Code Review
/
yardstick.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "yardstick offline support"
[yardstick.git]
/
yardstick
/
benchmark
/
scenarios
/
networking
/
vtc_throughput_noisy.py
diff --git
a/yardstick/benchmark/scenarios/networking/vtc_throughput_noisy.py
b/yardstick/benchmark/scenarios/networking/vtc_throughput_noisy.py
index
ad3832f
..
38ebc4c
100644
(file)
--- a/
yardstick/benchmark/scenarios/networking/vtc_throughput_noisy.py
+++ b/
yardstick/benchmark/scenarios/networking/vtc_throughput_noisy.py
@@
-7,6
+7,7
@@
# http://www.apache.org/licenses/LICENSE-2.0
##############################################################################
# http://www.apache.org/licenses/LICENSE-2.0
##############################################################################
+from __future__ import absolute_import
import logging
import os
import logging
import os
@@
-28,7
+29,7
@@
class VtcThroughputNoisy(base.Scenario):
self.setup_done = False
def setup(self):
self.setup_done = False
def setup(self):
- '''scenario setup'''
+ """scenario setup"""
self.options = self.scenario_cfg['options']
self.setup_done = True
self.options = self.scenario_cfg['options']
self.setup_done = True
@@
-77,15
+78,21
@@
class VtcThroughputNoisy(base.Scenario):
str(self.options['amount_of_ram'])
test_case['params']['number_of_cores'] = \
str(self.options['number_of_cores'])
str(self.options['amount_of_ram'])
test_case['params']['number_of_cores'] = \
str(self.options['number_of_cores'])
+ test_case['params']['network'] = \
+ str(self.options['default_net_name'])
+ test_case['params']['subnet'] = \
+ str(self.options['default_subnet_name'])
+ res = dict()
try:
try:
- res
ult
= api.FrameworkApi.execute_framework(
+ res = api.FrameworkApi.execute_framework(
[test_case],
iterations,
heat_template,
heat_template_parameters,
deployment_configuration,
openstack_credentials)
[test_case],
iterations,
heat_template,
heat_template_parameters,
deployment_configuration,
openstack_credentials)
- except Exception as e:
- LOG.info('Exception: {}'.format(e.message))
- LOG.info('Got output: {}'.format(result))
+ except Exception:
+ LOG.exception('Exception')
+ LOG.info('Got output: %s', res)
+ result.update(res)