Skip to content

Commit

Permalink
Merge branch 'master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
xuqma authored Jan 3, 2025
2 parents 9cf2934 + 850e572 commit 28803d0
Show file tree
Hide file tree
Showing 9 changed files with 1,959 additions and 12 deletions.
22 changes: 19 additions & 3 deletions release/models/bgp/openconfig-bgp-policy.yang
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,12 @@ module openconfig-bgp-policy {
reference "8.2.0";
}

revision "2024-11-13" {
description
"Add use-last-as leaf to set-as-path-prepend to prepend last AS.";
reference "8.1.0";
}

revision "2024-08-23" {
description
"Separate the ability to set the BGP MED along with an appropriate
Expand Down Expand Up @@ -927,9 +933,19 @@ module openconfig-bgp-policy {
leaf asn {
type oc-inet:as-number;
description
"The AS number to prepend to the AS path. If this leaf is
not specified and repeat-n is set, then the local AS
number will be used for prepending.";
"The AS number to prepend to the AS path. If neither this
leaf nor use-last-as leaf is specified but repeat-n is set, then
the local AS number will be used for prepending.";
}

leaf use-last-as {
type boolean;
description
"Indicates whether to use the last AS number, which is also the
most recent AS number, to prepend to the AS path.
If neither this leaf nor asn leaf is specified
but repeat-n is set, then the local AS number will be
used for prepending.";
}
}

Expand Down
41 changes: 40 additions & 1 deletion release/models/interfaces/openconfig-if-ip.yang
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,13 @@ module openconfig-if-ip {
Section 4.c of the IETF Trust's Legal Provisions Relating
to IETF Documents (http://trustee.ietf.org/license-info).";

oc-ext:openconfig-version "3.5.1";
oc-ext:openconfig-version "3.6.0";

revision "2024-05-28" {
description
"Add gratuitous-arp-accepted for IPv4 and unsolicited-na-accepted for IPv6.";
reference "3.6.0";
}

revision "2024-03-13" {
description
Expand Down Expand Up @@ -480,6 +486,15 @@ revision "2023-06-30" {
"RFC 791: Internet Protocol";
}

leaf gratuitous-arp-accepted {
type boolean;
description
"When set to true, gratuitous ARPs will be accepted and
the ARP table will be updated.";
reference
"RFC 826: An Ethernet Address Resolution Protocol";
}

uses ip-common-global-config;


Expand Down Expand Up @@ -605,6 +620,30 @@ revision "2023-06-30" {
"RFC 4862: IPv6 Stateless Address Autoconfiguration";
}

leaf learn-unsolicited {
type enumeration {
enum NONE {
value 0;
}
enum GLOBAL {
value 1;
}
enum LINK_LOCAL {
value 2;
}
enum BOTH {
value 3;
}
}
default "NONE";
description
"Sets if neighbors should be learned from unsolicited neighbor
advertisements for global or link local addresses or both.";
reference
"RFC 9131: Routers Creating Cache Entries upon
Receiving Unsolicited Neighbor Advertisements";
}

uses ip-common-global-config;
}

Expand Down
11 changes: 9 additions & 2 deletions release/models/interfaces/openconfig-interfaces.yang
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,14 @@ module openconfig-interfaces {
Section 4.c of the IETF Trust's Legal Provisions Relating
to IETF Documents (http://trustee.ietf.org/license-info).";

oc-ext:openconfig-version "3.7.1";
oc-ext:openconfig-version "3.7.2";

revision "2024-12-05" {
description
"Description typo for unnumbered/interface-ref/config/subinterface leaf";
reference
"3.7.2";
}

revision "2024-04-04" {
description
Expand Down Expand Up @@ -230,7 +237,7 @@ module openconfig-interfaces {
"Reference to a subinterface -- this requires the base
interface to be specified using the interface leaf in
this container. If only a reference to a base interface
is requuired, this leaf should not be set.";
is required, this leaf should not be set.";
}
}

Expand Down
10 changes: 8 additions & 2 deletions release/models/multicast/openconfig-pim.yang
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,15 @@ module openconfig-pim {
www.openconfig.net";

description
"An OpenConfig model for Protocol Independent Multicast (PIM).";
"An OpenConfig model for Protocol Independent Multicast (PIM) that supports IPv4 address family.";

oc-ext:openconfig-version "0.4.3";
oc-ext:openconfig-version "0.4.4";

revision "2024-12-06" {
description
"Update PIM documentation to clarify that only ipv4 AF is supported.";
reference "0.4.4";
}

revision "2023-03-06" {
description
Expand Down
9 changes: 9 additions & 0 deletions release/models/oam/.spec.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
- name: openconfig-oam
docs:
- yang/oam/openconfig-oam.yang
- yang/oam/openconfig-cfm-types.yang
- yang/oam/openconfig-oam-cfm.yang
build:
- yang/oam/openconfig-oam.yang
- yang/oam/openconfig-oam-cfm.yang
run-ci: true
Loading

0 comments on commit 28803d0

Please sign in to comment.