Merge branch 'master' into evpn-redist

openconfig · Oct 7, 2024 · 9760799 · 9760799
2 parents ea8afc4 + f238a8d
commit 9760799
Show file tree

Hide file tree

Showing 30 changed files with 2,311 additions and 52 deletions.
diff --git a/release/models/aft/openconfig-aft-common.yang b/release/models/aft/openconfig-aft-common.yang
diff --git a/release/models/aft/openconfig-aft-ethernet.yang b/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.6.0";
+  oc-ext:openconfig-version "2.7.0";
+
+  revision "2024-07-18" {
+    description
+        "Add container for mpls-in-udp under next-hops aft entry state.";
+      reference "2.7.0";
+  }
 
   revision "2024-04-25" {
     description

diff --git a/release/models/aft/openconfig-aft-ipv4.yang b/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.6.0";
+  oc-ext:openconfig-version "2.7.0";
+
+  revision "2024-09-05" {
+    description
+        "Add encapsulate-stack under aft next-hops.";
+      reference "2.7.0";
+  }
 
   revision "2024-04-25" {
     description

diff --git a/release/models/aft/openconfig-aft-ipv6.yang b/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.6.0";
+  oc-ext:openconfig-version "2.7.0";
+
+  revision "2024-07-18" {
+    description
+        "Add container for mpls-in-udp under next-hops aft entry state.";
+      reference "2.7.0";
+  }
 
   revision "2024-04-25" {
     description

diff --git a/release/models/aft/openconfig-aft-mpls.yang b/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.6.0";
+  oc-ext:openconfig-version "2.7.0";
+
+  revision "2024-09-05" {
+    description
+        "Add encapsulate-stack under aft next-hops.";
+      reference "2.7.0";
+  }
 
   revision "2024-04-25" {
     description

diff --git a/release/models/aft/openconfig-aft-pf.yang b/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.6.0";
+  oc-ext:openconfig-version "2.7.0";
+
+  revision "2024-07-18" {
+    description
+        "Add container for mpls-in-udp under next-hops aft entry state.";
+      reference "2.7.0";
+  }
 
   revision "2024-04-25" {
     description

diff --git a/release/models/aft/openconfig-aft-state-synced.yang b/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.6.0";
+  oc-ext:openconfig-version "2.7.0";
+
+  revision "2024-07-18" {
+    description
+        "Add container for mpls-in-udp under next-hops aft entry state.";
+      reference "2.7.0";
+  }
 
   revision "2024-04-25" {
     description

diff --git a/release/models/aft/openconfig-aft-types.yang b/release/models/aft/openconfig-aft-types.yang
@@ -16,7 +16,13 @@ module openconfig-aft-types {
     "Types related to the OpenConfig Abstract Forwarding
     Table (AFT) model";
 
-  oc-ext:openconfig-version "1.1.0";
+  oc-ext:openconfig-version "1.2.0";
+
+  revision "2024-07-18" {
+    description
+        "Add MPLS in UDP enums for encapsulate-header.";
+      reference "1.2.0";
+  }
 
   revision "2022-05-05" {
     description
@@ -89,6 +95,10 @@ module openconfig-aft-types {
         description
           "The encapsulation header is a VXLAN packet header";
       }
+      enum UDP {
+        description
+          "The encapsulation header is UDP packet header.";
+      }
     }
     description
       "Types of tunnel encapsulation that are supported by systems as either

diff --git a/release/models/aft/openconfig-aft.yang b/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.6.0";
+  oc-ext:openconfig-version "2.7.0";
+
+  revision "2024-09-05" {
+    description
+        "Add encapsulate-stack under aft next-hops.";
+      reference "2.7.0";
+  }
 
   revision "2024-04-25" {
     description

diff --git a/release/models/bgp/openconfig-bgp-common-multiprotocol.yang b/release/models/bgp/openconfig-bgp-common-multiprotocol.yang
@@ -24,7 +24,13 @@ submodule openconfig-bgp-common-multiprotocol {
     for multiple protocols in BGP. The groupings are common across
     multiple contexts.";
 
-  oc-ext:openconfig-version "9.7.1";
+  oc-ext:openconfig-version "9.8.0";
+
+  revision "2024-09-06" {
+    description
+      "Restore NONE enum value for community-type.";
+    reference "9.8.0";
+  }
 
   revision "2023-12-28" {
     description

diff --git a/release/models/bgp/openconfig-bgp-common-structure.yang b/release/models/bgp/openconfig-bgp-common-structure.yang
@@ -21,7 +21,13 @@ submodule openconfig-bgp-common-structure {
     "This sub-module contains groupings that are common across multiple BGP
     contexts and provide structure around other primitive groupings.";
 
-  oc-ext:openconfig-version "9.7.1";
+  oc-ext:openconfig-version "9.8.0";
+
+  revision "2024-09-06" {
+    description
+      "Restore NONE enum value for community-type.";
+    reference "9.8.0";
+  }
 
   revision "2023-12-28" {
     description

diff --git a/release/models/bgp/openconfig-bgp-common.yang b/release/models/bgp/openconfig-bgp-common.yang
@@ -24,7 +24,13 @@ submodule openconfig-bgp-common {
     may be application to a subset of global, peer-group or neighbor
     contexts.";
 
-  oc-ext:openconfig-version "9.7.1";
+  oc-ext:openconfig-version "9.8.0";
+
+  revision "2024-09-06" {
+    description
+      "Restore NONE enum value for community-type.";
+    reference "9.8.0";
+  }
 
   revision "2023-12-28" {
     description
@@ -326,9 +332,10 @@ submodule openconfig-bgp-common {
     leaf-list send-community-type {
       type oc-bgp-types:community-type;
       description
-        "Specify which types of community should be sent to the
-        neighbor or group. The default is to not send the
-        community attribute";
+        "Specify which types of community should be sent to the neighbor or
+        group. The default is to not send the community attribute.  Note, if
+        the NONE community-type is specified, no other types must be
+        specified.";
     }
 
     leaf description {

diff --git a/release/models/bgp/openconfig-bgp-errors.yang b/release/models/bgp/openconfig-bgp-errors.yang
@@ -18,7 +18,13 @@ submodule openconfig-bgp-errors {
     "This module defines BGP NOTIFICATION message error codes
     and subcodes";
 
-  oc-ext:openconfig-version "6.0.0";
+  oc-ext:openconfig-version "6.1.0";
+
+  revision "2024-09-06" {
+    description
+      "Restore NONE enum value for community-type.";
+    reference "6.1.0";
+  }
 
   revision "2024-01-31" {
     description

diff --git a/release/models/bgp/openconfig-bgp-global.yang b/release/models/bgp/openconfig-bgp-global.yang
@@ -27,7 +27,13 @@ submodule openconfig-bgp-global {
     "This sub-module contains groupings that are specific to the
     global context of the OpenConfig BGP module";
 
-  oc-ext:openconfig-version "9.7.1";
+  oc-ext:openconfig-version "9.8.0";
+
+  revision "2024-09-06" {
+    description
+      "Restore NONE enum value for community-type.";
+    reference "9.8.0";
+  }
 
   revision "2023-12-28" {
     description

diff --git a/release/models/bgp/openconfig-bgp-neighbor.yang b/release/models/bgp/openconfig-bgp-neighbor.yang
@@ -30,7 +30,13 @@ submodule openconfig-bgp-neighbor {
     "This sub-module contains groupings that are specific to the
     neighbor context of the OpenConfig BGP module.";
 
-  oc-ext:openconfig-version "9.7.1";
+  oc-ext:openconfig-version "9.8.0";
+
+  revision "2024-09-06" {
+    description
+      "Restore NONE enum value for community-type.";
+    reference "9.8.0";
+  }
 
   revision "2023-12-28" {
     description

diff --git a/release/models/bgp/openconfig-bgp-peer-group.yang b/release/models/bgp/openconfig-bgp-peer-group.yang
@@ -25,7 +25,13 @@ submodule openconfig-bgp-peer-group {
     "This sub-module contains groupings that are specific to the
     peer-group context of the OpenConfig BGP module.";
 
-  oc-ext:openconfig-version "9.7.1";
+  oc-ext:openconfig-version "9.8.0";
+
+  revision "2024-09-06" {
+    description
+      "Restore NONE enum value for community-type.";
+    reference "9.8.0";
+  }
 
   revision "2023-12-28" {
     description

diff --git a/release/models/bgp/openconfig-bgp-types.yang b/release/models/bgp/openconfig-bgp-types.yang
@@ -24,7 +24,13 @@ module openconfig-bgp-types {
     policy. It can be imported by modules that make use of BGP
     attributes";
 
-  oc-ext:openconfig-version "6.0.0";
+  oc-ext:openconfig-version "6.1.0";
+
+  revision "2024-09-06" {
+    description
+      "Restore NONE enum value for community-type.";
+    reference "6.1.0";
+  }
 
   revision "2024-02-01" {
     description
@@ -795,10 +801,8 @@ module openconfig-bgp-types {
       }
       enum NONE {
         description
-            "Do not send any community attribute.
-            This value has been deprecated because the node is now
-            a leaf-list.";
-        status deprecated;
+            "Do not send any community attribute. If this value is present
+            then the other community-types must not be present.";
       }
     }
     description

diff --git a/release/models/bgp/openconfig-bgp.yang b/release/models/bgp/openconfig-bgp.yang
@@ -68,7 +68,13 @@ module openconfig-bgp {
     whereas leaf not present inherits its value from the leaf present
     at the next higher level in the hierarchy.";
 
-  oc-ext:openconfig-version "9.7.1";
+  oc-ext:openconfig-version "9.8.0";
+
+  revision "2024-09-06" {
+    description
+      "Restore NONE enum value for community-type.";
+    reference "9.8.0";
+  }
 
   revision "2023-12-28" {
     description

diff --git a/release/models/gnsi/openconfig-gnsi-credentialz.yang b/release/models/gnsi/openconfig-gnsi-credentialz.yang
@@ -39,7 +39,13 @@ module openconfig-gnsi-credentialz {
       /system/aaa/authentication/users/user/config/password-hashed
       /system/aaa/authentication/users/user/state/password-hashed";
 
-  oc-ext:openconfig-version "0.6.0";
+  oc-ext:openconfig-version "0.7.0";
+
+  revision 2024-09-10 {
+    description
+      "Adding GLOME capabilities.";
+    reference "0.7.0";
+  }
 
   revision 2024-02-13 {
     description
@@ -142,6 +148,26 @@ module openconfig-gnsi-credentialz {
     }
   }
 
+  // GLOME related definitions.
+
+  grouping glome-key-version {
+    description
+      "Version identifier for the configured GLOME key.";
+
+    leaf active-glome-key-version {
+      type version;
+      description
+        "The version of the GLOME key.";
+    }
+
+    leaf active-glome-key-created-on {
+      type created-on;
+      description
+        "The timestamp of the moment when the GLOME key
+        was created.";
+    }
+  }
+
   // Success/failure counters.
   grouping counters {
     description
@@ -232,9 +258,16 @@ module openconfig-gnsi-credentialz {
           "Console-related state.";
 
         uses counters;
+
+        leaf enabled {
+          type boolean;
+          description
+            "Whether GLOME is enabled or not.";
+        }
       }
     }
   }
+
   // System role console related definitions.
 
   grouping user-console-credentials-version {

diff --git a/release/models/keychain/openconfig-keychain-types.yang b/release/models/keychain/openconfig-keychain-types.yang
@@ -21,14 +21,26 @@ module openconfig-keychain-types {
     "This module contains general data definitions for use in
     keychain-based authentication.";
 
-  oc-ext:openconfig-version "0.3.0";
+  oc-ext:openconfig-version "0.3.1";
+
+  revision "2024-08-27" {
+    description
+      "fix typo on AES_128_CMAC";
+    reference "0.3.1";
+  }
 
   revision "2024-08-27" {
     description
       "Added AES_128_CMAC and AES_256_CMAC";
     reference "0.3.0";
   }
 
+  revision "2024-08-27" {
+    description
+      "Fix typo in identity AES_128_CMAC_96";
+    reference "0.2.1";
+  }
+
   revision "2022-03-01" {
     description
       "Remove NONE identity from AUTH_TYPE";
@@ -135,7 +147,7 @@ module openconfig-keychain-types {
         HMAC and HKDF)";
   }
 
-  identity AES_28_CMAC_96 {
+  identity AES_128_CMAC_96 {
     base CRYPTO_TYPE;
       description
         "AES-128-CMAC-96 keyed hash function based on a AES-128 block