Use testbed.yaml as default testbed file (sonic-net#9257)

zhixzhu · Aug 3, 2023 · 1e6e66f · 1e6e66f
1 parent ea1cf99
commit 1e6e66f
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 15 deletions.
diff --git a/ansible/TestbedProcessing.py b/ansible/TestbedProcessing.py
@@ -52,7 +52,7 @@
 main_file = "group_vars/vm_host/main.yml"
 vmHostCreds_file = "group_vars/vm_host/creds.yml"
 labLinks_file = "files/sonic_lab_links.csv"
-testbed_file = "testbed.csv"
+testbed_file = "testbed.yaml"
 devices_file = "files/sonic_lab_devices.csv"
 eosCred_file = "group_vars/eos/creds.yml"
 fanoutSecrets_file = "group_vars/fanout/secrets.yml"
@@ -239,7 +239,7 @@ def makeSonicLabDevices(data, outfile):
 makeTestbed(data, outfile)
 @:parameter data - the dictionary to look through (devices dictionary)
 @:parameter outfile - the file to write to
-generates /testbed.csv by pulling confName, groupName, topo, ptf_image_name,
+generates /testbed.yaml by pulling confName, groupName, topo, ptf_image_name,
                                   ptf_ip, ptf_ipv6, server, vm_base, dut, and comment
 error handling: checks if attribute values are None type or string "None"
 """
@@ -298,7 +298,7 @@ def makeTestbed(data, outfile):
                     "," + vm_base + "," + dut + "," + comment
                 f.write(row + "\n")
     except IOError:
-        print("I/O error: issue creating testbed.csv")
+        print("I/O error: issue creating testbed.yaml")
 
 
 """
@@ -1024,7 +1024,7 @@ def main():
     # Generate sonic_lab_devices.csv (DEVICES)
     makeSonicLabDevices(devices, args.basedir + devices_file)
     print("\tCREATING TEST BED: " + args.basedir + testbed_file)
-    # Generate testbed.csv (TESTBED)
+    # Generate testbed.yaml (TESTBED)
     makeTestbed(testbed, args.basedir + testbed_file)
     print("\tCREATING VM_HOST/CREDS: " + args.basedir + vmHostCreds_file)
     # Generate vm_host\creds.yml (CREDS)

diff --git a/ansible/config_sonic_basedon_testbed.yml b/ansible/config_sonic_basedon_testbed.yml
@@ -38,7 +38,7 @@
   - block:
     - name: set default testbed file
       set_fact:
-        testbed_file: testbed.csv
+        testbed_file: testbed.yaml
       when: testbed_file is not defined
 
     - name: Gathering testbed information

diff --git a/ansible/library/test_facts.py b/ansible/library/test_facts.py
@@ -100,7 +100,7 @@
 '''
 
 # Default testbed file name
-TESTBED_FILE = 'testbed.csv'
+TESTBED_FILE = 'testbed.yaml'
 TESTCASE_FILE = 'roles/test/vars/testcases.yml'
 
 

diff --git a/ansible/linkstate/testbed_inv.ini b/ansible/linkstate/testbed_inv.ini
@@ -1,5 +1,5 @@
 [Global]
-testbed_configuration = testbed.csv
+testbed_configuration = testbed.yaml
 vm_inventory  = veos
 lab_inventory = lab
 lab_links     = files/sonic_lab_links.csv
diff --git a/ansible/recover_server.py b/ansible/recover_server.py
@@ -324,8 +324,8 @@ def _join_all(threads):
     parser = argparse.ArgumentParser(description='Recover testbed servers.')
     parser.add_argument('--testbed-servers', action='append',
                         type=str, required=True, help='testbed server to recover')
-    parser.add_argument('--testbed', default='testbed.csv',
-                        help='testbed file(default: testbed.csv)')
+    parser.add_argument('--testbed', default='testbed.yaml',
+                        help='testbed file(default: testbed.yaml)')
     parser.add_argument('--vm-file', default='veos',
                         help='vm inventory file(default: veos)')
     parser.add_argument('--vm-type', default='ceos', choices=[

diff --git a/ansible/roles/test/tasks/sonic.yml b/ansible/roles/test/tasks/sonic.yml
@@ -52,7 +52,7 @@
 
 - name: set default testbed file
   set_fact:
-    testbed_file: testbed.csv
+    testbed_file: testbed.yaml
   when: testbed_file is not defined
 
 ###############################################

diff --git a/ansible/testbed-cli.sh b/ansible/testbed-cli.sh
@@ -23,7 +23,7 @@ function usage
   echo "    $0 [options] collect-show-tech <testbed-name> <inventory> <vault-password-file>"
   echo
   echo "Options:"
-  echo "    -t <tbfile>     : testbed CSV file name (default: 'testbed.csv')"
+  echo "    -t <tbfile>     : testbed CSV file name (default: 'testbed.yaml')"
   echo "    -m <vmfile>     : virtual machine file name (default: 'veos')"
   echo "    -k <vmtype>     : vm type (veos|ceos|vsonic|vcisco) (default: 'ceos')"
   echo "    -n <vm_num>     : vm num (default: 0)"
@@ -744,7 +744,7 @@ function deploy_topo_with_cache
 }
 
 vmfile=veos
-tbfile=testbed.csv
+tbfile=testbed.yaml
 vm_type=ceos
 vm_num=0
 msetnumber=1

diff --git a/ansible/upgrade_sonic.yml b/ansible/upgrade_sonic.yml
@@ -14,7 +14,7 @@
       block:
         - name: Set default testbed file
           set_fact:
-            testbed_file: testbed.csv
+            testbed_file: testbed.yaml
           when: testbed_file is not defined
 
         - name: Gather testbed information

diff --git a/tests/run_tests.sh b/tests/run_tests.sh
@@ -11,7 +11,7 @@ function show_help_and_exit()
     echo "    -d <dut name>  : specify comma-separated DUT names (default: DUT name associated with testbed in testbed file)"
     echo "    -e <parameters>: specify extra parameter(s) (default: none)"
     echo "    -E             : exit for any error (default: False)"
-    echo "    -f <tb file>   : specify testbed file (default testbed.csv)"
+    echo "    -f <tb file>   : specify testbed file (default testbed.yaml)"
     echo "    -i <inventory> : specify inventory name"
     echo "    -I <folders>   : specify list of test folders, filter out test cases not in the folders (default: none)"
     echo "    -k <file log>  : specify file log level: error|warning|info|debug (default debug)"
@@ -101,7 +101,7 @@ function setup_environment()
     RETAIN_SUCCESS_LOG="False"
     SKIP_SCRIPTS=""
     SKIP_FOLDERS="ptftests acstests saitests scripts k8s sai_qualify"
-    TESTBED_FILE="${BASE_PATH}/ansible/testbed.csv"
+    TESTBED_FILE="${BASE_PATH}/ansible/testbed.yaml"
     TEST_CASES=""
     TEST_INPUT_ORDER="False"
     TEST_METHOD='group'