Merge lp:~cerberus/nova/lp853573 into lp:~hudson-openstack/nova/trunk

[Matt Dietz]

Fixes lp853573 for XenServer only

Implements an OS API extension that allows a user to power back on an instance that was shutdown through other means.

[lp:~cerberus/nova/lp853573]

1593. By Matt Dietz on 2011-09-20

Failed the inane extension list test

[Sandy Walsh (sandy-walsh)]

Shouldn't HyperV be pass'ed as well?

+47, you're using routing_get(), but don't have any decorators for redirecting the call the child zones (hmm, actually, haven't tried /server/XXX/action or extensions with rerouting, so it could be a fun investigation). So, either it should use .get() or use the decorators.

That get_updated() call seems like a recipe for debugging down the road. I know I'll never remember to update that method on a bug fix. I know, not your problem.

Otherwise, lgtm

review: Needs Fixing

[Sandy Walsh (sandy-walsh)]

Oh, should this be an admin-only operation? Or do you need admin context to perform it?

review: Needs Information

Unmerged revisions

1593. By Matt Dietz on 2011-09-20

Failed the inane extension list test

1592. By Matt Dietz on 2011-09-20

Merge from trunk

1591. By Matt Dietz on 2011-09-19

Merge from remote

1590. By Matt Dietz on 2011-09-19

Power on action extension with passing unit tests

=== added file 'nova/api/openstack/contrib/instanceactions.py'
--- nova/api/openstack/contrib/instanceactions.py	1970-01-01 00:00:00 +0000
+++ nova/api/openstack/contrib/instanceactions.py	2011-09-20 18:37:25 +0000
@@ -0,0 +1,86 @@
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+# Copyright 2011 OpenStack LLC.
+#
+#    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
+
+import json
+
+from webob import exc
+import webob
+
+from nova import compute
+from nova import exception
+import nova.image
+from nova import log as logging
+from nova import network
+from nova import rpc
+from nova.api.openstack import faults
+from nova.api.openstack import extensions
+from nova.api.openstack import wsgi
+
+LOG = logging.getLogger('nova.api.openstack.contrib.instanceactions')
+
+class InstanceActionsController(object):
+    def __init__(self):
+        self.compute_api = compute.API()
+
+    def create(self, req, server_id, body=None):
+        if not body:
+            return faults.Fault(exc.HTTPUnprocessableEntity())
+        context = req.environ['nova.context']
+        try:
+            server = self.compute_api.routing_get(context, server_id)
+        except exception.NotFound:
+            explanation = _("Server not found.")
+            return faults.Fault(exc.HTTPNotFound(explanation=explanation))
+
+        action_type = body['server']['action']
+        if action_type == 'poweron':
+            self.compute_api.power_on_instance(context, server_id)
+        else:
+            fault_message = "power_on is the only supported action"
+            return faults.Fault(exc.HTTPUnprocessableEntity(
+                                        explanation=fault_message))
+
+        return exc.HTTPNoContent()
+
+
+class Instanceactions(extensions.ExtensionDescriptor):
+    def __init__(self):
+        super(Instanceactions, self).__init__()
+
+    def get_name(self):
+        return "InstanceActions"
+
+    def get_alias(self):
+        return "OS-INST-ACT"
+
+    def get_description(self):
+        return "Extra Instance Actions support"
+
+    def get_namespace(self):
+        return "http://docs.openstack.org/ext/instance_actions/api/v1.1"
+
+    def get_updated(self):
+        return "2011-09-18T00:00:00+00:00"
+
+    def get_resources(self):
+        return self._instance_extension_controller()
+
+    def _instance_extension_controller(self):
+        res = extensions.ResourceExtension(
+            'os-instance-actions',
+            controller=InstanceActionsController(),
+            parent=dict(member_name='server', collection_name='servers'))
+        return [res]
 
=== modified file 'nova/compute/api.py'
--- nova/compute/api.py	2011-09-19 21:53:17 +0000
+++ nova/compute/api.py	2011-09-20 18:37:25 +0000
@@ -1264,6 +1264,12 @@
                                           context,
                                           instance_id)
 
+    def power_on_instance(self, context, instance_id):
+        """Turns the instance on if it was turned off previously"""
+        return self._call_compute_message("power_on_instance",
+                                          context,
+                                          instance_id)
+
     def get_actions(self, context, instance_id):
         """Retrieve actions for the given instance."""
         return self.db.instance_get_actions(context, instance_id)
 
=== modified file 'nova/compute/manager.py'
--- nova/compute/manager.py	2011-09-19 15:25:00 +0000
+++ nova/compute/manager.py	2011-09-20 18:37:25 +0000
@@ -1115,6 +1115,12 @@
             return self.driver.get_diagnostics(instance_ref)
 
     @exception.wrap_exception(notifier=notifier, publisher_id=publisher_id())
+    def power_on_instance(self, context, instance_id):
+        """Turns the instance on if it was turned off previously"""
+        instance_ref = self.db.instance_get(context, instance_id)
+        return self.driver.power_on(instance_ref)
+
+    @exception.wrap_exception(notifier=notifier, publisher_id=publisher_id())
     @checks_instance_lock
     def suspend_instance(self, context, instance_id):
         """Suspend the given instance."""
 
=== added file 'nova/tests/api/openstack/contrib/test_instance_actions.py'
--- nova/tests/api/openstack/contrib/test_instance_actions.py	1970-01-01 00:00:00 +0000
+++ nova/tests/api/openstack/contrib/test_instance_actions.py	2011-09-20 18:37:25 +0000
@@ -0,0 +1,92 @@
+# Copyright 2011 OpenStack LLC.
+# 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.
+
+import json
+import webob
+
+from nova import compute
+from nova import exception
+from nova import test
+from nova.api.openstack.contrib.instanceactions import \
+                        InstanceActionsController
+from nova.tests.api.openstack import fakes
+
+
+class InstanceActionTest(test.TestCase):
+    def test_power_on(self):
+        self.called = False
+
+        def fake_compute_get(*args, **kwargs):
+            return {}
+
+        def fake_compute_power_on(*args, **kwargs):
+            self.called = True
+
+        self.stubs.Set(compute.api.API, 'routing_get', fake_compute_get)
+        self.stubs.Set(compute.api.API, 'power_on_instance',
+                       fake_compute_power_on)
+        req = webob.Request.blank('/v1.1/openstack/servers/50/os-instance-actions')
+        req.headers['Accept'] = 'application/json'
+        req.headers['Content-Type'] = 'application/json'
+        req.method = 'POST'
+        body = {'server': {'action': 'poweron'}}
+        req.body = json.dumps(body)
+        res = req.get_response(fakes.wsgi_app())
+        self.assertEqual(res.status_int, 204)
+        self.assertEqual(self.called, True)
+
+    def test_action_bad_server_id_fails(self):
+        self.called = False
+
+        def fake_compute_get(*args, **kwargs):
+            raise exception.NotFound()
+
+        def fake_compute_power_on(*args, **kwargs):
+            self.called = True
+
+        self.stubs.Set(compute.api.API, 'routing_get', fake_compute_get)
+        self.stubs.Set(compute.api.API, 'power_on_instance',
+                       fake_compute_power_on)
+        req = webob.Request.blank('/v1.1/openstack/servers/50/os-instance-actions')
+        req.headers['Accept'] = 'application/json'
+        req.headers['Content-Type'] = 'application/json'
+        req.method = 'POST'
+        body = {'server': {'action': 'poweron'}}
+        req.body = json.dumps(body)
+        res = req.get_response(fakes.wsgi_app())
+        self.assertEqual(res.status_int, 404)
+        self.assertEqual(self.called, False)
+
+    def test_bad_action_fails(self):
+        self.called = False
+
+        def fake_compute_get(*args, **kwargs):
+            return {}
+
+        def fake_compute_power_on(*args, **kwargs):
+            self.called = True
+
+        self.stubs.Set(compute.api.API, 'routing_get', fake_compute_get)
+        self.stubs.Set(compute.api.API, 'power_on_instance',
+                       fake_compute_power_on)
+        req = webob.Request.blank('/v1.1/openstack/servers/50/os-instance-actions')
+        req.headers['Accept'] = 'application/json'
+        req.headers['Content-Type'] = 'application/json'
+        req.method = 'POST'
+        body = {'server': {'action': 'derp'}}
+        req.body = json.dumps(body)
+        res = req.get_response(fakes.wsgi_app())
+        self.assertEqual(res.status_int, 422)
+        self.assertEqual(self.called, False)
 
=== modified file 'nova/tests/api/openstack/test_extensions.py'
--- nova/tests/api/openstack/test_extensions.py	2011-09-14 15:54:56 +0000
+++ nova/tests/api/openstack/test_extensions.py	2011-09-20 18:37:25 +0000
@@ -91,6 +91,7 @@
             "Floating_ips",
             "Fox In Socks",
             "Hosts",
+            "InstanceActions",
             "Keypairs",
             "Multinic",
             "Quotas",
 
=== modified file 'nova/virt/driver.py'
--- nova/virt/driver.py	2011-09-15 18:44:49 +0000
+++ nova/virt/driver.py	2011-09-20 18:37:25 +0000
@@ -196,6 +196,10 @@
         # TODO(Vek): Need to pass context in for access to auth_token
         raise NotImplementedError()
 
+    def power_on(self, instance):
+        """Turns the instance on if it was previously turned off"""
+        raise NotImplementedError()
+
     def get_host_ip_addr(self):
         """
         Retrieves the IP address of the dom0
 
=== modified file 'nova/virt/xenapi/vmops.py'
--- nova/virt/xenapi/vmops.py	2011-09-19 15:25:00 +0000
+++ nova/virt/xenapi/vmops.py	2011-09-20 18:37:25 +0000
@@ -1074,6 +1074,10 @@
         vm_rec = self._session.get_xenapi().VM.get_record(vm_ref)
         return VMHelper.compile_diagnostics(self._session, vm_rec)
 
+    def power_on(self, instance):
+        """Turns the instance on if it was previously turned off"""
+        return self._start(instance)
+
     def get_console_output(self, instance):
         """Return snapshot of console."""
         # TODO: implement this to fix pylint!
 
=== modified file 'nova/virt/xenapi_conn.py'
--- nova/virt/xenapi_conn.py	2011-09-15 18:44:49 +0000
+++ nova/virt/xenapi_conn.py	2011-09-20 18:37:25 +0000
@@ -277,6 +277,10 @@
         """Return data about VM diagnostics"""
         return self._vmops.get_diagnostics(instance)
 
+    def power_on(self, instance):
+        """Turns the instance on if it was previously turned off"""
+        return self._vmops.power_on(instance)
+
     def get_console_output(self, instance):
         """Return snapshot of console"""
         return self._vmops.get_console_output(instance)