diff options
Diffstat (limited to 'scripts/automation/regression/stateless_tests')
5 files changed, 31 insertions, 25 deletions
diff --git a/scripts/automation/regression/stateless_tests/stl_client_test.py b/scripts/automation/regression/stateless_tests/stl_client_test.py index 01a90250..e7c9bb5d 100644 --- a/scripts/automation/regression/stateless_tests/stl_client_test.py +++ b/scripts/automation/regression/stateless_tests/stl_client_test.py @@ -1,5 +1,5 @@ #!/router/bin/python -from stl_general_test import CStlGeneral_Test, CTRexScenario +from .stl_general_test import CStlGeneral_Test, CTRexScenario from trex_stl_lib.api import * import os, sys import glob @@ -240,22 +240,32 @@ class STLClient_Test(CStlGeneral_Test): def test_all_profiles (self): - # need promiscious for this one... if self.is_virt_nics or not self.is_loopback: - self.skip('skipping profile tests for virtual NICs') + self.skip('skipping profile tests for virtual / non loopback') return try: - self.c.set_port_attr(ports = [self.tx_port, self.rx_port], promiscuous = True) - + for profile in self.profiles: - print("now testing profile {0}...\n").format(profile) + + print("now testing profile {0}...\n".format(profile)) p1 = STLProfile.load(profile, port_id = self.tx_port) p2 = STLProfile.load(profile, port_id = self.rx_port) + # if profile contains custom MAC addrs we need promiscuous mode + # but virtual NICs does not support promiscuous mode + self.c.set_port_attr(ports = [self.tx_port, self.rx_port], promiscuous = False) + + if p1.has_custom_mac_addr(): + if not self.is_virt_nics: + self.c.set_port_attr(ports = [self.tx_port, self.rx_port], promiscuous = True) + else: + print("\n*** profile needs promiscuous mode but running on virtual NICs - skipping... ***\n") + continue + if p1.has_flow_stats(): - print("profile needs RX caps - skipping...") + print("\n*** profile needs RX caps - skipping... ***\n") continue self.c.add_streams(p1, ports = self.tx_port) @@ -280,9 +290,8 @@ class STLClient_Test(CStlGeneral_Test): assert self.tx_port in stats, '{0} - no stats for TX port'.format(profile) assert self.rx_port in stats, '{0} - no stats for RX port'.format(profile) - assert stats[self.tx_port]['opackets'] == stats[self.rx_port]['ipackets'], '{0} - number of TX packets differ from RX packets'.format(profile) - - assert stats[self.rx_port]['opackets'] == stats[self.tx_port]['ipackets'], '{0} - number of TX packets differ from RX packets'.format(profile) + self.verify(stats[self.tx_port]['opackets'], stats[self.rx_port]['ipackets']) + self.verify(stats[self.rx_port]['opackets'], stats[self.tx_port]['ipackets']) self.c.remove_all_streams(ports = [self.tx_port, self.rx_port]) diff --git a/scripts/automation/regression/stateless_tests/stl_examples_test.py b/scripts/automation/regression/stateless_tests/stl_examples_test.py index 9e4fffc9..3f7d7b87 100755 --- a/scripts/automation/regression/stateless_tests/stl_examples_test.py +++ b/scripts/automation/regression/stateless_tests/stl_examples_test.py @@ -1,5 +1,5 @@ #!/router/bin/python -from stl_general_test import CStlGeneral_Test, CTRexScenario +from .stl_general_test import CStlGeneral_Test, CTRexScenario import os, sys from misc_methods import run_command @@ -28,6 +28,3 @@ class STLExamples_Test(CStlGeneral_Test): return_code, stdout, stderr = run_command("sh -c 'cd %s; %s %s -s %s'" % (examples_dir, sys.executable, example, CTRexScenario.configuration.trex['trex_name'])) assert return_code == 0, 'example %s failed.\nstdout: %s\nstderr: %s' % (return_code, stdout, stderr) - def test_stl_examples1(self): - print 'in test_stl_examples1' - diff --git a/scripts/automation/regression/stateless_tests/stl_general_test.py b/scripts/automation/regression/stateless_tests/stl_general_test.py index 64e93510..54388121 100644 --- a/scripts/automation/regression/stateless_tests/stl_general_test.py +++ b/scripts/automation/regression/stateless_tests/stl_general_test.py @@ -28,11 +28,11 @@ class CStlGeneral_Test(CTRexGeneral_Test): sys.stdout.write('.') sys.stdout.flush() self.stl_trex.connect() - print '' + print('') return True except: time.sleep(1) - print '' + print('') return False def map_ports(self, timeout = 5): @@ -42,10 +42,10 @@ class CStlGeneral_Test(CTRexGeneral_Test): sys.stdout.flush() CTRexScenario.stl_ports_map = stl_map_ports(self.stl_trex) if self.verify_bidirectional(CTRexScenario.stl_ports_map): - print '' + print('') return True time.sleep(1) - print '' + print('') return False # verify all the ports are bidirectional @@ -82,5 +82,5 @@ class STLBasic_Test(CStlGeneral_Test): CTRexScenario.stl_init_error = err if not self.map_ports(): self.fail(err) - print 'Got ports mapping: %s' % CTRexScenario.stl_ports_map + print('Got ports mapping: %s' % CTRexScenario.stl_ports_map) CTRexScenario.stl_init_error = None diff --git a/scripts/automation/regression/stateless_tests/stl_rx_test.py b/scripts/automation/regression/stateless_tests/stl_rx_test.py index bb682b6c..3b979744 100644 --- a/scripts/automation/regression/stateless_tests/stl_rx_test.py +++ b/scripts/automation/regression/stateless_tests/stl_rx_test.py @@ -1,5 +1,5 @@ #!/router/bin/python -from stl_general_test import CStlGeneral_Test, CTRexScenario +from .stl_general_test import CStlGeneral_Test, CTRexScenario from trex_stl_lib.api import * import os, sys @@ -86,7 +86,7 @@ class STLRX_Test(CStlGeneral_Test): # add both streams to ports self.c.add_streams([s1], ports = [self.tx_port]) - print "\ninjecting {0} packets on port {1}\n".format(total_pkts, self.tx_port) + print("\ninjecting {0} packets on port {1}\n".format(total_pkts, self.tx_port)) exp = {'pg_id': 5, 'total_pkts': total_pkts, 'pkt_len': self.pkt.get_pkt_len()} @@ -100,10 +100,10 @@ class STLRX_Test(CStlGeneral_Test): # one simple stream on TX --> RX def test_multiple_streams(self): num_streams = 10 - total_pkts = self.total_pkts / num_streams + total_pkts = int(self.total_pkts / num_streams) if total_pkts == 0: total_pkts = 1 - percent = self.rate_percent / num_streams + percent = int(self.rate_percent / num_streams) if percent == 0: percent = 1 @@ -148,7 +148,7 @@ class STLRX_Test(CStlGeneral_Test): exp = {'pg_id': 5, 'total_pkts': total_pkts, 'pkt_len': self.pkt.get_pkt_len()} for i in range(0, 10): - print "starting iteration {0}".format(i) + print("starting iteration {0}".format(i)) self.__rx_iteration( [exp] ) diff --git a/scripts/automation/regression/stateless_tests/trex_client_pkg_test.py b/scripts/automation/regression/stateless_tests/trex_client_pkg_test.py index 6e2de230..64d5000e 100755 --- a/scripts/automation/regression/stateless_tests/trex_client_pkg_test.py +++ b/scripts/automation/regression/stateless_tests/trex_client_pkg_test.py @@ -1,5 +1,5 @@ #!/router/bin/python -from stl_general_test import CStlGeneral_Test, CTRexScenario +from .stl_general_test import CStlGeneral_Test, CTRexScenario from misc_methods import run_command from nose.plugins.attrib import attr |