Merge "Update EC2 get_metadata calls to search 'deleted': False. Fixe…

…s nova smoke_tests!!!"
openstack · Oct 12, 2011 · c0cf874 · c0cf874
2 parents c12d610 + 7a2be62
commit c0cf874
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py
@@ -285,7 +285,7 @@ def _get_floaters_for_instance(self, context, instance, return_all=True):
 
     def _get_mpi_data(self, context, project_id):
         result = {}
-        search_opts = {'project_id': project_id}
+        search_opts = {'project_id': project_id, 'deleted': False}
         for instance in self.compute_api.get_all(context,
                 search_opts=search_opts):
             # only look at ipv4 addresses
@@ -360,7 +360,7 @@ def _format_instance_mapping(self, ctxt, instance_ref):
 
     def get_metadata(self, address):
         ctxt = context.get_admin_context()
-        search_opts = {'fixed_ip': address}
+        search_opts = {'fixed_ip': address, 'deleted': False}
         try:
             instance_ref = self.compute_api.get_all(ctxt,
                     search_opts=search_opts)

diff --git a/nova/compute/api.py b/nova/compute/api.py
@@ -929,6 +929,9 @@ def get_all(self, context, search_opts=None):
 
         If there is no filter and the context is an admin, it will retreive
         all instances in the system.
+
+        Deleted instances will be returned by default, unless there is a
+        search option that says otherwise.
         """
 
         if search_opts is None: