Merge "tg_rfc2544_ixia: use traffic id from JSON to update mac"

1 files changed, 5 insertions, 4 deletions

diff --git a/tests/unit/network_services/vnf_generic/vnf/test_tg_rfc2544_ixia.py b/tests/unit/network_services/vnf_generic/vnf/test_tg_rfc2544_ixia.py
index 0e303dc3b..0c3520c44 100644
--- a/tests/unit/network_services/vnf_generic/vnf/test_tg_rfc2544_ixia.py
+++ b/tests/unit/network_services/vnf_generic/vnf/test_tg_rfc2544_ixia.py
@@ -252,7 +252,7 @@ class TestIXIATrafficGen(unittest.TestCase):
         mock_traffic_profile = mock.Mock(autospec=TrafficProfile)
         mock_traffic_profile.get_traffic_definition.return_value = "64"
         mock_traffic_profile.params = self.TRAFFIC_PROFILE
-        mock_traffic_profile.ports = [0, 1]
+        mock_traffic_profile.ports = ["xe0", "xe1"]
 
         mock_ssh_instance = mock.Mock(autospec=mock_ssh.SSH)
         mock_ssh_instance.execute.return_value = 0, "", ""
@@ -348,6 +348,7 @@ class TestIXIATrafficGen(unittest.TestCase):
 
         with mock.patch('yardstick.benchmark.scenarios.networking.vnf_generic.open',
                         create=True) as mock_open:
-            mock_open.return_value = mock.MagicMock()
-            result = sut._traffic_runner(mock_traffic_profile)
-            self.assertIsNone(result)
+            with mock.patch('yardstick.network_services.vnf_generic.vnf.tg_rfc2544_ixia.open',
+                            create=True) as mock_ixia_open:
+                result = sut._traffic_runner(mock_traffic_profile)
+                self.assertIsNone(result)