From 8739529368cb755d33c3d8c532dd1c5d86f0bf85 Mon Sep 17 00:00:00 2001
From: Dan Prince <dan.prince@rackspace.com>
Date: Fri, 3 Jun 2011 08:50:30 -0400
Subject: Implement OSAPI v1.1 style image create.

---
 nova/api/openstack/images.py | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'nova/api')

diff --git a/nova/api/openstack/images.py b/nova/api/openstack/images.py
index 59d9e3082..48ea04248 100644
--- a/nova/api/openstack/images.py
+++ b/nova/api/openstack/images.py
@@ -123,7 +123,7 @@ class Controller(object):
             raise webob.exc.HTTPBadRequest()
 
         try:
-            server_id = body["image"]["serverId"]
+            server_id = self._server_id_from_req_data(body)
             image_name = body["image"]["name"]
         except KeyError:
             raise webob.exc.HTTPBadRequest()
@@ -135,6 +135,9 @@ class Controller(object):
         """Indicates that you must use a Controller subclass."""
         raise NotImplementedError
 
+    def _server_id_from_req_data(self, data):
+        raise NotImplementedError()
+
 
 class ControllerV10(Controller):
     """Version 1.0 specific controller logic."""
@@ -144,6 +147,9 @@ class ControllerV10(Controller):
         base_url = request.application_url
         return images_view.ViewBuilderV10(base_url)
 
+    def _server_id_from_req_data(self, data):
+        return data['image']['serverId']
+
 
 class ControllerV11(Controller):
     """Version 1.1 specific controller logic."""
@@ -153,6 +159,9 @@ class ControllerV11(Controller):
         base_url = request.application_url
         return images_view.ViewBuilderV11(base_url)
 
+    def _server_id_from_req_data(self, data):
+        return data['image']['serverRef']
+
 
 def create_resource(version='1.0'):
     controller = {
-- 
cgit 


From 0ef4a127e9539f90ac1d2f2846832ecc48b51e05 Mon Sep 17 00:00:00 2001
From: Dan Prince <dan.prince@rackspace.com>
Date: Fri, 3 Jun 2011 09:31:43 -0400
Subject: Add serverRef to image metadata serialization list.

---
 nova/api/openstack/images.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'nova/api')

diff --git a/nova/api/openstack/images.py b/nova/api/openstack/images.py
index 48ea04248..1fa3267dc 100644
--- a/nova/api/openstack/images.py
+++ b/nova/api/openstack/images.py
@@ -177,7 +177,7 @@ def create_resource(version='1.0'):
     metadata = {
         "attributes": {
             "image": ["id", "name", "updated", "created", "status",
-                      "serverId", "progress"],
+                      "serverId", "progress", "serverRef"],
             "link": ["rel", "type", "href"],
         },
     }
-- 
cgit