Merge "Allow to see steady state status in the yardstick logs"

[yardstick.git] / yardstick / tests / unit / network_services / vnf_generic / vnf / test_tg_rfc2544_trex.py

diff --git a/yardstick/tests/unit/network_services/vnf_generic/vnf/test_tg_rfc2544_trex.py b/yardstick/tests/unit/network_services/vnf_generic/vnf/test_tg_rfc2544_trex.py
index 4d3e4ff..a5b9f25 100644 (file)
--- a/yardstick/tests/unit/network_services/vnf_generic/vnf/test_tg_rfc2544_trex.py
+++ b/yardstick/tests/unit/network_services/vnf_generic/vnf/test_tg_rfc2544_trex.py
@@ -15,10 +15,11 @@
 import mock
 import unittest
 
+from yardstick.benchmark import contexts
+from yardstick.benchmark.contexts import base as ctx_base
 from yardstick.network_services.traffic_profile import base as tp_base
 from yardstick.network_services.vnf_generic.vnf import sample_vnf
 from yardstick.network_services.vnf_generic.vnf import tg_rfc2544_trex
-from yardstick.benchmark.contexts import base as ctx_base
 
 
 class TestTrexRfcResouceHelper(unittest.TestCase):
@@ -29,13 +30,14 @@ class TestTrexRfcResouceHelper(unittest.TestCase):
         mock_traffic_profile.config.duration = 3
         mock_traffic_profile.execute_traffic.return_value = ('fake_ports',
                                                              'port_pg_id_map')
-        mock_traffic_profile.get_drop_percentage.return_value = 'percentage'
+        mock_traffic_profile.get_drop_percentage.return_value = (True,
+                                                                 'percentage')
         rfc_rh = tg_rfc2544_trex.TrexRfcResourceHelper(mock_setup_helper)
         rfc_rh.TRANSIENT_PERIOD = 0
         rfc_rh.rfc2544_helper = mock.Mock()
 
         with mock.patch.object(rfc_rh, '_get_samples') as mock_get_samples:
-            rfc_rh._run_traffic_once(mock_traffic_profile)
+            self.assertTrue(rfc_rh._run_traffic_once(mock_traffic_profile))
 
         mock_traffic_profile.execute_traffic.assert_called_once_with(rfc_rh)
         mock_traffic_profile.stop_traffic.assert_called_once_with(rfc_rh)
@@ -206,7 +208,7 @@ class TestTrexTrafficGenRFC(unittest.TestCase):
         ],
         'context': {
             'nfvi_type': 'baremetal',
-            'type': 'Node',
+            'type': contexts.CONTEXT_NODE,
             'name': 'yardstick',
             'file': '/etc/yardstick/nodes/pod.yaml',
         },
@@ -222,12 +224,14 @@ class TestTrexTrafficGenRFC(unittest.TestCase):
         self._mock_ssh_helper.stop()
 
     def test___init__(self):
-        trex_traffic_gen = tg_rfc2544_trex.TrexTrafficGenRFC('vnf1', self.VNFD_0)
+        trex_traffic_gen = tg_rfc2544_trex.TrexTrafficGenRFC(
+            'vnf1', self.VNFD_0, 'task_id')
         self.assertIsNotNone(trex_traffic_gen.resource_helper._terminated.value)
 
     @mock.patch.object(ctx_base.Context, 'get_physical_node_from_server', return_value='mock_node')
     def test_collect_kpi(self, *args):
-        trex_traffic_gen = tg_rfc2544_trex.TrexTrafficGenRFC('vnf1', self.VNFD_0)
+        trex_traffic_gen = tg_rfc2544_trex.TrexTrafficGenRFC(
+            'vnf1', self.VNFD_0, 'task_id')
         trex_traffic_gen.scenario_helper.scenario_cfg = {
             'nodes': {trex_traffic_gen.name: "mock"}
         }
@@ -243,7 +247,8 @@ class TestTrexTrafficGenRFC(unittest.TestCase):
         mock_traffic_profile.get_traffic_definition.return_value = "64"
         mock_traffic_profile.params = self.TRAFFIC_PROFILE
 
-        trex_traffic_gen = tg_rfc2544_trex.TrexTrafficGenRFC('vnf1', self.VNFD_0)
+        trex_traffic_gen = tg_rfc2544_trex.TrexTrafficGenRFC(
+            'vnf1', self.VNFD_0, 'task_id')
         trex_traffic_gen._start_server = mock.Mock(return_value=0)
         trex_traffic_gen.resource_helper = mock.MagicMock()
         trex_traffic_gen.setup_helper.setup_vnf_environment = mock.MagicMock()
@@ -278,7 +283,8 @@ class TestTrexTrafficGenRFC(unittest.TestCase):
         mock_traffic_profile.get_traffic_definition.return_value = "64"
         mock_traffic_profile.params = self.TRAFFIC_PROFILE
 
-        trex_traffic_gen = tg_rfc2544_trex.TrexTrafficGenRFC('vnf1', self.VNFD_0)
+        trex_traffic_gen = tg_rfc2544_trex.TrexTrafficGenRFC(
+            'vnf1', self.VNFD_0, 'task_id')
         trex_traffic_gen.resource_helper = mock.MagicMock()
         trex_traffic_gen.setup_helper.setup_vnf_environment = mock.MagicMock()
         scenario_cfg = {