Merge "Modifies check_os.sh to check services and cinder is optional"

[functest.git] / functest / utils / functest_constants.py

diff --git a/functest/utils/functest_constants.py b/functest/utils/functest_constants.py
index ac9d77c..0a9a03b 100644 (file)
--- a/functest/utils/functest_constants.py
+++ b/functest/utils/functest_constants.py
@@ -146,6 +146,8 @@ TEMPEST_USER_PASSWORD = get_value('tempest.identity.user_password',
                                   'TEMPEST_USER_PASSWORD')
 TEMPEST_SSH_TIMEOUT = get_value('tempest.validation.ssh_timeout',
                                 'TEMPEST_SSH_TIMEOUT')
+TEMPEST_OPERATOR_ROLE = get_value('tempest.object_storage.operator_role',
+                                  'TEMPEST_OPERATOR_ROLE')
 TEMPEST_USE_CUSTOM_IMAGES = get_value('tempest.use_custom_images',
                                       'TEMPEST_USE_CUSTOM_IMAGES')
 TEMPEST_USE_CUSTOM_FLAVORS = get_value('tempest.use_custom_flavors',
@@ -193,35 +195,6 @@ ONOS_INSTALLER_MASTER_USERNAME = get_value(
 ONOS_INSTALLER_MASTER_PASSWORD = get_value(
     'ONOS.environment.installer_master_password',
     'ONOS_INSTALLER_MASTER_PASSWORD')
-PROMISE_REPO_DIR = get_value('general.dir.dir_repo_promise',
-                             'PROMISE_REPO_DIR')
-PROMISE_TENANT_NAME = get_value('promise.tenant_name',
-                                'PROMISE_TENANT_NAME')
-TENANT_DESCRIPTION = get_value('promise.tenant_description',
-                               'TENANT_DESCRIPTION')
-PROMISE_USER_NAME = get_value('promise.user_name', 'PROMISE_USER_NAME')
-PROMISE_USER_PWD = get_value('promise.user_pwd', 'PROMISE_USER_PWD')
-PROMISE_IMAGE_NAME = get_value('promise.image_name',
-                               'PROMISE_IMAGE_NAME')
-PROMISE_FLAVOR_NAME = get_value('promise.flavor_name',
-                                'PROMISE_FLAVOR_NAME')
-PROMISE_FLAVOR_VCPUS = get_value('promise.flavor_vcpus',
-                                 'PROMISE_FLAVOR_VCPUS')
-PROMISE_FLAVOR_RAM = get_value('promise.flavor_ram',
-                               'PROMISE_FLAVOR_RAM')
-PROMISE_FLAVOR_DISK = get_value('promise.flavor_disk',
-                                'PROMISE_FLAVOR_DISK')
-PROMISE_NET_NAME = get_value('promise.network_name', 'PROMISE_NET_NAME')
-PROMISE_SUBNET_NAME = get_value('promise.subnet_name',
-                                'PROMISE_SUBNET_NAME')
-PROMISE_SUBNET_CIDR = get_value('promise.subnet_cidr',
-                                'PROMISE_SUBNET_CIDR')
-PROMISE_ROUTER_NAME = get_value('promise.router_name',
-                                'PROMISE_ROUTER_NAME')
-DOCTOR_REPO_DIR = get_value('general.dir.dir_repo_doctor',
-                            'DOCTOR_REPO_DIR')
-COPPER_REPO_DIR = get_value('general.dir.repo_copper',
-                            'COPPER_REPO_DIR')
 EXAMPLE_INSTANCE_NAME = get_value('example.vm_name',
                                   'EXAMPLE_INSTANCE_NAME')
 EXAMPLE_FLAVOR = get_value('example.flavor', 'EXAMPLE_FLAVOR')
@@ -241,25 +214,5 @@ EXAMPLE_SECGROUP_NAME = get_value('example.sg_name',
                                   'EXAMPLE_SECGROUP_NAME')
 EXAMPLE_SECGROUP_DESCR = get_value('example.sg_desc',
                                    'EXAMPLE_SECGROUP_DESCR')
-VIMS_DATA_DIR = get_value('general.dir.dir_vIMS_data',
-                          'VIMS_DATA_DIR')
-VIMS_TEST_DIR = get_value('general.dir.dir_repo_vims_test',
-                          'VIMS_TEST_DIR')
-VIMS_TENANT_NAME = get_value('vIMS.general.tenant_name',
-                             'VIMS_TENANT_NAME')
-VIMS_TENANT_DESCRIPTION = get_value('vIMS.general.tenant_description',
-                                    'VIMS_TENANT_DESCRIPTION')
-VIMS_IMAGES = get_value('vIMS.general.images', 'VIMS_IMAGES')
-CFY_MANAGER_BLUEPRINT = get_value('vIMS.cloudify.blueprint',
-                                  'CFY_MANAGER_BLUEPRINT')
-CFY_MANAGER_REQUIERMENTS = get_value('vIMS.cloudify.requierments',
-                                     'CFY_MANAGER_REQUIERMENTS')
-CFY_INPUTS = get_value('vIMS.cloudify.inputs', 'CFY_INPUTS')
-CW_BLUEPRINT = get_value('vIMS.clearwater.blueprint', 'CW_BLUEPRINT')
-CW_DEPLOYMENT_NAME = get_value('vIMS.clearwater.deployment-name',
-                               'CW_DEPLOYMENT_NAME')
-CW_INPUTS = get_value('vIMS.clearwater.inputs', 'CW_INPUTS')
-CW_REQUIERMENTS = get_value('vIMS.clearwater.requierments',
-                            'CW_REQUIERMENTS')
 PARSER_REPO_DIR = get_value('general.dir.repo_parser',
                             'PARSER_REPO_DIR')