Merge branch 'master' into updateGnsiAcctzModel

release/models/aft/openconfig-aft-common.yang

@@ -23,7 +23,13 @@ submodule openconfig-aft-common {
     "Submodule containing definitions of groupings that are re-used
     across multiple contexts within the AFT model.";
 
-  oc-ext:openconfig-version "2.7.0";
+  oc-ext:openconfig-version "2.8.0";
+
+  revision "2024-09-19" {
+    description
+      "Add atomic-exempt attribute to AFT counters containers.";
+    reference "2.8.0";
+  }
 
   revision "2024-09-05" {
     description
@@ -1093,6 +1099,7 @@ submodule openconfig-aft-common {
   }
 
   grouping aft-common-entry-counter-state {
+    oc-ext:telemetry-atomic-exempt;
     description
       "Counters relating to a forwarding entry";
 
@@ -1112,6 +1119,7 @@ submodule openconfig-aft-common {
   }
 
   grouping aft-common-backup-entry-counter-state {
+    oc-ext:telemetry-atomic-exempt;
     description
       "Counters relating to a backup forwarding entry";
 

release/models/aft/openconfig-aft-ethernet.yang

@@ -20,7 +20,13 @@ submodule openconfig-aft-ethernet {
     "Submodule containing definitions of groupings for the abstract
     forwarding tables for Ethernet.";
 
-  oc-ext:openconfig-version "2.7.0";
+  oc-ext:openconfig-version "2.8.0";
+
+  revision "2024-09-19" {
+    description
+      "Add atomic-exempt attribute to AFT counters containers.";
+    reference "2.8.0";
+  }
 
   revision "2024-07-18" {
     description

release/models/aft/openconfig-aft-ipv4.yang

@@ -20,7 +20,13 @@ submodule openconfig-aft-ipv4 {
     "Submodule containing definitions of groupings for the abstract
     forwarding tables for IPv4.";
 
-  oc-ext:openconfig-version "2.7.0";
+  oc-ext:openconfig-version "2.8.0";
+
+  revision "2024-09-19" {
+    description
+      "Add atomic-exempt attribute to AFT counters containers.";
+    reference "2.8.0";
+  }
 
   revision "2024-09-05" {
     description

release/models/aft/openconfig-aft-ipv6.yang

@@ -20,7 +20,13 @@ submodule openconfig-aft-ipv6 {
     "Submodule containing definitions of groupings for the abstract
     forwarding tables for IPv6.";
 
-  oc-ext:openconfig-version "2.7.0";
+  oc-ext:openconfig-version "2.8.0";
+
+  revision "2024-09-19" {
+    description
+      "Add atomic-exempt attribute to AFT counters containers.";
+    reference "2.8.0";
+  }
 
   revision "2024-07-18" {
     description

release/models/aft/openconfig-aft-mpls.yang

@@ -21,7 +21,13 @@ submodule openconfig-aft-mpls {
     "Submodule containing definitions of groupings for the abstract
     forwarding table for MPLS label forwarding.";
 
-  oc-ext:openconfig-version "2.7.0";
+  oc-ext:openconfig-version "2.8.0";
+
+  revision "2024-09-19" {
+    description
+      "Add atomic-exempt attribute to AFT counters containers.";
+    reference "2.8.0";
+  }
 
   revision "2024-09-05" {
     description

release/models/aft/openconfig-aft-pf.yang

@@ -28,7 +28,13 @@ submodule openconfig-aft-pf {
     fields other than the destination address that is used in
     other forwarding tables.";
 
-  oc-ext:openconfig-version "2.7.0";
+  oc-ext:openconfig-version "2.8.0";
+
+  revision "2024-09-19" {
+    description
+      "Add atomic-exempt attribute to AFT counters containers.";
+    reference "2.8.0";
+  }
 
   revision "2024-07-18" {
     description

release/models/aft/openconfig-aft-state-synced.yang

@@ -16,7 +16,13 @@ submodule openconfig-aft-state-synced {
     "Submodule containing definitions of groupings for the state
     synced signals corresponding to various abstract forwarding tables.";
 
-  oc-ext:openconfig-version "2.7.0";
+  oc-ext:openconfig-version "2.8.0";
+
+  revision "2024-09-19" {
+    description
+      "Add atomic-exempt attribute to AFT counters containers.";
+    reference "2.8.0";
+  }
 
   revision "2024-07-18" {
     description

release/models/aft/openconfig-aft.yang

@@ -42,7 +42,13 @@ module openconfig-aft {
     is referred to as an Abstract Forwarding Table (AFT), rather than
     the FIB.";
 
-  oc-ext:openconfig-version "2.7.0";
+  oc-ext:openconfig-version "2.8.0";
+
+  revision "2024-09-19" {
+    description
+      "Add atomic-exempt attribute to AFT counters containers.";
+    reference "2.8.0";
+  }
 
   revision "2024-09-05" {
     description

release/models/ethernet-segments/openconfig-ethernet-segments.yang

@@ -8,6 +8,7 @@ module openconfig-ethernet-segments {
 
   import openconfig-extensions { prefix oc-ext; }
   import openconfig-interfaces { prefix oc-if; }
+  import openconfig-yang-types { prefix oc-yang-types; }
   import openconfig-evpn-types { prefix oc-evpn-types; }
 
   // meta
@@ -23,7 +24,13 @@ module openconfig-ethernet-segments {
      The ethernet segments are used in EVPN services are
      defined for the whole device";
 
-  oc-ext:openconfig-version "0.1.0";
+  oc-ext:openconfig-version "0.2.0";
+
+  revision "2024-09-06" {
+    description
+      "Added ability to configure an explicit es-import-route-target for an ES";
+    reference "0.2.0";
+  }
 
   revision "2021-06-28" {
    description
@@ -199,6 +206,17 @@ grouping evpn-ethernet-segment-df-config {
         "RFC 7432: BGP MPLS-Based Ethernet VPN";
     }
 
+    leaf es-import-route-target {
+      type oc-yang-types:mac-address;
+      description
+        "Received ES routes with an ES-Import extended community set to this value
+        are imported into this ethernet segment.  When configured by a user, the
+        es-import-route-target will be used, otherwise the system automatically
+        derives the value used by following the procedures in RFC 7432 Section 7.6.";
+      reference
+        "RFC 7432: BGP MPLS-Based Ethernet VPN Section 7.6";
+    }
+
     uses oc-if:interface-ref-common;
   }
 
@@ -247,4 +265,4 @@ grouping evpn-ethernet-segment-df-config {
 
   uses evpn-ethernet-segment-top;
 
-}
+}

release/models/openconfig-extensions.yang

@@ -18,7 +18,13 @@ module openconfig-extensions {
     "This module provides extensions to the YANG language to allow
     OpenConfig specific functionality and meta-data to be defined.";
 
-  oc-ext:openconfig-version "0.5.1";
+  oc-ext:openconfig-version "0.6.0";
+
+  revision "2024-09-19" {
+    description
+      "Add telemetry-atomic-exempt annotation.";
+    reference "0.6.0";
+  }
 
   revision "2022-10-05" {
     description
@@ -154,7 +160,7 @@ module openconfig-extensions {
   extension telemetry-atomic {
     description
       "The telemetry-atomic annotation is specified in the context of
-      a subtree (containre, or list), and indicates that all nodes
+      a subtree (container, or list), and indicates that all nodes
       within the subtree are always updated together within the data
       model. For example, all elements under the subtree may be updated
       as a result of a new alarm being raised, or the arrival of a new
@@ -164,6 +170,23 @@ module openconfig-extensions {
       optimisations for sending or storing the corresponding data.";
   }
 
+  extension telemetry-atomic-exempt {
+    description
+      "The telemetry-atomic-exempt annotation is specified in the context
+      of a node or subtree (container, or list), and indicates that the node
+      or all nodes within the subtree are not always updated together within
+      the data model of the parent tree. All elements under the subtree may
+      not be updated as a result of a new alarm being raised, or the arrival
+      of a new protocol message that updates the parent tree.
+
+      This annotation allows parent tree containers with telemetry-atomic
+      annotation to not be updated when a more frequently updated node or
+      subtree. For example, a counters container is present.
+
+      This extension should only be used when there is a parent that
+      contains telemetry-atomic extension.";
+  }
+
   extension operational {
     description
       "The operational annotation is specified in the context of a