From 171ecb411e4b8a00ab79f4cfc79a41f411527a7e Mon Sep 17 00:00:00 2001 From: Liam Young Date: Mon, 22 Jul 2019 07:22:28 +0000 Subject: [PATCH] Fix bug introduced by zaza reorg --- zaza/openstack/charm_tests/masakari/tests.py | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/zaza/openstack/charm_tests/masakari/tests.py b/zaza/openstack/charm_tests/masakari/tests.py index 3c2e6d7..1480624 100644 --- a/zaza/openstack/charm_tests/masakari/tests.py +++ b/zaza/openstack/charm_tests/masakari/tests.py @@ -23,9 +23,8 @@ import novaclient import zaza.model import zaza.openstack.charm_tests.test_utils as test_utils -import openstack as openstack_utils import zaza.openstack.utilities.juju as juju_utils -import zaza.openstack.utilities.openstack as openstack +import zaza.openstack.utilities.openstack as openstack_utils import zaza.openstack.configure.guest import zaza.openstack.configure.hacluster import zaza.openstack.configure.masakari @@ -52,7 +51,7 @@ class MasakariTest(test_utils.OpenStackBaseTest): zaza.openstack.configure.masakari.simulate_compute_host_recovery( unit.entity_id, model_name=cls.model_name) - openstack.enable_all_nova_services(cls.nova_client) + openstack_utils.enable_all_nova_services(cls.nova_client) zaza.openstack.configure.masakari.enable_hosts() def ensure_guest(self, vm_name): @@ -83,7 +82,7 @@ class MasakariTest(test_utils.OpenStackBaseTest): :returns: Hypervisor name and juju unit name :rtype: (str, str) """ - current_hypervisor = openstack.get_hypervisor_for_guest( + current_hypervisor = openstack_utils.get_hypervisor_for_guest( self.nova_client, vm_name) unit_name = juju_utils.get_unit_name_from_host_name( @@ -129,7 +128,7 @@ class MasakariTest(test_utils.OpenStackBaseTest): logging.info('Waiting for guest to move away from {}'.format( current_hypervisor)) # wait_for_server_migration will throw an exception if migration fails - openstack.wait_for_server_migration( + openstack_utils.wait_for_server_migration( self.nova_client, vm_name, current_hypervisor) @@ -138,7 +137,7 @@ class MasakariTest(test_utils.OpenStackBaseTest): zaza.openstack.configure.masakari.simulate_compute_host_recovery( unit_name, model_name=self.model_name) - openstack.enable_all_nova_services(self.nova_client) + openstack_utils.enable_all_nova_services(self.nova_client) zaza.openstack.configure.masakari.enable_hosts() def test_instance_restart_on_fail(self): @@ -162,7 +161,7 @@ class MasakariTest(test_utils.OpenStackBaseTest): model_name=self.model_name) logging.info('Waiting for {} to be updated and become active'.format( vm_name)) - openstack.wait_for_server_update_and_active( + openstack_utils.wait_for_server_update_and_active( self.nova_client, vm_name, inital_update_time)