Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into master
Browse files Browse the repository at this point in the history
sallylsy authored Nov 7, 2023
2 parents 10215ae + 025b0ee commit e288e9f
Showing 39 changed files with 811 additions and 170 deletions.
3 changes: 1 addition & 2 deletions cloudbuild.yaml
Original file line number Diff line number Diff line change
@@ -52,7 +52,7 @@ steps:
git clone [email protected]:openconfig/models-ci.git /go/src/github.com/openconfig/models-ci
cd /go/src/github.com/openconfig/models-ci
# Modify the major version to update models-ci version.
branch=$(git tag -l 'v11.*' | sort -V | tail -1)
branch=$(git tag -l 'v12.*' | sort -V | tail -1)
git checkout $branch
volumes:
- name: 'ssh'
@@ -90,7 +90,6 @@ steps:
-skipped-validators=confd,yanglint
-extra-pyang-versions=2.2.1
-branch=$BRANCH_NAME
-compat-report=pyangbind
secretEnv: ['GITHUB_ACCESS_TOKEN']
env:
- 'GOPATH=/go'
16 changes: 15 additions & 1 deletion release/models/aft/openconfig-aft-common.yang
Original file line number Diff line number Diff line change
@@ -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.3.0";
oc-ext:openconfig-version "2.4.0";

revision "2023-09-26" {
description
"Add next-hop-group-name in NHG AFT entry state.";
reference "2.4.0";
}

revision "2023-04-19" {
description
@@ -579,6 +585,14 @@ submodule openconfig-aft-common {
also be updated.";
}

leaf next-hop-group-name {
type string;
description
"Where applicable, this leaf is a unique identifier string for the
next-hop-group. It is an arbitrary name for the group, that is
supported by vendors and is exposed for telemetry.";
}

leaf programmed-id {
type uint64;
description
8 changes: 7 additions & 1 deletion release/models/aft/openconfig-aft-ethernet.yang
Original file line number Diff line number Diff line change
@@ -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.3.0";
oc-ext:openconfig-version "2.4.0";

revision "2023-09-26" {
description
"Add next-hop-group-name in NHG AFT entry state.";
reference "2.4.0";
}

revision "2023-04-19" {
description
8 changes: 7 additions & 1 deletion release/models/aft/openconfig-aft-ipv4.yang
Original file line number Diff line number Diff line change
@@ -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.3.0";
oc-ext:openconfig-version "2.4.0";

revision "2023-09-26" {
description
"Add next-hop-group-name in NHG AFT entry state.";
reference "2.4.0";
}

revision "2023-04-19" {
description
8 changes: 7 additions & 1 deletion release/models/aft/openconfig-aft-ipv6.yang
Original file line number Diff line number Diff line change
@@ -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.3.0";
oc-ext:openconfig-version "2.4.0";

revision "2023-09-26" {
description
"Add next-hop-group-name in NHG AFT entry state.";
reference "2.4.0";
}

revision "2023-04-19" {
description
8 changes: 7 additions & 1 deletion release/models/aft/openconfig-aft-mpls.yang
Original file line number Diff line number Diff line change
@@ -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.3.0";
oc-ext:openconfig-version "2.4.0";

revision "2023-09-26" {
description
"Add next-hop-group-name in NHG AFT entry state.";
reference "2.4.0";
}

revision "2023-04-19" {
description
8 changes: 7 additions & 1 deletion release/models/aft/openconfig-aft-pf.yang
Original file line number Diff line number Diff line change
@@ -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.3.0";
oc-ext:openconfig-version "2.4.0";

revision "2023-09-26" {
description
"Add next-hop-group-name in NHG AFT entry state.";
reference "2.4.0";
}

revision "2023-04-19" {
description
8 changes: 7 additions & 1 deletion release/models/aft/openconfig-aft-state-synced.yang
Original file line number Diff line number Diff line change
@@ -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.3.0";
oc-ext:openconfig-version "2.4.0";

revision "2023-09-26" {
description
"Add next-hop-group-name in NHG AFT entry state.";
reference "2.4.0";
}

revision "2023-04-19" {
description
8 changes: 7 additions & 1 deletion release/models/aft/openconfig-aft.yang
Original file line number Diff line number Diff line change
@@ -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.3.0";
oc-ext:openconfig-version "2.4.0";

revision "2023-09-26" {
description
"Add next-hop-group-name in NHG AFT entry state.";
reference "2.4.0";
}

revision "2023-04-19" {
description
8 changes: 7 additions & 1 deletion release/models/bgp/openconfig-bgp-common-multiprotocol.yang
Original file line number Diff line number Diff line change
@@ -24,7 +24,13 @@ submodule openconfig-bgp-common-multiprotocol {
for multiple protocols in BGP. The groupings are common across
multiple contexts.";

oc-ext:openconfig-version "9.4.1";
oc-ext:openconfig-version "9.5.0";

revision "2023-11-01" {
description
"Add default apply policy to global and per afi-safi config.";
reference "9.5.0";
}

revision "2023-06-27" {
description
8 changes: 7 additions & 1 deletion release/models/bgp/openconfig-bgp-common-structure.yang
Original file line number Diff line number Diff line change
@@ -21,7 +21,13 @@ submodule openconfig-bgp-common-structure {
"This sub-module contains groupings that are common across multiple BGP
contexts and provide structure around other primitive groupings.";

oc-ext:openconfig-version "9.4.1";
oc-ext:openconfig-version "9.5.0";

revision "2023-11-01" {
description
"Add default apply policy to global and per afi-safi config.";
reference "9.5.0";
}

revision "2023-06-27" {
description
8 changes: 7 additions & 1 deletion release/models/bgp/openconfig-bgp-common.yang
Original file line number Diff line number Diff line change
@@ -24,7 +24,13 @@ submodule openconfig-bgp-common {
may be application to a subset of global, peer-group or neighbor
contexts.";

oc-ext:openconfig-version "9.4.1";
oc-ext:openconfig-version "9.5.0";

revision "2023-11-01" {
description
"Add default apply policy to global and per afi-safi config.";
reference "9.5.0";
}

revision "2023-06-27" {
description
11 changes: 10 additions & 1 deletion release/models/bgp/openconfig-bgp-global.yang
Original file line number Diff line number Diff line change
@@ -7,6 +7,7 @@ submodule openconfig-bgp-global {
import openconfig-extensions { prefix oc-ext; }
import openconfig-yang-types { prefix oc-yang; }
import openconfig-inet-types { prefix oc-inet; }
import openconfig-routing-policy { prefix oc-rpol; }

// Include common submodules
include openconfig-bgp-common;
@@ -26,7 +27,13 @@ submodule openconfig-bgp-global {
"This sub-module contains groupings that are specific to the
global context of the OpenConfig BGP module";

oc-ext:openconfig-version "9.4.1";
oc-ext:openconfig-version "9.5.0";

revision "2023-11-01" {
description
"Add default apply policy to global and per afi-safi config.";
reference "9.5.0";
}

revision "2023-06-27" {
description
@@ -397,6 +404,7 @@ submodule openconfig-bgp-global {
uses bgp-common-global-group-use-multiple-paths;
uses bgp-common-structure-neighbor-group-add-paths;
uses bgp-global-mp-all-afi-safi-list-contents;
uses oc-rpol:default-policy-group;
}
}

@@ -482,6 +490,7 @@ submodule openconfig-bgp-global {
}

uses bgp-global-dynamic-neighbors;
uses oc-rpol:default-policy-group;
}

}
8 changes: 7 additions & 1 deletion release/models/bgp/openconfig-bgp-neighbor.yang
Original file line number Diff line number Diff line change
@@ -30,7 +30,13 @@ submodule openconfig-bgp-neighbor {
"This sub-module contains groupings that are specific to the
neighbor context of the OpenConfig BGP module.";

oc-ext:openconfig-version "9.4.1";
oc-ext:openconfig-version "9.5.0";

revision "2023-11-01" {
description
"Add default apply policy to global and per afi-safi config.";
reference "9.5.0";
}

revision "2023-06-27" {
description
8 changes: 7 additions & 1 deletion release/models/bgp/openconfig-bgp-peer-group.yang
Original file line number Diff line number Diff line change
@@ -25,7 +25,13 @@ submodule openconfig-bgp-peer-group {
"This sub-module contains groupings that are specific to the
peer-group context of the OpenConfig BGP module.";

oc-ext:openconfig-version "9.4.1";
oc-ext:openconfig-version "9.5.0";

revision "2023-11-01" {
description
"Add default apply policy to global and per afi-safi config.";
reference "9.5.0";
}

revision "2023-06-27" {
description
37 changes: 36 additions & 1 deletion release/models/bgp/openconfig-bgp-policy.yang
Original file line number Diff line number Diff line change
@@ -28,7 +28,16 @@ module openconfig-bgp-policy {
It augments the base routing-policy module with BGP-specific
options for conditions and actions.";

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

revision "2023-10-03" {
description
"Deprecate community-set-ref and ext-community-set-ref,
add the following leaf-list nodes:
* community-set-refs
* ext-community-set-refs";
reference "6.2.0";
}

revision "2023-03-27" {
description
@@ -831,7 +840,19 @@ module openconfig-bgp-policy {
"Configuration data for referening a community-set in the
set-community action";

leaf-list community-set-refs {
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 list of defined community sets by name";
}

leaf community-set-ref {
status deprecated;
type leafref {
path "/oc-rpol:routing-policy/oc-rpol:defined-sets/" +
"oc-bgp-pol:bgp-defined-sets/" +
@@ -994,7 +1015,21 @@ module openconfig-bgp-policy {
"Configuration data for referening a extended community-set
in the set-ext-community action";

leaf-list ext-community-set-refs {
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 list of defined extended community sets by
name";
}

leaf ext-community-set-ref {
status deprecated;
type leafref {
path "/oc-rpol:routing-policy/oc-rpol:defined-sets/" +
"oc-bgp-pol:bgp-defined-sets/" +
8 changes: 7 additions & 1 deletion release/models/bgp/openconfig-bgp.yang
Original file line number Diff line number Diff line change
@@ -68,7 +68,13 @@ module openconfig-bgp {
whereas leaf not present inherits its value from the leaf present
at the next higher level in the hierarchy.";

oc-ext:openconfig-version "9.4.1";
oc-ext:openconfig-version "9.5.0";

revision "2023-11-01" {
description
"Add default apply policy to global and per afi-safi config.";
reference "9.5.0";
}

revision "2023-06-27" {
description
Loading

0 comments on commit e288e9f

Please sign in to comment.