run_functional_tests not requires unit_tests/functional_tests, can be set to custom test, path from scripts or from regression. added hlt profile test.

4 files changed, 82 insertions, 76 deletions

diff --git a/scripts/automation/regression/trex_unit_test.py b/scripts/automation/regression/trex_unit_test.py
index 2995875c..be063846 100755
--- a/scripts/automation/regression/trex_unit_test.py
+++ b/scripts/automation/regression/trex_unit_test.py
@@ -119,7 +119,8 @@ class CTRexTestConfiguringPlugin(Plugin):
 
     def configure(self, options, conf):
         self.functional = options.functional
-        if self.functional:
+        self.collect_only = options.collect_only
+        if self.functional or self.collect_only:
             return
         if CTRexScenario.setup_dir and options.config_path:
             raise Exception('Please either define --cfg or use env. variable SETUP_DIR, not both.')
@@ -141,7 +142,7 @@ class CTRexTestConfiguringPlugin(Plugin):
             self.loggerPath = options.log_path
 
     def begin (self):
-        if self.functional:
+        if self.functional or self.collect_only:
             return
         # initialize CTRexScenario global testing class, to be used by all tests
         CTRexScenario.configuration = self.configuration
@@ -165,7 +166,7 @@ class CTRexTestConfiguringPlugin(Plugin):
             CustomLogger.setup_custom_logger('TRexLogger')
     
     def finalize(self, result):
-        if self.functional:
+        if self.functional or self.collect_only:
             return
         CTRexScenario.is_init       = False
         stop_trex_remote_server(self.configuration.trex)
@@ -212,22 +213,28 @@ if __name__ == "__main__":
         CTRexScenario.setup_name = os.path.basename(CTRexScenario.setup_dir)
         xml_name =  'report_%s.xml' % CTRexScenario.setup_name
 
-    nose_argv= sys.argv + ['-s', '-v', '--exe', '--rednose', '--detailed-errors', '--with-xunit', '--xunit-file=%s/%s' % (CTRexScenario.report_dir, xml_name)]
-    
-    for arg in sys.argv:
+    nose_argv = ['-s', '-v', '--exe', '--rednose', '--detailed-errors']
+    if '--collect-only' in sys.argv: # this is a user trying simply to view the available tests. no need xunit.
+        CTRexScenario.is_test_list = True
+    else:
+        nose_argv += ['--with-xunit', '--xunit-file=%s/%s' % (CTRexScenario.report_dir, xml_name)]
+        set_report_dir(CTRexScenario.report_dir)
+
+    for i, arg in enumerate(sys.argv):
         if 'unit_tests/' in arg:
             specific_tests = True
+            sys.argv[i] = arg[arg.find('unit_tests/'):]
         if 'log-path' in arg:
             disableLogCapture = True
-        if arg == '--collect-only':   # this is a user trying simply to view the available tests. removing xunit param from nose args
-            nose_argv[-3:-1] = []
-            CTRexScenario.is_test_list = True
-        else:
-            set_report_dir(CTRexScenario.report_dir)
+
+    nose_argv += sys.argv
 
     # Run all of the unit tests or just the selected ones
     if not specific_tests:
-        nose_argv += ['unit_tests']
+        if '--functional' in sys.argv:
+            nose_argv += ['unit_tests/functional_tests']
+        else:
+            nose_argv += ['unit_tests']
     if disableLogCapture:
         nose_argv += ['--nologcapture']
 
diff --git a/scripts/automation/regression/unit_tests/functional_tests/hltapi_stream_builder_test.py b/scripts/automation/regression/unit_tests/functional_tests/hltapi_stream_builder_test.py
index 534cc828..290e37d5 100755
--- a/scripts/automation/regression/unit_tests/functional_tests/hltapi_stream_builder_test.py
+++ b/scripts/automation/regression/unit_tests/functional_tests/hltapi_stream_builder_test.py
@@ -2,10 +2,11 @@
 
 import os
 import unittest
+from trex_stl_lib.trex_stl_hltapi import STLHltStream
+from trex_stl_lib.trex_stl_types import validate_type
 from nose.plugins.attrib import attr
 
 def compare_yamls(yaml1, yaml2):
-    from trex_stl_lib.trex_stl_types import validate_type
     validate_type('yaml1', yaml1, str)
     validate_type('yaml2', yaml2, str)
     i = 0
@@ -14,14 +15,11 @@ def compare_yamls(yaml1, yaml2):
         if line1 != line2:
             raise Exception('yamls are not equal starting from line %s:\n%s\n\t<->\n%s' % (i, line1.strip(), line2.strip()))
 
-@attr('run_on_trex')
+
 class CTRexHltApi_Test(unittest.TestCase):
     ''' Checks correct HLTAPI creation of packet/VM '''
 
     def setUp(self):
-        from trex_stl_lib.trex_stl_hltapi import CTRexHltApiBuilder
-        self.gen_stream = CTRexHltApiBuilder.generate_stream
-
         self.golden_yaml = None
         self.test_yaml = None
 
@@ -30,7 +28,7 @@ class CTRexHltApi_Test(unittest.TestCase):
 
     # Eth/IP/TCP, all values default, no VM instructions
     def test_default(self):
-        test_stream = self.gen_stream(name = 'stream-0')
+        test_stream = STLHltStream(name = 'stream-0')
         self.test_yaml = test_stream.dump_to_yaml(self.yaml_save_location())
         self.golden_yaml = '''
 - name: stream-0
@@ -53,13 +51,13 @@ class CTRexHltApi_Test(unittest.TestCase):
 
     # Eth/IP/TCP, ip src and dest is changed by VM
     def test_ip_ranges(self):
-        test_stream = self.gen_stream(ip_src_addr = '192.168.1.1',
-                                 ip_src_mode = 'increment',
-                                 ip_src_count = 5,
-                                 ip_dst_addr = '5.5.5.5',
-                                 ip_dst_count = 2,
-                                 ip_dst_mode = 'random',
-                                 name = 'stream-0')
+        test_stream = STLHltStream(ip_src_addr = '192.168.1.1',
+                                   ip_src_mode = 'increment',
+                                   ip_src_count = 5,
+                                   ip_dst_addr = '5.5.5.5',
+                                   ip_dst_count = 2,
+                                   ip_dst_mode = 'random',
+                                   name = 'stream-0')
         self.test_yaml = test_stream.dump_to_yaml(self.yaml_save_location())
         self.golden_yaml = '''
 - name: stream-0
@@ -109,12 +107,12 @@ class CTRexHltApi_Test(unittest.TestCase):
 
     # Eth / IP / TCP, tcp ports are changed by VM
     def test_tcp_ranges(self):
-        test_stream = self.gen_stream(tcp_src_port_mode = 'decrement',
-                                 tcp_src_port_count = 10,
-                                 tcp_dst_port_mode = 'random',
-                                 tcp_dst_port_count = 10,
-                                 tcp_dst_port = 1234,
-                                 name = 'stream-0')
+        test_stream = STLHltStream(tcp_src_port_mode = 'decrement',
+                                   tcp_src_port_count = 10,
+                                   tcp_dst_port_mode = 'random',
+                                   tcp_dst_port_count = 10,
+                                   tcp_dst_port = 1234,
+                                   name = 'stream-0')
         self.test_yaml = test_stream.dump_to_yaml(self.yaml_save_location())
         self.golden_yaml = '''
 - name: stream-0
@@ -164,30 +162,30 @@ class CTRexHltApi_Test(unittest.TestCase):
     # Eth / IP / UDP, udp ports are changed by VM
     def test_udp_ranges(self):
         # UDP is not set, expecting ignore of wrong UDP arguments
-        self.gen_stream(udp_src_port_mode = 'qwerqwer',
-                   udp_src_port_count = 'weqwer',
-                   udp_src_port = 'qwerqwer',
-                   udp_dst_port_mode = 'qwerqwe',
-                   udp_dst_port_count = 'sfgsdfg',
-                   udp_dst_port = 'sdfgsdfg')
+        STLHltStream(udp_src_port_mode = 'qwerqwer',
+                     udp_src_port_count = 'weqwer',
+                     udp_src_port = 'qwerqwer',
+                     udp_dst_port_mode = 'qwerqwe',
+                     udp_dst_port_count = 'sfgsdfg',
+                     udp_dst_port = 'sdfgsdfg')
         # UDP is set, expecting fail due to wrong UDP arguments
         with self.assertRaises(Exception):
-            self.gen_stream(l4_protocol = 'udp',
-                       udp_src_port_mode = 'qwerqwer',
-                       udp_src_port_count = 'weqwer',
-                       udp_src_port = 'qwerqwer',
-                       udp_dst_port_mode = 'qwerqwe',
-                       udp_dst_port_count = 'sfgsdfg',
-                       udp_dst_port = 'sdfgsdfg')
+            STLHltStream(l4_protocol = 'udp',
+                         udp_src_port_mode = 'qwerqwer',
+                         udp_src_port_count = 'weqwer',
+                         udp_src_port = 'qwerqwer',
+                         udp_dst_port_mode = 'qwerqwe',
+                         udp_dst_port_count = 'sfgsdfg',
+                         udp_dst_port = 'sdfgsdfg')
         # generate it already with correct arguments
-        test_stream = self.gen_stream(l4_protocol = 'udp',
-                                 udp_src_port_mode = 'decrement',
-                                 udp_src_port_count = 10,
-                                 udp_src_port = 1234,
-                                 udp_dst_port_mode = 'increment',
-                                 udp_dst_port_count = 10,
-                                 udp_dst_port = 1234,
-                                 name = 'stream-0')
+        test_stream = STLHltStream(l4_protocol = 'udp',
+                                   udp_src_port_mode = 'decrement',
+                                   udp_src_port_count = 10,
+                                   udp_src_port = 1234,
+                                   udp_dst_port_mode = 'increment',
+                                   udp_dst_port_count = 10,
+                                   udp_dst_port = 1234,
+                                   name = 'stream-0')
         self.test_yaml = test_stream.dump_to_yaml(self.yaml_save_location())
         self.golden_yaml = '''
 - name: stream-0
@@ -238,18 +236,18 @@ class CTRexHltApi_Test(unittest.TestCase):
     def test_pkt_len_by_framesize(self):
         # frame_size_step should be 1 (as default)
         with self.assertRaises(Exception):
-            test_stream = self.self.gen_stream(length_mode = 'decrement',
-                                     frame_size_min = 100,
-                                     frame_size_max = 3000,
-                                     frame_size_step = 20)
+            test_stream = STLHltStream(length_mode = 'decrement',
+                                       frame_size_min = 100,
+                                       frame_size_max = 3000,
+                                       frame_size_step = 20)
         # just check errors, no compare to golden
-        self.gen_stream(length_mode = 'increment',
-                   frame_size_min = 100,
-                   frame_size_max = 3000)
-        test_stream = self.gen_stream(length_mode = 'decrement',
-                                 frame_size_min = 100,
-                                 frame_size_max = 3000,
-                                 name = 'stream-0')
+        STLHltStream(length_mode = 'increment',
+                     frame_size_min = 100,
+                     frame_size_max = 3000)
+        test_stream = STLHltStream(length_mode = 'decrement',
+                                   frame_size_min = 100,
+                                   frame_size_max = 3000,
+                                   name = 'stream-0')
         self.test_yaml = test_stream.dump_to_yaml(self.yaml_save_location())
         self.golden_yaml = '''
 - name: stream-0
@@ -290,16 +288,16 @@ class CTRexHltApi_Test(unittest.TestCase):
     def test_pkt_len_by_l3length(self):
         # l3_length_step should be 1
         with self.assertRaises(Exception):
-            self.gen_stream(l4_protocol = 'udp',
-                       length_mode = 'random',
-                       l3_length_min = 100,
-                       l3_length_max = 400,
-                       l3_length_step = 20)
-        test_stream = self.gen_stream(l4_protocol = 'udp',
-                                 length_mode = 'random',
-                                 l3_length_min = 100,
-                                 l3_length_max = 400,
-                                 name = 'stream-0')
+            STLHltStream(l4_protocol = 'udp',
+                         length_mode = 'random',
+                         l3_length_min = 100,
+                         l3_length_max = 400,
+                         l3_length_step = 20)
+        test_stream = STLHltStream(l4_protocol = 'udp',
+                                   length_mode = 'random',
+                                   l3_length_min = 100,
+                                   l3_length_max = 400,
+                                   name = 'stream-0')
         self.test_yaml = test_stream.dump_to_yaml(self.yaml_save_location())
         self.golden_yaml = '''
 - name: stream-0
diff --git a/scripts/automation/regression/unit_tests/functional_tests/stl_basic_tests.py b/scripts/automation/regression/unit_tests/functional_tests/stl_basic_tests.py
index 9670b795..df1bd7e8 100644
--- a/scripts/automation/regression/unit_tests/functional_tests/stl_basic_tests.py
+++ b/scripts/automation/regression/unit_tests/functional_tests/stl_basic_tests.py
@@ -185,9 +185,9 @@ class CStlBasic_Test(functional_general_test.CGeneralFunctional_Test):
             self.run_py_profile_path (obj[0],obj[1],compare =obj[2], do_no_remove=True)
 
 
-    def hlt_profiles (self):
+    def test_hlt_profiles (self):
         p = (
-            ['hlt/hlt_udp_inc_len_9k.py', '-m 1 -l 50', False],
+            ['hlt/hlt_udp_inc_dec_len_9k.py', '-m 1 -l 40', True],
             )
         
 
diff --git a/scripts/automation/regression/unit_tests/trex_general_test.py b/scripts/automation/regression/unit_tests/trex_general_test.py
index 4558dd41..14af4820 100755
--- a/scripts/automation/regression/unit_tests/trex_general_test.py
+++ b/scripts/automation/regression/unit_tests/trex_general_test.py
@@ -83,6 +83,8 @@ class CTRexGeneral_Test(unittest.TestCase):
     """This class defines the general testcase of the T-Rex traffic generator"""
     def __init__ (self, *args, **kwargs):
         unittest.TestCase.__init__(self, *args, **kwargs)
+        if CTRexScenario.is_test_list:
+            return
         # Point test object to scenario global object
         self.configuration         = CTRexScenario.configuration
         self.benchmark             = CTRexScenario.benchmark
@@ -125,7 +127,6 @@ class CTRexGeneral_Test(unittest.TestCase):
                         print 'Matches needed image: %s' % needed_image
                 CTRexScenario.router_image = running_image
 
-                    
             if self.modes:
                 print termstyle.green('\t!!!\tRunning with modes: %s, not suitable tests will be skipped.\t!!!' % list(self.modes))