openstack
/
senlin
Code Issues Proposed changes

Use six module format ex message 

Change-Id: I0889020d7357840a23139262e3f43e1221840f66
Signed-off-by: Yuanbin.Chen <cybing4@gmail.com>
This commit is contained in:
Yuanbin.Chen 2018-03-29 18:12:06 +08:00
parent 325ff9dd2a
commit a91cf438c8
9 changed files with 27 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
contrib/kubernetes/kube/master.py
View File

@ -169,7 +169,8 @@ class ServerProfile(base.KubeBaseProfile):
except exc.InternalError as ex:
if server and server.id:
resource_id = server.id
raise exc.EResourceCreation(type='server', message=ex.message,
raise exc.EResourceCreation(type='server',
message=six.text_type(ex),
resource_id=resource_id)
def do_delete(self, obj, **params):

3
contrib/kubernetes/kube/worker.py
View File

@ -214,7 +214,8 @@ class ServerProfile(base.KubeBaseProfile):
except exc.InternalError as ex:
if server and server.id:
resource_id = server.id
raise exc.EResourceCreation(type='server', message=ex.message,
raise exc.EResourceCreation(type='server',
message=six.text_type(ex),
resource_id=resource_id)
def do_delete(self, obj, **params):

3
contrib/vdu/vdu/server.py
View File

@ -903,7 +903,8 @@ class ServerProfile(base.Profile):
except exc.InternalError as ex:
if server and server.id:
resource_id = server.id
raise exc.EResourceCreation(type='server', message=ex.message,
raise exc.EResourceCreation(type='server',
message=six.text_type(ex),
resource_id=resource_id)
def do_delete(self, obj, **params):

4
senlin/drivers/sdk.py
View File

@ -47,7 +47,7 @@ def parse_exception(ex):
elif hasattr(ex, "http_status") and ex.http_status is not None:
code = ex.http_status
message = ex.message
message = six.text_type(ex)
data = {}
if ex.details is None and ex.response is not None:
data = ex.response.json()
@ -78,7 +78,7 @@ def parse_exception(ex):
elif isinstance(ex, sdk_exc.SDKException):
# Besides HttpException there are some other exceptions like
# ResourceTimeout can be raised from SDK, handle them here.
message = ex.message
message = six.text_type(ex)
elif isinstance(ex, req_exc.RequestException):
# Exceptions that are not captured by SDK
code = ex.errno

4
senlin/engine/notifications/message.py
View File

@ -13,6 +13,7 @@
from oslo_config import cfg
from oslo_context import context as oslo_context
from oslo_log import log as logging
import six
from senlin.common import context as senlin_context
from senlin.common import exception
@ -89,4 +90,5 @@ class Message(object):
return self.zaqar().message_post(self.queue_name, message_list)
except exception.InternalError as ex:
raise exception.EResourceCreation(type='queue', message=ex.message)
raise exception.EResourceCreation(type='queue',
message=six.text_type(ex))

3
senlin/engine/receivers/base.py
View File

@ -218,7 +218,8 @@ class Receiver(object):
try:
base = kc.get_senlin_endpoint()
except exception.InternalError as ex:
msg = _('Senlin endpoint can not be found: %s.') % ex.message
msg = _('Senlin endpoint can not be found: %s.'
) % ex
LOG.warning(msg)
return base

15
senlin/engine/receivers/message.py
View File

@ -16,6 +16,7 @@ from keystoneauth1 import loading as ks_loading
from oslo_config import cfg
from oslo_log import log as logging
from oslo_utils import uuidutils
import six
from senlin.common import consts
from senlin.common import exception as exc
@ -103,7 +104,7 @@ class Message(base.Receiver):
'receiver': self.id}
LOG.error(msg)
raise exc.EResourceCreation(type='trust',
message=ex.message)
message=six.text_type(ex))
return trust.id
def _create_queue(self):
@ -116,7 +117,8 @@ class Message(base.Receiver):
try:
self.zaqar().queue_create(**kwargs)
except exc.InternalError as ex:
raise exc.EResourceCreation(type='queue', message=ex.message)
raise exc.EResourceCreation(type='queue',
message=six.text_type(ex))
return queue_name
@ -139,7 +141,7 @@ class Message(base.Receiver):
**kwargs)
except exc.InternalError as ex:
raise exc.EResourceCreation(type='subscription',
message=ex.message)
message=six.text_type(ex))
return subscription
def _find_cluster(self, context, identity):
@ -233,14 +235,14 @@ class Message(base.Receiver):
except exc.InternalError as ex:
raise exc.EResourceDeletion(type='subscription',
id='subscription',
message=ex.message)
message=six.text_type(ex))
# Delete zaqar queue
try:
self.zaqar().queue_delete(queue_name)
except exc.InternalError as ex:
raise exc.EResourceDeletion(type='queue',
id='queue_name',
message=ex.message)
message=six.text_type(ex))
def notify(self, context, params=None):
queue_name = self.channel['queue_name']
@ -262,7 +264,8 @@ class Message(base.Receiver):
action_id = self._build_action(context, message)
actions.append(action_id)
except exc.InternalError as ex:
LOG.error(_('Failed in building action: %s'), ex.message)
LOG.error(_('Failed in building action: %s'),
ex)
try:
self.zaqar().message_delete(queue_name, message['id'],
claim.id)

5
senlin/profiles/os/heat/stack.py
View File

@ -176,7 +176,8 @@ class StackProfile(base.Profile):
timeout=timeout)
return stack.id
except exc.InternalError as ex:
raise exc.EResourceCreation(type='stack', message=ex.message)
raise exc.EResourceCreation(type='stack',
message=six.text_type(ex))
def do_delete(self, obj, **params):
"""Delete the physical stack behind the node object.
@ -256,7 +257,7 @@ class StackProfile(base.Profile):
timeout=timeout)
except exc.InternalError as ex:
raise exc.EResourceUpdate(type='stack', id=self.stack_id,
message=ex.message)
message=six.text_type(ex))
return True

3
senlin/profiles/os/nova/server.py
View File

@ -864,7 +864,8 @@ class ServerProfile(base.Profile):
except exc.InternalError as ex:
if server and server.id:
resource_id = server.id
raise exc.EResourceCreation(type='server', message=ex.message,
raise exc.EResourceCreation(type='server',
message=six.text_type(ex),
resource_id=resource_id)
def do_delete(self, obj, **params):