Revert the vlan member list key to port

Signed-off-by: Arthi Sivanantham <[email protected]>
sonic-net · Apr 27, 2021 · f1206a4 · f1206a4
1 parent 6662244
commit f1206a4
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/src/sonic-yang-models/tests/yang_model_tests/tests_config/vlan.json b/src/sonic-yang-models/tests/yang_model_tests/tests_config/vlan.json
@@ -60,7 +60,7 @@
             "sonic-vlan:VLAN_MEMBER": {
                 "VLAN_MEMBER_LIST": [
                     {
-                        "ifname": "Ethernet0",
+                        "port": "Ethernet0",
                         "tagging_mode": "non-tagged",
                         "name": "Vlan100"
                     }
@@ -121,7 +121,7 @@
             "sonic-vlan:VLAN_MEMBER": {
                 "VLAN_MEMBER_LIST": [
                     {
-                        "ifname": "Ethernet0",
+                        "port": "Ethernet0",
                         "tagging_mode": "tagged",
                         "name": "Vlan200"
                     }
@@ -164,7 +164,7 @@
             "sonic-vlan:VLAN_MEMBER": {
                 "VLAN_MEMBER_LIST": [
                     {
-                        "ifname": "Ethernet156",
+                        "port": "Ethernet156",
                         "tagging_mode": "tagged",
                         "name": "Vlan100"
                     }
@@ -194,7 +194,7 @@
             "sonic-vlan:VLAN_MEMBER": {
                 "VLAN_MEMBER_LIST": [
                     {
-                        "ifname": "PortChannel5",
+                        "port": "PortChannel5",
                         "tagging_mode": "tagged",
                         "name": "Vlan200"
                     }
@@ -214,7 +214,7 @@
             "sonic-vlan:VLAN_MEMBER": {
                 "VLAN_MEMBER_LIST": [
                     {
-                        "ifname": "PortChannel1",
+                        "port": "PortChannel1",
                         "tagging_mode": "tagged",
                         "name": "Vlan100"
                     }

diff --git a/src/sonic-yang-models/yang-models/sonic-vlan.yang b/src/sonic-yang-models/yang-models/sonic-vlan.yang
@@ -1,6 +1,6 @@
 module sonic-vlan {
 
-	yang-version 1.1;
+    yang-version 1.1;
 
 	namespace "http://github.com/Azure/sonic-vlan";
 	prefix vlan;
@@ -126,7 +126,7 @@ module sonic-vlan {
 			list VLAN_LIST {
 
 				key "name";
-		
+        
 				leaf name {
 					type string {
 						pattern 'Vlan([0-9]{1,3}|[1-3][0-9]{3}|[4][0][0-8][0-9]|[4][0][9][0-4])';
@@ -169,15 +169,15 @@ module sonic-vlan {
 
 			list VLAN_MEMBER_LIST {
 
-				key "name ifname";
+				key "name port";
 
 				leaf name {
 					type leafref {
 						path "/vlan:sonic-vlan/vlan:VLAN/vlan:VLAN_LIST/vlan:name";
 					}
 				}
 
-				leaf ifname {
+				leaf port {
 					/* key elements are mandatory by default */
 					type union {
 						type leafref {
@@ -194,10 +194,10 @@ module sonic-vlan {
 					type stypes:vlan_tagging_mode;
 				}
 			}
-			/* end of list VLAN_MEMBER_LIST */
+            /* end of list VLAN_MEMBER_LIST */
 		}
-		/* end of container VLAN_MEMBER */
+        /* end of container VLAN_MEMBER */
 	}
-	/* end of container sonic-vlan */
+    /* end of container sonic-vlan */
 }
 /* end of module sonic-vlan */