Re-define the framesize and flow dynamic define in testcase

This patch adds the framesize and flow into test option instead of
adding a seperate file to avoid the multiple file update incase of ip
change.

Change-Id: Ic473c73773ad36422ecc02618b8c646a5336b70a
Signed-off-by: Deepak S <deepak.s@linux.intel.com>

3 files changed, 49 insertions, 16 deletions

diff --git a/tests/unit/benchmark/scenarios/networking/test_vnf_generic.py b/tests/unit/benchmark/scenarios/networking/test_vnf_generic.py
index 651614d3e..8ce33625b 100644
--- a/tests/unit/benchmark/scenarios/networking/test_vnf_generic.py
+++ b/tests/unit/benchmark/scenarios/networking/test_vnf_generic.py
@@ -375,6 +375,9 @@ class TestNetworkServiceTestCase(unittest.TestCase):
                     'allowed_drop_rate': '0.8 - 1',
                 },
             },
+            'options': {
+                'framesize': {'64B': 100}
+            },
             'runner': {
                 'object': 'NetworkServiceTestCase',
                 'interval': 35,
@@ -414,17 +417,40 @@ class TestNetworkServiceTestCase(unittest.TestCase):
     def test___init__(self):
         assert self.topology
 
+    def test__get_ip_flow_range(self):
+        self.scenario_cfg["traffic_options"]["flow"] = \
+            self._get_file_abspath("ipv4_1flow_Packets_vpe.yaml")
+        result = '152.16.100.1-152.16.100.254'
+        self.assertEqual(result, self.s._get_ip_flow_range({"tg__1": 'xe0'}))
+
     def test___get_traffic_flow(self):
         self.scenario_cfg["traffic_options"]["flow"] = \
             self._get_file_abspath("ipv4_1flow_Packets_vpe.yaml")
-        result = {'flow': {'dstip4_range': '152.40.0.20',
-                           'srcip4_range': '152.16.0.20', 'count': 1}}
+        self.scenario_cfg["options"] = {}
+        self.scenario_cfg['options'] = {
+            'flow': {
+              'src_ip': [
+                {
+                  'tg__1': 'xe0',
+                },
+              ],
+              'dst_ip': [
+                {
+                  'tg__1': 'xe1',
+                },
+              ],
+              'public_ip': ['1.1.1.1'],
+            },
+        }
+        result = {'flow': {'dst_ip0': '152.16.40.1-152.16.40.254',
+                           'src_ip0': '152.16.100.1-152.16.100.254'}}
+
         self.assertEqual(result, self.s._get_traffic_flow())
 
     def test___get_traffic_flow_error(self):
         self.scenario_cfg["traffic_options"]["flow"] = \
             "ipv4_1flow_Packets_vpe.yaml1"
-        self.assertEqual({}, self.s._get_traffic_flow())
+        self.assertEqual({'flow': {}}, self.s._get_traffic_flow())
 
     def test_get_vnf_imp(self):
         vnfd = COMPLETE_TREX_VNFD['vnfd:vnfd-catalog']['vnfd'][0]['class-name']
@@ -586,7 +612,7 @@ class TestNetworkServiceTestCase(unittest.TestCase):
 
     def test___get_traffic_imix_exception(self):
         with mock.patch.dict(self.scenario_cfg["traffic_options"], {'imix': ''}):
-            self.assertEqual({}, self.s._get_traffic_imix())
+            self.assertEqual({'imix': {'64B': 100}}, self.s._get_traffic_imix())
 
     def test__fill_traffic_profile(self):
         with mock.patch.dict("sys.modules", STL_MOCKS):
diff --git a/tests/unit/network_services/traffic_profile/test_rfc2544.py b/tests/unit/network_services/traffic_profile/test_rfc2544.py
index dcaf43dc5..04b7efc48 100644
--- a/tests/unit/network_services/traffic_profile/test_rfc2544.py
+++ b/tests/unit/network_services/traffic_profile/test_rfc2544.py
@@ -115,9 +115,9 @@ class TestRFC2544Profile(unittest.TestCase):
                            'outer_l3v4': {'dstip4': '1.1.1.1-1.15.255.255',
                                           'proto': 'udp',
                                           'srcip4': '90.90.1.1-90.105.255.255',
-                                          'dscp': 0, 'ttl': 32},
+                                          'dscp': 0, 'ttl': 32, 'count': 1},
                            'outer_l4': {'srcport': '2001',
-                                        'dsrport': '1234'}}},
+                               'dsrport': '1234', 'count': 1}}},
                'private_1': {'ipv4':
                            {'outer_l2': {'framesize':
                                          {'64B': '100', '1518B': '0',
@@ -127,9 +127,9 @@ class TestRFC2544Profile(unittest.TestCase):
                             'outer_l3v4': {'dstip4': '9.9.1.1-90.105.255.255',
                                            'proto': 'udp',
                                            'srcip4': '1.1.1.1-1.15.255.255',
-                                           'dscp': 0, 'ttl': 32},
+                                           'dscp': 0, 'ttl': 32, 'count': 1},
                             'outer_l4': {'dstport': '2001',
-                                         'srcport': '1234'}}},
+                                'srcport': '1234', 'count': 1}}},
                'schema': 'isb:traffic_profile:0.1'}
 
     def test___init__(self):
diff --git a/tests/unit/network_services/traffic_profile/test_traffic_profile.py b/tests/unit/network_services/traffic_profile/test_traffic_profile.py
index fd769e6e0..37193f862 100644
--- a/tests/unit/network_services/traffic_profile/test_traffic_profile.py
+++ b/tests/unit/network_services/traffic_profile/test_traffic_profile.py
@@ -117,9 +117,11 @@ class TestTrexProfile(unittest.TestCase):
                                    'outer_l3v4': {'dstip4': '1.1.1.1-1.1.2.2',
                                                   'proto': 'udp',
                                                   'srcip4': '9.9.1.1-90.1.2.2',
-                                                  'dscp': 0, 'ttl': 32},
+                                                  'dscp': 0, 'ttl': 32,
+                                                  'count': 1},
                                    'outer_l4': {'srcport': '2001',
-                                                'dsrport': '1234'}}},
+                                                'dsrport': '1234',
+                                                'count': 1}}},
                'private': {'ipv4':
                            {'outer_l2': {'framesize':
                                          {'64B': '100', '1518B': '0',
@@ -131,9 +133,10 @@ class TestTrexProfile(unittest.TestCase):
                             'outer_l3v4': {'dstip4': '9.9.1.1-90.105.255.255',
                                            'proto': 'udp',
                                            'srcip4': '1.1.1.1-1.15.255.255',
-                                           'dscp': 0, 'ttl': 32},
+                                           'dscp': 0, 'ttl': 32, 'count': 1},
                             'outer_l4': {'dstport': '2001',
-                                         'srcport': '1234'}}},
+                                         'srcport': '1234',
+                                         'count': 1}}},
                'schema': 'isb:traffic_profile:0.1'}
     PROFILE_v6 = {'description': 'Traffic profile to run RFC2544 latency',
                   'name': 'rfc2544',
@@ -149,9 +152,11 @@ class TestTrexProfile(unittest.TestCase):
                                       'outer_l3v4': {'dstip6': '0064:ff9b:0:0:0:0:9810:6414-0064:ff9b:0:0:0:0:9810:6420',
                                                      'proto': 'udp',
                                                      'srcip6': '0064:ff9b:0:0:0:0:9810:2814-0064:ff9b:0:0:0:0:9810:2820',
-                                                     'dscp': 0, 'ttl': 32},
+                                                     'dscp': 0, 'ttl': 32,
+                                                     'count': 1},
                                       'outer_l4': {'srcport': '2001',
-                                                   'dsrport': '1234'}}},
+                                                   'dsrport': '1234',
+                                                   'count': 1}}},
                   'private':
                   {'ipv6': {'outer_l2': {'framesize':
                                          {'64B': '100', '1518B': '0',
@@ -163,9 +168,11 @@ class TestTrexProfile(unittest.TestCase):
                             'outer_l3v4': {'dstip6': '0064:ff9b:0:0:0:0:9810:2814-0064:ff9b:0:0:0:0:9810:2820',
                                            'proto': 'udp',
                                            'srcip6': '0064:ff9b:0:0:0:0:9810:6414-0064:ff9b:0:0:0:0:9810:6420',
-                                           'dscp': 0, 'ttl': 32},
+                                           'dscp': 0, 'ttl': 32,
+                                           'count': 1},
                             'outer_l4': {'dstport': '2001',
-                                         'srcport': '1234'}}},
+                                         'srcport': '1234',
+                                         'count': 1}}},
                   'schema': 'isb:traffic_profile:0.1'}
 
     def test___init__(self):