[minigraph] Add downstreamsubrole parsing to minigraph.py

src/sonic-config-engine/minigraph.py

@@ -787,6 +787,7 @@ def parse_meta(meta, hname):
  region = None
  cloudtype = None
  resource_type = None
+ downstream_subrole = None
  kube_data = {}
  device_metas = meta.find(str(QName(ns, "Devices")))
  for device in device_metas.findall(str(QName(ns1, "DeviceMetadata"))):
@@ -816,11 +817,13 @@ def parse_meta(meta, hname):
  cloudtype = value
  elif name == "ResourceType":
  resource_type = value
+ elif name == "DownStreamSubRole":
+ downstream_subrole = value
  elif name == "KubernetesEnabled":
  kube_data["enable"] = value
  elif name == "KubernetesServerIp":
  kube_data["ip"] = value
- return syslog_servers, dhcp_servers, ntp_servers, tacacs_servers, mgmt_routes, erspan_dst, deployment_id, region, cloudtype, resource_type, kube_data
+ return syslog_servers, dhcp_servers, ntp_servers, tacacs_servers, mgmt_routes, erspan_dst, deployment_id, region, cloudtype, resource_type, downstream_subrole, kube_data
 
 
 def parse_linkmeta(meta, hname):
@@ -1093,6 +1096,7 @@ def parse_xml(filename, platform=None, port_config_file=None, asic_name=None, hw
  devices = None
  sub_role = None
  resource_type = None
+ downstream_subrole = None
  docker_routing_config_mode = "separated"
  port_speeds_default = {}
  port_speed_png = {}
@@ -1151,7 +1155,7 @@ def parse_xml(filename, platform=None, port_config_file=None, asic_name=None, hw
  elif child.tag == str(QName(ns, "UngDec")):
  (u_neighbors, u_devices, _, _, _, _, _, _) = parse_png(child, hostname, None)
  elif child.tag == str(QName(ns, "MetadataDeclaration")):
- (syslog_servers, dhcp_servers, ntp_servers, tacacs_servers, mgmt_routes, erspan_dst, deployment_id, region, cloudtype, resource_type, kube_data) = parse_meta(child, hostname)
+ (syslog_servers, dhcp_servers, ntp_servers, tacacs_servers, mgmt_routes, erspan_dst, deployment_id, region, cloudtype, resource_type, downstream_subrole, kube_data) = parse_meta(child, hostname)
  elif child.tag == str(QName(ns, "LinkMetadataDeclaration")):
  linkmetas = parse_linkmeta(child, hostname)
  elif child.tag == str(QName(ns, "DeviceInfos")):
@@ -1226,6 +1230,9 @@ def parse_xml(filename, platform=None, port_config_file=None, asic_name=None, hw
  if resource_type is not None:
  results['DEVICE_METADATA']['localhost']['resource_type'] = resource_type
 
+ if downstream_subrole is not None:
+ results['DEVICE_METADATA']['localhost']['downstream_subrole'] = downstream_subrole
+
  results['BGP_NEIGHBOR'] = bgp_sessions
  results['BGP_MONITORS'] = bgp_monitors
  results['BGP_PEER_RANGE'] = bgp_peers_with_range

src/sonic-config-engine/tests/simple-sample-graph-metadata.xml

@@ -258,6 +258,11 @@
  <a:Reference i:nil="true"/>
  <a:Value>resource_type_x</a:Value>
  </a:DeviceProperty>
+ <a:DeviceProperty>
+ <a:Name>DownStreamSubRole</a:Name>
+ <a:Reference i:nil="true"/>
+ <a:Value>downstream_subrole_y</a:Value>
+ </a:DeviceProperty>
  </a:Properties>
  </a:DeviceMetadata>
  </Devices>

src/sonic-config-engine/tests/test_cfggen.py

@@ -88,6 +88,11 @@ def test_minigraph_resourcetype(self):
  output = self.run_script(argument)
  self.assertEqual(output.strip(), 'resource_type_x')
 
+ def test_minigraph_downstream_subrole(self):
+ argument = '-v "DEVICE_METADATA[\'localhost\'][\'downstream_subrole\']" -m "' + self.sample_graph_metadata + '"'
+ output = self.run_script(argument)
+ self.assertEqual(output.strip(), 'downstream_subrole_y')
+
  def test_print_data(self):
  argument = '-m "' + self.sample_graph + '" --print-data'
  output = self.run_script(argument)