From 2c81874b3199f35a0e34b90bef91a74308e0b29b Mon Sep 17 00:00:00 2001 From: Alex Webster <31635844+awebsters@users.noreply.github.com> Date: Tue, 10 Sep 2024 19:49:00 -0400 Subject: [PATCH 1/6] Ntp auth types (#1163) * adding additional auth key types --- release/models/system/openconfig-system.yang | 44 +++++++++++++++++++- 1 file changed, 43 insertions(+), 1 deletion(-) diff --git a/release/models/system/openconfig-system.yang b/release/models/system/openconfig-system.yang index 3352fd221..8534a909f 100644 --- a/release/models/system/openconfig-system.yang +++ b/release/models/system/openconfig-system.yang @@ -47,7 +47,13 @@ module openconfig-system { Section 4.c of the IETF Trust's Legal Provisions Relating to IETF Documents (http://trustee.ietf.org/license-info)."; - oc-ext:openconfig-version "2.1.0"; + oc-ext:openconfig-version "2.2.0"; + + revision "2024-08-13" { + description + "Added additional auth key types"; + reference "2.2.0"; + } revision "2024-07-15" { description @@ -233,6 +239,42 @@ module openconfig-system { "MD5 encryption method"; } + identity NTP_AUTH_SHA1 { + base NTP_AUTH_TYPE; + description + "SHA1 encryption method"; + } + + identity NTP_AUTH_SHA256 { + base NTP_AUTH_TYPE; + description + "SHA256 encryption method"; + } + + identity NTP_AUTH_SHA384 { + base NTP_AUTH_TYPE; + description + "SHA384 encryption method"; + } + + identity NTP_AUTH_SHA512 { + base NTP_AUTH_TYPE; + description + "SHA512 encryption method"; + } + + identity NTP_AUTH_AES_CBC_128 { + base NTP_AUTH_TYPE; + description + "AES-CBC-128 encryption method"; + } + + identity NTP_AUTH_AES_CBC_256 { + base NTP_AUTH_TYPE; + description + "AES-CBC-256 encryption method"; + } + // typedef statements typedef timezone-name-type { From 2e49acd23578e9b6ee38da085a09bb13cc36ca04 Mon Sep 17 00:00:00 2001 From: Darren Loher Date: Thu, 12 Sep 2024 10:25:31 -0700 Subject: [PATCH 2/6] Add syslog TLS (#1166) * Add syslog over TLS --- .../system/openconfig-system-logging.yang | 24 ++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/release/models/system/openconfig-system-logging.yang b/release/models/system/openconfig-system-logging.yang index f845547cb..c7eaae8a5 100644 --- a/release/models/system/openconfig-system-logging.yang +++ b/release/models/system/openconfig-system-logging.yang @@ -23,7 +23,13 @@ module openconfig-system-logging { "This module defines configuration and operational state data for common logging facilities on network systems."; - oc-ext:openconfig-version "0.6.0"; + oc-ext:openconfig-version "0.7.0"; + +revision "2024-08-20" { + description + "Adding tls support for syslog."; + reference "0.7.0"; + } revision "2023-07-20" { description @@ -429,6 +435,22 @@ revision "2023-07-20" { "Sets the destination port number for syslog UDP messages to the server. The default for syslog is 514."; } + + leaf transport-security { + type boolean; + description + "Indicates if syslog transport layer security (TLS) is enabled."; + } + + leaf tls-profile-id { + type string; + description + "The ID of this syslog client's TLS profile. TLS profiles are managed + using the gNSI Certz service or other certificate management service + provided by the system."; + reference + "https://github.com/openconfig/gnsi/tree/main/certz"; + } } grouping logging-remote-state { From 27eabe3b8e8a59c97da1e3af2dbc219fdd7e17c4 Mon Sep 17 00:00:00 2001 From: SydneyCaulfeild <47483016+SydneyCaulfeild@users.noreply.github.com> Date: Fri, 13 Sep 2024 13:41:58 -0400 Subject: [PATCH 3/6] Update description of the model-name leaf. (#1160) * Indicate model-name is mandatory if component is removable or oc-platform-type:CHASSIS --- .../platform/openconfig-platform-common.yang | 8 +++++++- release/models/platform/openconfig-platform.yang | 16 ++++++++++++---- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/release/models/platform/openconfig-platform-common.yang b/release/models/platform/openconfig-platform-common.yang index 04f58b3ac..da46ed60b 100644 --- a/release/models/platform/openconfig-platform-common.yang +++ b/release/models/platform/openconfig-platform-common.yang @@ -20,7 +20,13 @@ submodule openconfig-platform-common { "This modules contains common groupings that are used in multiple components within the platform module."; - oc-ext:openconfig-version "0.27.0"; + oc-ext:openconfig-version "0.28.0"; + + revision "2024-08-08" { + description + "Update description of model-name leaf."; + reference "0.28.0"; + } revision "2024-05-29" { description diff --git a/release/models/platform/openconfig-platform.yang b/release/models/platform/openconfig-platform.yang index 89ebb559b..3ddb6cef4 100644 --- a/release/models/platform/openconfig-platform.yang +++ b/release/models/platform/openconfig-platform.yang @@ -65,7 +65,13 @@ module openconfig-platform { (presence or absence of a component) and state (physical attributes or status)."; - oc-ext:openconfig-version "0.27.0"; + oc-ext:openconfig-version "0.28.0"; + + revision "2024-08-08" { + description + "Update description of model-name leaf."; + reference "0.28.0"; + } revision "2024-05-29" { description @@ -540,11 +546,13 @@ module openconfig-platform { } leaf model-name { + when "../removable = 'true' or ../type = 'oc-platform-types:CHASSIS'"; + mandatory true; type string; description - "A human readable string describing the model of a component. - This string is optional and should only be populated if part-no - is also populated."; + "Model name that would be found in a catalog of stock keeping + units (SKU) and should be the orderable name of the + component."; } leaf clei-code { From 21fa1c99bf4148806c7b8c9daee54beaaece4f68 Mon Sep 17 00:00:00 2001 From: Ebben Aries Date: Fri, 13 Sep 2024 12:34:57 -0600 Subject: [PATCH 4/6] Deprecate /components/component/state/id leaf (#1107) * (M) release/models/platform/openconfig-platform.yang * (M) release/models/platform/openconfig-platform-common.yang - Deprecation of undefined/duplicate 'id' leaf --- release/models/platform/openconfig-platform-common.yang | 8 +++++++- release/models/platform/openconfig-platform.yang | 9 ++++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/release/models/platform/openconfig-platform-common.yang b/release/models/platform/openconfig-platform-common.yang index da46ed60b..79514ea73 100644 --- a/release/models/platform/openconfig-platform-common.yang +++ b/release/models/platform/openconfig-platform-common.yang @@ -20,7 +20,13 @@ submodule openconfig-platform-common { "This modules contains common groupings that are used in multiple components within the platform module."; - oc-ext:openconfig-version "0.28.0"; + oc-ext:openconfig-version "0.29.0"; + + revision "2024-10-13" { + description + "Deprecate component id leaf"; + reference "0.29.0"; + } revision "2024-08-08" { description diff --git a/release/models/platform/openconfig-platform.yang b/release/models/platform/openconfig-platform.yang index 3ddb6cef4..3850f2e78 100644 --- a/release/models/platform/openconfig-platform.yang +++ b/release/models/platform/openconfig-platform.yang @@ -65,7 +65,13 @@ module openconfig-platform { (presence or absence of a component) and state (physical attributes or status)."; - oc-ext:openconfig-version "0.28.0"; + oc-ext:openconfig-version "0.29.0"; + + revision "2024-10-13" { + description + "Deprecate component id leaf"; + reference "0.29.0"; + } revision "2024-08-08" { description @@ -423,6 +429,7 @@ module openconfig-platform { leaf id { type string; + status deprecated; description "Unique identifier assigned by the system for the component"; From bab19fd0acb5bd97aadca872d213f22ccc715b07 Mon Sep 17 00:00:00 2001 From: sallylsy <108024270+sallylsy@users.noreply.github.com> Date: Fri, 13 Sep 2024 13:32:26 -0700 Subject: [PATCH 5/6] Add fallback leaf for LACP in OC model (#1176) * Add fallback leaf for LACP in OC model --- release/models/lacp/openconfig-lacp.yang | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/release/models/lacp/openconfig-lacp.yang b/release/models/lacp/openconfig-lacp.yang index 832a6a178..f69f15f71 100644 --- a/release/models/lacp/openconfig-lacp.yang +++ b/release/models/lacp/openconfig-lacp.yang @@ -26,7 +26,13 @@ module openconfig-lacp { managing aggregate interfaces. It works in conjunction with the OpenConfig interfaces and aggregate interfaces models."; - oc-ext:openconfig-version "2.0.0"; + oc-ext:openconfig-version "2.1.0"; + + revision "2024-09-24" { + description + "Add LACP fallback leaf under both config and state."; + reference "2.1.0"; + } revision "2023-12-11" { description @@ -407,6 +413,15 @@ grouping aggregation-lacp-members-statistics { system-id"; } + leaf fallback { + type boolean; + description + "If the fallback is set to true, current LACP interface is + able to establish a Link Aggregation (LAG) before it receives + LACP PDUs from its peer, and fallback to a single port active + after the expiry of the timeout period."; + } + uses aggregation-lacp-global-config; } From 9b0a82ee10b6a598d124250f4df51a927c5916a9 Mon Sep 17 00:00:00 2001 From: Ryan Shea <115602+sourcequench@users.noreply.github.com> Date: Fri, 13 Sep 2024 16:34:00 -0400 Subject: [PATCH 6/6] Adding glome key version and console state. (#1178) * Adding GLOME capabilities to gnsi credentialz. --- .../gnsi/openconfig-gnsi-credentialz.yang | 35 ++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) diff --git a/release/models/gnsi/openconfig-gnsi-credentialz.yang b/release/models/gnsi/openconfig-gnsi-credentialz.yang index 0e4392a7a..cf611fd9c 100644 --- a/release/models/gnsi/openconfig-gnsi-credentialz.yang +++ b/release/models/gnsi/openconfig-gnsi-credentialz.yang @@ -39,7 +39,13 @@ module openconfig-gnsi-credentialz { /system/aaa/authentication/users/user/config/password-hashed /system/aaa/authentication/users/user/state/password-hashed"; - oc-ext:openconfig-version "0.6.0"; + oc-ext:openconfig-version "0.7.0"; + + revision 2024-09-10 { + description + "Adding GLOME capabilities."; + reference "0.7.0"; + } revision 2024-02-13 { description @@ -142,6 +148,26 @@ module openconfig-gnsi-credentialz { } } + // GLOME related definitions. + + grouping glome-key-version { + description + "Version identifier for the configured GLOME key."; + + leaf active-glome-key-version { + type version; + description + "The version of the GLOME key."; + } + + leaf active-glome-key-created-on { + type created-on; + description + "The timestamp of the moment when the GLOME key + was created."; + } + } + // Success/failure counters. grouping counters { description @@ -232,9 +258,16 @@ module openconfig-gnsi-credentialz { "Console-related state."; uses counters; + + leaf enabled { + type boolean; + description + "Whether GLOME is enabled or not."; + } } } } + // System role console related definitions. grouping user-console-credentials-version {