x/daisycloud-core
Code Issues Proposed changes

fix template description err

Browse Source 
It raises an error when description set to multiple lines of
generating cluster template.

TrivialFix

Change-Id: I3044f5a717a6c080029900ae6872c96380621e3c
This commit is contained in:
Zhou Ya 2016-10-24 16:00:08 +08:00
parent 82245fa9d9
commit 67ef05878a
18 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
code/daisyclient/daisyclient/common/http.py
View File

@ -22,7 +22,7 @@ from daisyclient.common.utils import safe_header
from daisyclient import exc
from oslo_utils import importutils
from oslo_utils import netutils
from simplejson import decoder
import requests
try:
from requests.packages.urllib3.exceptions import ProtocolError

8
code/daisyclient/daisyclient/v1/backup_restore.py
View File

@ -87,7 +87,7 @@ class BackupRestoreManager(base.ManagerWithFind):
url = '/v1/backup'
hdrs = self._backup_meta_to_headers(fields)
resp, body = self.client.post(url, headers=hdrs, data=hdrs)
resp, body = self.client.post(url, headers=None, data=hdrs)
return BackupRestore(self, body)
def restore(self, **kwargs):
@ -106,7 +106,7 @@ class BackupRestoreManager(base.ManagerWithFind):
url = '/v1/restore'
hdrs = self._restore_meta_to_headers(fields)
resp, body = self.client.post(url, headers=hdrs, data=hdrs)
resp, body = self.client.post(url, headers=None, data=hdrs)
def backup_file_version(self, **kwargs):
"""Get version of backup file.
@ -123,7 +123,7 @@ class BackupRestoreManager(base.ManagerWithFind):
url = '/v1/backup_file_version'
hdrs = self._restore_meta_to_headers(fields)
resp, body = self.client.post(url, headers=hdrs, data=hdrs)
resp, body = self.client.post(url, headers=None, data=hdrs)
return BackupRestore(self, body)
def version(self, **kwargs):
@ -141,5 +141,5 @@ class BackupRestoreManager(base.ManagerWithFind):
url = '/v1/version'
hdrs = self._restore_meta_to_headers(fields)
resp, body = self.client.post(url, headers=hdrs, data=hdrs)
resp, body = self.client.post(url, headers=None, data=hdrs)
return BackupRestore(self, body)

2
code/daisyclient/daisyclient/v1/clusters.py
View File

@ -283,7 +283,7 @@ class ClusterManager(base.ManagerWithFind):
hdrs = self._cluster_meta_to_headers(fields)
resp, body = self.client.post('/v1/clusters',
headers=hdrs,
headers=None,
data=hdrs)
return_request_id = kwargs.get('return_req_id', None)
if return_request_id is not None:

2
code/daisyclient/daisyclient/v1/components.py
View File

@ -275,7 +275,7 @@ class ComponentManager(base.ManagerWithFind):
hdrs = self._component_meta_to_headers(fields)
resp, body = self.client.post('/v1/components',
headers=hdrs,
headers=None,
data=hdrs)
return_request_id = kwargs.get('return_req_id', None)
if return_request_id is not None:

2
code/daisyclient/daisyclient/v1/config_files.py
View File

@ -241,7 +241,7 @@ class Config_fileManager(base.ManagerWithFind):
hdrs = self._config_file_meta_to_headers(fields)
resp, body = self.client.post('/v1/config_files',
headers=hdrs,
headers=None,
data=hdrs)
return_request_id = kwargs.get('return_req_id', None)
if return_request_id is not None:

6
code/daisyclient/daisyclient/v1/config_sets.py
View File

@ -241,7 +241,7 @@ class Config_setManager(base.ManagerWithFind):
hdrs = self._config_set_meta_to_headers(fields)
resp, body = self.client.post('/v1/config_sets',
headers=hdrs,
headers=None,
data=hdrs)
return_request_id = kwargs.get('return_req_id', None)
if return_request_id is not None:
@ -301,7 +301,7 @@ class Config_setManager(base.ManagerWithFind):
hdrs = self._config_set_meta_to_headers(fields)
resp, body = self.client.post('/v1/cluster_config_set_update',
headers=hdrs,
headers=None,
data=hdrs)
return Config_set(self, self._format_config_set_meta_for_user(
body['config_set']))
@ -322,6 +322,6 @@ class Config_setManager(base.ManagerWithFind):
hdrs = self._config_set_meta_to_headers(fields)
resp, body = self.client.post('/v1/cluster_config_set_progress',
headers=hdrs,
headers=None,
data=hdrs)
return Config_set(self, self._format_config_set_meta_for_user(body))

4
code/daisyclient/daisyclient/v1/configs.py
View File

@ -243,7 +243,7 @@ class ConfigManager(base.ManagerWithFind):
hdrs = self._config_meta_to_headers(fields)
resp, body = self.client.post('/v1/configs',
headers=hdrs,
headers=None,
data=hdrs)
return_request_id = kwargs.get('return_req_id', None)
if return_request_id is not None:
@ -260,7 +260,7 @@ class ConfigManager(base.ManagerWithFind):
continue
hdrs = self._config_meta_to_headers(fields)
url = "/v1/configs_delete"
resp, body = self.client.delete(url, headers=hdrs, data=hdrs)
resp, body = self.client.delete(url, headers=None, data=hdrs)
return_request_id = kwargs.get('return_req_id', None)
if return_request_id is not None:
return_request_id.append(resp.headers.get(OS_REQ_ID_HDR, None))

4
code/daisyclient/daisyclient/v1/disk_array.py
View File

@ -184,7 +184,7 @@ class DiskArrayManager(base.ManagerWithFind):
url = '/v1/service_disk'
hdrs = self._service_disk_meta_to_headers(fields)
resp, body = self.client.post(url, headers=hdrs, data=hdrs)
resp, body = self.client.post(url, headers=None, data=hdrs)
return Disk_array(self, self._format_service_disk_meta_for_user(
body['disk_meta']))
@ -331,7 +331,7 @@ class DiskArrayManager(base.ManagerWithFind):
url = '/v1/cinder_volume'
hdrs = self._service_disk_meta_to_headers(fields)
resp, body = self.client.post(url, headers=hdrs, data=hdrs)
resp, body = self.client.post(url, headers=None, data=hdrs)
return Disk_array(self, self._format_service_disk_meta_for_user(
body['disk_meta']))

6
code/daisyclient/daisyclient/v1/hosts.py
View File

@ -257,7 +257,7 @@ class HostManager(base.ManagerWithFind):
hdrs = self._host_meta_to_headers(fields)
resp, body = self.client.post('/v1/nodes',
headers=hdrs,
headers=None,
data=hdrs)
return_request_id = kwargs.get('return_req_id', None)
if return_request_id is not None:
@ -312,7 +312,7 @@ class HostManager(base.ManagerWithFind):
continue
hdrs.update(self._host_meta_to_headers(fields))
url = '/v1/discover_host/'
resp, body = self.client.post(url, headers=hdrs, data=hdrs)
resp, body = self.client.post(url, headers=None, data=hdrs)
return Host(self, self._format_host_meta_for_user(body))
@ -335,7 +335,7 @@ class HostManager(base.ManagerWithFind):
hdrs = self._host_meta_to_headers(fields)
resp, body = self.client.post('/v1/discover/nodes',
headers=hdrs,
headers=None,
data=hdrs)
return_request_id = kwargs.get('return_req_id', None)

4
code/daisyclient/daisyclient/v1/images.py
View File

@ -312,7 +312,7 @@ class ImageManager(base.ManagerWithFind):
hdrs['x-glance-api-copy-from'] = copy_from
resp, body = self.client.post('/v1/images',
headers=hdrs,
headers=None,
data=image_data)
return_request_id = kwargs.get('return_req_id', None)
if return_request_id is not None:
@ -354,7 +354,7 @@ class ImageManager(base.ManagerWithFind):
hdrs['x-glance-api-copy-from'] = copy_from
url = '/v1/images/%s' % base.getid(image)
resp, body = self.client.put(url, headers=hdrs, data=image_data)
resp, body = self.client.put(url, headers=None, data=image_data)
return_request_id = kwargs.get('return_req_id', None)
if return_request_id is not None:
return_request_id.append(resp.headers.get(OS_REQ_ID_HDR, None))

6
code/daisyclient/daisyclient/v1/install.py
View File

@ -90,7 +90,7 @@ class InstallManager(base.ManagerWithFind):
url = '/v1/install'
hdrs = self._install_meta_to_headers(fields)
resp, body = self.client.post(url, headers=hdrs, data=hdrs)
resp, body = self.client.post(url, headers=None, data=hdrs)
return Install(self, self._format_install_meta_for_user(body))
def export_db(self, **kwargs):
@ -108,7 +108,7 @@ class InstallManager(base.ManagerWithFind):
url = '/v1/export_db'
hdrs = self._install_meta_to_headers(fields)
resp, body = self.client.post(url, headers=hdrs, data=hdrs)
resp, body = self.client.post(url, headers=None, data=hdrs)
return Install(self, self._format_install_meta_for_user(body))
def disk_array_update(self, cluster, **kwargs):
@ -124,5 +124,5 @@ class InstallManager(base.ManagerWithFind):
url = '/v1/disk_array/%s' % base.getid(cluster)
hdrs = self._install_meta_to_headers(fields)
resp, body = self.client.post(url, headers=hdrs, data=hdrs)
resp, body = self.client.post(url, headers=None, data=hdrs)
return Install(self, self._format_install_meta_for_user(body))

2
code/daisyclient/daisyclient/v1/networks.py
View File

@ -282,7 +282,7 @@ class NetworkManager(base.ManagerWithFind):
hdrs = self._network_meta_to_headers(fields)
resp, body = self.client.post('/v1/networks',
headers=hdrs,
headers=None,
data=hdrs)
return_request_id = kwargs.get('return_req_id', None)
if return_request_id is not None:

2
code/daisyclient/daisyclient/v1/roles.py
View File

@ -280,7 +280,7 @@ class RoleManager(base.ManagerWithFind):
hdrs = self._role_meta_to_headers(fields)
resp, body = self.client.post('/v1/roles',
headers=hdrs,
headers=None,
data=hdrs)
return_request_id = kwargs.get('return_req_id', None)
if return_request_id is not None:

2
code/daisyclient/daisyclient/v1/services.py
View File

@ -275,7 +275,7 @@ class ServiceManager(base.ManagerWithFind):
hdrs = self._service_meta_to_headers(fields)
resp, body = self.client.post('/v1/services',
headers=hdrs,
headers=None,
data=hdrs)
return_request_id = kwargs.get('return_req_id', None)
if return_request_id is not None:

12
code/daisyclient/daisyclient/v1/template.py
View File

@ -221,7 +221,7 @@ class TemplateManager(base.ManagerWithFind):
hdrs = self._template_meta_to_headers(fields)
resp, body = self.client.post('/v1/template',
headers=hdrs,
headers=None,
data=hdrs)
return_request_id = kwargs.get('return_req_id', None)
if return_request_id is not None:
@ -275,7 +275,7 @@ class TemplateManager(base.ManagerWithFind):
url = '/v1/export_db_to_json'
hdrs = self._template_meta_to_headers(fields)
resp, body = self.client.post(url, headers=hdrs, data=hdrs)
resp, body = self.client.post(url, headers=None, data=hdrs)
return Template(
self, self._format_template_meta_for_user(body['template']))
@ -293,7 +293,7 @@ class TemplateManager(base.ManagerWithFind):
url = '/v1/import_json_to_template'
hdrs = self._template_meta_to_headers(fields)
resp, body = self.client.post(url, headers=hdrs, data=hdrs)
resp, body = self.client.post(url, headers=None, data=hdrs)
return Template(
self, self._format_template_meta_for_user(body['template']))
@ -311,7 +311,7 @@ class TemplateManager(base.ManagerWithFind):
url = '/v1/import_template_to_db'
hdrs = self._template_meta_to_headers(fields)
resp, body = self.client.post(url, headers=hdrs, data=hdrs)
resp, body = self.client.post(url, headers=None, data=hdrs)
return Template(
self, self._format_template_meta_for_user(body['template']))
@ -327,7 +327,7 @@ class TemplateManager(base.ManagerWithFind):
url = '/v1/host_to_template'
hdrs = self._template_meta_to_headers(fields)
resp, body = self.client.post(url, headers=hdrs, data=hdrs)
resp, body = self.client.post(url, headers=None, data=hdrs)
return Template(
self, self._format_template_meta_for_user(body['host_template']))
@ -403,6 +403,6 @@ class TemplateManager(base.ManagerWithFind):
url = '/v1/host_template'
hdrs = self._template_meta_to_headers(fields)
resp, body = self.client.put(url, headers=hdrs, data=hdrs)
resp, body = self.client.put(url, headers=None, data=hdrs)
return Template(
self, self._format_template_meta_for_user(body['host_template']))

1
code/daisyclient/daisyclient/v1/uninstall.py
View File

@ -26,6 +26,7 @@ OS_REQ_ID_HDR = 'x-openstack-request-id'
class Uninstall(base.Resource):
def __repr__(self):
return "<Uninstall %s>" % self._info

2
code/daisyclient/daisyclient/v1/update.py Executable file → Normal file
View File

@ -75,7 +75,7 @@ class UpdateManager(base.ManagerWithFind):
if field in CREATE_PARAMS:
fields[field] = kwargs[field]
else:
msg = 'update() got an unexpected keyword argument \'%s\''
msg = 'update() got an unexpected argument \'%s\''
raise TypeError(msg % field)
if "cluster" in fields:

1
code/daisyclient/setup.cfg Executable file → Normal file
View File

@ -44,4 +44,3 @@ upload-dir = doc/build/html
[wheel]
universal = 1