openstack/shade
Code Issues Proposed changes

Don't remove top-container element for server REST API calls

Browse Source 
Change-Id: Ic44e99b95a546bbc62562634340f14033ae1e346
Signed-off-by: Rosario Di Somma <rosario.disomma@dreamhost.com>
This commit is contained in:
Rosario Di Somma 2017-06-19 19:37:27 +00:00
parent 94727f3d99
commit 410a4558db
2 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
shade/_adapter.py
View File

@ -139,7 +139,7 @@ class ShadeAdapter(adapter.Adapter):
'security_group', 'security_groups',
'security_group_rule', 'security_group_rules',
'users', 'user', 'projects', 'tenants',
'project', 'tenant']:
'project', 'tenant', 'servers', 'server']:
if key in result_json.keys():
self._log_request_id(response)
return result_json

30
shade/openstackcloud.py
View File

@ -2016,10 +2016,10 @@ class OpenStackCloud(
params = {}
if all_projects:
params['all_tenants'] = True
data = self._compute_client.get(
'/servers/detail', params=params, error_message=error_msg)
servers = self._normalize_servers(
self._compute_client.get(
'/servers/detail', params=params, error_message=error_msg))
meta.get_and_munchify('servers', data))
return [
self._expand_server(server, detailed, bare)
for server in servers
@ -2800,8 +2800,9 @@ class OpenStackCloud(
return meta.add_server_interfaces(self, server)
def get_server_by_id(self, id):
return meta.add_server_interfaces(self, self._normalize_server(
self._compute_client.get('/servers/{id}'.format(id=id))))
data = self._compute_client.get('/servers/{id}'.format(id=id))
server = meta.get_and_munchify('server', data)
return meta.add_server_interfaces(self, self._normalize_server(server))
def get_server_group(self, name_or_id=None, filters=None):
"""Get a server group by name or ID.
@ -5639,8 +5640,9 @@ class OpenStackCloud(
if 'block_device_mapping_v2' in kwargs:
endpoint = '/os-volumes_boot'
with _utils.shade_exceptions("Error in creating instance"):
server = self._compute_client.post(
data = self._compute_client.post(
endpoint, json={'server': kwargs})
server = meta.get_and_munchify('server', data)
admin_pass = server.get('adminPass') or kwargs.get('admin_pass')
if not wait:
# This is a direct get call to skip the list_servers
@ -5758,10 +5760,11 @@ class OpenStackCloud(
if admin_pass:
kwargs['adminPass'] = admin_pass
server = self._compute_client.post(
data = self._compute_client.post(
'/servers/{server_id}/action'.format(server_id=server_id),
error_message="Error in rebuilding instance",
json={'rebuild': kwargs})
server = meta.get_and_munchify('server', data)
if not wait:
return self._expand_server(
self._normalize_server(server), bare=bare, detailed=detailed)
@ -5952,12 +5955,13 @@ class OpenStackCloud(
raise OpenStackCloudException(
"failed to find server '{server}'".format(server=name_or_id))
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})),
bare=bare, detailed=detailed)
data = 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})
server = self._normalize_server(
meta.get_and_munchify('server', data))
return self._expand_server(server, bare=bare, detailed=detailed)
def create_server_group(self, name, policies):
"""Create a new server group.