gen-mg broken for multi-asic kvm - issue #4343 (#4420)

* Revert "Revert "[chassis] Support for gen-mg for multi-asic linecards in VoQ chassis (#3746)" (#4351)" This reverts commit aa9c059. * Fix for issue #4343 when running gen-mg for multi-asic kvm - Use empty list as the default for switchids in the call to port_alias. - In port_alias ansible library, check the length of switchids before using it. - In minigraph_png, - For supporting not all ports connected to fanout, in minigraph_png.j2, we added DeviceInterfaceLink for only ports that are defined in the device_conn (from connection graph). But, for masic KVM, device_conn is not defined, and thus we were not adding any port. The fix is that if the inventory_hostname is not present in the device_conn, then add DeviceInterfaceLink for all front_panel_asic_ifnames - 'Bandwidth' for each DeviceInterfaceLink was hard-coded to 40G, we added code to get it from port_speed which also gets populated from the connection graph. However, port_speed is empty for KVM, and thus generation was failing. Fix is to check if the port is present in port_speed, and if so, use the speed defined in port_speed. Else, use default 40G.
sonic-net · Oct 13, 2021 · 9eda7d0 · 9eda7d0
1 parent bdeacb1
commit 9eda7d0
Show file tree

Hide file tree

Showing 10 changed files with 448 additions and 93 deletions.
diff --git a/ansible/TestbedProcessing.py b/ansible/TestbedProcessing.py
@@ -492,47 +492,62 @@ def makeLab(data, devices, testbed, outfile):
                         except AttributeError:
                             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 AttributeError:
-                            print("\t\t" + host + " voq_inband_ip not found")
-
-                        try: #get voq_inband_ipv6
-                            voq_inband_ipv6 = dev.get("voq_inband_ipv6")
-                            if voq_inband_ipv6 is not None:
-                               entry += "\tvoq_inband_ipv6=" + str( voq_inband_ipv6 )
-                        except AttributeError:
-                            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 AttributeError:
-                            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 AttributeError:
-                            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 AttributeError:
-                            print("\t\t" + host + " switch_type not found")
+                                entry += "\tswitch_type=" + str( switch_type )
+                                if switch_type == 'voq' and card_type != 'supervisor':
+                                    if num_asics is None:
+                                        num_asics = 1
+
+                                    # All fields are a list. For single asic the list is of size 1.
+                                    switchids = dev.get("switchids")                       # switchids, single asic example "[4]", 3 asic example "[4,6,8]"
+                                    voq_inband_ip = dev.get("voq_inband_ip")               # voq_inband_ip
+                                    voq_inband_ipv6 = dev.get("voq_inband_ipv6")           # voq_inband_ipv6
+                                    voq_inband_intf = dev.get("voq_inband_intf")           # voq_inband_intf
+                                    voq_inband_type = dev.get("voq_inband_type")           # voq_inband_type
+                                    max_cores = dev.get("max_cores")                       # max cores
+                                    lo4096_ip = dev.get("loopback4096_ip")                 # loopback4096_ip
+                                    lo4096_ipv6 = dev.get("loopback4096_ipv6")             # loopback4096_ipv6
+                                    num_cores_per_asic = dev.get("num_cores_per_asic", 1)  # number of cores per asic - to be used in calculating the switchids, assuming to be the same for all linecards
+
+                                    # Add fields
+                                    if switchids is None:
+                                        switchids = [start_switchid + (asic_id * num_cores_per_asic) for asic_id in range(num_asics)]
+                                    entry += "\tswitchids=" + str(switchids)
+
+                                    if voq_inband_ip is None:
+                                        voq_inband_ip = ["1.1.1.{}/32".format(start_switchid + asic_id) for asic_id in range(num_asics)]
+                                    entry += "\tvoq_inband_ip=" + str(voq_inband_ip)
+
+                                    if voq_inband_ipv6 is None:
+                                        voq_inband_ip = ["1111::1:{}/128".format(start_switchid + asic_id) for asic_id in range(num_asics)]
+                                    entry += "\tvoq_inband_ipv6=" + str(voq_inband_ip)
+
+                                    if voq_inband_intf is None:
+                                        voq_inband_intf = ["Ethernet-IB{}".format(asic_id) for asic_id in range(num_asics)]
+                                    entry += "\tvoq_inband_intf=" + str(voq_inband_intf)
+
+                                    if voq_inband_type is None:
+                                        voq_inband_type = "port"
+                                    entry += "\tvoq_inband_type=" + voq_inband_type
+
+                                    if max_cores is None:
+                                        max_cores = 48
+                                    entry += "\tmax_cores=" + str(max_cores)
+
+                                    if lo4096_ip is None:
+                                        lo4096_ip = ["8.0.0.{}/32".format(start_switchid + asic_id) for asic_id in range(num_asics)]
+                                    entry += "\tloopback4096_ip=" + lo4096_ip
+
+                                    if lo4096_ipv6 is None:
+                                        lo4096_ipv6 = ["2603:10e2:400::{}/128".format(start_switchid + asic_id) for asic_id in range(num_asics)]
+                                    entry += "\tloopback4096_ipv6=" + lo4096_ipv6
+
+                                    start_switchid += (num_asics * num_cores_per_asic)
 
-                        try: #get max_cores
-                            max_cores = dev.get("max_cores")
-                            if max_cores is not None:
-                               entry += "\tmax_cores=" + str( max_cores )
                         except AttributeError:
-                            print("\t\t" + host + " max_cores not found")
+                            print("\t\t" + host + " switch_type not found")
 
                         try: #get os
                             os = dev.get("os")

diff --git a/ansible/config_sonic_basedon_testbed.yml b/ansible/config_sonic_basedon_testbed.yml
@@ -83,7 +83,7 @@
       hwsku: "{{ hwsku }}"
       card_type: "{{ card_type | default('fixed') }}"
       hostname: "{{ inventory_hostname | default('') }}"
-      start_switchid: "{{ start_switchid | default(0) }}"
+      switchids: "{{ switchids | default([]) }}"
     when: deploy is defined and deploy|bool == true
 
   - name: find interface name mapping and individual interface speed if defined with local data
@@ -92,7 +92,7 @@
       num_asic: "{{ num_asics }}"
       card_type: "{{ card_type | default('fixed') }}"
       hostname: "{{ inventory_hostname | default('') }}"
-      start_switchid: "{{ start_switchid | default(0) }}"
+      switchids: "{{ switchids | default([]) }}"
     delegate_to: localhost
     when: deploy is not defined or deploy|bool == false
 
@@ -110,8 +110,7 @@
 
   - name: set all VoQ information for iBGP
     set_fact:
-      all_inbands: "{{ all_inbands | default( [] ) + [ hostvars[item]['voq_inband_ip'] ] }}"
-      all_hostnames: "{{ all_hostnames | default( [] ) + [ item ] }}"
+      all_inbands: "{{ all_inbands | default( {} ) | combine( { item : hostvars[item]['voq_inband_ip']}) }}"
     when: hostvars[item]['voq_inband_ip'] is defined
     loop: "{{ ansible_play_batch }}"
 

diff --git a/ansible/library/fabric_info.py b/ansible/library/fabric_info.py
@@ -23,8 +23,8 @@
 
 RETURN = '''
       ansible_facts{
-        fabric_info: [{'asicname': 'ASIC0', 'ip_prefix': '10.1.0.1/32', 'ip6_prefix': 'FC00:1::1/128'},
-                      {'asicname': 'ASIC1', 'ip_prefix': '10.1.0.2/32', 'ip6_prefix': 'FC00:1::2/128'}]
+        fabric_info: [{'asicname': 'ASIC0', 'asic_id': 0, 'ip_prefix': '10.1.0.1/32', 'ip6_prefix': 'FC00:1::1/128'},
+                      {'asicname': 'ASIC1', 'asic_id': 1, 'ip_prefix': '10.1.0.2/32', 'ip6_prefix': 'FC00:1::2/128'}]
       }
 '''
 
@@ -55,6 +55,7 @@ def main():
             next_v4addr = str( ipaddress.IPv4Address(v4base + asic_id) )
             next_v6addr = str( ipaddress.IPv6Address(v6base + asic_id) )
             data = { 'asicname': key,
+                     'asic_id' : asic_id,
                      'ip_prefix': next_v4addr + "/" + v4pfx[-1],
                      'ip6_prefix': next_v6addr + "/" + v6pfx[-1] }
             fabric_info.append( data )

diff --git a/ansible/library/port_alias.py b/ansible/library/port_alias.py
@@ -104,8 +104,8 @@ def get_portmap(self, asic_id=None, include_internal=False,
         port_coreid_index = -1
         port_core_portid_index = -1
         num_voq_index = -1
-        # default to ASIC0 as minigraph.py parsing code has that assumption.
-        asic_name = "ASIC0" if asic_id is None else "ASIC" + str(asic_id)
+        # default to Asic0 as minigraph.py parsing code has that assumption.
+        asic_name = "Asic0" if asic_id is None else "asic" + str(asic_id)
 
         filename = self.get_portconfig_path(asic_id)
         if filename is None:
@@ -209,7 +209,7 @@ def main():
             include_internal=dict(required=False, type='bool', default=False),
             card_type=dict(type='str', required=False),
             hostname=dict(type='str', required=False),
-            start_switchid=dict(type='int', required=False)
+            switchids=dict(type='list', required=False)
         ),
         supports_check_mode=True
     )
@@ -235,10 +235,10 @@ def main():
                                            'sysports': sysports})
            return
         allmap = SonicPortAliasMap(m_args['hwsku'])
-        start_switchid = 0
-        if  'start_switchid' in m_args and m_args['start_switchid'] != None:
-           start_switchid = int(m_args['start_switchid'])
-        # When this script is invoked on sonic-mgmt docker, num_asic
+        switchids = None
+        if 'switchids' in m_args and m_args['switchids'] != None and len(m_args['switchids']):
+           switchids = m_args['switchids']
+        # When this script is invoked on sonic-mgmt docker, num_asic 
         # parameter is passed.
         if m_args['num_asic'] is not None:
             num_asic = m_args['num_asic']
@@ -264,8 +264,8 @@ def main():
         if 'hostname' in m_args:
             hostname = m_args['hostname']
         for asic_id in range(num_asic):
-            if asic_id is not None:
-                switchid = start_switchid + asic_id
+            if switchids and asic_id is not None:
+                switchid = switchids[asic_id]
             if num_asic == 1:
                 asic_id = None
             (aliases_asic, portmap_asic, aliasmap_asic, portspeed_asic, front_panel_asic, asicifnames_asic,

diff --git a/ansible/templates/minigraph_cpg.j2 b/ansible/templates/minigraph_cpg.j2
@@ -80,20 +80,40 @@
 {% endfor %}
 {% endif %}
 {% if switch_type is defined and switch_type == 'voq' %}
-{% for all_idx in range(all_inbands|length) %}
-{% if voq_inband_ip != all_inbands[all_idx] %}
+{% set voq_peers = dict() %}
+{% for asic_id in range(num_asics) %}
+{% if num_asics == 1 %}
+{% set start_rtr = inventory_hostname %}
+{% else %}
+{% set start_rtr = "ASIC" + asic_id|string %}
+{% endif %}
+{% for a_linecard in all_inbands %}
+{% for idx in range(all_inbands[a_linecard]|length) %}
+{% if voq_inband_ip[asic_id] != all_inbands[a_linecard][idx] %}
       <BGPSession>
-        <StartRouter>{{ inventory_hostname  }}</StartRouter>
-        <StartPeer>{{ voq_inband_ip.split('/')[0] }}</StartPeer>
-        <EndRouter>{{ all_hostnames[all_idx] }}</EndRouter>
-        <EndPeer>{{ all_inbands[all_idx].split('/')[0] }}</EndPeer>
+        <StartRouter>{{ start_rtr }}</StartRouter>
+        <StartPeer>{{ voq_inband_ip[asic_id].split('/')[0] }}</StartPeer>
+{% if all_inbands[a_linecard]|length == 1 %}
+{% set end_rtr = a_linecard %}
+{% else %}
+{% if a_linecard == inventory_hostname %}
+{% set end_rtr = "ASIC" + idx|string %}
+{% else %}
+{% set end_rtr = a_linecard + "-ASIC" + idx|string %}
+{% endif %}
+{% endif %}
+{% set _ = voq_peers.update({ all_inbands[a_linecard][idx].split('/')[0] : end_rtr }) %}
+        <EndRouter>{{ end_rtr }}</EndRouter>
+        <EndPeer>{{ all_inbands[a_linecard][idx].split('/')[0] }}</EndPeer>
         <Multihop>1</Multihop>
         <HoldTime>0</HoldTime>
         <KeepAliveTime>0</KeepAliveTime>
         <VoQChassisInternal>true</VoQChassisInternal>
       </BGPSession>
 {% endif %}
 {% endfor %}
+{% endfor %}
+{% endfor %}
 {% endif %}
     </PeeringSessions>
     <Routers xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
@@ -112,16 +132,14 @@
           </BGPPeer>
 {% endif %}
 {% endfor %}
-{% if switch_type is defined and switch_type == 'voq' %}
-{% for all_idx in range(all_inbands|length) %}
-{% if voq_inband_ip != all_inbands[all_idx] %}
+{% if num_asics == 1 and switch_type is defined and switch_type == 'voq' %}
+{% for a_voq_peer in voq_peers %}
           <BGPPeer>
-            <Address>{{ all_inbands[all_idx].split('/')[0] }}</Address>
+            <Address>{{ a_voq_peer }}</Address>
             <RouteMapIn i:nil="true"/>
             <RouteMapOut i:nil="true"/>
             <Vrf i:nil="true"/>
           </BGPPeer>
-{% endif %}
 {% endfor %}
 {% endif %}
 {% if 'tor' in vm_topo_config['dut_type'] | lower %}
@@ -147,17 +165,6 @@
         </a:Peers>
         <a:RouteMaps/>
       </a:BGPRouterDeclaration>
-{% if switch_type is defined and switch_type == 'voq' %}
-{% for all_idx in range(all_inbands|length) %}
-{% if voq_inband_ip != all_inbands[all_idx] %}
-      <a:BGPRouterDeclaration>
-        <a:ASN>{{ vm_topo_config['dut_asn'] }}</a:ASN>
-        <a:Hostname>{{ all_hostnames[all_idx]  }}</a:Hostname>
-        <a:RouteMaps/>
-      </a:BGPRouterDeclaration>
-{% endif %}
-{% endfor %}
-{% endif %}
 {% for index in range( vms_number) %}
 {% if vm_topo_config['vm'][vms[index]]['intfs'][dut_index|int]|length > 0 %}
       <a:BGPRouterDeclaration>
@@ -174,7 +181,7 @@
         <a:Hostname>{{ asic }}</a:Hostname>
         <a:Peers>
 {% for index in range( vms_number) %}
-{% if vm_asic_ifnames[vms[index]][0].split('-')[1] == asic %}
+{% if vms[index] in vm_asic_ifnames and vm_asic_ifnames[vms[index]][0].split('-')[1] == asic %}
           <BGPPeer>
             <Address>{{ vm_topo_config['vm'][vms[index]]['peer_ipv4'][dut_index|int] }}</Address>
             <RouteMapIn i:nil="true"/>
@@ -197,6 +204,52 @@
         <a:RouteMaps/>
       </a:BGPRouterDeclaration>
 {% endfor %}
+{% if switch_type is defined and switch_type == 'voq' %}
+{% for a_linecard in all_inbands %}
+{% if a_linecard != inventory_hostname %}
+{% for idx in range(all_inbands[a_linecard]|length) %}
+      <a:BGPRouterDeclaration>
+        <a:ASN>{{ vm_topo_config['dut_asn'] }}</a:ASN>
+        <a:Hostname>{{ voq_peers[all_inbands[a_linecard][idx].split('/')[0]] }}</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+{% endfor %}
+{% endif %}
+{% endfor %}
+{% if num_asics > 1 %}
+{% for asic_id in range(num_asics) %}
+{% set asic_name = "ASIC" + asic_id|string %}
+      <a:BGPRouterDeclaration>
+        <a:ASN>{{ vm_topo_config['dut_asn'] }}</a:ASN>
+        <a:Hostname>{{ asic_name }}</a:Hostname>
+        <a:Peers>
+{% for index in range( vms_number) %}
+{% if vms[index] in vm_asic_ifnames and vm_asic_ifnames[vms[index]][0].split('-')[1] == asic_name %}
+          <BGPPeer>
+            <Address>{{ vm_topo_config['vm'][vms[index]]['peer_ipv4'][dut_index|int] }}</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+{% endif %}
+{% endfor %}
+{% for a_linecard in all_inbands %}
+{% for idx in range(all_inbands[a_linecard]|length) %}
+{% if voq_inband_ip[asic_id] != all_inbands[a_linecard][idx] %}
+          <BGPPeer>
+            <Address>{{ all_inbands[a_linecard][idx] }}</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+            <Vrf i:nil="true"/>
+          </BGPPeer>
+{% endif %}
+{% endfor %}
+{% endfor %}
+        </a:Peers>
+      </a:BGPRouterDeclaration>
+{% endfor %}
+{% endif %}
+{% endif %}
     </Routers>
   </CpgDec>