Add i18n module for networking-powervm domain

Since the translated messages will be in a message catalog
name networking-powervm, all the translation functions must
point to that domain. This change introduces the i18n.py module
to setup translation.

Change-Id: If16d45677071088a95600371daf2066ae21b92b7

networking_powervm/__init__.py

@@ -1,23 +0,0 @@
-# Copyright 2011 OpenStack Foundation
-# All Rights Reserved.
-#
-#    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.
-
-import gettext
-import six
-
-
-if six.PY2:
-    gettext.install('networking-powervm', unicode=1)
-else:
-    gettext.install('networking-powervm')

networking_powervm/plugins/ibm/agent/powervm/agent_base.py

@@ -28,12 +28,14 @@ from neutron.agent import rpc as agent_rpc
 from neutron.common import constants as q_const
 from neutron.common import topics
 from neutron import context as ctx
-from neutron.i18n import _, _LW, _LI
 from pypowervm import adapter as pvm_adpt
 from pypowervm.helpers import log_helper as log_hlp
 from pypowervm.helpers import vios_busy as vio_hlp
 from pypowervm.utils import uuid as pvm_uuid
 
+from networking_powervm.plugins.ibm.agent.powervm.i18n import _
+from networking_powervm.plugins.ibm.agent.powervm.i18n import _LI
+from networking_powervm.plugins.ibm.agent.powervm.i18n import _LW
 from networking_powervm.plugins.ibm.agent.powervm import utils
 
 import time

networking_powervm/plugins/ibm/agent/powervm/i18n.py

@@ -0,0 +1,25 @@
+# Copyright 2015 IBM Corp.
+#
+# All Rights Reserved.
+#
+#    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.
+
+import oslo_i18n
+
+# Initialize message translators and short cut methods
+_translators = oslo_i18n.TranslatorFactory(domain='networking-powervm')
+_ = _translators.primary
+_LI = _translators.log_info
+_LW = _translators.log_warning
+_LE = _translators.log_error
+_LC = _translators.log_critical

networking_powervm/plugins/ibm/agent/powervm/sea_agent.py

@@ -25,13 +25,15 @@ from oslo_log import log as logging
 
 from neutron.agent.common import config as a_config
 from neutron.common import config as n_config
-from neutron.i18n import _LW, _LE, _LI
 from pypowervm import adapter as pvm_adpt
 from pypowervm.tasks import network_bridger as net_br
 from pypowervm import util as pvm_util
 
 from networking_powervm.plugins.ibm.agent.powervm import agent_base
 from networking_powervm.plugins.ibm.agent.powervm import constants as p_const
+from networking_powervm.plugins.ibm.agent.powervm.i18n import _LE
+from networking_powervm.plugins.ibm.agent.powervm.i18n import _LI
+from networking_powervm.plugins.ibm.agent.powervm.i18n import _LW
 from networking_powervm.plugins.ibm.agent.powervm import utils
 
 import sys

networking_powervm/plugins/ibm/agent/powervm/utils.py

@@ -16,8 +16,6 @@
 
 from oslo_log import log as logging
 
-from neutron.i18n import _LW
-
 from pypowervm import exceptions as pvm_exc
 from pypowervm import util as pvm_util
 from pypowervm.utils import retry as pvm_retry
@@ -27,6 +25,7 @@ from pypowervm.wrappers import network as pvm_net
 from pypowervm.wrappers import virtual_io_server as pvm_vios
 
 from networking_powervm.plugins.ibm.agent.powervm import exceptions as np_exc
+from networking_powervm.plugins.ibm.agent.powervm.i18n import _LW
 
 LOG = logging.getLogger(__name__)
 

tox.ini

@@ -78,6 +78,3 @@ ignore = E125,E126,E128,E129,E265,H305,H307,H402,H404,H405,H904
 show-source = true
 builtins = _
 exclude = .venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,build,tools,.ropeproject,rally-scenarios
-
-[hacking]
-import_exceptions = neutron.i18n