Skip to content

Commit 69c4820

Browse files
lizhijianrdVladimirKuk
authored andcommitted
[Yang] Fix Yang model of BGP Allowed Prefix (sonic-net#20550)
Why I did it Bugfix for Yang model of BGP Allowed Prefix. Support optional NEIGHBOR_TYPE in key. Support optional le and ge in prefixes_v4/prefixes_v6 list (e.g., 10.20.30.0/24 le 30). Work item tracking Microsoft ADO (number only): 30001113 How I did it Updated sonic-bgp-allowed-prefix.yang. Define optional value NEIGHBOR_TYPE in key. Define type bgp-allowed-ipv4-prefix and bgp-allowed-ipv6-prefix to support the optional suffix in prefixes_v4/prefixes_v6 list. How to verify it Verified by UT:
1 parent f19a0a9 commit 69c4820

3 files changed

Lines changed: 363 additions & 93 deletions

File tree

src/sonic-yang-models/tests/yang_model_tests/tests/bgp.json

Lines changed: 11 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -158,43 +158,32 @@
158158
"BGP_PEERRANGE_ALL_VALID": {
159159
"desc": "Configure BGP peer range table."
160160
},
161-
"BGP_ALLOWED_PREFIXES_COM_LIST_ALL_VALID": {
161+
"BGP_ALLOWED_PREFIXES_ALL_VALID": {
162162
"desc": "Configue BGP allowed prefix list."
163163
},
164-
"BGP_ALLOWED_PREFIXES_COM_LIST_INVALID_DEPLOYMENT": {
165-
"desc": "Invalid default action.",
164+
"BGP_ALLOWED_PREFIXES_INVALID_DEPLOYMENT": {
165+
"desc": "Invalid deployment.",
166166
"eStrKey" : "Pattern"
167167
},
168-
"BGP_ALLOWED_PREFIXES_COM_LIST_INVALID_DEFAULT_ACTION": {
169-
"desc": "Invalid default action.",
168+
"BGP_ALLOWED_PREFIXES_INVALID_ID": {
169+
"desc": "Invalid id.",
170170
"eStrKey" : "InvalidValue",
171-
"eStr" : ["default_action"]
172-
},
173-
"BGP_ALLOWED_PREFIXES_COM_LIST_INVALID_PREFIXES_IPV4": {
174-
"desc": "Invalid IPv4 prefix.",
175-
"eStrKey" : "Pattern"
171+
"eStr" : ["id"]
176172
},
177-
"BGP_ALLOWED_PREFIXES_COM_LIST_INVALID_PREFIXES_IPV6": {
178-
"desc": "Invalid IPv6 prefix.",
179-
"eStrKey" : "Pattern"
180-
},
181-
"BGP_ALLOWED_PREFIXES_LIST_ALL_VALID": {
182-
"desc": "Configue BGP allowed prefix list."
183-
},
184-
"BGP_ALLOWED_PREFIXES_LIST_INVALID_DEPLOYMENT": {
185-
"desc": "Invalid default action.",
173+
"BGP_ALLOWED_PREFIXES_INVALID_NEIGHBOR": {
174+
"desc": "Invalid neighbor.",
186175
"eStrKey" : "Pattern"
187176
},
188-
"BGP_ALLOWED_PREFIXES_LIST_INVALID_DEFAULT_ACTION": {
177+
"BGP_ALLOWED_PREFIXES_INVALID_DEFAULT_ACTION": {
189178
"desc": "Invalid default action.",
190179
"eStrKey" : "InvalidValue",
191180
"eStr" : ["default_action"]
192181
},
193-
"BGP_ALLOWED_PREFIXES_LIST_INVALID_PREFIXES_IPV4": {
182+
"BGP_ALLOWED_PREFIXES_INVALID_PREFIXES_IPV4": {
194183
"desc": "Invalid IPv4 prefix.",
195184
"eStrKey" : "Pattern"
196185
},
197-
"BGP_ALLOWED_PREFIXES_LIST_INVALID_PREFIXES_IPV6": {
186+
"BGP_ALLOWED_PREFIXES_INVALID_PREFIXES_IPV6": {
198187
"desc": "Invalid IPv6 prefix.",
199188
"eStrKey" : "Pattern"
200189
},

0 commit comments

Comments
 (0)