summaryrefslogtreecommitdiffstats
path: root/scripts/automation/regression/trex_unit_test.py
diff options
context:
space:
mode:
authorYaroslav Brustinov <ybrustin@cisco.com>2016-05-22 17:06:25 +0300
committerYaroslav Brustinov <ybrustin@cisco.com>2016-05-22 17:06:25 +0300
commit8e230286998bfa7a1dfcefe2493d5bee66d2746a (patch)
treedea698ff60c4819a744802981a818d59d6011547 /scripts/automation/regression/trex_unit_test.py
parent6b12595f08d7d655d398e73753f3dad67982e856 (diff)
regression: add disconnects + delay before running examples + at end of regression
revert profile udp_1ptk_simple.py and add new upd_for_benchmarks.py
Diffstat (limited to 'scripts/automation/regression/trex_unit_test.py')
-rwxr-xr-xscripts/automation/regression/trex_unit_test.py14
1 files changed, 8 insertions, 6 deletions
diff --git a/scripts/automation/regression/trex_unit_test.py b/scripts/automation/regression/trex_unit_test.py
index aaf98708..a272fe7b 100755
--- a/scripts/automation/regression/trex_unit_test.py
+++ b/scripts/automation/regression/trex_unit_test.py
@@ -168,13 +168,12 @@ class CTRexTestConfiguringPlugin(Plugin):
CTRexScenario.benchmark = self.benchmark
CTRexScenario.modes = set(self.modes)
CTRexScenario.server_logs = self.server_logs
- CTRexScenario.trex = CTRexClient(trex_host = self.configuration.trex['trex_name'],
- verbose = self.json_verbose)
- if not self.no_daemon and not CTRexScenario.trex.check_master_connectivity():
- print('Could not connect to master daemon')
- sys.exit(-1)
if not self.no_daemon:
- CTRexScenario.scripts_path = CTRexScenario.trex.get_trex_path()
+ CTRexScenario.trex = CTRexClient(trex_host = self.configuration.trex['trex_name'],
+ verbose = self.json_verbose)
+ if not CTRexScenario.trex.check_master_connectivity():
+ print('Could not connect to master daemon')
+ sys.exit(-1)
if options.ga and CTRexScenario.setup_name:
CTRexScenario.GAManager = GAmanager(GoogleID = 'UA-75220362-4',
UserID = CTRexScenario.setup_name,
@@ -241,6 +240,9 @@ class CTRexTestConfiguringPlugin(Plugin):
if self.stateless:
if not self.no_daemon:
CTRexScenario.trex.force_kill(False)
+ if CTRexScenario.stl_trex and CTRexScenario.stl_trex.is_connected():
+ CTRexScenario.stl_trex.disconnect()
+ time.sleep(3)
CTRexScenario.stl_trex = None