007 mt7921 is replaced by mt7925e_W6 *.json and *.bash

Signed-off-by: Chuck SmileyRekiere <[email protected]>
greearb · Jan 28, 2025 · b2a5cf5 · b2a5cf5
1 parent b61db4b
commit b2a5cf5
Show file tree

Hide file tree

Showing 11 changed files with 42 additions and 46 deletions.
diff --git a/py-scripts/tools/ct_tests_json/ct_us_007/ct_perf_rvr/ct_perf_rvr_2g_007_rx.json b/py-scripts/tools/ct_tests_json/ct_us_007/ct_perf_rvr/ct_perf_rvr_2g_007_rx.json
@@ -2,7 +2,7 @@
     "ct_perf_rvr_2g_007":{
         "Notes":[
             "This json file describes tests to be run by LANforge system performance 007, note ssid_idx=0 is for Radio-1, ssid_idx_1 is for Radio-1"
-        ]  
+        ]
     },
     "test_suites":{
         "rvr_perf_2g_mt7915e_W0_rx":{
@@ -420,7 +420,7 @@
                 ]
             }
         },
-        "rvr_perf_2g_mt7921_W6_rx":{
+        "rvr_perf_2g_mt7925e_W6_rx":{
             "CC_DUT":{
                 "enabled":"TRUE",
                 "load_db":"skip",
@@ -568,7 +568,7 @@
                     " "
                 ]
             }
-        }         
+        }
 
     }
 }
diff --git a/py-scripts/tools/ct_tests_json/ct_us_007/ct_perf_rvr/ct_perf_rvr_2g_007_tx.json b/py-scripts/tools/ct_tests_json/ct_us_007/ct_perf_rvr/ct_perf_rvr_2g_007_tx.json
@@ -2,7 +2,7 @@
     "ct_perf_rvr_2g_007":{
         "Notes":[
             "This json file describes tests to be run by LANforge system performance 007, note ssid_idx=0 is for Radio-1, ssid_idx_1 is for Radio-1"
-        ]  
+        ]
     },
     "test_suites":{
         "rvr_perf_2g_mt7915e_W0_tx":{
@@ -420,7 +420,7 @@
                 ]
             }
         },
-        "rvr_perf_2g_mt7921_W6_tx":{
+        "rvr_perf_2g_mt7925e_W6_tx":{
             "CC_DUT":{
                 "enabled":"TRUE",
                 "load_db":"skip",
@@ -568,7 +568,7 @@
                     " "
                 ]
             }
-        }         
+        }
 
     }
 }
diff --git a/py-scripts/tools/ct_tests_json/ct_us_007/ct_perf_rvr/ct_perf_rvr_2g_007_tx_rx.json b/py-scripts/tools/ct_tests_json/ct_us_007/ct_perf_rvr/ct_perf_rvr_2g_007_tx_rx.json
@@ -2,7 +2,7 @@
     "ct_perf_rvr_2g_007":{
         "Notes":[
             "This json file describes tests to be run by LANforge system performance 007, note ssid_idx=0 is for Radio-1, ssid_idx_1 is for Radio-1"
-        ]  
+        ]
     },
     "test_suites":{
         "rvr_perf_2g_mt7915e_W0_tx_rx":{
@@ -420,7 +420,7 @@
                 ]
             }
         },
-        "rvr_perf_2g_mt7921_W6_tx_rx":{
+        "rvr_perf_2g_mt7925e_W6_tx_rx":{
             "CC_DUT":{
                 "enabled":"TRUE",
                 "load_db":"skip",
@@ -568,7 +568,7 @@
                     " "
                 ]
             }
-        }         
+        }
 
     }
 }
diff --git a/py-scripts/tools/ct_tests_json/ct_us_007/ct_perf_rvr/ct_perf_rvr_5g_007_rx.json b/py-scripts/tools/ct_tests_json/ct_us_007/ct_perf_rvr/ct_perf_rvr_5g_007_rx.json
@@ -2,7 +2,7 @@
     "ct_perf_rvr_5g_007":{
         "Notes":[
             "This json file describes tests to be run by LANforge system performance 007, note ssid_idx=0 is for Radio-1, ssid_idx_1 is for Radio-2"
-        ]  
+        ]
     },
     "test_suites":{
         "rvr_perf_5g_1_mt7915e_W0_rx":{
@@ -833,7 +833,7 @@
                 ]
             }
         },
-        "rvr_perf_5g_1_mt7921_W6_rx":{
+        "rvr_perf_5g_1_mt7925e_W6_rx":{
             "CC_DUT":{
                 "enabled":"TRUE",
                 "load_db":"skip",
@@ -902,7 +902,7 @@
                 ]
             }
         },
-        "rvr_perf_5g_2_mt7921_W6_rx":{
+        "rvr_perf_5g_2_mt7925e_W6_rx":{
             "CC_DUT":{
                 "enabled":"TRUE",
                 "load_db":"skip",
@@ -1119,7 +1119,7 @@
                     " "
                 ]
             }
-        }         
+        }
 
     }
 }
diff --git a/py-scripts/tools/ct_tests_json/ct_us_007/ct_perf_rvr/ct_perf_rvr_5g_007_tx.json b/py-scripts/tools/ct_tests_json/ct_us_007/ct_perf_rvr/ct_perf_rvr_5g_007_tx.json
@@ -2,7 +2,7 @@
     "ct_perf_rvr_5g_007":{
         "Notes":[
             "This json file describes tests to be run by LANforge system performance 007, note ssid_idx=0 is for Radio-1, ssid_idx_1 is for Radio-2"
-        ]  
+        ]
     },
     "test_suites":{
         "rvr_perf_5g_1_mt7915e_W0_tx":{
@@ -833,7 +833,7 @@
                 ]
             }
         },
-        "rvr_perf_5g_1_mt7921_W6_tx":{
+        "rvr_perf_5g_1_mt7925e_W6_tx":{
             "CC_DUT":{
                 "enabled":"TRUE",
                 "load_db":"skip",
@@ -902,7 +902,7 @@
                 ]
             }
         },
-        "rvr_perf_5g_2_mt7921_W6_tx":{
+        "rvr_perf_5g_2_mt7925e_W6_tx":{
             "CC_DUT":{
                 "enabled":"TRUE",
                 "load_db":"skip",
@@ -1119,7 +1119,7 @@
                     " "
                 ]
             }
-        }         
+        }
 
     }
 }
diff --git a/py-scripts/tools/ct_tests_json/ct_us_007/ct_perf_rvr/ct_perf_rvr_5g_007_tx_rx.json b/py-scripts/tools/ct_tests_json/ct_us_007/ct_perf_rvr/ct_perf_rvr_5g_007_tx_rx.json
@@ -2,7 +2,7 @@
     "ct_perf_rvr_5g_007":{
         "Notes":[
             "This json file describes tests to be run by LANforge system performance 007, note ssid_idx=0 is for Radio-1, ssid_idx_1 is for Radio-2"
-        ]  
+        ]
     },
     "test_suites":{
         "rvr_perf_5g_1_mt7915e_W0_tx_rx":{
@@ -833,7 +833,7 @@
                 ]
             }
         },
-        "rvr_perf_5g_1_mt7921_W6_tx_rx":{
+        "rvr_perf_5g_1_mt7925e_W6_tx_rx":{
             "CC_DUT":{
                 "enabled":"TRUE",
                 "load_db":"skip",
@@ -902,7 +902,7 @@
                 ]
             }
         },
-        "rvr_perf_5g_2_mt7921_W6_tx_rx":{
+        "rvr_perf_5g_2_mt7925e_W6_tx_rx":{
             "CC_DUT":{
                 "enabled":"TRUE",
                 "load_db":"skip",
@@ -1119,7 +1119,7 @@
                     " "
                 ]
             }
-        }         
+        }
 
     }
 }
diff --git a/py-scripts/tools/ct_tests_json/ct_us_007/ct_perf_rvr/ct_perf_rvr_6g_007_rx.json b/py-scripts/tools/ct_tests_json/ct_us_007/ct_perf_rvr/ct_perf_rvr_6g_007_rx.json
@@ -2,7 +2,7 @@
     "ct_perf_rvr_6g_007":{
         "Notes":[
             "This json file describes tests to be run by LANforge system performance 007, note ssid_idx=0 is for Radio-1, ssid_idx_1 is for Radio-4"
-        ]  
+        ]
     },
     "test_suites":{
         "rvr_perf_6g_mt7915e_W0_rx":{
@@ -425,7 +425,7 @@
                 ]
             }
         },
-        "rvr_perf_6g_mt7921_W6_rx":{
+        "rvr_perf_6g_mt7925e_W6_rx":{
             "CC_DUT":{
                 "enabled":"TRUE",
                 "load_db":"skip",
@@ -575,7 +575,7 @@
                     " "
                 ]
             }
-        }         
+        }
 
     }
 }
diff --git a/py-scripts/tools/ct_tests_json/ct_us_007/ct_perf_rvr/ct_perf_rvr_6g_007_tx.json b/py-scripts/tools/ct_tests_json/ct_us_007/ct_perf_rvr/ct_perf_rvr_6g_007_tx.json
@@ -2,7 +2,7 @@
     "ct_perf_rvr_6g_007":{
         "Notes":[
             "This json file describes tests to be run by LANforge system performance 007, note ssid_idx=0 is for Radio-1, ssid_idx_1 is for Radio-4"
-        ]  
+        ]
     },
     "test_suites":{
         "rvr_perf_6g_mt7915e_W0_tx":{
@@ -425,7 +425,7 @@
                 ]
             }
         },
-        "rvr_perf_6g_mt7921_W6_tx":{
+        "rvr_perf_6g_mt7925e_W6_tx":{
             "CC_DUT":{
                 "enabled":"TRUE",
                 "load_db":"skip",
@@ -575,7 +575,7 @@
                     " "
                 ]
             }
-        }         
+        }
 
     }
 }
diff --git a/py-scripts/tools/ct_tests_json/ct_us_007/ct_perf_rvr/ct_perf_rvr_6g_007_tx_rx.json b/py-scripts/tools/ct_tests_json/ct_us_007/ct_perf_rvr/ct_perf_rvr_6g_007_tx_rx.json
@@ -2,7 +2,7 @@
     "ct_perf_rvr_6g_007":{
         "Notes":[
             "This json file describes tests to be run by LANforge system performance 007, note ssid_idx=0 is for Radio-1, ssid_idx_1 is for Radio-4"
-        ]  
+        ]
     },
     "test_suites":{
         "rvr_perf_6g_mt7915e_W0_tx_rx":{
@@ -425,7 +425,7 @@
                 ]
             }
         },
-        "rvr_perf_6g_mt7921_W6_tx_rx":{
+        "rvr_perf_6g_mt7925e_W6_tx_rx":{
             "CC_DUT":{
                 "enabled":"TRUE",
                 "load_db":"skip",
@@ -575,7 +575,7 @@
                     " "
                 ]
             }
-        }         
+        }
 
     }
 }
diff --git a/py-scripts/tools/ct_us_007_rvr_2024_run.bash b/py-scripts/tools/ct_us_007_rvr_2024_run.bash
@@ -11,30 +11,28 @@ echo "Running RVR tests"
 --json_test \
 ./ct_tests_json/ct_us_007/ct_perf_rvr/ct_perf_rvr_2g_007_rx.json:rvr_perf_2g_mt7915e_W0_rx,\
 ./ct_tests_json/ct_us_007/ct_perf_rvr/ct_perf_rvr_2g_007_rx.json:rvr_perf_2g_ax210_W2_rx,\
-./ct_tests_json/ct_us_007/ct_perf_rvr/ct_perf_rvr_2g_007_rx.json:rvr_perf_2g_mt7921_W6_rx,\
+./ct_tests_json/ct_us_007/ct_perf_rvr/ct_perf_rvr_2g_007_rx.json:rvr_perf_2g_mt7925e_W6_rx,\
 ./ct_tests_json/ct_us_007/ct_perf_rvr/ct_perf_rvr_2g_007_rx.json:rvr_perf_2g_mt7922_W7_rx,\
 ./ct_tests_json/ct_us_007/ct_perf_rvr/ct_perf_rvr_5g_007_rx.json:rvr_perf_5g_1_mt7915e_W0_rx,\
 ./ct_tests_json/ct_us_007/ct_perf_rvr/ct_perf_rvr_5g_007_rx.json:rvr_perf_5g_1_ax210_W2_rx,\
-./ct_tests_json/ct_us_007/ct_perf_rvr/ct_perf_rvr_5g_007_rx.json:rvr_perf_5g_1_mt7921_W6_rx,\
+./ct_tests_json/ct_us_007/ct_perf_rvr/ct_perf_rvr_5g_007_rx.json:rvr_perf_5g_1_mt7925e_W6_rx,\
 ./ct_tests_json/ct_us_007/ct_perf_rvr/ct_perf_rvr_5g_007_rx.json:rvr_perf_5g_1_mt7922_W7_rx,\
 ./ct_tests_json/ct_us_007/ct_perf_rvr/ct_perf_rvr_6g_007_rx.json:rvr_perf_6g_ax210_W2_rx,\
-./ct_tests_json/ct_us_007/ct_perf_rvr/ct_perf_rvr_6g_007_rx.json:rvr_perf_6g_mt7921_W6_rx,\
+./ct_tests_json/ct_us_007/ct_perf_rvr/ct_perf_rvr_6g_007_rx.json:rvr_perf_6g_mt7925e_W6_rx,\
 ./ct_tests_json/ct_us_007/ct_perf_rvr/ct_perf_rvr_6g_007_rx.json:rvr_perf_6g_mt7922_W7_rx,\
 ./ct_tests_json/ct_us_007/ct_perf_rvr/ct_perf_rvr_2g_5g_6g_007_rx.json:rvr_perf_2g_5g_6g_ax210_W2_W3_W4_rx,\
 ./ct_tests_json/ct_us_007/ct_perf_rvr/ct_perf_rvr_2g_007_tx.json:rvr_perf_2g_mt7915e_W0_tx,\
 ./ct_tests_json/ct_us_007/ct_perf_rvr/ct_perf_rvr_2g_007_tx.json:rvr_perf_2g_ax210_W2_tx,\
-./ct_tests_json/ct_us_007/ct_perf_rvr/ct_perf_rvr_2g_007_tx.json:rvr_perf_2g_mt7921_W6_tx,\
+./ct_tests_json/ct_us_007/ct_perf_rvr/ct_perf_rvr_2g_007_tx.json:rvr_perf_2g_mt7925e_W6_tx,\
 ./ct_tests_json/ct_us_007/ct_perf_rvr/ct_perf_rvr_2g_007_tx.json:rvr_perf_2g_mt7922_W7_tx,\
 ./ct_tests_json/ct_us_007/ct_perf_rvr/ct_perf_rvr_5g_007_tx.json:rvr_perf_5g_1_mt7915e_W0_tx,\
 ./ct_tests_json/ct_us_007/ct_perf_rvr/ct_perf_rvr_5g_007_tx.json:rvr_perf_5g_1_ax210_W2_tx,\
-./ct_tests_json/ct_us_007/ct_perf_rvr/ct_perf_rvr_5g_007_tx.json:rvr_perf_5g_1_mt7921_W6_tx,\
+./ct_tests_json/ct_us_007/ct_perf_rvr/ct_perf_rvr_5g_007_tx.json:rvr_perf_5g_1_mt7925e_W6_tx,\
 ./ct_tests_json/ct_us_007/ct_perf_rvr/ct_perf_rvr_5g_007_tx.json:rvr_perf_5g_1_mt7922_W7_tx,\
 ./ct_tests_json/ct_us_007/ct_perf_rvr/ct_perf_rvr_6g_007_tx.json:rvr_perf_6g_ax210_W2_tx,\
-./ct_tests_json/ct_us_007/ct_perf_rvr/ct_perf_rvr_6g_007_tx.json:rvr_perf_6g_mt7921_W6_tx,\
+./ct_tests_json/ct_us_007/ct_perf_rvr/ct_perf_rvr_6g_007_tx.json:rvr_perf_6g_mt7925e_W6_tx,\
 ./ct_tests_json/ct_us_007/ct_perf_rvr/ct_perf_rvr_6g_007_tx.json:rvr_perf_6g_mt7922_W7_tx,\
 ./ct_tests_json/ct_us_007/ct_perf_rvr/ct_perf_rvr_2g_5g_6g_007_tx.json:rvr_perf_2g_5g_6g_ax210_W2_W3_W4_tx \
 --path /home/lanforge/html-reports/ct_us_007_2024 \
 --log_level debug \
 --production
-
-
diff --git a/py-scripts/tools/ct_us_007_rvr_run.bash b/py-scripts/tools/ct_us_007_rvr_run.bash
@@ -11,30 +11,28 @@ echo "Running RVR tests"
 --json_test \
 ./ct_tests_json/ct_us_007/ct_perf_rvr/ct_perf_rvr_2g_007_rx.json:rvr_perf_2g_mt7915e_W0_rx,\
 ./ct_tests_json/ct_us_007/ct_perf_rvr/ct_perf_rvr_2g_007_rx.json:rvr_perf_2g_ax210_W2_rx,\
-./ct_tests_json/ct_us_007/ct_perf_rvr/ct_perf_rvr_2g_007_rx.json:rvr_perf_2g_mt7921_W6_rx,\
+./ct_tests_json/ct_us_007/ct_perf_rvr/ct_perf_rvr_2g_007_rx.json:rvr_perf_2g_mt7925e_W6_rx,\
 ./ct_tests_json/ct_us_007/ct_perf_rvr/ct_perf_rvr_2g_007_rx.json:rvr_perf_2g_mt7922_W7_rx,\
 ./ct_tests_json/ct_us_007/ct_perf_rvr/ct_perf_rvr_5g_007_rx.json:rvr_perf_5g_1_mt7915e_W0_rx,\
 ./ct_tests_json/ct_us_007/ct_perf_rvr/ct_perf_rvr_5g_007_rx.json:rvr_perf_5g_1_ax210_W2_rx,\
-./ct_tests_json/ct_us_007/ct_perf_rvr/ct_perf_rvr_5g_007_rx.json:rvr_perf_5g_1_mt7921_W6_rx,\
+./ct_tests_json/ct_us_007/ct_perf_rvr/ct_perf_rvr_5g_007_rx.json:rvr_perf_5g_1_mt7925e_W6_rx,\
 ./ct_tests_json/ct_us_007/ct_perf_rvr/ct_perf_rvr_5g_007_rx.json:rvr_perf_5g_1_mt7922_W7_rx,\
 ./ct_tests_json/ct_us_007/ct_perf_rvr/ct_perf_rvr_6g_007_rx.json:rvr_perf_6g_ax210_W2_rx,\
-./ct_tests_json/ct_us_007/ct_perf_rvr/ct_perf_rvr_6g_007_rx.json:rvr_perf_6g_mt7921_W6_rx,\
+./ct_tests_json/ct_us_007/ct_perf_rvr/ct_perf_rvr_6g_007_rx.json:rvr_perf_6g_mt7925e_W6_rx,\
 ./ct_tests_json/ct_us_007/ct_perf_rvr/ct_perf_rvr_6g_007_rx.json:rvr_perf_6g_mt7922_W7_rx,\
 ./ct_tests_json/ct_us_007/ct_perf_rvr/ct_perf_rvr_2g_5g_6g_007_rx.json:rvr_perf_2g_5g_6g_ax210_W2_W3_W4_rx,\
 ./ct_tests_json/ct_us_007/ct_perf_rvr/ct_perf_rvr_2g_007_tx.json:rvr_perf_2g_mt7915e_W0_tx,\
 ./ct_tests_json/ct_us_007/ct_perf_rvr/ct_perf_rvr_2g_007_tx.json:rvr_perf_2g_ax210_W2_tx,\
-./ct_tests_json/ct_us_007/ct_perf_rvr/ct_perf_rvr_2g_007_tx.json:rvr_perf_2g_mt7921_W6_tx,\
+./ct_tests_json/ct_us_007/ct_perf_rvr/ct_perf_rvr_2g_007_tx.json:rvr_perf_2g_mt7925e_W6_tx,\
 ./ct_tests_json/ct_us_007/ct_perf_rvr/ct_perf_rvr_2g_007_tx.json:rvr_perf_2g_mt7922_W7_tx,\
 ./ct_tests_json/ct_us_007/ct_perf_rvr/ct_perf_rvr_5g_007_tx.json:rvr_perf_5g_1_mt7915e_W0_tx,\
 ./ct_tests_json/ct_us_007/ct_perf_rvr/ct_perf_rvr_5g_007_tx.json:rvr_perf_5g_1_ax210_W2_tx,\
-./ct_tests_json/ct_us_007/ct_perf_rvr/ct_perf_rvr_5g_007_tx.json:rvr_perf_5g_1_mt7921_W6_tx,\
+./ct_tests_json/ct_us_007/ct_perf_rvr/ct_perf_rvr_5g_007_tx.json:rvr_perf_5g_1_mt7925e_W6_tx,\
 ./ct_tests_json/ct_us_007/ct_perf_rvr/ct_perf_rvr_5g_007_tx.json:rvr_perf_5g_1_mt7922_W7_tx,\
 ./ct_tests_json/ct_us_007/ct_perf_rvr/ct_perf_rvr_6g_007_tx.json:rvr_perf_6g_ax210_W2_tx,\
-./ct_tests_json/ct_us_007/ct_perf_rvr/ct_perf_rvr_6g_007_tx.json:rvr_perf_6g_mt7921_W6_tx,\
+./ct_tests_json/ct_us_007/ct_perf_rvr/ct_perf_rvr_6g_007_tx.json:rvr_perf_6g_mt7925e_W6_tx,\
 ./ct_tests_json/ct_us_007/ct_perf_rvr/ct_perf_rvr_6g_007_tx.json:rvr_perf_6g_mt7922_W7_tx,\
 ./ct_tests_json/ct_us_007/ct_perf_rvr/ct_perf_rvr_2g_5g_6g_007_tx.json:rvr_perf_2g_5g_6g_ax210_W2_W3_W4_tx \
 --path /home/lanforge/html-reports/ct_us_007 \
 --log_level debug \
 --production
-
-