Switchport Modes Port & Port Channel Yang Model Configurations

src/sonic-yang-models/tests/yang_model_tests/tests/port.json

@@ -19,6 +19,11 @@
     "PORT_VALID_MTU_TEST_2": {
         "desc": "PORT_VALID_MTU_TEST_2 no failure."
     },
+    "PORT_INVLAID_MODE_TEST": {
+        "desc": "PORT_INVLAID_MODE_TEST invalid mode failure.",
+        "eStrKey" : "Pattern",
+        "eStr": ["routed|access|trunk"]
+    },
     "PORT_VALID_AUTONEG_TEST_1": {
         "desc": "PORT_VALID_AUTONEG_TEST_1 no failure."
     },

src/sonic-yang-models/tests/yang_model_tests/tests/portchannel.json

@@ -19,6 +19,11 @@
         "eStrKey" : "Pattern",
         "eStr": ["0x8100|0x9100|0x9200|0x88a8|0x88A8"]
     },
+    "PORT_CHANNEL_INVALID_MODE": {
+        "desc": "INCORRECT VALUE OF MODE IN PORT_CHANNEL TABLE.",
+        "eStrKey" : "Pattern",
+        "eStr": ["routed|access|trunk"]
+    },
     "PORT_CHANNEL_INVALID_FALLBACK": {
         "desc": "INCORRECT PORTCHANNEL FALLBACK IN PORT_CHANNEL TABLE.",
         "eStrKey" : "Pattern",

src/sonic-yang-models/tests/yang_model_tests/tests_config/dhcp_server_ipv4.json

@@ -20,7 +20,8 @@
                         "mtu": 9000,
                         "lanes": "1",
                         "name": "Ethernet0",
-                        "speed": 25000
+                        "speed": 25000,
+                        "mode" : "trunk"
                     }
                 ]
             }
@@ -204,7 +205,8 @@
                         "mtu": 9000,
                         "lanes": "1",
                         "name": "Ethernet0",
-                        "speed": 25000
+                        "speed": 25000,
+                        "mode" : "trunk"
                     }
                 ]
             }
@@ -358,7 +360,8 @@
                         "mtu": 9000,
                         "lanes": "1",
                         "name": "Ethernet0",
-                        "speed": 25000
+                        "speed": 25000,
+                        "mode" : "trunk"
                     }
                 ]
             }
@@ -423,7 +426,8 @@
                         "mtu": 9000,
                         "lanes": "1",
                         "name": "Ethernet0",
-                        "speed": 25000
+                        "speed": 25000,
+                        "mode" : "trunk"
                     }
                 ]
             }
@@ -504,7 +508,8 @@
                         "mtu": 9000,
                         "lanes": "1",
                         "name": "Ethernet0",
-                        "speed": 25000
+                        "speed": 25000,
+                        "mode" : "trunk"
                     }
                 ]
             }
@@ -585,7 +590,8 @@
                         "mtu": 9000,
                         "lanes": "1",
                         "name": "Ethernet0",
-                        "speed": 25000
+                        "speed": 25000,
+                        "mode" : "trunk"
                     }
                 ]
             }
@@ -666,7 +672,8 @@
                         "mtu": 9000,
                         "lanes": "1",
                         "name": "Ethernet0",
-                        "speed": 25000
+                        "speed": 25000,
+                        "mode" : "trunk"
                     }
                 ]
             }
@@ -747,7 +754,8 @@
                         "mtu": 9000,
                         "lanes": "1",
                         "name": "Ethernet0",
-                        "speed": 25000
+                        "speed": 25000,
+                        "mode" : "trunk"
                     }
                 ]
             }

src/sonic-yang-models/tests/yang_model_tests/tests_config/dhcpv6_relay.json

@@ -24,7 +24,8 @@
                         "mtu": 9000,
                         "lanes": "1",
                         "name": "Ethernet0",
-                        "speed": 25000
+                        "speed": 25000,
+                        "mode":"trunk"
                     }
                 ]
             }

src/sonic-yang-models/tests/yang_model_tests/tests_config/interface.json

@@ -27,7 +27,8 @@
                         "lanes": "65",
                         "mtu": 9000,
                         "name": "Ethernet8",
-                        "speed": 25000
+                        "speed": 25000,
+                        "mode":"trunk"
                     },
                     {
                         "admin_status": "up",
@@ -36,7 +37,8 @@
                         "lanes": "71",
                         "mtu": 9000,
                         "name": "Ethernet9",
-                        "speed": 25000
+                        "speed": 25000,
+                        "mode":"trunk"
                     }
                 ]
             }
@@ -71,7 +73,8 @@
                         "lanes": "65",
                         "mtu": 9000,
                         "name": "Ethernet8",
-                        "speed": 25000
+                        "speed": 25000,
+                        "mode":"trunk"
                     }
                 ]
             }
@@ -104,7 +107,8 @@
                         "description": "Ethernet8",
                         "mtu": 9000,
                         "name": "Ethernet8",
-                        "speed": 25000
+                        "speed": 25000,
+                        "mode":"trunk"
                     }
                 ]
             }
@@ -140,7 +144,8 @@
                         "lanes": "65",
                         "mtu": 9000,
                         "name": "Ethernet8",
-                        "speed": 25000
+                        "speed": 25000,
+                        "mode":"trunk"
                     }
                 ]
             }
@@ -176,7 +181,8 @@
                         "lanes": "65",
                         "mtu": 9000,
                         "name": "Ethernet8",
-                        "speed": 25000
+                        "speed": 25000,
+                        "mode":"trunk"
                     }
                 ]
             }
@@ -204,7 +210,8 @@
                         "lanes": "65",
                         "mtu": 9000,
                         "name": "Ethernet8",
-                        "speed": 25000
+                        "speed": 25000,
+                        "mode":"trunk"
                     }
                 ]
             }
@@ -232,7 +239,8 @@
                         "lanes": "65",
                         "mtu": 9000,
                         "name": "Ethernet8",
-                        "speed": 25000
+                        "speed": 25000,
+                        "mode":"trunk"
                     }
                 ]
             }
@@ -260,7 +268,8 @@
                         "lanes": "65",
                         "mtu": 9000,
                         "name": "Ethernet8",
-                        "speed": 25000
+                        "speed": 25000,
+                        "mode":"trunk"
                     }
                 ]
             }

src/sonic-yang-models/tests/yang_model_tests/tests_config/mclag.json

@@ -10,7 +10,8 @@
                         "lanes": "65",
                         "mtu": 9000,
                         "name": "Ethernet0",
-                        "speed": 25000
+                        "speed": 25000,
+                        "mode": "trunk"
                     },
                     {
                         "admin_status": "up",
@@ -19,7 +20,8 @@
                         "lanes": "65",
                         "mtu": 9000,
                         "name": "Ethernet10",
-                        "speed": 25000
+                        "speed": 25000,
+                        "mode":"routed"
                     }
                 ]
             }
@@ -32,14 +34,17 @@
                         "min_links": "1",
                         "mtu": "9100",
                         "lacp_key": "auto",
-                        "name": "PortChannel2"
+                        "name": "PortChannel2",
+                        "mode":"trunk"
                     },
                     {
                         "admin_status": "up",
                         "min_links": "1",
                         "mtu": "9100",
                         "lacp_key": "auto",
-                        "name": "PortChannel10"
+                        "name": "PortChannel10",
+                        "mode":"trunk"
+
                     }
                 ]
             }
@@ -126,7 +131,8 @@
                         "lanes": "65",
                         "mtu": 9000,
                         "name": "Ethernet0",
-                        "speed": 25000
+                        "speed": 25000,
+                        "mode":"trunk"
                     },
                     {
                         "admin_status": "up",
@@ -135,7 +141,8 @@
                         "lanes": "65",
                         "mtu": 9000,
                         "name": "Ethernet4",
-                        "speed": 25000
+                        "speed": 25000,
+                        "mode":"trunk"
                     }
                 ]
             }
@@ -148,7 +155,8 @@
                         "min_links": "1",
                         "mtu": "9100",
                         "lacp_key": "auto",
-                        "name": "PortChannel2"
+                        "name": "PortChannel2",
+                        "mode":"trunk"
                     }
                 ]
             }
@@ -302,7 +310,8 @@
                         "lanes": "65",
                         "mtu": 9000,
                         "name": "Ethernet12",
-                        "speed": 25000
+                        "speed": 25000,
+                        "mode":"routed"
                     }
                 ]
             }