openstack
/
shade
Code Issues Proposed changes

Merge "list_servers pagination support"

This commit is contained in:
Zuul 2018-03-31 13:47:17 +00:00 committed by Gerrit Code Review
parent db1696a529 6040b34345
commit 7d4458448c
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
shade/openstackcloud.py
View File

@ -2191,8 +2191,20 @@ class OpenStackCloud(
params['all_tenants'] = True
data = self._compute_client.get(
'/servers/detail', params=params, error_message=error_msg)
unprocessed_servers = {'servers': []}
while 'servers_links' in data:
unprocessed_servers['servers'].extend(data['servers'])
parse_result = urllib.parse.urlparse(
data['servers_links'][0]['href'])
pagination_params = dict(
urllib.parse.parse_qsl(parse_result.query))
params.update(pagination_params)
data = self._compute_client.get(
'/servers/detail', params=params, error_message=error_msg)
unprocessed_servers['servers'].extend(data['servers'])
servers = self._normalize_servers(
self._get_and_munchify('servers', data))
self._get_and_munchify('servers', unprocessed_servers))
return [
self._expand_server(server, detailed, bare)
for server in servers