summaryrefslogtreecommitdiffstats
path: root/nova/compute
diff options
context:
space:
mode:
authorAlex Meade <alex.meade@rackspace.com>2011-11-10 15:52:04 -0500
committerAlex Meade <alex.meade@rackspace.com>2011-11-11 11:00:43 -0500
commit43fb6880d90197735b0b9bf4587fcece825c1ed0 (patch)
tree26066ad20308b4b85f8b4229293654d1067fb2f9 /nova/compute
parent59dfaf9e02ff0064a6844c9c986737267317776f (diff)
Convert pause/unpause, sus/res to use instance obj
Related to blueprint internal-uuids Change-Id: I02bd212b4878ed0fcb971c223518ecf7126bd597
Diffstat (limited to 'nova/compute')
-rw-r--r--nova/compute/api.py12
1 files changed, 8 insertions, 4 deletions
diff --git a/nova/compute/api.py b/nova/compute/api.py
index 820a7b9b6..dd1357d6c 100644
--- a/nova/compute/api.py
+++ b/nova/compute/api.py
@@ -1343,8 +1343,9 @@ class API(base.Base):
self.network_api.add_network_to_project(context, project_id)
@scheduler_api.reroute_compute("pause")
- def pause(self, context, instance_id):
+ def pause(self, context, instance):
"""Pause the given instance."""
+ instance_id = instance["id"]
self.update(context,
instance_id,
vm_state=vm_states.ACTIVE,
@@ -1352,8 +1353,9 @@ class API(base.Base):
self._cast_compute_message('pause_instance', context, instance_id)
@scheduler_api.reroute_compute("unpause")
- def unpause(self, context, instance_id):
+ def unpause(self, context, instance):
"""Unpause the given instance."""
+ instance_id = instance["id"]
self.update(context,
instance_id,
vm_state=vm_states.PAUSED,
@@ -1388,8 +1390,9 @@ class API(base.Base):
return self.db.instance_get_actions(context, instance_id)
@scheduler_api.reroute_compute("suspend")
- def suspend(self, context, instance_id):
+ def suspend(self, context, instance):
"""Suspend the given instance."""
+ instance_id = instance["id"]
self.update(context,
instance_id,
vm_state=vm_states.ACTIVE,
@@ -1397,8 +1400,9 @@ class API(base.Base):
self._cast_compute_message('suspend_instance', context, instance_id)
@scheduler_api.reroute_compute("resume")
- def resume(self, context, instance_id):
+ def resume(self, context, instance):
"""Resume the given instance."""
+ instance_id = instance["id"]
self.update(context,
instance_id,
vm_state=vm_states.SUSPENDED,