From 68a9e7e348760e827824af29635994565e4e8f31 Mon Sep 17 00:00:00 2001
From: romeyo <romeyo@arista.com>
Date: Thu, 25 May 2023 11:01:20 -0700
Subject: [PATCH 1/7] * (M) aft/openconfig-aft-common.yang * (M)
 aft/openconfig-aft-common.yang * (M) aft/openconfig-aft-ethernet.yang * (M)
 aft/openconfig-aft-ipv4.yang * (M) aft/openconfig-aft-ipv6.yang * (M)
 aft/openconfig-aft-mpls.yang * (M) aft/openconfig-aft-pf.yang * (M)
 aft/openconfig-aft-state-synced.yang * (M) aft/openconfig-aft.yang   - Add
 next-hop-group-name in NHG AFT entry state   - Add ttl and tos in NH AFT
 entry state

---
 release/models/aft/openconfig-aft-common.yang | 30 ++++++++++++++++++-
 .../models/aft/openconfig-aft-ethernet.yang   |  9 +++++-
 release/models/aft/openconfig-aft-ipv4.yang   |  9 +++++-
 release/models/aft/openconfig-aft-ipv6.yang   |  9 +++++-
 release/models/aft/openconfig-aft-mpls.yang   |  9 +++++-
 release/models/aft/openconfig-aft-pf.yang     |  9 +++++-
 .../aft/openconfig-aft-state-synced.yang      |  9 +++++-
 release/models/aft/openconfig-aft.yang        |  9 +++++-
 8 files changed, 85 insertions(+), 8 deletions(-)

diff --git a/release/models/aft/openconfig-aft-common.yang b/release/models/aft/openconfig-aft-common.yang
index b2c44dad6..c40c3d9c7 100644
--- a/release/models/aft/openconfig-aft-common.yang
+++ b/release/models/aft/openconfig-aft-common.yang
@@ -23,7 +23,14 @@ 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.3.0";
+  oc-ext:openconfig-version "2.4.0";
+
+  revision "2023-05-25" {
+    description
+      "Add next-hop-group-name in NHG AFT entry state and
+       Add ttl and tos in NH AFT entry state";
+    reference "2.4.0";
+  }
 
   revision "2023-04-19" {
     description
@@ -359,6 +366,18 @@ submodule openconfig-aft-common {
          specified network-instance.";
     }
 
+    leaf ttl {
+      type uint32;
+      description
+        "TTL used when forwarding a packet to the specified next-hop.";
+    }
+
+    leaf tos {
+      type uint16;
+      description
+        "TOS used when forwarding a packet to the specified next-hop.";
+    }
+
     uses aft-common-install-protocol;
   }
 
@@ -579,6 +598,15 @@ submodule openconfig-aft-common {
         also be updated.";
     }
 
+    leaf next-hop-group-name {
+      type string;
+      description
+       "Where applicable, this leaf is a unique identifier string for the
+        next-hop-group. This leaf's type is able to accommodate more
+        permutations of identifiers that vendors may have and want to
+        expose.";
+    }
+
     leaf programmed-id {
       type uint64;
       description
diff --git a/release/models/aft/openconfig-aft-ethernet.yang b/release/models/aft/openconfig-aft-ethernet.yang
index d0b85dfc7..366d989eb 100644
--- a/release/models/aft/openconfig-aft-ethernet.yang
+++ b/release/models/aft/openconfig-aft-ethernet.yang
@@ -20,7 +20,14 @@ submodule openconfig-aft-ethernet {
     "Submodule containing definitions of groupings for the abstract
     forwarding tables for Ethernet.";
 
-  oc-ext:openconfig-version "2.3.0";
+  oc-ext:openconfig-version "2.4.0";
+
+  revision "2023-05-25" {
+     description
+       "Add next-hop-group-name in NHG AFT entry state and
+        Add ttl and tos in NH AFT entry state";
+     reference "2.4.0";
+  }
 
   revision "2023-04-19" {
     description
diff --git a/release/models/aft/openconfig-aft-ipv4.yang b/release/models/aft/openconfig-aft-ipv4.yang
index 04d4054c2..676ee96f5 100644
--- a/release/models/aft/openconfig-aft-ipv4.yang
+++ b/release/models/aft/openconfig-aft-ipv4.yang
@@ -20,7 +20,14 @@ submodule openconfig-aft-ipv4 {
     "Submodule containing definitions of groupings for the abstract
     forwarding tables for IPv4.";
 
-  oc-ext:openconfig-version "2.3.0";
+  oc-ext:openconfig-version "2.4.0";
+
+  revision "2023-05-25" {
+     description
+       "Add next-hop-group-name in NHG AFT entry state and
+        Add ttl and tos in NH AFT entry state";
+     reference "2.4.0";
+  }
 
   revision "2023-04-19" {
     description
diff --git a/release/models/aft/openconfig-aft-ipv6.yang b/release/models/aft/openconfig-aft-ipv6.yang
index 6b6cd1937..2c43480d2 100644
--- a/release/models/aft/openconfig-aft-ipv6.yang
+++ b/release/models/aft/openconfig-aft-ipv6.yang
@@ -20,7 +20,14 @@ submodule openconfig-aft-ipv6 {
     "Submodule containing definitions of groupings for the abstract
     forwarding tables for IPv6.";
 
-  oc-ext:openconfig-version "2.3.0";
+  oc-ext:openconfig-version "2.4.0";
+
+  revision "2023-05-25" {
+    description
+      "Add next-hop-group-name in NHG AFT entry state and
+       Add ttl and tos in NH AFT entry state";
+    reference "2.4.0";
+  }
 
   revision "2023-04-19" {
     description
diff --git a/release/models/aft/openconfig-aft-mpls.yang b/release/models/aft/openconfig-aft-mpls.yang
index 4b4fd828c..882cf8712 100644
--- a/release/models/aft/openconfig-aft-mpls.yang
+++ b/release/models/aft/openconfig-aft-mpls.yang
@@ -21,7 +21,14 @@ submodule openconfig-aft-mpls {
     "Submodule containing definitions of groupings for the abstract
     forwarding table for MPLS label forwarding.";
 
-  oc-ext:openconfig-version "2.3.0";
+  oc-ext:openconfig-version "2.4.0";
+
+  revision "2023-05-25" {
+    description
+      "Add next-hop-group-name in NHG AFT entry state and
+       Add ttl and tos in NH AFT entry state";
+    reference "2.4.0";
+  }
 
   revision "2023-04-19" {
     description
diff --git a/release/models/aft/openconfig-aft-pf.yang b/release/models/aft/openconfig-aft-pf.yang
index 85ee9d78f..9394fe7fd 100644
--- a/release/models/aft/openconfig-aft-pf.yang
+++ b/release/models/aft/openconfig-aft-pf.yang
@@ -28,7 +28,14 @@ submodule openconfig-aft-pf {
     fields other than the destination address that is used in
     other forwarding tables.";
 
-  oc-ext:openconfig-version "2.3.0";
+  oc-ext:openconfig-version "2.4.0";
+
+  revision "2023-05-25" {
+    description
+      "Add next-hop-group-name in NHG AFT entry state and
+       Add ttl and tos in NH AFT entry state";
+    reference "2.4.0";
+  }
 
   revision "2023-04-19" {
     description
diff --git a/release/models/aft/openconfig-aft-state-synced.yang b/release/models/aft/openconfig-aft-state-synced.yang
index a20dd9257..d4b926ca5 100644
--- a/release/models/aft/openconfig-aft-state-synced.yang
+++ b/release/models/aft/openconfig-aft-state-synced.yang
@@ -16,7 +16,14 @@ 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.3.0";
+  oc-ext:openconfig-version "2.4.0";
+
+  revision "2023-05-25" {
+    description
+      "Add next-hop-group-name in NHG AFT entry state and
+       Add ttl and tos in NH AFT entry state";
+    reference "2.4.0";
+  }
 
   revision "2023-04-19" {
     description
diff --git a/release/models/aft/openconfig-aft.yang b/release/models/aft/openconfig-aft.yang
index c204271de..b33187f79 100644
--- a/release/models/aft/openconfig-aft.yang
+++ b/release/models/aft/openconfig-aft.yang
@@ -42,7 +42,14 @@ module openconfig-aft {
     is referred to as an Abstract Forwarding Table (AFT), rather than
     the FIB.";
 
-  oc-ext:openconfig-version "2.3.0";
+  oc-ext:openconfig-version "2.4.0";
+
+  revision "2023-05-25" {
+    description
+      "Add next-hop-group-name in NHG AFT entry state and
+       Add ttl and tos in NH AFT entry state";
+    reference "2.4.0";
+  }
 
   revision "2023-04-19" {
     description

From dd3774ff7daade592a9fd1cf83c642c1c6fac827 Mon Sep 17 00:00:00 2001
From: romeyo <romeyo@arista.com>
Date: Tue, 6 Jun 2023 05:52:55 -0700
Subject: [PATCH 2/7] Addressed review comments

---
 release/models/aft/openconfig-aft-common.yang | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/release/models/aft/openconfig-aft-common.yang b/release/models/aft/openconfig-aft-common.yang
index c40c3d9c7..092c2010f 100644
--- a/release/models/aft/openconfig-aft-common.yang
+++ b/release/models/aft/openconfig-aft-common.yang
@@ -28,7 +28,7 @@ submodule openconfig-aft-common {
   revision "2023-05-25" {
     description
       "Add next-hop-group-name in NHG AFT entry state and
-       Add ttl and tos in NH AFT entry state";
+       Add ttl and tos in NH AFT entry state for telemetry";
     reference "2.4.0";
   }
 
@@ -369,13 +369,15 @@ submodule openconfig-aft-common {
     leaf ttl {
       type uint32;
       description
-        "TTL used when forwarding a packet to the specified next-hop.";
+        "The TTL value used by the hardware pipeline while forwarding
+         a packet to the specified next-hop.";
     }
 
     leaf tos {
       type uint16;
       description
-        "TOS used when forwarding a packet to the specified next-hop.";
+        "The TOS value used by the hardware pipeline while forwarding
+         a packet to the specified next-hop.";
     }
 
     uses aft-common-install-protocol;
@@ -602,9 +604,8 @@ submodule openconfig-aft-common {
       type string;
       description
        "Where applicable, this leaf is a unique identifier string for the
-        next-hop-group. This leaf's type is able to accommodate more
-        permutations of identifiers that vendors may have and want to
-        expose.";
+        next-hop-group. It is an arbitrary name for the group, that is
+        supported by vendors and is exposed for telemetry.";
     }
 
     leaf programmed-id {

From af0a0c908da332d64cb16b16c1dc059e8276d001 Mon Sep 17 00:00:00 2001
From: romeyo <romeyo@arista.com>
Date: Thu, 13 Jul 2023 07:42:07 -0700
Subject: [PATCH 3/7] Adding auto-size

---
 release/models/aft/openconfig-aft-common.yang       | 12 ++++++++++--
 release/models/aft/openconfig-aft-ethernet.yang     |  4 ++--
 release/models/aft/openconfig-aft-ipv4.yang         |  4 ++--
 release/models/aft/openconfig-aft-ipv6.yang         |  4 ++--
 release/models/aft/openconfig-aft-mpls.yang         |  4 ++--
 release/models/aft/openconfig-aft-pf.yang           |  4 ++--
 release/models/aft/openconfig-aft-state-synced.yang |  4 ++--
 release/models/aft/openconfig-aft.yang              |  4 ++--
 8 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/release/models/aft/openconfig-aft-common.yang b/release/models/aft/openconfig-aft-common.yang
index 092c2010f..f01c61e1e 100644
--- a/release/models/aft/openconfig-aft-common.yang
+++ b/release/models/aft/openconfig-aft-common.yang
@@ -27,8 +27,8 @@ submodule openconfig-aft-common {
 
   revision "2023-05-25" {
     description
-      "Add next-hop-group-name in NHG AFT entry state and
-       Add ttl and tos in NH AFT entry state for telemetry";
+      "Add next-hop-group-name and auto-size in NHG AFT entry state
+       and Add ttl and tos in NH AFT entry state for telemetry";
     reference "2.4.0";
   }
 
@@ -608,6 +608,14 @@ submodule openconfig-aft-common {
         supported by vendors and is exposed for telemetry.";
     }
 
+    leaf auto-size {
+      type boolean;
+      description
+       "Where applicable, this leaf is a indicator of the
+        next-hop-group size being automatically determined or is it
+        configured to a fixed size.";
+    }
+
     leaf programmed-id {
       type uint64;
       description
diff --git a/release/models/aft/openconfig-aft-ethernet.yang b/release/models/aft/openconfig-aft-ethernet.yang
index 366d989eb..977215186 100644
--- a/release/models/aft/openconfig-aft-ethernet.yang
+++ b/release/models/aft/openconfig-aft-ethernet.yang
@@ -24,8 +24,8 @@ submodule openconfig-aft-ethernet {
 
   revision "2023-05-25" {
      description
-       "Add next-hop-group-name in NHG AFT entry state and
-        Add ttl and tos in NH AFT entry state";
+       "Add next-hop-group-name and auto-size in NHG AFT entry state
+        and Add ttl and tos in NH AFT entry state";
      reference "2.4.0";
   }
 
diff --git a/release/models/aft/openconfig-aft-ipv4.yang b/release/models/aft/openconfig-aft-ipv4.yang
index 676ee96f5..ad14e5c06 100644
--- a/release/models/aft/openconfig-aft-ipv4.yang
+++ b/release/models/aft/openconfig-aft-ipv4.yang
@@ -24,8 +24,8 @@ submodule openconfig-aft-ipv4 {
 
   revision "2023-05-25" {
      description
-       "Add next-hop-group-name in NHG AFT entry state and
-        Add ttl and tos in NH AFT entry state";
+       "Add next-hop-group-name and auto-size in NHG AFT entry state
+        and Add ttl and tos in NH AFT entry state";
      reference "2.4.0";
   }
 
diff --git a/release/models/aft/openconfig-aft-ipv6.yang b/release/models/aft/openconfig-aft-ipv6.yang
index 2c43480d2..3a79bfe03 100644
--- a/release/models/aft/openconfig-aft-ipv6.yang
+++ b/release/models/aft/openconfig-aft-ipv6.yang
@@ -24,8 +24,8 @@ submodule openconfig-aft-ipv6 {
 
   revision "2023-05-25" {
     description
-      "Add next-hop-group-name in NHG AFT entry state and
-       Add ttl and tos in NH AFT entry state";
+      "Add next-hop-group-name and auto-size in NHG AFT entry state
+       and Add ttl and tos in NH AFT entry state";
     reference "2.4.0";
   }
 
diff --git a/release/models/aft/openconfig-aft-mpls.yang b/release/models/aft/openconfig-aft-mpls.yang
index 882cf8712..8ddb599af 100644
--- a/release/models/aft/openconfig-aft-mpls.yang
+++ b/release/models/aft/openconfig-aft-mpls.yang
@@ -25,8 +25,8 @@ submodule openconfig-aft-mpls {
 
   revision "2023-05-25" {
     description
-      "Add next-hop-group-name in NHG AFT entry state and
-       Add ttl and tos in NH AFT entry state";
+      "Add next-hop-group-name and auto-size in NHG AFT entry state
+       and Add ttl and tos in NH AFT entry state";
     reference "2.4.0";
   }
 
diff --git a/release/models/aft/openconfig-aft-pf.yang b/release/models/aft/openconfig-aft-pf.yang
index 9394fe7fd..f7badbe2b 100644
--- a/release/models/aft/openconfig-aft-pf.yang
+++ b/release/models/aft/openconfig-aft-pf.yang
@@ -32,8 +32,8 @@ submodule openconfig-aft-pf {
 
   revision "2023-05-25" {
     description
-      "Add next-hop-group-name in NHG AFT entry state and
-       Add ttl and tos in NH AFT entry state";
+      "Add next-hop-group-name and auto-size in NHG AFT entry state
+       and Add ttl and tos in NH AFT entry state";
     reference "2.4.0";
   }
 
diff --git a/release/models/aft/openconfig-aft-state-synced.yang b/release/models/aft/openconfig-aft-state-synced.yang
index d4b926ca5..cbbe4bec9 100644
--- a/release/models/aft/openconfig-aft-state-synced.yang
+++ b/release/models/aft/openconfig-aft-state-synced.yang
@@ -20,8 +20,8 @@ submodule openconfig-aft-state-synced {
 
   revision "2023-05-25" {
     description
-      "Add next-hop-group-name in NHG AFT entry state and
-       Add ttl and tos in NH AFT entry state";
+      "Add next-hop-group-name and auto-size in NHG AFT entry state
+       and Add ttl and tos in NH AFT entry state";
     reference "2.4.0";
   }
 
diff --git a/release/models/aft/openconfig-aft.yang b/release/models/aft/openconfig-aft.yang
index b33187f79..04f06542f 100644
--- a/release/models/aft/openconfig-aft.yang
+++ b/release/models/aft/openconfig-aft.yang
@@ -46,8 +46,8 @@ module openconfig-aft {
 
   revision "2023-05-25" {
     description
-      "Add next-hop-group-name in NHG AFT entry state and
-       Add ttl and tos in NH AFT entry state";
+      "Add next-hop-group-name and auto-size in NHG AFT entry state
+       and Add ttl and tos in NH AFT entry state";
     reference "2.4.0";
   }
 

From b131e42e4d9ab56bfadda337471407b1b83c663c Mon Sep 17 00:00:00 2001
From: romeyo <romeyo@arista.com>
Date: Mon, 7 Aug 2023 10:06:22 -0700
Subject: [PATCH 4/7] Add gre and mpls containers under next-hops aft entry
 state. Add ttl and tos under gre, mpls and ip-in-ip aft entry state. Remove
 nexthop-group-name and autosiz changes from this PR.

---
 release/models/aft/openconfig-aft-common.yang | 69 ++++++++++++++-----
 .../models/aft/openconfig-aft-ethernet.yang   |  5 +-
 release/models/aft/openconfig-aft-ipv4.yang   |  5 +-
 release/models/aft/openconfig-aft-ipv6.yang   |  5 +-
 release/models/aft/openconfig-aft-mpls.yang   |  5 +-
 release/models/aft/openconfig-aft-pf.yang     |  5 +-
 .../aft/openconfig-aft-state-synced.yang      |  5 +-
 release/models/aft/openconfig-aft.yang        |  5 +-
 8 files changed, 74 insertions(+), 30 deletions(-)

diff --git a/release/models/aft/openconfig-aft-common.yang b/release/models/aft/openconfig-aft-common.yang
index f01c61e1e..8cac0bde2 100644
--- a/release/models/aft/openconfig-aft-common.yang
+++ b/release/models/aft/openconfig-aft-common.yang
@@ -27,8 +27,9 @@ submodule openconfig-aft-common {
 
   revision "2023-05-25" {
     description
-      "Add next-hop-group-name and auto-size in NHG AFT entry state
-       and Add ttl and tos in NH AFT entry state for telemetry";
+      "Add gre and mpls containers under next-hops aft entry state.
+       Add ttl and tos under gre, mpls and ip-in-ip aft entry state
+       for telemetry.";
     reference "2.4.0";
   }
 
@@ -211,6 +212,33 @@ submodule openconfig-aft-common {
             description
               "State parameters relating to IP-in-IP encapsulation.";
             uses aft-common-entry-nexthop-ipip-state;
+            uses aft-common-entry-nexthop-encap-outer-header-state;
+          }
+        }
+
+        container gre {
+          description
+            "When specified, the packet has an GRE header applied to it before
+             forwarding to the specified next-hop.";
+
+          container state {
+            config false;
+            description
+              "State parameters relating to GRE encapsulation.";
+            uses aft-common-entry-nexthop-encap-outer-header-state;
+          }
+        }
+
+        container mpls {
+          description
+            "When specified, the packet has an MPLS header applied to it before
+             forwarding to the specified next-hop.";
+
+          container state {
+            config false;
+            description
+              "State parameters relating to MPLS encapsulation.";
+            uses aft-common-entry-nexthop-encap-outer-header-state;
           }
         }
 
@@ -366,20 +394,6 @@ submodule openconfig-aft-common {
          specified network-instance.";
     }
 
-    leaf ttl {
-      type uint32;
-      description
-        "The TTL value used by the hardware pipeline while forwarding
-         a packet to the specified next-hop.";
-    }
-
-    leaf tos {
-      type uint16;
-      description
-        "The TOS value used by the hardware pipeline while forwarding
-         a packet to the specified next-hop.";
-    }
-
     uses aft-common-install-protocol;
   }
 
@@ -400,6 +414,29 @@ submodule openconfig-aft-common {
     }
   }
 
+  grouping aft-common-entry-nexthop-encap-outer-header-state {
+    description
+      "Outer header fields of encapsulation applied on a next-hop";
+
+    leaf ttl {
+      type uint32;
+      description
+        "This leaf reflects the configured TTL value that is used in the outer
+         header during packet encapsulation. When this leaf is not set, the TTL
+         value of the inner packet is copied over as the outer packet's TTL
+         value during encapsulation.";
+    }
+
+    leaf tos {
+      type uint16;
+      description
+        "This leaf reflects the configured TOS value that is used in the outer
+         header during packet encapsulation. When this leaf is not set, the TOS
+         value of the inner packet is copied over as the outer packet's TOS
+         value during encapsulation.";
+    }
+  }
+
   grouping aft-common-install-protocol {
     description
       "Grouping for a common reference to the protocol which
diff --git a/release/models/aft/openconfig-aft-ethernet.yang b/release/models/aft/openconfig-aft-ethernet.yang
index 977215186..433a235e7 100644
--- a/release/models/aft/openconfig-aft-ethernet.yang
+++ b/release/models/aft/openconfig-aft-ethernet.yang
@@ -24,8 +24,9 @@ submodule openconfig-aft-ethernet {
 
   revision "2023-05-25" {
      description
-       "Add next-hop-group-name and auto-size in NHG AFT entry state
-        and Add ttl and tos in NH AFT entry state";
+       "Add gre and mpls containers under next-hops aft entry state.
+        Add ttl and tos under gre, mpls and ip-in-ip aft entry state
+        for telemetry.";
      reference "2.4.0";
   }
 
diff --git a/release/models/aft/openconfig-aft-ipv4.yang b/release/models/aft/openconfig-aft-ipv4.yang
index ad14e5c06..be777a21f 100644
--- a/release/models/aft/openconfig-aft-ipv4.yang
+++ b/release/models/aft/openconfig-aft-ipv4.yang
@@ -24,8 +24,9 @@ submodule openconfig-aft-ipv4 {
 
   revision "2023-05-25" {
      description
-       "Add next-hop-group-name and auto-size in NHG AFT entry state
-        and Add ttl and tos in NH AFT entry state";
+       "Add gre and mpls containers under next-hops aft entry state.
+        Add ttl and tos under gre, mpls and ip-in-ip aft entry state
+        for telemetry.";
      reference "2.4.0";
   }
 
diff --git a/release/models/aft/openconfig-aft-ipv6.yang b/release/models/aft/openconfig-aft-ipv6.yang
index 3a79bfe03..07bb6b556 100644
--- a/release/models/aft/openconfig-aft-ipv6.yang
+++ b/release/models/aft/openconfig-aft-ipv6.yang
@@ -24,8 +24,9 @@ submodule openconfig-aft-ipv6 {
 
   revision "2023-05-25" {
     description
-      "Add next-hop-group-name and auto-size in NHG AFT entry state
-       and Add ttl and tos in NH AFT entry state";
+      "Add gre and mpls containers under next-hops aft entry state.
+       Add ttl and tos under gre, mpls and ip-in-ip aft entry state
+       for telemetry.";
     reference "2.4.0";
   }
 
diff --git a/release/models/aft/openconfig-aft-mpls.yang b/release/models/aft/openconfig-aft-mpls.yang
index 8ddb599af..0c4a03129 100644
--- a/release/models/aft/openconfig-aft-mpls.yang
+++ b/release/models/aft/openconfig-aft-mpls.yang
@@ -25,8 +25,9 @@ submodule openconfig-aft-mpls {
 
   revision "2023-05-25" {
     description
-      "Add next-hop-group-name and auto-size in NHG AFT entry state
-       and Add ttl and tos in NH AFT entry state";
+      "Add gre and mpls containers under next-hops aft entry state.
+       Add ttl and tos under gre, mpls and ip-in-ip aft entry state
+       for telemetry.";
     reference "2.4.0";
   }
 
diff --git a/release/models/aft/openconfig-aft-pf.yang b/release/models/aft/openconfig-aft-pf.yang
index f7badbe2b..5896ca58a 100644
--- a/release/models/aft/openconfig-aft-pf.yang
+++ b/release/models/aft/openconfig-aft-pf.yang
@@ -32,8 +32,9 @@ submodule openconfig-aft-pf {
 
   revision "2023-05-25" {
     description
-      "Add next-hop-group-name and auto-size in NHG AFT entry state
-       and Add ttl and tos in NH AFT entry state";
+      "Add gre and mpls containers under next-hops aft entry state.
+       Add ttl and tos under gre, mpls and ip-in-ip aft entry state
+       for telemetry.";
     reference "2.4.0";
   }
 
diff --git a/release/models/aft/openconfig-aft-state-synced.yang b/release/models/aft/openconfig-aft-state-synced.yang
index cbbe4bec9..73dd12290 100644
--- a/release/models/aft/openconfig-aft-state-synced.yang
+++ b/release/models/aft/openconfig-aft-state-synced.yang
@@ -20,8 +20,9 @@ submodule openconfig-aft-state-synced {
 
   revision "2023-05-25" {
     description
-      "Add next-hop-group-name and auto-size in NHG AFT entry state
-       and Add ttl and tos in NH AFT entry state";
+      "Add gre and mpls containers under next-hops aft entry state.
+       Add ttl and tos under gre, mpls and ip-in-ip aft entry state
+       for telemetry.";
     reference "2.4.0";
   }
 
diff --git a/release/models/aft/openconfig-aft.yang b/release/models/aft/openconfig-aft.yang
index 04f06542f..d00b14453 100644
--- a/release/models/aft/openconfig-aft.yang
+++ b/release/models/aft/openconfig-aft.yang
@@ -46,8 +46,9 @@ module openconfig-aft {
 
   revision "2023-05-25" {
     description
-      "Add next-hop-group-name and auto-size in NHG AFT entry state
-       and Add ttl and tos in NH AFT entry state";
+      "Add gre and mpls containers under next-hops aft entry state.
+       Add ttl and tos under gre, mpls and ip-in-ip aft entry state
+       for telemetry.";
     reference "2.4.0";
   }
 

From 478746d23ad5db6a8756ea8f76cd028a95f433a7 Mon Sep 17 00:00:00 2001
From: romeyo <romeyo@arista.com>
Date: Mon, 7 Aug 2023 11:04:58 -0700
Subject: [PATCH 5/7] remove nhg-name and auto-size

---
 release/models/aft/openconfig-aft-common.yang | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/release/models/aft/openconfig-aft-common.yang b/release/models/aft/openconfig-aft-common.yang
index 8cac0bde2..cd3292b6a 100644
--- a/release/models/aft/openconfig-aft-common.yang
+++ b/release/models/aft/openconfig-aft-common.yang
@@ -637,22 +637,6 @@ submodule openconfig-aft-common {
         also be updated.";
     }
 
-    leaf next-hop-group-name {
-      type string;
-      description
-       "Where applicable, this leaf is a unique identifier string for the
-        next-hop-group. It is an arbitrary name for the group, that is
-        supported by vendors and is exposed for telemetry.";
-    }
-
-    leaf auto-size {
-      type boolean;
-      description
-       "Where applicable, this leaf is a indicator of the
-        next-hop-group size being automatically determined or is it
-        configured to a fixed size.";
-    }
-
     leaf programmed-id {
       type uint64;
       description

From 1113d66e5c479de75acc680410fd7278ef759541 Mon Sep 17 00:00:00 2001
From: romeyo <romeyo@arista.com>
Date: Mon, 21 Aug 2023 07:25:10 -0700
Subject: [PATCH 6/7] changed ttl and tos type to uint8

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

diff --git a/release/models/aft/openconfig-aft-common.yang b/release/models/aft/openconfig-aft-common.yang
index cd3292b6a..4cd7bb63f 100644
--- a/release/models/aft/openconfig-aft-common.yang
+++ b/release/models/aft/openconfig-aft-common.yang
@@ -419,7 +419,7 @@ submodule openconfig-aft-common {
       "Outer header fields of encapsulation applied on a next-hop";
 
     leaf ttl {
-      type uint32;
+      type uint8;
       description
         "This leaf reflects the configured TTL value that is used in the outer
          header during packet encapsulation. When this leaf is not set, the TTL
@@ -428,7 +428,7 @@ submodule openconfig-aft-common {
     }
 
     leaf tos {
-      type uint16;
+      type uint8;
       description
         "This leaf reflects the configured TOS value that is used in the outer
          header during packet encapsulation. When this leaf is not set, the TOS

From a69ea22646aaa56da5c1b2b6db32915f31c5e530 Mon Sep 17 00:00:00 2001
From: romeyo <romeyo@arista.com>
Date: Wed, 23 Aug 2023 06:53:12 -0700
Subject: [PATCH 7/7] updated documentation for default value

---
 release/models/aft/openconfig-aft-common.yang | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/release/models/aft/openconfig-aft-common.yang b/release/models/aft/openconfig-aft-common.yang
index 4cd7bb63f..f44153418 100644
--- a/release/models/aft/openconfig-aft-common.yang
+++ b/release/models/aft/openconfig-aft-common.yang
@@ -421,19 +421,19 @@ submodule openconfig-aft-common {
     leaf ttl {
       type uint8;
       description
-        "This leaf reflects the configured TTL value that is used in the outer
-         header during packet encapsulation. When this leaf is not set, the TTL
-         value of the inner packet is copied over as the outer packet's TTL
-         value during encapsulation.";
+        "This leaf reflects the configured/default TTL value that is used in the
+         outer header during packet encapsulation. When this leaf is not set,
+         the TTL value of the inner packet is copied over as the outer packet's
+         TTL value during encapsulation.";
     }
 
     leaf tos {
       type uint8;
       description
-        "This leaf reflects the configured TOS value that is used in the outer
-         header during packet encapsulation. When this leaf is not set, the TOS
-         value of the inner packet is copied over as the outer packet's TOS
-         value during encapsulation.";
+        "This leaf reflects the configured/default TOS value that is used in the
+         outer header during packet encapsulation. When this leaf is not set,
+         the TOS value of the inner packet is copied over as the outer packet's
+         TOS value during encapsulation.";
     }
   }