Merge lp:~rackspace-titan/nova/read-deleted-lp824008-rbp into lp:~hudson-openstack/nova/milestone-proposed

[Brian Waldon]

Backporting fix for but lp824008 - euca-describe-instance showing deleted entities

[Vish Ishaya (vishvananda)]

If the branch is from before the code split, you can just propose the existing branch instead of making a new one.

like here:

https://code.launchpad.net/~rackspace-titan/nova/read-deleted-lp824008/+merge/74828

review: Disapprove

Unmerged revisions

1155. By Brian Waldon on 2011-09-09

porting fix for euca-describe-instances bug to rbp

=== modified file 'nova/api/ec2/cloud.py'
--- nova/api/ec2/cloud.py	2011-09-02 18:00:33 +0000
+++ nova/api/ec2/cloud.py	2011-09-09 14:49:22 +0000
@@ -1200,6 +1200,7 @@
                 instances.append(instance)
         else:
             try:
+                search_opts['deleted'] = False
                 instances = self.compute_api.get_all(context,
                         search_opts=search_opts)
             except exception.NotFound:

=== modified file 'nova/tests/test_cloud.py'
--- nova/tests/test_cloud.py	2011-09-01 17:54:52 +0000
+++ nova/tests/test_cloud.py	2011-09-09 14:49:22 +0000
@@ -486,11 +486,9 @@
         inst2 = db.instance_create(self.context, args2)
         db.instance_destroy(self.context, inst1.id)
         result = self.cloud.describe_instances(self.context)
+        self.assertEqual(len(result['reservationSet']), 1)
         result1 = result['reservationSet'][0]['instancesSet']
         self.assertEqual(result1[0]['instanceId'],
-                         ec2utils.id_to_ec2_id(inst1.id))
-        result2 = result['reservationSet'][1]['instancesSet']
-        self.assertEqual(result2[0]['instanceId'],
                          ec2utils.id_to_ec2_id(inst2.id))
 
     def _block_device_mapping_create(self, instance_id, mappings):