Skip to content

Commit cf90228

Browse files
committed
Fixed some issues related to default_vrf_oid.
Signed-off-by: Mahdi Ramezani <[email protected]>
1 parent 310e62a commit cf90228

File tree

2 files changed

+13
-5
lines changed

2 files changed

+13
-5
lines changed

scripts/vnet_route_check.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -404,9 +404,11 @@ def main():
404404
return rc
405405
asic_db = swsscommon.DBConnector('ASIC_DB', 0, True)
406406
virtual_router = swsscommon.Table(asic_db, 'ASIC_STATE:SAI_OBJECT_TYPE_VIRTUAL_ROUTER')
407-
if virtual_router.getKeys() != []:
408-
global default_vrf_oid
409-
default_vrf_oid = virtual_router.getKeys()[0]
407+
global default_vrf_oid
408+
default_vrf_oid = ""
409+
vr_keys = virtual_router.getKeys()
410+
if vr_keys:
411+
default_vrf_oid = vr_keys[0]
410412

411413
app_db_vnet_routes = get_vnet_routes_from_app_db()
412414
active_app_db_vnet_routes = filter_active_vnet_routes(app_db_vnet_routes)

tests/vnet_route_check_test.py

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -506,7 +506,10 @@
506506
ASIC_STATE: {
507507
"SAI_OBJECT_TYPE_ROUTER_INTERFACE:oid:0x6000000000d76": {
508508
"SAI_ROUTER_INTERFACE_ATTR_VIRTUAL_ROUTER_ID": "oid:0x3000000000d4b"
509-
}
509+
},
510+
"SAI_OBJECT_TYPE_VIRTUAL_ROUTER": {
511+
"oid:0x3000000000d4b": {"": ""}
512+
},
510513
}
511514
},
512515
STATE_DB: {
@@ -537,7 +540,10 @@
537540
ASIC_STATE: {
538541
"SAI_OBJECT_TYPE_ROUTER_INTERFACE:oid:0x6000000000d76": {
539542
"SAI_ROUTER_INTERFACE_ATTR_VIRTUAL_ROUTER_ID": "oid:0x3000000000d4b"
540-
}
543+
},
544+
"SAI_OBJECT_TYPE_VIRTUAL_ROUTER": {
545+
"oid:0x3000000000d4b": {"": ""}
546+
},
541547
}
542548
},
543549
STATE_DB: {

0 commit comments

Comments
 (0)