Adapt doctor test case to the FeatureBase framework

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

diff --git a/functest/utils/functest_constants.py b/functest/utils/functest_constants.py
index c4be077..bd10978 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',
@@ -218,8 +220,6 @@ 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',
@@ -241,20 +241,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')
-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')