Use sdk for list_servers
As the next baby step in combining shade and sdk code, have list_servers use conn.compute.servers() on the backend. Change-Id: I4e87fcc69fcffeed3720b878518cf02ccd30a3dc
This commit is contained in:
parent
3ba6e5fe5e
commit
60d931f4c7
|
@ -480,7 +480,8 @@ class Normalizer(object):
|
||||||
server, 'os-extended-volumes:volumes_attached',
|
server, 'os-extended-volumes:volumes_attached',
|
||||||
[], self.strict_mode)
|
[], 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)
|
ret['has_config_drive'] = _to_bool(config_drive)
|
||||||
|
|
||||||
host_id = server.pop('hostId', None)
|
host_id = server.pop('hostId', None)
|
||||||
|
|
|
@ -2124,19 +2124,11 @@ class _OpenStackCloudMixin(_normalize.Normalizer):
|
||||||
|
|
||||||
def _list_servers(self, detailed=False, all_projects=False, bare=False,
|
def _list_servers(self, detailed=False, all_projects=False, bare=False,
|
||||||
filters=None):
|
filters=None):
|
||||||
error_msg = "Error fetching server list on {cloud}:{region}:".format(
|
filters = filters or {}
|
||||||
cloud=self.name,
|
servers = [
|
||||||
region=self.config.region_name)
|
self._normalize_server(server.to_dict())
|
||||||
|
for server in self.compute.servers(
|
||||||
params = filters or {}
|
all_projects=all_projects, **filters)]
|
||||||
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))
|
|
||||||
return [
|
return [
|
||||||
self._expand_server(server, detailed, bare)
|
self._expand_server(server, detailed, bare)
|
||||||
for server in servers
|
for server in servers
|
||||||
|
|
Loading…
Reference in New Issue