Skip to content

Commit

Permalink
Merge branch 'master' into updateGnsiAcctzModel
Browse files Browse the repository at this point in the history
  • Loading branch information
@dplore
dplore authored Oct 22, 2024
2 parents d16966b + b0ef779 commit 14fbe43
Show file tree
Hide file tree
Showing 11 changed files with 423 additions and 45 deletions.
334 changes: 321 additions & 13 deletions release/models/aft/openconfig-aft-common.yang
View file

Large diffs are not rendered by default.

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.6.0";
oc-ext:openconfig-version "2.7.0";

revision "2024-07-18" {
description
"Add container for mpls-in-udp under next-hops aft entry state.";
reference "2.7.0";
}

revision "2024-04-25" {
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.6.0";
oc-ext:openconfig-version "2.7.0";

revision "2024-09-05" {
description
"Add encapsulate-stack under aft next-hops.";
reference "2.7.0";
}

revision "2024-04-25" {
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.6.0";
oc-ext:openconfig-version "2.7.0";

revision "2024-07-18" {
description
"Add container for mpls-in-udp under next-hops aft entry state.";
reference "2.7.0";
}

revision "2024-04-25" {
description
Expand Down
8 changes: 7 additions & 1 deletion release/models/aft/openconfig-aft-mpls.yang
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,13 @@ submodule openconfig-aft-mpls {
"Submodule containing definitions of groupings for the abstract
forwarding table for MPLS label forwarding.";

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

revision "2024-09-05" {
description
"Add encapsulate-stack under aft next-hops.";
reference "2.7.0";
}

revision "2024-04-25" {
description
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.6.0";
oc-ext:openconfig-version "2.7.0";

revision "2024-07-18" {
description
"Add container for mpls-in-udp under next-hops aft entry state.";
reference "2.7.0";
}

revision "2024-04-25" {
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.6.0";
oc-ext:openconfig-version "2.7.0";

revision "2024-07-18" {
description
"Add container for mpls-in-udp under next-hops aft entry state.";
reference "2.7.0";
}

revision "2024-04-25" {
description
Expand Down
12 changes: 11 additions & 1 deletion release/models/aft/openconfig-aft-types.yang
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,13 @@ module openconfig-aft-types {
"Types related to the OpenConfig Abstract Forwarding
Table (AFT) model";

oc-ext:openconfig-version "1.1.0";
oc-ext:openconfig-version "1.2.0";

revision "2024-07-18" {
description
"Add MPLS in UDP enums for encapsulate-header.";
reference "1.2.0";
}

revision "2022-05-05" {
description
Expand Down Expand Up @@ -89,6 +95,10 @@ module openconfig-aft-types {
description
"The encapsulation header is a VXLAN packet header";
}
enum UDP {
description
"The encapsulation header is UDP packet header.";
}
}
description
"Types of tunnel encapsulation that are supported by systems as either
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.6.0";
oc-ext:openconfig-version "2.7.0";

revision "2024-09-05" {
description
"Add encapsulate-stack under aft next-hops.";
reference "2.7.0";
}

revision "2024-04-25" {
description
Expand Down
15 changes: 14 additions & 1 deletion release/models/multicast/openconfig-pim-types.yang
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,13 @@ module openconfig-pim-types {
description
"This module defines types related to the PIM protocol model.";

oc-ext:openconfig-version "0.1.1";
oc-ext:openconfig-version "0.1.2";

revision "2024-05-31" {
description
"Add PIM bidirectional mode.";
reference "0.1.2";
}

revision "2018-11-21" {
description
Expand Down Expand Up @@ -62,6 +68,13 @@ module openconfig-pim-types {
reference "RFC3973";
}

identity PIM_MODE_BIDIR {
base PIM_MODE;
description
"PIM bidirectional mode.";
reference "RFC5015";
}

// typedef statements

typedef dr-priority-type {
Expand Down
51 changes: 28 additions & 23 deletions release/models/platform/openconfig-platform-transceiver.yang
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,13 @@ module openconfig-platform-transceiver {
specify a physical-channel within a TRANSCEIVER component
(i.e. gray optic) that it is associated with.";

oc-ext:openconfig-version "0.14.0";
oc-ext:openconfig-version "0.15.0";

revision "2024-09-21" {
description
"Clearly define how physical channel power leaves are used.";
reference "0.15.0";
}

revision "2023-08-30" {
description
Expand Down Expand Up @@ -204,7 +210,11 @@ revision "2023-08-30" {
Values include the instantaneous, average, minimum, and
maximum statistics. If avg/min/max statistics are not
supported, the target is expected to just supply the
instant value";
instant value. In some cases, such as when the physical
channel has a leafref to an optical channel component and the
module-functional-type is TYPE_DIGITAL_COHERENT_OPTIC this
grouping will NOT be used as the data will be within the
optical-channel";

uses oc-types:avg-min-max-instant-stats-precision2-dBm;
}
Expand All @@ -221,7 +231,12 @@ revision "2023-08-30" {
Values include the instantaneous, average, minimum, and
maximum statistics. If avg/min/max statistics are not
supported, the target is expected to just supply the
instant value";
instant value. When the physical channel has a leafref to
an optical channel component and the module-functional-type is
TYPE_DIGITAL_COHERENT_OPTIC this represents the aggregate
total optical power value (signal and noise) whereas
optical power value within the optical-channel represents
the signal power";

uses oc-types:avg-min-max-instant-stats-precision2-dBm;
}
Expand All @@ -233,7 +248,11 @@ revision "2023-08-30" {
with up to two decimal precision. Values include the
instantaneous, average, minimum, and maximum statistics.
If avg/min/max statistics are not supported, the target is
expected to just supply the instant value";
expected to just supply the instant value. In some cases,
such as when the physical channel has a leafref to an optical
channel component and the module-functional-type is
TYPE_DIGITAL_COHERENT_OPTIC this grouping will NOT be used
as the data will be within the optical-channel";

uses oc-types:avg-min-max-instant-stats-precision2-mA;
}
Expand All @@ -251,7 +270,11 @@ revision "2023-08-30" {
"The frequency in MHz of the individual physical channel
(e.g. ITU C50 - 195.0THz and would be reported as
195,000,000 MHz in this model). This attribute is not
configurable on most client ports.";
configurable on most client ports In some cases, such as when
the physical channel has a leafref to an optical channel
component and the module-functional-type is
TYPE_DIGITAL_COHERENT_OPTIC this grouping will NOT be used
as the data will be within the optical-channel.";
}
}

Expand Down Expand Up @@ -384,24 +407,6 @@ revision "2023-08-30" {
uses oc-opt-types:avg-min-max-instant-stats-precision2-pct;
}

uses physical-channel-state-extended {
when "../../../state/module-functional-type = 'oc-opt-types:TYPE_STANDARD_OPTIC'" {
description
"When the physical channel is of TYPE_STANDARD_OPTIC, the
extended state will be used";
}
}
}

grouping physical-channel-state-extended {
description
"Extended operational state data for physical client channels
for applications where the full physical channel config and
state are used. In some cases, such as when the physical
channel has a leafref to an optical channel component and the
module-functional-type is TYPE_DIGITAL_COHERENT_OPTIC this
grouping will NOT be used.";

uses output-optical-frequency;
uses optical-power-state;
}
Expand Down

0 comments on commit 14fbe43

Please sign in to comment.