Convert list_servers to REST

Change-Id: Id3e60a9df87c3ca64fcabcb5c6d30b2b0bcb0b24
This commit is contained in:
Monty Taylor 2017-06-15 22:41:08 -05:00
parent 83c8bf5a34
commit 70365c9f65
No known key found for this signature in database
GPG Key ID: 7BAE94BC7141A594
2 changed files with 14 additions and 18 deletions

View File

@ -47,11 +47,6 @@ class UserRemoveFromGroup(task_manager.Task):
return client.keystone_client.users.remove_from_group(**self.args)
class ServerList(task_manager.Task):
def main(self, client):
return client.nova_client.servers.list(**self.args)
class ServerGroupList(task_manager.Task):
def main(self, client):
return client.nova_client.server_groups.list(**self.args)

View File

@ -2011,20 +2011,21 @@ class OpenStackCloud(
return self._servers
def _list_servers(self, detailed=False, all_projects=False, bare=False):
with _utils.shade_exceptions(
"Error fetching server list on {cloud}:{region}:".format(
cloud=self.name,
region=self.region_name)):
kwargs = {}
if all_projects:
kwargs['search_opts'] = {'all_tenants': True}
servers = self._normalize_servers(
self.manager.submit_task(_tasks.ServerList(**kwargs)))
error_msg = "Error fetching server list on {cloud}:{region}:".format(
cloud=self.name,
region=self.region_name)
return [
self._expand_server(server, detailed, bare)
for server in servers
]
params = {}
if all_projects:
params['all_tenants'] = True
servers = self._normalize_servers(
self._compute_client.get(
'/servers/detail', params=params, error_message=error_msg))
return [
self._expand_server(server, detailed, bare)
for server in servers
]
def list_server_groups(self):
"""List all available server groups.