Add MPLS-in-UDP and GUE decap actions to policy-forwarding. (openconf…

…ig#1072) * Add decapsulate-gue and decapsulate-gre PF actions. * (M) policy-forwarding/openconfig-pf-forwarding-policies.yang - Added MPLS-in-UDP decapsulation action [RFC 7510] - Added Generic UDP Encapsulation (GUE) decapsulation action [https://datatracker.ietf.org/doc/draft-ietf-intarea-gue/] * Bump version of policy-forwarding module. * Merge updates from openconfig/public. * Clean up trailing whitespace. Co-authored-by: Dan Ameme <[email protected]>
gizzygizmo · Feb 23, 2022 · 8c2fb05 · 8c2fb05
1 parent 4a8a67e
commit 8c2fb05
Show file tree

Hide file tree

Showing 4 changed files with 48 additions and 4 deletions.
diff --git a/release/models/policy-forwarding/openconfig-pf-forwarding-policies.yang b/release/models/policy-forwarding/openconfig-pf-forwarding-policies.yang
@@ -21,7 +21,13 @@ submodule openconfig-pf-forwarding-policies {
     "This submodule contains configuration and operational state
     relating to the definition of policy-forwarding policies.";
 
-  oc-ext:openconfig-version "0.4.0";
+  oc-ext:openconfig-version "0.5.0";
+
+  revision "2022-01-25" {
+    description
+      "Add GUE and MPLS-in-UDP decapsulation actions.";
+    reference "0.5.0";
+  }
 
   revision "2021-08-06" {
     description
@@ -300,6 +306,26 @@ submodule openconfig-pf-forwarding-policies {
         should be forwarded to the next-hop IP address, bypassing any
         lookup on the local system.";
     }
+
+    leaf decapsulate-mpls-in-udp {
+      type boolean;
+      default false;
+      description
+        "When this leaf is set to true, the local system should remove
+        the UDP header from the packet matching the rule.
+        Following the decapsulation it should subsequently forward the
+        encapsulated packet according to the underlying MPLS label.";
+    }
+
+    leaf decapsulate-gue {
+      type boolean;
+      default false;
+      description
+        "When this leaf is set to true, the local system should remove
+        the Generic UDP Encapsulation (GUE) header from the packet matching
+        the rule. Following the decapsulation it should subsequently forward the
+        encapsulated packet according to the underlying IPv4 or IPv6 header.";
+    }
   }
 
   grouping pf-forwarding-policy-action-encapsulate-gre {

diff --git a/release/models/policy-forwarding/openconfig-pf-interfaces.yang b/release/models/policy-forwarding/openconfig-pf-interfaces.yang
@@ -19,7 +19,13 @@ submodule openconfig-pf-interfaces {
     "This submodule contains groupings related to the association
     between interfaces and policy forwarding rules.";
 
-  oc-ext:openconfig-version "0.4.0";
+  oc-ext:openconfig-version "0.5.0";
+
+  revision "2022-01-25" {
+    description
+      "Add GUE and MPLS-in-UDP decapsulation actions.";
+    reference "0.5.0";
+  }
 
   revision "2021-08-06" {
     description

diff --git a/release/models/policy-forwarding/openconfig-pf-path-groups.yang b/release/models/policy-forwarding/openconfig-pf-path-groups.yang
@@ -18,7 +18,13 @@ submodule openconfig-pf-path-groups {
     forwarding entities together to be used as policy forwarding
     targets.";
 
-  oc-ext:openconfig-version "0.4.0";
+  oc-ext:openconfig-version "0.5.0";
+
+  revision "2022-01-25" {
+    description
+      "Add GUE and MPLS-in-UDP decapsulation actions.";
+    reference "0.5.0";
+  }
 
   revision "2021-08-06" {
     description

diff --git a/release/models/policy-forwarding/openconfig-policy-forwarding.yang b/release/models/policy-forwarding/openconfig-policy-forwarding.yang
@@ -81,7 +81,13 @@ module openconfig-policy-forwarding {
     The forwarding action of the corresponding policy is set to
     PATH_GROUP and references the configured group of LSPs.";
 
-  oc-ext:openconfig-version "0.4.0";
+  oc-ext:openconfig-version "0.5.0";
+
+  revision "2022-01-25" {
+    description
+      "Add GUE and MPLS-in-UDP decapsulation actions.";
+    reference "0.5.0";
+  }
 
   revision "2021-08-06" {
     description