[sonic-yang-models]: Address review comment V3.

-- flex counter. -- versions. -- tests. Signed-off-by: Praveen Chaudhary<[email protected]>
sonic-net · Nov 12, 2020 · 6941fc7 · 6941fc7
1 parent 1d3f070
commit 6941fc7
Show file tree

Hide file tree

Showing 3 changed files with 75 additions and 3 deletions.
diff --git a/src/sonic-yang-models/tests/yang_model_tests/yangTest.json b/src/sonic-yang-models/tests/yang_model_tests/yangTest.json
@@ -835,6 +835,21 @@
                 "QUEUE": {
                     "FLEX_COUNTER_STATUS": "enable"
                 },
+                "QUEUE_WATERMARK": {
+                    "FLEX_COUNTER_STATUS": "enable"
+                },
+                "PORT_RATES": {
+                    "FLEX_COUNTER_STATUS": "enable"
+                },
+                "PORT_BUFFER_DROP": {
+                    "FLEX_COUNTER_STATUS": "enable"
+                },
+                "BUFFER_POOL_WATERMARK_KEY": {
+                    "FLEX_COUNTER_STATUS": "enable"
+                },
+                "QUEUE": {
+                    "FLEX_COUNTER_STATUS": "enable"
+                },
                 "QUEUE_WATERMARK": {
                     "FLEX_COUNTER_STATUS": "enable"
                 }
@@ -1659,6 +1674,21 @@
             "QUEUE": {
                 "FLEX_COUNTER_STATUS": "enable"
             },
+            "QUEUE_WATERMARK": {
+                "FLEX_COUNTER_STATUS": "enable"
+            },
+            "PORT_RATES": {
+                "FLEX_COUNTER_STATUS": "enable"
+            },
+            "PORT_BUFFER_DROP": {
+                "FLEX_COUNTER_STATUS": "enable"
+            },
+            "BUFFER_POOL_WATERMARK_KEY": {
+                "FLEX_COUNTER_STATUS": "enable"
+            },
+            "QUEUE": {
+                "FLEX_COUNTER_STATUS": "enable"
+            },
             "QUEUE_WATERMARK": {
                 "FLEX_COUNTER_STATUS": "enable"
             }

diff --git a/src/sonic-yang-models/yang-models/sonic-flex_counter.yang b/src/sonic-yang-models/yang-models/sonic-flex_counter.yang
@@ -25,31 +25,73 @@ module sonic-flex_counter {
 
             description "FLEX_COUNTER_TABLE part of config_db.json";
 
+            /* below are in alphabetical order */
+
+            container BUFFER_POOL_WATERMARK_KEY {
+                /* BUFFER_POOL_WATERMARK_STAT_COUNTER_FLEX_COUNTER_GROUP */
+                leaf FLEX_COUNTER_STATUS {
+                    type flex_status;
+                }
+            }
+
+            container DEBUG_COUNTER {
+                /* DEBUG_COUNTER_FLEX_COUNTER_GROUP */
+                leaf FLEX_COUNTER_STATUS {
+                    type flex_status;
+                }
+            }
+
             container PFCWD {
+                /* PFC_WD_FLEX_COUNTER_GROUP */
+                leaf FLEX_COUNTER_STATUS {
+                    type flex_status;
+                }
+            }
+
+            container PG_WATERMARK {
+                /* PG_WATERMARK_STAT_COUNTER_FLEX_COUNTER_GROUP */
                 leaf FLEX_COUNTER_STATUS {
                     type flex_status;
                 }
             }
 
             container PORT {
+                /* PORT_STAT_COUNTER_FLEX_COUNTER_GROUP */
                 leaf FLEX_COUNTER_STATUS {
                     type flex_status;
                 }
             }
 
-            container QUEUE {
+            container PORT_BUFFER_DROP {
+                /* PORT_BUFFER_DROP_COUNTER_FLEX_COUNTER_GROUP */
                 leaf FLEX_COUNTER_STATUS {
                     type flex_status;
                 }
             }
 
-            container PG_WATERMARK {
+            container QUEUE {
+                /* QUEUE_STAT_COUNTER_FLEX_COUNTER_GROUP */
                 leaf FLEX_COUNTER_STATUS {
                     type flex_status;
                 }
             }
 
             container QUEUE_WATERMARK {
+                /* QUEUE_WATERMARK_STAT_COUNTER_FLEX_COUNTER_GROUP */
+                leaf FLEX_COUNTER_STATUS {
+                    type flex_status;
+                }
+            }
+
+            container RIF {
+                /* RIF_STAT_COUNTER_FLEX_COUNTER_GROUP */
+                leaf FLEX_COUNTER_STATUS {
+                    type flex_status;
+                }
+            }
+
+            container RIF_RATES {
+                /* RIF_RATE_COUNTER_FLEX_COUNTER_GROUP */
                 leaf FLEX_COUNTER_STATUS {
                     type flex_status;
                 }

diff --git a/src/sonic-yang-models/yang-models/sonic-versions.yang b/src/sonic-yang-models/yang-models/sonic-versions.yang
@@ -16,7 +16,7 @@ module sonic-versions {
 
         container VERSIONS {
 
-            description "VERSIONS part of config_db.json";
+            description "DATABASE SCHEMA VERSIONS part of config_db.json";
 
             container DATABASE {