Merge "Properly expand server dicts after rebuild and update"
This commit is contained in:
commit
77b2a441cf
@ -5730,8 +5730,8 @@ class OpenStackCloud(
|
||||
error_message="Error in rebuilding instance",
|
||||
json={'rebuild': kwargs})
|
||||
if not wait:
|
||||
# TODO(mordred) add expand server next
|
||||
return self._normalize_server(server)
|
||||
return self._expand_server(
|
||||
self._normalize_server(server), bare=bare, detailed=detailed)
|
||||
|
||||
admin_pass = server.get('adminPass') or admin_pass
|
||||
for count in _utils._iterate_timeout(
|
||||
@ -5919,11 +5919,12 @@ class OpenStackCloud(
|
||||
raise OpenStackCloudException(
|
||||
"failed to find server '{server}'".format(server=name_or_id))
|
||||
|
||||
return self._normalize_server(
|
||||
return self._expand_server(self._normalize_server(
|
||||
self._compute_client.put(
|
||||
'/servers/{server_id}'.format(server_id=server['id']),
|
||||
error_message="Error updating server {0}".format(name_or_id),
|
||||
json={'server': kwargs}))
|
||||
json={'server': kwargs})),
|
||||
bare=bare, detailed=detailed)
|
||||
|
||||
def create_server_group(self, name, policies):
|
||||
"""Create a new server group.
|
||||
|
@ -132,6 +132,10 @@ class TestRebuildServer(base.RequestsMockTestCase):
|
||||
json={
|
||||
'rebuild': {
|
||||
'imageRef': 'a'}})),
|
||||
dict(method='GET',
|
||||
uri=self.get_mock_url(
|
||||
'network', 'public', append=['v2.0', 'networks.json']),
|
||||
json={'networks': []}),
|
||||
])
|
||||
self.assertEqual(
|
||||
self.rebuild_server['status'],
|
||||
@ -158,6 +162,10 @@ class TestRebuildServer(base.RequestsMockTestCase):
|
||||
'rebuild': {
|
||||
'imageRef': 'a',
|
||||
'adminPass': password}})),
|
||||
dict(method='GET',
|
||||
uri=self.get_mock_url(
|
||||
'network', 'public', append=['v2.0', 'networks.json']),
|
||||
json={'networks': []}),
|
||||
])
|
||||
self.assertEqual(
|
||||
password,
|
||||
|
@ -75,6 +75,10 @@ class TestUpdateServer(base.RequestsMockTestCase):
|
||||
json={'server': fake_update_server},
|
||||
validate=dict(
|
||||
json={'server': {'name': self.updated_server_name}})),
|
||||
dict(method='GET',
|
||||
uri=self.get_mock_url(
|
||||
'network', 'public', append=['v2.0', 'networks.json']),
|
||||
json={'networks': []}),
|
||||
])
|
||||
self.assertEqual(
|
||||
self.updated_server_name,
|
||||
|
Loading…
Reference in New Issue
Block a user