From cd51c99294015a7c828cf62d4a3b7537a9726dba Mon Sep 17 00:00:00 2001 From: Daniel Barney Date: Mon, 18 May 2026 10:23:11 -0700 Subject: [PATCH 1/2] Adding udp-v6 encap ``` grouping static-encap-headers +-- encap-headers +-- encap-header* [index] +-- index? -> ../config/index +-- config | +-- index? uint8 | +-- type? oc-aftt:encapsulation-header-type +--ro state | +--ro index? uint8 | +--ro type? oc-aftt:encapsulation-header-type +-- udp-v4 | +-- config | | +-- src-ip? oc-inet:ipv4-address | | +-- dst-ip? oc-inet:ipv4-address | | +-- dscp? oc-inet:dscp | | +-- src-udp-port? oc-inet:port-number | | +-- dst-udp-port? oc-inet:port-number | | +-- ip-ttl? uint8 | +--ro state | +--ro src-ip? oc-inet:ipv4-address | +--ro dst-ip? oc-inet:ipv4-address | +--ro dscp? oc-inet:dscp | +--ro src-udp-port? oc-inet:port-number | +--ro dst-udp-port? oc-inet:port-number | +--ro ip-ttl? uint8 +-- udp-v6 | +-- config | | +-- src-ip? oc-inet:ipv6-address | | +-- dst-ip? oc-inet:ipv6-address | | +-- dscp? oc-inet:dscp | | +-- src-udp-port? oc-inet:port-number | | +-- dst-udp-port? oc-inet:port-number | | +-- ip-ttl? uint8 | +--ro state | +--ro src-ip? oc-inet:ipv6-address | +--ro dst-ip? oc-inet:ipv6-address | +--ro dscp? oc-inet:dscp | +--ro src-udp-port? oc-inet:port-number | +--ro dst-udp-port? oc-inet:port-number | +--ro ip-ttl? uint8 +-- gre | +-- config | | +-- src-ip? oc-inet:ip-address | | +-- dst-ip? oc-inet:ip-address | | +-- ttl? uint8 | +--ro state | +--ro src-ip? oc-inet:ip-address | +--ro dst-ip? oc-inet:ip-address | +--ro ttl? uint8 +-- mpls +-- config | +-- traffic-class? oc-mplst:mpls-tc | +-- label? oc-mplst:mpls-label +--ro state +--ro traffic-class? oc-mplst:mpls-tc +--ro label? oc-mplst:mpls-label ``` Diffs ``` --- scratch/original_tree.txt 2026-05-18 17:16:44.000000000 +0000 +++ scratch/modified_tree.txt 2026-05-18 17:16:56.000000000 +0000 @@ -57,6 +57,21 @@ | +--ro src-udp-port? oc-inet:port-number | +--ro dst-udp-port? oc-inet:port-number | +--ro ip-ttl? uint8 + +-- udp-v6 + | +-- config + | | +-- src-ip? oc-inet:ipv6-address + | | +-- dst-ip? oc-inet:ipv6-address + | | +-- dscp? oc-inet:dscp + | | +-- src-udp-port? oc-inet:port-number + | | +-- dst-udp-port? oc-inet:port-number + | | +-- ip-ttl? uint8 + | +--ro state + | +--ro src-ip? oc-inet:ipv6-address + | +--ro dst-ip? oc-inet:ipv6-address + | +--ro dscp? oc-inet:dscp + | +--ro src-udp-port? oc-inet:port-number + | +--ro dst-udp-port? oc-inet:port-number + | +--ro ip-ttl? uint8 +-- gre | +-- config | | +-- src-ip? oc-inet:ip-address @@ -134,6 +149,21 @@ | +--ro src-udp-port? oc-inet:port-number | +--ro dst-udp-port? oc-inet:port-number | +--ro ip-ttl? uint8 + +-- udp-v6 + | +-- config + | | +-- src-ip? oc-inet:ipv6-address + | | +-- dst-ip? oc-inet:ipv6-address + | | +-- dscp? oc-inet:dscp + | | +-- src-udp-port? oc-inet:port-number + | | +-- dst-udp-port? oc-inet:port-number + | | +-- ip-ttl? uint8 + | +--ro state + | +--ro src-ip? oc-inet:ipv6-address + | +--ro dst-ip? oc-inet:ipv6-address + | +--ro dscp? oc-inet:dscp + | +--ro src-udp-port? oc-inet:port-number + | +--ro dst-udp-port? oc-inet:port-number + | +--ro ip-ttl? uint8 +-- gre | +-- config | | +-- src-ip? oc-inet:ip-address @@ -174,6 +204,21 @@ | +--ro dscp? oc-inet:dscp | +--ro src-udp-port? oc-inet:port-number | +--ro dst-udp-port? oc-inet:port-number + | +--ro ip-ttl? uint8 + +-- udp-v6 + | +-- config + | | +-- src-ip? oc-inet:ipv6-address + | | +-- dst-ip? oc-inet:ipv6-address + | | +-- dscp? oc-inet:dscp + | | +-- src-udp-port? oc-inet:port-number + | | +-- dst-udp-port? oc-inet:port-number + | | +-- ip-ttl? uint8 + | +--ro state + | +--ro src-ip? oc-inet:ipv6-address + | +--ro dst-ip? oc-inet:ipv6-address + | +--ro dscp? oc-inet:dscp + | +--ro src-udp-port? oc-inet:port-number + | +--ro dst-udp-port? oc-inet:port-number | +--ro ip-ttl? uint8 +-- gre | +-- config ``` --- .../openconfig-network-instance-static.yang | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/release/models/network-instance/openconfig-network-instance-static.yang b/release/models/network-instance/openconfig-network-instance-static.yang index b54c72f796..0ede4010e7 100644 --- a/release/models/network-instance/openconfig-network-instance-static.yang +++ b/release/models/network-instance/openconfig-network-instance-static.yang @@ -294,6 +294,29 @@ module openconfig-network-instance-static { uses oc-aft:aft-common-entry-nexthop-encap-udp-v4-state; } } + + container udp-v6 { + when "../config/type = 'oc-aftt:UDPV6'"; + description + "Container of nodes for UDP in IPv6 encapsulation. When this + container is used, an IPv6 header with a UDP header is added + to the encapsulation list."; + + container config { + description + "Configuration parameters relating to encapsulation headers."; + + uses oc-aft:aft-common-entry-nexthop-encap-udp-v6-state; + } + + container state { + config false; + description + "State parameters relating to encapsulation headers."; + + uses oc-aft:aft-common-entry-nexthop-encap-udp-v6-state; + } + } container gre { when "../config/type = 'oc-aftt:GRE'"; From 5c6bd2b04b6535bb6e3fe6e7b3c308987dcc7720 Mon Sep 17 00:00:00 2001 From: Daniel Barney Date: Mon, 18 May 2026 12:22:45 -0700 Subject: [PATCH 2/2] Removing spaces --- .../network-instance/openconfig-network-instance-static.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release/models/network-instance/openconfig-network-instance-static.yang b/release/models/network-instance/openconfig-network-instance-static.yang index 0ede4010e7..b3fb7fa3c4 100644 --- a/release/models/network-instance/openconfig-network-instance-static.yang +++ b/release/models/network-instance/openconfig-network-instance-static.yang @@ -294,7 +294,7 @@ module openconfig-network-instance-static { uses oc-aft:aft-common-entry-nexthop-encap-udp-v4-state; } } - + container udp-v6 { when "../config/type = 'oc-aftt:UDPV6'"; description