summaryrefslogtreecommitdiffstats
path: root/nova/tests
diff options
context:
space:
mode:
authorSandy Walsh <sandy.walsh@rackspace.com>2011-05-31 06:29:38 -0700
committerSandy Walsh <sandy.walsh@rackspace.com>2011-05-31 06:29:38 -0700
commitfccc653376ec03e2f8d4e91449a18d62cd87902f (patch)
tree3f99c3d639a8c8251c281453ff892a2d267327c3 /nova/tests
parent544ec189a7fddc4b4491774b62071a4884e8e895 (diff)
downloadnova-fccc653376ec03e2f8d4e91449a18d62cd87902f.tar.gz
nova-fccc653376ec03e2f8d4e91449a18d62cd87902f.tar.xz
nova-fccc653376ec03e2f8d4e91449a18d62cd87902f.zip
tests passing again
Diffstat (limited to 'nova/tests')
-rw-r--r--nova/tests/api/openstack/test_servers.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/nova/tests/api/openstack/test_servers.py b/nova/tests/api/openstack/test_servers.py
index fbde5c9ce..7bad28ca8 100644
--- a/nova/tests/api/openstack/test_servers.py
+++ b/nova/tests/api/openstack/test_servers.py
@@ -31,6 +31,7 @@ from nova import flags
from nova import test
import nova.api.openstack
from nova.api.openstack import servers
+from nova.api.openstack import create_instance_controller
import nova.compute.api
from nova.compute import instance_types
from nova.compute import power_state
@@ -1380,7 +1381,8 @@ class ServersTest(test.TestCase):
class TestServerCreateRequestXMLDeserializer(unittest.TestCase):
def setUp(self):
- self.deserializer = servers.ServerCreateRequestXMLDeserializer()
+ self.deserializer = \
+ create_instance_controller.ServerCreateRequestXMLDeserializer()
def test_minimal_request(self):
serial_request = """