From cfdf077be56381dfa63d362d00b15631b98221af Mon Sep 17 00:00:00 2001
From: Abhishek Dosi <abdosi@microsoft.com>
Date: Tue, 22 Oct 2024 00:48:21 +0000
Subject: [PATCH] More Changes

Signed-off-by: Abhishek Dosi <abdosi@microsoft.com>
---
 .../voq_chassis_lc_multi_asic.xml             |  4 +--
 .../tests/test_chassis_cfggen.py              |  9 ++++--
 .../tests_config/device_metadata.json         | 29 ++++++++++++++++++-
 3 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/src/sonic-config-engine/tests/chassis_data/voq_chassis_data/voq_chassis_lc_multi_asic.xml b/src/sonic-config-engine/tests/chassis_data/voq_chassis_data/voq_chassis_lc_multi_asic.xml
index 2bbf8868da5e..f19e6adbb716 100644
--- a/src/sonic-config-engine/tests/chassis_data/voq_chassis_data/voq_chassis_lc_multi_asic.xml
+++ b/src/sonic-config-engine/tests/chassis_data/voq_chassis_data/voq_chassis_lc_multi_asic.xml
@@ -44009,7 +44009,7 @@
                     <a:DeviceProperty>
                         <a:Name>MacSecEnabled</a:Name>
                         <a:Reference i:nil="true" />
-                        <a:Value>True</a:Value>
+                        <a:Value>False</a:Value>
                     </a:DeviceProperty>
                     <a:DeviceProperty>
                         <a:Name>OsVersion</a:Name>
@@ -48335,4 +48335,4 @@
     <HwSku>Sonic-400g-lc-sku</HwSku>
     <Version>1.0.1388.35297&#xD;
 </Version>
-</DeviceMiniGraph>
\ No newline at end of file
+</DeviceMiniGraph>
diff --git a/src/sonic-config-engine/tests/test_chassis_cfggen.py b/src/sonic-config-engine/tests/test_chassis_cfggen.py
index 83d4be6f3550..8f7eee3f6908 100644
--- a/src/sonic-config-engine/tests/test_chassis_cfggen.py
+++ b/src/sonic-config-engine/tests/test_chassis_cfggen.py
@@ -138,7 +138,8 @@ def test_device_metadata(self):
             'switch_type': 'voq',
             'switch_id': 20,
             'max_cores': 64,
-            'slice_type': 'AZNG_Production'})
+            'slice_type': 'AZNG_Production',
+            'sub_type': 'UpstreamLC'})
 
     def test_port(self):
         argument = ['-m', self.sample_graph, '-p',
@@ -445,7 +446,8 @@ def test_device_metadata(self):
             'deployment_id': '3',
             'cluster': 'TestbedForstr-sonic',
             'switch_type': 'voq',
-            'max_cores': 64})
+            'max_cores': 64,
+            'sub_type': 'DownstreamLC'})
 
     def test_device_metadata_for_namespace(self):
         argument = [
@@ -922,7 +924,8 @@ def test_device_metadata(self):
                 "cluster": "TestbedForstr-sonic",
                 "switch_type": "fabric",
                 "sub_role": "fabric",
-                "max_cores": 64
+                "max_cores": 64,
+                "sub_type": "Supervisor"
             }
         )
 
diff --git a/src/sonic-yang-models/tests/yang_model_tests/tests_config/device_metadata.json b/src/sonic-yang-models/tests/yang_model_tests/tests_config/device_metadata.json
index 5d0e0201b4ff..44f0966c8b18 100644
--- a/src/sonic-yang-models/tests/yang_model_tests/tests_config/device_metadata.json
+++ b/src/sonic-yang-models/tests/yang_model_tests/tests_config/device_metadata.json
@@ -256,7 +256,7 @@
             }
         }
     },
-    "DEVICE_METADATA_VALID_SUBTYPE": {
+    "DEVICE_METADATA_VALID_SUBTYPE0": {
         "sonic-device_metadata:sonic-device_metadata": {
             "sonic-device_metadata:DEVICE_METADATA": {
                 "sonic-device_metadata:localhost": {
@@ -265,6 +265,33 @@
             }
         }
     },
+    "DEVICE_METADATA_VALID_SUBTYPE1": {
+        "sonic-device_metadata:sonic-device_metadata": {
+            "sonic-device_metadata:DEVICE_METADATA": {
+                "sonic-device_metadata:localhost": {
+                    "subtype": "Supervisor"
+                }
+            }
+        }
+    },
+    "DEVICE_METADATA_VALID_SUBTYPE2": {
+        "sonic-device_metadata:sonic-device_metadata": {
+            "sonic-device_metadata:DEVICE_METADATA": {
+                "sonic-device_metadata:localhost": {
+                    "subtype": "UpstreamLC"
+                }
+            }
+        }
+    },
+    "DEVICE_METADATA_VALID_SUBTYPE3": {
+        "sonic-device_metadata:sonic-device_metadata": {
+            "sonic-device_metadata:DEVICE_METADATA": {
+                "sonic-device_metadata:localhost": {
+                    "subtype": "DownstreamLC"
+                }
+            }
+        }
+    },
     "DEVICE_METADATA_INVALID_SUBTYPE": {
         "sonic-device_metadata:sonic-device_metadata": {
             "sonic-device_metadata:DEVICE_METADATA": {