diff options
| author | Chris Behrens <cbehrens@codestud.com> | 2011-06-23 07:03:42 -0700 |
|---|---|---|
| committer | Chris Behrens <cbehrens@codestud.com> | 2011-06-23 07:03:42 -0700 |
| commit | 82e7bb113cdf0297d69ed863a2ba66bad46bece9 (patch) | |
| tree | 2aa424c50edc8d25076475cea3c81d9fa58d5e37 /nova/api | |
| parent | 37758dfe6a2b963d6acfdf9fe886167e42e4ec52 (diff) | |
| parent | e241f5301621e66360bb884193884f9f98bc8832 (diff) | |
| download | nova-82e7bb113cdf0297d69ed863a2ba66bad46bece9.tar.gz nova-82e7bb113cdf0297d69ed863a2ba66bad46bece9.tar.xz nova-82e7bb113cdf0297d69ed863a2ba66bad46bece9.zip | |
Merged list-zone-recurse
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/openstack/servers.py | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/nova/api/openstack/servers.py b/nova/api/openstack/servers.py index 31ec46e8e..decbfd6e6 100644 --- a/nova/api/openstack/servers.py +++ b/nova/api/openstack/servers.py @@ -76,10 +76,18 @@ class Controller(object): builder - the response model builder """ - reservation_id = req.str_GET.get('reservation_id') + query_str = req.str_GET + reservation_id = query_str.get('reservation_id') + project_id = query_str.get('project_id') + fixed_ip = query_str.get('fixed_ip') + recurse_zones = query_str.get('recurse_zones') + recurse_zones = recurse_zones and True or False instance_list = self.compute_api.get_all( req.environ['nova.context'], - reservation_id=reservation_id) + reservation_id=reservation_id, + project_id=project_id, + fixed_ip=fixed_ip, + recurse_zones=recurse_zones) limited_list = self._limit_items(instance_list, req) builder = self._get_view_builder(req) servers = [builder.build(inst, is_detail)['server'] |