Skip to content

Commit

Permalink
Merge branch 'master' into dplore/mount-type
Browse files Browse the repository at this point in the history
  • Loading branch information
dplore committed Sep 24, 2024
2 parents d447a80 + 16df0a6 commit 57db022
Show file tree
Hide file tree
Showing 7 changed files with 163 additions and 12 deletions.
35 changes: 34 additions & 1 deletion release/models/gnsi/openconfig-gnsi-credentialz.yang
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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 {
Expand Down
16 changes: 14 additions & 2 deletions release/models/keychain/openconfig-keychain-types.yang
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,26 @@ module openconfig-keychain-types {
"This module contains general data definitions for use in
keychain-based authentication.";

oc-ext:openconfig-version "0.3.0";
oc-ext:openconfig-version "0.3.1";

revision "2024-08-27" {
description
"fix typo on AES_128_CMAC";
reference "0.3.1";
}

revision "2024-08-27" {
description
"Added AES_128_CMAC and AES_256_CMAC";
reference "0.3.0";
}

revision "2024-08-27" {
description
"Fix typo in identity AES_128_CMAC_96";
reference "0.2.1";
}

revision "2022-03-01" {
description
"Remove NONE identity from AUTH_TYPE";
Expand Down Expand Up @@ -135,7 +147,7 @@ module openconfig-keychain-types {
HMAC and HKDF)";
}

identity AES_28_CMAC_96 {
identity AES_128_CMAC_96 {
base CRYPTO_TYPE;
description
"AES-128-CMAC-96 keyed hash function based on a AES-128 block
Expand Down
17 changes: 16 additions & 1 deletion release/models/lacp/openconfig-lacp.yang
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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;
}

Expand Down
14 changes: 13 additions & 1 deletion release/models/platform/openconfig-platform-common.yang
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,19 @@ 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.29.0";

revision "2024-10-13" {
description
"Deprecate component id leaf";
reference "0.29.0";
}

revision "2024-08-08" {
description
"Update description of model-name leaf.";
reference "0.28.0";
}

revision "2024-05-29" {
description
Expand Down
23 changes: 19 additions & 4 deletions release/models/platform/openconfig-platform.yang
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,19 @@ 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.29.0";

revision "2024-10-13" {
description
"Deprecate component id leaf";
reference "0.29.0";
}

revision "2024-08-08" {
description
"Update description of model-name leaf.";
reference "0.28.0";
}

revision "2024-05-29" {
description
Expand Down Expand Up @@ -417,6 +429,7 @@ module openconfig-platform {

leaf id {
type string;
status deprecated;
description
"Unique identifier assigned by the system for the
component";
Expand Down Expand Up @@ -540,11 +553,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 {
Expand Down
24 changes: 23 additions & 1 deletion release/models/system/openconfig-system-logging.yang
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 {
Expand Down
46 changes: 44 additions & 2 deletions release/models/system/openconfig-system.yang
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,17 @@ 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.2.0";
oc-ext:openconfig-version "2.3.0";

revision "2024-08-21" {
revision "2024-09-24" {
description
"Added mount-point type leaf to describe the type of file system.";
reference "2.3.0";
}

revision "2024-08-13" {
description
"Added additional auth key types";
reference "2.2.0";
}

Expand Down Expand Up @@ -239,6 +245,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 {
Expand Down

0 comments on commit 57db022

Please sign in to comment.