Merge branch 'master' into cfm_branch

openconfig · Nov 20, 2024 · 0c7c4d9 · 0c7c4d9
2 parents 8773950 + ea290e3
commit 0c7c4d9
Show file tree

Hide file tree

Showing 4 changed files with 88 additions and 25 deletions.
diff --git a/release/models/interfaces/openconfig-if-ethernet.yang b/release/models/interfaces/openconfig-if-ethernet.yang
@@ -24,7 +24,15 @@ module openconfig-if-ethernet {
     "Model for managing Ethernet interfaces -- augments the OpenConfig
     model for interface configuration and state.";
 
-  oc-ext:openconfig-version "2.13.0";
+  oc-ext:openconfig-version "2.14.0";
+
+  revision "2024-09-17" {
+    description
+      "Refactor config/state nodes to account for physical ethernet vs.
+      aggregate interface characteristics along with description updates
+      to indicate applicability.";
+    reference "2.14.0";
+  }
 
   revision "2023-03-10" {
     description
@@ -294,7 +302,9 @@ module openconfig-if-ethernet {
   // grouping statements
 
   grouping ethernet-interface-config {
-    description "Configuration items for Ethernet interfaces";
+    description
+      "Common interface configuration for physical ethernet + logical
+      aggregate interfaces";
 
     leaf mac-address {
       type oc-yang:mac-address;
@@ -304,6 +314,31 @@ module openconfig-if-ethernet {
         expected to show the system-assigned MAC address.";
     }
 
+    leaf enable-flow-control {
+      type boolean;
+      default false;
+      description
+        "Enable or disable flow control for this interface.
+        Ethernet flow control is a mechanism by which a receiver
+        may send PAUSE frames to a sender to stop transmission for
+        a specified time.
+
+        This setting should override auto-negotiated flow control
+        settings.  If left unspecified, and auto-negotiate is TRUE,
+        flow control mode is negotiated with the peer interface.";
+      reference
+        "IEEE 802.3x";
+    }
+  }
+
+  grouping physical-interface-config {
+    description
+      "Configuration specific to physical ethernet interfaces.  Note
+      that this grouping is to only apply when the interface `type` is
+      set to 'ianaift:ethernetCsmacd'.  This is not currently restricted
+      by YANG language statements (must/when) due to uses of this module
+      within other domains (e.g. wifi).";
+
     leaf auto-negotiate {
       type boolean;
       default true;
@@ -365,22 +400,6 @@ module openconfig-if-ethernet {
         by ETHERNET_SPEED identities";
     }
 
-    leaf enable-flow-control {
-      type boolean;
-      default false;
-      description
-        "Enable or disable flow control for this interface.
-        Ethernet flow control is a mechanism by which a receiver
-        may send PAUSE frames to a sender to stop transmission for
-        a specified time.
-
-        This setting should override auto-negotiated flow control
-        settings.  If left unspecified, and auto-negotiate is TRUE,
-        flow control mode is negotiated with the peer interface.";
-      reference
-        "IEEE 802.3x";
-    }
-
     leaf fec-mode {
       type identityref {
         base INTERFACE_FEC;
@@ -596,9 +615,13 @@ module openconfig-if-ethernet {
 
   }
 
-  grouping ethernet-interface-state {
+  grouping physical-interface-state {
     description
-      "Grouping for defining Ethernet-specific operational state";
+      "Grouping for operational state specific to physical ethernet
+      interfaces.  Note that this grouping is to only apply when the
+      interface `type` is set to 'ianaift:ethernetCsmacd'.  This is not
+      currently restricted by YANG language statements (must/when) due
+      to uses of this module within other domains (e.g. wifi).";
 
     leaf hw-mac-address {
       type oc-yang:mac-address;
@@ -631,6 +654,11 @@ module openconfig-if-ethernet {
         completed auto-negotiation with the remote peer, this value
         shows the interface speed that has been negotiated.";
     }
+  }
+
+  grouping ethernet-interface-state {
+    description
+      "Common state for physical ethernet and aggregate interfaces";
 
     container counters {
       description "Ethernet interface counters";
@@ -653,7 +681,7 @@ module openconfig-if-ethernet {
         description "Configuration data for ethernet interfaces";
 
         uses ethernet-interface-config;
-
+        uses physical-interface-config;
       }
 
       container state {
@@ -662,6 +690,8 @@ module openconfig-if-ethernet {
         description "State variables for Ethernet interfaces";
 
         uses ethernet-interface-config;
+        uses physical-interface-config;
+        uses physical-interface-state;
         uses ethernet-interface-state;
 
       }

diff --git a/release/models/network-instance/openconfig-network-instance-policy.yang b/release/models/network-instance/openconfig-network-instance-policy.yang
@@ -25,7 +25,14 @@ module openconfig-network-instance-policy {
     actions) for the network instance model.  These statements are
     generally added to the routing policy model.";
 
-  oc-ext:openconfig-version "0.1.2";
+  oc-ext:openconfig-version "0.1.3";
+
+  revision "2024-09-19" {
+    description
+      "Correct typo in description of
+       match-protocol-instance/protocol-name.";
+    reference "0.1.3";
+  }
 
   revision "2023-07-25" {
     description
@@ -74,7 +81,7 @@ revision "2018-11-21" {
           on in the local network instance. The string
           must match one of /network-instances/
           network-instance/protocols/
-          protocol/identifier in the local network
+          protocol/name in the local network
           instance.";
       }
   }

diff --git a/release/models/optical-transport/openconfig-transport-types.yang b/release/models/optical-transport/openconfig-transport-types.yang
@@ -22,7 +22,13 @@ module openconfig-transport-types {
     "This module contains general type definitions and identities
     for optical transport models.";
 
-  oc-ext:openconfig-version "1.0.0";
+  oc-ext:openconfig-version "1.1.0";
+
+  revision "2024-11-21" {
+    description
+      "Add PROT_OTSI_A protocol type.";
+    reference "1.1.0";
+  }
 
   revision "2024-07-24" {
     description
@@ -855,6 +861,14 @@ module openconfig-transport-types {
       "FlexO protocol as defined in ITU-T G.709.1 and ITU-T G.709.3";
   }
 
+  identity PROT_OTSI_A {
+    base TRIBUTARY_PROTOCOL_TYPE;
+    description
+      "OTSI_A is the digital adaptation between the OTSi and the
+      FlexO-x, or the regenerator section layer of the FlexO";
+    reference "ITU-T G.798";
+  }
+
   identity PROT_ODUFLEX_GFP {
     base TRIBUTARY_PROTOCOL_TYPE;
     description "ODU Flex with GFP protocol";

diff --git a/release/models/platform/openconfig-platform-types.yang b/release/models/platform/openconfig-platform-types.yang
@@ -22,9 +22,15 @@ module openconfig-platform-types {
     "This module defines data types (e.g., YANG identities)
     to support the OpenConfig component inventory model.";
 
-  oc-ext:openconfig-version "1.8.0";
+  oc-ext:openconfig-version "1.9.0";
 
 
+  revision "2024-11-04" {
+    description
+      "Add FAN_TRAY_CONTROLLER";
+    reference "1.9.0";
+  }
+
   revision "2024-04-30" {
     description
       "Add FAN_TRAY";
@@ -339,6 +345,12 @@ module openconfig-platform-types {
       "Contains multiple fans that work in unison to cool the router components.";
   }
 
+  identity FAN_TRAY_CONTROLLER {
+    base OPENCONFIG_HARDWARE_COMPONENT;
+    description
+      "Controls the fan trays.";
+  }
+
   identity SENSOR {
     base OPENCONFIG_HARDWARE_COMPONENT;
     description