From a1b0f64bccea682e55ec5086aef979df57cf686f Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Wed, 21 Feb 2018 10:01:30 +0100 Subject: Automatically download defcore.txt MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It stops writing files in Functest package dirs and cleans instance variables in refstack modules too. Change-Id: Iaddbe4fbaf12d1af207b86d4e44258efdc6d6f3a Signed-off-by: Cédric Ollivier --- .../openstack/refstack_client/tempest_conf.py | 69 ---------------------- 1 file changed, 69 deletions(-) delete mode 100644 functest/opnfv_tests/openstack/refstack_client/tempest_conf.py (limited to 'functest/opnfv_tests/openstack/refstack_client/tempest_conf.py') diff --git a/functest/opnfv_tests/openstack/refstack_client/tempest_conf.py b/functest/opnfv_tests/openstack/refstack_client/tempest_conf.py deleted file mode 100644 index 73a2685c..00000000 --- a/functest/opnfv_tests/openstack/refstack_client/tempest_conf.py +++ /dev/null @@ -1,69 +0,0 @@ -#!/usr/bin/env python - -# matthew.lijun@huawei.com -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 - -""" Used to generate tempest.conf """ - -import logging -import pkg_resources - -from functest.opnfv_tests.openstack.tempest import conf_utils -from functest.opnfv_tests.openstack.tempest.tempest \ - import TempestResourcesManager - -LOGGER = logging.getLogger(__name__) - - -class TempestConf(object): - """ TempestConf class""" - def __init__(self, **kwargs): - self.verifier_id = conf_utils.get_verifier_id() - self.deployment_id = conf_utils.get_verifier_deployment_id() - self.deployment_dir = conf_utils.get_verifier_deployment_dir( - self.verifier_id, self.deployment_id) - self.confpath = pkg_resources.resource_filename( - 'functest', - 'opnfv_tests/openstack/refstack_client/refstack_tempest.conf') - self.resources = TempestResourcesManager(**kwargs) - - def generate_tempestconf(self): - """ Generate tempest.conf file""" - try: - resources = self.resources.create(create_project=True, - use_custom_images=True, - use_custom_flavors=True) - conf_utils.configure_tempest_defcore( - self.deployment_dir, - network_name=resources.get("network_name"), - image_id=resources.get("image_id"), - flavor_id=resources.get("flavor_id"), - image_id_alt=resources.get("image_id_alt"), - flavor_id_alt=resources.get("flavor_id_alt"), - tenant_id=resources.get("project_id")) - except Exception as err: # pylint: disable=broad-except - LOGGER.error("error with generating refstack client " - "reference tempest conf file: %s", err) - - def main(self): - """ The main function called by entry point""" - try: - self.generate_tempestconf() - LOGGER.info("a reference tempest conf file generated " - "at %s", self.confpath) - except Exception as err: # pylint: disable=broad-except - LOGGER.error('Error with run: %s', err) - - def clean(self): - """Clean up the resources""" - self.resources.cleanup() - - -def main(): - """Entry point""" - logging.basicConfig() - tempestconf = TempestConf() - tempestconf.main() -- cgit 1.2.3-korg