diff options
| author | Jenkins <jenkins@review.openstack.org> | 2011-09-29 16:57:19 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2011-09-29 16:57:19 +0000 |
| commit | e7d17921e99df3a8c2c00a6175e423ce369272f8 (patch) | |
| tree | be3ef5aae44e11971f0e1ff990f6d1cb66b46e7a /nova/api | |
| parent | bf181c2e322d78e7e3df71c9681555f1ab9f085f (diff) | |
| parent | bb410b3f1bbdebdbdf540a22cd37fc9526897fe1 (diff) | |
Merge "Change 'recurse_zones' to 'local_zone_only'."
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/openstack/servers.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/nova/api/openstack/servers.py b/nova/api/openstack/servers.py index de081343e..938ba8787 100644 --- a/nova/api/openstack/servers.py +++ b/nova/api/openstack/servers.py @@ -140,9 +140,9 @@ class Controller(object): remove_invalid_options(context, search_opts, self._get_server_search_options()) - # Convert recurse_zones into a boolean - search_opts['recurse_zones'] = utils.bool_from_str( - search_opts.get('recurse_zones', False)) + # Convert local_zone_only into a boolean + search_opts['local_zone_only'] = utils.bool_from_str( + search_opts.get('local_zone_only', False)) # If search by 'status', we need to convert it to 'vm_state' # to pass on to child zones. @@ -1041,7 +1041,7 @@ class ControllerV10(Controller): def _get_server_search_options(self): """Return server search options allowed by non-admin""" - return 'reservation_id', 'fixed_ip', 'name', 'recurse_zones' + return 'reservation_id', 'fixed_ip', 'name', 'local_zone_only' class ControllerV11(Controller): @@ -1272,7 +1272,7 @@ class ControllerV11(Controller): def _get_server_search_options(self): """Return server search options allowed by non-admin""" - return ('reservation_id', 'name', 'recurse_zones', + return ('reservation_id', 'name', 'local_zone_only', 'status', 'image', 'flavor', 'changes-since') |