Add "duration" parameter to test case definition

Add "duration" parameter to test case definition, in scenario:options
section. This parameter will be rendered in the traffic profile.

If the parameter is not present in the test case scenario options, the
default time written in the traffic profile options will be 30 seconds
(TrafficProfile.DEFAULT_DURATION = 30). If the traffic profile
injection time is not defined, the default injection time will be 30
seconds.

  testcase:scenario:options:duration (default = 30)
      render --> traffic_profile:duration
          parse --> TrafficProfile.duration (default = 30)

Target traffic profiles (RFC2544):
  - RFC2544Profile
  - IXIARFC2544Profile

JIRA: YARDSTICK-1194

Change-Id: I968922e6bb882d7ee15aa1c4db4037face7a3492
Signed-off-by: Rodolfo Alonso Hernandez <rodolfo.alonso.hernandez@intel.com>

5 files changed, 73 insertions, 84 deletions

diff --git a/yardstick/tests/unit/benchmark/scenarios/networking/test_vnf_generic.py b/yardstick/tests/unit/benchmark/scenarios/networking/test_vnf_generic.py
index 2885dc6fb..bb1a7aaca 100644
--- a/yardstick/tests/unit/benchmark/scenarios/networking/test_vnf_generic.py
+++ b/yardstick/tests/unit/benchmark/scenarios/networking/test_vnf_generic.py
@@ -628,7 +628,8 @@ class TestNetworkServiceTestCase(unittest.TestCase):
                  'extra_args': {'arg1': 'value1', 'arg2': 'value2'},
                  'flow': {'flow': {}},
                  'imix': {'imix': {'64B': 100}},
-                 'uplink': {}}
+                 'uplink': {},
+                 'duration': 30}
             )
             mock_tprofile_get.assert_called_once_with(fake_vnfd)
 
diff --git a/yardstick/tests/unit/network_services/traffic_profile/test_base.py b/yardstick/tests/unit/network_services/traffic_profile/test_base.py
index 641064cbe..cf4888d82 100644
--- a/yardstick/tests/unit/network_services/traffic_profile/test_base.py
+++ b/yardstick/tests/unit/network_services/traffic_profile/test_base.py
@@ -69,5 +69,14 @@ class TestTrafficProfile(unittest.TestCase):
 
 class TestDummyProfile(unittest.TestCase):
     def test_execute(self):
-        dummy_profile = base.DummyProfile(base.TrafficProfile)
+        tp_config = {'traffic_profile': {'duration': 15}}
+        dummy_profile = base.DummyProfile(tp_config)
         self.assertIsNone(dummy_profile.execute({}))
+
+
+class TrafficProfileConfigTestCase(unittest.TestCase):
+
+    def test__init(self):
+        tp_config = {'traffic_profile': {'duration': 15}}
+        tp_config_obj = base.TrafficProfileConfig(tp_config)
+        self.assertEqual(15, tp_config_obj.duration)
diff --git a/yardstick/tests/unit/network_services/traffic_profile/test_fixed.py b/yardstick/tests/unit/network_services/traffic_profile/test_fixed.py
index 39905e6b1..2f6713760 100644
--- a/yardstick/tests/unit/network_services/traffic_profile/test_fixed.py
+++ b/yardstick/tests/unit/network_services/traffic_profile/test_fixed.py
@@ -102,8 +102,7 @@ class TestFixedProfile(unittest.TestCase):
                'id': 'VpeApproxVnf', 'name': 'VPEVnfSsh'}]}}
 
     def test___init__(self):
-        fixed_profile = \
-            FixedProfile(TrafficProfile)
+        fixed_profile = FixedProfile(self.TRAFFIC_PROFILE)
         self.assertIsNotNone(fixed_profile)
 
     def test_execute(self):
diff --git a/yardstick/tests/unit/network_services/traffic_profile/test_http.py b/yardstick/tests/unit/network_services/traffic_profile/test_http.py
index 0d1b916a7..d44fab2b5 100644
--- a/yardstick/tests/unit/network_services/traffic_profile/test_http.py
+++ b/yardstick/tests/unit/network_services/traffic_profile/test_http.py
@@ -11,30 +11,29 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-#
 
 import unittest
 
-from yardstick.network_services.traffic_profile.base import TrafficProfile
-from yardstick.network_services.traffic_profile.http import \
-    TrafficProfileGenericHTTP
+from yardstick.network_services.traffic_profile import http
 
 
 class TestTrafficProfileGenericHTTP(unittest.TestCase):
+
+    TP_CONFIG = {'traffic_profile': {'duration': 10}}
+
     def test___init__(self):
-        traffic_profile_generic_htt_p = \
-            TrafficProfileGenericHTTP(TrafficProfile)
-        self.assertIsNotNone(traffic_profile_generic_htt_p)
+        tp_generic_http = http.TrafficProfileGenericHTTP(
+            self.TP_CONFIG)
+        self.assertIsNotNone(tp_generic_http)
 
     def test_execute(self):
-        traffic_profile_generic_htt_p = \
-            TrafficProfileGenericHTTP(TrafficProfile)
+        tp_generic_http = http.TrafficProfileGenericHTTP(
+            self.TP_CONFIG)
         traffic_generator = {}
-        self.assertIsNone(
-            traffic_profile_generic_htt_p.execute(traffic_generator))
+        self.assertIsNone(tp_generic_http.execute(traffic_generator))
 
     def test__send_http_request(self):
-        traffic_profile_generic_htt_p = \
-                TrafficProfileGenericHTTP(TrafficProfile)
-        self.assertIsNone(traffic_profile_generic_htt_p._send_http_request(
-                             "10.1.1.1", "250", "/req"))
+        tp_generic_http = http.TrafficProfileGenericHTTP(
+            self.TP_CONFIG)
+        self.assertIsNone(tp_generic_http._send_http_request(
+            '10.1.1.1', '250', '/req'))
diff --git a/yardstick/tests/unit/network_services/traffic_profile/test_trex_traffic_profile.py b/yardstick/tests/unit/network_services/traffic_profile/test_trex_traffic_profile.py
index 7111c8075..34face774 100644
--- a/yardstick/tests/unit/network_services/traffic_profile/test_trex_traffic_profile.py
+++ b/yardstick/tests/unit/network_services/traffic_profile/test_trex_traffic_profile.py
@@ -139,80 +139,63 @@ class TestTrexProfile(unittest.TestCase):
                                   'count': 1}}},
         'schema': 'isb:traffic_profile:0.1'}
 
+    def setUp(self):
+        self.trex_profile = TrexProfile(self.PROFILE)
+
     def test___init__(self):
-        TrafficProfile.params = self.PROFILE
-        trex_profile = \
-            TrexProfile(TrafficProfile)
-        self.assertEqual(trex_profile.pps, 100)
+        self.assertEqual(self.trex_profile.pps, 100)
 
     def test_qinq(self):
         qinq = {"S-VLAN": {"id": 128, "priority": 0, "cfi": 0},
                 "C-VLAN": {"id": 512, "priority": 0, "cfi": 0}}
 
-        trex_profile = \
-            TrexProfile(TrafficProfile)
-        self.assertIsNone(trex_profile.set_qinq(qinq))
+        self.assertIsNone(self.trex_profile.set_qinq(qinq))
 
         qinq = {"S-VLAN": {"id": "128-130", "priority": 0, "cfi": 0},
                 "C-VLAN": {"id": "512-515", "priority": 0, "cfi": 0}}
-        self.assertIsNone(trex_profile.set_qinq(qinq))
+        self.assertIsNone(self.trex_profile.set_qinq(qinq))
 
     def test__set_outer_l2_fields(self):
-        trex_profile = \
-            TrexProfile(TrafficProfile)
         qinq = {"S-VLAN": {"id": 128, "priority": 0, "cfi": 0},
                 "C-VLAN": {"id": 512, "priority": 0, "cfi": 0}}
         outer_l2 = self.PROFILE[TrafficProfile.UPLINK]['ipv4']['outer_l2']
         outer_l2['QinQ'] = qinq
-        self.assertIsNone(trex_profile._set_outer_l2_fields(outer_l2))
+        self.assertIsNone(self.trex_profile._set_outer_l2_fields(outer_l2))
 
     def test__set_outer_l3v4_fields(self):
-        trex_profile = \
-            TrexProfile(TrafficProfile)
         outer_l3v4 = self.PROFILE[TrafficProfile.UPLINK]['ipv4']['outer_l3v4']
         outer_l3v4['proto'] = 'tcp'
-        self.assertIsNone(trex_profile._set_outer_l3v4_fields(outer_l3v4))
+        self.assertIsNone(self.trex_profile._set_outer_l3v4_fields(outer_l3v4))
 
     def test__set_outer_l3v6_fields(self):
-        trex_profile = \
-            TrexProfile(TrafficProfile)
         outer_l3v6 = self.PROFILE_v6[TrafficProfile.UPLINK]['ipv6']['outer_l3v4']
         outer_l3v6['proto'] = 'tcp'
         outer_l3v6['tc'] = 1
         outer_l3v6['hlim'] = 10
-        self.assertIsNone(trex_profile._set_outer_l3v6_fields(outer_l3v6))
+        self.assertIsNone(self.trex_profile._set_outer_l3v6_fields(outer_l3v6))
 
     def test__set_outer_l4_fields(self):
-        trex_profile = \
-            TrexProfile(TrafficProfile)
         outer_l4 = self.PROFILE[TrafficProfile.UPLINK]['ipv4']['outer_l4']
-        self.assertIsNone(trex_profile._set_outer_l4_fields(outer_l4))
+        self.assertIsNone(self.trex_profile._set_outer_l4_fields(outer_l4))
 
     def test_get_streams(self):
-        trex_profile = \
-            TrexProfile(TrafficProfile)
-        trex_profile.params = self.PROFILE
         profile_data = self.PROFILE[TrafficProfile.UPLINK]
-        self.assertIsNotNone(trex_profile.get_streams(profile_data))
-        trex_profile.pg_id = 1
-        self.assertIsNotNone(trex_profile.get_streams(profile_data))
-        trex_profile.params = self.PROFILE_v6
-        trex_profile.profile_data = self.PROFILE_v6[TrafficProfile.UPLINK]
-        self.assertIsNotNone(trex_profile.get_streams(profile_data))
-        trex_profile.pg_id = 1
-        self.assertIsNotNone(trex_profile.get_streams(profile_data))
+        self.assertIsNotNone(self.trex_profile.get_streams(profile_data))
+        self.trex_profile.pg_id = 1
+        self.assertIsNotNone(self.trex_profile.get_streams(profile_data))
+        self.trex_profile.params = self.PROFILE_v6
+        self.trex_profile.profile_data = self.PROFILE_v6[TrafficProfile.UPLINK]
+        self.assertIsNotNone(self.trex_profile.get_streams(profile_data))
+        self.trex_profile.pg_id = 1
+        self.assertIsNotNone(self.trex_profile.get_streams(profile_data))
 
     def test_generate_packets(self):
-        trex_profile = \
-            TrexProfile(TrafficProfile)
-        trex_profile.fsize = 10
-        trex_profile.base_pkt = [10]
-        self.assertIsNone(trex_profile.generate_packets())
+        self.trex_profile.fsize = 10
+        self.trex_profile.base_pkt = [10]
+        self.assertIsNone(self.trex_profile.generate_packets())
 
     def test_generate_imix_data_error(self):
-        trex_profile = \
-            TrexProfile(TrafficProfile)
-        self.assertEqual({}, trex_profile.generate_imix_data(False))
+        self.assertEqual({}, self.trex_profile.generate_imix_data(False))
 
     def test__count_ip_ipv4(self):
         start, end, count = TrexProfile._count_ip('1.1.1.1', '1.2.3.4')
@@ -237,7 +220,7 @@ class TestTrexProfile(unittest.TestCase):
             TrexProfile._count_ip(start_ip, end_ip)
 
     def test__dscp_range_action_partial_actual_count_zero(self):
-        traffic_profile = TrexProfile(TrafficProfile)
+        traffic_profile = TrexProfile(self.PROFILE)
         dscp_partial = traffic_profile._dscp_range_action_partial()
 
         flow_vars_initial_length = len(traffic_profile.vm_flow_vars)
@@ -245,7 +228,7 @@ class TestTrexProfile(unittest.TestCase):
         self.assertEqual(len(traffic_profile.vm_flow_vars), flow_vars_initial_length + 2)
 
     def test__dscp_range_action_partial_count_greater_than_actual(self):
-        traffic_profile = TrexProfile(TrafficProfile)
+        traffic_profile = TrexProfile(self.PROFILE)
         dscp_partial = traffic_profile._dscp_range_action_partial()
 
         flow_vars_initial_length = len(traffic_profile.vm_flow_vars)
@@ -253,7 +236,7 @@ class TestTrexProfile(unittest.TestCase):
         self.assertEqual(len(traffic_profile.vm_flow_vars), flow_vars_initial_length + 2)
 
     def test__udp_range_action_partial_actual_count_zero(self):
-        traffic_profile = TrexProfile(TrafficProfile)
+        traffic_profile = TrexProfile(self.PROFILE)
         traffic_profile.udp['field1'] = 'value1'
         udp_partial = traffic_profile._udp_range_action_partial('field1')
 
@@ -262,7 +245,7 @@ class TestTrexProfile(unittest.TestCase):
         self.assertEqual(len(traffic_profile.vm_flow_vars), flow_vars_initial_length + 2)
 
     def test__udp_range_action_partial_count_greater_than_actual(self):
-        traffic_profile = TrexProfile(TrafficProfile)
+        traffic_profile = TrexProfile(self.PROFILE)
         traffic_profile.udp['field1'] = 'value1'
         udp_partial = traffic_profile._udp_range_action_partial('field1', 'not_used_count')
 
@@ -271,39 +254,37 @@ class TestTrexProfile(unittest.TestCase):
         self.assertEqual(len(traffic_profile.vm_flow_vars), flow_vars_initial_length + 2)
 
     def test__general_single_action_partial(self):
-        trex_profile = TrexProfile(TrafficProfile)
-
-        trex_profile._general_single_action_partial(ETHERNET)(SRC)(
+        self.trex_profile._general_single_action_partial(ETHERNET)(SRC)(
             self.EXAMPLE_ETHERNET_ADDR)
         self.assertEqual(self.EXAMPLE_ETHERNET_ADDR,
-                         trex_profile.ether_packet.src)
+                         self.trex_profile.ether_packet.src)
 
-        trex_profile._general_single_action_partial(IP)(DST)(
+        self.trex_profile._general_single_action_partial(IP)(DST)(
             self.EXAMPLE_IP_ADDR)
-        self.assertEqual(self.EXAMPLE_IP_ADDR, trex_profile.ip_packet.dst)
+        self.assertEqual(self.EXAMPLE_IP_ADDR, self.trex_profile.ip_packet.dst)
 
-        trex_profile._general_single_action_partial(IPv6)(DST)(
+        self.trex_profile._general_single_action_partial(IPv6)(DST)(
             self.EXAMPLE_IPv6_ADDR)
-        self.assertEqual(self.EXAMPLE_IPv6_ADDR, trex_profile.ip6_packet.dst)
+        self.assertEqual(self.EXAMPLE_IPv6_ADDR,
+                         self.trex_profile.ip6_packet.dst)
 
-        trex_profile._general_single_action_partial(UDP)(SRC_PORT)(5060)
-        self.assertEqual(5060, trex_profile.udp_packet.sport)
+        self.trex_profile._general_single_action_partial(UDP)(SRC_PORT)(5060)
+        self.assertEqual(5060, self.trex_profile.udp_packet.sport)
 
-        trex_profile._general_single_action_partial(IP)(TYPE_OF_SERVICE)(0)
-        self.assertEqual(0, trex_profile.ip_packet.tos)
+        self.trex_profile._general_single_action_partial(
+            IP)(TYPE_OF_SERVICE)(0)
+        self.assertEqual(0, self.trex_profile.ip_packet.tos)
 
     def test__set_proto_addr(self):
-        trex_profile = TrexProfile(TrafficProfile)
-
         ether_range = "00:00:00:00:00:01-00:00:00:00:00:02"
         ip_range = "1.1.1.2-1.1.1.10"
         ipv6_range = '0064:ff9b:0:0:0:0:9810:6414-0064:ff9b:0:0:0:0:9810:6420'
 
-        trex_profile._set_proto_addr(ETHERNET, SRC, ether_range)
-        trex_profile._set_proto_addr(ETHERNET, DST, ether_range)
-        trex_profile._set_proto_addr(IP, SRC, ip_range)
-        trex_profile._set_proto_addr(IP, DST, ip_range)
-        trex_profile._set_proto_addr(IPv6, SRC, ipv6_range)
-        trex_profile._set_proto_addr(IPv6, DST, ipv6_range)
-        trex_profile._set_proto_addr(UDP, SRC_PORT, "5060-5090")
-        trex_profile._set_proto_addr(UDP, DST_PORT, "5060")
+        self.trex_profile._set_proto_addr(ETHERNET, SRC, ether_range)
+        self.trex_profile._set_proto_addr(ETHERNET, DST, ether_range)
+        self.trex_profile._set_proto_addr(IP, SRC, ip_range)
+        self.trex_profile._set_proto_addr(IP, DST, ip_range)
+        self.trex_profile._set_proto_addr(IPv6, SRC, ipv6_range)
+        self.trex_profile._set_proto_addr(IPv6, DST, ipv6_range)
+        self.trex_profile._set_proto_addr(UDP, SRC_PORT, '5060-5090')
+        self.trex_profile._set_proto_addr(UDP, DST_PORT, '5060')