From 1940ccffb6c22c39d6c21be4e84f20e350599f71 Mon Sep 17 00:00:00 2001
From: Alex Meade <alex.meade@rackspace.com>
Date: Thu, 7 Jul 2011 16:19:21 -0400
Subject: Removed serverRef from some tests and viewbuilder

---
 nova/api/openstack/views/images.py      |  4 +++-
 nova/tests/api/openstack/test_images.py | 33 ++-------------------------------
 2 files changed, 5 insertions(+), 32 deletions(-)

diff --git a/nova/api/openstack/views/images.py b/nova/api/openstack/views/images.py
index fc4c1b55e..ae8e73678 100644
--- a/nova/api/openstack/views/images.py
+++ b/nova/api/openstack/views/images.py
@@ -98,7 +98,9 @@ class ViewBuilderV11(ViewBuilder):
 
     def _build_server(self, image, image_obj):
         try:
-            image['serverRef'] = image_obj['properties']['instance_ref']
+            serverRef = image_obj['properties']['instance_ref']
+            #TODO (ameade)  get the server information
+            #image['server'] = ?
         except KeyError:
             return
 
diff --git a/nova/tests/api/openstack/test_images.py b/nova/tests/api/openstack/test_images.py
index d45195286..7e2240830 100644
--- a/nova/tests/api/openstack/test_images.py
+++ b/nova/tests/api/openstack/test_images.py
@@ -401,12 +401,13 @@ class ImageControllerWithGlanceServiceTest(test.TestCase):
 
         href = "http://localhost/v1.1/images/124"
         bookmark = "http://localhost/images/124"
+        server_href = "http://localhost/v1.1/servers/42"
+        server_bookmark = "http://localhost/servers/42"
 
         expected_image = {
             "image": {
                 "id": 124,
                 "name": "queued snapshot",
-                "serverRef": "http://localhost/v1.1/servers/42",
                 "updated": self.NOW_API_FORMAT,
                 "created": self.NOW_API_FORMAT,
                 "status": "QUEUED",
@@ -648,7 +649,6 @@ class ImageControllerWithGlanceServiceTest(test.TestCase):
                 u'instance_ref': u'http://localhost/v1.1/servers/42',
                 u'user_id': u'1',
             },
-            'serverRef': "http://localhost/v1.1/servers/42",
             'updated': self.NOW_API_FORMAT,
             'created': self.NOW_API_FORMAT,
             'status': 'QUEUED',
@@ -668,7 +668,6 @@ class ImageControllerWithGlanceServiceTest(test.TestCase):
                 u'instance_ref': u'http://localhost/v1.1/servers/42',
                 u'user_id': u'1',
             },
-            'serverRef': "http://localhost/v1.1/servers/42",
             'updated': self.NOW_API_FORMAT,
             'created': self.NOW_API_FORMAT,
             'status': 'SAVING',
@@ -689,7 +688,6 @@ class ImageControllerWithGlanceServiceTest(test.TestCase):
                 u'instance_ref': u'http://localhost/v1.1/servers/42',
                 u'user_id': u'1',
             },
-            'serverRef': "http://localhost/v1.1/servers/42",
             'updated': self.NOW_API_FORMAT,
             'created': self.NOW_API_FORMAT,
             'status': 'ACTIVE',
@@ -709,7 +707,6 @@ class ImageControllerWithGlanceServiceTest(test.TestCase):
                 u'instance_ref': u'http://localhost/v1.1/servers/42',
                 u'user_id': u'1',
             },
-            'serverRef': "http://localhost/v1.1/servers/42",
             'updated': self.NOW_API_FORMAT,
             'created': self.NOW_API_FORMAT,
             'status': 'FAILED',
@@ -1029,30 +1026,6 @@ class ImageControllerWithGlanceServiceTest(test.TestCase):
         response = req.get_response(fakes.wsgi_app())
         self.assertEqual(200, response.status_int)
 
-    def test_create_image_v1_1_actual_server_ref(self):
-
-        serverRef = 'http://localhost/v1.1/servers/1'
-        body = dict(image=dict(serverRef=serverRef, name='Backup 1'))
-        req = webob.Request.blank('/v1.1/images')
-        req.method = 'POST'
-        req.body = json.dumps(body)
-        req.headers["content-type"] = "application/json"
-        response = req.get_response(fakes.wsgi_app())
-        self.assertEqual(200, response.status_int)
-        result = json.loads(response.body)
-        self.assertEqual(result['image']['serverRef'], serverRef)
-
-    def test_create_image_v1_1_server_ref_bad_hostname(self):
-
-        serverRef = 'http://asdf/v1.1/servers/1'
-        body = dict(image=dict(serverRef=serverRef, name='Backup 1'))
-        req = webob.Request.blank('/v1.1/images')
-        req.method = 'POST'
-        req.body = json.dumps(body)
-        req.headers["content-type"] = "application/json"
-        response = req.get_response(fakes.wsgi_app())
-        self.assertEqual(400, response.status_int)
-
     def test_create_image_v1_1_no_server_ref(self):
 
         body = dict(image=dict(name='Snapshot 1'))
@@ -1441,8 +1414,6 @@ class ImageXMLSerializationTest(test.TestCase):
         output = serializer.serialize(fixtures, 'index')
         actual = minidom.parseString(output.replace("  ", ""))
 
-        expected_serverRef = self.SERVER_HREF
-        expected_now = self.TIMESTAMP
         expected = minidom.parseString("""
         <images
                 xmlns="http://docs.openstack.org/compute/api/v1.1"
-- 
cgit