support sonic-mgmt multi-dut gen-mg for LC

ansible/TestbedProcessing.py

@@ -363,6 +363,7 @@ def makeLabSecrets(data, outfile):
 """
 def makeLab(data, devices, testbed, outfile):
     deviceGroup = data
+    start_switchid = 0
     with open(outfile, "w") as toWrite:
         for key, value in deviceGroup.items():
             #children section
@@ -377,6 +378,7 @@ def makeLab(data, devices, testbed, outfile):
                 toWrite.write("[" + key + "]\n")
                 for host in value.get("host"):
                     entry = host
+                    dev = devices.get(host.lower())
 
                     if "ptf" in key:
                         try: #get ansible host
@@ -416,6 +418,96 @@ def makeLab(data, devices, testbed, outfile):
                                 entry += "\tansible_ssh_pass=" + ansible_ssh_pass
                             except:
                                 print("\t\t" + host + ": ansible_ssh_pass not found")
+                        try: #get hwsku
+                            hwsku = dev.get("hwsku")
+                            if hwsku is not None:
+                               entry += "\thwsku=" + hwsku
+                        except:
+                            print("\t\t" + host + ": hwsku not found")
+
+                        try: #get card_type
+                            card_type = dev.get("card_type")
+                            if card_type is not None:
+                               entry += "\tcard_type=" + card_type
+                        except:
+                           print("\t\t" + host + ": card_type not found")
+
+                        try: #get num_asics
+                            num_asics = dev.get("num_asics")
+                            if num_asics is not None:
+                               entry += "\tnum_asics=" + str( num_asics )
+                        except:
+                            print("\t\t" + host + " num_asics not found")
+
+                        if card_type != 'supervisor':
+                           entry += "\tstart_switchid=" + str( start_switchid )
+                           if num_asic is not None:
+                              start_switchid += int( num_asic )
+                           else:
+                              start_switchid += 1
+
+                        try: #get frontend_asics
+                            frontend_asics = dev.get("frontend_asics")
+                            if frontend_asics is not None:
+                               entry += "\tfrontend_asics=" + frontend_asics.__str__()
+                        except:
+                            print("\t\t" + host + ": frontend_asics not found")
+
+                        try: #get asics_host_ip
+                            asics_host_ip = dev.get("asics_host_ip")
+                            if asics_host_ip is not None:
+                               entry += " \tasics_host_ip=" + str( asics_host_ip )
+                        except:
+                            print("\t\t" + host + " asics_host_ip not found")
+
+                        try: #get asics_host_ipv6
+                            asics_host_ipv6 = dev.get("asics_host_ipv6")
+                            if asics_host_ipv6 is not None:
+                               entry += "\tasics_host_ipv6=" + str( asics_host_ipv6 )
+                        except:
+                            print("\t\t" + host + " asics_host_ipv6 not found")
+
+                        try: #get voq_inband_ip
+                            voq_inband_ip = dev.get("voq_inband_ip")
+                            if voq_inband_ip is not None:
+                               entry += "\tvoq_inband_ip=" + str( voq_inband_ip )
+                        except:
+                            print("\t\t" + host + " voq_inband_ip not found")
+
+                        try: #get voq_inband_ipv6
+                            voq_inband_ip = dev.get("voq_inband_ipv6")
+                            if voq_inband_ip is not None:
+                               entry += "\tvoq_inband_ipv6=" + str( voq_inband_ipv6 )
+                        except:
+                            print("\t\t" + host + " voq_inband_ipv6 not found")
+
+                        try: #get voq_inband_intf
+                            voq_inband_intf = dev.get("voq_inband_intf")
+                            if voq_inband_intf is not None:
+                               entry += "\tvoq_inband_intf=" + str( voq_inband_intf )
+                        except:
+                            print("\t\t" + host + " voq_inband_intf not found")
+
+                        try: #get voq_inband_type
+                            voq_inband_type = dev.get("voq_inband_type")
+                            if voq_inband_type is not None:
+                               entry += "\tvoq_inband_type=" + str( voq_inband_type )
+                        except:
+                            print("\t\t" + host + " voq_inband_type not found")
+
+                        try: #get switch_type
+                            switch_type = dev.get("switch_type")
+                            if switch_type is not None:
+                               entry += "\tswitch_type=" + str( switch_type )
+                        except:
+                            print("\t\t" + host + " switch_type not found")
+
+                        try: #get max_cores
+                            max_cores = dev.get("max_cores")
+                            if max_cores is not None:
+                               entry += "\tmax_cores=" + str( max_cores )
+                        except:
+                            print("\t\t" + host + " max_cores not found")
 
                     toWrite.write(entry + "\n")
                 toWrite.write("\n")
@@ -457,6 +549,10 @@ def makeVeos(data, veos, devices, outfile):
                     try:
                         ansible_host = devices.get(host.lower()).get("ansible").get("ansible_host")
                         entry += "\tansible_host=" + ansible_host.split("/")[0]
+                        if dev.get("device_type") == "DevSonic":
+                            entry += "\ttype=" + dev.get("type")
+                            entry += "\thwsku=" + dev.get("hwsku")
+                            entry += "\tcard_type=" + dev.get("card_type")
                     except:
                         try:
                             ansible_host = veos.get(key).get(host).get("ansible_host")

ansible/ansible.cfg

@@ -49,7 +49,7 @@ sudo_exe = sudo
 #sudo_flags = -H
 
 # SSH timeout
-timeout = 10
+timeout = 30
 
 # default user to use for playbooks if user is not specified
 # (/usr/bin/ansible will use current user as default)

ansible/config_sonic_basedon_testbed.yml

@@ -61,6 +61,10 @@
       set_fact:
         topo: "{{ testbed_facts['topo'] }}"
 
+    - name: set ptf image name
+      set_fact:
+        ptf_image: "{{ testbed_facts['ptf_image_name'] }}"
+
     - name: set vm
       set_fact:
         vm_base: "{{ testbed_facts['vm_base'] }}"
@@ -71,14 +75,29 @@
     delegate_to: localhost
 
   - name: find interface name mapping and individual interface speed if defined from dut
-    port_alias: hwsku="{{ hwsku }}"
+    port_alias:
+      hwsku: "{{ hwsku }}"
+      card_type: "{{ card_type | default('fixed') }}"
+      hostname: "{{ inventory_hostname | default('') }}"
+      start_switchid: "{{ start_switchid | default(0) }}"
     when: deploy is defined and deploy|bool == true
 
   - name: find interface name mapping and individual interface speed if defined with local data
-    port_alias: hwsku="{{ hwsku }}" num_asic="{{ num_asics }}"
+    port_alias:
+      hwsku="{{ hwsku }}"
+      num_asic="{{ num_asics }}"
+      card_type: "{{ card_type | default('fixed') }}"
+      hostname: "{{ inventory_hostname | default('') }}"
+      start_switchid: "{{ start_switchid | default(0) }}"
     delegate_to: localhost
     when: deploy is not defined or deploy|bool == false
 
+  - name: set all VoQ information
+    set_fact:
+      all_sysports: "{{ all_system_ports | default( [] ) + item.value['ansible_facts']['sysports'] }}"
+    with_dict: "{{ hostvars }}"
+    when: item.value['ansible_facts']['sysports'] is defined
+
   - name: find all enabled host_interfaces
     set_fact:
       host_if_indexes: "{{ vm_topo_config['host_interfaces_by_dut'][dut_index|int] | difference(vm_topo_config['disabled_host_interfaces_by_dut'][dut_index|int]) }}"
@@ -111,7 +130,7 @@
     when: vm_file is not defined
 
   - set_fact:
-      VM_topo: "{% if 'ptf' in topo %}False{% else %}True{% endif %}"
+      VM_topo: "{% if 'ptf' in topo or 'docker-keysight-api-server' in ptf_image %}False{% else %}True{% endif %}"
       remote_dut: "{{ ansible_ssh_host }}"
 
   - name: gather testbed VM informations
@@ -377,6 +396,18 @@
         become: true
         shell: config load_minigraph -y
 
+      - name: Wait for switch to become reachable again
+        become: false
+        local_action: wait_for
+        args:
+          host: "{{ ansible_host }}"
+          port: 22
+          state: started
+          search_regex: "OpenSSH_[\\w\\.]+ Debian"
+          delay: 10
+          timeout: 600
+        changed_when: false
+
       - name: execute cli "config bgp startup all" to bring up all bgp sessions for test
         become: true
         shell: config bgp startup all

ansible/devutils

@@ -260,6 +260,19 @@ def action_pdu_status(parameters):
     show_data_output(header, data, parameters['json'])
 
 
+def action_pdu_failures(parameters):
+    header, data = action_pdu(parameters, 'status')
+    failures = []
+    for entry in data:
+        if parameters['json']:
+            if any(x['output_watts'] == '0' for x in entry['PDU status']):
+                failures.append(entry)
+        else:
+            if any(x['output_watts'] == '0' for x in entry[2]):
+                failures.append(entry)
+    show_data_output(header, failures, parameters['json'])
+
+
 def action_pdu_off(parameters):
     header, data = action_pdu(parameters, 'off')
     show_data_output(header, data, parameters['json'])
@@ -324,9 +337,9 @@ def main():
     parser.add_argument('-6', '--ipv6', help='Include IPv6', action='store_true',
                         required=False, default=False)
     parser.add_argument('-a', '--action',
-                        help='Action towards host(s): list, ping, run, ssh, console, pdu_status, pdu_on, pdu_off, pdu_reboot, default list',
+                        help='Action towards host(s): list, ping, run, ssh, console, pdu_status, pdu_on, pdu_off, pdu_reboot, pdu_failures, default list',
                         type=str, required=False, default='list',
-                        choices=['list', 'ping', 'ssh', 'console', 'run', 'pdu_status', 'pdu_on', 'pdu_off', 'pdu_reboot'])
+                        choices=['list', 'ping', 'ssh', 'console', 'run', 'pdu_status', 'pdu_on', 'pdu_off', 'pdu_reboot', 'pdu_failures'])
     parser.add_argument('--cmd', help="Command to run on all hosts",
                         type=str, required=False)
     parser.add_argument('-g', '--group', help='Groups: all, sonic, ptf, pdu, default all',
@@ -358,6 +371,7 @@ def main():
                'pdu_off': action_pdu_off,
                'pdu_on': action_pdu_on,
                'pdu_reboot': action_pdu_reboot,
+               'pdu_failures': action_pdu_failures,
                }
     parameters = {'hosts': hosts,
                   'limit': args.limit,