Merge branch 'master' into master

.github/pull_request_template.md

@@ -3,7 +3,7 @@ tagged with "Note" can be removed from the template.]
 
 [Note: Before this PR can be reviewed please agree to the CLA covering this
 repo. Please also review the contribution guide -
-https://github.com/openconfig/public/blob/master/doc/external-contributions-guide.md]
+https://github.com/openconfig/public/blob/master/doc/contributions-guide.md]
 
 ### Change Scope
 

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/bgp/openconfig-bgp-policy.yang

@@ -28,7 +28,14 @@ module openconfig-bgp-policy {
     It augments the base routing-policy module with BGP-specific
     options for conditions and actions.";
 
-  oc-ext:openconfig-version "7.1.0";
+  oc-ext:openconfig-version "8.0.0";
+
+  revision "2024-08-23" {
+    description
+      "Separate the ability to set the BGP MED along with an appropriate
+      action.";
+    reference "8.0.0";
+  }
 
   revision "2024-07-02" {
     description
@@ -210,23 +217,40 @@ module openconfig-bgp-policy {
   typedef bgp-set-med-type {
     type union {
       type uint32;
-      type string {
-        pattern '[+-][0-9]+';
-        oc-ext:posix-pattern '^[+-][0-9]+$';
-      }
       type enumeration {
         enum IGP {
-          description "set the MED value to the IGP cost toward the
-          next hop for the route";
+          description
+            "Set the MED value to the IGP cost toward the next hop for
+            the route";
         }
       }
     }
     description
-      "Type definition for specifying how the BGP MED can
-      be set in BGP policy actions. The three choices are to set
-      the MED directly using the uint32 type or increment/decrement
-      using +/- notation in the string type or setting it to
-      the IGP cost using the enum (predefined value).";
+      "Type definition for specifying how the BGP MED can be set in BGP
+      policy actions.  The MED can be specified as a direct integer
+      value or setting it to the IGP cost.  To be used in conjunction
+      with `bgp-set-med-action` in order to specify the appropriate
+      action to take on this value.";
+  }
+
+  typedef bgp-set-med-action {
+    type enumeration {
+      enum SET {
+        description
+          "Action to set the MED to a specific value.";
+      }
+      enum ADD {
+        description
+          "Action to increment the previous MED value.";
+      }
+      enum SUBTRACT {
+        description
+          "Action to decrement the previous MED value.";
+      }
+    }
+    description
+      "Specifies which action to take on the value specified by the
+      bgp-set-med-type.";
   }
 
   // grouping statements
@@ -1345,8 +1369,24 @@ module openconfig-bgp-policy {
 
     leaf set-med {
       type bgp-set-med-type;
-      description "set the med metric attribute in the route
-      update";
+      must "../set-med-action" {
+        error-message
+          "set-med cannot be specified without a valid set-med-action";
+      }
+      description
+        "Set the MED metric attribute in the route update.  When set, a
+        valid `set-med-action` must be specified.";
+    }
+
+    leaf set-med-action {
+      type bgp-set-med-action;
+      must "../set-med" {
+        error-message
+          "set-med-action cannot be specified without a set-med value";
+      }
+      description
+        "When set-med is specified, this leaf is mandatory to set the
+        appropriate action on the MED metric value.";
     }
   }
 

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;
 
-}
+}