Add packet trimming counters

Author: sallylsy

release/models/interfaces/openconfig-interfaces.yang

@@ -13,7 +13,7 @@ module openconfig-interfaces {
   import openconfig-types { prefix oc-types; }
   import openconfig-extensions { prefix oc-ext; }
   import openconfig-transport-types { prefix oc-opt-types; }
-  import openconfig-platform-integrated-circuit { prefix oc-ic; }
+  import openconfig-qos-elements { prefix oc-qos; }
 
   // meta
   organization "OpenConfig working group";
@@ -1373,7 +1373,7 @@ module openconfig-interfaces {
 
             uses interface-common-counters-state;
             uses interface-counters-state;
-            uses oc-ic:trim-pkts-counters-top;
+            uses oc-qos:trim-pkts-counters-top;
           }
         }
 

release/models/platform/openconfig-platform-integrated-circuit.yang

@@ -20,13 +20,7 @@ module openconfig-platform-integrated-circuit {
     These components are generically forwarding NPUs or ASICs within
     the system for which configuration or state is applicable.";
 
-  oc-ext:openconfig-version "0.4.0";
-
-  revision "2026-04-30" {
-    description
-      "Add counters for packet trimming.";
-    reference "0.4.0";
-  }
+  oc-ext:openconfig-version "0.3.1";
 
   revision "2022-04-20" {
     description
@@ -178,43 +172,6 @@ module openconfig-platform-integrated-circuit {
     }
   }
 
-  grouping trim-pkts-counters-top {
-    description
-      "Structural grouping for packet trimming counters.";
-
-    leaf out-trim-pkts {
-      type oc-yang:counter64;
-      description
-        "The number of packets that were trimmed and successfully
-        transmitted.";
-    }
-
-    uses trim-pkts-common-counters-top;
-  }
-
-  grouping trim-pkts-common-counters-top {
-    description
-      "Structural grouping for packet trimming counters.
-      Counters collected at port level, queue level and
-      switch level.";
-
-    leaf trim-pkts {
-      type oc-yang:counter64;
-      description
-        "The total number of packets that were trimmed.
-        This counter includes both packets that were
-        transmitted after trimming and those that were
-        subsequently dropped.";
-    }
-
-    leaf dropped-trim-pkts {
-      type oc-yang:counter64;
-      description
-        "The number of packets that were trimmed but dropped due to a
-        failed shared buffer admission on the trim queue.";
-    }
-  }
-
   augment "/oc-platform:components/oc-platform:component/oc-platform:integrated-circuit" {
     description
       "Augment integrated circuit components with backplane-facing capacity and memory errors.";

release/models/platform/openconfig-platform-pipeline-counters.yang

@@ -10,6 +10,7 @@ module openconfig-platform-pipeline-counters {
   import openconfig-extensions { prefix oc-ext; }
   import openconfig-platform { prefix oc-platform; }
   import openconfig-platform-integrated-circuit { prefix oc-ic; }
+  import openconfig-qos-elements { prefix oc-qos; }
 
   organization
     "OpenConfig working group";
@@ -221,7 +222,7 @@ module openconfig-platform-pipeline-counters {
               as it can be calculated by sum the sent
               trimmed packets and dropped trimmed packets.";
 
-            uses oc-ic:trim-pkts-common-counters-top;
+            uses oc-qos:trim-pkts-counters-top;
           }
         }
       }

release/models/qos/openconfig-qos-elements.yang

@@ -39,7 +39,7 @@ submodule openconfig-qos-elements {
 
   revision "2026-04-30" {
     description
-      "Bump version to 2.2.0";
+      "Add packet trimming counters.";
     reference "2.2.0";
   }
 
@@ -1441,4 +1441,34 @@ submodule openconfig-qos-elements {
         Differentiated Services";
     }
   }
+
+  grouping trim-pkts-counters-top {
+    description
+      "Structural grouping for packet trimming counters.
+      Counters collected at interface level, queue level and
+      integrated-circuit level.";
+
+    leaf trim-pkts {
+      type oc-yang:counter64;
+      description
+        "The total number of packets that were trimmed.
+        This counter includes both packets that were
+        transmitted after trimming and those that were
+        subsequently dropped.";
+    }
+
+    leaf out-trim-pkts {
+      type oc-yang:counter64;
+      description
+        "The number of packets that were trimmed and successfully
+        transmitted.";
+    }
+
+    leaf dropped-trim-pkts {
+      type oc-yang:counter64;
+      description
+        "The number of packets that were trimmed but dropped due to a
+        failed shared buffer admission on the trim queue.";
+    }
+  }
 }

release/models/qos/openconfig-qos-mem-mgmt.yang

@@ -33,7 +33,7 @@ submodule openconfig-qos-mem-mgmt {
 
   revision "2026-04-30" {
     description
-      "Bump version to 2.1.0";
+      "Bump version to 2.2.0";
     reference "2.2.0";
   }