summaryrefslogtreecommitdiff
path: root/heat/tests/test_metadata_refresh.py
diff options
context:
space:
mode:
Diffstat (limited to 'heat/tests/test_metadata_refresh.py')
-rw-r--r--heat/tests/test_metadata_refresh.py14
1 files changed, 7 insertions, 7 deletions
diff --git a/heat/tests/test_metadata_refresh.py b/heat/tests/test_metadata_refresh.py
index 3a5b9ce44..07a75758f 100644
--- a/heat/tests/test_metadata_refresh.py
+++ b/heat/tests/test_metadata_refresh.py
@@ -18,9 +18,9 @@ from oslo.config import cfg
from heat.common import identifier
from heat.common import template_format
+from heat.engine.clients.os import glance
from heat.engine import environment
from heat.engine import parser
-from heat.engine.resources import image
from heat.engine.resources import instance
from heat.engine.resources import nova_keypair
from heat.engine.resources import server
@@ -168,8 +168,8 @@ class MetadataRefreshTest(HeatTestCase):
self.m.StubOutWithMock(nova_keypair.KeypairConstraint, 'validate')
nova_keypair.KeypairConstraint.validate(
mox.IgnoreArg(), mox.IgnoreArg()).MultipleTimes().AndReturn(True)
- self.m.StubOutWithMock(image.ImageConstraint, 'validate')
- image.ImageConstraint.validate(
+ self.m.StubOutWithMock(glance.ImageConstraint, 'validate')
+ glance.ImageConstraint.validate(
mox.IgnoreArg(), mox.IgnoreArg()).MultipleTimes().AndReturn(True)
self.m.StubOutWithMock(instance.Instance, 'handle_create')
@@ -237,8 +237,8 @@ class WaitCondMetadataUpdateTest(HeatTestCase):
self.m.StubOutWithMock(nova_keypair.KeypairConstraint, 'validate')
nova_keypair.KeypairConstraint.validate(
mox.IgnoreArg(), mox.IgnoreArg()).MultipleTimes().AndReturn(True)
- self.m.StubOutWithMock(image.ImageConstraint, 'validate')
- image.ImageConstraint.validate(
+ self.m.StubOutWithMock(glance.ImageConstraint, 'validate')
+ glance.ImageConstraint.validate(
mox.IgnoreArg(), mox.IgnoreArg()).MultipleTimes().AndReturn(True)
self.m.StubOutWithMock(instance.Instance, 'handle_create')
@@ -333,8 +333,8 @@ class MetadataRefreshTestServer(HeatTestCase):
self.m.StubOutWithMock(nova_keypair.KeypairConstraint, 'validate')
nova_keypair.KeypairConstraint.validate(
mox.IgnoreArg(), mox.IgnoreArg()).MultipleTimes().AndReturn(True)
- self.m.StubOutWithMock(image.ImageConstraint, 'validate')
- image.ImageConstraint.validate(
+ self.m.StubOutWithMock(glance.ImageConstraint, 'validate')
+ glance.ImageConstraint.validate(
mox.IgnoreArg(), mox.IgnoreArg()).MultipleTimes().AndReturn(True)
self.m.StubOutWithMock(server.Server, 'handle_create')