openstack/python-openstackclient
Code Issues Proposed changes

Merge "Optimize _prep_server_detail to avoid redundant find_resource"

Browse Source
This commit is contained in:
Zuul 2018-06-12 01:14:16 +00:00 committed by Gerrit Code Review
commit 4c4c0ae2da
2 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
openstackclient/compute/v2/server.py
View File

@ -120,18 +120,21 @@ def _prefix_checked_value(prefix):
return func return func
def _prep_server_detail(compute_client, image_client, server): def _prep_server_detail(compute_client, image_client, server, refresh=True):
"""Prepare the detailed server dict for printing """Prepare the detailed server dict for printing
:param compute_client: a compute client instance :param compute_client: a compute client instance
:param image_client: an image client instance :param image_client: an image client instance
:param server: a Server resource :param server: a Server resource
:param refresh: Flag indicating if ``server`` is already the latest version
or if it needs to be refreshed, for example when showing
the latest details of a server after creating it.
:rtype: a dict of server details :rtype: a dict of server details
""" """
info = server.to_dict() info = server.to_dict()
if refresh:
server = utils.find_resource(compute_client.servers, info['id']) server = utils.find_resource(compute_client.servers, info['id'])
info.update(server.to_dict()) info.update(server.to_dict())
# Convert the image blob to a name # Convert the image blob to a name
image_info = info.get('image', {}) image_info = info.get('image', {})
@ -1540,7 +1543,8 @@ class RebuildServer(command.ShowOne):
self.app.stdout.write(_('Error rebuilding server\n')) self.app.stdout.write(_('Error rebuilding server\n'))
raise SystemExit raise SystemExit
details = _prep_server_detail(compute_client, image_client, server) details = _prep_server_detail(compute_client, image_client, server,
refresh=False)
return zip(*sorted(six.iteritems(details))) return zip(*sorted(six.iteritems(details)))
@ -2021,7 +2025,8 @@ class ShowServer(command.ShowOne):
return ({}, {}) return ({}, {})
else: else:
data = _prep_server_detail(compute_client, data = _prep_server_detail(compute_client,
self.app.client_manager.image, server) self.app.client_manager.image, server,
refresh=False)
return zip(*sorted(six.iteritems(data))) return zip(*sorted(six.iteritems(data)))

8
openstackclient/tests/unit/compute/v2/test_server.py
View File

@ -2331,17 +2331,17 @@ class TestServerRebuild(TestServer):
self.images_mock.get.return_value = self.image self.images_mock.get.return_value = self.image
# Fake the rebuilt new server. # Fake the rebuilt new server.
new_server = compute_fakes.FakeServer.create_one_server()
# Fake the server to be rebuilt. The IDs of them should be the same.
attrs = { attrs = {
'id': new_server.id,
'image': { 'image': {
'id': self.image.id 'id': self.image.id
}, },
'networks': {}, 'networks': {},
'adminPass': 'passw0rd', 'adminPass': 'passw0rd',
} }
new_server = compute_fakes.FakeServer.create_one_server(attrs=attrs)
# Fake the server to be rebuilt. The IDs of them should be the same.
attrs['id'] = new_server.id
methods = { methods = {
'rebuild': new_server, 'rebuild': new_server,
} }