From 9e7c7706a76ad76612ba75314d436a8ba419a3eb Mon Sep 17 00:00:00 2001
From: Mohammed Naser <mnaser@vexxhost.com>
Date: Sat, 9 Jul 2011 21:45:54 -0400
Subject: Fixed two typos in rescue API command

---
 nova/api/ec2/cloud.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py
index ee263f614..0e2fe128d 100644
--- a/nova/api/ec2/cloud.py
+++ b/nova/api/ec2/cloud.py
@@ -1037,7 +1037,7 @@ class CloudController(object):
 
     def rescue_instance(self, context, instance_id, **kwargs):
         """This is an extension to the normal ec2_api"""
-        self._do_instance(self.compute_api.rescue, contect, instnace_id)
+        self._do_instance(self.compute_api.rescue, context, instance_id)
         return True
 
     def unrescue_instance(self, context, instance_id, **kwargs):
-- 
cgit 


From 9980a8a90c73f95440a760ae91bafc5b1f308931 Mon Sep 17 00:00:00 2001
From: Mohammed Naser <mnaser@vexxhost.com>
Date: Sat, 9 Jul 2011 22:00:27 -0400
Subject: Added myself to authors file

---
 Authors | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Authors b/Authors
index 1b3c90764..3548c0924 100644
--- a/Authors
+++ b/Authors
@@ -62,6 +62,7 @@ Masanori Itoh <itoumsn@nttdata.co.jp>
 Matt Dietz <matt.dietz@rackspace.com>
 Michael Gundlach <michael.gundlach@rackspace.com>
 Mike Scherbakov <mihgen@gmail.com>
+Mohammed Naser <mnaser@vexxhost.com>
 Monsyne Dragon <mdragon@rackspace.com>
 Monty Taylor <mordred@inaugust.com>
 MORITA Kazutaka <morita.kazutaka@gmail.com>
-- 
cgit 


From 67ccc98d6a0d9e8618889fd9fa398a39735d044a Mon Sep 17 00:00:00 2001
From: Vishvananda Ishaya <vishvananda@gmail.com>
Date: Mon, 25 Jul 2011 20:33:20 +0000
Subject: add a simple broken test to verify the bug

---
 nova/tests/test_cloud.py | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/nova/tests/test_cloud.py b/nova/tests/test_cloud.py
index d71a03aff..87edaac36 100644
--- a/nova/tests/test_cloud.py
+++ b/nova/tests/test_cloud.py
@@ -518,6 +518,21 @@ class CloudTestCase(test.TestCase):
         self._wait_for_running(ec2_instance_id)
         return ec2_instance_id
 
+    def test_rescue_unrescue_instance(self):
+        instance_id = self._run_instance(
+            image_id='ami-1',
+            instance_type=FLAGS.default_instance_type,
+            max_count=1)
+        self.cloud.rescue_instance(context=self.context,
+                                   instance_id=instance_id)
+        # NOTE(vish): This currently does no validation, it simply makes sure
+        #             that the code path doesn't throw an exception.
+        self.cloud.unrescue_instance(context=self.context,
+                                   instance_id=instance_id)
+        # TODO(soren): We need this until we can stop polling in the rpc code
+        #              for unit tests.
+        self.cloud.terminate_instances(self.context, [instance_id])
+
     def test_console_output(self):
         instance_id = self._run_instance(
             image_id='ami-1',
-- 
cgit