SONiC Yang model support for LLDP

sonic-net · May 3, 2021 · 654c6b0 · 654c6b0
1 parent 262b916
commit 654c6b0
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 41 deletions.
diff --git a/src/sonic-yang-models/tests/yang_model_tests/tests/lldp.json b/src/sonic-yang-models/tests/yang_model_tests/tests/lldp.json
@@ -2,11 +2,6 @@
     "LLDP_GLOBAL_TEST": {
         "desc": "LLDP test global LLDP table"
     },
-    "LLDP_GLOBAL_TEST_INVALID_ID": {
-        "desc": "LLDP test global table with invalid id",
-        "eStrKey" : "InvalidValue",
-        "eStr": ["id"]
-    },
     "LLDP_GLOBAL_TEST_INVALID_HELLO": {
         "desc": "LLDP test global table with invalid hello value",
         "eStrKey" : "InvalidValue",

diff --git a/src/sonic-yang-models/tests/yang_model_tests/tests_config/lldp.json b/src/sonic-yang-models/tests/yang_model_tests/tests_config/lldp.json
@@ -2,9 +2,7 @@
     "LLDP_GLOBAL_TEST": {
         "sonic-lldp:sonic-lldp": {
             "sonic-lldp:LLDP": {
-                "LLDP_LIST": [
-                    {
-                        "id": "GLOBAL",
+                "sonic-lldp:GLOBAL": {
                         "mode": "TRANSMIT",
                         "enabled": "true",
                         "hello_time": "20",
@@ -13,17 +11,14 @@
                         "supp_system_capabilities_tlv": "false",
                         "system_name": "sonic",
                         "system_description": "sonic-system"
-                    }
-                ]
+                }
             }
         }
     },
     "LLDP_GLOBAL_TEST_INVALID_ID": {
         "sonic-lldp:sonic-lldp": {
             "sonic-lldp:LLDP": {
-                "LLDP_LIST": [
-                    {
-                        "id": "GLOBALE",
+                "sonic-lldp:GLOBAL": {
                         "mode": "TRANSMIT",
                         "enabled": "true",
                         "hello_time": "10",
@@ -32,17 +27,14 @@
                         "supp_system_capabilities_tlv": "false",
                         "system_name": "sonic",
                         "system_description": "sonic-system"
-                    }
-                ]
+                }
             }
         }
     },
     "LLDP_GLOBAL_TEST_INVALID_HELLO": {
         "sonic-lldp:sonic-lldp": {
             "sonic-lldp:LLDP": {
-                "LLDP_LIST": [
-                    {
-                        "id": "GLOBAL",
+                "sonic-lldp:GLOBAL": {
                         "mode": "TRANSMIT",
                         "enabled": "true",
                         "hello_time": "test",
@@ -51,17 +43,14 @@
                         "supp_system_capabilities_tlv": "false",
                         "system_name": "sonic",
                         "system_description": "sonic-system"
-                    }
-                ]
+                }
             }
         }
     },
     "LLDP_GLOBAL_TEST_INVALID_MULTIPLIER": {
         "sonic-lldp:sonic-lldp": {
             "sonic-lldp:LLDP": {
-                "LLDP_LIST": [
-                    {
-                        "id": "GLOBAL",
+                "sonic-lldp:GLOBAL": {
                         "mode": "TRANSMIT",
                         "enabled": "true",
                         "hello_time": "10",
@@ -70,17 +59,14 @@
                         "supp_system_capabilities_tlv": "false",
                         "system_name": "sonic",
                         "system_description": "sonic-system"
-                    }
-                ]
+                }
             }
         }
     },
     "LLDP_GLOBAL_TEST_DEFAULT_SUPP_MGMT_ADDR_TLV": {
         "sonic-lldp:sonic-lldp": {
             "sonic-lldp:LLDP": {
-                "LLDP_LIST": [
-                    {
-                        "id": "GLOBAL",
+                "sonic-lldp:GLOBAL": {
                         "mode": "TRANSMIT",
                         "enabled": "true",
                         "hello_time": "10",
@@ -89,8 +75,7 @@
                         "supp_system_capabilities_tlv": "false",
                         "system_name": "sonic",
                         "system_description": "sonic-system"
-                    }
-                ]
+                }
             }
         }
     },

diff --git a/src/sonic-yang-models/yang-models/sonic-lldp.yang b/src/sonic-yang-models/yang-models/sonic-lldp.yang
@@ -45,17 +45,7 @@ module sonic-lldp {
 
     container sonic-lldp {
         container LLDP {
-            list LLDP_LIST {
-                key "id";
-
-                leaf id {
-                    type enumeration {
-                        enum GLOBAL;
-                    }
-                    description
-                        "It's value is always GLOBAL";
-                }
-
+            container GLOBAL {
 
                 leaf hello_time {
                     type uint8 {