From 02ea2bec110c6cb74ba50b91705b3ae46fe60179 Mon Sep 17 00:00:00 2001
From: Dan Ameme <danameme@google.com>
Date: Wed, 30 Oct 2024 12:22:10 -0700
Subject: [PATCH] Add policy forwarding for next hop match and GUE
 encapsulation action

---
 .../openconfig-pf-forwarding-policies.yang    | 44 +------------------
 1 file changed, 2 insertions(+), 42 deletions(-)

diff --git a/release/models/policy-forwarding/openconfig-pf-forwarding-policies.yang b/release/models/policy-forwarding/openconfig-pf-forwarding-policies.yang
index 352eb526f..593fa2d47 100644
--- a/release/models/policy-forwarding/openconfig-pf-forwarding-policies.yang
+++ b/release/models/policy-forwarding/openconfig-pf-forwarding-policies.yang
@@ -8,6 +8,8 @@ submodule openconfig-pf-forwarding-policies {
   import openconfig-yang-types { prefix "oc-yang"; }
   import openconfig-inet-types { prefix "oc-inet"; }
   import openconfig-types { prefix oc-types; }
+  import openconfig-mpls-types { prefix "oc-mplst"; }
+  import openconfig-evpn-types { prefix "oc-evpn-types"; }
 
   include openconfig-pf-path-groups;
 
@@ -718,27 +720,6 @@ submodule openconfig-pf-forwarding-policies {
             uses pf-encap-udp-config;
           }
         }
-
-        container vxlan {
-          when "../config/type = 'oc-types:VXLAN'";
-          description
-            "Container of nodes for VXLAN encapsulation.";
-
-          container config {
-            description
-              "Config parameters relating to VXLAN encapsulation headers.";
-
-            uses pf-encap-vxlan-config;
-          }
-
-          container state {
-            config false;
-            description
-              "State parameters relating to VXLAN encapsulation headers.";
-
-            uses pf-encap-vxlan-config;
-          }
-        }
       }
     }
   }
@@ -885,27 +866,6 @@ submodule openconfig-pf-forwarding-policies {
     }
   }
 
-  grouping pf-encap-vxlan-config {
-    description
-      "VXLAN encapsulation applied on top of a packet.";
-
-    leaf vni-label {
-      type oc-evpn-types:evi-id;
-      description
-        "Where applicable, the next hop label representing the virtual
-        network identifier (VNI) for the forwarding entry. This leaf is
-        applicable only to next-hops which include VXLAN encapsulation
-        header information";
-    }
-
-    leaf tunnel-src-ip-address {
-      type oc-inet:ip-address;
-      description
-        "Where applicable this represents the vxlan tunnel source ip address.
-        For VXLAN this represents the source VTEP ip address";
-    }
-  }
-
   grouping pf-match-next-hop-groups-config {
     description
       "Configuration parameters relating matching next-hop of a packet.";