Fix minor issues with IxNet L3 rfc2544

Changed default rate from 100pps to 100%.
Set Ip mask to 32

JIRA: YARDSTICK-1566

Change-Id: I4c0245297b2d6b254c06155047c3499f6572e9c5
Signed-off-by: Chornyi, TarasX <tarasx.chornyi@intel.com>

diff --git a/samples/vnf_samples/traffic_profiles/ixia_ipv4_latency_L3.yaml b/samples/vnf_samples/traffic_profiles/ixia_ipv4_latency_L3.yaml
index e7221b1..d1abcaf 100644 (file)
--- a/samples/vnf_samples/traffic_profiles/ixia_ipv4_latency_L3.yaml
+++ b/samples/vnf_samples/traffic_profiles/ixia_ipv4_latency_L3.yaml
@@ -23,7 +23,7 @@ name:            rfc2544
 description:     Traffic profile to run RFC2544 latency with L3 support
 traffic_profile:
   traffic_type : IXIARFC2544Profile # defines traffic behavior - constant or look for highest possible throughput
-  frame_rate : 100  # pc of linerate
+  frame_rate : 100%  # pc of linerate
   duration: {{ duration }}
   enable_latency: True
 

diff --git a/yardstick/network_services/vnf_generic/vnf/tg_rfc2544_ixia.py b/yardstick/network_services/vnf_generic/vnf/tg_rfc2544_ixia.py
index 4d6bd42..4fbbf6a 100644 (file)
--- a/yardstick/network_services/vnf_generic/vnf/tg_rfc2544_ixia.py
+++ b/yardstick/network_services/vnf_generic/vnf/tg_rfc2544_ixia.py
@@ -77,7 +77,7 @@ class IxiaL3Scenario(IxiaBasicScenario):
                 iprange = self.ixia_cfg['flow'].get('src_ip')[index]
                 start_ip = utils.get_ip_range_start(iprange)
                 count = utils.get_ip_range_count(iprange)
-                self.client.add_static_ipv4(intf, vport, start_ip, count)
+                self.client.add_static_ipv4(intf, vport, start_ip, count, '32')
             except IndexError:
                 raise exceptions.IncorrectFlowOption(
                     option="src_ip", link="uplink_{}".format(index))
@@ -87,7 +87,7 @@ class IxiaL3Scenario(IxiaBasicScenario):
                 iprange = self.ixia_cfg['flow'].get('dst_ip')[index]
                 start_ip = utils.get_ip_range_start(iprange)
                 count = utils.get_ip_range_count(iprange)
-                self.client.add_static_ipv4(intf, vport, start_ip, count)
+                self.client.add_static_ipv4(intf, vport, start_ip, count, '32')
             except IndexError:
                 raise exceptions.IncorrectFlowOption(
                     option="dst_ip", link="downlink_{}".format(index))

diff --git a/yardstick/tests/unit/network_services/vnf_generic/vnf/test_tg_rfc2544_ixia.py b/yardstick/tests/unit/network_services/vnf_generic/vnf/test_tg_rfc2544_ixia.py
index 7247ee8..ab7a6a8 100644 (file)
--- a/yardstick/tests/unit/network_services/vnf_generic/vnf/test_tg_rfc2544_ixia.py
+++ b/yardstick/tests/unit/network_services/vnf_generic/vnf/test_tg_rfc2544_ixia.py
@@ -537,9 +537,9 @@ class TestIxiaL3Scenario(TestIxiaBasicScenario):
         self.mock_IxNextgen.get_static_interface.assert_any_call('2')
 
         self.scenario.client.add_static_ipv4.assert_any_call(
-            'intf1', '1', '192.168.0.1', 49)
+            'intf1', '1', '192.168.0.1', 49, '32')
         self.scenario.client.add_static_ipv4.assert_any_call(
-            'intf2', '2', '192.168.1.1', 149)
+            'intf2', '2', '192.168.1.1', 149, '32')
 
     def test__add_interfaces(self):
         self.mock_IxNextgen.get_vports.return_value = ['1', '2']