diff options
| author |   Ross Brattain <ross.b.brattain@intel.com> | 2017-09-21 15:01:01 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-09-21 15:01:01 +0000 |
| commit | 4529399c79b1e61ea37cb79e790adc130c98cf45 (patch) | |
| tree | c534015d4409a9d60c66191335fc336dce00a6cd /tests/unit/network_services/vnf_generic | |
| parent | b00112e33caffee6b6b01402537e68007fdc8cb2 (diff) | |
| parent | 133f90ad75679ce0c51b9c1b714ee1039928c896 (diff) | |
Merge "tg_rfc2544_ixia: use traffic id from JSON to update mac"
Diffstat (limited to 'tests/unit/network_services/vnf_generic')
| -rw-r--r-- | tests/unit/network_services/vnf_generic/vnf/test_tg_rfc2544_ixia.py | 9 |
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) |