summaryrefslogtreecommitdiffstats
path: root/tests/unit/benchmark/scenarios/networking
diff options
context:
space:
mode:
authorDeepak S <deepak.s@linux.intel.com>2016-12-30 09:22:51 -0800
committerDeepak S <deepak.s@linux.intel.com>2017-01-19 08:28:32 +0530
commitc1d6fd53c49a2cc5c0a7eab82e15dcf1a08f4e32 (patch)
tree9a4b38b668a106130d7485750147a3df4cd3d035 /tests/unit/benchmark/scenarios/networking
parentddb76faa5841997bd3eec4ed2f3d33f56e66d0c3 (diff)
Adding generic traffic profiles for trex traffic generator
This patch defines Generic traffic profiles - rfc2544, http etc JiRA: YARDSTICK-489 Change-Id:I0d8270b4d5f5f2d3415b98182990d8649099dbe3 Signed-off-by: Deepak S <deepak.s@linux.intel.com>
Diffstat (limited to 'tests/unit/benchmark/scenarios/networking')
-rw-r--r--tests/unit/benchmark/scenarios/networking/test_vnf_generic.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/unit/benchmark/scenarios/networking/test_vnf_generic.py b/tests/unit/benchmark/scenarios/networking/test_vnf_generic.py
index 7dfd9e3a1..540d7f214 100644
--- a/tests/unit/benchmark/scenarios/networking/test_vnf_generic.py
+++ b/tests/unit/benchmark/scenarios/networking/test_vnf_generic.py
@@ -395,8 +395,8 @@ class TestNetworkServiceTestCase(unittest.TestCase):
self._get_file_abspath("ipv4_1flow_Packets_vpe.yaml")
self.scenario_cfg["traffic_options"]["imix"] = \
self._get_file_abspath("imix_voice.yaml")
- self.assertRaises(RuntimeError, self.s._fill_traffic_profile,
- self.scenario_cfg, self.context_cfg)
+ self.assertIsNotNone(self.s._fill_traffic_profile(self.scenario_cfg,
+ self.context_cfg))
def test_teardown(self):
vnf = mock.Mock(autospec=GenericVNF)