Skip to content

Commit

Permalink
Merge branch 'master' into liulk/issue-1135
Browse files Browse the repository at this point in the history
  • Loading branch information
@liulk
liulk authored Aug 19, 2024
2 parents 6cfa216 + 6e28490 commit 8fe39fc
Show file tree
Hide file tree
Showing 17 changed files with 192 additions and 26 deletions.
22 changes: 21 additions & 1 deletion release/models/aft/openconfig-aft-common.yang
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,13 @@ submodule openconfig-aft-common {
"Submodule containing definitions of groupings that are re-used
across multiple contexts within the AFT model.";

oc-ext:openconfig-version "2.5.0";
oc-ext:openconfig-version "2.6.0";

revision "2024-04-25" {
description
"Add backup-active to AFT NHG state.";
reference "2.6.0";
}

revision "2024-01-26" {
description
Expand Down Expand Up @@ -693,6 +699,20 @@ submodule openconfig-aft-common {
entries within the next-hop group become unusable, the backup
next-hop group is used if specified.";
}

leaf backup-active {
type boolean;
default false;
description
"Set to true if and only if the device no longer forwards traffic
using the primary NextHops of this NextHopGroup and instead uses
the specified backup-next-hop-group. This leaf should be set to
false if the backup-next-hop-group is either unspecified or unused
by the device.";
}



}

grouping aft-nhg-nh-state {
Expand Down
8 changes: 7 additions & 1 deletion release/models/aft/openconfig-aft-ethernet.yang
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,13 @@ submodule openconfig-aft-ethernet {
"Submodule containing definitions of groupings for the abstract
forwarding tables for Ethernet.";

oc-ext:openconfig-version "2.5.0";
oc-ext:openconfig-version "2.6.0";

revision "2024-04-25" {
description
"Add backup-active to AFT NHG state.";
reference "2.6.0";
}

revision "2024-01-26" {
description
Expand Down
8 changes: 7 additions & 1 deletion release/models/aft/openconfig-aft-ipv4.yang
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,13 @@ submodule openconfig-aft-ipv4 {
"Submodule containing definitions of groupings for the abstract
forwarding tables for IPv4.";

oc-ext:openconfig-version "2.5.0";
oc-ext:openconfig-version "2.6.0";

revision "2024-04-25" {
description
"Add backup-active to AFT NHG state.";
reference "2.6.0";
}

revision "2024-01-26" {
description
Expand Down
8 changes: 7 additions & 1 deletion release/models/aft/openconfig-aft-ipv6.yang
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,13 @@ submodule openconfig-aft-ipv6 {
"Submodule containing definitions of groupings for the abstract
forwarding tables for IPv6.";

oc-ext:openconfig-version "2.5.0";
oc-ext:openconfig-version "2.6.0";

revision "2024-04-25" {
description
"Add backup-active to AFT NHG state.";
reference "2.6.0";
}

revision "2024-01-26" {
description
Expand Down
16 changes: 7 additions & 9 deletions release/models/aft/openconfig-aft-mpls.yang
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,20 +21,18 @@ submodule openconfig-aft-mpls {
"Submodule containing definitions of groupings for the abstract
forwarding table for MPLS label forwarding.";

oc-ext:openconfig-version "2.5.0";
oc-ext:openconfig-version "2.6.0";

revision "2024-01-26" {
revision "2024-04-25" {
description
"Add gre container under next-hops aft entry state.
Add src-ip, dst-ip and ttl under gre aft entry state
for telemetry.";
reference "2.5.0";
"Add backup-active to AFT NHG state.";
reference "2.6.0";
}

revision "2023-09-26" {
revision "2024-04-25" {
description
"Add next-hop-group-name in NHG AFT entry state.";
reference "2.4.0";
"Add backup-active to AFT NHG state.";
reference "2.5.0";
}

revision "2023-04-19" {
Expand Down
8 changes: 7 additions & 1 deletion release/models/aft/openconfig-aft-pf.yang
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,13 @@ submodule openconfig-aft-pf {
fields other than the destination address that is used in
other forwarding tables.";

oc-ext:openconfig-version "2.5.0";
oc-ext:openconfig-version "2.6.0";

revision "2024-04-25" {
description
"Add backup-active to AFT NHG state.";
reference "2.6.0";
}

revision "2024-01-26" {
description
Expand Down
8 changes: 7 additions & 1 deletion release/models/aft/openconfig-aft-state-synced.yang
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,13 @@ submodule openconfig-aft-state-synced {
"Submodule containing definitions of groupings for the state
synced signals corresponding to various abstract forwarding tables.";

oc-ext:openconfig-version "2.5.0";
oc-ext:openconfig-version "2.6.0";

revision "2024-04-25" {
description
"Add backup-active to AFT NHG state.";
reference "2.6.0";
}

revision "2024-01-26" {
description
Expand Down
8 changes: 7 additions & 1 deletion release/models/aft/openconfig-aft.yang
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,13 @@ module openconfig-aft {
is referred to as an Abstract Forwarding Table (AFT), rather than
the FIB.";

oc-ext:openconfig-version "2.5.0";
oc-ext:openconfig-version "2.6.0";

revision "2024-04-25" {
description
"Add backup-active to AFT NHG state.";
reference "2.6.0";
}

revision "2024-01-26" {
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
21 changes: 20 additions & 1 deletion release/models/optical-transport/openconfig-terminal-device.yang
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,14 @@ module openconfig-terminal-device {
ports per linecard, separate linecards for client and line ports,
etc.).";

oc-ext:openconfig-version "1.9.1";
oc-ext:openconfig-version "1.9.2";

revision "2024-06-12" {
description
"Add a state leaf to optical channels to reference their logical
channel assignment.";
reference "1.9.2";
}

revision "2023-12-13" {
description
Expand Down Expand Up @@ -1325,6 +1332,18 @@ module openconfig-terminal-device {
to the same value across related optical channels.";
}

leaf logical-channel-assignment {
type leafref {
path "/oc-opt-term:terminal-device/oc-opt-term:logical-channels" +
"/oc-opt-term:channel/oc-opt-term:index";
}
description
"Reference to the logical channel that is directly assigned
to this optical channel if it is assigned to a logical channel.
The logical channel must also reference this optical channel at
logical-channel-assignments/assignment/state/optical-channel";
}

uses oc-transceiver:optical-power-state;

container chromatic-dispersion {
Expand Down
8 changes: 7 additions & 1 deletion release/models/ospf/openconfig-ospfv2-area-interface.yang
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,13 @@ submodule openconfig-ospfv2-area-interface {
"This submodule provides OSPFv2 configuration and operational
state parameters that are specific to the area context";

oc-ext:openconfig-version "0.5.1";
oc-ext:openconfig-version "0.5.2";

revision "2024-06-17" {
description
"Correct ROUTER_INFORMATION_LSA to ROUTER_INFORMATION.";
reference "0.5.2";
}

revision "2023-11-01" {
description
Expand Down
8 changes: 7 additions & 1 deletion release/models/ospf/openconfig-ospfv2-area.yang
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,13 @@ submodule openconfig-ospfv2-area {
"This submodule provides OSPFv2 configuration and operational
state parameters that are specific to the area context";

oc-ext:openconfig-version "0.5.1";
oc-ext:openconfig-version "0.5.2";

revision "2024-06-17" {
description
"Correct ROUTER_INFORMATION_LSA to ROUTER_INFORMATION.";
reference "0.5.2";
}

revision "2023-11-01" {
description
Expand Down
8 changes: 7 additions & 1 deletion release/models/ospf/openconfig-ospfv2-common.yang
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,13 @@ submodule openconfig-ospfv2-common {
"This submodule provides OSPFv2 configuration and operational
state parameters that are shared across multiple contexts";

oc-ext:openconfig-version "0.5.1";
oc-ext:openconfig-version "0.5.2";

revision "2024-06-17" {
description
"Correct ROUTER_INFORMATION_LSA to ROUTER_INFORMATION.";
reference "0.5.2";
}

revision "2023-11-01" {
description
Expand Down
8 changes: 7 additions & 1 deletion release/models/ospf/openconfig-ospfv2-global.yang
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,13 @@ submodule openconfig-ospfv2-global {
"This submodule provides OSPFv2 configuration and operational
state parameters that are global to a particular OSPF instance";

oc-ext:openconfig-version "0.5.1";
oc-ext:openconfig-version "0.5.2";

revision "2024-06-17" {
description
"Correct ROUTER_INFORMATION_LSA to ROUTER_INFORMATION.";
reference "0.5.2";
}

revision "2023-11-01" {
description
Expand Down
10 changes: 8 additions & 2 deletions release/models/ospf/openconfig-ospfv2-lsdb.yang
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,13 @@ submodule openconfig-ospfv2-lsdb {
"An OpenConfig model for the Open Shortest Path First (OSPF)
version 2 link-state database (LSDB)";

oc-ext:openconfig-version "0.5.1";
oc-ext:openconfig-version "0.5.2";

revision "2024-06-17" {
description
"Correct ROUTER_INFORMATION_LSA to ROUTER_INFORMATION.";
reference "0.5.2";
}

revision "2023-11-01" {
description
Expand Down Expand Up @@ -749,7 +755,7 @@ submodule openconfig-ospfv2-lsdb {
} // grace LSA

container router-information {
when "../state/type = 'oc-ospf-types:ROUTER_INFORMATION_LSA'" {
when "../state/type = 'oc-ospf-types:ROUTER_INFORMATION'" {
description
"Include the router-information container when the opaque LSA
type is specified to be an RI LSA";
Expand Down
8 changes: 7 additions & 1 deletion release/models/ospf/openconfig-ospfv2.yang
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,13 @@ module openconfig-ospfv2 {
"An OpenConfig model for Open Shortest Path First (OSPF)
version 2";

oc-ext:openconfig-version "0.5.1";
oc-ext:openconfig-version "0.5.2";

revision "2024-06-17" {
description
"Correct ROUTER_INFORMATION_LSA to ROUTER_INFORMATION.";
reference "0.5.2";
}

revision "2023-11-01" {
description
Expand Down
16 changes: 15 additions & 1 deletion release/models/system/openconfig-system.yang
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.0.0";
oc-ext:openconfig-version "2.1.0";

revision "2024-07-15" {
description
"Added auth key reference in ntp server configuration.";
reference "2.1.0";
}

revision "2023-12-20" {
description
Expand Down Expand Up @@ -748,6 +754,14 @@ module openconfig-system {
description
"Source address to use on outgoing NTP packets";
}

leaf key-id {
type leafref {
path "../../../../ntp-keys/ntp-key/key-id";
}
description
"Reference to NTP authentication key for this server.";
}
}

grouping system-ntp-server-state {
Expand Down

0 comments on commit 8fe39fc

Please sign in to comment.