Parser changes to support parsing of multi-asic device minigraph

src/sonic-config-engine/minigraph.py

@@ -75,7 +75,7 @@ def parse_device(device):
             deployment_id = node.text
     return (lo_prefix, mgmt_prefix, name, hwsku, d_type, deployment_id)
 
-def parse_png(png, hname):
+def parse_png(png, hname, device_hostname):
     neighbors = {}
     devices = {}
     console_dev = ''
@@ -84,6 +84,7 @@ def parse_png(png, hname):
     mgmt_port = ''
     port_speeds = {}
     console_ports = {}
+    device_neighbors = []
     for child in png:
         if child.tag == str(QName(ns, "DeviceInterfaceLinks")):
             for link in child.findall(str(QName(ns, "DeviceLinkBase"))):
@@ -101,7 +102,7 @@ def parse_png(png, hname):
                             'baud_rate': baudrate,
                             'flow_control': flowcontrol
                             }
-                    else:
+                    if startdevice.lower() == hname.lower():
                         console_ports[startport] = {
                             'remote_device': enddevice,
                             'baud_rate': baudrate,
@@ -118,19 +119,51 @@ def parse_png(png, hname):
                 startport = link.find(str(QName(ns, "StartPort"))).text
                 bandwidth_node = link.find(str(QName(ns, "Bandwidth")))
                 bandwidth = bandwidth_node.text if bandwidth_node is not None else None
-
-                if enddevice.lower() == hname.lower():
-                    if port_alias_map.has_key(endport):
-                        endport = port_alias_map[endport]
-                    neighbors[endport] = {'name': startdevice, 'port': startport}
-                    if bandwidth:
-                        port_speeds[endport] = bandwidth
+                # Chassis internal node is used in multi-asic device or chassis minigraph
+                # where the minigraph will contain the internal asic connectivity and
+                # external neighbor information. The ChassisInternal node will be used to 
+                # determine if the link is internal to the device or chassis.
+                chassis_internal_node = link.find(str(QName(ns, "ChassisInternal")))
+                chassis_internal = chassis_internal_node.text if chassis_internal_node is not None else "false"
+
+                # if hname is ASIC name and the link is an external link
+                # include the external neighbor inforamtion in ASIC ports table 
+                if chassis_internal == "false" and hname.lower() != device_hostname.lower():
+                    if (enddevice.lower() == device_hostname.lower()):
+                        if ((port_alias_asic_map.has_key(endport)) and
+                                (hname.lower() in port_alias_asic_map[endport].lower())):
+                            endport = port_alias_asic_map[endport]
+                            neighbors[port_alias_map[endport]] = {'name': startdevice, 'port': startport}
+                            device_neighbors.append(startdevice)
+                            if bandwidth:
+                                port_speeds[port_alias_map[endport]] = bandwidth
+
+                    if (startdevice.lower() == device_hostname.lower()):
+                        if ((port_alias_asic_map.has_key(startport)) and
+                               (hname.lower() in port_alias_asic_map[startport].lower())):
+                            startport = port_alias_asic_map[startport]
+                            neighbors[port_alias_map[startport]] = {'name': enddevice, 'port': endport}
+                            device_neighbors.append(enddevice)
+                            if bandwidth:
+                                port_speeds[port_alias_map[startport]] = bandwidth
                 else:
-                    if port_alias_map.has_key(startport):
-                        startport = port_alias_map[startport]
-                    neighbors[startport] = {'name': enddevice, 'port': endport}
-                    if bandwidth:
-                        port_speeds[startport] = bandwidth
+                    if ((enddevice.lower() == hname.lower()) and
+                        (startdevice.lower() != device_hostname.lower())):
+                        if port_alias_map.has_key(endport):
+                            endport = port_alias_map[endport]
+                        neighbors[endport] = {'name': startdevice, 'port': startport}
+                        device_neighbors.append(startdevice)
+                        if bandwidth:
+                            port_speeds[endport] = bandwidth
+
+                    if ((startdevice.lower() == hname.lower()) and
+                        (enddevice.lower() != device_hostname.lower())):
+                        if port_alias_map.has_key(startport):
+                            startport = port_alias_map[startport]
+                        neighbors[startport] = {'name': enddevice, 'port': endport}
+                        device_neighbors.append(enddevice)
+                        if bandwidth:
+                            port_speeds[startport] = bandwidth
 
         if child.tag == str(QName(ns, "Devices")):
             for device in child.findall(str(QName(ns, "Device"))):
@@ -157,10 +190,19 @@ def parse_png(png, hname):
                             elif node.tag == str(QName(ns, "EndDevice")):
                                 mgmt_dev = node.text
 
-    return (neighbors, devices, console_dev, console_port, mgmt_dev, mgmt_port, port_speeds, console_ports)
+    return (neighbors, devices, console_dev, console_port, mgmt_dev, mgmt_port, port_speeds, console_ports, device_neighbors)
+
 
+def parse_dpg(dpg, hname, device_hostname):
 
-def parse_dpg(dpg, hname):
+    #In Multi-NPU platforms the acl intfs are defined for only for the host.
+    # to get the aclintfs node first.
+    for child in dpg:
+
+        aclintfs = child.find(str(QName(ns, "AclInterfaces")))
+        if aclintfs is not None:
+            break 
+
     for child in dpg:
         hostname = child.find(str(QName(ns, "Hostname")))
         if hostname.text.lower() != hname.lower():
@@ -254,7 +296,7 @@ def parse_dpg(dpg, hname):
                 vlan_attributes['alias'] = vintfname
             vlans[sonic_vlan_name] = vlan_attributes
 
-        aclintfs = child.find(str(QName(ns, "AclInterfaces")))
+                 
         acls = {}
         for aclintf in aclintfs.findall(str(QName(ns, "AclInterface"))):
             if aclintf.find(str(QName(ns, "InAcl"))) is not None:
@@ -369,7 +411,7 @@ def parse_cpg(cpg, hname):
                         'keepalive': keepalive,
                         'nhopself': nhopself
                     }
-                else:
+                if start_router.lower() == hname.lower():
                     bgp_sessions[end_peer.lower()] = {
                         'name': end_router,
                         'local_addr': start_peer.lower(),
@@ -419,6 +461,7 @@ def parse_meta(meta, hname):
     mgmt_routes = []
     erspan_dst = []
     deployment_id = None
+    sub_role = None
     device_metas = meta.find(str(QName(ns, "Devices")))
     for device in device_metas.findall(str(QName(ns1, "DeviceMetadata"))):
         if device.find(str(QName(ns1, "Name"))).text.lower() == hname.lower():
@@ -441,7 +484,9 @@ def parse_meta(meta, hname):
                     erspan_dst = value_group
                 elif name == "DeploymentId":
                     deployment_id = value
-    return syslog_servers, dhcp_servers, ntp_servers, tacacs_servers, mgmt_routes, erspan_dst, deployment_id
+                elif name == "SubRole":
+                    sub_role = value
+    return syslog_servers, dhcp_servers, ntp_servers, tacacs_servers, mgmt_routes, erspan_dst, deployment_id, sub_role
 
 def parse_deviceinfo(meta, hwsku):
     port_speeds = {}
@@ -518,7 +563,7 @@ def parse_spine_chassis_fe(results, vni, lo_intfs, phyport_intfs, pc_intfs, pc_m
             if pc_member[0] == pc_intf:
                 intf_name = pc_member[1]
                 break 
-
+        
         if intf_name == None:
             print >> sys.stderr, 'Warning: cannot find any interfaces that belong to %s' % (pc_intf)
             continue
@@ -564,8 +609,11 @@ def filter_acl_mirror_table_bindings(acls, neighbors, port_channels):
 # Main functions
 #
 ###############################################################################
-
-def parse_xml(filename, platform=None, port_config_file=None):
+# hostname paramter: To parse minigraph.xml that contains multiple hosts 
+# information, like in case of multi-asic device or chassis device, this 
+# parameter can be used to specify the specific hostname for which configuration
+# has to be generated.
+def parse_xml(filename, platform=None, port_config_file=None, hostname=None):
     root = ET.parse(filename).getroot()
     mini_graph_path = filename
 
@@ -585,7 +633,7 @@ def parse_xml(filename, platform=None, port_config_file=None):
     lo_intfs = None
     neighbors = None
     devices = None
-    hostname = None
+    sub_role = None
     docker_routing_config_mode = "separated"
     port_speeds_default = {}
     port_speed_png = {}
@@ -600,34 +648,47 @@ def parse_xml(filename, platform=None, port_config_file=None):
     bgp_peers_with_range = None
     deployment_id = None
 
-    hwsku_qn = QName(ns, "HwSku")
+
+    #hostname is the asic_name, get the asic_id from the asic_name
+    if hostname is not None:
+        asic_id = hostname[-1]
+    else:
+        asic_id = None
+
+    hwsku_qn = QName(ns, "HwSku") 
     hostname_qn = QName(ns, "Hostname")
     docker_routing_config_mode_qn = QName(ns, "DockerRoutingConfigMode")
     for child in root:
         if child.tag == str(hwsku_qn):
             hwsku = child.text
         if child.tag == str(hostname_qn):
-            hostname = child.text
+            device_hostname = child.text
         if child.tag == str(docker_routing_config_mode_qn):
             docker_routing_config_mode = child.text
 
-    (ports, alias_map) = get_port_config(hwsku, platform, port_config_file)
+    if hostname is None:
+        hostname = device_hostname
+
+    (ports, alias_map, alias_asic_map) = get_port_config(hwsku=hwsku, platform=platform, port_config_file=port_config_file, asic=asic_id)
     port_alias_map.update(alias_map)
+    port_alias_asic_map.update(alias_asic_map)
+
     for child in root:
         if child.tag == str(QName(ns, "DpgDec")):
-            (intfs, lo_intfs, mvrf, mgmt_intf, vlans, vlan_members, pcs, pc_members, acls, vni) = parse_dpg(child, hostname)
+            (intfs, lo_intfs, mvrf, mgmt_intf, vlans, vlan_members, pcs, pc_members, acls, vni) = parse_dpg(child, hostname, device_hostname)
         elif child.tag == str(QName(ns, "CpgDec")):
             (bgp_sessions, bgp_asn, bgp_peers_with_range, bgp_monitors) = parse_cpg(child, hostname)
         elif child.tag == str(QName(ns, "PngDec")):
-            (neighbors, devices, console_dev, console_port, mgmt_dev, mgmt_port, port_speed_png, console_ports) = parse_png(child, hostname)
+            (neighbors, devices, console_dev, console_port, mgmt_dev, mgmt_port, port_speed_png, console_ports, device_neighbors) = parse_png(child, hostname, device_hostname)
         elif child.tag == str(QName(ns, "UngDec")):
-            (u_neighbors, u_devices, _, _, _, _, _, _) = parse_png(child, hostname)
+            (u_neighbors, u_devices, _, _, _, _, _, _, _) = parse_png(child, hostname, device_hostname)
         elif child.tag == str(QName(ns, "MetadataDeclaration")):
-            (syslog_servers, dhcp_servers, ntp_servers, tacacs_servers, mgmt_routes, erspan_dst, deployment_id) = parse_meta(child, hostname)
+            (syslog_servers, dhcp_servers, ntp_servers, tacacs_servers, mgmt_routes, erspan_dst, deployment_id, sub_role) = parse_meta(child, hostname)
         elif child.tag == str(QName(ns, "DeviceInfos")):
             (port_speeds_default, port_descriptions) = parse_deviceinfo(child, hwsku)
 
     current_device = [devices[key] for key in devices if key.lower() == hostname.lower()][0]
+
     results = {}
     results['DEVICE_METADATA'] = {'localhost': {
         'bgp_asn': bgp_asn,
@@ -638,6 +699,11 @@ def parse_xml(filename, platform=None, port_config_file=None):
         'type': current_device['type']
         }
     }
+    # for this hostname, if sub_role is defined, add sub_role in 
+    # device_metadata
+    if sub_role is not None:
+        current_device['sub_role'] = sub_role
+        results['DEVICE_METADATA']['localhost']['sub_role'] =  sub_role
     results['BGP_NEIGHBOR'] = bgp_sessions
     results['BGP_MONITORS'] = bgp_monitors
     results['BGP_PEER_RANGE'] = bgp_peers_with_range
@@ -698,9 +764,11 @@ def parse_xml(filename, platform=None, port_config_file=None):
 
     for port_name in port_speed_png:
         # not consider port not in port_config.ini
-        if port_name not in ports:
-            print >> sys.stderr, "Warning: ignore interface '%s' as it is not in the port_config.ini" % port_name
-            continue
+        #If no port_config_file is found ports is empty so ignore this error
+        if port_config_file is not None:
+            if port_name not in ports:
+                print >> sys.stderr, "Warning: ignore interface '%s' as it is not in the port_config.ini" % port_name
+                continue
 
         ports.setdefault(port_name, {})['speed'] = port_speed_png[port_name]
 
@@ -804,11 +872,12 @@ def parse_xml(filename, platform=None, port_config_file=None):
     for nghbr in neighbors.keys():
         # remove port not in port_config.ini
         if nghbr not in ports:
-            print >> sys.stderr, "Warning: ignore interface '%s' in DEVICE_NEIGHBOR as it is not in the port_config.ini" % nghbr
+            if port_config_file is not None:
+                print >> sys.stderr, "Warning: ignore interface '%s' in DEVICE_NEIGHBOR as it is not in the port_config.ini" % nghbr
             del neighbors[nghbr]
 
     results['DEVICE_NEIGHBOR'] = neighbors
-    results['DEVICE_NEIGHBOR_METADATA'] = { key:devices[key] for key in devices if key.lower() != hostname.lower() }
+    results['DEVICE_NEIGHBOR_METADATA'] = { key:devices[key] for key in devices if key in device_neighbors }
     results['SYSLOG_SERVER'] = dict((item, {}) for item in syslog_servers)
     results['DHCP_SERVER'] = dict((item, {}) for item in dhcp_servers)
     results['NTP_SERVER'] = dict((item, {}) for item in ntp_servers)
@@ -873,8 +942,17 @@ def parse_device_desc_xml(filename):
 
     return results
 
+def parse_asic_sub_role(filename, asic_name):
+    if not os.path.isfile(filename):
+        return None
+    root = ET.parse(filename).getroot()
+    for child in root:
+        if child.tag == str(QName(ns, "MetadataDeclaration")):
+             _, _, _, _, _, _, _, sub_role = parse_meta(child, asic_name)
+	     return sub_role
 
 port_alias_map = {}
+port_alias_asic_map = {}
 
 
 def print_parse_xml(filename):

src/sonic-config-engine/portconfig.py

@@ -3,11 +3,13 @@
 import sys
 
 
-def get_port_config_file_name(hwsku=None, platform=None):
+def get_port_config_file_name(hwsku=None, platform=None, asic=None):
     port_config_candidates = []
     port_config_candidates.append('/usr/share/sonic/hwsku/port_config.ini')
     if hwsku:
         if platform:
+            if asic:
+                port_config_candidates.append(os.path.join('/usr/share/sonic/device', platform, hwsku, asic,'port_config.ini'))
             port_config_candidates.append(os.path.join('/usr/share/sonic/device', platform, hwsku, 'port_config.ini'))
         port_config_candidates.append(os.path.join('/usr/share/sonic/platform', hwsku, 'port_config.ini'))
         port_config_candidates.append(os.path.join('/usr/share/sonic', hwsku, 'port_config.ini'))
@@ -17,17 +19,19 @@ def get_port_config_file_name(hwsku=None, platform=None):
     return None
 
 
-def get_port_config(hwsku=None, platform=None, port_config_file=None):
+
+def get_port_config(hwsku=None, platform=None, port_config_file=None, asic=None):
     if not port_config_file:
-        port_config_file = get_port_config_file_name(hwsku, platform)
+        port_config_file = get_port_config_file_name(hwsku, platform, asic)
         if not port_config_file:
-            return ({}, {})
+            return ({}, {}, {})
     return parse_port_config_file(port_config_file)
 
 
 def parse_port_config_file(port_config_file):
     ports = {}
     port_alias_map = {}
+    port_alias_asic_map = {}
     # Default column definition
     titles = ['name', 'lanes', 'alias', 'index']
     with open(port_config_file) as data:
@@ -49,6 +53,14 @@ def parse_port_config_file(port_config_file):
             data.setdefault('alias', name)
             ports[name] = data
             port_alias_map[data['alias']] = name
-    return (ports, port_alias_map)
+            # asic_port_name to sonic_name mapping also included in
+            # port_alias_map
+            if (('asic_port_name' in data) and
+                (data['asic_port_name'] != name)):
+                port_alias_map[data['asic_port_name']] = name
+            # alias to asic_port_name mapping
+            if 'asic_port_name' in data:
+                port_alias_asic_map[data['alias']] = data['asic_port_name'].strip()
+    return (ports, port_alias_map, port_alias_asic_map)