Add multicast counters to ip interface, remove physical counters from…

… subinterface (#905) * add multicast to ip if, remove physical counters from subinterface * add in deprecated leaves to subif for backwards compat * use common grouping for if counters
openconfig · Jul 25, 2023 · e5ce68c · e5ce68c
1 parent 5b178c5
commit e5ce68c
Show file tree

Hide file tree

Showing 2 changed files with 364 additions and 369 deletions.
diff --git a/release/models/interfaces/openconfig-if-ip.yang b/release/models/interfaces/openconfig-if-ip.yang
@@ -44,7 +44,14 @@ module openconfig-if-ip {
     Section 4.c of the IETF Trust's Legal Provisions Relating
     to IETF Documents (http://trustee.ietf.org/license-info).";
 
-  oc-ext:openconfig-version "3.4.0";
+  oc-ext:openconfig-version "3.5.0";
+
+  revision "2023-07-14" {
+    description
+      "Move counters which apply to both interfaces and subinterfaces to
+      a common grouping.  Deprecate physical counters from subinterface";
+    reference "3.5.0";
+  }
 
   revision "2023-06-30" {
     description
@@ -230,42 +237,6 @@ module openconfig-if-ip {
         "Packet and byte counters for IP transmission and
         reception for the address family.";
 
-
-      leaf in-pkts {
-        type oc-yang:counter64;
-        description
-          "The total number of IP packets received for the specified
-          address family, including those received in error";
-        reference
-          "RFC 4293 - Management Information Base for the
-          Internet Protocol (IP)";
-      }
-
-      leaf in-octets {
-        type oc-yang:counter64;
-        description
-          "The total number of octets received in input IP packets
-          for the specified address family, including those received
-          in error.";
-        reference
-          "RFC 4293 - Management Information Base for the
-          Internet Protocol (IP)";
-      }
-
-      leaf in-error-pkts {
-        // TODO: this counter combines several error conditions --
-        // could consider breaking them out to separate leaf nodes
-        type oc-yang:counter64;
-        description
-          "Number of IP packets discarded due to errors for the
-          specified address family, including errors in the IP
-          header, no route found to the IP destination, invalid
-          address, unknown protocol, etc.";
-        reference
-          "RFC 4293 - Management Information Base for the
-          Internet Protocol (IP)";
-      }
-
       leaf in-forwarded-pkts {
         type oc-yang:counter64;
         description
@@ -291,57 +262,6 @@ module openconfig-if-ip {
           Internet Protocol (IP)";
       }
 
-      leaf in-discarded-pkts {
-        type oc-yang:counter64;
-        description
-          "The number of input IP packets for the
-          specified address family, for which no problems were
-          encountered to prevent their continued processing, but
-          were discarded (e.g., for lack of buffer space).";
-        reference
-          "RFC 4293 - Management Information Base for the
-          Internet Protocol (IP)";
-      }
-
-      leaf out-pkts {
-        type oc-yang:counter64;
-        description
-          "The total number of IP packets for the
-          specified address family that the device supplied
-          to the lower layers for transmission.  This includes
-          packets generated locally and those forwarded by the
-          device.";
-        reference
-          "RFC 4293 - Management Information Base for the
-          Internet Protocol (IP)";
-      }
-
-      leaf out-octets {
-        type oc-yang:counter64;
-        description
-          "The total number of octets in IP packets for the
-          specified address family that the device
-          supplied to the lower layers for transmission.  This
-          includes packets generated locally and those forwarded by
-          the device.";
-        reference
-          "RFC 4293 - Management Information Base for the
-          Internet Protocol (IP)";
-      }
-
-      leaf out-error-pkts {
-        // TODO: this counter combines several error conditions --
-        // could consider breaking them out to separate leaf nodes
-        type oc-yang:counter64;
-        description
-          "Number of IP packets for the specified address family
-          locally generated and discarded due to errors, including
-          no route found to the IP destination.";
-        reference
-          "RFC 4293 - Management Information Base for the
-          Internet Protocol (IP)";
-      }
-
       leaf out-forwarded-pkts {
         type oc-yang:counter64;
         description
@@ -363,25 +283,10 @@ module openconfig-if-ip {
           "RFC 4293 - Management Information Base for the
           Internet Protocol (IP)";
       }
-
-      leaf out-discarded-pkts {
-        type oc-yang:counter64;
-        description
-          "The number of output IP packets for the
-          specified address family for which no problem was
-          encountered to prevent their transmission to their
-          destination, but were discarded (e.g., for lack of
-          buffer space).";
-        reference
-          "RFC 4293 - Management Information Base for the
-          Internet Protocol (IP)";
-      }
     }
-
   }
 
 
-
   grouping ipv4-global-config {
     description
       "Configuration data for IPv4 interfaces across