diff options
5 files changed, 29 insertions, 21 deletions
diff --git a/yardstick/benchmark/scenarios/networking/vtc_instantiation_validation.py b/yardstick/benchmark/scenarios/networking/vtc_instantiation_validation.py index 509fa847b..bec23fc52 100644 --- a/yardstick/benchmark/scenarios/networking/vtc_instantiation_validation.py +++ b/yardstick/benchmark/scenarios/networking/vtc_instantiation_validation.py @@ -72,8 +72,9 @@ class VtcInstantiationValidation(base.Scenario): test_case['params']['vlan_receiver'] = \ str(self.options['vlan_receiver']) + res = dict() try: - result = api.FrameworkApi.execute_framework( + res = api.FrameworkApi.execute_framework( [test_case], iterations, heat_template, @@ -82,4 +83,5 @@ class VtcInstantiationValidation(base.Scenario): openstack_credentials) except Exception as e: LOG.info('Exception: {}'.format(e.message)) - LOG.info('Got output: {}'.format(result)) + LOG.info('Got output: {}'.format(res)) + result.update(res) diff --git a/yardstick/benchmark/scenarios/networking/vtc_instantiation_validation_noisy.py b/yardstick/benchmark/scenarios/networking/vtc_instantiation_validation_noisy.py index 4834a5fc7..57b975811 100644 --- a/yardstick/benchmark/scenarios/networking/vtc_instantiation_validation_noisy.py +++ b/yardstick/benchmark/scenarios/networking/vtc_instantiation_validation_noisy.py @@ -79,8 +79,9 @@ class VtcInstantiationValidationNoisy(base.Scenario): test_case['params']['number_of_cores'] = \ str(self.options['number_of_cores']) + res = dict() try: - result = api.FrameworkApi.execute_framework( + res = api.FrameworkApi.execute_framework( [test_case], iterations, heat_template, @@ -89,4 +90,5 @@ class VtcInstantiationValidationNoisy(base.Scenario): openstack_credentials) except Exception as e: LOG.info('Exception: {}'.format(e.message)) - LOG.info('Got output: {}'.format(result)) + LOG.info('Got output: {}'.format(res)) + result.update(res) diff --git a/yardstick/benchmark/scenarios/networking/vtc_throughput.py b/yardstick/benchmark/scenarios/networking/vtc_throughput.py index fe7a88470..ff20279ff 100644 --- a/yardstick/benchmark/scenarios/networking/vtc_throughput.py +++ b/yardstick/benchmark/scenarios/networking/vtc_throughput.py @@ -72,8 +72,9 @@ class VtcThroughput(base.Scenario): test_case['params']['vlan_receiver'] = \ str(self.options['vlan_receiver']) + res = dict() try: - result = api.FrameworkApi.execute_framework( + res = api.FrameworkApi.execute_framework( [test_case], iterations, heat_template, @@ -82,4 +83,5 @@ class VtcThroughput(base.Scenario): openstack_credentials) except Exception as e: LOG.info('Exception: {}'.format(e.message)) - LOG.info('Got output: {}'.format(result)) + LOG.info('Got output: {}'.format(res)) + result.update(res) diff --git a/yardstick/benchmark/scenarios/networking/vtc_throughput_noisy.py b/yardstick/benchmark/scenarios/networking/vtc_throughput_noisy.py index ad3832fb5..703e06cf8 100644 --- a/yardstick/benchmark/scenarios/networking/vtc_throughput_noisy.py +++ b/yardstick/benchmark/scenarios/networking/vtc_throughput_noisy.py @@ -78,8 +78,9 @@ class VtcThroughputNoisy(base.Scenario): test_case['params']['number_of_cores'] = \ str(self.options['number_of_cores']) + res = dict() try: - result = api.FrameworkApi.execute_framework( + res = api.FrameworkApi.execute_framework( [test_case], iterations, heat_template, @@ -88,4 +89,5 @@ class VtcThroughputNoisy(base.Scenario): openstack_credentials) except Exception as e: LOG.info('Exception: {}'.format(e.message)) - LOG.info('Got output: {}'.format(result)) + LOG.info('Got output: {}'.format(res)) + result.update(res) diff --git a/yardstick/vTC/apexlake/apexlake.conf b/yardstick/vTC/apexlake/apexlake.conf index 56937d2ef..9ebbc5d56 100644 --- a/yardstick/vTC/apexlake/apexlake.conf +++ b/yardstick/vTC/apexlake/apexlake.conf @@ -1,3 +1,16 @@ +[PacketGen] +packet_generator = dpdk_pktgen +pktgen_directory = /root/programs/Pktgen-DPDK/dpdk/examples/pktgen/ +dpdk_directory = /root/programs/Pktgen-DPDK/dpdk/ +program_name = app/app/x86_64-native-linuxapp-gcc/pktgen +coremask = 1f +memory_channels = 3 +bus_slot_nic_1 = 01:00.0 +bus_slot_nic_2 = 01:00.1 +name_if_1 = p2p1 +name_if_2 = p2p2 + + [General] ## template_base is the name of the base template from which generate all the others #template_base_name = vTC.yaml @@ -38,19 +51,6 @@ influxdb_port = 8086 influxdb_db_name = database -[PacketGen] -packet_generator = dpdk_pktgen -pktgen_directory = /root/programs/Pktgen-DPDK/dpdk/examples/pktgen/ -dpdk_directory = /root/programs/Pktgen-DPDK/dpdk/ -program_name = app/app/x86_64-native-linuxapp-gcc/pktgen -coremask = 1f -memory_channels = 3 -bus_slot_nic_1 = 01:00.0 -bus_slot_nic_2 = 01:00.1 -name_if_1 = p2p1 -name_if_2 = p2p2 - - [Deployment-parameters] #default_net = monitoring #default_subnet = monitoring_subnet |