Accept line rate percentage or fps a initial rate for IXIA RFC2544

Accept line rate percentage or fps a initial rate for IXIA RFC2544 traffic profile:
  traffic_profile:
    traffic_type : IXIARFC2544Profile
    frame_rate : 100%

  traffic_profile:
    traffic_type : IXIARFC2544Profile
    frame_rate : 5000fps

JIRA: YARDSTICK-1336

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

2 files changed, 30 insertions, 3 deletions

diff --git a/yardstick/tests/unit/network_services/libs/ixia_libs/test_ixnet_api.py b/yardstick/tests/unit/network_services/libs/ixia_libs/test_ixnet_api.py
index 541855aa8..afa4cc3dc 100644
--- a/yardstick/tests/unit/network_services/libs/ixia_libs/test_ixnet_api.py
+++ b/yardstick/tests/unit/network_services/libs/ixia_libs/test_ixnet_api.py
@@ -28,7 +28,8 @@ TRAFFIC_PARAMETERS = {
         'id': 1,
         'bidir': 'False',
         'duration': 60,
-        'iload': '100',
+        'rate': 10000.5,
+        'rate_unit': 'fps',
         'outer_l2': {
             'framesize': {'64B': '25', '256B': '75'}
         },
@@ -65,7 +66,8 @@ TRAFFIC_PARAMETERS = {
         'id': 2,
         'bidir': 'False',
         'duration': 60,
-        'iload': '100',
+        'rate': 75.2,
+        'rate_unit': '%',
         'outer_l2': {
             'framesize': {'128B': '35', '1024B': '65'}
         },
@@ -396,6 +398,12 @@ class TestIxNextgen(unittest.TestCase):
 
         self.assertEqual(6, len(ixnet_gen.ixnet.setMultiAttribute.mock_calls))
         self.assertEqual(4, len(mock_update_frame.mock_calls))
+        ixnet_gen.ixnet.setMultiAttribute.assert_has_calls(
+            [mock.call('cfg_element/frameRate', '-rate', 10000.5,
+                       '-type', 'framesPerSecond'),
+             mock.call('cfg_element/frameRate', '-rate', 75.2, '-type',
+                       'percentLineRate')],
+            any_order=True)
 
     def test_update_frame_flow_not_present(self):
         ixnet_gen = ixnet_api.IxNextgen()
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 55276af58..2a366fc94 100644
--- a/yardstick/tests/unit/network_services/traffic_profile/test_base.py
+++ b/yardstick/tests/unit/network_services/traffic_profile/test_base.py
@@ -82,7 +82,26 @@ class TrafficProfileConfigTestCase(unittest.TestCase):
         self.assertEqual({'64B': 100}, tp_config_obj.packet_sizes)
         self.assertEqual(base.TrafficProfileConfig.DEFAULT_SCHEMA,
                          tp_config_obj.schema)
-        self.assertEqual(base.TrafficProfileConfig.DEFAULT_FRAME_RATE,
+        self.assertEqual(float(base.TrafficProfileConfig.DEFAULT_FRAME_RATE),
                          tp_config_obj.frame_rate)
         self.assertEqual(base.TrafficProfileConfig.DEFAULT_DURATION,
                          tp_config_obj.duration)
+
+    def test__parse_rate(self):
+        tp_config = {'traffic_profile': {'packet_sizes': {'64B': 100}}}
+        tp_config_obj = base.TrafficProfileConfig(tp_config)
+        self.assertEqual((100.0, 'fps'), tp_config_obj._parse_rate('100  '))
+        self.assertEqual((200.5, 'fps'), tp_config_obj._parse_rate('200.5'))
+        self.assertEqual((300.8, 'fps'), tp_config_obj._parse_rate('300.8fps'))
+        self.assertEqual((400.2, 'fps'),
+                         tp_config_obj._parse_rate('400.2 fps'))
+        self.assertEqual((500.3, '%'), tp_config_obj._parse_rate('500.3%'))
+        self.assertEqual((600.1, '%'), tp_config_obj._parse_rate('600.1 %'))
+
+    def test__parse_rate_exception(self):
+        tp_config = {'traffic_profile': {'packet_sizes': {'64B': 100}}}
+        tp_config_obj = base.TrafficProfileConfig(tp_config)
+        with self.assertRaises(exceptions.TrafficProfileRate):
+            tp_config_obj._parse_rate('100Fps')
+        with self.assertRaises(exceptions.TrafficProfileRate):
+            tp_config_obj._parse_rate('100 kbps')