Skip to content

Commit 529bb96

Browse files
anamehraanamehra
authored
route_check: Skip route checks if bgp feature is not enabled (#3075)
* Execute Route check script only when feature bgp is enabled If bgp is not enabled, get_frr_routes() gets empty list and route check fails and throws a traceback. Adding check to to skip route checks bgp feature is disabled. On the Chassis supervisor, bgp may be disabled. Signed-off-by: Anand Mehra [email protected]
1 parent bcb10f1 commit 529bb96

File tree

3 files changed

+177
-5
lines changed

3 files changed

+177
-5
lines changed

‎scripts/route_check.py

+16
Original file line numberDiff line numberDiff line change
@@ -533,6 +533,18 @@ def filter_out_standalone_tunnel_routes(namespace, routes):
533533

534534
return updated_routes
535535

536+
def is_feature_bgp_enabled(namespace):
537+
"""
538+
Check if bgp feature is enabled or disabled.
539+
Return True if enabled else False.
540+
"""
541+
cfg_db = multi_asic.connect_config_db_for_ns(namespace)
542+
feature_table = cfg_db.get_table("FEATURE")
543+
bgp_enabled = False
544+
if 'bgp' in feature_table:
545+
if feature_table['bgp']["state"] == "enabled":
546+
bgp_enabled = True
547+
return bgp_enabled
536548

537549
def check_frr_pending_routes(namespace):
538550
"""
@@ -827,6 +839,10 @@ def main():
827839
signal.signal(signal.SIGALRM, handler)
828840
load_db_config()
829841

842+
if not is_feature_bgp_enabled(namespace):
843+
print_message(syslog.LOG_INFO, "BGP feature is disabled, exiting without checking routes!!")
844+
return 0, None
845+
830846
while True:
831847
signal.alarm(TIMEOUT_SECONDS)
832848
ret, res= check_routes(namespace)

‎tests/route_check_test.py

+6-3
Original file line numberDiff line numberDiff line change
@@ -271,11 +271,14 @@ def test_timeout(self, mock_dbs, force_hang):
271271
# Test timeout
272272
ex_raised = False
273273
# Use an expected failing test case to trigger the select
274-
set_test_case_data(TEST_DATA['2'])
275-
274+
ct_data = TEST_DATA['2']
275+
set_test_case_data(ct_data)
276276
try:
277-
with patch('sys.argv', [route_check.__file__.split('/')[-1]]):
277+
with patch('sys.argv', [route_check.__file__.split('/')[-1]]), \
278+
patch('route_check.load_db_config', side_effect=lambda: init_db_conns(ct_data[NAMESPACE])):
279+
278280
ret, res = route_check.main()
281+
279282
except Exception as err:
280283
ex_raised = True
281284
expect = "timeout occurred"

‎tests/route_check_test_data.py

+155-2
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
VNET_ROUTE_TABLE = 'VNET_ROUTE_TABLE'
2424
INTF_TABLE = 'INTF_TABLE'
2525
RT_ENTRY_TABLE = 'ASIC_STATE'
26+
FEATURE_TABLE = 'FEATURE'
2627
SEPARATOR = ":"
2728
DEVICE_METADATA = "DEVICE_METADATA"
2829
MUX_CABLE = "MUX_CABLE"
@@ -32,7 +33,17 @@
3233
RT_ENTRY_KEY_PREFIX = 'SAI_OBJECT_TYPE_ROUTE_ENTRY:{\"dest":\"'
3334
RT_ENTRY_KEY_SUFFIX = '\",\"switch_id\":\"oid:0x21000000000000\",\"vr\":\"oid:0x3000000000023\"}'
3435

35-
DEFAULT_CONFIG_DB = {DEVICE_METADATA: {LOCALHOST: {}}}
36+
DEFAULT_CONFIG_DB = {
37+
DEVICE_METADATA: {
38+
LOCALHOST: {
39+
}
40+
},
41+
FEATURE_TABLE: {
42+
"bgp": {
43+
"state": "enabled"
44+
}
45+
}
46+
}
3647

3748
TEST_DATA = {
3849
"0": {
@@ -330,6 +341,11 @@
330341
CONFIG_DB: {
331342
DEVICE_METADATA: {
332343
LOCALHOST: {"subtype": "DualToR"}
344+
},
345+
FEATURE_TABLE: {
346+
"bgp": {
347+
"state": "enabled"
348+
}
333349
}
334350
},
335351
APPL_DB: {
@@ -396,6 +412,11 @@
396412
"soc_ipv6": "fc02:1000::3/128",
397413
"state": "auto"
398414
},
415+
},
416+
FEATURE_TABLE: {
417+
"bgp": {
418+
"state": "enabled"
419+
}
399420
}
400421
},
401422
APPL_DB: {
@@ -563,6 +584,11 @@
563584
CONFIG_DB: {
564585
DEVICE_METADATA: {
565586
LOCALHOST: {"subtype": "DualToR"}
587+
},
588+
FEATURE_TABLE: {
589+
"bgp": {
590+
"state": "enabled"
591+
}
566592
}
567593
},
568594
APPL_DB: {
@@ -881,5 +907,132 @@
881907
},
882908
RET: -1,
883909
},
884-
910+
"21": {
911+
DESCR: "basic good one on single asic, bgp disabled",
912+
MULTI_ASIC: False,
913+
NAMESPACE: [''],
914+
ARGS: "route_check -m INFO -i 1000",
915+
PRE: {
916+
DEFAULTNS: {
917+
CONFIG_DB: {
918+
DEVICE_METADATA: {
919+
LOCALHOST: {
920+
}
921+
},
922+
FEATURE_TABLE: {
923+
"bgp": {
924+
"state": "disabled"
925+
}
926+
}
927+
},
928+
APPL_DB: {
929+
ROUTE_TABLE: {
930+
"0.0.0.0/0" : { "ifname": "portchannel0" },
931+
"10.10.196.12/31" : { "ifname": "portchannel0" },
932+
},
933+
INTF_TABLE: {
934+
"PortChannel1013:10.10.196.24/31": {},
935+
"PortChannel1023:2603:10b0:503:df4::5d/126": {},
936+
"PortChannel1024": {}
937+
}
938+
},
939+
ASIC_DB: {
940+
RT_ENTRY_TABLE: {
941+
RT_ENTRY_KEY_PREFIX + "10.10.196.12/31" + RT_ENTRY_KEY_SUFFIX: {},
942+
RT_ENTRY_KEY_PREFIX + "10.10.196.24/32" + RT_ENTRY_KEY_SUFFIX: {},
943+
RT_ENTRY_KEY_PREFIX + "2603:10b0:503:df4::5d/128" + RT_ENTRY_KEY_SUFFIX: {},
944+
RT_ENTRY_KEY_PREFIX + "0.0.0.0/0" + RT_ENTRY_KEY_SUFFIX: {}
945+
}
946+
},
947+
},
948+
},
949+
FRR_ROUTES: {
950+
DEFAULTNS: {
951+
"0.0.0.0/0": [
952+
{
953+
"prefix": "0.0.0.0/0",
954+
"vrfName": "default",
955+
"protocol": "bgp",
956+
"offloaded": "true",
957+
},
958+
],
959+
"10.10.196.12/31": [
960+
{
961+
"prefix": "10.10.196.12/31",
962+
"vrfName": "default",
963+
"protocol": "bgp",
964+
},
965+
],
966+
"10.10.196.24/31": [
967+
{
968+
"protocol": "connected",
969+
},
970+
],
971+
},
972+
},
973+
},
974+
"22": {
975+
DESCR: "basic good one on multi-asic, bgp disabled",
976+
MULTI_ASIC: True,
977+
NAMESPACE: ['asic0'],
978+
ARGS: "route_check -m INFO -i 1000",
979+
PRE: {
980+
ASIC0: {
981+
CONFIG_DB: {
982+
DEVICE_METADATA: {
983+
LOCALHOST: {
984+
}
985+
},
986+
FEATURE_TABLE: {
987+
"bgp": {
988+
"state": "disabled"
989+
}
990+
}
991+
},
992+
APPL_DB: {
993+
ROUTE_TABLE: {
994+
"0.0.0.0/0" : { "ifname": "portchannel0" },
995+
"10.10.196.12/31" : { "ifname": "portchannel0" },
996+
},
997+
INTF_TABLE: {
998+
"PortChannel1013:10.10.196.24/31": {},
999+
"PortChannel1023:2603:10b0:503:df4::5d/126": {},
1000+
"PortChannel1024": {}
1001+
}
1002+
},
1003+
ASIC_DB: {
1004+
RT_ENTRY_TABLE: {
1005+
RT_ENTRY_KEY_PREFIX + "10.10.196.12/31" + RT_ENTRY_KEY_SUFFIX: {},
1006+
RT_ENTRY_KEY_PREFIX + "10.10.196.24/32" + RT_ENTRY_KEY_SUFFIX: {},
1007+
RT_ENTRY_KEY_PREFIX + "2603:10b0:503:df4::5d/128" + RT_ENTRY_KEY_SUFFIX: {},
1008+
RT_ENTRY_KEY_PREFIX + "0.0.0.0/0" + RT_ENTRY_KEY_SUFFIX: {}
1009+
}
1010+
},
1011+
},
1012+
},
1013+
FRR_ROUTES: {
1014+
ASIC0: {
1015+
"0.0.0.0/0": [
1016+
{
1017+
"prefix": "0.0.0.0/0",
1018+
"vrfName": "default",
1019+
"protocol": "bgp",
1020+
"offloaded": "true",
1021+
},
1022+
],
1023+
"10.10.196.12/31": [
1024+
{
1025+
"prefix": "10.10.196.12/31",
1026+
"vrfName": "default",
1027+
"protocol": "bgp",
1028+
},
1029+
],
1030+
"10.10.196.24/31": [
1031+
{
1032+
"protocol": "connected",
1033+
},
1034+
],
1035+
},
1036+
},
1037+
},
8851038
}

0 commit comments

Comments
 (0)