From 727b617d21b8c6af8862a3f24b6dbfa9e1c7f9cf Mon Sep 17 00:00:00 2001 From: romeyo Date: Mon, 7 Aug 2023 10:06:22 -0700 Subject: [PATCH] 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"; }