diff options
Diffstat (limited to 'functest/opnfv_tests')
| -rw-r--r-- | functest/opnfv_tests/openstack/rally/rally.py | 3 | ||||
| -rw-r--r-- | functest/opnfv_tests/openstack/tempest/conf_utils.py | 2 | ||||
| -rwxr-xr-x | functest/opnfv_tests/sdn/odl/odl.py | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/functest/opnfv_tests/openstack/rally/rally.py b/functest/opnfv_tests/openstack/rally/rally.py index f984c368..16a872fc 100644 --- a/functest/opnfv_tests/openstack/rally/rally.py +++ b/functest/opnfv_tests/openstack/rally/rally.py @@ -66,6 +66,7 @@ class RallyBase(testcase_base.TestcaseBase): self.cinder_client = os_utils.get_cinder_client() self.network_dict = {} self.volume_type = None + self.smoke = None def _build_task_args(self, test_file_name): task_args = {'service_list': [test_file_name]} @@ -287,7 +288,7 @@ class RallyBase(testcase_base.TestcaseBase): cmd_line = ("rally task validate " "--task {0} " "--task-args \"{1}\"" - .format(task_file, self.__build_task_args(test_name))) + .format(task_file, self._build_task_args(test_name))) logger.debug('running command line: {}'.format(cmd_line)) p = subprocess.Popen(cmd_line, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True) diff --git a/functest/opnfv_tests/openstack/tempest/conf_utils.py b/functest/opnfv_tests/openstack/tempest/conf_utils.py index 0c9064a1..91a5bb4b 100644 --- a/functest/opnfv_tests/openstack/tempest/conf_utils.py +++ b/functest/opnfv_tests/openstack/tempest/conf_utils.py @@ -208,7 +208,7 @@ def configure_tempest_multisite(deployment_dir): # cmd = ("openstack endpoint show kingbird | grep publicurl |" # "awk '{print $4}' | awk -F '/' '{print $4}'") # kingbird_api_version = os.popen(cmd).read() - kingbird_api_version = os_utils.get_endpoint(service_type='kingbird') + kingbird_api_version = os_utils.get_endpoint(service_type='multisite') if CI_INSTALLER_TYPE == 'fuel': # For MOS based setup, the service is accessible diff --git a/functest/opnfv_tests/sdn/odl/odl.py b/functest/opnfv_tests/sdn/odl/odl.py index 9502be93..25075957 100755 --- a/functest/opnfv_tests/sdn/odl/odl.py +++ b/functest/opnfv_tests/sdn/odl/odl.py @@ -164,7 +164,7 @@ class ODLTests(testcase_base.TestcaseBase): kwargs['ospassword'] = os.environ['OS_PASSWORD'] if installer_type == 'fuel': kwargs['odlwebport'] = '8282' - elif installer_type == 'apex': + elif installer_type == 'apex' or installer_type == 'netvirt': kwargs['odlip'] = os.environ['SDN_CONTROLLER_IP'] kwargs['odlwebport'] = '8081' kwargs['odlrestconfport'] = '8081' |