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

[Vish Ishaya]

Adding a can_read_deleted filter back to db.api.instance_get_all_by_filters that was removed in a recent merge.

=== 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 16:40:51 +0000
@@ -1200,8 +1200,10 @@
                 instances.append(instance)
         else:
             try:
+                # always filter out deleted instances
+                search_opts['deleted'] = False
                 instances = self.compute_api.get_all(context,
-                        search_opts=search_opts)
+                                                     search_opts=search_opts)
             except exception.NotFound:
                 instances = []
         for instance in instances:

=== 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 16:40:51 +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):