Skip to content

Commit

Permalink
Merge branch 'master' into dplore/ebgp-unchanged-nh
Browse files Browse the repository at this point in the history
  • Loading branch information
@dplore
dplore authored Aug 29, 2024
2 parents 2b89287 + 6b19efb commit 95aaa29
Show file tree
Hide file tree
Showing 24 changed files with 500 additions and 88 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
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
Loading

0 comments on commit 95aaa29

Please sign in to comment.