Add policy forwarding for next hop match and GUE encapsulation action…

… (resolve conflicts)

release/models/aft/.spec.yml

@@ -1,7 +1,6 @@
 - name: openconfig-aft
   docs:
     - yang/aft/openconfig-aft.yang
-    - yang/aft/openconfig-aft-types.yang
     - yang/aft/openconfig-aft-summary.yang
   build:
     - yang/network-instance/openconfig-network-instance.yang

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

@@ -9,7 +9,7 @@ submodule openconfig-aft-common {
   import openconfig-inet-types { prefix "oc-inet"; }
   import openconfig-mpls-types { prefix "oc-mplst"; }
   import openconfig-policy-types { prefix "oc-pol-types"; }
-  import openconfig-aft-types { prefix "oc-aftt"; }
+  import openconfig-types { prefix oc-types; }
   import openconfig-evpn-types { prefix "oc-evpn-types"; }
 
   organization
@@ -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.8.0";
+  oc-ext:openconfig-version "2.9.0";
+
+  revision "2024-10-20" {
+    description
+      "Add support for policy forwarding match on next hop and GUE encapsulation action.";
+    reference "2.9.0";
+  }
 
   revision "2024-09-19" {
     description
@@ -309,7 +315,7 @@ submodule openconfig-aft-common {
             }
 
             container gre {
-              when "../state/type = 'oc-aftt:GRE'";
+              when "../state/type = 'oc-types:GRE'";
               description
                 "Container of nodes for GRE encapsulation.";
 
@@ -322,7 +328,7 @@ submodule openconfig-aft-common {
             }
 
             container ipv4 {
-              when "../state/type = 'oc-aftt:IPV4'";
+              when "../state/type = 'oc-types:IPV4'";
               description
                 "Container of nodes for UDP in IPv4 encapsulation.  When this
                 container is used, an IPv4 packet with no transport header
@@ -337,7 +343,7 @@ submodule openconfig-aft-common {
             }
 
             container ipv6 {
-              when "../state/type = 'oc-aftt:IPV6'";
+              when "../state/type = 'oc-types:IPV6'";
               description
                 "Container of nodes for UDP in IPv6 encapsulation.  When this
                 container is used, an IPv6 packet with no transport header
@@ -352,7 +358,7 @@ submodule openconfig-aft-common {
             }
 
             container mpls {
-              when "../state/type = 'oc-aftt:MPLS'";
+              when "../state/type = 'oc-types:MPLS'";
               description
                 "Container of nodes for MPLS encapsulation.";
 
@@ -365,7 +371,7 @@ submodule openconfig-aft-common {
             }
 
             container udp-v4 {
-              when "../state/type = 'oc-aftt:UDPV4'";
+              when "../state/type = 'oc-types:UDPV4'";
               description
                 "Container of nodes for UDP in IPv4 encapsulation.  When this
                 container is used, an IPv4 header with a UDP header is added
@@ -381,7 +387,7 @@ submodule openconfig-aft-common {
             }
 
             container udp-v6 {
-              when "../state/type = 'oc-aftt:UDPV6'";
+              when "../state/type = 'oc-types:UDPV6'";
               description
                 "Container of nodes for UDP in IPv6 encapsulation.  When this
                 container is used, an IPv6 header with a UDP header is added
@@ -397,7 +403,7 @@ submodule openconfig-aft-common {
             }
 
             container vxlan {
-              when "../state/type = 'oc-aftt:VXLAN'";
+              when "../state/type = 'oc-types:VXLAN'";
               description
                 "Container of nodes for VXLAN encapsulation.";
 
@@ -428,7 +434,7 @@ submodule openconfig-aft-common {
     }
 
     leaf type {
-      type oc-aftt:encapsulation-header-type;
+      type oc-types:encapsulation-header-type;
       description
         "Defines which type of packet header should be used.";
     }
@@ -577,7 +583,7 @@ submodule openconfig-aft-common {
     }
 
     leaf encapsulate-header {
-      type oc-aftt:encapsulation-header-type;
+      type oc-types:encapsulation-header-type;
       description
         "When forwarding a packet to the specified next-hop the local
         system performs an encapsulation of the packet - adding the
@@ -590,7 +596,7 @@ submodule openconfig-aft-common {
     }
 
     leaf decapsulate-header {
-      type oc-aftt:encapsulation-header-type;
+      type oc-types:encapsulation-header-type;
       description
         "When forwarding a packet to the specified next-hop, the local
          system performs a decapsulation of the packet - removing the
@@ -780,7 +786,7 @@ submodule openconfig-aft-common {
     uses aft-common-install-protocol;
 
     leaf decapsulate-header {
-      type oc-aftt:encapsulation-header-type;
+      type oc-types:encapsulation-header-type;
       description
         "When forwarding a packet to the specified next-hop, the local
         system performs a decapsulation of the packet - removing the

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.8.0";
+  oc-ext:openconfig-version "2.9.0";
+
+  revision "2024-10-20" {
+    description
+      "Add support for policy forwarding match on next hop and GUE encapsulation action.";
+    reference "2.9.0";
+  }
 
   revision "2024-09-19" {
     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.8.0";
+  oc-ext:openconfig-version "2.9.0";
+
+  revision "2024-10-20" {
+    description
+      "Add support for policy forwarding match on next hop and GUE encapsulation action.";
+    reference "2.9.0";
+  }
 
   revision "2024-09-19" {
     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.8.0";
+  oc-ext:openconfig-version "2.9.0";
+
+  revision "2024-10-20" {
+    description
+      "Add support for policy forwarding match on next hop and GUE encapsulation action.";
+    reference "2.9.0";
+  }
 
   revision "2024-09-19" {
     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.8.0";
+  oc-ext:openconfig-version "2.9.0";
+
+  revision "2024-10-20" {
+    description
+      "Add support for policy forwarding match on next hop and GUE encapsulation action.";
+    reference "2.9.0";
+  }
 
   revision "2024-09-19" {
     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.8.0";
+  oc-ext:openconfig-version "2.9.0";
+
+  revision "2024-10-20" {
+    description
+      "Add support for policy forwarding match on next hop and GUE encapsulation action.";
+    reference "2.9.0";
+  }
 
   revision "2024-09-19" {
     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.8.0";
+  oc-ext:openconfig-version "2.9.0";
+
+  revision "2024-10-20" {
+    description
+      "Add support for policy forwarding match on next hop and GUE encapsulation action.";
+    reference "2.9.0";
+  }
 
   revision "2024-09-19" {
     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.8.0";
+  oc-ext:openconfig-version "2.9.0";
+
+  revision "2024-10-20" {
+    description
+      "Add support for policy forwarding match on next hop and GUE encapsulation action.";
+    reference "2.9.0";
+  }
 
   revision "2024-09-19" {
     description