Add aft encapsulation-headers

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

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

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

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

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

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

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

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

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

@@ -19,7 +19,13 @@ module openconfig-mpls-types {
   description
     "General types for MPLS / TE data model";
 
-  oc-ext:openconfig-version "3.5.0";
+  oc-ext:openconfig-version "3.6.0";
+
+  revision "2024-07-24" {
+    description
+      "Add mpls-label-stack typdef";
+    reference "3.6.0";
+  }
 
   revision "2023-12-14" {
     description
@@ -479,6 +485,19 @@ module openconfig-mpls-types {
     reference "RFC 3032 - MPLS Label Stack Encoding";
   }
 
+  typedef mpls-label-stack {
+    type mpls-label;
+  description
+    "Type used to specify a stack of MPLS label values.  This type must be
+     used in a leaf-list which is ordered by user. The the stack of labels
+     is encoded where the first entry in the list is the label at the bottom
+     of the stack.
+
+     For example, a packet with a label stack of two labels, the bottom
+     label being 42 and the top label being 8072 will be represented with
+     a leaf-list of [42, 8072].";
+  }
+
   typedef tunnel-type {
     type enumeration {
       enum P2P {