From 2258ea303c6c3573998dea7b9d347d46873018db Mon Sep 17 00:00:00 2001 From: Yaroslav Brustinov Date: Wed, 9 Mar 2016 14:05:08 +0200 Subject: regression: stl updates --- .../regression/stateless_tests/stl_general_test.py | 62 ++++++++++++++++++++++ 1 file changed, 62 insertions(+) create mode 100644 scripts/automation/regression/stateless_tests/stl_general_test.py (limited to 'scripts/automation/regression/stateless_tests/stl_general_test.py') diff --git a/scripts/automation/regression/stateless_tests/stl_general_test.py b/scripts/automation/regression/stateless_tests/stl_general_test.py new file mode 100644 index 00000000..8d21cadf --- /dev/null +++ b/scripts/automation/regression/stateless_tests/stl_general_test.py @@ -0,0 +1,62 @@ +import os, sys +import unittest +from trex import CTRexScenario +from stateful_tests.trex_general_test import CTRexGeneral_Test +from trex_stl_lib.api import * +import time +from nose.tools import nottest + + +class CStlGeneral_Test(CTRexGeneral_Test): + """This class defines the general stateless testcase of the T-Rex traffic generator""" + + #once for all tests under CStlGeneral_Test + @classmethod + def setUpClass(cls): + cls.stl_trex = CTRexScenario.stl_trex + + def setUp(self): + CTRexGeneral_Test.setUp(self) + # check basic requirements, should be verified at test_connectivity, here only skip test + if CTRexScenario.stl_init_error: + self.skip(CTRexScenario.stl_init_error) + + @staticmethod + def connect(timeout = 20): + sys.stdout.write('Connecting') + for i in range(timeout): + try: + sys.stdout.write('.') + sys.stdout.flush() + CTRexScenario.stl_trex.connect() + return + except: + time.sleep(1) + CTRexScenario.stl_trex.connect() + + @staticmethod + def get_port_count(): + return CTRexScenario.stl_trex.get_port_count() + + @staticmethod + def is_connected(): + return CTRexScenario.stl_trex.is_connected() + +class STLBasic_Test(CStlGeneral_Test): + # will run it first explicitly, check connectivity and configure routing + @nottest + def test_connectivity(self): + if not self.is_loopback: + CTRexScenario.router.load_clean_config() + CTRexScenario.router.configure_basic_interfaces() + CTRexScenario.router.config_pbr(mode = "config") + + CTRexScenario.stl_init_error = 'Client could not connect' + self.connect() + CTRexScenario.stl_init_error = 'Client could not map ports' + CTRexScenario.stl_ports_map = stl_map_ports(CTRexScenario.stl_trex) + CTRexScenario.stl_init_error = 'Could not determine bidirectional ports' + print 'Ports mapping: %s' % CTRexScenario.stl_ports_map + if not len(CTRexScenario.stl_ports_map['bi']): + raise STLError('No bidirectional ports') + CTRexScenario.stl_init_error = None -- cgit 1.2.3-korg From 240dbb67fa16d8d55c64d7658d284e07ae59cdaf Mon Sep 17 00:00:00 2001 From: Yaroslav Brustinov Date: Wed, 9 Mar 2016 23:43:21 +0200 Subject: regression: exchange --copy flag to --pkg argument, to run server with given package unzipped to /tmp/trex-scripts dir --- scripts/automation/regression/misc_methods.py | 2 +- .../stateless_tests/stl_examples_test.py | 2 - .../regression/stateless_tests/stl_general_test.py | 1 + scripts/automation/regression/trex_unit_test.py | 61 ++++++++++++---------- 4 files changed, 35 insertions(+), 31 deletions(-) (limited to 'scripts/automation/regression/stateless_tests/stl_general_test.py') diff --git a/scripts/automation/regression/misc_methods.py b/scripts/automation/regression/misc_methods.py index 6830be01..783858e8 100755 --- a/scripts/automation/regression/misc_methods.py +++ b/scripts/automation/regression/misc_methods.py @@ -40,7 +40,7 @@ def run_command(cmd, background = False): def run_remote_command(host, command_string, background = False): - cmd = 'ssh -tt %s \'sudo sh -c "%s"\'' % (host, command_string) + cmd = 'ssh -tt %s \'sudo sh -ec "%s"\'' % (host, command_string) return run_command(cmd, background) diff --git a/scripts/automation/regression/stateless_tests/stl_examples_test.py b/scripts/automation/regression/stateless_tests/stl_examples_test.py index 080bb3d3..9e4fffc9 100755 --- a/scripts/automation/regression/stateless_tests/stl_examples_test.py +++ b/scripts/automation/regression/stateless_tests/stl_examples_test.py @@ -7,7 +7,6 @@ class STLExamples_Test(CStlGeneral_Test): """This class defines the IMIX testcase of the T-Rex traffic generator""" def setUp(self): - print 'STLExamples_Test setUp' CStlGeneral_Test.setUp(self) # examples connect by their own if self.is_connected(): @@ -15,7 +14,6 @@ class STLExamples_Test(CStlGeneral_Test): @classmethod def tearDownClass(cls): - print 'STLExamples_Test tearDownClass' # connect back at end of tests if not cls.is_connected(): CTRexScenario.stl_trex.connect() diff --git a/scripts/automation/regression/stateless_tests/stl_general_test.py b/scripts/automation/regression/stateless_tests/stl_general_test.py index 8d21cadf..f3bd5bfe 100644 --- a/scripts/automation/regression/stateless_tests/stl_general_test.py +++ b/scripts/automation/regression/stateless_tests/stl_general_test.py @@ -53,6 +53,7 @@ class STLBasic_Test(CStlGeneral_Test): CTRexScenario.stl_init_error = 'Client could not connect' self.connect() + print '' CTRexScenario.stl_init_error = 'Client could not map ports' CTRexScenario.stl_ports_map = stl_map_ports(CTRexScenario.stl_trex) CTRexScenario.stl_init_error = 'Could not determine bidirectional ports' diff --git a/scripts/automation/regression/trex_unit_test.py b/scripts/automation/regression/trex_unit_test.py index 73c14ea9..328a8040 100755 --- a/scripts/automation/regression/trex_unit_test.py +++ b/scripts/automation/regression/trex_unit_test.py @@ -66,19 +66,21 @@ STATEFUL_STOP_COMMAND = './trex_daemon_server stop; sleep 1; ./trex_daemon_serve STATEFUL_RUN_COMMAND = 'rm /var/log/trex/trex_daemon_server.log; ./trex_daemon_server start; sleep 2; ./trex_daemon_server show' TREX_FILES = ('_t-rex-64', '_t-rex-64-o', '_t-rex-64-debug', '_t-rex-64-debug-o') -def trex_remote_command(trex_data, command, background = False): - return misc_methods.run_remote_command(trex_data['trex_name'], ('cd %s; ' % CTRexScenario.scripts_path)+ command, background) +def trex_remote_command(trex_data, command, background = False, from_scripts = True): + if from_scripts: + return misc_methods.run_remote_command(trex_data['trex_name'], ('cd %s; ' % CTRexScenario.scripts_path)+ command, background) + return misc_methods.run_remote_command(trex_data['trex_name'], command, background) # 1 = running, 0 - not running def check_trex_running(trex_data): commands = [] for filename in TREX_FILES: commands.append('ps -C %s > /dev/null' % filename) - (return_code, stdout, stderr) = trex_remote_command(trex_data, ' || '.join(commands)) + return_code, _, _ = trex_remote_command(trex_data, ' || '.join(commands), from_scripts = False) return not return_code def kill_trex_process(trex_data): - (return_code, stdout, stderr) = trex_remote_command(trex_data, 'ps -u root --format comm,pid,cmd | grep _t-rex-64 | grep -v grep || true') + return_code, stdout, _ = trex_remote_command(trex_data, 'ps -u root --format comm,pid,cmd | grep _t-rex-64 | grep -v grep || true', from_scripts = False) assert return_code == 0, 'last remote command failed' if stdout: for process in stdout.split('\n'): @@ -86,7 +88,7 @@ def kill_trex_process(trex_data): proc_name, pid, full_cmd = re.split('\s+', process, maxsplit=2) if proc_name.find('t-rex-64') >= 0: print 'Killing remote process: %s' % full_cmd - trex_remote_command(trex_data, 'kill %s' % pid) + trex_remote_command(trex_data, 'kill %s' % pid, from_scripts = False) except: continue @@ -132,52 +134,55 @@ class CTRexTestConfiguringPlugin(Plugin): parser.add_option('--stf', '--stateful', action="store_true", default = False, dest="stateful", help="Run stateful tests.") - parser.add_option('--copy', action="store_true", default = False, - dest="copy", - help="Copy TRex server to temp directory and run from there.") + parser.add_option('--pkg', action="store", + dest="pkg", + help="Run with given TRex package. Make sure the path available at server machine.") parser.add_option('--no-ssh', '--no_ssh', action="store_true", default = False, dest="no_ssh", - help="Flag wherever not to connect via ssh to run the daemons etc.") + help="Flag to disable any ssh to server machine.") def configure(self, options, conf): - self.functional = options.functional - self.stateless = options.stateless - self.stateful = options.stateful - self.copy = options.copy self.collect_only = options.collect_only - if self.functional or self.collect_only: + if self.collect_only: + return + self.functional = options.functional + self.stateless = options.stateless + self.stateful = options.stateful + self.pkg = options.pkg + self.no_ssh = options.no_ssh + self.verbose_mode = options.verbose_mode + if self.functional and (not self.pkg or self.no_ssh): return if CTRexScenario.setup_dir and options.config_path: raise Exception('Please either define --cfg or use env. variable SETUP_DIR, not both.') if not options.config_path and CTRexScenario.setup_dir: options.config_path = CTRexScenario.setup_dir - if options.config_path: - self.configuration = misc_methods.load_complete_config_file(os.path.join(options.config_path, 'config.yaml')) - self.configuration.trex['trex_name'] = address_to_ip(self.configuration.trex['trex_name']) - self.benchmark = misc_methods.load_benchmark_config_file(os.path.join(options.config_path, 'benchmark.yaml')) - self.enabled = True - else: + if not options.config_path: raise Exception('Please specify path to config.yaml using --cfg parameter or env. variable SETUP_DIR') + self.configuration = misc_methods.load_complete_config_file(os.path.join(options.config_path, 'config.yaml')) + self.configuration.trex['trex_name'] = address_to_ip(self.configuration.trex['trex_name']) # translate hostname to ip + self.benchmark = misc_methods.load_benchmark_config_file(os.path.join(options.config_path, 'benchmark.yaml')) + self.enabled = True self.modes = self.configuration.trex.get('modes', []) self.kill_running = options.kill_running self.load_image = options.load_image - self.verbose_mode = options.verbose_mode - self.no_ssh = options.no_ssh self.clean_config = False if options.skip_clean_config else True self.server_logs = options.server_logs if options.log_path: self.loggerPath = options.log_path - - def begin (self): # initialize CTRexScenario global testing class, to be used by all tests CTRexScenario.configuration = self.configuration CTRexScenario.benchmark = self.benchmark CTRexScenario.modes = set(self.modes) CTRexScenario.server_logs = self.server_logs - if self.copy and not CTRexScenario.is_copied and not self.no_ssh: - new_path = '/tmp/trex_scripts' - return_code, stdout, stderr = trex_remote_command(self.configuration.trex, - 'mkdir -p %s; rsync -L -az %s/ %s' % (new_path, CTRexScenario.scripts_path, new_path)) + + + def begin (self): + if self.pkg and not CTRexScenario.is_copied and not self.no_ssh: + new_path = '/tmp/trex-scripts' + rsync_template = 'rm -rf /tmp/trex-scripts; mkdir -p %s; rsync -Lc %s /tmp; tar -xzf /tmp/%s -C %s; mv %s/v*.*/* %s' + rsync_command = rsync_template % (new_path, self.pkg, os.path.basename(self.pkg), new_path, new_path, new_path) + return_code, stdout, stderr = trex_remote_command(self.configuration.trex, rsync_command, from_scripts = False) if return_code: print 'Failed copying' sys.exit(-1) -- cgit 1.2.3-korg From 834431083b4f9e6ac7eac00d5ec6682c92b16da9 Mon Sep 17 00:00:00 2001 From: Yaroslav Brustinov Date: Thu, 10 Mar 2016 11:33:39 +0200 Subject: regression: stl added 1 more map try + sleep --- scripts/automation/regression/stateless_tests/stl_general_test.py | 5 +++++ scripts/automation/regression/trex_unit_test.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'scripts/automation/regression/stateless_tests/stl_general_test.py') diff --git a/scripts/automation/regression/stateless_tests/stl_general_test.py b/scripts/automation/regression/stateless_tests/stl_general_test.py index f3bd5bfe..435c7eea 100644 --- a/scripts/automation/regression/stateless_tests/stl_general_test.py +++ b/scripts/automation/regression/stateless_tests/stl_general_test.py @@ -54,6 +54,11 @@ class STLBasic_Test(CStlGeneral_Test): CTRexScenario.stl_init_error = 'Client could not connect' self.connect() print '' + try: + stl_map_ports(CTRexScenario.stl_trex) + except: + pass + time.sleep(5) CTRexScenario.stl_init_error = 'Client could not map ports' CTRexScenario.stl_ports_map = stl_map_ports(CTRexScenario.stl_trex) CTRexScenario.stl_init_error = 'Could not determine bidirectional ports' diff --git a/scripts/automation/regression/trex_unit_test.py b/scripts/automation/regression/trex_unit_test.py index 328a8040..c90d5bdc 100755 --- a/scripts/automation/regression/trex_unit_test.py +++ b/scripts/automation/regression/trex_unit_test.py @@ -180,7 +180,7 @@ class CTRexTestConfiguringPlugin(Plugin): def begin (self): if self.pkg and not CTRexScenario.is_copied and not self.no_ssh: new_path = '/tmp/trex-scripts' - rsync_template = 'rm -rf /tmp/trex-scripts; mkdir -p %s; rsync -Lc %s /tmp; tar -xzf /tmp/%s -C %s; mv %s/v*.*/* %s' + rsync_template = 'rm -rf /tmp/trex-scripts; mkdir -p %s; rsync -Lc %s /tmp; tar -mxzf /tmp/%s -C %s; mv %s/v*.*/* %s' rsync_command = rsync_template % (new_path, self.pkg, os.path.basename(self.pkg), new_path, new_path, new_path) return_code, stdout, stderr = trex_remote_command(self.configuration.trex, rsync_command, from_scripts = False) if return_code: -- cgit 1.2.3-korg