From b6e8d38fc492e8dd3bd7dad7ae3c3a6c41d665d4 Mon Sep 17 00:00:00 2001
From: Abhishek Dosi <abdosi@microsoft.com>
Date: Mon, 1 Aug 2022 17:13:53 +0000
Subject: [PATCH] Revert "Minigraph resource type changes (#5198)"

This reverts commit f42f325f09f699178353060b85fc33f9cbdba6d9.
---
 src/sonic-config-engine/minigraph.py                   | 10 ++--------
 .../tests/simple-sample-graph-metadata.xml             |  3 ---
 src/sonic-config-engine/tests/test_cfggen.py           |  5 -----
 3 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/src/sonic-config-engine/minigraph.py b/src/sonic-config-engine/minigraph.py
index 67356d0b1c..abdc074745 100644
--- a/src/sonic-config-engine/minigraph.py
+++ b/src/sonic-config-engine/minigraph.py
@@ -615,7 +615,6 @@ def parse_meta(meta, hname):
     cloudtype = None
     downstream_subrole = None
     qos_profile = None
-    resource_type = 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():
@@ -646,9 +645,7 @@ def parse_meta(meta, hname):
                     downstream_subrole = value
                 elif name == "SonicQosProfile":
                     qos_profile = value
-                elif name == "ResourceType":
-                    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
+    return syslog_servers, dhcp_servers, ntp_servers, tacacs_servers, mgmt_routes, erspan_dst, deployment_id, region, cloudtype, downstream_subrole, qos_profile
 
 
 def parse_linkmeta(meta, hname):
@@ -927,7 +924,6 @@ def parse_xml(filename, platform=None, port_config_file=None, asic_name=None):
     devices = None
     sub_role = None
     downstream_subrole = None
-    resource_type = None
     docker_routing_config_mode = "separated"
     port_speeds_default = {}
     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")):
                 (u_neighbors, u_devices, _, _, _, _, _, _) = parse_png(child, hostname)
             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")):
                 linkmetas = parse_linkmeta(child, hostname)
             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:
         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_MONITORS'] = bgp_monitors
diff --git a/src/sonic-config-engine/tests/simple-sample-graph-metadata.xml b/src/sonic-config-engine/tests/simple-sample-graph-metadata.xml
index 5520226320..49e3fc699a 100644
--- a/src/sonic-config-engine/tests/simple-sample-graph-metadata.xml
+++ b/src/sonic-config-engine/tests/simple-sample-graph-metadata.xml
@@ -257,9 +257,6 @@
      <a:Name>DownStreamSubRole</a:Name>
      <a:Reference i:nil="true"/>
      <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:Properties>
   </a:DeviceMetadata>
diff --git a/src/sonic-config-engine/tests/test_cfggen.py b/src/sonic-config-engine/tests/test_cfggen.py
index da8c88fd70..2583132074 100644
--- a/src/sonic-config-engine/tests/test_cfggen.py
+++ b/src/sonic-config-engine/tests/test_cfggen.py
@@ -82,11 +82,6 @@ class TestCfgGen(TestCase):
         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_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):
         argument = '-m "' + self.sample_graph + '" --print-data'