Skip to content

Commit 5ccdf3f

Browse files
committed
config_db initial value as fixed
1 parent 5e7dab5 commit 5ccdf3f

File tree

1 file changed

+12
-7
lines changed

1 file changed

+12
-7
lines changed

tests/snappi_tests/bgp/files/ebgp_helper.py

+12-7
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ def run_ebgp_session_capacity_test(snappi_api,
3838
"""
3939
Run eBGP Session Capacity Tests
4040
"""
41+
config_db = json.loads(duthost.shell("sonic-cfggen -d --print-data")['stdout'])
4142
global flag
4243
if snappi_extra_params is None:
4344
snappi_extra_params = SnappiTestParams()
@@ -51,7 +52,7 @@ def run_ebgp_session_capacity_test(snappi_api,
5152
snappi_extra_params.route_ranges = create_ip_list('200.1.1.1', session_count, mask=32)
5253
snappi_extra_params.tx_host_ips = get_host_addresses(snappi_extra_params.tx_ipv4_subnet + '/' + str(snappi_extra_params.tx_subnet_prefix), 2) # one for ixia , one for dut
5354
snappi_extra_params.rx_host_ips = get_host_addresses(snappi_extra_params.rx_ipv4_subnet + '/' + str(snappi_extra_params.rx_subnet_prefix), session_count + 1)
54-
snappi_config = setup_dut_snappi_config(duthost, snappi_api, snappi_ports, session_count, snappi_extra_params)
55+
snappi_config = setup_dut_snappi_config(duthost, config_db, snappi_api, snappi_ports, session_count, snappi_extra_params)
5556
result = verify_results(snappi_api, snappi_config, session_count)
5657
result_list.append(result)
5758
flag = flag + result
@@ -66,7 +67,7 @@ def run_ebgp_session_capacity_test(snappi_api,
6667
max_session = session_count
6768
logger.info('Reducing eBGP session count as previous iteration encountered loss or protocols didn\'t come up')
6869
while max_session_capacity >min_session or max_session_capacity < max_session:
69-
snappi_config = setup_dut_snappi_config(duthost, snappi_api, snappi_ports, max_session_capacity, snappi_extra_params)
70+
snappi_config = setup_dut_snappi_config(duthost, config_db, snappi_api, snappi_ports, max_session_capacity, snappi_extra_params)
7071
result = verify_results(snappi_api, snappi_config, max_session_capacity)
7172
result_list.append(result)
7273
if result == 0:
@@ -88,6 +89,7 @@ def run_ebgp_session_capacity_test(snappi_api,
8889
break
8990

9091
def setup_dut_snappi_config(duthost,
92+
config_db,
9193
snappi_api,
9294
snappi_ports,
9395
session_count,
@@ -97,7 +99,7 @@ def setup_dut_snappi_config(duthost,
9799
"""
98100

99101
logger.info('\n')
100-
config_db = json.loads(duthost.shell("sonic-cfggen -d --print-data")['stdout'])
102+
#config_db = json.loads(duthost.shell("sonic-cfggen -d --print-data")['stdout'])
101103
interfaces = dict()
102104
loopback_interfaces = dict()
103105
loopback_interfaces.update({"Loopback0": {}})
@@ -272,18 +274,20 @@ def get_ti_stats(ixnet):
272274
return tmp
273275

274276
def wait_for_bgp_session_up(ixnet, timeout = 60):
277+
time.sleep(timeout)
275278
protocol_summary = StatViewAssistant(ixnet, 'Protocols Summary')
276279
for row in protocol_summary.Rows:
277280
if 'BGP' in row['Protocol Type']:
278-
time.sleep(timeout)
279-
logger.info('eBGP Sessions Total {}'.format(row['Sessions Total']))
280-
logger.info('eBGP Sessions Up {}'.format(row['Sessions Up']))
281-
if int(row['Sessions Total']) == int(row['Sessions Up']):
281+
logger.info('eBGP Sessions Total : {}'.format(row['Sessions Total']))
282+
logger.info('eBGP Sessions Up : {}'.format(row['Sessions Up']))
283+
if int(row['Sessions Total']) != int(row['Sessions Up']):
282284
logger.info('|-------FAIL : All eBGP sessions are not Up in {}s-----|'.format(timeout))
283285
return False
284286
return True
285287

286288

289+
290+
287291
def verify_results(api, snappi_config, session_count):
288292
global max_session_capacity
289293
logger.info('\n')
@@ -316,5 +320,6 @@ def verify_results(api, snappi_config, session_count):
316320
ts.traffic.flow_transmit.state = ts.traffic.flow_transmit.STOP
317321
api.set_control_state(ts)
318322
ixnet.StopAllProtocols()
323+
wait(30, "For traffic and protocol to stop")
319324
max_session_capacity = session_count
320325
return 0

0 commit comments

Comments
 (0)