Merge lp:~gundlach/nova/rsapi-reboot into lp:~cerberus/nova/servers_api

[Michael Gundlach]

Reboot functionality in servers Controller, and a couple of missing imports in unittests.

Note that I did this semi-blind, relying on _deserialize() and _instance_id_translator() to exist and work. You'll want to make sure it merges properly into your branch.

Also, you might need to pull from trunk in order for this merge to look small, as I've got the latest trunk in here.

[lp:~gundlach/nova/rsapi-reboot]

299. By Michael Gundlach on 2010-09-29

Support reboot in api.rackspace by extracting reboot function from api.ec2 into api.cloud.

[Jay Pipes (jaypipes)]

nice.

review: Approve

[Matt Dietz (cerberus)]

Seems fine.

Only thing to note is that the other actions (Resize and Rebuild) will also multiplex through the action... action :-/ So we may want to raise "not implemented" if anything but a reboot is requested.

[Matt Dietz (cerberus)]

Disregard, I just realized it would do that no matter what.

=== added file 'nova/api/cloud.py'
--- nova/api/cloud.py	1970-01-01 00:00:00 +0000
+++ nova/api/cloud.py	2010-09-29 19:55:55 +0000
@@ -0,0 +1,42 @@
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+# Copyright 2010 United States Government as represented by the
+# Administrator of the National Aeronautics and Space Administration.
+# All Rights Reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
+"""
+Methods for API calls to control instances via AMQP.
+"""
+
+
+from nova import db
+from nova import flags
+from nova import rpc
+
+FLAGS = flags.FLAGS
+
+
+def reboot(instance_id, context=None):
+    """Reboot the given instance.
+    
+    #TODO(gundlach) not actually sure what context is used for by ec2 here
+    -- I think we can just remove it and use None all the time.
+    """
+    instance_ref = db.instance_get_by_ec2_id(None, instance_id)
+    host = instance_ref['host']
+    rpc.cast(db.queue_get_for(context, FLAGS.compute_topic, host),
+             {"method": "reboot_instance",
+              "args": {"context": None,
+                       "instance_id": instance_ref['id']}})

=== modified file 'nova/api/ec2/cloud.py'
--- nova/api/ec2/cloud.py	2010-09-28 23:10:47 +0000
+++ nova/api/ec2/cloud.py	2010-09-29 19:55:55 +0000
@@ -36,6 +36,7 @@
 from nova import rpc
 from nova import utils
 from nova.compute.instance_types import INSTANCE_TYPES
+from nova.api import cloud
 from nova.api.ec2 import images
 
 
@@ -664,12 +665,7 @@
     def reboot_instances(self, context, instance_id, **kwargs):
         """instance_id is a list of instance ids"""
         for id_str in instance_id:
-            instance_ref = db.instance_get_by_ec2_id(context, id_str)
-            host = instance_ref['host']
-            rpc.cast(db.queue_get_for(context, FLAGS.compute_topic, host),
-                     {"method": "reboot_instance",
-                      "args": {"context": None,
-                               "instance_id": instance_ref['id']}})
+            cloud.reboot(id_str, context=context)
         return True
 
     def delete_volume(self, context, volume_id, **kwargs):

=== modified file 'nova/api/rackspace/servers.py'
--- nova/api/rackspace/servers.py	2010-09-29 17:58:40 +0000
+++ nova/api/rackspace/servers.py	2010-09-29 19:55:55 +0000
@@ -24,6 +24,7 @@
 from nova import rpc
 from nova import utils
 from nova import wsgi
+from nova.api import cloud
 from nova.api.rackspace import _id_translator
 from nova.compute import power_state
 from nova.wsgi import Serializer
@@ -171,8 +172,13 @@
     def action(self, req, id):
         """ multi-purpose method used to reboot, rebuild, and 
         resize a server """
-        if not req.environ.has_key('inst_dict'):
-            return exc.HTTPUnprocessableEntity()
+        input_dict = self._deserialize(req.body, req)
+        try:
+            reboot_type = input_dict['reboot']['type']
+        except Exception:
+            raise faults.Fault(webob.exc.HTTPNotImplemented())
+        opaque_id = _instance_id_translator().from_rsapi_id(id)
+        cloud.reboot(opaque_id)
 
     def _build_server_instance(self, req):
         """Build instance data structure and save it to the data store."""

=== modified file 'nova/tests/api/rackspace/images.py'
--- nova/tests/api/rackspace/images.py	2010-08-30 19:04:47 +0000
+++ nova/tests/api/rackspace/images.py	2010-09-29 19:55:55 +0000
@@ -15,6 +15,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+import stubout
 import unittest
 
 from nova.api.rackspace import images

=== modified file 'nova/tests/api/rackspace/sharedipgroups.py'
--- nova/tests/api/rackspace/sharedipgroups.py	2010-08-25 21:37:22 +0000
+++ nova/tests/api/rackspace/sharedipgroups.py	2010-09-29 19:55:55 +0000
@@ -15,6 +15,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+import stubout
 import unittest
 
 from nova.api.rackspace import sharedipgroups