Skip to content

Commit

Permalink
Merge branch 'master' into ptp_0501
Browse files Browse the repository at this point in the history
  • Loading branch information
dplore authored Sep 26, 2024
2 parents 9cb39ea + 4513c14 commit 3974d01
Show file tree
Hide file tree
Showing 15 changed files with 280 additions and 25 deletions.
8 changes: 7 additions & 1 deletion release/models/bgp/openconfig-bgp-common-multiprotocol.yang
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,13 @@ submodule openconfig-bgp-common-multiprotocol {
for multiple protocols in BGP. The groupings are common across
multiple contexts.";

oc-ext:openconfig-version "9.7.1";
oc-ext:openconfig-version "9.8.0";

revision "2024-09-06" {
description
"Restore NONE enum value for community-type.";
reference "9.8.0";
}

revision "2023-12-28" {
description
Expand Down
8 changes: 7 additions & 1 deletion release/models/bgp/openconfig-bgp-common-structure.yang
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,13 @@ submodule openconfig-bgp-common-structure {
"This sub-module contains groupings that are common across multiple BGP
contexts and provide structure around other primitive groupings.";

oc-ext:openconfig-version "9.7.1";
oc-ext:openconfig-version "9.8.0";

revision "2024-09-06" {
description
"Restore NONE enum value for community-type.";
reference "9.8.0";
}

revision "2023-12-28" {
description
Expand Down
15 changes: 11 additions & 4 deletions release/models/bgp/openconfig-bgp-common.yang
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,13 @@ submodule openconfig-bgp-common {
may be application to a subset of global, peer-group or neighbor
contexts.";

oc-ext:openconfig-version "9.7.1";
oc-ext:openconfig-version "9.8.0";

revision "2024-09-06" {
description
"Restore NONE enum value for community-type.";
reference "9.8.0";
}

revision "2023-12-28" {
description
Expand Down Expand Up @@ -326,9 +332,10 @@ submodule openconfig-bgp-common {
leaf-list send-community-type {
type oc-bgp-types:community-type;
description
"Specify which types of community should be sent to the
neighbor or group. The default is to not send the
community attribute";
"Specify which types of community should be sent to the neighbor or
group. The default is to not send the community attribute. Note, if
the NONE community-type is specified, no other types must be
specified.";
}

leaf description {
Expand Down
8 changes: 7 additions & 1 deletion release/models/bgp/openconfig-bgp-errors.yang
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,13 @@ submodule openconfig-bgp-errors {
"This module defines BGP NOTIFICATION message error codes
and subcodes";

oc-ext:openconfig-version "6.0.0";
oc-ext:openconfig-version "6.1.0";

revision "2024-09-06" {
description
"Restore NONE enum value for community-type.";
reference "6.1.0";
}

revision "2024-01-31" {
description
Expand Down
8 changes: 7 additions & 1 deletion release/models/bgp/openconfig-bgp-global.yang
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,13 @@ submodule openconfig-bgp-global {
"This sub-module contains groupings that are specific to the
global context of the OpenConfig BGP module";

oc-ext:openconfig-version "9.7.1";
oc-ext:openconfig-version "9.8.0";

revision "2024-09-06" {
description
"Restore NONE enum value for community-type.";
reference "9.8.0";
}

revision "2023-12-28" {
description
Expand Down
8 changes: 7 additions & 1 deletion release/models/bgp/openconfig-bgp-neighbor.yang
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,13 @@ submodule openconfig-bgp-neighbor {
"This sub-module contains groupings that are specific to the
neighbor context of the OpenConfig BGP module.";

oc-ext:openconfig-version "9.7.1";
oc-ext:openconfig-version "9.8.0";

revision "2024-09-06" {
description
"Restore NONE enum value for community-type.";
reference "9.8.0";
}

revision "2023-12-28" {
description
Expand Down
8 changes: 7 additions & 1 deletion release/models/bgp/openconfig-bgp-peer-group.yang
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,13 @@ submodule openconfig-bgp-peer-group {
"This sub-module contains groupings that are specific to the
peer-group context of the OpenConfig BGP module.";

oc-ext:openconfig-version "9.7.1";
oc-ext:openconfig-version "9.8.0";

revision "2024-09-06" {
description
"Restore NONE enum value for community-type.";
reference "9.8.0";
}

revision "2023-12-28" {
description
Expand Down
14 changes: 9 additions & 5 deletions release/models/bgp/openconfig-bgp-types.yang
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,13 @@ module openconfig-bgp-types {
policy. It can be imported by modules that make use of BGP
attributes";

oc-ext:openconfig-version "6.0.0";
oc-ext:openconfig-version "6.1.0";

revision "2024-09-06" {
description
"Restore NONE enum value for community-type.";
reference "6.1.0";
}

revision "2024-02-01" {
description
Expand Down Expand Up @@ -795,10 +801,8 @@ module openconfig-bgp-types {
}
enum NONE {
description
"Do not send any community attribute.
This value has been deprecated because the node is now
a leaf-list.";
status deprecated;
"Do not send any community attribute. If this value is present
then the other community-types must not be present.";
}
}
description
Expand Down
8 changes: 7 additions & 1 deletion release/models/bgp/openconfig-bgp.yang
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,13 @@ module openconfig-bgp {
whereas leaf not present inherits its value from the leaf present
at the next higher level in the hierarchy.";

oc-ext:openconfig-version "9.7.1";
oc-ext:openconfig-version "9.8.0";

revision "2024-09-06" {
description
"Restore NONE enum value for community-type.";
reference "9.8.0";
}

revision "2023-12-28" {
description
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
2 changes: 2 additions & 0 deletions release/models/platform/.spec.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
- yang/platform/openconfig-platform-cpu.yang
- yang/platform/openconfig-platform-ext.yang
- yang/platform/openconfig-platform-software.yang
- yang/platform/openconfig-platform-storage.yang
- yang/platform/openconfig-platform-fabric.yang
- yang/platform/openconfig-platform-pipeline-counters.yang
- yang/platform/openconfig-platform-integrated-circuit.yang
Expand All @@ -31,6 +32,7 @@
- yang/platform/openconfig-platform-ext.yang
- yang/platform/openconfig-platform-cpu.yang
- yang/platform/openconfig-platform-software.yang
- yang/platform/openconfig-platform-storage.yang
- yang/platform/openconfig-platform-fabric.yang
- yang/platform/openconfig-platform-pipeline-counters.yang
- yang/platform/openconfig-platform-integrated-circuit.yang
Expand Down
8 changes: 7 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,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.29.0";
oc-ext:openconfig-version "0.30.0";

revision "2024-10-13" {
description
"Add storage state io-errors.";
reference "0.30.0";
}

revision "2024-10-13" {
description
Expand Down
164 changes: 164 additions & 0 deletions release/models/platform/openconfig-platform-storage.yang
Original file line number Diff line number Diff line change
@@ -0,0 +1,164 @@
module openconfig-platform-storage {

yang-version "1";

// namespace
namespace "http://openconfig.net/yang/platform/storage";

prefix "oc-storage";

import openconfig-platform {
prefix oc-platform;
}
import openconfig-extensions {
prefix oc-ext;
}
import openconfig-yang-types {
prefix oc-yang;
}

// meta
organization
"OpenConfig working group";

contact
"OpenConfig working group
www.openconfig.net";

description
"This module defines data related to STORAGE components in the
OpenConfig platform model.
Portions of this code were derived from the following copyright holders.
References to each copyright holder are mentioned where related content
is used.
NVM Express Base Specification Revision 2.0a
https://nvmexpress.org/wp-content/uploads/NVMe-NVM-Express-2.0a-2021.07.26-Ratified.pdf
(c) Copyright 2007 to 2021 NVM Express, Inc. ALL RIGHTS RESERVED.
This NVM Express Base Specification, revision 2.0a is proprietary to the
NVM Express, Inc. (also referred to as “Company”) and/or its successors
and assigns.
S.M.A.R.T. Attribute: Reallocated Sectors Count | Knowledge Base
http://kb.acronis.com.";

oc-ext:openconfig-version "0.1.0";

revision "2024-08-26" {
description
"Initial revision.";
reference
"0.1.0";
}

// OpenConfig specific extensions for module metadata.
oc-ext:regexp-posix;
oc-ext:catalog-organization "openconfig";
oc-ext:origin "openconfig";

// identity statements
// typedef statements
// grouping statements
grouping storage-counters-state {
description
"Operational state for storage component statistics. These leaves
are derived from a list of commonly supported S.M.A.R.T. counters.
Note that while common, these attributes may not be supported by
all storage device vendors and media types.";

leaf soft-read-error-rate {
type oc-yang:counter64;
description
"Uncorrected read errors reported to the operating system. SMART ID
201.";
reference
"S.M.A.R.T. Attribute: Soft Read Error Rate / Off Track Errors (Maxtor)
| Knowledge Base. kb.acronis.com.";
}

leaf reallocated-sectors {
type oc-yang:counter64;
description
"Count of reallocated sectors. The raw value represents a count of
the bad sectors that have been found and remapped. SMART ID 5.";
reference
"S.M.A.R.T. Attribute: Reallocated Sectors Count | Knowledge Base -
kb.acronis.com";
}

leaf end-to-end-error {
type oc-yang:counter64;
description
"Count of parity errors which occur in the data path to the media.
SMART ID 184.";
reference
"Acronis Drive Monitor: Disk Health Calculation Knowledge Base -
kb.acronis.com";
}

leaf offline-uncorrectable-sectors-count {
type oc-yang:counter64;
description
"The total count of uncorrectable errors when reading/writing a
sector. SMART ID 198.";
reference
"Acronis Drive Monitor: Disk Health Calculation Knowledge Base -
kb.acronis.com";
}

leaf life-left {
type uint8;
description
"Indicates the approximate SSD life left, in terms of program/erase
cycles or available reserved blocks. A normalized value of 100
represents a new drive, with a threshold value at 10 indicating a need
for replacement. A value of 0 may mean that the drive is operating in
read-only mode to allow data recovery. SMART ID 231.";
reference
"SMART attribute details,
https://media.kingston.com/support/downloads/MKP_306_SMART_attribute.pdf";
}

leaf percentage-used {
type uint8;
description
"Contains a vendor specific estimate of the percentage of NVM
subsystem life used based on the actual usage and the manufacturer’s
prediction of NVM life. A value of 100 indicates that the estimated
endurance of the NVM in the NVM subsystem has been consumed, but may
not indicate an NVM subsystem failure. The value is allowed to exceed
100. Percentages greater than 254 shall be represented as 255.";
reference
"NVM Express Base Specification Revision 2.0a
https://nvmexpress.org/wp-content/uploads/NVMe-NVM-Express-2.0a-2021.07.26-Ratified.pdf";
}
}
grouping storage-state {
description
"Storage component state. These counters are derived from the
linux kernel block layer statistics in /sys/block/<dev>/stat.
Implementations which do not use the linux kernel to access
storage should provide equivalent counters.";
reference
"https://www.kernel.org/doc/Documentation/block/stat.txt";

container counters {
description
"A collection of storage specific statistics entitites.";

uses storage-counters-state;
}
}

// data definition statements
// augment statements
augment "/oc-platform:components/oc-platform:component/" +
"oc-platform:storage/oc-platform:state" {
description
"Adding storage data to component model";

uses storage-state;
}
}

Loading

0 comments on commit 3974d01

Please sign in to comment.