Use openstack.common.logging in NEC OpenFlow plugin

Fixes bug 1084129

Also fixes non-i18n raise messages.

Change-Id: I077662329d17427fa3efa7269244248613a6ab85

diff --git a/quantum/plugins/nec/agent/nec_quantum_agent.py b/quantum/plugins/nec/agent/nec_quantum_agent.py
index 551ff1705f6a8a86c4e11e9472e62935c379b2a7..6b9eba03d048989daa94890c57a5782c5dbe520b 100755 (executable)
--- a/quantum/plugins/nec/agent/nec_quantum_agent.py
+++ b/quantum/plugins/nec/agent/nec_quantum_agent.py
@@ -21,7 +21,6 @@
 #    under the License.
 # @author: Ryota MIBU
 
-import logging
 import socket
 import sys
 import time
@@ -30,11 +29,11 @@ from quantum.agent.linux import ovs_lib
 from quantum.common import config as logging_config
 from quantum.common import topics
 from quantum.openstack.common import context
+from quantum.openstack.common import log as logging
 from quantum.openstack.common import rpc
 from quantum.plugins.nec.common import config
 
 
-logging.basicConfig()
 LOG = logging.getLogger(__name__)
 
 

diff --git a/quantum/plugins/nec/common/ofc_client.py b/quantum/plugins/nec/common/ofc_client.py
index f8db74da70a727fde9e01400070b1a2d7c022884..3ec99092b46d5f8d8881dd5666ca17f951927d38 100644 (file)
--- a/quantum/plugins/nec/common/ofc_client.py
+++ b/quantum/plugins/nec/common/ofc_client.py
@@ -17,9 +17,9 @@
 
 import httplib
 import json
-import logging
 import socket
 
+from quantum.openstack.common import log as logging
 from quantum.plugins.nec.common import exceptions as nexc
 
 

diff --git a/quantum/plugins/nec/db/api.py b/quantum/plugins/nec/db/api.py
index 853f2944a683e341a67ea85438e526edf0817c5d..b74e77dd408d9a6ecdbd73074fd60b77f07e40fb 100644 (file)
--- a/quantum/plugins/nec/db/api.py
+++ b/quantum/plugins/nec/db/api.py
@@ -15,12 +15,11 @@
 #    under the License.
 # @author: Ryota MIBU
 
-import logging
-
 import sqlalchemy as sa
 
 from quantum.db import api as db
 from quantum.db import model_base
+from quantum.openstack.common import log as logging
 from quantum.plugins.nec.common import config
 from quantum.plugins.nec.common import exceptions as nexc
 from quantum.plugins.nec.db import models as nmodels

diff --git a/quantum/plugins/nec/db/nec_plugin_base.py b/quantum/plugins/nec/db/nec_plugin_base.py
index 8e86f3d14d49d43482bd6a8a3a338e84f0559430..9d1e53a21fe6f6105329568b5e693ad25b2763be 100644 (file)
--- a/quantum/plugins/nec/db/nec_plugin_base.py
+++ b/quantum/plugins/nec/db/nec_plugin_base.py
@@ -15,12 +15,11 @@
 #    under the License.
 # @author: Ryota MIBU
 
-import logging
-
 from sqlalchemy.orm import exc
 
 from quantum.api.v2 import attributes
 from quantum.db import db_base_plugin_v2
+from quantum.openstack.common import log as logging
 from quantum.openstack.common import uuidutils
 from quantum.plugins.nec.common import exceptions as q_exc
 from quantum.plugins.nec.db import models as nmodels

diff --git a/quantum/plugins/nec/drivers/__init__.py b/quantum/plugins/nec/drivers/__init__.py
index 09e803b31bd10857facd14bde7566924684f1ea9..b226faaa23f63335859c725e3bea7547e9358681 100644 (file)
--- a/quantum/plugins/nec/drivers/__init__.py
+++ b/quantum/plugins/nec/drivers/__init__.py
@@ -15,9 +15,8 @@
 #    under the License.
 # @author: Ryota MIBU
 
-import logging
-
 from quantum.openstack.common import importutils
+from quantum.openstack.common import log as logging
 
 
 LOG = logging.getLogger(__name__)

diff --git a/quantum/plugins/nec/nec_plugin.py b/quantum/plugins/nec/nec_plugin.py
index 6f36dc15b61bccba69bdd188edabea167dd15c41..d7e07e91e5db56d591c54c81f5a8abb964681231 100644 (file)
--- a/quantum/plugins/nec/nec_plugin.py
+++ b/quantum/plugins/nec/nec_plugin.py
@@ -15,12 +15,11 @@
 #    under the License.
 # @author: Ryota MIBU
 
-import logging
-
 from quantum.common import topics
 from quantum import context
 from quantum.db import dhcp_rpc_base
 from quantum.db import l3_db
+from quantum.openstack.common import log as logging
 from quantum.openstack.common import rpc
 from quantum.openstack.common.rpc import dispatcher
 from quantum.plugins.nec.common import config

diff --git a/quantum/plugins/nec/ofc_manager.py b/quantum/plugins/nec/ofc_manager.py
index 40517f5e275e6efc350ffbfccfe96ad338e77ff9..75ee68d73fd22f6965e4bd1b66d74a5034df8781 100644 (file)
--- a/quantum/plugins/nec/ofc_manager.py
+++ b/quantum/plugins/nec/ofc_manager.py
@@ -43,7 +43,8 @@ class OFCManager(object):
         model = self.resource_map[resource]
         ofc_item = ndb.find_ofc_item(model, quantum_id)
         if not ofc_item:
-            reason = "NotFound %s for quantum_id=%s." % (resource, quantum_id)
+            reason = _("NotFound %(resource)s for "
+                       "quantum_id=%(quantum_id)s.") % locals()
             raise nexc.OFCConsistencyBroken(reason=reason)
         return ofc_item.id