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

[yang] sonic-bgp-cmn/admin_status fixed (#9429)

Browse Source 
#### Why I did it
fixing https://github.com/Azure/sonic-buildimage/issues/9350 "[yang-models] BGP neighbor admin_status should be up/down"
This commit is contained in:
MaratGubaiev 2021-12-09 20:19:05 +02:00 committed by GitHub
parent b88f68b1d6
commit 4562b82bf2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 29 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/sonic-yang-models/tests/yang_model_tests/tests_config/bgp.json
View File

@ -177,7 +177,7 @@
"peer_port": 0, "peer_port": 0,
"shutdown_message": "BGP PeerGroup Shutdown Message", "shutdown_message": "BGP PeerGroup Shutdown Message",
"strict_capability_match": false, "strict_capability_match": false,
"admin_status": false, "admin_status": "down",
"local_as_no_prepend": false, "local_as_no_prepend": false,
"local_as_replace_as": false "local_as_replace_as": false
}, },
@ -211,7 +211,7 @@
"peer_port": 0, "peer_port": 0,
"shutdown_message": "BGP PeerGroup Shutdown Message", "shutdown_message": "BGP PeerGroup Shutdown Message",
"strict_capability_match": false, "strict_capability_match": false,
"admin_status": false, "admin_status": "down",
"local_as_no_prepend": false, "local_as_no_prepend": false,
"local_as_replace_as": false "local_as_replace_as": false
} }
@ -223,14 +223,14 @@
"vrf_name": "default", "vrf_name": "default",
"neighbor": "20.0.0.1", "neighbor": "20.0.0.1",
"afi_safi": "ipv4_unicast", "afi_safi": "ipv4_unicast",
"admin_status": true, "admin_status": "up",
"send_default_route": true "send_default_route": true
}, },
{ {
"vrf_name": "Vrf1", "vrf_name": "Vrf1",
"neighbor": "20.0.0.2", "neighbor": "20.0.0.2",
"afi_safi": "ipv6_unicast", "afi_safi": "ipv6_unicast",
"admin_status": true, "admin_status": "up",
"send_default_route": true "send_default_route": true
} }
@ -321,7 +321,7 @@
"peer_port": 0, "peer_port": 0,
"shutdown_message": "BGP PeerGroup Shutdown Message", "shutdown_message": "BGP PeerGroup Shutdown Message",
"strict_capability_match": false, "strict_capability_match": false,
"admin_status": false, "admin_status": "down",
"local_as_no_prepend": false, "local_as_no_prepend": false,
"local_as_replace_as": false "local_as_replace_as": false
}, },
@ -355,7 +355,7 @@
"peer_port": 0, "peer_port": 0,
"shutdown_message": "BGP PeerGroup Shutdown Message", "shutdown_message": "BGP PeerGroup Shutdown Message",
"strict_capability_match": false, "strict_capability_match": false,
"admin_status": false, "admin_status": "down",
"local_as_no_prepend": false, "local_as_no_prepend": false,
"local_as_replace_as": false "local_as_replace_as": false
} }
@ -367,14 +367,14 @@
"vrf_name": "default", "vrf_name": "default",
"peer_group_name": "PG1", "peer_group_name": "PG1",
"afi_safi": "ipv4_unicast", "afi_safi": "ipv4_unicast",
"admin_status": true, "admin_status": "up",
"send_default_route": true "send_default_route": true
}, },
{ {
"vrf_name": "Vrf1", "vrf_name": "Vrf1",
"peer_group_name": "PG2", "peer_group_name": "PG2",
"afi_safi": "ipv6_unicast", "afi_safi": "ipv6_unicast",
"admin_status": true, "admin_status": "up",
"send_default_route": true "send_default_route": true
} }
@ -441,7 +441,7 @@
"vrf_name": "default", "vrf_name": "default",
"neighbor": "20.0.0.1", "neighbor": "20.0.0.1",
"afi_safi": "ipv4_unicast", "afi_safi": "ipv4_unicast",
"admin_status": true, "admin_status": "up",
"send_default_route": true "send_default_route": true
}]} }]}
} }
@ -666,7 +666,7 @@
"vrf_name": "default", "vrf_name": "default",
"neighbor": "11.12.14.921", "neighbor": "11.12.14.921",
"afi_safi": "ipv4_unicast", "afi_safi": "ipv4_unicast",
"admin_status": true "admin_status": "up"
} }
] ]
} }
@ -702,7 +702,7 @@
"vrf_name": "default", "vrf_name": "default",
"neighbor": "20.0.0.1", "neighbor": "20.0.0.1",
"afi_safi": "ipv4_unicast", "afi_safi": "ipv4_unicast",
"admin_status": true, "admin_status": "up",
"max_prefix_warning_threshold": 102 "max_prefix_warning_threshold": 102
} }
] ]
@ -739,7 +739,7 @@
"vrf_name": "default", "vrf_name": "default",
"neighbor": "20.0.0.1", "neighbor": "20.0.0.1",
"afi_safi": "ipv4_unicast", "afi_safi": "ipv4_unicast",
"admin_status": true, "admin_status": "up",
"soft_reconfiguration_in": "not_true" "soft_reconfiguration_in": "not_true"
} }
] ]
@ -776,7 +776,7 @@
"vrf_name": "default", "vrf_name": "default",
"neighbor": "20.0.0.1", "neighbor": "20.0.0.1",
"afi_safi": "ipv4_unicast", "afi_safi": "ipv4_unicast",
"admin_status": true, "admin_status": "up",
"send_community": "foobar" "send_community": "foobar"
} }
] ]
@ -813,7 +813,7 @@
"vrf_name": "default", "vrf_name": "default",
"neighbor": "20.0.0.1", "neighbor": "20.0.0.1",
"afi_safi": "ipv4_unicast", "afi_safi": "ipv4_unicast",
"admin_status": true, "admin_status": "up",
"route_map_in": [ "route_map_in": [
"rtmap05" "rtmap05"
] ]
@ -864,7 +864,7 @@
"vrf_name": "default", "vrf_name": "default",
"neighbor": "20.0.0.1", "neighbor": "20.0.0.1",
"afi_safi": "ipv4_unicast", "afi_safi": "ipv4_unicast",
"admin_status": true, "admin_status": "up",
"route_map_in": [ "route_map_in": [
"rtmap01", "rtmap01",
"rtmap02" "rtmap02"
@ -916,7 +916,7 @@
"vrf_name": "default", "vrf_name": "default",
"neighbor": "20.0.0.1", "neighbor": "20.0.0.1",
"afi_safi": "ipv4_unicast", "afi_safi": "ipv4_unicast",
"admin_status": true, "admin_status": "up",
"route_map_out": [ "route_map_out": [
"rtmap01", "rtmap01",
"rtmap02" "rtmap02"
@ -959,7 +959,7 @@
"vrf_name": "default", "vrf_name": "default",
"peer_group_name": "PG1", "peer_group_name": "PG1",
"afi_safi": "ipv4_unicast", "afi_safi": "ipv4_unicast",
"admin_status": true, "admin_status": "up",
"send_default_route": true "send_default_route": true
}]} }]}
} }
@ -1099,7 +1099,7 @@
"vrf_name": "default", "vrf_name": "default",
"peer_group_name": "PG1", "peer_group_name": "PG1",
"afi_safi": "ipv4_unicast", "afi_safi": "ipv4_unicast",
"admin_status": true, "admin_status": "up",
"max_prefix_warning_threshold": 102 "max_prefix_warning_threshold": 102
} }
] ]
@ -1136,7 +1136,7 @@
"vrf_name": "default", "vrf_name": "default",
"peer_group_name": "PG1", "peer_group_name": "PG1",
"afi_safi": "ipv4_unicast", "afi_safi": "ipv4_unicast",
"admin_status": true, "admin_status": "up",
"soft_reconfiguration_in": "not_true" "soft_reconfiguration_in": "not_true"
} }
] ]
@ -1173,7 +1173,7 @@
"vrf_name": "default", "vrf_name": "default",
"peer_group_name": "PG1", "peer_group_name": "PG1",
"afi_safi": "ipv4_unicast", "afi_safi": "ipv4_unicast",
"admin_status": true, "admin_status": "up",
"send_community": "foobar" "send_community": "foobar"
} }
] ]
@ -1210,7 +1210,7 @@
"vrf_name": "default", "vrf_name": "default",
"peer_group_name": "PG1", "peer_group_name": "PG1",
"afi_safi": "ipv4_unicast", "afi_safi": "ipv4_unicast",
"admin_status": true, "admin_status": "up",
"route_map_in": [ "route_map_in": [
"rtmap05" "rtmap05"
] ]
@ -1261,7 +1261,7 @@
"vrf_name": "default", "vrf_name": "default",
"peer_group_name": "PG1", "peer_group_name": "PG1",
"afi_safi": "ipv4_unicast", "afi_safi": "ipv4_unicast",
"admin_status": true, "admin_status": "up",
"route_map_in": [ "route_map_in": [
"rtmap01", "rtmap01",
"rtmap02" "rtmap02"
@ -1313,7 +1313,7 @@
"vrf_name": "default", "vrf_name": "default",
"peer_group_name": "PG1", "peer_group_name": "PG1",
"afi_safi": "ipv4_unicast", "afi_safi": "ipv4_unicast",
"admin_status": true, "admin_status": "up",
"route_map_out": [ "route_map_out": [
"rtmap01", "rtmap01",
"rtmap02" "rtmap02"

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

@ -3,6 +3,10 @@ module sonic-bgp-common {
prefix bgpcmn; prefix bgpcmn;
yang-version 1.1; yang-version 1.1;
import sonic-types {
prefix stypes;
}
import ietf-inet-types { import ietf-inet-types {
prefix inet; prefix inet;
} }
@ -314,7 +318,7 @@ module sonic-bgp-common {
} }
leaf admin_status { leaf admin_status {
type boolean; type stypes:admin_status;
description "To enable BGP peer"; description "To enable BGP peer";
} }
@ -338,7 +342,7 @@ module sonic-bgp-common {
} }
leaf admin_status { leaf admin_status {
type boolean; type stypes:admin_status;
description "Indicates address family active/inactive status"; description "Indicates address family active/inactive status";
} }