Improve IXIA IxNetwork library and traffic profile (4)

This patch implements an active wait for the traffic injection. Once the
traffic is started, the traffic generator class will poll periodically the
IXIA traffic generator chassis to retrieve the status of the traffic
("started", "stopped").

Now the latency statistics are retrieved and reported for each injection
period.

JIRA: YARDSTICK-1116

Change-Id: I4422e2c88b4fc97b7cac3de8a82b2d75467c4117
Signed-off-by: Rodolfo Alonso Hernandez <rodolfo.alonso.hernandez@intel.com>
Signed-off-by: Emma Foley <emma.l.foley@intel.com>

diff --git a/tests/unit/__init__.py b/tests/unit/__init__.py
index 5935abb..95b2b8a 100644 (file)
--- a/tests/unit/__init__.py
+++ b/tests/unit/__init__.py
@@ -12,9 +12,15 @@
 # See the License for the specific language governing permissions and\r
 # limitations under the License.\r
 \r
-from yardstick import tests\r
+import sys\r
+\r
+import mock\r
 \r
+from yardstick import tests\r
 \r
 # NOTE(ralonsoh): to be removed. Replace all occurrences of\r
 # tests.unit.STL_MOCKS with yardstick.tests.STL_MOCKS\r
 STL_MOCKS = tests.STL_MOCKS\r
+\r
+mock_stl = mock.patch.dict(sys.modules, tests.STL_MOCKS)\r
+mock_stl.start()\r

diff --git a/yardstick/network_services/libs/ixia_libs/ixnet/ixnet_api.py b/yardstick/network_services/libs/ixia_libs/ixnet/ixnet_api.py
index a8464e9..393f60f 100644 (file)
--- a/yardstick/network_services/libs/ixia_libs/ixnet/ixnet_api.py
+++ b/yardstick/network_services/libs/ixia_libs/ixnet/ixnet_api.py
@@ -17,6 +17,7 @@ import logging
 import IxNetwork
 
 from yardstick.common import exceptions
+from yardstick.common import utils
 
 
 log = logging.getLogger(__name__)
@@ -34,6 +35,9 @@ PROTO_VLAN = 'vlan'
 IP_VERSION_4_MASK = '0.0.0.255'
 IP_VERSION_6_MASK = '0:0:0:0:0:0:0:ff'
 
+TRAFFIC_STATUS_STARTED = 'started'
+TRAFFIC_STATUS_STOPPED = 'stopped'
+
 
 # NOTE(ralonsoh): this pragma will be removed in the last patch of this series
 class IxNextgen(object):  # pragma: no cover
@@ -141,6 +145,19 @@ class IxNextgen(object):  # pragma: no cover
         raise exceptions.IxNetworkFieldNotPresentInStackItem(
             field_name=field_name, stack_item=stack_item)
 
+    def _get_traffic_state(self):
+        """Get traffic state"""
+        return self.ixnet.getAttribute(self.ixnet.getRoot() + 'traffic',
+                                       '-state')
+
+    def is_traffic_running(self):
+        """Returns true if traffic state == TRAFFIC_STATUS_STARTED"""
+        return self._get_traffic_state() == TRAFFIC_STATUS_STARTED
+
+    def is_traffic_stopped(self):
+        """Returns true if traffic state == TRAFFIC_STATUS_STOPPED"""
+        return self._get_traffic_state() == TRAFFIC_STATUS_STOPPED
+
     @staticmethod
     def _parse_framesize(framesize):
         """Parse "framesize" config param. to return a list of weighted pairs
@@ -435,15 +452,19 @@ class IxNextgen(object):  # pragma: no cover
         return stats
 
     def start_traffic(self):
-        tis = self.ixnet.getList('/traffic', 'trafficItem')
-        for ti in tis:
-            self.ixnet.execute('generate', [ti])
-            self.ixnet.execute('apply', '/traffic')
-            self.ixnet.execute('start', '/traffic')
-
-    # NOTE(ralonsoh): to be updated in next patchset
-    # pragma: no cover
-    def ix_stop_traffic(self):
-        tis = self.ixnet.getList('/traffic', 'trafficItem')
-        for _ in tis:
+        """Start the traffic injection in the traffic item
+
+        By configuration, there is only one traffic item. This function returns
+        when the traffic state is TRAFFIC_STATUS_STARTED.
+        """
+        traffic_items = self.ixnet.getList('/traffic', 'trafficItem')
+        if self.is_traffic_running():
             self.ixnet.execute('stop', '/traffic')
+            # pylint: disable=unnecessary-lambda
+            utils.wait_until_true(lambda: self.is_traffic_stopped())
+
+        self.ixnet.execute('generate', traffic_items)
+        self.ixnet.execute('apply', '/traffic')
+        self.ixnet.execute('start', '/traffic')
+        # pylint: disable=unnecessary-lambda
+        utils.wait_until_true(lambda: self.is_traffic_running())

diff --git a/yardstick/network_services/traffic_profile/base.py b/yardstick/network_services/traffic_profile/base.py
index 162bab2..9eba550 100644 (file)
--- a/yardstick/network_services/traffic_profile/base.py
+++ b/yardstick/network_services/traffic_profile/base.py
@@ -44,7 +44,7 @@ class TrafficProfile(object):
         # IMIX = {"10K": 0.1, "100M": 0.5}
         self.params = tp_config
 
-    def execute_traffic(self, traffic_generator):
+    def execute_traffic(self, traffic_generator, **kawrgs):
         """ This methods defines the behavior of the traffic generator.
         It will be called in a loop until the traffic generator exits.
 

diff --git a/yardstick/network_services/traffic_profile/ixia_rfc2544.py b/yardstick/network_services/traffic_profile/ixia_rfc2544.py
index 453c586..73806f9 100644 (file)
--- a/yardstick/network_services/traffic_profile/ixia_rfc2544.py
+++ b/yardstick/network_services/traffic_profile/ixia_rfc2544.py
@@ -12,7 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from __future__ import absolute_import
 import logging
 
 from yardstick.network_services.traffic_profile.trex_traffic_profile import \
@@ -82,12 +81,10 @@ class IXIARFC2544Profile(TrexProfile):
     def _ixia_traffic_generate(self, traffic, ixia_obj):
         for key, value in traffic.items():
             if key.startswith((self.UPLINK, self.DOWNLINK)):
-                value["iload"] = str(self.rate)
+                value['iload'] = str(self.rate)
         ixia_obj.update_frame(traffic)
         ixia_obj.update_ip_packet(traffic)
         ixia_obj.start_traffic()
-        self.tmp_drop = 0
-        self.tmp_throughput = 0
 
     def update_traffic_profile(self, traffic_generator):
         def port_generator():
@@ -105,78 +102,59 @@ class IXIARFC2544Profile(TrexProfile):
 
         self.ports = [port for port in port_generator()]
 
-    def execute_traffic(self, traffic_generator, ixia_obj, mac=None):
-        if mac is None:
-            mac = {}
+    def execute_traffic(self, traffic_generator, ixia_obj=None, mac=None):
+        mac = {} if mac is None else mac
+        first_run = self.first_run
         if self.first_run:
+            self.first_run = False
             self.full_profile = {}
             self.pg_id = 0
             self.update_traffic_profile(traffic_generator)
-            traffic = \
-                self._get_ixia_traffic_profile(self.full_profile, mac)
             self.max_rate = self.rate
             self.min_rate = 0
-            self.get_multiplier()
-            self._ixia_traffic_generate(traffic, ixia_obj)
-
-    def get_multiplier(self):
-        self.rate = round((self.max_rate + self.min_rate) / 2.0, 2)
-        multiplier = round(self.rate / self.pps, 2)
-        return str(multiplier)
+        else:
+            self.rate = round(float(self.max_rate + self.min_rate) / 2.0, 2)
 
-    def start_ixia_latency(self, traffic_generator, ixia_obj, mac=None):
-        if mac is None:
-            mac = {}
-        self.update_traffic_profile(traffic_generator)
-        traffic = \
-            self._get_ixia_traffic_profile(self.full_profile, mac)
+        traffic = self._get_ixia_traffic_profile(self.full_profile, mac)
         self._ixia_traffic_generate(traffic, ixia_obj)
+        return first_run
 
-    def get_drop_percentage(self, samples, tol_min, tolerance, ixia_obj,
-                            mac=None):
-        if mac is None:
-            mac = {}
-        status = 'Running'
+    def get_drop_percentage(self, samples, tol_min, tolerance, duration=30.0,
+                            first_run=False):
+        completed = False
         drop_percent = 100
-        in_packets = sum([samples[iface]['in_packets'] for iface in samples])
-        out_packets = sum([samples[iface]['out_packets'] for iface in samples])
-        rx_throughput = \
-            sum([samples[iface]['RxThroughput'] for iface in samples])
-        tx_throughput = \
-            sum([samples[iface]['TxThroughput'] for iface in samples])
-        packet_drop = abs(out_packets - in_packets)
+        num_ifaces = len(samples)
+        in_packets_sum = sum(
+            [samples[iface]['in_packets'] for iface in samples])
+        out_packets_sum = sum(
+            [samples[iface]['out_packets'] for iface in samples])
+        rx_throughput = sum(
+            [samples[iface]['RxThroughput'] for iface in samples])
+        rx_throughput = round(float(rx_throughput), 2)
+        tx_throughput = sum(
+            [samples[iface]['TxThroughput'] for iface in samples])
+        tx_throughput = round(float(tx_throughput), 2)
+        packet_drop = abs(out_packets_sum - in_packets_sum)
+
         try:
-            drop_percent = round((packet_drop / float(out_packets)) * 100, 2)
+            drop_percent = round(
+                (packet_drop / float(out_packets_sum)) * 100, 2)
         except ZeroDivisionError:
             LOG.info('No traffic is flowing')
-        samples['TxThroughput'] = round(tx_throughput / 1.0, 2)
-        samples['RxThroughput'] = round(rx_throughput / 1.0, 2)
-        samples['CurrentDropPercentage'] = drop_percent
-        samples['Throughput'] = self.tmp_throughput
-        samples['DropPercentage'] = self.tmp_drop
-        if drop_percent > tolerance and self.tmp_throughput == 0:
-            samples['Throughput'] = round(rx_throughput / 1.0, 2)
-            samples['DropPercentage'] = drop_percent
-        if self.first_run:
-            max_supported_rate = out_packets / 30.0
-            self.rate = max_supported_rate
-            self.first_run = False
-            if drop_percent <= tolerance:
-                status = 'Completed'
+
+        samples['TxThroughput'] = tx_throughput
+        samples['RxThroughput'] = rx_throughput
+        samples['DropPercentage'] = drop_percent
+
+        if first_run:
+            self.rate = out_packets_sum / duration / num_ifaces
+            completed = True if drop_percent <= tolerance else False
+
         if drop_percent > tolerance:
             self.max_rate = self.rate
         elif drop_percent < tol_min:
             self.min_rate = self.rate
-            if drop_percent >= self.tmp_drop:
-                self.tmp_drop = drop_percent
-                self.tmp_throughput = round((rx_throughput / 1.0), 2)
-                samples['Throughput'] = round(rx_throughput / 1.0, 2)
-                samples['DropPercentage'] = drop_percent
         else:
-            samples['Throughput'] = round(rx_throughput / 1.0, 2)
-            samples['DropPercentage'] = drop_percent
-            return status, samples
-        self.get_multiplier()
-        traffic = self._get_ixia_traffic_profile(self.full_profile, mac)
-        self._ixia_traffic_generate(traffic, ixia_obj)
-        return status, samples
+            completed = True
+
+        return completed, samples

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 deb0a80..2010546 100644 (file)
--- a/yardstick/network_services/vnf_generic/vnf/tg_rfc2544_ixia.py
+++ b/yardstick/network_services/vnf_generic/vnf/tg_rfc2544_ixia.py
@@ -12,12 +12,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import time
 import os
 import logging
 import sys
 
 from yardstick.common import exceptions
+from yardstick.common import utils
 from yardstick.network_services.vnf_generic.vnf.sample_vnf import SampleVNFTrafficGen
 from yardstick.network_services.vnf_generic.vnf.sample_vnf import ClientResourceHelper
 from yardstick.network_services.vnf_generic.vnf.sample_vnf import Rfc2544ResourceHelper
@@ -135,43 +135,28 @@ class IxiaResourceHelper(ClientResourceHelper):
             mac["src_mac_{}".format(port_num)] = virt_intf.get("local_mac", default)
             mac["dst_mac_{}".format(port_num)] = virt_intf.get("dst_mac", default)
 
-        samples = {}
-        # Generate ixia traffic config...
         try:
             while not self._terminated.value:
-                traffic_profile.execute_traffic(self, self.client, mac)
+                first_run = traffic_profile.execute_traffic(
+                    self, self.client, mac)
                 self.client_started.value = 1
-                time.sleep(WAIT_FOR_TRAFFIC)
-                self.client.ix_stop_traffic()
+                # pylint: disable=unnecessary-lambda
+                utils.wait_until_true(lambda: self.client.is_traffic_stopped())
                 samples = self.generate_samples(traffic_profile.ports)
+
+                # NOTE(ralonsoh): the traffic injection duration is fixed to 30
+                # seconds. This parameter is configurable and must be retrieved
+                # from the traffic_profile.full_profile information.
+                # Every flow must have the same duration.
+                completed, samples = traffic_profile.get_drop_percentage(
+                    samples, min_tol, max_tol, first_run=first_run)
                 self._queue.put(samples)
-                status, samples = traffic_profile.get_drop_percentage(samples, min_tol,
-                                                                      max_tol, self.client, mac)
 
-                current = samples['CurrentDropPercentage']
-                if min_tol <= current <= max_tol or status == 'Completed':
+                if completed:
                     self._terminated.value = 1
 
-            self.client.ix_stop_traffic()
-            self._queue.put(samples)
-
-            if not self.rfc_helper.is_done():
-                self._terminated.value = 1
-                return
-
-            traffic_profile.execute_traffic(self, self.client, mac)
-            for _ in range(5):
-                time.sleep(self.LATENCY_TIME_SLEEP)
-                self.client.ix_stop_traffic()
-                samples = self.generate_samples(traffic_profile.ports, 'latency', {})
-                self._queue.put(samples)
-                traffic_profile.start_ixia_latency(self, self.client, mac)
-                if self._terminated.value:
-                    break
-
-            self.client.ix_stop_traffic()
         except Exception:  # pylint: disable=broad-except
-            LOG.exception("Run Traffic terminated")
+            LOG.exception('Run Traffic terminated')
 
         self._terminated.value = 1
 

diff --git a/yardstick/tests/unit/benchmark/contexts/standalone/test_model.py b/yardstick/tests/unit/benchmark/contexts/standalone/test_model.py
index 72e684a..2cf1d92 100644 (file)
--- a/yardstick/tests/unit/benchmark/contexts/standalone/test_model.py
+++ b/yardstick/tests/unit/benchmark/contexts/standalone/test_model.py
@@ -549,5 +549,5 @@ class OvsDeployTestCase(unittest.TestCase):
                     'ovs_version': ovs_version,
                     'dpdk_version': dpdk_version,
                     'proxy': 'test_proxy'})
-            mock_execute.assert_called_once_with(cmd)
-            mock_env_get.assert_called_once_with('http_proxy', '')
+            mock_execute.assert_called_with(cmd)
+            mock_env_get.assert_called_with('http_proxy', '')

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 460728c..34afa3d 100644 (file)
--- 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
@@ -454,3 +454,59 @@ class TestIxNextgen(unittest.TestCase):
                                return_value=None):
             with self.assertRaises(exceptions.IxNetworkFlowNotPresent):
                 ixnet_gen.update_ip_packet(TRAFFIC_PARAMETERS)
+
+    @mock.patch.object(ixnet_api.IxNextgen, '_get_traffic_state')
+    def test_start_traffic(self, mock_ixnextgen_get_traffic_state):
+        ixnet_gen = ixnet_api.IxNextgen()
+        ixnet_gen._ixnet = self.ixnet
+        ixnet_gen._ixnet.getList.return_value = [0]
+
+        mock_ixnextgen_get_traffic_state.side_effect = [
+            'stopped', 'started', 'started', 'started']
+
+        result = ixnet_gen.start_traffic()
+        self.assertIsNone(result)
+        self.ixnet.getList.assert_called_once()
+        self.assertEqual(3, ixnet_gen._ixnet.execute.call_count)
+
+    @mock.patch.object(ixnet_api.IxNextgen, '_get_traffic_state')
+    def test_start_traffic_traffic_running(
+            self, mock_ixnextgen_get_traffic_state):
+        ixnet_gen = ixnet_api.IxNextgen()
+        ixnet_gen._ixnet = self.ixnet
+        ixnet_gen._ixnet.getList.return_value = [0]
+        mock_ixnextgen_get_traffic_state.side_effect = [
+            'started', 'stopped', 'started']
+
+        result = ixnet_gen.start_traffic()
+        self.assertIsNone(result)
+        self.ixnet.getList.assert_called_once()
+        self.assertEqual(4, ixnet_gen._ixnet.execute.call_count)
+
+    @mock.patch.object(ixnet_api.IxNextgen, '_get_traffic_state')
+    def test_start_traffic_wait_for_traffic_to_stop(
+            self, mock_ixnextgen_get_traffic_state):
+        ixnet_gen = ixnet_api.IxNextgen()
+        ixnet_gen._ixnet = self.ixnet
+        ixnet_gen._ixnet.getList.return_value = [0]
+        mock_ixnextgen_get_traffic_state.side_effect = [
+            'started', 'started', 'started', 'stopped', 'started']
+
+        result = ixnet_gen.start_traffic()
+        self.assertIsNone(result)
+        self.ixnet.getList.assert_called_once()
+        self.assertEqual(4, ixnet_gen._ixnet.execute.call_count)
+
+    @mock.patch.object(ixnet_api.IxNextgen, '_get_traffic_state')
+    def test_start_traffic_wait_for_traffic_start(
+            self, mock_ixnextgen_get_traffic_state):
+        ixnet_gen = ixnet_api.IxNextgen()
+        ixnet_gen._ixnet = self.ixnet
+        ixnet_gen._ixnet.getList.return_value = [0]
+        mock_ixnextgen_get_traffic_state.side_effect = [
+            'stopped', 'stopped', 'stopped', 'started']
+
+        result = ixnet_gen.start_traffic()
+        self.assertIsNone(result)
+        self.ixnet.getList.assert_called_once()
+        self.assertEqual(3, ixnet_gen._ixnet.execute.call_count)

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 3b88049..641064c 100644 (file)
--- a/yardstick/tests/unit/network_services/traffic_profile/test_base.py
+++ b/yardstick/tests/unit/network_services/traffic_profile/test_base.py
@@ -44,7 +44,7 @@ class TestTrafficProfile(unittest.TestCase):
         traffic_profile = base.TrafficProfile(self.TRAFFIC_PROFILE)
         self.assertEqual(self.TRAFFIC_PROFILE, traffic_profile.params)
 
-    def test_execute(self):
+    def test_execute_traffic(self):
         traffic_profile = base.TrafficProfile(self.TRAFFIC_PROFILE)
         self.assertRaises(NotImplementedError,
                           traffic_profile.execute_traffic, {})

diff --git a/yardstick/tests/unit/network_services/traffic_profile/test_ixia_rfc2544.py b/yardstick/tests/unit/network_services/traffic_profile/test_ixia_rfc2544.py
index a0abe2b..6b3532f 100644 (file)
--- a/yardstick/tests/unit/network_services/traffic_profile/test_ixia_rfc2544.py
+++ b/yardstick/tests/unit/network_services/traffic_profile/test_ixia_rfc2544.py
@@ -11,25 +11,14 @@
 # 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
-import mock
 
 from copy import deepcopy
 
-from yardstick.tests import STL_MOCKS
-
-STLClient = mock.MagicMock()
-stl_patch = mock.patch.dict("sys.modules", STL_MOCKS)
-stl_patch.start()
+import mock
+import unittest
 
-if stl_patch:
-    from yardstick.network_services.traffic_profile.trex_traffic_profile \
-        import TrexProfile
-    from yardstick.network_services.traffic_profile.ixia_rfc2544 import \
-        IXIARFC2544Profile
-    from yardstick.network_services.traffic_profile import ixia_rfc2544
+from yardstick.network_services.traffic_profile import ixia_rfc2544
+from yardstick.network_services.traffic_profile import trex_traffic_profile
 
 
 class TestIXIARFC2544Profile(unittest.TestCase):
@@ -52,7 +41,7 @@ class TestIXIARFC2544Profile(unittest.TestCase):
         'traffic_profile': {
             'traffic_type': 'IXIARFC2544Profile',
             'frame_rate': 100},
-        IXIARFC2544Profile.DOWNLINK: {
+        ixia_rfc2544.IXIARFC2544Profile.DOWNLINK: {
             'ipv4': {
                 'outer_l2': {
                     'framesize': {
@@ -73,7 +62,7 @@ class TestIXIARFC2544Profile(unittest.TestCase):
                 'outer_l4': {
                     'srcport': '2001',
                     'dsrport': '1234'}}},
-        IXIARFC2544Profile.UPLINK: {
+        ixia_rfc2544.IXIARFC2544Profile.UPLINK: {
             'ipv4': {
                 'outer_l2': {
                     'framesize': {
@@ -97,14 +86,15 @@ class TestIXIARFC2544Profile(unittest.TestCase):
         'schema': 'isb:traffic_profile:0.1'}
 
     def test_get_ixia_traffic_profile_error(self):
-        traffic_generator = mock.Mock(autospec=TrexProfile)
+        traffic_generator = mock.Mock(
+            autospec=trex_traffic_profile.TrexProfile)
         traffic_generator.my_ports = [0, 1]
         traffic_generator.uplink_ports = [-1]
         traffic_generator.downlink_ports = [1]
         traffic_generator.client = \
             mock.Mock(return_value=True)
         STATIC_TRAFFIC = {
-            IXIARFC2544Profile.UPLINK: {
+            ixia_rfc2544.IXIARFC2544Profile.UPLINK: {
                 "id": 1,
                 "bidir": "False",
                 "duration": 60,
@@ -143,7 +133,7 @@ class TestIXIARFC2544Profile(unittest.TestCase):
                 },
                 "traffic_type": "continuous"
             },
-            IXIARFC2544Profile.DOWNLINK: {
+            ixia_rfc2544.IXIARFC2544Profile.DOWNLINK: {
                 "id": 2,
                 "bidir": "False",
                 "duration": 60,
@@ -187,7 +177,8 @@ class TestIXIARFC2544Profile(unittest.TestCase):
         }
         ixia_rfc2544.STATIC_TRAFFIC = STATIC_TRAFFIC
 
-        r_f_c2544_profile = IXIARFC2544Profile(self.TRAFFIC_PROFILE)
+        r_f_c2544_profile = ixia_rfc2544.IXIARFC2544Profile(
+            self.TRAFFIC_PROFILE)
         r_f_c2544_profile.rate = 100
         mac = {"src_mac_0": "00:00:00:00:00:01",
                "src_mac_1": "00:00:00:00:00:02",
@@ -199,14 +190,15 @@ class TestIXIARFC2544Profile(unittest.TestCase):
         self.assertIsNotNone(result)
 
     def test_get_ixia_traffic_profile(self):
-        traffic_generator = mock.Mock(autospec=TrexProfile)
+        traffic_generator = mock.Mock(
+            autospec=trex_traffic_profile.TrexProfile)
         traffic_generator.my_ports = [0, 1]
         traffic_generator.uplink_ports = [-1]
         traffic_generator.downlink_ports = [1]
         traffic_generator.client = \
             mock.Mock(return_value=True)
         STATIC_TRAFFIC = {
-            IXIARFC2544Profile.UPLINK: {
+            ixia_rfc2544.IXIARFC2544Profile.UPLINK: {
                 "id": 1,
                 "bidir": "False",
                 "duration": 60,
@@ -246,7 +238,7 @@ class TestIXIARFC2544Profile(unittest.TestCase):
                 },
                 "traffic_type": "continuous"
             },
-            IXIARFC2544Profile.DOWNLINK: {
+            ixia_rfc2544.IXIARFC2544Profile.DOWNLINK: {
                 "id": 2,
                 "bidir": "False",
                 "duration": 60,
@@ -289,7 +281,8 @@ class TestIXIARFC2544Profile(unittest.TestCase):
         }
         ixia_rfc2544.STATIC_TRAFFIC = STATIC_TRAFFIC
 
-        r_f_c2544_profile = IXIARFC2544Profile(self.TRAFFIC_PROFILE)
+        r_f_c2544_profile = ixia_rfc2544.IXIARFC2544Profile(
+            self.TRAFFIC_PROFILE)
         r_f_c2544_profile.rate = 100
         mac = {"src_mac_0": "00:00:00:00:00:01",
                "src_mac_1": "00:00:00:00:00:02",
@@ -302,14 +295,15 @@ class TestIXIARFC2544Profile(unittest.TestCase):
 
     @mock.patch("yardstick.network_services.traffic_profile.ixia_rfc2544.open")
     def test_get_ixia_traffic_profile_v6(self, *args):
-        traffic_generator = mock.Mock(autospec=TrexProfile)
+        traffic_generator = mock.Mock(
+            autospec=trex_traffic_profile.TrexProfile)
         traffic_generator.my_ports = [0, 1]
         traffic_generator.uplink_ports = [-1]
         traffic_generator.downlink_ports = [1]
         traffic_generator.client = \
             mock.Mock(return_value=True)
         STATIC_TRAFFIC = {
-            IXIARFC2544Profile.UPLINK: {
+            ixia_rfc2544.IXIARFC2544Profile.UPLINK: {
                 "id": 1,
                 "bidir": "False",
                 "duration": 60,
@@ -348,7 +342,7 @@ class TestIXIARFC2544Profile(unittest.TestCase):
                 },
                 "traffic_type": "continuous"
             },
-            IXIARFC2544Profile.DOWNLINK: {
+            ixia_rfc2544.IXIARFC2544Profile.DOWNLINK: {
                 "id": 2,
                 "bidir": "False",
                 "duration": 60,
@@ -392,7 +386,8 @@ class TestIXIARFC2544Profile(unittest.TestCase):
         }
         ixia_rfc2544.STATIC_TRAFFIC = STATIC_TRAFFIC
 
-        r_f_c2544_profile = IXIARFC2544Profile(self.TRAFFIC_PROFILE)
+        r_f_c2544_profile = ixia_rfc2544.IXIARFC2544Profile(
+            self.TRAFFIC_PROFILE)
         r_f_c2544_profile.rate = 100
         mac = {"src_mac_0": "00:00:00:00:00:01",
                "src_mac_1": "00:00:00:00:00:02",
@@ -405,7 +400,7 @@ class TestIXIARFC2544Profile(unittest.TestCase):
                         'traffic_profile':
                         {'traffic_type': 'IXIARFC2544Profile',
                          'frame_rate': 100},
-                        IXIARFC2544Profile.DOWNLINK:
+                        ixia_rfc2544.IXIARFC2544Profile.DOWNLINK:
                         {'ipv4':
                          {'outer_l2': {'framesize':
                                        {'64B': '100', '1518B': '0',
@@ -422,7 +417,7 @@ class TestIXIARFC2544Profile(unittest.TestCase):
                                          'dscp': 0, 'ttl': 32},
                           'outer_l4': {'srcport': '2001',
                                        'dsrport': '1234'}}},
-                        IXIARFC2544Profile.UPLINK: {'ipv4':
+                        ixia_rfc2544.IXIARFC2544Profile.UPLINK: {'ipv4':
                                                     {'outer_l2': {'framesize':
                                                                   {'64B': '100', '1518B': '0',
                                                                    '128B': '0', '1400B': '0',
@@ -446,51 +441,75 @@ class TestIXIARFC2544Profile(unittest.TestCase):
         self.assertIsNotNone(result)
 
     def test__get_ixia_traffic_profile_default_args(self):
-        r_f_c2544_profile = IXIARFC2544Profile(self.TRAFFIC_PROFILE)
+        r_f_c2544_profile = ixia_rfc2544.IXIARFC2544Profile(
+            self.TRAFFIC_PROFILE)
 
         expected = {}
         result = r_f_c2544_profile._get_ixia_traffic_profile({})
         self.assertDictEqual(result, expected)
 
     def test__ixia_traffic_generate(self):
-        traffic_generator = mock.Mock(autospec=TrexProfile)
+        traffic_generator = mock.Mock(
+            autospec=trex_traffic_profile.TrexProfile)
         traffic_generator.networks = {
             "uplink_0": ["xe0"],
             "downlink_0": ["xe1"],
         }
         traffic_generator.client = \
             mock.Mock(return_value=True)
-        traffic = {IXIARFC2544Profile.DOWNLINK: {'iload': 10},
-                   IXIARFC2544Profile.UPLINK: {'iload': 10}}
+        traffic = {ixia_rfc2544.IXIARFC2544Profile.DOWNLINK: {'iload': 10},
+                   ixia_rfc2544.IXIARFC2544Profile.UPLINK: {'iload': 10}}
         ixia_obj = mock.MagicMock()
-        r_f_c2544_profile = IXIARFC2544Profile(self.TRAFFIC_PROFILE)
+        r_f_c2544_profile = ixia_rfc2544.IXIARFC2544Profile(
+            self.TRAFFIC_PROFILE)
         r_f_c2544_profile.rate = 100
         result = r_f_c2544_profile._ixia_traffic_generate(traffic, ixia_obj)
         self.assertIsNone(result)
 
-    def test_execute(self):
-        traffic_generator = mock.Mock(autospec=TrexProfile)
-        traffic_generator.networks = {
-            "uplink_0": ["xe0"],
-            "downlink_0": ["xe1"],
-        }
-        traffic_generator.client = \
-            mock.Mock(return_value=True)
-        r_f_c2544_profile = IXIARFC2544Profile(self.TRAFFIC_PROFILE)
-        r_f_c2544_profile.first_run = True
-        r_f_c2544_profile.params = {IXIARFC2544Profile.DOWNLINK: {'iload': 10},
-                                    IXIARFC2544Profile.UPLINK: {'iload': 10}}
+    def test_execute_traffic_first_run(self):
+        rfc2544_profile = ixia_rfc2544.IXIARFC2544Profile(self.TRAFFIC_PROFILE)
+        rfc2544_profile.first_run = True
+        rfc2544_profile.rate = 50
+        with mock.patch.object(rfc2544_profile, '_get_ixia_traffic_profile') \
+                as mock_get_tp, \
+                mock.patch.object(rfc2544_profile, '_ixia_traffic_generate') \
+                as mock_tgenerate, \
+                mock.patch.object(rfc2544_profile, 'update_traffic_profile') \
+                as mock_update_tp:
+            mock_get_tp.return_value = 'fake_tprofile'
+            output = rfc2544_profile.execute_traffic(mock.ANY,
+                                                     ixia_obj=mock.ANY)
 
-        r_f_c2544_profile.get_streams = mock.Mock()
-        r_f_c2544_profile.full_profile = {}
-        r_f_c2544_profile._get_ixia_traffic_profile = mock.Mock()
-        r_f_c2544_profile.get_multiplier = mock.Mock()
-        r_f_c2544_profile._ixia_traffic_generate = mock.Mock()
-        ixia_obj = mock.MagicMock()
-        self.assertIsNone(r_f_c2544_profile.execute_traffic(traffic_generator, ixia_obj))
+        self.assertTrue(output)
+        self.assertFalse(rfc2544_profile.first_run)
+        self.assertEqual(50, rfc2544_profile.max_rate)
+        self.assertEqual(0, rfc2544_profile.min_rate)
+        mock_get_tp.assert_called_once()
+        mock_tgenerate.assert_called_once()
+        mock_update_tp.assert_called_once()
+
+    def test_execute_traffic_not_first_run(self):
+        rfc2544_profile = ixia_rfc2544.IXIARFC2544Profile(self.TRAFFIC_PROFILE)
+        rfc2544_profile.first_run = False
+        rfc2544_profile.max_rate = 70
+        rfc2544_profile.min_rate = 0
+        with mock.patch.object(rfc2544_profile, '_get_ixia_traffic_profile') \
+                as mock_get_tp, \
+                mock.patch.object(rfc2544_profile, '_ixia_traffic_generate') \
+                as mock_tgenerate:
+            mock_get_tp.return_value = 'fake_tprofile'
+            rfc2544_profile.full_profile = mock.ANY
+            output = rfc2544_profile.execute_traffic(mock.ANY,
+                                                     ixia_obj=mock.ANY)
+
+        self.assertFalse(output)
+        self.assertEqual(35.0, rfc2544_profile.rate)
+        mock_get_tp.assert_called_once()
+        mock_tgenerate.assert_called_once()
 
     def test_update_traffic_profile(self):
-        traffic_generator = mock.Mock(autospec=TrexProfile)
+        traffic_generator = mock.Mock(
+            autospec=trex_traffic_profile.TrexProfile)
         traffic_generator.networks = {
             "uplink_0": ["xe0"],  # private, one value for intfs
             "downlink_0": ["xe1", "xe2"],  # public, two values for intfs
@@ -508,7 +527,7 @@ class TestIXIARFC2544Profile(unittest.TestCase):
             "downlink_0": ["xe1", "xe2"],
         })
 
-        r_f_c2544_profile = IXIARFC2544Profile(traffic_profile)
+        r_f_c2544_profile = ixia_rfc2544.IXIARFC2544Profile(traffic_profile)
         r_f_c2544_profile.full_profile = {}
         r_f_c2544_profile.get_streams = mock.Mock()
 
@@ -516,112 +535,89 @@ class TestIXIARFC2544Profile(unittest.TestCase):
             r_f_c2544_profile.update_traffic_profile(traffic_generator))
         self.assertEqual(r_f_c2544_profile.ports, ports_expected)
 
-    def test_get_drop_percentage(self):
-        r_f_c2544_profile = IXIARFC2544Profile(self.TRAFFIC_PROFILE)
-        r_f_c2544_profile.params = self.PROFILE
-        ixia_obj = mock.MagicMock()
-        r_f_c2544_profile.execute = mock.Mock()
-        r_f_c2544_profile._get_ixia_traffic_profile = mock.Mock()
-        r_f_c2544_profile._ixia_traffic_generate = mock.Mock()
-        r_f_c2544_profile.get_multiplier = mock.Mock()
-        r_f_c2544_profile.tmp_throughput = 0
-        r_f_c2544_profile.tmp_drop = 0
-        r_f_c2544_profile.full_profile = {}
-        samples = {}
-        for ifname in range(1):
-            name = "xe{}".format(ifname)
-            samples[name] = {"rx_throughput_fps": 20,
-                             "tx_throughput_fps": 20,
-                             "rx_throughput_mbps": 10,
-                             "tx_throughput_mbps": 10,
-                             "RxThroughput": 10,
-                             "TxThroughput": 10,
-                             "in_packets": 1000,
-                             "out_packets": 1000}
-        tol_min = 100.0
-        tolerance = 0.0
-        self.assertIsNotNone(
-            r_f_c2544_profile.get_drop_percentage(samples, tol_min, tolerance,
-                                                  ixia_obj))
+    def test_get_drop_percentage_completed(self):
+        samples = {'iface_name_1':
+                       {'RxThroughput': 10, 'TxThroughput': 10,
+                        'in_packets': 1000, 'out_packets': 1000},
+                   'iface_name_2':
+                       {'RxThroughput': 11, 'TxThroughput': 13,
+                        'in_packets': 1005, 'out_packets': 1007}
+                   }
+        rfc2544_profile = ixia_rfc2544.IXIARFC2544Profile(self.TRAFFIC_PROFILE)
+        completed, samples = rfc2544_profile.get_drop_percentage(samples, 0, 1)
+        self.assertTrue(completed)
+        self.assertEqual(23.0, samples['TxThroughput'])
+        self.assertEqual(21.0, samples['RxThroughput'])
+        self.assertEqual(0.1, samples['DropPercentage'])
 
-    def test_get_drop_percentage_update(self):
-        r_f_c2544_profile = IXIARFC2544Profile(self.TRAFFIC_PROFILE)
-        r_f_c2544_profile.params = self.PROFILE
-        ixia_obj = mock.MagicMock()
-        r_f_c2544_profile.execute = mock.Mock()
-        r_f_c2544_profile._get_ixia_traffic_profile = mock.Mock()
-        r_f_c2544_profile._ixia_traffic_generate = mock.Mock()
-        r_f_c2544_profile.get_multiplier = mock.Mock()
-        r_f_c2544_profile.tmp_throughput = 0
-        r_f_c2544_profile.tmp_drop = 0
-        r_f_c2544_profile.full_profile = {}
-        samples = {}
-        for ifname in range(1):
-            name = "xe{}".format(ifname)
-            samples[name] = {"rx_throughput_fps": 20,
-                             "tx_throughput_fps": 20,
-                             "rx_throughput_mbps": 10,
-                             "tx_throughput_mbps": 10,
-                             "RxThroughput": 10,
-                             "TxThroughput": 10,
-                             "in_packets": 1000,
-                             "out_packets": 1002}
-        tol_min = 0.0
-        tolerance = 1.0
-        self.assertIsNotNone(
-            r_f_c2544_profile.get_drop_percentage(samples, tol_min, tolerance,
-                                                  ixia_obj))
+    def test_get_drop_percentage_over_drop_percentage(self):
+        samples = {'iface_name_1':
+                       {'RxThroughput': 10, 'TxThroughput': 10,
+                        'in_packets': 1000, 'out_packets': 1000},
+                   'iface_name_2':
+                       {'RxThroughput': 11, 'TxThroughput': 13,
+                        'in_packets': 1005, 'out_packets': 1007}
+                   }
+        rfc2544_profile = ixia_rfc2544.IXIARFC2544Profile(self.TRAFFIC_PROFILE)
+        rfc2544_profile.rate = 1000
+        completed, samples = rfc2544_profile.get_drop_percentage(
+            samples, 0, 0.05)
+        self.assertFalse(completed)
+        self.assertEqual(23.0, samples['TxThroughput'])
+        self.assertEqual(21.0, samples['RxThroughput'])
+        self.assertEqual(0.1, samples['DropPercentage'])
+        self.assertEqual(rfc2544_profile.rate, rfc2544_profile.max_rate)
 
-    def test_get_drop_percentage_div_zero(self):
-        r_f_c2544_profile = IXIARFC2544Profile(self.TRAFFIC_PROFILE)
-        r_f_c2544_profile.params = self.PROFILE
-        ixia_obj = mock.MagicMock()
-        r_f_c2544_profile.execute = mock.Mock()
-        r_f_c2544_profile._get_ixia_traffic_profile = mock.Mock()
-        r_f_c2544_profile._ixia_traffic_generate = mock.Mock()
-        r_f_c2544_profile.get_multiplier = mock.Mock()
-        r_f_c2544_profile.tmp_throughput = 0
-        r_f_c2544_profile.tmp_drop = 0
-        r_f_c2544_profile.full_profile = {}
-        samples = {}
-        for ifname in range(1):
-            name = "xe{}".format(ifname)
-            samples[name] = {"rx_throughput_fps": 20,
-                             "tx_throughput_fps": 20,
-                             "rx_throughput_mbps": 10,
-                             "tx_throughput_mbps": 10,
-                             "RxThroughput": 10,
-                             "TxThroughput": 10,
-                             "in_packets": 1000,
-                             "out_packets": 0}
-        tol_min = 0.0
-        tolerance = 0.0
-        r_f_c2544_profile.tmp_throughput = 0
-        self.assertIsNotNone(
-            r_f_c2544_profile.get_drop_percentage(samples, tol_min, tolerance,
-                                                  ixia_obj))
+    def test_get_drop_percentage_under_drop_percentage(self):
+        samples = {'iface_name_1':
+                       {'RxThroughput': 10, 'TxThroughput': 10,
+                        'in_packets': 1000, 'out_packets': 1000},
+                   'iface_name_2':
+                       {'RxThroughput': 11, 'TxThroughput': 13,
+                        'in_packets': 1005, 'out_packets': 1007}
+                   }
+        rfc2544_profile = ixia_rfc2544.IXIARFC2544Profile(self.TRAFFIC_PROFILE)
+        rfc2544_profile.rate = 1000
+        completed, samples = rfc2544_profile.get_drop_percentage(
+            samples, 0.2, 1)
+        self.assertFalse(completed)
+        self.assertEqual(23.0, samples['TxThroughput'])
+        self.assertEqual(21.0, samples['RxThroughput'])
+        self.assertEqual(0.1, samples['DropPercentage'])
+        self.assertEqual(rfc2544_profile.rate, rfc2544_profile.min_rate)
 
-    def test_get_multiplier(self):
-        r_f_c2544_profile = IXIARFC2544Profile(self.TRAFFIC_PROFILE)
-        r_f_c2544_profile.max_rate = 100
-        r_f_c2544_profile.min_rate = 100
-        self.assertEqual("1.0", r_f_c2544_profile.get_multiplier())
+    @mock.patch.object(ixia_rfc2544.LOG, 'info')
+    def test_get_drop_percentage_not_flow(self, *args):
+        samples = {'iface_name_1':
+                       {'RxThroughput': 0, 'TxThroughput': 10,
+                        'in_packets': 1000, 'out_packets': 0},
+                   'iface_name_2':
+                       {'RxThroughput': 0, 'TxThroughput': 13,
+                        'in_packets': 1005, 'out_packets': 0}
+                   }
+        rfc2544_profile = ixia_rfc2544.IXIARFC2544Profile(self.TRAFFIC_PROFILE)
+        rfc2544_profile.rate = 1000
+        completed, samples = rfc2544_profile.get_drop_percentage(
+            samples, 0.2, 1)
+        self.assertFalse(completed)
+        self.assertEqual(23.0, samples['TxThroughput'])
+        self.assertEqual(0, samples['RxThroughput'])
+        self.assertEqual(100, samples['DropPercentage'])
+        self.assertEqual(rfc2544_profile.rate, rfc2544_profile.max_rate)
 
-    def test_start_ixia_latency(self):
-        traffic_generator = mock.Mock(autospec=TrexProfile)
-        traffic_generator.networks = {
-            "uplink_0": ["xe0"],
-            "downlink_0": ["xe1"],
-        }
-        traffic_generator.client = \
-            mock.Mock(return_value=True)
-        r_f_c2544_profile = IXIARFC2544Profile(self.TRAFFIC_PROFILE)
-        r_f_c2544_profile.max_rate = 100
-        r_f_c2544_profile.min_rate = 100
-        ixia_obj = mock.MagicMock()
-        r_f_c2544_profile._get_ixia_traffic_profile = \
-            mock.Mock(return_value={})
-        r_f_c2544_profile.full_profile = {}
-        r_f_c2544_profile._ixia_traffic_generate = mock.Mock()
-        self.assertIsNone(
-            r_f_c2544_profile.start_ixia_latency(traffic_generator, ixia_obj))
+    def test_get_drop_percentage_first_run(self):
+        samples = {'iface_name_1':
+                       {'RxThroughput': 10, 'TxThroughput': 10,
+                        'in_packets': 1000, 'out_packets': 1000},
+                   'iface_name_2':
+                       {'RxThroughput': 11, 'TxThroughput': 13,
+                        'in_packets': 1005, 'out_packets': 1007}
+                   }
+        rfc2544_profile = ixia_rfc2544.IXIARFC2544Profile(self.TRAFFIC_PROFILE)
+        completed, samples = rfc2544_profile.get_drop_percentage(
+            samples, 0, 1, first_run=True)
+        self.assertTrue(completed)
+        self.assertEqual(23.0, samples['TxThroughput'])
+        self.assertEqual(21.0, samples['RxThroughput'])
+        self.assertEqual(0.1, samples['DropPercentage'])
+        self.assertEqual(33.45, rfc2544_profile.rate)

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 e79461b..956c192 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
@@ -30,7 +30,8 @@ NAME = "tg__1"
 class TestIxiaResourceHelper(unittest.TestCase):
 
     def setUp(self):
-        self._mock_IxNextgen = mock.patch.object(tg_rfc2544_ixia, 'IxNextgen')
+        self._mock_IxNextgen = mock.patch.object(tg_rfc2544_ixia,
+                                                 'IxNextgen')
         self.mock_IxNextgen = self._mock_IxNextgen.start()
         self.addCleanup(self._stop_mocks)
 
@@ -54,13 +55,19 @@ class TestIxiaResourceHelper(unittest.TestCase):
         ixia_resource_helper.stop_collect()
         self.assertEqual(mock_client.ix_stop_traffic.call_count, 1)
 
-    # NOTE(ralonsoh): to be updated in next patchset
-    def test__initialise_client(self):
-        pass
-
-    # NOTE(ralonsoh): to be updated in next patchset
     def test_run_traffic(self):
-        pass
+        mock_tprofile = mock.Mock()
+        mock_tprofile.get_drop_percentage.return_value = True, 'fake_samples'
+        ixia_rhelper = tg_rfc2544_ixia.IxiaResourceHelper(mock.Mock())
+        ixia_rhelper.rfc_helper = mock.Mock()
+        ixia_rhelper.vnfd_helper = mock.Mock()
+        ixia_rhelper.vnfd_helper.port_pairs.all_ports = []
+        with mock.patch.object(ixia_rhelper, 'generate_samples'), \
+                mock.patch.object(ixia_rhelper, '_build_ports'), \
+                mock.patch.object(ixia_rhelper, '_initialize_client'):
+            ixia_rhelper.run_traffic(mock_tprofile)
+
+        self.assertEqual('fake_samples', ixia_rhelper._queue.get())
 
 
 @mock.patch(
@@ -254,8 +261,6 @@ class TestIXIATrafficGen(unittest.TestCase):
         sut = tg_rfc2544_ixia.IxiaTrafficGen('vnf1', vnfd)
         sut._check_status()
 
-    @mock.patch(
-        "yardstick.network_services.vnf_generic.vnf.tg_rfc2544_ixia.time")
     @mock.patch("yardstick.ssh.SSH")
     def test_traffic_runner(self, mock_ssh, *args):
         mock_traffic_profile = mock.Mock(autospec=tp_base.TrafficProfile)