Merge branch 'master' into pkt_trim_cnt_0325

Author: ElodinLaarz

doc/openconfig_style_guide.md

@@ -3,7 +3,7 @@
 
 **Contributors:** Anees Shaikh, Rob Shakir, Kristian Larsson, Darren Loher
 **October 26, 2015**<br>
-*Updated: June 12, 2025*
+*Updated: January 9th 2026*
 
 ## Background
 This document describes conventions adopted in the OpenConfig operator group
@@ -49,6 +49,7 @@ and released soon.
     - [`choice`](#choice)
     - [XPath](#xpath)
     - [Regular expressions](#regular-expressions)
+  - [Schema Usability](#schema-usability)
   - [Appendix](#appendix)
     - [Example groupings for containers](#example-groupings-for-containers)
     - [OpenConfig YANG module template](#openconfig-yang-module-template)
@@ -476,6 +477,40 @@ reference for [regular
 expressions](http://www.w3.org/TR/2004/REC-xmlschema-2-20041028/#regexs).
 However, this is not a commonly used standard for implementors.
 
+## Schema Usability
+
+Some elements of the OpenConfig style guide are implemented in order to provide
+consistent programmatic handling of the schema. For instance, the `config` and
+`state` containers used for operational state, and surrounding containers for
+YANG `list` statements. In some cases (e.g., programmatically generating
+configuration), this schema verbosity negatively impacts usability -- e.g.,
+requiring programmers to reference longer paths than are necessary. Tooling
+generating programmatic APIs around OpenConfig can improve usability by
+transforming the schema. Such transformations rely on consistency in the
+modelling approach.
+
+The following rules MUST be adhered to within the OpenConfig models to
+ensure that downstream tooling does not break.
+
+* **A `list` node MUST NOT share its identifier with any sibling of its
+  parent container.** It is not legal for `/a/foos/foo` and `/a/foo` to
+  exist, or for `/interfaces/interface` and `/interface` to exist, where
+  `/a/foos/foo` and `/interfaces/interface` are `list` nodes. This rule
+  exists to allow the (style-guide-required) "surrounding" container of a
+  list to be removed during schema transformation.
+* **A leaf node MUST NOT share its identifier with any of the children of
+  its grandparent node.** It is not legal for `/a/config/leaf` and `/a/leaf`
+  to both exist nor for `/b/state/leaf` and `/b/leaf` to both exist. The
+  single exception to this rule is the OpenConfig list key pattern: a leaf
+  inside the `config` or `state` container is permitted to share its name
+  with the `leafref` node acting as the `key` of the parent list. The node
+  acting as the key of the `list` MUST be of type `leafref` as specified
+  elsewhere in this guide. This rule ensures that the `config` and `state`
+  containers can be removed during schema transformation.
+
+An example of programmatic compression is implemented for the generation of
+code in ygot -- both for Go and Protobuf artifact generation
+([reference](https://github.com/openconfig/ygot/blob/master/docs/design.md#openconfig-path-compression)).
 
 ## Appendix
 

release/models/lacp/openconfig-lacp.yang

@@ -26,7 +26,14 @@ module openconfig-lacp {
     managing aggregate interfaces.   It works in conjunction with
     the OpenConfig interfaces and aggregate interfaces models.";
 
-  oc-ext:openconfig-version "2.1.0";
+oc-ext:openconfig-version "2.2.0";
+
+revision "2026-04-09" {
+description
+"Add LACP fallback timeout leaf.";
+reference "2.2.0";
+}
+
 
   revision "2024-09-24" {
     description
@@ -422,6 +429,13 @@ grouping aggregation-lacp-members-statistics {
         after the expiry of the timeout period.";
     }
 
+    leaf fallback-timeout {
+      type uint16;
+      units "seconds";
+      description
+        "The timeout in seconds to wait for LACP PDUs before falling back to a single port.";
+    }
+
     uses aggregation-lacp-global-config;
   }
 

release/models/wifi/openconfig-wifi-mac.yang

@@ -26,7 +26,12 @@ module openconfig-wifi-mac {
   description
     "Model for managing MAC layer configuration of Radio interfaces.";
 
-  oc-ext:openconfig-version "1.4.2";
+  oc-ext:openconfig-version "1.5.0";
+
+  revision "2026-03-24" {
+    description "Add 802.11mc RTT configuration and state containers.";
+    reference "1.5.0";
+  }
 
   revision "2026-01-06" {
     description "Add tx-beacons counter to BSSID state.";
@@ -603,6 +608,22 @@ module openconfig-wifi-mac {
     }
   }
 
+  grouping rtt-config {
+    description
+      "802.11mc RTT (Round Trip Time) configuration, per SSID.";
+
+    leaf enabled {
+      type boolean;
+      description
+        "Configures whether IEEE 802.11mc Fine Timing Measurement (FTM),
+        also known as Round Trip Time (RTT), is enabled for clients
+        associated with this SSID. When set to 'true', the Access Point
+        will respond to FTM requests from clients, allowing them to
+        perform accurate distance measurements. When 'false', FTM
+        responses are disabled for this SSID.";
+    }
+  }
+
   grouping bssid-common-state {
     description
       "Grouping for defining bssid-specific operational state";
@@ -1795,6 +1816,31 @@ module openconfig-wifi-mac {
     }
   }
 
+  grouping rtt-top {
+    description
+      "Top-level grouping for RTT configuration and operational
+      state data.";
+
+    container rtt {
+      description
+        "Top-level container for RTT configuration and
+        state container.";
+
+      container config {
+        description
+          "Container for RTT configuration elements.";
+        uses rtt-config;
+      }
+
+      container state {
+        config false;
+        description
+          "Container for RTT state elements.";
+        uses rtt-config;
+      }
+    }
+  }
+
   grouping ssid-top {
     description
       "Top-level grouping for SSID configuration and operational state
@@ -1840,6 +1886,7 @@ module openconfig-wifi-mac {
         uses dot1x-timers-top;
         uses band-steering-top;
         uses mlo-top;
+        uses rtt-top;
       }
     }
   }