From 041927452095aac00e9cce83a75c52d910874be5 Mon Sep 17 00:00:00 2001
From: dplore <dloher@google.com>
Date: Wed, 11 Sep 2024 16:57:41 -0700
Subject: [PATCH] create vxlan encap container and move vni-label and
 tunnel-src-ip-address

---
 release/models/aft/openconfig-aft-common.yang | 44 ++++++++++++++++++-
 1 file changed, 42 insertions(+), 2 deletions(-)

diff --git a/release/models/aft/openconfig-aft-common.yang b/release/models/aft/openconfig-aft-common.yang
index a673ad759..693bec875 100644
--- a/release/models/aft/openconfig-aft-common.yang
+++ b/release/models/aft/openconfig-aft-common.yang
@@ -349,6 +349,17 @@ submodule openconfig-aft-common {
               }
             }
 
+            container vxlan {
+              when "../state/type = 'oc-aftt:VXLAN'";
+              description
+                "Container of nodes for VXLAN encapsulation.";
+              container state {
+                description
+                  "State parameters relating to VXLAN encapsulation headers.";
+                uses aft-common-entry-nexthop-vxlan-state;
+              }
+            }
+
           }
         }
 
@@ -415,18 +426,26 @@ submodule openconfig-aft-common {
 
     leaf vni-label {
       type oc-evpn-types:evi-id;
+      status deprecated;
       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";
+        header information.
+        
+        This leaf is deprecated.  The encap-headers/encap-header/xvlan tree
+        should be used instead.";
     }
 
     leaf tunnel-src-ip-address {
       type oc-inet:ip-address;
+      status deprecated;
       description
         "Where applicable this represents the vxlan tunnel source ip address.
-        For VXLAN this represents the source VTEP ip address";
+        For VXLAN this represents the source VTEP ip address.
+
+        This leaf is deprecated.  The encap-headers/encap-header/xvlan tree
+        should be used instead.";
     }
   }
 
@@ -664,6 +683,27 @@ submodule openconfig-aft-common {
     }
   }
 
+  grouping aft-common-entry-nexthop-vxlan-state {
+    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 aft-common-install-protocol {
     description
       "Grouping for a common reference to the protocol which