matthew/sonic-buildimage
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Minigraph resource type changes (#5198)"

Browse Source 
This reverts commit f42f325f09.
This commit is contained in:
Abhishek Dosi 2022-08-01 17:13:53 +00:00
parent 5ff90316be
commit b6e8d38fc4
3 changed files with 2 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/sonic-config-engine/minigraph.py
View File

@ -615,7 +615,6 @@ def parse_meta(meta, hname):
cloudtype = None cloudtype = None
downstream_subrole = None downstream_subrole = None
qos_profile = None qos_profile = None
resource_type = None
device_metas = meta.find(str(QName(ns, "Devices"))) device_metas = meta.find(str(QName(ns, "Devices")))
for device in device_metas.findall(str(QName(ns1, "DeviceMetadata"))): for device in device_metas.findall(str(QName(ns1, "DeviceMetadata"))):
if device.find(str(QName(ns1, "Name"))).text.lower() == hname.lower(): if device.find(str(QName(ns1, "Name"))).text.lower() == hname.lower():
@ -646,9 +645,7 @@ def parse_meta(meta, hname):
downstream_subrole = value downstream_subrole = value
elif name == "SonicQosProfile": elif name == "SonicQosProfile":
qos_profile = value qos_profile = value
elif name == "ResourceType": return syslog_servers, dhcp_servers, ntp_servers, tacacs_servers, mgmt_routes, erspan_dst, deployment_id, region, cloudtype, downstream_subrole, qos_profile
resource_type = value
return syslog_servers, dhcp_servers, ntp_servers, tacacs_servers, mgmt_routes, erspan_dst, deployment_id, region, cloudtype, downstream_subrole, qos_profile, resource_type
def parse_linkmeta(meta, hname): def parse_linkmeta(meta, hname):
@ -927,7 +924,6 @@ def parse_xml(filename, platform=None, port_config_file=None, asic_name=None):
devices = None devices = None
sub_role = None sub_role = None
downstream_subrole = None downstream_subrole = None
resource_type = None
docker_routing_config_mode = "separated" docker_routing_config_mode = "separated"
port_speeds_default = {} port_speeds_default = {}
port_speed_png = {} port_speed_png = {}
@ -985,7 +981,7 @@ def parse_xml(filename, platform=None, port_config_file=None, asic_name=None):
elif child.tag == str(QName(ns, "UngDec")): elif child.tag == str(QName(ns, "UngDec")):
(u_neighbors, u_devices, _, _, _, _, _, _) = parse_png(child, hostname) (u_neighbors, u_devices, _, _, _, _, _, _) = parse_png(child, hostname)
elif child.tag == str(QName(ns, "MetadataDeclaration")): elif child.tag == str(QName(ns, "MetadataDeclaration")):
(syslog_servers, dhcp_servers, ntp_servers, tacacs_servers, mgmt_routes, erspan_dst, deployment_id, region, cloudtype, downstream_subrole, qos_profile, resource_type) = parse_meta(child, hostname) (syslog_servers, dhcp_servers, ntp_servers, tacacs_servers, mgmt_routes, erspan_dst, deployment_id, region, cloudtype, downstream_subrole, qos_profile) = parse_meta(child, hostname)
elif child.tag == str(QName(ns, "LinkMetadataDeclaration")): elif child.tag == str(QName(ns, "LinkMetadataDeclaration")):
linkmetas = parse_linkmeta(child, hostname) linkmetas = parse_linkmeta(child, hostname)
elif child.tag == str(QName(ns, "DeviceInfos")): elif child.tag == str(QName(ns, "DeviceInfos")):
@ -1037,8 +1033,6 @@ def parse_xml(filename, platform=None, port_config_file=None, asic_name=None):
if downstream_subrole is not None: if downstream_subrole is not None:
results['DEVICE_METADATA']['localhost']['downstream_subrole'] = downstream_subrole results['DEVICE_METADATA']['localhost']['downstream_subrole'] = downstream_subrole
if resource_type is not None:
results['DEVICE_METADATA']['localhost']['resource_type'] = resource_type
results['BGP_NEIGHBOR'] = bgp_sessions results['BGP_NEIGHBOR'] = bgp_sessions
results['BGP_MONITORS'] = bgp_monitors results['BGP_MONITORS'] = bgp_monitors

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

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

5
src/sonic-config-engine/tests/test_cfggen.py
View File

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