openstack/openstacksdk
Code Issues Proposed changes

Switch update_server cloud layer to proxy

Browse Source 
Rely on proxy in the cloud layer for update_server method

Change-Id: I15e387e36a1ea8c39a860aa10767c8a63e5c2390
This commit is contained in:
Artem Goncharov
2021-12-19 12:51:42 +01:00
parent a92ee7ae51
commit f4dafb3a5c
2 changed files with 21 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
openstack/cloud/_compute.py
View File

@@ -1269,18 +1269,14 @@ class ComputeCloudMixin(_normalize.Normalizer):
:raises: OpenStackCloudException on operation error.
"""
server = self.get_server(name_or_id=name_or_id, bare=True)
if server is None:
raise exc.OpenStackCloudException(
"failed to find server '{server}'".format(server=name_or_id))
server = self.compute.find_server(
name_or_id,
ignore_missing=False
)
server = self.compute.update_server(
server, **kwargs)
data = proxy._json_response(
self.compute.put(
'/servers/{server_id}'.format(server_id=server['id']),
json={'server': kwargs}),
error_message="Error updating server {0}".format(name_or_id))
server = self._normalize_server(
self._get_and_munchify('server', data))
return self._expand_server(server, bare=bare, detailed=detailed)
def create_server_group(self, name, policies=[], policy=None):

16
openstack/tests/unit/cloud/test_update_server.py
View File

@@ -43,7 +43,13 @@ class TestUpdateServer(base.TestCase):
self.get_nova_discovery_mock_dict(),
dict(method='GET',
uri=self.get_mock_url(
'compute', 'public', append=['servers', 'detail']),
'compute', 'public',
append=['servers', self.server_name]),
status_code=404),
dict(method='GET',
uri=self.get_mock_url(
'compute', 'public', append=['servers'],
qs_elements=['name=%s' % self.server_name]),
json={'servers': [self.fake_server]}),
dict(method='PUT',
uri=self.get_mock_url(
@@ -69,7 +75,13 @@ class TestUpdateServer(base.TestCase):
self.get_nova_discovery_mock_dict(),
dict(method='GET',
uri=self.get_mock_url(
'compute', 'public', append=['servers', 'detail']),
'compute', 'public',
append=['servers', self.server_name]),
status_code=404),
dict(method='GET',
uri=self.get_mock_url(
'compute', 'public', append=['servers'],
qs_elements=['name=%s' % self.server_name]),
json={'servers': [self.fake_server]}),
dict(method='PUT',
uri=self.get_mock_url(