diff options
Diffstat (limited to 'functest/utils')
| -rw-r--r-- | functest/utils/env.py | 3 | ||||
| -rw-r--r-- | functest/utils/functest_constants.py | 4 | ||||
| -rw-r--r-- | functest/utils/functest_utils.py | 20 |
3 files changed, 4 insertions, 23 deletions
diff --git a/functest/utils/env.py b/functest/utils/env.py index 19c6099c..360f41d0 100644 --- a/functest/utils/env.py +++ b/functest/utils/env.py @@ -8,7 +8,8 @@ default_envs = { 'DEPLOY_TYPE': 'virt', 'INSTALLER_TYPE': None, 'INSTALLER_IP': None, - 'BUILD_TAG': None + 'BUILD_TAG': None, + 'OS_ENDPOINT_TYPE': None } diff --git a/functest/utils/functest_constants.py b/functest/utils/functest_constants.py index 991a2972..de7e9708 100644 --- a/functest/utils/functest_constants.py +++ b/functest/utils/functest_constants.py @@ -111,7 +111,7 @@ RALLY_PRIVATE_SUBNET_NAME = get_value('rally.subnet_name', RALLY_PRIVATE_SUBNET_CIDR = get_value('rally.subnet_cidr', 'RALLY_PRIVATE_SUBNET_CIDR') RALLY_ROUTER_NAME = get_value('rally.router_name', 'RALLY_ROUTER_NAME') -RALLY_INSTALLATION_DIR = get_value('general.dir.dir_rally_inst', +RALLY_INSTALLATION_DIR = get_value('general.dir.rally_inst', 'RALLY_INSTALLATION_DIR') GLANCE_IMAGE_NAME = get_value('general.openstack.image_name', 'GLANCE_IMAGE_NAME') @@ -149,7 +149,7 @@ TEMPEST_USE_CUSTOM_IMAGES = get_value('tempest.use_custom_images', 'TEMPEST_USE_CUSTOM_IMAGES') TEMPEST_USE_CUSTOM_FLAVORS = get_value('tempest.use_custom_flavors', 'TEMPEST_USE_CUSTOM_FLAVORS') -TEMPEST_TEST_LIST_DIR = get_value('general.dir.dir_tempest_cases', +TEMPEST_TEST_LIST_DIR = get_value('general.dir.tempest_cases', 'TEMPEST_TEST_LIST_DIR') NAME_VM_1 = get_value('vping.vm_name_1', 'NAME_VM_1') NAME_VM_2 = get_value('vping.vm_name_2', 'NAME_VM_2') diff --git a/functest/utils/functest_utils.py b/functest/utils/functest_utils.py index e4845c62..3145f573 100644 --- a/functest/utils/functest_utils.py +++ b/functest/utils/functest_utils.py @@ -321,26 +321,6 @@ def execute_command(cmd, info=False, error_msg="", return returncode -def get_deployment_dir(): - """ - Returns current Rally deployment directory - """ - deployment_name = get_functest_config('rally.deployment_name') - rally_dir = get_functest_config('general.dir.dir_rally_inst') - cmd = ("rally deployment list | awk '/" + deployment_name + - "/ {print $2}'") - p = subprocess.Popen(cmd, shell=True, - stdout=subprocess.PIPE, - stderr=subprocess.STDOUT) - deployment_uuid = p.stdout.readline().rstrip() - if deployment_uuid == "": - logger.error("Rally deployment not found.") - exit(-1) - deployment_dir = (rally_dir + "/tempest/for-deployment-" + - deployment_uuid) - return deployment_dir - - def get_dict_by_test(testname): with open(get_testcases_file_dir()) as f: testcases_yaml = yaml.safe_load(f) |