From cd26122dd6eb3434d06a13a0e2666e4c714b3fef Mon Sep 17 00:00:00 2001
From: Anish Narsian <44376847+anish-n@users.noreply.github.com>
Date: Fri, 14 Jan 2022 15:37:20 -0800
Subject: [PATCH] [Yang] Add resource_type and downstream_subrole to yang model
 (#9696)

#### Why I did it
As a fix for https://github.com/Azure/sonic-buildimage/issues/9574

#### How I did it
Enhance yang model for networking-metadata

#### How to verify it
Unit testing
---
 .../tests/device_metadata.json                 |  6 ++++++
 .../tests_config/device_metadata.json          | 18 ++++++++++++++++++
 .../yang-models/sonic-device_metadata.yang     |  8 ++++++++
 3 files changed, 32 insertions(+)

diff --git a/src/sonic-yang-models/tests/yang_model_tests/tests/device_metadata.json b/src/sonic-yang-models/tests/yang_model_tests/tests/device_metadata.json
index 070495b8df33..41a30e18965f 100644
--- a/src/sonic-yang-models/tests/yang_model_tests/tests/device_metadata.json
+++ b/src/sonic-yang-models/tests/yang_model_tests/tests/device_metadata.json
@@ -60,6 +60,12 @@
     },
     "DEVICE_METADATA_CORRECT_CLOUDTYPE_REGION_CONFIG": {
         "desc": "Verifying cloudtype and region configuration."
+    },
+    "DEVICE_METADATA_DOWNSTREAM_SUBROLE_CONFIG": {
+        "desc": "Verifying downstream subrole configuration."
+    },
+    "DEVICE_METADATA_RESOURCE_TYPE_CONFIG": {
+        "desc": "Verifying resource type configuration."
     },
 	"DEVICE_METADATA_VALID_SUBTYPE": {
 		"desc": "Verifying valid subtype value"
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 950d9d874c24..50016176b7da 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
@@ -160,6 +160,24 @@
             }
         }
     },
+    "DEVICE_METADATA_DOWNSTREAM_SUBROLE_CONFIG": {
+        "sonic-device_metadata:sonic-device_metadata": {
+            "sonic-device_metadata:DEVICE_METADATA": {
+                "sonic-device_metadata:localhost": {
+                    "downstream_subrole": "downstream_subrole_y"
+                }
+            }
+        }
+    },
+    "DEVICE_METADATA_RESOURCE_TYPE_CONFIG": {
+        "sonic-device_metadata:sonic-device_metadata": {
+            "sonic-device_metadata:DEVICE_METADATA": {
+                "sonic-device_metadata:localhost": {
+                    "resource_type": "resource_type_x"
+                }
+            }
+        }
+    },
     "DEVICE_METADATA_VALID_SUBTYPE": {
         "sonic-device_metadata:sonic-device_metadata": {
             "sonic-device_metadata:DEVICE_METADATA": {
diff --git a/src/sonic-yang-models/yang-models/sonic-device_metadata.yang b/src/sonic-yang-models/yang-models/sonic-device_metadata.yang
index 8c736997e172..32e6b063e5b1 100644
--- a/src/sonic-yang-models/yang-models/sonic-device_metadata.yang
+++ b/src/sonic-yang-models/yang-models/sonic-device_metadata.yang
@@ -127,6 +127,14 @@ module sonic-device_metadata {
                     type string;
                 }
 
+                leaf downstream_subrole {
+                    type string;
+                }
+
+                leaf resource_type {
+                    type string;
+                }
+
                 leaf subtype {
                     type string {
                         pattern "DualToR";