diff --git a/heat/tests/test_clients.py b/heat/tests/test_clients.py index 0b5dcae6bd..bbd407be53 100644 --- a/heat/tests/test_clients.py +++ b/heat/tests/test_clients.py @@ -31,7 +31,7 @@ from heat.engine import clients from heat.engine.clients import client_plugin from heat.tests import common from heat.tests import utils -from heat.tests.v1_1 import fakes +from heat.tests.v1_1 import fakes as fakes_v1_1 class ClientsTest(common.HeatTestCase): @@ -475,7 +475,7 @@ class TestIsNotFound(common.HeatTestCase): is_conflict=False, is_unprocessable_entity=False, plugin='nova', - exception=lambda: fakes.fake_exception(), + exception=lambda: fakes_v1_1.fake_exception(), )), ('nova_exception', dict( is_not_found=False, @@ -493,7 +493,7 @@ class TestIsNotFound(common.HeatTestCase): is_conflict=False, is_unprocessable_entity=False, plugin='nova', - exception=lambda: fakes.fake_exception(413), + exception=lambda: fakes_v1_1.fake_exception(413), )), ('nova_unprocessable_entity', dict( is_not_found=False, @@ -502,7 +502,7 @@ class TestIsNotFound(common.HeatTestCase): is_conflict=False, is_unprocessable_entity=True, plugin='nova', - exception=lambda: fakes.fake_exception(422), + exception=lambda: fakes_v1_1.fake_exception(422), )), ('nova_conflict', dict( is_not_found=False, @@ -511,7 +511,7 @@ class TestIsNotFound(common.HeatTestCase): is_conflict=True, is_unprocessable_entity=False, plugin='nova', - exception=lambda: fakes.fake_exception(409), + exception=lambda: fakes_v1_1.fake_exception(409), )), ('swift_not_found', dict( is_not_found=True, diff --git a/heat/tests/test_eip.py b/heat/tests/test_eip.py index e1f3f31f36..faf84a9f9b 100644 --- a/heat/tests/test_eip.py +++ b/heat/tests/test_eip.py @@ -26,7 +26,7 @@ from heat.engine import rsrc_defn from heat.engine import scheduler from heat.tests import common from heat.tests import utils -from heat.tests.v1_1 import fakes +from heat.tests.v1_1 import fakes as fakes_v1_1 eip_template = ''' @@ -159,7 +159,7 @@ class EIPTest(common.HeatTestCase): def setUp(self): # force Nova, will test Neutron below super(EIPTest, self).setUp() - self.fc = fakes.FakeClient() + self.fc = fakes_v1_1.FakeClient() self.m.StubOutWithMock(nova.NovaClientPlugin, '_create') self.m.StubOutWithMock(self.fc.servers, 'get') @@ -285,7 +285,7 @@ class EIPTest(common.HeatTestCase): def test_eip_with_exception(self): self.m.StubOutWithMock(self.fc.floating_ips, 'create') nova.NovaClientPlugin._create().AndReturn(self.fc) - self.fc.floating_ips.create().AndRaise(fakes.fake_exception()) + self.fc.floating_ips.create().AndRaise(fakes_v1_1.fake_exception()) self.m.ReplayAll() t = template_format.parse(eip_template) @@ -304,7 +304,7 @@ class EIPTest(common.HeatTestCase): self.m.StubOutWithMock(self.fc.floating_ips, 'delete') nova.NovaClientPlugin._create().AndReturn(self.fc) self.fc.floating_ips.delete(mox.IsA(object)).AndRaise( - fakes.fake_exception()) + fakes_v1_1.fake_exception()) self.fc.servers.get(mox.IsA(object)).AndReturn(False) self.m.ReplayAll() @@ -368,7 +368,7 @@ class AllocTest(common.HeatTestCase): def setUp(self): super(AllocTest, self).setUp() - self.fc = fakes.FakeClient() + self.fc = fakes_v1_1.FakeClient() self.m.StubOutWithMock(self.fc.servers, 'get') self.m.StubOutWithMock(nova.NovaClientPlugin, '_create') self.m.StubOutWithMock(parser.Stack, 'resource_by_refid') @@ -692,7 +692,7 @@ class AllocTest(common.HeatTestCase): self._mock_server_get(mock_server=server, multiple=True) self.m.StubOutWithMock(self.fc.servers, 'add_floating_ip') self.fc.servers.add_floating_ip(server, '11.0.0.1').AndRaise( - fakes.fake_exception(400)) + fakes_v1_1.fake_exception(400)) self.m.ReplayAll() t = template_format.parse(eip_template_ipassoc) diff --git a/heat/tests/test_engine_service.py b/heat/tests/test_engine_service.py index 37db45d43d..803396261b 100644 --- a/heat/tests/test_engine_service.py +++ b/heat/tests/test_engine_service.py @@ -52,7 +52,7 @@ from heat.tests import common from heat.tests import fakes as test_fakes from heat.tests import generic_resource as generic_rsrc from heat.tests import utils -from heat.tests.v1_1 import fakes +from heat.tests.v1_1 import fakes as fakes_v1_1 cfg.CONF.import_opt('engine_life_check_timeout', 'heat.common.config') cfg.CONF.import_opt('enable_stack_abandon', 'heat.common.config') @@ -238,7 +238,7 @@ def setup_mock_for_image_constraint(mocks, imageId_input, def setup_mocks(mocks, stack, mock_image_constraint=True): - fc = fakes.FakeClient() + fc = fakes_v1_1.FakeClient() mocks.StubOutWithMock(instances.Instance, 'nova') instances.Instance.nova().MultipleTimes().AndReturn(fc) mocks.StubOutWithMock(nova.NovaClientPlugin, '_create') @@ -287,12 +287,12 @@ def setup_stack(stack_name, ctx, create_res=True): def clean_up_stack(stack, delete_res=True): if delete_res: m = mox.Mox() - fc = fakes.FakeClient() + fc = fakes_v1_1.FakeClient() m.StubOutWithMock(instances.Instance, 'nova') instances.Instance.nova().MultipleTimes().AndReturn(fc) m.StubOutWithMock(fc.client, 'get_servers_9999') get = fc.client.get_servers_9999 - get().AndRaise(fakes.fake_exception()) + get().AndRaise(fakes_v1_1.fake_exception()) m.ReplayAll() stack.delete() if delete_res: @@ -450,7 +450,7 @@ class StackCreateTest(common.HeatTestCase): self.m.StubOutWithMock(fc.client, 'get_servers_9999') get = fc.client.get_servers_9999 - get().AndRaise(fakes.fake_exception()) + get().AndRaise(fakes_v1_1.fake_exception()) mox.Replay(get) stack.delete() @@ -1634,7 +1634,7 @@ class StackServiceAuthorizeTest(common.HeatTestCase): fc = setup_mocks(self.m, stack) self.m.StubOutWithMock(fc.client, 'get_servers_9999') get = fc.client.get_servers_9999 - get().AndRaise(fakes.fake_exception()) + get().AndRaise(fakes_v1_1.fake_exception()) self.m.ReplayAll() stack.store() diff --git a/heat/tests/test_instance.py b/heat/tests/test_instance.py index 551fdbd365..42e767b435 100644 --- a/heat/tests/test_instance.py +++ b/heat/tests/test_instance.py @@ -33,7 +33,7 @@ from heat.engine.resources import instance as instances from heat.engine import scheduler from heat.tests import common from heat.tests import utils -from heat.tests.v1_1 import fakes +from heat.tests.v1_1 import fakes as fakes_v1_1 wp_template = ''' @@ -75,7 +75,7 @@ wp_template = ''' class InstancesTest(common.HeatTestCase): def setUp(self): super(InstancesTest, self).setUp() - self.fc = fakes.FakeClient() + self.fc = fakes_v1_1.FakeClient() def _setup_test_stack(self, stack_name): t = template_format.parse(wp_template) @@ -564,7 +564,7 @@ class InstancesTest(common.HeatTestCase): d2['server']['status'] = vm_delete_status get().AndReturn((200, d2)) else: - get().AndRaise(fakes.fake_exception()) + get().AndRaise(fakes_v1_1.fake_exception()) self.m.ReplayAll() diff --git a/heat/tests/test_instance_group_update_policy.py b/heat/tests/test_instance_group_update_policy.py index 461fe7f9c4..101f7ec566 100644 --- a/heat/tests/test_instance_group_update_policy.py +++ b/heat/tests/test_instance_group_update_policy.py @@ -26,7 +26,7 @@ from heat.engine import parser from heat.engine.resources import instance from heat.tests import common from heat.tests import utils -from heat.tests.v1_1 import fakes +from heat.tests.v1_1 import fakes as fakes_v1_1 ig_tmpl_without_updt_policy = ''' @@ -160,7 +160,7 @@ class InstanceGroupTest(common.HeatTestCase): def setUp(self): super(InstanceGroupTest, self).setUp() - self.fc = fakes.FakeClient() + self.fc = fakes_v1_1.FakeClient() def _stub_validate(self): self.m.StubOutWithMock(parser.Stack, 'validate') diff --git a/heat/tests/test_instance_network.py b/heat/tests/test_instance_network.py index aace09e8b3..6e2493e271 100644 --- a/heat/tests/test_instance_network.py +++ b/heat/tests/test_instance_network.py @@ -25,7 +25,7 @@ from heat.engine.resources import network_interface as network_interfaces from heat.engine import scheduler from heat.tests import common from heat.tests import utils -from heat.tests.v1_1 import fakes +from heat.tests.v1_1 import fakes as fakes_v1_1 wp_template = ''' @@ -152,7 +152,7 @@ class FakeNeutron(object): class instancesTest(common.HeatTestCase): def setUp(self): super(instancesTest, self).setUp() - self.fc = fakes.FakeClient() + self.fc = fakes_v1_1.FakeClient() def _mock_get_image_id_success(self, imageId_input, imageId): self.m.StubOutWithMock(glance.GlanceClientPlugin, 'get_image_id') @@ -187,7 +187,7 @@ class instancesTest(common.HeatTestCase): d2['server']['status'] = vm_delete_status get().AndReturn((200, d2)) else: - get().AndRaise(fakes.fake_exception()) + get().AndRaise(fakes_v1_1.fake_exception()) self.m.ReplayAll() diff --git a/heat/tests/test_loadbalancer.py b/heat/tests/test_loadbalancer.py index 7b8d4761fa..a488aac916 100644 --- a/heat/tests/test_loadbalancer.py +++ b/heat/tests/test_loadbalancer.py @@ -31,7 +31,7 @@ from heat.engine import rsrc_defn from heat.engine import scheduler from heat.tests import common from heat.tests import utils -from heat.tests.v1_1 import fakes +from heat.tests.v1_1 import fakes as fakes_v1_1 lb_template = ''' @@ -104,7 +104,7 @@ lb_template_nokey = ''' class LoadBalancerTest(common.HeatTestCase): def setUp(self): super(LoadBalancerTest, self).setUp() - self.fc = fakes.FakeClient() + self.fc = fakes_v1_1.FakeClient() self.m.StubOutWithMock(nova.NovaClientPlugin, '_create') self.m.StubOutWithMock(self.fc.servers, 'create') self.m.StubOutWithMock(resource.Resource, 'metadata_set') diff --git a/heat/tests/test_neutron_autoscaling.py b/heat/tests/test_neutron_autoscaling.py index d0e098f9f8..af5f8e6537 100644 --- a/heat/tests/test_neutron_autoscaling.py +++ b/heat/tests/test_neutron_autoscaling.py @@ -27,7 +27,7 @@ from heat.engine.resources import instance from heat.engine import template from heat.tests import common from heat.tests import utils -from heat.tests.v1_1 import fakes as v1fakes +from heat.tests.v1_1 import fakes as fakes_v1_1 as_template = ''' @@ -105,7 +105,7 @@ class AutoScalingTest(common.HeatTestCase): super(AutoScalingTest, self).setUp() self.ctx = utils.dummy_context() - self.fc = v1fakes.FakeClient() + self.fc = fakes_v1_1.FakeClient() cfg.CONF.set_default('heat_waitcondition_server_url', 'http://server.test:8000/v1/waitcondition') diff --git a/heat/tests/test_neutron_loadbalancer.py b/heat/tests/test_neutron_loadbalancer.py index fb96d32d04..acbf519e6f 100644 --- a/heat/tests/test_neutron_loadbalancer.py +++ b/heat/tests/test_neutron_loadbalancer.py @@ -28,7 +28,7 @@ from heat.engine.resources.neutron import loadbalancer from heat.engine import scheduler from heat.tests import common from heat.tests import utils -from heat.tests.v1_1 import fakes as nova_fakes +from heat.tests.v1_1 import fakes as fakes_v1_1 health_monitor_template = ''' @@ -847,7 +847,7 @@ class PoolMemberTest(common.HeatTestCase): def setUp(self): super(PoolMemberTest, self).setUp() - self.fc = nova_fakes.FakeClient() + self.fc = fakes_v1_1.FakeClient() self.m.StubOutWithMock(neutronclient.Client, 'create_member') self.m.StubOutWithMock(neutronclient.Client, 'delete_member') self.m.StubOutWithMock(neutronclient.Client, 'update_member') @@ -949,7 +949,7 @@ class LoadBalancerTest(common.HeatTestCase): def setUp(self): super(LoadBalancerTest, self).setUp() - self.fc = nova_fakes.FakeClient() + self.fc = fakes_v1_1.FakeClient() self.m.StubOutWithMock(neutronclient.Client, 'create_member') self.m.StubOutWithMock(neutronclient.Client, 'delete_member') self.stub_keystoneclient() diff --git a/heat/tests/test_neutron_security_group.py b/heat/tests/test_neutron_security_group.py index 78870f6917..5f2948f047 100644 --- a/heat/tests/test_neutron_security_group.py +++ b/heat/tests/test_neutron_security_group.py @@ -23,7 +23,7 @@ from heat.engine import scheduler from heat.engine import template from heat.tests import common from heat.tests import utils -from heat.tests.v1_1 import fakes +from heat.tests.v1_1 import fakes as fakes_v1_1 class SecurityGroupTest(common.HeatTestCase): @@ -85,7 +85,7 @@ Resources: def setUp(self): super(SecurityGroupTest, self).setUp() - self.fc = fakes.FakeClient() + self.fc = fakes_v1_1.FakeClient() self.stub_keystoneclient() self.m.StubOutWithMock(nova_sgr.SecurityGroupRuleManager, 'create') self.m.StubOutWithMock(nova_sgr.SecurityGroupRuleManager, 'delete') diff --git a/heat/tests/test_nokey.py b/heat/tests/test_nokey.py index e18904536d..0dd393de54 100644 --- a/heat/tests/test_nokey.py +++ b/heat/tests/test_nokey.py @@ -18,7 +18,7 @@ from heat.engine.resources import instance as instances from heat.engine import scheduler from heat.tests import common from heat.tests import utils -from heat.tests.v1_1 import fakes +from heat.tests.v1_1 import fakes as fakes_v1_1 nokey_template = ''' @@ -43,7 +43,7 @@ nokey_template = ''' class nokeyTest(common.HeatTestCase): def setUp(self): super(nokeyTest, self).setUp() - self.fc = fakes.FakeClient() + self.fc = fakes_v1_1.FakeClient() def test_nokey_create(self): diff --git a/heat/tests/test_nova_floatingip.py b/heat/tests/test_nova_floatingip.py index fa7fbc2a0a..62d8404e4a 100644 --- a/heat/tests/test_nova_floatingip.py +++ b/heat/tests/test_nova_floatingip.py @@ -23,7 +23,7 @@ from heat.engine import rsrc_defn from heat.engine import scheduler from heat.tests import common from heat.tests import utils -from heat.tests.v1_1 import fakes +from heat.tests.v1_1 import fakes as fakes_v1_1 floating_ip_template = ''' @@ -149,7 +149,7 @@ class NovaFloatingIPTest(common.HeatTestCase): def test_delete_floating_ip_assoc_successful_if_create_failed(self): rsrc = self.prepare_floating_ip_assoc() self.novaclient.servers.add_floating_ip(None, '11.0.0.1').AndRaise( - fakes.fake_exception(400)) + fakes_v1_1.fake_exception(400)) self.m.ReplayAll() diff --git a/heat/tests/test_nova_keypair.py b/heat/tests/test_nova_keypair.py index cc6234405b..ad3893f98e 100644 --- a/heat/tests/test_nova_keypair.py +++ b/heat/tests/test_nova_keypair.py @@ -21,7 +21,7 @@ from heat.engine.resources import nova_keypair from heat.engine import scheduler from heat.tests import common from heat.tests import utils -from heat.tests.v1_1 import fakes +from heat.tests.v1_1 import fakes as fakes_v1_1 class NovaKeyPairTest(common.HeatTestCase): @@ -157,7 +157,7 @@ class NovaKeyPairTest(common.HeatTestCase): test_res.resource_id = "key_name" test_res.state_set(test_res.CREATE, test_res.COMPLETE) (self.fake_keypairs.delete("key_name") - .AndRaise(fakes.fake_exception())) + .AndRaise(fakes_v1_1.fake_exception())) self.m.ReplayAll() scheduler.TaskRunner(test_res.delete)() self.assertEqual((test_res.DELETE, test_res.COMPLETE), test_res.state) diff --git a/heat/tests/test_nova_servergroup.py b/heat/tests/test_nova_servergroup.py index fd505c2ddf..212b8550d8 100644 --- a/heat/tests/test_nova_servergroup.py +++ b/heat/tests/test_nova_servergroup.py @@ -18,7 +18,7 @@ from heat.common import template_format from heat.engine import scheduler from heat.tests import common from heat.tests import utils -from heat.tests.v1_1 import fakes +from heat.tests.v1_1 import fakes as fakes_v1_1 sg_template = { "heat_template_version": "2013-05-23", @@ -99,7 +99,7 @@ class NovaServerGroupTest(common.HeatTestCase): def test_sg_delete_not_found(self): self._create_sg('test') - self.sg_mgr.delete.side_effect = fakes.fake_exception() + self.sg_mgr.delete.side_effect = fakes_v1_1.fake_exception() scheduler.TaskRunner(self.sg.delete)() self.sg_mgr.delete.assert_called_once_with('test') self.assertEqual((self.sg.DELETE, self.sg.COMPLETE), diff --git a/heat/tests/test_nova_utils.py b/heat/tests/test_nova_utils.py index ce4060fa75..c2567be1ec 100644 --- a/heat/tests/test_nova_utils.py +++ b/heat/tests/test_nova_utils.py @@ -23,7 +23,7 @@ from heat.common import exception from heat.engine.resources import nova_utils from heat.engine import scheduler from heat.tests import common -from heat.tests.v1_1 import fakes +from heat.tests.v1_1 import fakes as fakes_v1_1 class NovaUtilsTests(common.HeatTestCase): @@ -91,7 +91,7 @@ class NovaUtilsTests(common.HeatTestCase): self.nova_client.keypairs.get( my_key_name).AndReturn(my_key) self.nova_client.keypairs.get( - 'notakey').AndRaise(fakes.fake_exception()) + 'notakey').AndRaise(fakes_v1_1.fake_exception()) self.m.ReplayAll() self.assertEqual(my_key, nova_utils.get_keypair(self.nova_client, my_key_name)) @@ -147,12 +147,12 @@ class NovaUtilsRefreshServerTests(common.HeatTestCase): def test_overlimit_error(self): server = mock.Mock() - server.get.side_effect = fakes.fake_exception(413) + server.get.side_effect = fakes_v1_1.fake_exception(413) self.assertIsNone(nova_utils.refresh_server(server)) def test_500_error(self): server = self.m.CreateMockAnything() - server.get().AndRaise(fakes.fake_exception(500)) + server.get().AndRaise(fakes_v1_1.fake_exception(500)) self.m.ReplayAll() self.assertIsNone(nova_utils.refresh_server(server)) @@ -160,7 +160,7 @@ class NovaUtilsRefreshServerTests(common.HeatTestCase): def test_503_error(self): server = self.m.CreateMockAnything() - server.get().AndRaise(fakes.fake_exception(503)) + server.get().AndRaise(fakes_v1_1.fake_exception(503)) self.m.ReplayAll() self.assertIsNone(nova_utils.refresh_server(server)) @@ -168,7 +168,7 @@ class NovaUtilsRefreshServerTests(common.HeatTestCase): def test_unhandled_exception(self): server = self.m.CreateMockAnything() - server.get().AndRaise(fakes.fake_exception(501)) + server.get().AndRaise(fakes_v1_1.fake_exception(501)) self.m.ReplayAll() self.assertRaises(nova_exceptions.ClientException, diff --git a/heat/tests/test_security_group.py b/heat/tests/test_security_group.py index d954dccc10..51a6e52401 100644 --- a/heat/tests/test_security_group.py +++ b/heat/tests/test_security_group.py @@ -29,7 +29,7 @@ from heat.engine import scheduler from heat.engine import template from heat.tests import common from heat.tests import utils -from heat.tests.v1_1 import fakes +from heat.tests.v1_1 import fakes as fakes_v1_1 NovaSG = collections.namedtuple('NovaSG', @@ -130,7 +130,7 @@ Resources: def setUp(self): super(SecurityGroupTest, self).setUp() - self.fc = fakes.FakeClient() + self.fc = fakes_v1_1.FakeClient() self.m.StubOutWithMock(nova.NovaClientPlugin, '_create') self.stub_keystoneclient() self.m.StubOutWithMock(nova_sgr.SecurityGroupRuleManager, 'create') @@ -603,16 +603,16 @@ Resources: nova_sgr.SecurityGroupRuleManager.create( 2, 'tcp', 22, 22, '0.0.0.0/0', None).AndRaise( - fakes.fake_exception(400, 'Rule already exists')) + fakes_v1_1.fake_exception(400, 'Rule already exists')) nova_sgr.SecurityGroupRuleManager.create( 2, 'tcp', 80, 80, '0.0.0.0/0', None).AndReturn( - fakes.fake_exception(400, 'Rule already exists')) + fakes_v1_1.fake_exception(400, 'Rule already exists')) nova_sgr.SecurityGroupRuleManager.create( 2, 'tcp', None, None, None, 1).AndReturn( - fakes.fake_exception(400, 'Rule already exists')) + fakes_v1_1.fake_exception(400, 'Rule already exists')) nova_sgr.SecurityGroupRuleManager.create( 2, 'icmp', None, None, None, '1').AndReturn( - fakes.fake_exception(400, 'Rule already exists')) + fakes_v1_1.fake_exception(400, 'Rule already exists')) # delete script nova_sg.SecurityGroupManager.get(2).AndReturn(NovaSG( @@ -664,17 +664,17 @@ Resources: }] )) nova_sgr.SecurityGroupRuleManager.delete(130).AndRaise( - fakes.fake_exception()) + fakes_v1_1.fake_exception()) nova_sgr.SecurityGroupRuleManager.delete(131).AndRaise( - fakes.fake_exception()) + fakes_v1_1.fake_exception()) nova_sgr.SecurityGroupRuleManager.delete(132).AndRaise( - fakes.fake_exception()) + fakes_v1_1.fake_exception()) nova_sgr.SecurityGroupRuleManager.delete(133).AndRaise( - fakes.fake_exception()) + fakes_v1_1.fake_exception()) nova_sg.SecurityGroupManager.delete(2).AndReturn(None) nova_sg.SecurityGroupManager.get(2).AndRaise( - fakes.fake_exception()) + fakes_v1_1.fake_exception()) self.m.ReplayAll() stack = self.create_stack(self.test_template_nova) diff --git a/heat/tests/test_server_tags.py b/heat/tests/test_server_tags.py index 6ab8fbfc3d..871fb3d432 100644 --- a/heat/tests/test_server_tags.py +++ b/heat/tests/test_server_tags.py @@ -23,7 +23,7 @@ from heat.engine.resources import instance as instances from heat.engine import scheduler from heat.tests import common from heat.tests import utils -from heat.tests.v1_1 import fakes +from heat.tests.v1_1 import fakes as fakes_v1_1 instance_template = ''' @@ -55,7 +55,7 @@ instance_template = ''' class ServerTagsTest(common.HeatTestCase): def setUp(self): super(ServerTagsTest, self).setUp() - self.fc = fakes.FakeClient() + self.fc = fakes_v1_1.FakeClient() def _mock_get_image_id_success(self, imageId_input, imageId): self.m.StubOutWithMock(glance.GlanceClientPlugin, 'get_image_id') diff --git a/heat/tests/test_sqlalchemy_api.py b/heat/tests/test_sqlalchemy_api.py index ef9bca0806..8c9255ac80 100644 --- a/heat/tests/test_sqlalchemy_api.py +++ b/heat/tests/test_sqlalchemy_api.py @@ -33,7 +33,7 @@ from heat.engine.resources import instance as instances from heat.engine import scheduler from heat.tests import common from heat.tests import utils -from heat.tests.v1_1 import fakes +from heat.tests.v1_1 import fakes as fakes_v1_1 wp_template = ''' @@ -86,7 +86,7 @@ class MyResource(rsrc.Resource): class SqlAlchemyTest(common.HeatTestCase): def setUp(self): super(SqlAlchemyTest, self).setUp() - self.fc = fakes.FakeClient() + self.fc = fakes_v1_1.FakeClient() self.ctx = utils.dummy_context() def tearDown(self): @@ -111,7 +111,7 @@ class SqlAlchemyTest(common.HeatTestCase): return (template, stack) def _mock_create(self, mocks): - fc = fakes.FakeClient() + fc = fakes_v1_1.FakeClient() mocks.StubOutWithMock(instances.Instance, 'nova') instances.Instance.nova().MultipleTimes().AndReturn(fc) self.m.StubOutWithMock(nova.NovaClientPlugin, '_create') @@ -130,12 +130,12 @@ class SqlAlchemyTest(common.HeatTestCase): return fc def _mock_delete(self, mocks): - fc = fakes.FakeClient() + fc = fakes_v1_1.FakeClient() mocks.StubOutWithMock(instances.Instance, 'nova') instances.Instance.nova().MultipleTimes().AndReturn(fc) mocks.StubOutWithMock(fc.client, 'get_servers_9999') get = fc.client.get_servers_9999 - get().MultipleTimes().AndRaise(fakes.fake_exception()) + get().MultipleTimes().AndRaise(fakes_v1_1.fake_exception()) @mock.patch.object(db_api, '_paginate_query') def test_filter_and_page_query_paginates_query(self, mock_paginate_query): diff --git a/heat/tests/test_validate.py b/heat/tests/test_validate.py index 56b5ba63f7..3deb47c760 100644 --- a/heat/tests/test_validate.py +++ b/heat/tests/test_validate.py @@ -26,7 +26,7 @@ from heat.engine import resources from heat.engine import service from heat.tests import common from heat.tests import utils -from heat.tests.v1_1 import fakes +from heat.tests.v1_1 import fakes as fakes_v1_1 test_template_volumeattach = ''' { @@ -843,8 +843,8 @@ class validateTest(common.HeatTestCase): def setUp(self): super(validateTest, self).setUp() resources.initialise() - self.fc = fakes.FakeClient() - self.gc = fakes.FakeClient() + self.fc = fakes_v1_1.FakeClient() + self.gc = fakes_v1_1.FakeClient() resources.initialise() self.ctx = utils.dummy_context() self.patch('heat.engine.service.warnings') diff --git a/heat/tests/test_volume.py b/heat/tests/test_volume.py index 36d2dbfe05..d296d3cfdc 100644 --- a/heat/tests/test_volume.py +++ b/heat/tests/test_volume.py @@ -34,7 +34,7 @@ from heat.engine import rsrc_defn from heat.engine import scheduler from heat.tests import common from heat.tests import utils -from heat.tests.v1_1 import fakes +from heat.tests.v1_1 import fakes as fakes_v1_1 volume_template = ''' @@ -122,7 +122,7 @@ resources: class BaseVolumeTest(common.HeatTestCase): def setUp(self): super(BaseVolumeTest, self).setUp() - self.fc = fakes.FakeClient() + self.fc = fakes_v1_1.FakeClient() self.cinder_fc = cinderclient.Client('username', 'password') self.cinder_fc.volume_api_version = 2 self.m.StubOutWithMock(cinder.CinderClientPlugin, '_create') @@ -352,7 +352,7 @@ class VolumeTest(BaseVolumeTest): self.fc.volumes.get_server_volume(u'WikiDatabase', 'vol-123').AndReturn(fva) self.fc.volumes.get_server_volume( - u'WikiDatabase', 'vol-123').AndRaise(fakes.fake_exception()) + u'WikiDatabase', 'vol-123').AndRaise(fakes_v1_1.fake_exception()) self.m.ReplayAll() @@ -383,12 +383,12 @@ class VolumeTest(BaseVolumeTest): self.cinder_fc.volumes.get(fva.id).AndReturn(fva) self.fc.volumes.delete_server_volume( - 'WikiDatabase', 'vol-123').AndRaise(fakes.fake_exception(400)) + 'WikiDatabase', 'vol-123').AndRaise(fakes_v1_1.fake_exception(400)) self.fc.volumes.get_server_volume(u'WikiDatabase', 'vol-123').AndReturn(fva) self.fc.volumes.get_server_volume( - u'WikiDatabase', 'vol-123').AndRaise(fakes.fake_exception()) + u'WikiDatabase', 'vol-123').AndRaise(fakes_v1_1.fake_exception()) self.m.ReplayAll() stack = utils.parse_stack(self.t, stack_name=stack_name) @@ -446,7 +446,7 @@ class VolumeTest(BaseVolumeTest): self.fc.volumes.get_server_volume(u'WikiDatabase', 'vol-123').AndReturn(fva) self.fc.volumes.get_server_volume( - u'WikiDatabase', 'vol-123').AndRaise(fakes.fake_exception()) + u'WikiDatabase', 'vol-123').AndRaise(fakes_v1_1.fake_exception()) self.m.ReplayAll() @@ -959,7 +959,7 @@ class CinderVolumeTest(BaseVolumeTest): self.fc.volumes.get_server_volume(u'WikiDatabase', 'vol-123').AndReturn(fva) self.fc.volumes.get_server_volume( - u'WikiDatabase', 'vol-123').AndRaise(fakes.fake_exception()) + u'WikiDatabase', 'vol-123').AndRaise(fakes_v1_1.fake_exception()) self.m.ReplayAll() @@ -1124,7 +1124,7 @@ class CinderVolumeTest(BaseVolumeTest): self.fc.volumes.get_server_volume(u'WikiDatabase', 'vol-123').AndReturn(fvd) self.fc.volumes.get_server_volume( - u'WikiDatabase', 'vol-123').AndRaise(fakes.fake_exception()) + u'WikiDatabase', 'vol-123').AndRaise(fakes_v1_1.fake_exception()) # resize script fvr = FakeLatencyVolume(life_cycle=('extending', 'extending', @@ -1328,7 +1328,7 @@ class CinderVolumeTest(BaseVolumeTest): self.fc.volumes.get_server_volume(u'WikiDatabase', 'vol-123').AndReturn(fva) self.fc.volumes.get_server_volume( - u'WikiDatabase', 'vol-123').AndRaise(fakes.fake_exception()) + u'WikiDatabase', 'vol-123').AndRaise(fakes_v1_1.fake_exception()) # attach script self._mock_create_server_volume_script(fva2, device=u'/dev/vdd', @@ -1382,7 +1382,7 @@ class CinderVolumeTest(BaseVolumeTest): self.fc.volumes.get_server_volume(u'WikiDatabase', 'vol-123').AndReturn(fva) self.fc.volumes.get_server_volume( - u'WikiDatabase', 'vol-123').AndRaise(fakes.fake_exception()) + u'WikiDatabase', 'vol-123').AndRaise(fakes_v1_1.fake_exception()) # attach script self._mock_create_server_volume_script(fv2a, volume='vol-456', @@ -1429,7 +1429,7 @@ class CinderVolumeTest(BaseVolumeTest): self.fc.volumes.get_server_volume(u'WikiDatabase', 'vol-123').AndReturn(fva) self.fc.volumes.get_server_volume( - u'WikiDatabase', 'vol-123').AndRaise(fakes.fake_exception()) + u'WikiDatabase', 'vol-123').AndRaise(fakes_v1_1.fake_exception()) # attach script self._mock_create_server_volume_script(fva2, server=u'AnotherServer',