summaryrefslogtreecommitdiffstats
path: root/yardstick/benchmark
diff options
context:
space:
mode:
Diffstat (limited to 'yardstick/benchmark')
-rw-r--r--yardstick/benchmark/scenarios/networking/vtc_instantiation_validation.py6
-rw-r--r--yardstick/benchmark/scenarios/networking/vtc_instantiation_validation_noisy.py6
-rw-r--r--yardstick/benchmark/scenarios/networking/vtc_throughput.py6
-rw-r--r--yardstick/benchmark/scenarios/networking/vtc_throughput_noisy.py6
4 files changed, 16 insertions, 8 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)