diff options
| author |   Linda Wang <wangwulin@huawei.com> | 2018-03-13 01:36:40 +0000 |
|---|---|---|
| committer | Linda Wang <wangwulin@huawei.com> | 2018-03-15 03:50:30 +0000 |
| commit | c9fd7ceab29ff755aa8a9ee1bcb6ab958e5e0420 (patch) | |
| tree | 86910e6c608ab886264e1ff2fa388761b2078116 /functest/opnfv_tests/openstack/tempest/conf_utils.py | |
| parent | 370eee3b9b1b20057191aa614ddfda31f8656e8e (diff) | |
Create 2 images and flavors for tempest tests
Also
1. remove the obsolete function: generate_test_accounts_file
2. Use patch mechanism to get config
Change-Id: I455ac37de71519bcaf9a51e5f1de1b9bc83b9ba6
Signed-off-by: Linda Wang <wangwulin@huawei.com>
Diffstat (limited to 'functest/opnfv_tests/openstack/tempest/conf_utils.py')
| -rw-r--r-- | functest/opnfv_tests/openstack/tempest/conf_utils.py | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/functest/opnfv_tests/openstack/tempest/conf_utils.py b/functest/opnfv_tests/openstack/tempest/conf_utils.py index 8832a48bf..d6b1eb401 100644 --- a/functest/opnfv_tests/openstack/tempest/conf_utils.py +++ b/functest/opnfv_tests/openstack/tempest/conf_utils.py @@ -39,9 +39,6 @@ TEMPEST_BLACKLIST = pkg_resources.resource_filename( 'functest', 'opnfv_tests/openstack/tempest/custom_tests/blacklist.txt') TEMPEST_CONF_YAML = pkg_resources.resource_filename( 'functest', 'opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml') -TEST_ACCOUNTS_FILE = pkg_resources.resource_filename( - 'functest', - 'opnfv_tests/openstack/tempest/custom_tests/test_accounts.yaml') CI_INSTALLER_TYPE = env.get('INSTALLER_TYPE') @@ -173,26 +170,6 @@ def backup_tempest_config(conf_file, res_dir): os.path.join(res_dir, 'tempest.conf')) -def generate_test_accounts_file(tenant_id): - """ - Add needed tenant and user params into test_accounts.yaml - """ - - LOGGER.debug("Add needed params into test_accounts.yaml...") - accounts_list = [ - { - 'tenant_name': getattr( - config.CONF, 'tempest_identity_tenant_name'), - 'tenant_id': str(tenant_id), - 'username': getattr(config.CONF, 'tempest_identity_user_name'), - 'password': getattr(config.CONF, 'tempest_identity_user_password') - } - ] - - with open(TEST_ACCOUNTS_FILE, "w") as tfile: - yaml.dump(accounts_list, tfile, default_flow_style=False) - - def update_tempest_conf_file(conf_file, rconfig): """Update defined paramters into tempest config file""" with open(TEMPEST_CONF_YAML) as yfile: |