diff options
Diffstat (limited to 'functest/opnfv_tests')
| -rw-r--r-- | functest/opnfv_tests/openstack/tempest/conf_utils.py | 6 | ||||
| -rw-r--r-- | functest/opnfv_tests/openstack/vping/vping_base.py | 2 | ||||
| -rwxr-xr-x | functest/opnfv_tests/sdn/odl/odl.py | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/functest/opnfv_tests/openstack/tempest/conf_utils.py b/functest/opnfv_tests/openstack/tempest/conf_utils.py index 03735baa..028b085c 100644 --- a/functest/opnfv_tests/openstack/tempest/conf_utils.py +++ b/functest/opnfv_tests/openstack/tempest/conf_utils.py @@ -111,8 +111,8 @@ def configure_tempest(deployment_dir, IMAGE_ID=None, FLAVOR_ID=None): Calls rally verify and updates the generated tempest.conf with given parameters """ - conf_verifier_result = configure_verifier(deployment_dir) - configure_tempest_update_params(conf_verifier_result, + conf_file = configure_verifier(deployment_dir) + configure_tempest_update_params(conf_file, IMAGE_ID, FLAVOR_ID) @@ -192,6 +192,8 @@ def configure_verifier(deployment_dir): % tempest_conf_file) raise Exception("Tempest configuration file %s NOT found." % tempest_conf_file) + else: + return tempest_conf_file def configure_tempest_multisite(deployment_dir): diff --git a/functest/opnfv_tests/openstack/vping/vping_base.py b/functest/opnfv_tests/openstack/vping/vping_base.py index 8285d93f..a5309bd4 100644 --- a/functest/opnfv_tests/openstack/vping/vping_base.py +++ b/functest/opnfv_tests/openstack/vping/vping_base.py @@ -289,6 +289,6 @@ class VPingMain(object): if result != VPingBase.EX_OK: return result if kwargs['report']: - return self.vping.publish_report() + return self.vping.push_to_db() except Exception: return VPingBase.EX_RUN_ERROR diff --git a/functest/opnfv_tests/sdn/odl/odl.py b/functest/opnfv_tests/sdn/odl/odl.py index 25075957..9bff324f 100755 --- a/functest/opnfv_tests/sdn/odl/odl.py +++ b/functest/opnfv_tests/sdn/odl/odl.py @@ -237,6 +237,6 @@ if __name__ == '__main__': if result != testcase_base.TestcaseBase.EX_OK: sys.exit(result) if args['pushtodb']: - sys.exit(odl.publish_report()) + sys.exit(odl.push_to_db()) except Exception: sys.exit(testcase_base.TestcaseBase.EX_RUN_ERROR) |