From addc7f7318147c29de474813b00ae40882ca9662 Mon Sep 17 00:00:00 2001 From: "jose.lausuch" Date: Wed, 13 Jul 2016 12:07:21 +0200 Subject: Use common way to get the openstack clients Instead of repeating the code in all the scripts and importing the openstack libraries, the clients shall be given by openstack utils, which is its purpose JIRA: FUNCTEST-163 Change-Id: I1ccc05a3af44ee1ab5938ea9e4e01dbe55f4816d Signed-off-by: jose.lausuch --- utils/openstack_clean.py | 33 ++++++--------------------------- 1 file changed, 6 insertions(+), 27 deletions(-) (limited to 'utils/openstack_clean.py') diff --git a/utils/openstack_clean.py b/utils/openstack_clean.py index 3eb39a26..c266eeb3 100755 --- a/utils/openstack_clean.py +++ b/utils/openstack_clean.py @@ -20,17 +20,10 @@ # http://www.apache.org/licenses/LICENSE-2.0 # -""" logging configuration """ - import time - -from cinderclient import client as cinderclient import functest.utils.functest_logger as ft_logger import functest.utils.functest_utils as ft_utils import functest.utils.openstack_utils as os_utils -from keystoneclient.v2_0 import client as keystoneclient -from neutronclient.v2_0 import client as neutronclient -from novaclient import client as novaclient import yaml @@ -41,7 +34,7 @@ OS_SNAPSHOT_FILE = ft_utils.get_parameter_from_yaml( def separator(): - logger.info("-------------------------------------------") + logger.debug("-------------------------------------------") def remove_instances(nova_client, default_instances): @@ -360,9 +353,12 @@ def remove_tenants(keystone_client, default_tenants): def main(): - logger.info("+++++++++++++++++++++++++++++++") logger.info("Cleaning OpenStack resources...") - logger.info("+++++++++++++++++++++++++++++++") + + nova_client = os_utils.get_nova_client() + neutron_client = os_utils.get_neutron_client() + keystone_client = os_utils.get_keystone_client() + cinder_client = os_utils.get_cinder_client() try: with open(OS_SNAPSHOT_FILE) as f: @@ -382,23 +378,6 @@ def main(): default_users = snapshot_yaml.get('users') default_tenants = snapshot_yaml.get('tenants') - creds_nova = os_utils.get_credentials("nova") - nova_client = novaclient.Client('2', **creds_nova) - - creds_neutron = os_utils.get_credentials("neutron") - neutron_client = neutronclient.Client(**creds_neutron) - - creds_keystone = os_utils.get_credentials("keystone") - keystone_client = keystoneclient.Client(**creds_keystone) - - creds_cinder = os_utils.get_credentials("cinder") - # cinder_client = cinderclient.Client(**creds_cinder) - cinder_client = cinderclient.Client('1', creds_cinder['username'], - creds_cinder['api_key'], - creds_cinder['project_id'], - creds_cinder['auth_url'], - service_type="volume") - if not os_utils.check_credentials(): logger.error("Please source the openrc credentials and run " "the script again.") -- cgit 1.2.3-korg