Merged waldon.

3 files changed, 90 insertions, 5 deletions

diff --git a/nova/api/openstack/servers.py b/nova/api/openstack/servers.py
index 4b2703549..edf98fe93 100644
--- a/nova/api/openstack/servers.py
+++ b/nova/api/openstack/servers.py
@@ -611,9 +611,7 @@ class ControllerV10(Controller):
             return faults.Fault(exc.HTTPBadRequest(msg))
 
         image_id = input_dict['rebuild']['imageId']
-
         self.compute_api.rebuild(context, id, image_id)
-
         return exc.HTTPAccepted()
 
 
@@ -643,7 +641,27 @@ class ControllerV11(Controller):
         return common.limited_by_marker(items, req)
 
     def _action_rebuild(self, input_dict, req, id):
-        return faults.Fault(exc.HTTPNotImplemented())
+        context = req.environ['nova.context']
+        if (not 'rebuild' in input_dict
+            or not 'imageRef' in input_dict['rebuild']):
+            msg = _("No imageRef was specified")
+            return faults.Fault(exc.HTTPBadRequest(msg))
+
+        image_ref = input_dict['rebuild']['imageRef']
+        image_id = common.get_id_from_href(image_ref)
+
+        metadata = []
+        if 'metadata' in input_dict['rebuild']:
+            try:
+                for k, v in input_dict['rebuild']['metadata'].items():
+                    metadata.append({'key': k, 'value': v})
+
+            except Exception:
+                msg = _("Improperly formatted metadata provided")
+                return exc.HTTPBadRequest(msg)
+
+        self.compute_api.rebuild(context, id, image_id, metadata)
+        return exc.HTTPAccepted()
 
 
 class ServerCreateRequestXMLDeserializer(object):
diff --git a/nova/compute/api.py b/nova/compute/api.py
index 93a5e7855..fdfb8103b 100644
--- a/nova/compute/api.py
+++ b/nova/compute/api.py
@@ -482,12 +482,15 @@ class API(base.Base):
 
     def rebuild(self, context, instance_id, image_id, metadata=None):
         """Rebuild the given instance with the provided metadata."""
-        return
         # default to an empty list
         metadata = metadata or []
         #TODO: validate metadata
+        params = {
+            "image_id": image_id,
+            "metadata": metadata,
+        }
         self._cast_compute_message('rebuild_instance', context,
-                                   instance_id, metadata)
+                                   instance_id, params=params)
 
     def revert_resize(self, context, instance_id):
         """Reverts a resize, deleting the 'new' instance in the process"""
diff --git a/nova/tests/api/openstack/test_servers.py b/nova/tests/api/openstack/test_servers.py
index 87abc0067..00c6d850a 100644
--- a/nova/tests/api/openstack/test_servers.py
+++ b/nova/tests/api/openstack/test_servers.py
@@ -803,6 +803,70 @@ class ServersTest(test.TestCase):
         res = req.get_response(fakes.wsgi_app())
         self.assertEqual(res.status_int, 400)
 
+    def test_server_rebuild_accepted_minimum_v11(self):
+        body = {
+            "rebuild": {
+                "imageRef": "http://localhost/images/2",
+            },
+        }
+
+        req = webob.Request.blank('/v1.1/servers/1/action')
+        req.method = 'POST'
+        req.content_type = 'application/json'
+        req.body = json.dumps(body)
+
+        res = req.get_response(fakes.wsgi_app())
+        self.assertEqual(res.status_int, 202)
+
+    def test_server_rebuild_accepted_with_metadata_v11(self):
+        body = {
+            "rebuild": {
+                "imageRef": "http://localhost/images/2",
+                "metadata": {
+                    "open": "stack",
+                },
+            },
+        }
+
+        req = webob.Request.blank('/v1.1/servers/1/action')
+        req.method = 'POST'
+        req.content_type = 'application/json'
+        req.body = json.dumps(body)
+
+        res = req.get_response(fakes.wsgi_app())
+        self.assertEqual(res.status_int, 202)
+
+    def test_server_rebuild_accepted_with_bad_metadata_v11(self):
+        body = {
+            "rebuild": {
+                "imageRef": "http://localhost/images/2",
+                "metadata": "stack",
+            },
+        }
+
+        req = webob.Request.blank('/v1.1/servers/1/action')
+        req.method = 'POST'
+        req.content_type = 'application/json'
+        req.body = json.dumps(body)
+
+        res = req.get_response(fakes.wsgi_app())
+        self.assertEqual(res.status_int, 400)
+
+    def test_server_rebuild_bad_entity_v11(self):
+        body = {
+            "rebuild": {
+                "imageId": 2,
+            },
+        }
+
+        req = webob.Request.blank('/v1.1/servers/1/action')
+        req.method = 'POST'
+        req.content_type = 'application/json'
+        req.body = json.dumps(body)
+
+        res = req.get_response(fakes.wsgi_app())
+        self.assertEqual(res.status_int, 400)
+
     def test_delete_server_instance(self):
         req = webob.Request.blank('/v1.0/servers/1')
         req.method = 'DELETE'