Merge "Bugfix: task_id parameter from API can not pass to yardstick core"

[yardstick.git] / yardstick / benchmark / scenarios / networking / vtc_instantiation_validation.py

diff --git a/yardstick/benchmark/scenarios/networking/vtc_instantiation_validation.py b/yardstick/benchmark/scenarios/networking/vtc_instantiation_validation.py
index 509fa84..ac57c92 100644 (file)
--- a/yardstick/benchmark/scenarios/networking/vtc_instantiation_validation.py
+++ b/yardstick/benchmark/scenarios/networking/vtc_instantiation_validation.py
@@ -7,6 +7,7 @@
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
 
+from __future__ import absolute_import
 import logging
 import os
 
@@ -28,7 +29,7 @@ class VtcInstantiationValidation(base.Scenario):
         self.setup_done = False
 
     def setup(self):
-        '''scenario setup'''
+        """scenario setup"""
 
         self.options = self.scenario_cfg['options']
         self.setup_done = True
@@ -72,14 +73,16 @@ 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,
                 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)