Merge branch 'master' into aft-atomic-exempt

openconfig · Oct 8, 2024 · a8a3af7 · a8a3af7
2 parents 328106c + 868ab34
commit a8a3af7
Show file tree

Hide file tree

Showing 10 changed files with 396 additions and 23 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/multicast/openconfig-pim-types.yang b/release/models/multicast/openconfig-pim-types.yang
@@ -21,7 +21,13 @@ module openconfig-pim-types {
     description
       "This module defines types related to the PIM protocol model.";
 
-    oc-ext:openconfig-version "0.1.1";
+    oc-ext:openconfig-version "0.1.2";
+
+    revision "2024-05-31" {
+      description
+        "Add PIM bidirectional mode.";
+      reference "0.1.2";
+    }
 
     revision "2018-11-21" {
       description
@@ -62,6 +68,13 @@ module openconfig-pim-types {
         reference "RFC3973";
     }
 
+    identity PIM_MODE_BIDIR {
+        base PIM_MODE;
+        description
+          "PIM bidirectional mode.";
+        reference "RFC5015";
+    }
+
     // typedef statements
 
     typedef dr-priority-type {