openstack
/
murano-dashboard
Code Issues Proposed changes

Merge "Cleanup for Refactor-error-messages"

This commit is contained in:
Zuul 2020-09-08 05:59:55 +00:00 committed by Gerrit Code Review
parent 5915355c5b 1c1dac9aa6
commit cf98035930
3 changed files with 9 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
muranodashboard/environments/tables.py
View File

@ -100,9 +100,8 @@ class CreateEnvironment(tables.LinkAction):
def action(self, request, environment): def action(self, request, environment):
try: try:
api.environment_create(request, environment) api.environment_create(request, environment)
except Exception as e: except Exception:
msg = (_('Unable to create environment {0}' msg = _('Unable to create environment "%s".') % environment
' due to: {1}').format(environment, e))
LOG.error(msg) LOG.error(msg)
redirect = reverse(self.redirect_url) redirect = reverse(self.redirect_url)
exceptions.handle(request, msg, redirect=redirect) exceptions.handle(request, msg, redirect=redirect)
@ -153,9 +152,8 @@ class DeleteEnvironment(policy.PolicyTargetMixin, tables.DeleteAction):
def action(self, request, environment_id): def action(self, request, environment_id):
try: try:
api.environment_delete(request, environment_id) api.environment_delete(request, environment_id)
except Exception as e: except Exception:
msg = (_('Unable to delete environment {0}' msg = _('Unable to delete environment "%s".') % environment_id
' due to: {1}').format(environment_id, e))
LOG.error(msg) LOG.error(msg)
redirect = reverse(self.redirect_url) redirect = reverse(self.redirect_url)
exceptions.handle(request, msg, redirect=redirect) exceptions.handle(request, msg, redirect=redirect)
@ -209,9 +207,8 @@ class AbandonEnvironment(tables.DeleteAction):
def action(self, request, environment_id): def action(self, request, environment_id):
try: try:
api.environment_delete(request, environment_id, True) api.environment_delete(request, environment_id, True)
except Exception as e: except Exception:
msg = (_('Unable to abandon an environment {0}' msg = _('Unable to abandon the environment "%s".') % environment_id
' due to: {1}').format(environment_id, e))
LOG.error(msg) LOG.error(msg)
redirect = reverse(self.redirect_url) redirect = reverse(self.redirect_url)
exceptions.handle(request, msg, redirect=redirect) exceptions.handle(request, msg, redirect=redirect)

19
muranodashboard/packages/forms.py
View File

@ -12,9 +12,6 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
import json
import sys
from django.core import validators from django.core import validators
from django import forms from django import forms
from django.urls import reverse from django.urls import reverse
@ -252,20 +249,8 @@ class ModifyPackageForm(PackageParamsMixin, horizon_forms.SelfHandlingForm):
request, request,
msg, msg,
redirect=reverse('horizon:app-catalog:packages:index')) redirect=reverse('horizon:app-catalog:packages:index'))
except Exception as original_e: except Exception:
reason = '' msg = _('Failed to modify the package.')
exc_info = sys.exc_info()
if hasattr(original_e, 'details'):
try:
error = json.loads(original_e.details).get('error')
if error:
reason = error.get('message')
except ValueError:
# Let horizon operate with original exception
raise (exc_info[0], exc_info[1], exc_info[2])
msg = _('Failed to modify the package. {0}').format(reason)
LOG.exception(msg) LOG.exception(msg)
redirect = reverse('horizon:app-catalog:packages:index') redirect = reverse('horizon:app-catalog:packages:index')
exceptions.handle(request, exceptions.handle(request,

2
muranodashboard/tests/unit/packages/test_forms.py
View File

@ -252,7 +252,7 @@ class TestModifyPackageForm(helpers.APITestCase):
'horizon:app-catalog:packages:index') 'horizon:app-catalog:packages:index')
mock_exceptions.handle.assert_called_once_with( mock_exceptions.handle.assert_called_once_with(
self.mock_request, self.mock_request,
'Failed to modify the package. {0}'.format('test_error_message'), 'Failed to modify the package.',
redirect='test_redirect') redirect='test_redirect')