matthew/sonic-buildimage
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[yang] Change asn to start from 0 for bgp monitor (#15350) (#15482)

Browse Source
This commit is contained in:
mssonicbld 2023-06-16 03:58:05 +08:00 committed by GitHub
parent c4fcd31fa6
commit 821c883ef4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/sonic-yang-models/tests/files/sample_config_db.json
View File

@ -1351,7 +1351,7 @@
"BGP_MONITORS": { "BGP_MONITORS": {
"5.6.7.8": { "5.6.7.8": {
"admin_status": "up", "admin_status": "up",
"asn": "65000", "asn": "0",
"holdtime": "180", "holdtime": "180",
"keepalive": "60", "keepalive": "60",
"local_addr": "10.0.0.11", "local_addr": "10.0.0.11",

2
src/sonic-yang-models/yang-models/sonic-bgp-common.yang
View File

@ -534,7 +534,7 @@ module sonic-bgp-common {
grouping sonic-bgp-cmn-neigh { grouping sonic-bgp-cmn-neigh {
leaf asn { leaf asn {
type uint32 { type uint32 {
range "1..4294967295"; range "0..4294967295";
} }
description "Peer AS number"; description "Peer AS number";
} }

3
src/sonic-yang-models/yang-models/sonic-bgp-internal-neighbor.yang
View File

@ -43,6 +43,9 @@ module sonic-bgp-internal-neighbor {
must "(current() = /dm:sonic-device_metadata/dm:DEVICE_METADATA/dm:localhost/dm:bgp_asn)" { must "(current() = /dm:sonic-device_metadata/dm:DEVICE_METADATA/dm:localhost/dm:bgp_asn)" {
error-message "Internal iBGP neighbors should have same ASN as defined in device metadata"; error-message "Internal iBGP neighbors should have same ASN as defined in device metadata";
} }
must ". >= 1" {
error-message "ASN must be greater than 0";
}
} }
refine local_addr { refine local_addr {
mandatory true; mandatory true;

8
src/sonic-yang-models/yang-models/sonic-bgp-neighbor.yang
View File

@ -61,7 +61,13 @@ module sonic-bgp-neighbor {
description "BGP Neighbor address"; description "BGP Neighbor address";
} }
uses bgpcmn:sonic-bgp-cmn-neigh; uses bgpcmn:sonic-bgp-cmn-neigh {
refine asn {
must ". >= 1" {
error-message "ASN must be greater than 0";
}
}
}
} }
list BGP_NEIGHBOR_LIST { list BGP_NEIGHBOR_LIST {

3
src/sonic-yang-models/yang-models/sonic-bgp-voq-chassis-neighbor.yang
View File

@ -45,6 +45,9 @@ module sonic-bgp-voq-chassis-neighbor {
must "(current() = /dm:sonic-device_metadata/dm:DEVICE_METADATA/dm:localhost/dm:bgp_asn)" { must "(current() = /dm:sonic-device_metadata/dm:DEVICE_METADATA/dm:localhost/dm:bgp_asn)" {
error-message "Voq chassis BGP neighbors should have same ASN as defined in device metadata"; error-message "Voq chassis BGP neighbors should have same ASN as defined in device metadata";
} }
must ". >= 1" {
error-message "ASN must be greater than 0";
}
} }
refine local_addr { refine local_addr {
mandatory true; mandatory true;