Enable veiw services after deployment
Change-Id: I8c3c780d0560100c120da5350b48a3bb1758b5c0
This commit is contained in:
parent
8196e532d5
commit
43a0bda3a4
|
@ -158,7 +158,7 @@ def get_service_client(request, service_type):
|
|||
def services_list(request, environment_id):
|
||||
services = []
|
||||
|
||||
session_id = Session.get(request, environment_id)
|
||||
session_id = Session.get_or_create(request, environment_id)
|
||||
get_environment = muranoclient(request).environments.get
|
||||
|
||||
environment = get_environment(environment_id, session_id)
|
||||
|
|
|
@ -86,11 +86,7 @@ class DeleteEnvironment(tables.DeleteAction):
|
|||
return True
|
||||
|
||||
def action(self, request, environment_id):
|
||||
try:
|
||||
api.environment_delete(request, environment_id)
|
||||
except:
|
||||
msg = _('Sorry, you can\'t delete this environment right now')
|
||||
exceptions.handle(request, msg)
|
||||
api.environment_delete(request, environment_id)
|
||||
|
||||
|
||||
class EditEnvironment(tables.LinkAction):
|
||||
|
|
|
@ -167,10 +167,9 @@ class Services(tables.DataTableView):
|
|||
|
||||
def get_context_data(self, **kwargs):
|
||||
context = super(Services, self).get_context_data(**kwargs)
|
||||
|
||||
try:
|
||||
context['environment_name'] = self.environment_name
|
||||
except ArithmeticError:
|
||||
except:
|
||||
msg = _('Sorry, you this environment does\'t exist anymore')
|
||||
redirect = reverse("horizon:project:murano:index")
|
||||
exceptions.handle(self.request, msg, redirect=redirect)
|
||||
|
@ -208,11 +207,11 @@ class DetailServiceView(tabs.TabView):
|
|||
service_id = self.kwargs['service_id']
|
||||
try:
|
||||
service = api.service_get(self.request, service_id)
|
||||
except Exception as e:
|
||||
except:
|
||||
redirect = reverse('horizon:project:murano:index')
|
||||
exceptions.handle(self.request,
|
||||
_('Unable to retrieve details for '
|
||||
'service: %s' % e.message),
|
||||
'service'),
|
||||
redirect=redirect)
|
||||
else:
|
||||
self._service = service
|
||||
|
|
Loading…
Reference in New Issue