Merge lp:~eday/nova/compute-abstraction-reboot into lp:~hudson-openstack/nova/trunk

[Eric Day]

Moved the reboot/rescue methods into nova.compute.api.

[Michael Gundlach (gundlach)]

yep

review: Approve

[lp:~eday/nova/compute-abstraction-reboot]

429. By Eric Day on 2010-12-03

Merged trunk.

[Jay Pipes (jaypipes)]

rock on.

review: Approve

=== removed file 'nova/api/cloud.py'
--- nova/api/cloud.py	2010-10-24 23:04:35 +0000
+++ nova/api/cloud.py	1970-01-01 00:00:00 +0000
@@ -1,58 +0,0 @@
-# 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."""
-    instance_ref = db.instance_get_by_internal_id(context, instance_id)
-    host = instance_ref['host']
-    rpc.cast(context,
-             db.queue_get_for(context, FLAGS.compute_topic, host),
-             {"method": "reboot_instance",
-              "args": {"instance_id": instance_ref['id']}})
-
-
-def rescue(instance_id, context):
-    """Rescue the given instance."""
-    instance_ref = db.instance_get_by_internal_id(context, instance_id)
-    host = instance_ref['host']
-    rpc.cast(context,
-             db.queue_get_for(context, FLAGS.compute_topic, host),
-             {"method": "rescue_instance",
-              "args": {"instance_id": instance_ref['id']}})
-
-
-def unrescue(instance_id, context):
-    """Unrescue the given instance."""
-    instance_ref = db.instance_get_by_internal_id(context, instance_id)
-    host = instance_ref['host']
-    rpc.cast(context,
-             db.queue_get_for(context, FLAGS.compute_topic, host),
-             {"method": "unrescue_instance",
-              "args": {"instance_id": instance_ref['id']}})
 
=== modified file 'nova/api/ec2/cloud.py'
--- nova/api/ec2/cloud.py	2010-12-02 16:47:25 +0000
+++ nova/api/ec2/cloud.py	2010-12-03 17:43:19 +0000
@@ -41,7 +41,6 @@
 from nova import utils
 from nova.compute import api as compute_api
 from nova.compute import instance_types
-from nova.api import cloud
 from nova.image.s3 import S3ImageService
 
 
@@ -834,19 +833,19 @@
         """instance_id is a list of instance ids"""
         for ec2_id in instance_id:
             internal_id = ec2_id_to_internal_id(ec2_id)
-            cloud.reboot(internal_id, context=context)
+            self.compute_api.reboot(context, internal_id)
         return True
 
     def rescue_instance(self, context, instance_id, **kwargs):
         """This is an extension to the normal ec2_api"""
         internal_id = ec2_id_to_internal_id(instance_id)
-        cloud.rescue(internal_id, context=context)
+        self.compute_api.rescue(context, internal_id)
         return True
 
     def unrescue_instance(self, context, instance_id, **kwargs):
         """This is an extension to the normal ec2_api"""
         internal_id = ec2_id_to_internal_id(instance_id)
-        cloud.unrescue(internal_id, context=context)
+        self.compute_api.unrescue(context, internal_id)
         return True
 
     def update_instance(self, context, ec2_id, **kwargs):
 
=== modified file 'nova/api/openstack/servers.py'
--- nova/api/openstack/servers.py	2010-12-02 20:17:41 +0000
+++ nova/api/openstack/servers.py	2010-12-03 17:43:19 +0000
@@ -23,7 +23,6 @@
 from nova import utils
 from nova import wsgi
 from nova import context
-from nova.api import cloud
 from nova.api.openstack import faults
 from nova.compute import api as compute_api
 from nova.compute import instance_types
@@ -183,9 +182,9 @@
         inst_ref = self.db.instance_get_by_internal_id(ctxt, int(id))
         if not inst_ref or (inst_ref and not inst_ref.user_id == user_id):
             return faults.Fault(exc.HTTPUnprocessableEntity())
-        #TODO(gundlach): pass reboot_type, support soft reboot in
-        #virt driver
-        cloud.reboot(id)
+        # TODO(gundlach): pass reboot_type, support soft reboot in
+        # virt driver
+        self.compute_api.reboot(ctxt, id)
 
     def _get_network_topic(self, context):
         """Retrieves the network host for a project"""
 
=== modified file 'nova/compute/api.py'
--- nova/compute/api.py	2010-12-02 17:34:52 +0000
+++ nova/compute/api.py	2010-12-03 17:43:19 +0000
@@ -210,3 +210,30 @@
 
         """
         self.db.instance_update(context, instance_id, kwargs)
+
+    def reboot(self, context, instance_id):
+        """Reboot the given instance."""
+        instance = self.db.instance_get_by_internal_id(context, instance_id)
+        host = instance['host']
+        rpc.cast(context,
+                 self.db.queue_get_for(context, FLAGS.compute_topic, host),
+                 {"method": "reboot_instance",
+                  "args": {"instance_id": instance['id']}})
+
+    def rescue(self, context, instance_id):
+        """Rescue the given instance."""
+        instance = self.db.instance_get_by_internal_id(context, instance_id)
+        host = instance['host']
+        rpc.cast(context,
+                 self.db.queue_get_for(context, FLAGS.compute_topic, host),
+                 {"method": "rescue_instance",
+                  "args": {"instance_id": instance['id']}})
+
+    def unrescue(self, context, instance_id):
+        """Unrescue the given instance."""
+        instance = self.db.instance_get_by_internal_id(context, instance_id)
+        host = instance['host']
+        rpc.cast(context,
+                 self.db.queue_get_for(context, FLAGS.compute_topic, host),
+                 {"method": "unrescue_instance",
+                  "args": {"instance_id": instance['id']}})