diff --git a/quantum/extensions/quotasv2.py b/quantum/extensions/quotasv2.py index 7c5c6b455..693ca4922 100644 --- a/quantum/extensions/quotasv2.py +++ b/quantum/extensions/quotasv2.py @@ -62,7 +62,7 @@ class QuotaSetsController(wsgi.Controller): return dict((k, v['limit']) for k, v in values.items()) def create(self, request, body=None): - raise NotImplemented() + raise NotImplementedError() def index(self, request): context = request.context diff --git a/quantum/plugins/metaplugin/proxy_quantum_plugin.py b/quantum/plugins/metaplugin/proxy_quantum_plugin.py index 846414641..70f861551 100644 --- a/quantum/plugins/metaplugin/proxy_quantum_plugin.py +++ b/quantum/plugins/metaplugin/proxy_quantum_plugin.py @@ -15,6 +15,8 @@ # License for the specific language governing permissions and limitations # under the License. +import logging + from quantum.db import api as db from quantum.db import db_base_plugin_v2 from quantum.db import models_v2 @@ -23,6 +25,9 @@ from quantumclient.common import exceptions from quantumclient.v2_0 import client +LOG = logging.getLogger(__name__) + + class ProxyPluginV2(db_base_plugin_v2.QuantumDbPluginV2): def __init__(self, configfile=None): options = {"sql_connection": cfg.CONF.DATABASE.sql_connection} @@ -70,7 +75,6 @@ class ProxyPluginV2(db_base_plugin_v2.QuantumDbPluginV2): self._get_client().delete_subnet(id) except exceptions.NotFound: LOG.warn("subnet in remote have already deleted") - pass return super(ProxyPluginV2, self).delete_subnet(context, id) def create_network(self, context, network): @@ -97,9 +101,8 @@ class ProxyPluginV2(db_base_plugin_v2.QuantumDbPluginV2): def delete_network(self, context, id): try: self._get_client().delete_network(id) - except exceptions.NetworkNotFound: + except exceptions.NetworkNotFoundClient: LOG.warn("network in remote have already deleted") - pass return super(ProxyPluginV2, self).delete_network(context, id) def create_port(self, context, port): @@ -126,7 +129,6 @@ class ProxyPluginV2(db_base_plugin_v2.QuantumDbPluginV2): def delete_port(self, context, id): try: self._get_client().delete_port(id) - except exceptions.portNotFound: + except exceptions.PortNotFoundClient: LOG.warn("port in remote have already deleted") - pass return super(ProxyPluginV2, self).delete_port(context, id) diff --git a/quantum/plugins/nec/db/nec_plugin_base.py b/quantum/plugins/nec/db/nec_plugin_base.py index d99e2e3da..a051abf6c 100644 --- a/quantum/plugins/nec/db/nec_plugin_base.py +++ b/quantum/plugins/nec/db/nec_plugin_base.py @@ -15,12 +15,20 @@ # under the License. # @author: Ryota MIBU +import logging + +from sqlalchemy.orm import exc + from quantum.api.v2 import attributes from quantum.common import utils from quantum.db import db_base_plugin_v2 +from quantum.plugins.nec.common import exceptions as q_exc from quantum.plugins.nec.db import models as nmodels +LOG = logging.getLogger(__name__) + + class NECPluginV2Base(db_base_plugin_v2.QuantumDbPluginV2): """ Base class of plugins that handle packet filters. """