From 851419fe355e1e3323ec03a7bc8e3085094e4f86 Mon Sep 17 00:00:00 2001 From: Rodolfo Alonso Hernandez Date: Wed, 23 May 2018 18:03:19 +0100 Subject: Make injection time configurable for IXIA RFC2544 test cases JIRA: YARDSTICK-1196 Change-Id: I77b4772b9224ff5cd21fd9fc67eb7e4b821fcf77 Signed-off-by: Rodolfo Alonso Hernandez --- .../tests/unit/network_services/libs/ixia_libs/test_ixnet_api.py | 4 ++-- .../tests/unit/network_services/traffic_profile/test_base.py | 9 +++++++-- 2 files changed, 9 insertions(+), 4 deletions(-) (limited to 'yardstick/tests') 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 dd43a64a5..2327d1ac8 100644 --- 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 @@ -367,7 +367,7 @@ class TestIxNextgen(unittest.TestCase): mock_get_stack_item: mock_get_stack_item.side_effect = [['item1'], ['item2'], ['item3'], ['item4']] - ixnet_gen.update_frame(TRAFFIC_PARAMETERS) + ixnet_gen.update_frame(TRAFFIC_PARAMETERS, 50) self.assertEqual(6, len(ixnet_gen.ixnet.setMultiAttribute.mock_calls)) self.assertEqual(4, len(mock_update_frame.mock_calls)) @@ -385,7 +385,7 @@ class TestIxNextgen(unittest.TestCase): ixnet_gen, '_get_config_element_by_flow_group_name', return_value=None): with self.assertRaises(exceptions.IxNetworkFlowNotPresent): - ixnet_gen.update_frame(TRAFFIC_PARAMETERS) + ixnet_gen.update_frame(TRAFFIC_PARAMETERS, 40) def test_get_statistics(self): ixnet_gen = ixnet_api.IxNextgen() 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 2a366fc94..0dc3e0579 100644 --- a/yardstick/tests/unit/network_services/traffic_profile/test_base.py +++ b/yardstick/tests/unit/network_services/traffic_profile/test_base.py @@ -80,12 +80,17 @@ class TrafficProfileConfigTestCase(unittest.TestCase): tp_config = {'traffic_profile': {'packet_sizes': {'64B': 100}}} tp_config_obj = base.TrafficProfileConfig(tp_config) self.assertEqual({'64B': 100}, tp_config_obj.packet_sizes) + self.assertEqual(base.TrafficProfileConfig.DEFAULT_DURATION, + tp_config_obj.duration) + + def test__init_set_duration(self): + tp_config = {'traffic_profile': {'duration': 15}} + tp_config_obj = base.TrafficProfileConfig(tp_config) self.assertEqual(base.TrafficProfileConfig.DEFAULT_SCHEMA, tp_config_obj.schema) self.assertEqual(float(base.TrafficProfileConfig.DEFAULT_FRAME_RATE), tp_config_obj.frame_rate) - self.assertEqual(base.TrafficProfileConfig.DEFAULT_DURATION, - tp_config_obj.duration) + self.assertEqual(15, tp_config_obj.duration) def test__parse_rate(self): tp_config = {'traffic_profile': {'packet_sizes': {'64B': 100}}} -- cgit 1.2.3-korg