From 180040364dd900571c0145d286e04dbb9e93363e Mon Sep 17 00:00:00 2001 From: tengyiG <108433002+tengyiG@users.noreply.github.com> Date: Tue, 27 Aug 2024 11:16:47 -0700 Subject: [PATCH 1/8] Update openconfig-keychain-types.yang Added AES_128_CMAC and AES_256_CMAC --- .../keychain/openconfig-keychain-types.yang | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/release/models/keychain/openconfig-keychain-types.yang b/release/models/keychain/openconfig-keychain-types.yang index d84b1f54c..5dca31aac 100644 --- a/release/models/keychain/openconfig-keychain-types.yang +++ b/release/models/keychain/openconfig-keychain-types.yang @@ -137,4 +137,22 @@ module openconfig-keychain-types { reference "RFC 4494 - The AES-CMAC-96 Algorithm and Its Use with IPsec"; } + + identity AES_128_CMAC { + base CRYPTO_TYPE; + description + "AES-128-CMAC keyed hash function based on a AES-128 block + cipher."; + reference + "RFC 4493 - The AES-CMAC Algorithm and Its Use with IPsec"; + } + + identity AES_256_CMAC { + base CRYPTO_TYPE; + description + "AES-256-CMAC keyed hash function based on a AES-256 block + cipher."; + reference + "RFC 4493 - The AES-CMAC Algorithm and Its Use with IPsec"; + } } From 37e5b5666e3f85a72b8d43465f39043b77fc9129 Mon Sep 17 00:00:00 2001 From: Tengyi Wang Date: Thu, 23 Jan 2025 04:53:01 +0000 Subject: [PATCH 2/8] Updated UDP enum in openconfig-aft-types.yang; --- release/models/aft/openconfig-aft-types.yang | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/release/models/aft/openconfig-aft-types.yang b/release/models/aft/openconfig-aft-types.yang index 56d920b5f..1b6b3b4b9 100644 --- a/release/models/aft/openconfig-aft-types.yang +++ b/release/models/aft/openconfig-aft-types.yang @@ -95,9 +95,14 @@ module openconfig-aft-types { description "The encapsulation header is a VXLAN packet header"; } - enum UDP { + enum UDPV4 { description "The encapsulation header is UDP packet header."; + "The encapsulation header is UDPV4 packet header."; + } + enum UDPV6 { + description + "The encapsulation header is UDPV6 packet header."; } } description From c749b44a926a93b4df317a9099c0562fa628a849 Mon Sep 17 00:00:00 2001 From: Tengyi Wang Date: Thu, 23 Jan 2025 21:37:18 +0000 Subject: [PATCH 3/8] Updated UDP enums related to openconfig-aft-types. --- release/models/aft/openconfig-aft-types.yang | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/release/models/aft/openconfig-aft-types.yang b/release/models/aft/openconfig-aft-types.yang index 1b6b3b4b9..c95660811 100644 --- a/release/models/aft/openconfig-aft-types.yang +++ b/release/models/aft/openconfig-aft-types.yang @@ -95,9 +95,12 @@ module openconfig-aft-types { description "The encapsulation header is a VXLAN packet header"; } - enum UDPV4 { + enum UDP { description "The encapsulation header is UDP packet header."; + } + enum UDPV4 { + description "The encapsulation header is UDPV4 packet header."; } enum UDPV6 { From 7fb185749db1f474b8a1c924ba49934bd529720e Mon Sep 17 00:00:00 2001 From: tengyiG Date: Tue, 28 Jan 2025 15:44:05 -0800 Subject: [PATCH 4/8] Update release/models/aft/openconfig-aft-types.yang Co-authored-by: Darren Loher --- release/models/aft/openconfig-aft-types.yang | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/release/models/aft/openconfig-aft-types.yang b/release/models/aft/openconfig-aft-types.yang index c95660811..3468c8f56 100644 --- a/release/models/aft/openconfig-aft-types.yang +++ b/release/models/aft/openconfig-aft-types.yang @@ -96,8 +96,10 @@ module openconfig-aft-types { "The encapsulation header is a VXLAN packet header"; } enum UDP { + deprecated; description - "The encapsulation header is UDP packet header."; + "The encapsulation header is UDP packet header. This node + is deprecated in favor of UDPV4 and UDPV6 nodes."; } enum UDPV4 { description From 2e1b712cc5d1e20fef589a5ad27c59790696bc33 Mon Sep 17 00:00:00 2001 From: Tengyi Wang Date: Tue, 28 Jan 2025 23:58:25 +0000 Subject: [PATCH 5/8] Update the yang model version and revision --- release/models/aft/openconfig-aft-types.yang | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/release/models/aft/openconfig-aft-types.yang b/release/models/aft/openconfig-aft-types.yang index 3468c8f56..7a12c6f5e 100644 --- a/release/models/aft/openconfig-aft-types.yang +++ b/release/models/aft/openconfig-aft-types.yang @@ -16,7 +16,13 @@ module openconfig-aft-types { "Types related to the OpenConfig Abstract Forwarding Table (AFT) model"; - oc-ext:openconfig-version "1.2.0"; + oc-ext:openconfig-version "1.3.0"; + + revision "2025-01-28" { + description + "Deprecated UDP enum and replaced it by more fine-grained enums UDPV4 and UDPV6."; + reference "1.3.0"; + } revision "2024-07-18" { description From 7147dec79cba8e5d1e914a6846a70892e1e0ed8b Mon Sep 17 00:00:00 2001 From: Tengyi Wang Date: Wed, 29 Jan 2025 00:12:51 +0000 Subject: [PATCH 6/8] Add "DEPRECATED" in description of enum UDP because deprecated directive is not supported for enums. --- release/models/aft/openconfig-aft-types.yang | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/release/models/aft/openconfig-aft-types.yang b/release/models/aft/openconfig-aft-types.yang index 7a12c6f5e..390fbf48f 100644 --- a/release/models/aft/openconfig-aft-types.yang +++ b/release/models/aft/openconfig-aft-types.yang @@ -102,9 +102,8 @@ module openconfig-aft-types { "The encapsulation header is a VXLAN packet header"; } enum UDP { - deprecated; description - "The encapsulation header is UDP packet header. This node + "DEPRECATED. The encapsulation header is UDP packet header. This node is deprecated in favor of UDPV4 and UDPV6 nodes."; } enum UDPV4 { From 0fa0742baf2fe8d035f426ee85fcadfd090c8630 Mon Sep 17 00:00:00 2001 From: Tengyi Wang Date: Tue, 4 Feb 2025 17:12:27 -0800 Subject: [PATCH 7/8] Modified the description of UDPV4 and UDPV6 --- release/models/aft/openconfig-aft-types.yang | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/release/models/aft/openconfig-aft-types.yang b/release/models/aft/openconfig-aft-types.yang index 390fbf48f..a4a134749 100644 --- a/release/models/aft/openconfig-aft-types.yang +++ b/release/models/aft/openconfig-aft-types.yang @@ -108,11 +108,11 @@ module openconfig-aft-types { } enum UDPV4 { description - "The encapsulation header is UDPV4 packet header."; + "The encapsulation header is a UDP + IPv4 header."; } enum UDPV6 { description - "The encapsulation header is UDPV6 packet header."; + "The encapsulation header is UDP + IPv6 header."; } } description From 190e007557a18690240d81045aeb885aa62bb92c Mon Sep 17 00:00:00 2001 From: Tengyi Wang Date: Tue, 4 Feb 2025 17:13:57 -0800 Subject: [PATCH 8/8] Added an indefinite Article in UDPV6 --- release/models/aft/openconfig-aft-types.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release/models/aft/openconfig-aft-types.yang b/release/models/aft/openconfig-aft-types.yang index a4a134749..4594d4aa0 100644 --- a/release/models/aft/openconfig-aft-types.yang +++ b/release/models/aft/openconfig-aft-types.yang @@ -112,7 +112,7 @@ module openconfig-aft-types { } enum UDPV6 { description - "The encapsulation header is UDP + IPv6 header."; + "The encapsulation header is a UDP + IPv6 header."; } } description