Switchport Modes Port & Port Channel Yang Model Configurations

src/sonic-yang-models/tests/files/sample_config_db.json

@@ -86,6 +86,7 @@
                 ],
                 "tpid": "0x8100",
                 "mtu": "9100",
+                "mode": "access",
                 "lacp_key": "auto"
             },
             "PortChannel0004": {
@@ -96,6 +97,7 @@
                 ],
                 "tpid": "0x9200",
                 "mtu": "9100",
+                "mode": "trunk",
                 "lacp_key": "auto"
             },
             "PortChannel2": {

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

@@ -19,6 +19,21 @@
     "PORT_VALID_MTU_TEST_2": {
         "desc": "PORT_VALID_MTU_TEST_2 no failure."
     },
+    "PORT_VALID_MODE_TEST_1": {
+        "desc": "PORT_VALID_MODE_TEST_1 no failure.",
+        "eStrKey" : "Pattern",
+        "eStr": ["routed|access|trunk"]
+    },
+    "PORT_VALID_MODE_TEST_2": {
+        "desc": "PORT_VALID_MODE_TEST_2 no failure.",
+        "eStrKey" : "Pattern",
+        "eStr": ["routed|access|trunk"]
+    },
+    "PORT_VALID_MODE_TEST_3": {
+        "desc": "PORT_VALID_MODE_TEST_3 no 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_config/port.json

@@ -29,6 +29,7 @@
                         "description": "Ethernet8",
                         "fec": "rs",
                         "lanes": "65",
+                        "mode": "access",
                         "mtu": 9000,
                         "pfc_asym": "on",
                         "name": "Ethernet8",
@@ -69,6 +70,51 @@
             }
         }
     },
+    "PORT_VALID_MODE_TEST_1": {
+        "sonic-port:sonic-port": {
+            "sonic-port:PORT": {
+                "PORT_LIST": [
+                    {
+                        "name": "Ethernet8",
+                        "alias": "eth8",
+                        "lanes": "65",
+                        "speed": 25000,
+                        "mode": "access"
+                    }
+                ]
+            }
+        }
+    },
+    "PORT_VALID_MODE_TEST_2": {
+        "sonic-port:sonic-port": {
+            "sonic-port:PORT": {
+                "PORT_LIST": [
+                    {
+                        "name": "Ethernet8",
+                        "alias": "eth8",
+                        "lanes": "65",
+                        "speed": 25000,
+                        "mode": "trunk"
+                    }
+                ]
+            }
+        }
+    },
+    "PORT_VALID_MODE_TEST_3": {
+        "sonic-port:sonic-port": {
+            "sonic-port:PORT": {
+                "PORT_LIST": [
+                    {
+                        "name": "Ethernet8",
+                        "alias": "eth8",
+                        "lanes": "65",
+                        "speed": 25000,
+                        "mode": "routed"
+                    }
+                ]
+            }
+        }
+    },
     "PORT_VALID_AUTONEG_TEST_1": {
         "sonic-port:sonic-port": {
             "sonic-port:PORT": {

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

@@ -9,6 +9,7 @@
                         "description": "Ethernet0",
                         "lanes": "65",
                         "mtu": 9000,
+                        "mode": "access",
                         "name": "Ethernet0",
                         "tpid": "0x8100",
                         "speed": 25000
@@ -28,6 +29,7 @@
                         "mtu": "9100",
                         "tpid": "0x8100",
                         "lacp_key": "auto",
+                        "mode": "access",
                         "name": "PortChannel0001"
                     }
                 ]

src/sonic-yang-models/yang-models/sonic-port.yang

@@ -51,6 +51,14 @@ module sonic-port{
 						length 1..128;
 					}
 				}
+
+				leaf mode {
+					description "SwitchPort Modes values will be from "routed|access|trunk. Default val is routed. "; 
+					type string {
+						pattern "routed|access|trunk";	
+					}
+					default "routed";
+				}
 
 				leaf description {
 					type string {

src/sonic-yang-models/yang-models/sonic-portchannel.yang

@@ -80,6 +80,15 @@ module sonic-portchannel {
                         range 1..1024;
                     }
                 }
+
+               leaf mode {
+                   description "PortChannel Modes values will be from "routed|access|trunk. Default val is routed.";
+                   type string {
+                       pattern "routed|access|trunk";
+                    }
+                    default "routed";
+
+                }
 
                 leaf description {
                     type string {

src/sonic-yang-models/yang-templates/sonic-types.yang.j2

@@ -208,6 +208,14 @@ module sonic-types {
         }
     }
 
+    typedef mode {
+        type string {
+            pattern "routed|access|trunk";
+        }
+        description
+            "SwitchPort Modes for Port & PortChannel";
+    }
+
     typedef meter_type {
         type enumeration {
             enum packets;