Skip to content

Commit

Permalink
Merge branch 'master' into evpn-vni-peergroup
Browse files Browse the repository at this point in the history
  • Loading branch information
@mikewiebe
mikewiebe authored Jan 8, 2024
2 parents 42d4845 + af9d6b6 commit fc6a90b
Show file tree
Hide file tree
Showing 3 changed files with 149 additions and 41 deletions.
132 changes: 129 additions & 3 deletions release/models/bgp/openconfig-bgp-policy.yang
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,18 @@ module openconfig-bgp-policy {
It augments the base routing-policy module with BGP-specific
options for conditions and actions.";

oc-ext:openconfig-version "6.2.0";
oc-ext:openconfig-version "6.3.0";

revision "2023-10-23" {
description
"Revert revision 2019-02-01.
Move match-set-options of BGP community and BGP extended community from
defined-sets/bgp-defined-sets/community-set and
defined-sets/bgp-defined-sets/ext-community-set back to
policy-definitions/statements/.../bgp-conditions
for consistency across sets.";
reference "6.3.0";
}

revision "2023-10-03" {
description
Expand Down Expand Up @@ -244,12 +255,113 @@ module openconfig-bgp-policy {
}
}

grouping match-community-config {
description
"Configuration data for match conditions on community set";

leaf community-set {
type leafref {
path "/oc-rpol:routing-policy/oc-rpol:defined-sets/" +
"oc-bgp-pol:bgp-defined-sets/oc-bgp-pol:community-sets/" +
"oc-bgp-pol:community-set/oc-bgp-pol:community-set-name";
}
description "References a defined community set";
}
uses oc-rpol:match-set-options-group;
}

grouping match-community-state {
description
"Operational state data for match conditions on community set";
}

grouping match-community-top {
description
"Top-level grouping for match conditions on community set";

container match-community-set {
description
"Match a referenced community set according to the logic
defined in the match-set-options leaf";

container config {
description
"Configuration data for match conditions on community set";

uses match-community-config;
}

container state {

config false;

description
"Operational state data for match conditions on community set";

uses match-community-config;
uses match-community-state;
}
}
}

grouping match-ext-community-config {
description
"Configuration data for match conditions on extended community set";

leaf ext-community-set {
type leafref {
path "/oc-rpol:routing-policy/oc-rpol:defined-sets/" +
"oc-bgp-pol:bgp-defined-sets/oc-bgp-pol:ext-community-sets/" +
"oc-bgp-pol:ext-community-set/oc-bgp-pol:ext-community-set-name";
}
description "References a defined extended community set";
}
uses oc-rpol:match-set-options-group;
}

grouping match-ext-community-state {
description
"Operational state data for match conditions on extended community set";
}

grouping match-ext-community-top {
description
"Top-level grouping for match conditions on extended community set";

container match-ext-community-set {
description
"Match a referenced extended community set according to the logic
defined in the match-set-options leaf";

container config {
description
"Configuration data for match conditions on extended community set";

uses match-ext-community-config;
}

container state {

config false;

description
"Operational state data for match conditions on extended
community set";

uses match-ext-community-config;
uses match-ext-community-state;
}
}
}

grouping bgp-match-set-conditions {
description
"Condition statement definitions for checking membership in a
defined set";

uses match-as-path-top;
uses match-community-top;
uses match-ext-community-top;
}

grouping community-count-config {
Expand Down Expand Up @@ -391,6 +503,7 @@ module openconfig-bgp-policy {
}

leaf community-set {
status deprecated;
type leafref {
path "/oc-rpol:routing-policy/oc-rpol:defined-sets/" +
"oc-bgp-pol:bgp-defined-sets/oc-bgp-pol:community-sets/" +
Expand All @@ -401,6 +514,7 @@ module openconfig-bgp-policy {
}

leaf ext-community-set {
status deprecated;
type leafref {
path "/oc-rpol:routing-policy/oc-rpol:defined-sets/" +
"oc-bgp-pol:bgp-defined-sets/oc-bgp-pol:ext-community-sets/" +
Expand Down Expand Up @@ -477,7 +591,13 @@ module openconfig-bgp-policy {
removed.";
}

uses oc-rpol:match-set-options-group;
leaf match-set-options {
status deprecated;
type oc-pol-types:match-set-options-type;
description
"Optional parameter that governs the behaviour of the
match operation";
}
}

grouping community-set-state {
Expand Down Expand Up @@ -553,7 +673,13 @@ module openconfig-bgp-policy {
removed.";
}

uses oc-rpol:match-set-options-group;
leaf match-set-options {
status deprecated;
type oc-pol-types:match-set-options-type;
description
"Optional parameter that governs the behaviour of the
match operation";
}
}

grouping ext-community-set-state {
Expand Down
24 changes: 13 additions & 11 deletions release/models/isis/openconfig-isis-policy.yang
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,13 @@ module openconfig-isis-policy {
It augments the base routing-policy module with BGP-specific
options for conditions and actions.";

oc-ext:openconfig-version "0.7.0";
oc-ext:openconfig-version "0.8.0";

revision "2023-11-02" {
description
"Fixing metric type leafs for action and condition branches.";
reference "0.8.0";
}

revision "2023-04-28" {
description
Expand Down Expand Up @@ -151,10 +157,10 @@ module openconfig-isis-policy {
within it";
}

leaf set-metric-type {
leaf match-metric-type {
type isis-types:metric-type;
description
"Set the type of the route to redistribute to INTERNAL or EXTERNAL";
"Matches the type of the route to redistribute to INTERNAL or EXTERNAL";
}
}

Expand Down Expand Up @@ -195,20 +201,16 @@ module openconfig-isis-policy {
}

leaf set-metric-type {
type isis-types:level-number;
status deprecated;
type isis-types:metric-type;
description
"Formerly this leaf sets the type of metric that is to be specified
when the set-metric leaf is specified. This leaf is DEPRECATED
due to being assigned the wrong type. Use set-metric-style-type
instead.";
"This leaf sets the type of metric that is to be specified
when the set-metric leaf is specified";
}

leaf set-metric-style-type {
type isis-types:metric-style;
description
"Set the type of metric that is to be specified when the
set metric leaf is specified";
"Set the style of the metric";
}

leaf set-metric {
Expand Down
34 changes: 7 additions & 27 deletions release/models/p4rt/openconfig-p4rt.yang
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,13 @@ module openconfig-p4rt {
The P4RT protocol specification is linked from https://p4.org/specs/
under the P4Runtime heading.";

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

revision 2023-12-13 {
description
"Remove unused chassis id";
reference "1.0.0";
}

revision 2022-08-19 {
description
Expand Down Expand Up @@ -104,18 +110,6 @@ module openconfig-p4rt {
}
}

grouping p4rt-chassis-config {
description
"Config regarding P4RT use cases which corresponds to the global device hardware package";

leaf id {
type uint32;
description
"An identifier used for the root of oc-p4rt:node-id. It is used to
indicate which oc-p4rt:node-id's belong to the same device";
}
}

grouping p4rt-ic-config {
description
"Integrated-circuit specific configuration that is applicable to devices
Expand Down Expand Up @@ -176,20 +170,6 @@ module openconfig-p4rt {
uses p4rt-ic-config;
}

augment "/oc-platform:components/oc-platform:component/" +
"oc-platform:chassis/oc-platform:config" {
description
"Add P4RT chassis config to platform chassis component.";
uses p4rt-chassis-config;
}

augment "/oc-platform:components/oc-platform:component/" +
"oc-platform:chassis/oc-platform:state" {
description
"Add P4RT chassis state to platform chassis component.";
uses p4rt-chassis-config;
}

}

// rpc statements
Expand Down

0 comments on commit fc6a90b

Please sign in to comment.