Skip to content

Commit 9dc58ea

Browse files
authored
[sonic-utilities] Fix show vnet [neighbors | routes [all | tunnel]] crashed issue (#1263)
When query "NEIGH_TABLE*" or "VNET_ROUTE_TUNNEL_TABLE*" from APPDB, it may contain a combination of table names with and without ":" This PR shall skip handling the below entries in APP_DB: 127.0.0.1:6379> keys NEIGH_TABLE* "NEIGH_TABLE_DEL_SET" "NEIGH_TABLE_KEY_SET"
1 parent f9eb739 commit 9dc58ea

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

show/main.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2291,7 +2291,7 @@ def neighbors():
22912291
appl_db.connect(appl_db.APPL_DB)
22922292

22932293
# Fetching data from appl_db for neighbors
2294-
nbrs = appl_db.keys(appl_db.APPL_DB, "NEIGH_TABLE*")
2294+
nbrs = appl_db.keys(appl_db.APPL_DB, "NEIGH_TABLE:*")
22952295
nbrs_data = {}
22962296
for nbr in nbrs if nbrs else []:
22972297
tbl, intf, ip = nbr.split(":", 2)
@@ -2331,7 +2331,7 @@ def all():
23312331
header = ['vnet name', 'prefix', 'nexthop', 'interface']
23322332

23332333
# Fetching data from appl_db for VNET ROUTES
2334-
vnet_rt_keys = appl_db.keys(appl_db.APPL_DB, "VNET_ROUTE_TABLE*")
2334+
vnet_rt_keys = appl_db.keys(appl_db.APPL_DB, "VNET_ROUTE_TABLE:*")
23352335
vnet_rt_keys = natsorted(vnet_rt_keys) if vnet_rt_keys else []
23362336

23372337
table = []
@@ -2350,7 +2350,7 @@ def all():
23502350
header = ['vnet name', 'prefix', 'endpoint', 'mac address', 'vni']
23512351

23522352
# Fetching data from appl_db for VNET TUNNEL ROUTES
2353-
vnet_rt_keys = appl_db.keys(appl_db.APPL_DB, "VNET_ROUTE_TUNNEL_TABLE*")
2353+
vnet_rt_keys = appl_db.keys(appl_db.APPL_DB, "VNET_ROUTE_TUNNEL_TABLE:*")
23542354
vnet_rt_keys = natsorted(vnet_rt_keys) if vnet_rt_keys else []
23552355

23562356
table = []
@@ -2374,7 +2374,7 @@ def tunnel():
23742374
header = ['vnet name', 'prefix', 'endpoint', 'mac address', 'vni']
23752375

23762376
# Fetching data from appl_db for VNET TUNNEL ROUTES
2377-
vnet_rt_keys = appl_db.keys(appl_db.APPL_DB, "VNET_ROUTE_TUNNEL_TABLE*")
2377+
vnet_rt_keys = appl_db.keys(appl_db.APPL_DB, "VNET_ROUTE_TUNNEL_TABLE:*")
23782378
vnet_rt_keys = natsorted(vnet_rt_keys) if vnet_rt_keys else []
23792379

23802380
table = []

0 commit comments

Comments
 (0)