merged trunk

2 files changed, 20 insertions, 17 deletions

diff --git a/nova/api/openstack/views/servers.py b/nova/api/openstack/views/servers.py
index a8171fa15..be25e1e40 100644
--- a/nova/api/openstack/views/servers.py
+++ b/nova/api/openstack/views/servers.py
@@ -162,7 +162,6 @@ class ViewBuilderV11(ViewBuilder):
         if 'image_ref' in dict(inst):
             image_href = inst['image_ref']
             image_id = str(common.get_id_from_href(image_href))
-            print "IMAGE ID:", image_id
             _bookmark = self.image_builder.generate_bookmark(image_id)
             response['image'] = {
                 "id": image_id,
diff --git a/nova/tests/api/openstack/test_servers.py b/nova/tests/api/openstack/test_servers.py
index 3c50f4638..48213085a 100644
--- a/nova/tests/api/openstack/test_servers.py
+++ b/nova/tests/api/openstack/test_servers.py
@@ -78,16 +78,16 @@ def return_virtual_interface_instance_nonexistant(interfaces):
     return _return_virtual_interface_by_instance
 
 
-def return_server_with_addresses(private, public):
+def return_server_with_attributes(**kwargs):
     def _return_server(context, id):
-        return stub_instance(id, private_address=private,
-                             public_addresses=public)
+        return stub_instance(id, **kwargs)
     return _return_server
 
 
-def return_server_with_interfaces(interfaces, **kwargs):
+def return_server_with_addresses(private, public):
     def _return_server(context, id):
-        return stub_instance(id, interfaces=interfaces, **kwargs)
+        return stub_instance(id, private_address=private,
+                             public_addresses=public)
     return _return_server
 
 
@@ -325,7 +325,8 @@ class ServersTest(test.TestCase):
                 ],
             },
         ]
-        new_return_server = return_server_with_interfaces(interfaces)
+        new_return_server = return_server_with_attributes(
+            interfaces=interfaces)
         self.stubs.Set(nova.db.api, 'instance_get', new_return_server)
 
         req = webob.Request.blank('/v1.1/servers/1')
@@ -416,7 +417,8 @@ class ServersTest(test.TestCase):
                 ],
             },
         ]
-        new_return_server = return_server_with_interfaces(interfaces)
+        new_return_server = return_server_with_attributes(
+            interfaces=interfaces)
         self.stubs.Set(nova.db.api, 'instance_get', new_return_server)
 
         req = webob.Request.blank('/v1.1/servers/1')
@@ -485,8 +487,8 @@ class ServersTest(test.TestCase):
                 ],
             },
         ]
-        new_return_server = return_server_with_interfaces(interfaces,
-                                                          power_state=1)
+        new_return_server = return_server_with_attributes(
+            interfaces=interfaces, power_state=1)
         self.stubs.Set(nova.db.api, 'instance_get', new_return_server)
 
         req = webob.Request.blank('/v1.1/servers/1')
@@ -575,10 +577,9 @@ class ServersTest(test.TestCase):
                 ],
             },
         ]
-        new_return_server = return_server_with_interfaces(interfaces,
-                                                          power_state=1,
-                                                          image_ref=image_ref,
-                                                          flavor_id=flavor_id)
+        new_return_server = return_server_with_attributes(
+            interfaces=interfaces, power_state=1, image_ref=image_ref,
+            flavor_id=flavor_id)
         self.stubs.Set(nova.db.api, 'instance_get', new_return_server)
 
         req = webob.Request.blank('/v1.1/servers/1')
@@ -777,7 +778,8 @@ class ServersTest(test.TestCase):
                 'fixed_ipv6': '2001:4860::12',
             },
         ]
-        new_return_server = return_server_with_interfaces(interfaces)
+        new_return_server = return_server_with_attributes(
+            interfaces=interfaces)
         self.stubs.Set(nova.db.api, 'instance_get', new_return_server)
 
         req = webob.Request.blank('/v1.1/servers/1')
@@ -820,7 +822,8 @@ class ServersTest(test.TestCase):
                 'fixed_ipv6': '2001:4860::12',
             },
         ]
-        new_return_server = return_server_with_interfaces(interfaces)
+        new_return_server = return_server_with_attributes(
+            interfaces=interfaces)
         self.stubs.Set(nova.db.api, 'instance_get', new_return_server)
 
         req = webob.Request.blank('/v1.1/servers/1')
@@ -3009,7 +3012,8 @@ class ServersViewBuilderV11Test(test.TestCase):
             address_builder,
             flavor_builder,
             image_builder,
-            base_url)
+            base_url,
+            )
         return view_builder
 
     def test_build_server(self):