diff --git a/manila_ui/enabled/_90_manila_project_shares.py b/manila_ui/enabled/_90_manila_project_shares.py index ad08b0c6..99258b3b 100644 --- a/manila_ui/enabled/_90_manila_project_shares.py +++ b/manila_ui/enabled/_90_manila_project_shares.py @@ -1,6 +1,29 @@ +# Copyright 2016 Mirantis Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. You may obtain +# a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. + +from manila_ui import exceptions + PANEL_DASHBOARD = 'project' PANEL_GROUP = 'compute' PANEL = 'shares' ADD_PANEL = 'manila_ui.dashboards.project.shares.panel.Shares' + # ADD_INSTALLED_APPS enables using html templates from within the plugin ADD_INSTALLED_APPS = ['manila_ui.dashboards.project'] + +ADD_EXCEPTIONS = { + 'recoverable': exceptions.RECOVERABLE, + 'not_found': exceptions.NOT_FOUND, + 'unauthorized': exceptions.UNAUTHORIZED, +} diff --git a/manila_ui/exceptions.py b/manila_ui/exceptions.py index 8ebbb9d4..5d497429 100644 --- a/manila_ui/exceptions.py +++ b/manila_ui/exceptions.py @@ -16,56 +16,20 @@ # License for the specific language governing permissions and limitations # under the License. -from cinderclient import exceptions as cinderclient -from glanceclient.common import exceptions as glanceclient -from heatclient import exc as heatclient -from keystoneclient import exceptions as keystoneclient from manilaclient import exceptions as manilaclient -from neutronclient.common import exceptions as neutronclient -from novaclient import exceptions as novaclient -from requests import exceptions as requests -from swiftclient import client as swiftclient UNAUTHORIZED = ( - keystoneclient.Unauthorized, - cinderclient.Unauthorized, - novaclient.Unauthorized, - glanceclient.Unauthorized, + manilaclient.AuthorizationFailure, manilaclient.Unauthorized, - neutronclient.Unauthorized, - heatclient.HTTPUnauthorized, ) NOT_FOUND = ( - keystoneclient.NotFound, - cinderclient.NotFound, - novaclient.NotFound, - glanceclient.NotFound, manilaclient.NotFound, - neutronclient.NotFound, - heatclient.HTTPNotFound, ) -# NOTE(gabriel): This is very broad, and may need to be dialed in. RECOVERABLE = ( - keystoneclient.ClientException, - # AuthorizationFailure is raised when Keystone is "unavailable". - keystoneclient.AuthorizationFailure, - keystoneclient.Forbidden, - cinderclient.ClientException, - cinderclient.ConnectionError, - cinderclient.Forbidden, - novaclient.ClientException, - novaclient.Forbidden, - glanceclient.ClientException, manilaclient.ClientException, - neutronclient.Forbidden, - neutronclient.NeutronClientException, - swiftclient.ClientException, - heatclient.HTTPForbidden, - heatclient.HTTPException, - requests.RequestException, )