From a688fae99ae9f62d39db70ddd4317741f7e8e383 Mon Sep 17 00:00:00 2001
From: dplore <dloher@google.com>
Date: Thu, 5 Sep 2024 19:39:49 -0700
Subject: [PATCH] add state containers

---
 release/models/aft/openconfig-aft-common.yang | 25 +++++++++++++++----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/release/models/aft/openconfig-aft-common.yang b/release/models/aft/openconfig-aft-common.yang
index f6d60a9f3..6654ae3ec 100644
--- a/release/models/aft/openconfig-aft-common.yang
+++ b/release/models/aft/openconfig-aft-common.yang
@@ -289,26 +289,41 @@ submodule openconfig-aft-common {
             container gre {
               description 
                 "Container of nodes for GRE encapsulation.";
-
-              uses aft-common-entry-nexthop-gre-state;
+              container state {
+                description 
+                  "State parameters relating to GRE encapsulation headers.";
+                uses aft-common-entry-nexthop-gre-state;
+              }
             }
 
             container ip {
               description 
                 "Container of nodes for IP encapsulation.";
-              uses aft-common-entry-nexthop-ip-state;
+              container state {
+                description 
+                  "State parameters relating to IP encapsulation headers.";
+                uses aft-common-entry-nexthop-ip-state;
+              }
             }
 
             container mpls {
               description 
                 "Container of nodes for IP encapsulation.";
-              uses aft-common-entry-nexthop-mpls-state;
+              container state {
+                description 
+                  "State parameters relating to MPLS encapsulation headers.";
+                uses aft-common-entry-nexthop-mpls-state;
+              }
             }
 
             container udp {
               description 
                 "Container of nodes for UDP encapsulation.";
-              uses aft-common-entry-nexthop-udp-state;
+              container state {
+                description 
+                  "State parameters relating to UDP encapsulation headers.";
+                uses aft-common-entry-nexthop-udp-state;
+              }
             }
           }
         }