Merge "Use sdk for list_servers"
This commit is contained in:
commit
728a3fae29
|
@ -480,7 +480,8 @@ class Normalizer(object):
|
|||
server, 'os-extended-volumes:volumes_attached',
|
||||
[], self.strict_mode)
|
||||
|
||||
config_drive = server.pop('config_drive', False)
|
||||
config_drive = server.pop(
|
||||
'has_config_drive', server.pop('config_drive', False))
|
||||
ret['has_config_drive'] = _to_bool(config_drive)
|
||||
|
||||
host_id = server.pop('hostId', None)
|
||||
|
|
|
@ -2137,19 +2137,11 @@ class _OpenStackCloudMixin(_normalize.Normalizer):
|
|||
|
||||
def _list_servers(self, detailed=False, all_projects=False, bare=False,
|
||||
filters=None):
|
||||
error_msg = "Error fetching server list on {cloud}:{region}:".format(
|
||||
cloud=self.name,
|
||||
region=self.config.region_name)
|
||||
|
||||
params = filters or {}
|
||||
if all_projects:
|
||||
params['all_tenants'] = True
|
||||
data = _adapter._json_response(
|
||||
self.compute.get(
|
||||
'/servers/detail', params=params),
|
||||
error_message=error_msg)
|
||||
servers = self._normalize_servers(
|
||||
self._get_and_munchify('servers', data))
|
||||
filters = filters or {}
|
||||
servers = [
|
||||
self._normalize_server(server.to_dict())
|
||||
for server in self.compute.servers(
|
||||
all_projects=all_projects, **filters)]
|
||||
return [
|
||||
self._expand_server(server, detailed, bare)
|
||||
for server in servers
|
||||
|
|
Loading…
Reference in New Issue