openstack
/
senlin-dashboard
Code Issues Proposed changes

Refactor error messages 

This patch refactoring the error message and
shows the detailed error message

Change-Id: I1b5e2f3beb5d3e7b36bcd7d8e9f7091a80ba3d36
This commit is contained in:
pengyuesheng 2019-09-06 15:53:59 +08:00
parent 3d883aee14
commit 3a72853303
8 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
senlin_dashboard/cluster/clusters/forms.py
View File

@ -87,10 +87,10 @@ class CreateForm(forms.SelfHandlingForm):
msg = _('Creating cluster "%s" successfully') % data['name'] msg = _('Creating cluster "%s" successfully') % data['name']
messages.success(request, msg) messages.success(request, msg)
return cluster return cluster
except Exception: except Exception as e:
redirect = reverse(INDEX_URL) redirect = reverse(INDEX_URL)
exceptions.handle(request, exceptions.handle(request,
_("Unable to create cluster."), _("Unable to create cluster: %s") % e,
redirect=redirect) redirect=redirect)
@ -125,8 +125,8 @@ class ManagePoliciesForm(forms.SelfHandlingForm):
"cluster": data['cluster_id']} "cluster": data['cluster_id']}
messages.success(request, msg) messages.success(request, msg)
return attach return attach
except Exception: except Exception as e:
redirect = reverse(INDEX_URL) redirect = reverse(INDEX_URL)
exceptions.handle(request, exceptions.handle(request,
_("Unable to attach policy."), _("Unable to attach policy: %s") % e,
redirect=redirect) redirect=redirect)

8
senlin_dashboard/cluster/clusters/views.py
View File

@ -57,10 +57,10 @@ class IndexView(tables.DataTableView):
paginate=True, paginate=True,
reversed_order=reversed_order, reversed_order=reversed_order,
filters=filters) filters=filters)
except Exception: except Exception as e:
self._prev = self._more = False self._prev = self._more = False
clusters = [] clusters = []
msg = _('Unable to retrieve clusters.') msg = _('Unable to retrieve clusters: %s') % e
exceptions.handle(self.request, msg) exceptions.handle(self.request, msg)
return clusters return clusters
@ -91,8 +91,8 @@ class DetailView(tabs.TabView):
cluster = senlin.cluster_get(self.request, cluster_id) cluster = senlin.cluster_get(self.request, cluster_id)
cluster.profile_url = reverse_lazy(self.profile_url, cluster.profile_url = reverse_lazy(self.profile_url,
args=[cluster.profile_id]) args=[cluster.profile_id])
except Exception: except Exception as e:
msg = _("Unable to retrieve cluster.") msg = _("Unable to retrieve cluster: %s") % e
url = reverse_lazy(clusters_forms.INDEX_URL) url = reverse_lazy(clusters_forms.INDEX_URL)
exceptions.handle(self.request, msg, redirect=url) exceptions.handle(self.request, msg, redirect=url)
return cluster return cluster

8
senlin_dashboard/cluster/nodes/forms.py
View File

@ -86,10 +86,10 @@ class CreateForm(forms.SelfHandlingForm):
msg = _('Creating node "%s" successfully') % data['name'] msg = _('Creating node "%s" successfully') % data['name']
messages.info(request, msg) messages.info(request, msg)
return node return node
except Exception: except Exception as e:
redirect = reverse("horizon:cluster:nodes:index") redirect = reverse("horizon:cluster:nodes:index")
exceptions.handle(request, exceptions.handle(request,
_("Unable to create node."), _("Unable to create node: %s") % e,
redirect=redirect) redirect=redirect)
@ -133,9 +133,9 @@ class UpdateNodeForm(forms.SelfHandlingForm):
' has been accepted for processing.') % ' has been accepted for processing.') %
data['name']) data['name'])
return node return node
except Exception: except Exception as e:
redirect = reverse("horizon:cluster:nodes:index") redirect = reverse("horizon:cluster:nodes:index")
exceptions.handle(request, exceptions.handle(request,
_("Unable to update node."), _("Unable to update node: %s") % e,
redirect=redirect) redirect=redirect)
return False return False

12
senlin_dashboard/cluster/nodes/views.py
View File

@ -57,10 +57,10 @@ class IndexView(tables.DataTableView):
paginate=True, paginate=True,
reversed_order=reversed_order, reversed_order=reversed_order,
filters=filters) filters=filters)
except Exception: except Exception as e:
self._prev = self._more = False self._prev = self._more = False
nodes = [] nodes = []
msg = _('Unable to retrieve nodes.') msg = _('Unable to retrieve nodes: %s') % e
exceptions.handle(self.request, msg) exceptions.handle(self.request, msg)
return nodes return nodes
@ -90,8 +90,8 @@ class DetailView(tabs.TabView):
# Get initial node information # Get initial node information
node_id = self.kwargs["node_id"] node_id = self.kwargs["node_id"]
node = senlin.node_get(self.request, node_id) node = senlin.node_get(self.request, node_id)
except Exception: except Exception as e:
msg = _("Unable to retrieve node.") msg = _("Unable to retrieve node: %s") % e
url = reverse_lazy("horizon:cluster:nodes:index") url = reverse_lazy("horizon:cluster:nodes:index")
exceptions.handle(self.request, msg, redirect=url) exceptions.handle(self.request, msg, redirect=url)
return node return node
@ -145,8 +145,8 @@ class UpdateView(forms.ModalFormView):
"role": node.role, "role": node.role,
"metadata": metadata} "metadata": metadata}
except Exception: except Exception as e:
msg = _("Unable to retrieve node.") msg = _("Unable to retrieve node: %s") % e
url = reverse_lazy("horizon:cluster:nodes:index") url = reverse_lazy("horizon:cluster:nodes:index")
exceptions.handle(self.request, msg, redirect=url) exceptions.handle(self.request, msg, redirect=url)
return node_dict return node_dict

8
senlin_dashboard/cluster/policies/forms.py
View File

@ -91,9 +91,9 @@ class CreatePolicyForm(forms.SelfHandlingForm):
_('Your policy %s has been created.') % _('Your policy %s has been created.') %
args['name']) args['name'])
return policy return policy
except Exception: except Exception as e:
redirect = reverse(INDEX_URL) redirect = reverse(INDEX_URL)
msg = _('Unable to create new policy') msg = _('Unable to create new policy: %s') % e
exceptions.handle(request, msg, redirect=redirect) exceptions.handle(request, msg, redirect=redirect)
return False return False
@ -114,8 +114,8 @@ class UpdatePolicyForm(forms.SelfHandlingForm):
except ValidationError as e: except ValidationError as e:
self.api_error(e.messages[0]) self.api_error(e.messages[0])
return False return False
except Exception: except Exception as e:
redirect = reverse(INDEX_URL) redirect = reverse(INDEX_URL)
msg = _('Unable to update policy') msg = _('Unable to update policy: %s') % e
exceptions.handle(request, msg, redirect=redirect) exceptions.handle(request, msg, redirect=redirect)
return False return False

12
senlin_dashboard/cluster/policies/views.py
View File

@ -57,10 +57,10 @@ class IndexView(tables.DataTableView):
paginate=True, paginate=True,
reversed_order=reversed_order, reversed_order=reversed_order,
filters=filters) filters=filters)
except Exception: except Exception as e:
self._prev = self._more = False self._prev = self._more = False
policies = [] policies = []
msg = _('Unable to retrieve policies.') msg = _('Unable to retrieve policies: %s') % e
exceptions.handle(self.request, msg) exceptions.handle(self.request, msg)
return policies return policies
@ -90,8 +90,8 @@ class DetailView(tabs.TabView):
policy = senlin.policy_get(self.request, policy_id) policy = senlin.policy_get(self.request, policy_id)
policy.policy_spec = yaml.safe_dump(policy.spec, policy.policy_spec = yaml.safe_dump(policy.spec,
default_flow_style=False) default_flow_style=False)
except Exception: except Exception as e:
msg = _("Unable to retrieve policy.") msg = _("Unable to retrieve policy: %s") % e
url = reverse_lazy(policies_forms.INDEX_URL) url = reverse_lazy(policies_forms.INDEX_URL)
exceptions.handle(self.request, msg, redirect=url) exceptions.handle(self.request, msg, redirect=url)
return policy return policy
@ -129,8 +129,8 @@ class UpdateView(forms.ModalFormView):
policy = senlin.policy_get(self.request, policy_id) policy = senlin.policy_get(self.request, policy_id)
policy_dict = {"policy_id": policy_id, policy_dict = {"policy_id": policy_id,
"name": policy.name} "name": policy.name}
except Exception: except Exception as e:
msg = _("Unable to retrieve policy.") msg = _("Unable to retrieve policy: %s") % e
url = reverse_lazy(policies_forms.INDEX_URL) url = reverse_lazy(policies_forms.INDEX_URL)
exceptions.handle(self.request, msg, redirect=url) exceptions.handle(self.request, msg, redirect=url)
return policy_dict return policy_dict

4
senlin_dashboard/cluster/receivers/forms.py
View File

@ -96,8 +96,8 @@ class CreateReceiverForm(forms.SelfHandlingForm):
_('Your receiver %s has been created successfully.') % _('Your receiver %s has been created successfully.') %
data['name']) data['name'])
return receiver return receiver
except Exception: except Exception as e:
redirect = reverse(INDEX_URL) redirect = reverse(INDEX_URL)
msg = _('Unable to create new receiver') msg = _('Unable to create new receiver: %s') % e
exceptions.handle(request, msg, redirect=redirect) exceptions.handle(request, msg, redirect=redirect)
return False return False

8
senlin_dashboard/cluster/receivers/views.py
View File

@ -55,10 +55,10 @@ class IndexView(tables.DataTableView):
paginate=True, paginate=True,
reversed_order=reversed_order, reversed_order=reversed_order,
filters=filters) filters=filters)
except Exception: except Exception as e:
self._prev = self._more = False self._prev = self._more = False
receivers = [] receivers = []
msg = _('Unable to retrieve receivers.') msg = _('Unable to retrieve receivers: %s') % e
exceptions.handle(self.request, msg) exceptions.handle(self.request, msg)
return receivers return receivers
@ -87,8 +87,8 @@ class DetailView(tabs.TabView):
# Get initial receiver information # Get initial receiver information
receiver_id = self.kwargs["receiver_id"] receiver_id = self.kwargs["receiver_id"]
receiver = senlin.receiver_get(self.request, receiver_id) receiver = senlin.receiver_get(self.request, receiver_id)
except Exception: except Exception as e:
msg = _("Unable to retrieve receiver.") msg = _("Unable to retrieve receiver: %s") % e
url = reverse_lazy("horizon:cluster:receivers:index") url = reverse_lazy("horizon:cluster:receivers:index")
exceptions.handle(self.request, msg, redirect=url) exceptions.handle(self.request, msg, redirect=url)
return receiver return receiver