openstack/nova
Code Issues Proposed changes

Fix cloudpipe instances query.

Browse Source 
Filter out deleted instances in _get_all_cloudpipes.

Fix bug 1092786.

Change-Id: Ia714a1989f78728f8b3597d6f837b622427ac5b1
This commit is contained in:
MotoKen
2012-12-22 13:58:53 +08:00
parent 1836ede3c5
commit 1f2144893d
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
nova/api/openstack/compute/contrib/cloudpipe.py
View File

@@ -74,7 +74,9 @@ class CloudpipeController(object):
def _get_all_cloudpipes(self, context):
"""Get all cloudpipes"""
return [instance for instance in self.compute_api.get_all(context)
instances = self.compute_api.get_all(context,
search_opts={'deleted': False})
return [instance for instance in instances
if instance['image_ref'] == str(CONF.vpn_image_id)
and instance['vm_state'] != vm_states.DELETED]

4
nova/tests/api/openstack/compute/contrib/test_cloudpipe.py
View File

@@ -39,11 +39,11 @@ def fake_vpn_instance():
}
def compute_api_get_all_empty(context):
def compute_api_get_all_empty(context, search_opts=None):
return []
def compute_api_get_all(context):
def compute_api_get_all(context, search_opts=None):
return [fake_vpn_instance()]