Skip to content

Commit

Permalink
Merge branch 'master' into vlan-aware-bundle
Browse files Browse the repository at this point in the history
  • Loading branch information
@dplore
dplore authored Aug 28, 2024
2 parents f5246eb + abba929 commit ade9750
Show file tree
Hide file tree
Showing 14 changed files with 312 additions and 35 deletions.
26 changes: 25 additions & 1 deletion release/models/keychain/openconfig-keychain-types.yang
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,13 @@ module openconfig-keychain-types {
"This module contains general data definitions for use in
keychain-based authentication.";

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

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

revision "2022-03-01" {
description
Expand Down Expand Up @@ -137,4 +143,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";
}
}
11 changes: 10 additions & 1 deletion release/models/mpls/openconfig-mpls-igp.yang
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,16 @@ submodule openconfig-mpls-igp {
"Configuration generic configuration parameters for IGP-congruent
LSPs";

oc-ext:openconfig-version "3.5.0";
oc-ext:openconfig-version "3.6.0";

revision "2024-06-19" {
description
"Added support with backward compatibility to configure ECMP
of next-hops for the same LSP name. Also marked attributes
push-label, next-hop and interface as deprecated under egress,
transit and ingress config";
reference "3.6.0";
}

revision "2023-12-14" {
description
Expand Down
123 changes: 114 additions & 9 deletions release/models/mpls/openconfig-mpls-static.yang
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,16 @@ submodule openconfig-mpls-static {
"Defines static LSP configuration";


oc-ext:openconfig-version "3.5.0";
oc-ext:openconfig-version "3.6.0";

revision "2024-06-19" {
description
"Added support with backward compatibility to configure ECMP
of next-hops for the same LSP name. Also marked attributes
push-label, next-hop and interface as deprecated under egress,
transit and ingress config";
reference "3.6.0";
}

revision "2023-12-14" {
description
Expand Down Expand Up @@ -156,36 +165,126 @@ submodule openconfig-mpls-static {

// grouping statements

grouping static-lsp-common-config {
grouping static-lsp-nexthop-index {
description
"common definitions for static LSPs";
"Next hop index definition for static LSPs";

leaf next-hop {
leaf index {
type uint32;
description
"An user-specified identifier utilised to uniquely reference
the next-hop entry in the next-hop list. The value of this
index has no semantic meaning other than for referencing
the entry.";
}
}

grouping static-lsp-nexthop-common-config {
description
"Common definition of next hop configuration for static LSPs";

leaf ip-address {
type inet:ip-address;
description
"next hop IP address for the LSP";
"Next hop IP address for the LSP";
}

leaf push-label {
type oc-mplst:mpls-label;
description
"Label value to push at the current hop for the
LSP";
}

// interface-ref
uses oc-if:interface-ref-common;
}

grouping static-lsp-common-config {
description
"Common definitions for static LSPs";

leaf incoming-label {
type oc-mplst:mpls-label;
description
"label value on the incoming packet";
"Label value on the incoming packet";
}

leaf next-hop {
type inet:ip-address;
status deprecated;
description
"Next hop IP address for the LSP";
}

leaf push-label {
type oc-mplst:mpls-label;
status deprecated;
description
"label value to push at the current hop for the
"Label value to push at the current hop for the
LSP";
}

// interface-ref
uses oc-if:interface-ref-common;
uses oc-if:interface-ref-common {
status deprecated;
}

leaf metric {
type uint8;
description
"Specifies metric value used for the MPLS route";
"Specifies metric value used for the MPLS route.";
}
}

grouping static-lsp-nexthops-common {
description
"MPLS Static LSP next-hops configuration";

container lsp-next-hops {
description
"Configuration and state parameters relating to the
next-hops that are to be utilised for the MPLS static
route being specified";

list lsp-next-hop {
key "index";

description
"A list of next-hops to be utilised for the MPLS
static route being specified.";

leaf index {
type leafref {
path "../config/index";
}
description
"A reference to the index of the current next-hop.
The index is intended to be a user-specified value
which can be used to reference the next-hop in
question, without any other semantics being
assigned to it.";
}

container config {
description
"Configuration parameters relating to the next-hop
entry";

uses static-lsp-nexthop-index;
uses static-lsp-nexthop-common-config;
}

container state {
config false;
description
"Operational state parameters relating to the
next-hop entry";

uses static-lsp-nexthop-index;
uses static-lsp-nexthop-common-config;
}
}
}
}

Expand Down Expand Up @@ -227,6 +326,8 @@ submodule openconfig-mpls-static {
uses static-lsp-ingress-config;
uses static-lsp-ingress-state;
}

uses static-lsp-nexthops-common;
}
}

Expand Down Expand Up @@ -268,6 +369,8 @@ submodule openconfig-mpls-static {
uses static-lsp-transit-config;
uses static-lsp-transit-state;
}

uses static-lsp-nexthops-common;
}
}

Expand Down Expand Up @@ -309,6 +412,8 @@ submodule openconfig-mpls-static {
uses static-lsp-egress-config;
uses static-lsp-egress-state;
}

uses static-lsp-nexthops-common;
}
}

Expand Down
11 changes: 10 additions & 1 deletion release/models/mpls/openconfig-mpls-te.yang
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,16 @@ submodule openconfig-mpls-te {
signaling protocol or mechanism (see related submodules for
signaling protocol-specific configuration).";

oc-ext:openconfig-version "3.5.0";
oc-ext:openconfig-version "3.6.0";

revision "2024-06-19" {
description
"Added support with backward compatibility to configure ECMP
of next-hops for the same LSP name. Also marked attributes
push-label, next-hop and interface as deprecated under egress,
transit and ingress config";
reference "3.6.0";
}

revision "2023-12-14" {
description
Expand Down
11 changes: 10 additions & 1 deletion release/models/mpls/openconfig-mpls.yang
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,16 @@ module openconfig-mpls {
+------+ |ROUTING| +-----+
+-------+
";
oc-ext:openconfig-version "3.5.0";
oc-ext:openconfig-version "3.6.0";

revision "2024-06-19" {
description
"Added support with backward compatibility to configure ECMP
of next-hops for the same LSP name. Also marked attributes
push-label, next-hop and interface as deprecated under egress,
transit and ingress config";
reference "3.6.0";
}

revision "2023-12-14" {
description
Expand Down
45 changes: 44 additions & 1 deletion release/models/optical-transport/openconfig-optical-attenuator.yang
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,13 @@ module openconfig-optical-attenuator {
for variable optical attenuators, deployed as part of a transport
line system.";

oc-ext:openconfig-version "0.1.0";
oc-ext:openconfig-version "0.2.0";

revision "2024-07-10" {
description
"Adding SYSTEM_CONTROLLED mode with accompanying leaves";
reference "0.2.0";
}

revision "2019-07-19" {
description
Expand Down Expand Up @@ -62,6 +68,12 @@ module openconfig-optical-attenuator {
"Constant attenuation mode";
}

identity SYSTEM_CONTROLLED {
base OPTICAL_ATTENUATOR_MODE;
description
"System controls the attenuation value.";
}


// grouping statements

Expand Down Expand Up @@ -112,6 +124,28 @@ module openconfig-optical-attenuator {
maintain constant output power. When false, the attenuator is set
max attenuation or blocked.";
}

leaf max-output-power {
type decimal64 {
fraction-digits 2;
}
units dBm;
description
"The max power level allowed on the output of attenuator. This leaf
is optional when in SYSTEM_CONTROLLED mode.";
}

leaf max-output-power-threshold {
type decimal64 {
fraction-digits 2;
}
units dB;
description
"If the system-derived-target-output-power is equal to or greater than
'max-output-power + max-output-power-threshold', a device alarm will
be raised within /system/alarms. This leaf is only relevant when
in SYSTEM_CONTROLLED mode.";
}
}

grouping optical-attenuator-state {
Expand Down Expand Up @@ -150,6 +184,15 @@ module openconfig-optical-attenuator {
port. This leaf is only valid for ports of type EGRESS.";
}

leaf system-derived-target-output-power {
type decimal64 {
fraction-digits 2;
}
units dBm;
description
"The target output power as determined by the device.
This leaf is only relevant when in SYSTEM_CONTROLLED mode.";
}

container actual-attenuation {
description
Expand Down
23 changes: 15 additions & 8 deletions release/models/optical-transport/openconfig-transport-types.yang
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,14 @@ module openconfig-transport-types {
"This module contains general type definitions and identities
for optical transport models.";

oc-ext:openconfig-version "0.25.0";
oc-ext:openconfig-version "1.0.0";

revision "2024-07-24" {
description
"Corrected description for FACILITY and TERMINAL loopback-mode-type
enums.";
reference "1.0.0";
}

revision "2024-06-28" {
description
Expand Down Expand Up @@ -221,19 +228,19 @@ module openconfig-transport-types {
"No loopback is applied";
}
enum FACILITY {
description
"A port internal loopback at ASIC level. The loopback directs
traffic normally transmitted on the port back to the device as
if received on the same port from an external source. Note this
mode is used when internal loopback does NOT specify MAC or PHY.";
}
enum TERMINAL {
description
"A port external loopback at ASIC level. The loopback which
directs traffic received from an external source on the port
back out the transmit side of the same port. Note this mode is
used when external loopback does NOT specify MAC or PHY";
}
enum TERMINAL {
description
"A port internal loopback at ASIC level. The loopback directs
traffic normally transmitted on the port back to the device as
if received on the same port from an external source. Note this
mode is used when internal loopback does NOT specify MAC or PHY.";
}
enum ASIC_PHY_LOCAL {
description
"A port internal loopback at PHY module. The loopback directs
Expand Down
Loading

0 comments on commit ade9750

Please sign in to comment.