From 8b357ace5ada1fb609ceb587698a6c02ad822d8d Mon Sep 17 00:00:00 2001 From: Zhenzan Zhou Date: Tue, 22 Dec 2015 14:57:58 +0800 Subject: [PATCH] Remove duplicated nova wrapper The nova wrapper2 just uses the same credential to create another nova client session with the same capability. And it is hardcode for keystone API v3. Change-Id: I52b11a9b48ce2bb37a7872e2335ac3bae3f742c7 Closes-Bug: #1528142 --- watcher/applier/primitives/migration.py | 26 ++----------------------- 1 file changed, 2 insertions(+), 24 deletions(-) diff --git a/watcher/applier/primitives/migration.py b/watcher/applier/primitives/migration.py index 428bd0cb2..34e54b8a6 100644 --- a/watcher/applier/primitives/migration.py +++ b/watcher/applier/primitives/migration.py @@ -17,8 +17,6 @@ # limitations under the License. # -from keystoneclient.auth.identity import v3 -from keystoneclient import session from oslo_config import cfg from watcher.applier.primitives.base import BasePrimitive @@ -47,34 +45,14 @@ class Migrate(BasePrimitive): session=keystone.get_session()) instance = wrapper.find_instance(self.instance_uuid) if instance: - project_id = getattr(instance, "tenant_id") - - creds2 = \ - {'auth_url': CONF.keystone_authtoken.auth_uri, - 'username': CONF.keystone_authtoken.admin_user, - 'password': CONF.keystone_authtoken.admin_password, - 'project_id': project_id, - 'user_domain_name': "default", - 'project_domain_name': "default"} - auth2 = v3.Password(auth_url=creds2['auth_url'], - username=creds2['username'], - password=creds2['password'], - project_id=creds2['project_id'], - user_domain_name=creds2[ - 'user_domain_name'], - project_domain_name=creds2[ - 'project_domain_name']) - sess2 = session.Session(auth=auth2) - wrapper2 = NovaClient(creds2, session=sess2) - # todo(jed) remove Primitves if self.migration_type is Primitives.COLD_MIGRATE: - return wrapper2.live_migrate_instance( + return wrapper.live_migrate_instance( instance_id=self.instance_uuid, dest_hostname=destination, block_migration=True) elif self.migration_type is Primitives.LIVE_MIGRATE: - return wrapper2.live_migrate_instance( + return wrapper.live_migrate_instance( instance_id=self.instance_uuid, dest_hostname=destination, block_migration=False)