x/cloudcafe
Code Issues Proposed changes

Modifies servers client to be less permissive in params/serialization

Browse Source 
* Removed code to provide a missing image name
* Removed "None" params from create server requests

Change-Id: I77acb4b5b732c543d91945dd5c1917c431efabd1
This commit is contained in:
Daryl Walleck
2013-06-17 01:00:09 -05:00
parent 941945632a
commit 05c1877345
2 changed files with 9 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cloudcafe/compute/servers_api/client.py
View File

@@ -592,8 +592,6 @@ class ServersClient(AutoMarshallingRestClient):
@rtype: Requests.response
"""
if name is None:
name = rand_name("TestImage")
url = '{base_url}/servers/{server_id}/action'.format(
base_url=self.url, server_id=server_id)
create_image_request_object = CreateImage(name, metadata)

26
cloudcafe/compute/servers_api/models/requests.py
View File

@@ -48,23 +48,15 @@ class CreateServer(AutoMarshallingModel):
body['name'] = self.name
body['imageRef'] = self.imageRef
body['flavorRef'] = self.flavorRef
if self.diskConfig is not None:
body['OS-DCF:diskConfig'] = self.diskConfig
if self.adminPass is not None:
body['adminPass'] = self.adminPass
if self.metadata is not None:
body['metadata'] = self.metadata
if self.accessIPv4 is not None:
body['accessIPv4'] = self.accessIPv4
if self.accessIPv6 is not None:
body['accessIPv6'] = self.accessIPv6
if self.personality is not None:
body['personality'] = self.personality
if self.networks is not None:
body['networks'] = self.networks
if self.key_name is not None:
body['key_name'] = self.key_name
body['OS-DCF:diskConfig'] = self.diskConfig
body['adminPass'] = self.adminPass
body['metadata'] = self.metadata
body['accessIPv4'] = self.accessIPv4
body['accessIPv6'] = self.accessIPv6
body['personality'] = self.personality
body['networks'] = self.networks
body['key_name'] = self.key_name
body = self._remove_empty_values(body)
return json.dumps({self.ROOT_TAG: body})