diff options
Diffstat (limited to 'scripts/automation/regression/stateful_tests')
| -rwxr-xr-x | scripts/automation/regression/stateful_tests/trex_general_test.py | 40 |
1 files changed, 25 insertions, 15 deletions
diff --git a/scripts/automation/regression/stateful_tests/trex_general_test.py b/scripts/automation/regression/stateful_tests/trex_general_test.py index dc3f9943..62243da7 100755 --- a/scripts/automation/regression/stateful_tests/trex_general_test.py +++ b/scripts/automation/regression/stateful_tests/trex_general_test.py @@ -39,6 +39,7 @@ from .tests_exceptions import * from platform_cmd_link import * import unittest from glob import glob +from datetime import datetime, timedelta def setUpModule(module): pass @@ -72,21 +73,6 @@ class CTRexGeneral_Test(unittest.TestCase): self.is_VM = True if 'VM' in self.modes else False if not CTRexScenario.is_init: - #update elk const object - if self.elk: - setup = CTRexScenario.elk_info['info']['setup'] - - if self.is_loopback : - setup['dut'] = 'loopback' - else: - setup['dut'] = 'router' - - if self.is_VM: - setup['baremetal'] = False - setup['hypervisor'] = 'ESXi' #TBD - else: - setup['baremetal'] = True - if self.trex and not self.no_daemon: # stateful CTRexScenario.trex_version = self.trex.get_trex_version() if not self.is_loopback: @@ -122,6 +108,30 @@ class CTRexGeneral_Test(unittest.TestCase): if self.modes: print(termstyle.green('\t!!!\tRunning with modes: %s, not suitable tests will be skipped.\t!!!' % list(self.modes))) + #update elk const object + if self.elk: + timediff = timedelta(hours=2) # workaround to get IL timezone + date_str = CTRexScenario.trex_version['Date'].strip() + timestamp = datetime.strptime(date_str, '%b %d %Y , %H:%M:%S') - timediff + + img = CTRexScenario.elk_info['info']['image'] + img['sha'] = CTRexScenario.trex_version['Git SHA'] + img['build_time'] = timestamp.strftime("%Y-%m-%d %H:%M:%S") + img['version'] = CTRexScenario.trex_version['Version'] + + setup = CTRexScenario.elk_info['info']['setup'] + if self.is_loopback : + setup['dut'] = 'loopback' + else: + setup['dut'] = 'router' + + if self.is_VM: + setup['baremetal'] = False + setup['hypervisor'] = 'ESXi' #TBD + else: + setup['baremetal'] = True + + CTRexScenario.is_init = True print(termstyle.green("Done instantiating TRex scenario!\n")) |