Deprecate sysinv.openstack.common.gettextutils

The gettextutils code dates back to when openstack projects
maintained common code and was later replaced by oslo_utils.

The new convention is to create a new _i18n.py file at the base
level and import it.

See: https://docs.openstack.org/oslo.i18n/latest

Most of the changes in this review are:

Old Code:
  from sysinv.openstack.common.gettextutils import _

New Code:
  from sysinv._i18n import _

This explicitly adds oslo_i18n to requirements.txt

Change-Id: I606ef9fef1e0431340669e9a2f153a038e72b88a
Story: 2006796
Task: 37340
Signed-off-by: Al Bailey <Al.Bailey@windriver.com>

sysinv/sysinv/centos/sysinv.spec

@@ -28,6 +28,7 @@ Requires: python-wsme
 Requires: python-six
 Requires: python2-django
 Requires: python2-mox3
+Requires: python2-oslo-i18n
 Requires: python2-oslo-config
 Requires: python2-oslo-concurrency
 Requires: python2-oslo-db

sysinv/sysinv/opensuse/sysinv.spec

@@ -33,6 +33,7 @@ Requires: python2-WebTest
 Requires: python2-WSME
 Requires: python2-six
 Requires: python2-mox3
+Requires: python2-oslo.i18n
 Requires: python2-oslo.config
 Requires: python2-oslo.concurrency
 Requires: python2-oslo.db

sysinv/sysinv/sysinv/openstack-common.conf

@@ -9,7 +9,6 @@ module=excutils
 module=fileutils
 module=fixture
 module=flakes
-module=gettextutils
 module=importutils
 module=install_venv_common
 module=jsonutils

sysinv/sysinv/sysinv/requirements.txt

@@ -16,6 +16,7 @@ netaddr
 paramiko>=1.8.0
 passlib>=1.7.0
 iso8601>=0.1.4
+oslo.i18n  # Apache-2.0
 oslo.config>=3.7.0 # Apache-2.0
 oslo.concurrency>=3.7.1 # Apache-2.0
 oslo.db>=4.1.0 # Apache-2.0

sysinv/sysinv/sysinv/sysinv/_i18n.py

@@ -0,0 +1,32 @@
+#
+# Copyright (c) 2018-2019 Wind River Systems, Inc.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+"""oslo.i18n integration module.
+
+See https://docs.openstack.org/oslo.i18n/latest/user/usage.html
+
+"""
+
+import oslo_i18n
+
+DOMAIN = 'sysinv'
+
+_translators = oslo_i18n.TranslatorFactory(domain=DOMAIN)
+
+# The primary translation function using the well-known name "_"
+_ = _translators.primary
+
+# The contextual translation function using the name "_C"
+# requires oslo.i18n >=2.1.0
+_C = _translators.contextual_form
+
+# The plural translation function using the name "_P"
+# requires oslo.i18n >=2.1.0
+_P = _translators.plural_form
+
+
+def get_available_languages():
+    return oslo_i18n.get_available_languages(DOMAIN)

sysinv/sysinv/sysinv/sysinv/agent/lldp/config.py

@@ -10,7 +10,7 @@
 #
 
 from oslo_config import cfg
-from oslo_utils._i18n import _
+from sysinv._i18n import _
 
 SYSINV_LLDP_OPTS = [
     cfg.ListOpt('drivers',

sysinv/sysinv/sysinv/sysinv/agent/pci.py

@@ -16,7 +16,7 @@ import os
 import shlex
 import subprocess
 
-from oslo_utils._i18n import _
+from sysinv._i18n import _
 from sysinv.common import constants
 from sysinv.common import utils
 from sysinv.openstack.common import log as logging

sysinv/sysinv/sysinv/sysinv/api/controllers/v1/address.py

@@ -20,14 +20,13 @@
 
 
 import netaddr
-import uuid
-
 import pecan
 from pecan import rest
-
+import uuid
 from wsme import types as wtypes
 import wsmeext.pecan as wsme_pecan
 
+from sysinv._i18n import _
 from sysinv.api.controllers.v1 import base
 from sysinv.api.controllers.v1 import collection
 from sysinv.api.controllers.v1 import route
@@ -37,7 +36,6 @@ from sysinv.common import constants
 from sysinv.common import exception
 from sysinv.common import utils as cutils
 from sysinv import objects
-from sysinv.openstack.common.gettextutils import _
 from sysinv.openstack.common import log
 
 LOG = log.getLogger(__name__)

sysinv/sysinv/sysinv/sysinv/api/controllers/v1/address_pool.py

@@ -20,17 +20,15 @@
 
 
 import netaddr
-import uuid
-
 import pecan
 from pecan import rest
 import random
-
+import uuid
 import wsme
 from wsme import types as wtypes
 import wsmeext.pecan as wsme_pecan
 
-from oslo_utils._i18n import _
+from sysinv._i18n import _
 from sysinv.api.controllers.v1 import base
 from sysinv.api.controllers.v1 import collection
 from sysinv.api.controllers.v1 import types

sysinv/sysinv/sysinv/sysinv/api/controllers/v1/ceph_mon.py

@@ -20,15 +20,14 @@
 #
 
 import jsonpatch
-import six
-
 import pecan
 from pecan import rest
-
+import six
 import wsme
 from wsme import types as wtypes
 import wsmeext.pecan as wsme_pecan
 
+from sysinv._i18n import _
 from sysinv.api.controllers.v1 import base
 from sysinv.api.controllers.v1 import collection
 from sysinv.api.controllers.v1 import controller_fs as controller_fs_utils
@@ -42,7 +41,6 @@ from sysinv.common import utils as cutils
 from sysinv import objects
 from sysinv.openstack.common import log
 from sysinv.openstack.common import uuidutils
-from sysinv.openstack.common.gettextutils import _
 
 from sysinv.common.storage_backend_conf import StorageBackendConfig
 

sysinv/sysinv/sysinv/sysinv/api/controllers/v1/certificate.py

@@ -21,15 +21,17 @@
 
 import datetime
 import os
-
 import pecan
 import ssl
 import wsme
 import wsmeext.pecan as wsme_pecan
+
 from cryptography import x509
 from cryptography.hazmat.backends import default_backend
 from pecan import expose
 from pecan import rest
+
+from sysinv._i18n import _
 from sysinv import objects
 from sysinv.api.controllers.v1 import base
 from sysinv.api.controllers.v1 import collection
@@ -40,7 +42,6 @@ from sysinv.common import constants
 from sysinv.common import exception
 from sysinv.common import utils as cutils
 from sysinv.openstack.common import log
-from sysinv.openstack.common.gettextutils import _
 from wsme import types as wtypes
 
 LOG = log.getLogger(__name__)

sysinv/sysinv/sysinv/sysinv/api/controllers/v1/cluster.py

@@ -18,15 +18,14 @@
 # Copyright (c) 2016-2017 Wind River Systems, Inc.
 #
 
-
-import uuid
-
+import os
 import pecan
+from pecan import rest
+import uuid
 import wsme
 import wsmeext.pecan as wsme_pecan
-import os
-from oslo_utils._i18n import _
-from pecan import rest
+
+from sysinv._i18n import _
 from sysinv import objects
 from sysinv.api.controllers.v1 import base
 from sysinv.api.controllers.v1 import collection

sysinv/sysinv/sysinv/sysinv/api/controllers/v1/community.py

@@ -11,14 +11,13 @@
 #
 
 import jsonpatch
-
 import pecan
 from pecan import rest
-
 import wsme
 from wsme import types as wtypes
 import wsmeext.pecan as wsme_pecan
 
+from sysinv._i18n import _
 from sysinv.api.controllers.v1 import base
 from sysinv.api.controllers.v1 import collection
 from sysinv.api.controllers.v1 import link
@@ -29,7 +28,6 @@ from sysinv.common import utils as cutils
 from sysinv import objects
 from sysinv.openstack.common.db.exception import DBDuplicateEntry
 from sysinv.openstack.common.db.exception import DBError
-from sysinv.openstack.common.gettextutils import _
 from sysinv.openstack.common import log
 
 LOG = log.getLogger(__name__)

sysinv/sysinv/sysinv/sysinv/api/controllers/v1/controller_fs.py

@@ -21,14 +21,13 @@
 
 
 import jsonpatch
-
 import pecan
 from pecan import rest
-
 import wsme
 from wsme import types as wtypes
 import wsmeext.pecan as wsme_pecan
 
+from sysinv._i18n import _
 from sysinv.api.controllers.v1 import base
 from sysinv.api.controllers.v1 import collection
 from sysinv.api.controllers.v1 import link
@@ -39,7 +38,6 @@ from sysinv.common import exception
 from sysinv.common import utils as cutils
 from sysinv import objects
 from sysinv.openstack.common import log
-from sysinv.openstack.common.gettextutils import _
 
 LOG = log.getLogger(__name__)
 

sysinv/sysinv/sysinv/sysinv/api/controllers/v1/cpu.py

@@ -20,15 +20,14 @@
 
 
 import jsonpatch
-import six
-
 import pecan
 from pecan import rest
-
+import six
 import wsme
 from wsme import types as wtypes
 import wsmeext.pecan as wsme_pecan
 
+from sysinv._i18n import _
 from sysinv.api.controllers.v1 import base
 from sysinv.api.controllers.v1 import collection
 from sysinv.api.controllers.v1 import link
@@ -39,7 +38,6 @@ from sysinv.common import constants
 from sysinv.common import exception
 from sysinv.common import utils as cutils
 from sysinv import objects
-from sysinv.openstack.common.gettextutils import _
 from sysinv.openstack.common import log
 
 LOG = log.getLogger(__name__)

sysinv/sysinv/sysinv/sysinv/api/controllers/v1/datanetwork.py

@@ -29,6 +29,7 @@ import wsme
 from wsme import types as wtypes
 import wsmeext.pecan as wsme_pecan
 
+from sysinv._i18n import _
 from sysinv.api.controllers.v1 import base
 from sysinv.api.controllers.v1 import collection
 from sysinv.api.controllers.v1 import types
@@ -38,7 +39,6 @@ from sysinv.common import exception
 from sysinv.common import utils as cutils
 from sysinv import objects
 from sysinv.openstack.common import log
-from sysinv.openstack.common.gettextutils import _
 
 LOG = log.getLogger(__name__)
 

sysinv/sysinv/sysinv/sysinv/api/controllers/v1/disk.py

@@ -18,16 +18,14 @@
 # Copyright (c) 2013-2017 Wind River Systems, Inc.
 #
 
-
-import six
-
 import pecan
 from pecan import rest
-
+import six
 import wsme
 from wsme import types as wtypes
 import wsmeext.pecan as wsme_pecan
 
+from sysinv._i18n import _
 from sysinv.api.controllers.v1 import base
 from sysinv.api.controllers.v1 import collection
 from sysinv.api.controllers.v1 import link
@@ -39,7 +37,6 @@ from sysinv.common import exception
 from sysinv.common import constants
 from sysinv.common import utils as cutils
 from sysinv import objects
-from sysinv.openstack.common.gettextutils import _
 from sysinv.openstack.common import log
 
 LOG = log.getLogger(__name__)

sysinv/sysinv/sysinv/sysinv/api/controllers/v1/dns.py

@@ -19,16 +19,14 @@
 # Copyright (c) 2013-2017 Wind River Systems, Inc.
 #
 
-
 import jsonpatch
-
 import pecan
 from pecan import rest
-
 import wsme
 from wsme import types as wtypes
 import wsmeext.pecan as wsme_pecan
 
+from sysinv._i18n import _
 from sysinv.api.controllers.v1 import base
 from sysinv.api.controllers.v1 import collection
 from sysinv.api.controllers.v1 import link
@@ -38,7 +36,6 @@ from sysinv.common import constants
 from sysinv.common import exception
 from sysinv.common import utils as cutils
 from sysinv import objects
-from sysinv.openstack.common.gettextutils import _
 from sysinv.openstack.common import log
 
 from netaddr import IPAddress

sysinv/sysinv/sysinv/sysinv/api/controllers/v1/drbdconfig.py

@@ -20,14 +20,13 @@
 #
 
 import jsonpatch
-
 import pecan
 from pecan import rest
-
 import wsme
 from wsme import types as wtypes
 import wsmeext.pecan as wsme_pecan
 
+from sysinv._i18n import _
 from sysinv.api.controllers.v1 import base
 from sysinv.api.controllers.v1 import collection
 from sysinv.api.controllers.v1 import link
@@ -37,7 +36,6 @@ from sysinv.common import constants
 from sysinv.common import exception
 from sysinv.common import utils as cutils
 from sysinv import objects
-from sysinv.openstack.common.gettextutils import _
 from sysinv.openstack.common import log
 
 LOG = log.getLogger(__name__)

sysinv/sysinv/sysinv/sysinv/api/controllers/v1/ethernet_port.py

@@ -18,17 +18,15 @@
 # Copyright (c) 2013-2016 Wind River Systems, Inc.
 #
 
-
 import jsonpatch
-import six
-
 import pecan
 from pecan import rest
-
+import six
 import wsme
 from wsme import types as wtypes
 import wsmeext.pecan as wsme_pecan
 
+from sysinv._i18n import _
 from sysinv.api.controllers.v1 import base
 from sysinv.api.controllers.v1 import collection
 from sysinv.api.controllers.v1 import link
@@ -37,7 +35,6 @@ from sysinv.api.controllers.v1 import utils
 from sysinv.common import exception
 from sysinv.common import utils as cutils
 from sysinv import objects
-from sysinv.openstack.common.gettextutils import _
 from sysinv.openstack.common import log
 
 LOG = log.getLogger(__name__)

sysinv/sysinv/sysinv/sysinv/api/controllers/v1/fernet_repo.py

@@ -6,19 +6,19 @@
 
 
 import pecan
+from pecan import rest
+from six.moves import http_client
 import wsme
 import wsmeext.pecan as wsme_pecan
-from six.moves import http_client
+from wsme import types as wtypes
 
-from pecan import rest
+from sysinv._i18n import _
 from sysinv.api.controllers.v1 import base
 from sysinv.api.controllers.v1 import collection
 from sysinv.api.controllers.v1 import link
 from sysinv.api.controllers.v1 import types
 from sysinv.openstack.common import log
 from sysinv.common import utils as cutils
-from sysinv.openstack.common.gettextutils import _
-from wsme import types as wtypes
 
 LOG = log.getLogger(__name__)
 

sysinv/sysinv/sysinv/sysinv/api/controllers/v1/health.py

@@ -5,13 +5,12 @@
 
 import pecan
 from pecan import rest
-
 import wsme
 from wsme import types as wtypes
 import wsmeext.pecan as wsme_pecan
 
+from sysinv._i18n import _
 from sysinv.openstack.common import log
-from sysinv.openstack.common.gettextutils import _
 
 
 LOG = log.getLogger(__name__)

sysinv/sysinv/sysinv/sysinv/api/controllers/v1/helm_charts.py

@@ -7,17 +7,16 @@
 import pecan
 from pecan import rest
 import six
-import yaml
-
 import wsme
 from wsme import types as wtypes
 import wsmeext.pecan as wsme_pecan
+import yaml
 
+from sysinv._i18n import _
 from sysinv import objects
 from sysinv.common import exception
 from sysinv.helm import common
 from sysinv.openstack.common import log
-from sysinv.openstack.common.gettextutils import _
 
 
 LOG = log.getLogger(__name__)

sysinv/sysinv/sysinv/sysinv/api/controllers/v1/host.py

@@ -46,8 +46,9 @@ from fm_api import constants as fm_constants
 from fm_api import fm_api
 from pecan import expose
 from pecan import rest
-from sysinv import objects
 
+from sysinv import objects
+from sysinv._i18n import _
 from sysinv.api.controllers.v1 import ethernet_port
 from sysinv.api.controllers.v1 import port
 from sysinv.api.controllers.v1 import address as address_api
@@ -90,7 +91,6 @@ from sysinv.common import exception
 from sysinv.common import utils as cutils
 from sysinv.openstack.common import log
 from sysinv.openstack.common import uuidutils
-from sysinv.openstack.common.gettextutils import _
 from sysinv.common.storage_backend_conf import StorageBackendConfig
 from sysinv.common import health
 

sysinv/sysinv/sysinv/sysinv/api/controllers/v1/host_fs.py

@@ -5,14 +5,13 @@
 #
 
 import jsonpatch
-
 import pecan
 from pecan import rest
-
 import wsme
 from wsme import types as wtypes
 import wsmeext.pecan as wsme_pecan
 
+from sysinv._i18n import _
 from sysinv.api.controllers.v1 import base
 from sysinv.api.controllers.v1 import collection
 from sysinv.api.controllers.v1 import link
@@ -23,7 +22,6 @@ from sysinv.common import exception
 from sysinv.common import utils as cutils
 from sysinv import objects
 from sysinv.openstack.common import log
-from sysinv.openstack.common.gettextutils import _
 
 LOG = log.getLogger(__name__)
 

sysinv/sysinv/sysinv/sysinv/api/controllers/v1/interface.py

@@ -34,6 +34,7 @@ import string
 from wsme import types as wtypes
 import wsmeext.pecan as wsme_pecan
 
+from sysinv._i18n import _
 from sysinv.api.controllers.v1 import address
 from sysinv.api.controllers.v1 import address_pool
 from sysinv.api.controllers.v1 import base
@@ -52,7 +53,6 @@ from sysinv import objects
 from sysinv.objects import utils as object_utils
 from sysinv.openstack.common import log
 from sysinv.openstack.common import uuidutils
-from sysinv.openstack.common.gettextutils import _
 from fm_api import constants as fm_constants
 from fm_api import fm_api
 

sysinv/sysinv/sysinv/sysinv/api/controllers/v1/interface_datanetwork.py

@@ -22,13 +22,14 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-import uuid
-import wsme
 import pecan
 from pecan import rest
+import uuid
+import wsme
 from wsme import types as wtypes
 import wsmeext.pecan as wsme_pecan
 
+from sysinv._i18n import _
 from sysinv.api.controllers.v1 import base
 from sysinv.api.controllers.v1 import collection
 from sysinv.api.controllers.v1 import types
@@ -36,8 +37,6 @@ from sysinv.api.controllers.v1 import utils
 from sysinv.common import utils as cutils
 from sysinv.common import constants
 from sysinv.common import exception
-from sysinv.openstack.common.gettextutils import _
-
 from sysinv import objects
 
 

sysinv/sysinv/sysinv/sysinv/api/controllers/v1/interface_network.py

@@ -21,13 +21,14 @@
 
 import os
 import pecan
+from pecan import rest
 import uuid
 import wsme
 import wsmeext.pecan as wsme_pecan
-from oslo_log import log
-from pecan import rest
 from wsme import types as wtypes
 
+from oslo_log import log
+from sysinv._i18n import _
 from sysinv import objects
 from sysinv.api.controllers.v1 import address_pool
 from sysinv.api.controllers.v1 import base
@@ -37,7 +38,6 @@ from sysinv.api.controllers.v1 import utils
 from sysinv.common import constants
 from sysinv.common import exception
 from sysinv.common import utils as cutils
-from sysinv.openstack.common.gettextutils import _
 
 LOG = log.getLogger(__name__)
 

sysinv/sysinv/sysinv/sysinv/api/controllers/v1/kube_app.py

@@ -15,6 +15,7 @@ import wsmeext.pecan as wsme_pecan
 
 from contextlib import contextmanager
 from oslo_log import log
+from sysinv._i18n import _
 from sysinv import objects
 from sysinv.api.controllers.v1 import base
 from sysinv.api.controllers.v1 import collection
@@ -24,7 +25,6 @@ from sysinv.common import constants
 from sysinv.common import exception
 from sysinv.common import utils as cutils
 from sysinv.helm import common as helm_common
-from sysinv.openstack.common.gettextutils import _
 
 import cgcs_patch.constants as patch_constants
 

sysinv/sysinv/sysinv/sysinv/api/controllers/v1/label.py

@@ -4,9 +4,12 @@
 #
 
 import pecan
+from pecan import rest
 import wsme
 import wsmeext.pecan as wsme_pecan
-from pecan import rest
+from wsme import types as wtypes
+
+from sysinv._i18n import _
 from sysinv import objects
 from sysinv.api.controllers.v1 import base
 from sysinv.api.controllers.v1 import collection
@@ -19,9 +22,7 @@ from sysinv.common import utils as cutils
 from sysinv.helm import common
 from sysinv.openstack.common import excutils
 from sysinv.openstack.common import log
-from sysinv.openstack.common.gettextutils import _
 from sysinv.openstack.common.rpc import common as rpc_common
-from wsme import types as wtypes
 
 LOG = log.getLogger(__name__)
 

sysinv/sysinv/sysinv/sysinv/api/controllers/v1/lldp_agent.py

@@ -18,16 +18,14 @@
 # Copyright (c) 2016 Wind River Systems, Inc.
 #
 
-
 import jsonpatch
-
 import pecan
 from pecan import rest
-
 import wsme
 from wsme import types as wtypes
 import wsmeext.pecan as wsme_pecan
 
+from sysinv._i18n import _
 from sysinv.api.controllers.v1 import base
 from sysinv.api.controllers.v1 import collection
 from sysinv.api.controllers.v1 import link
@@ -38,7 +36,6 @@ from sysinv.common import constants
 from sysinv.common import exception
 from sysinv.common import utils as cutils
 from sysinv import objects
-from sysinv.openstack.common.gettextutils import _
 from sysinv.openstack.common import log
 
 LOG = log.getLogger(__name__)

sysinv/sysinv/sysinv/sysinv/api/controllers/v1/lldp_neighbour.py

@@ -18,16 +18,14 @@
 # Copyright (c) 2016 Wind River Systems, Inc.
 #
 
-
 import jsonpatch
-
 import pecan
 from pecan import rest
-
 import wsme
 from wsme import types as wtypes
 import wsmeext.pecan as wsme_pecan
 
+from sysinv._i18n import _
 from sysinv.api.controllers.v1 import base
 from sysinv.api.controllers.v1 import collection
 from sysinv.api.controllers.v1 import link
@@ -38,7 +36,6 @@ from sysinv.common import constants
 from sysinv.common import exception
 from sysinv.common import utils as cutils
 from sysinv import objects
-from sysinv.openstack.common.gettextutils import _
 from sysinv.openstack.common import log
 
 LOG = log.getLogger(__name__)

sysinv/sysinv/sysinv/sysinv/api/controllers/v1/lldp_tlv.py

@@ -18,16 +18,14 @@
 # Copyright (c) 2016 Wind River Systems, Inc.
 #
 
-
 import jsonpatch
-
 import pecan
 from pecan import rest
-
 import wsme
 from wsme import types as wtypes
 import wsmeext.pecan as wsme_pecan
 
+from sysinv._i18n import _
 from sysinv.api.controllers.v1 import base
 from sysinv.api.controllers.v1 import collection
 from sysinv.api.controllers.v1 import link
@@ -36,7 +34,6 @@ from sysinv.api.controllers.v1 import utils
 from sysinv.common import exception
 from sysinv.common import utils as cutils
 from sysinv import objects
-from sysinv.openstack.common.gettextutils import _
 from sysinv.openstack.common import log
 
 LOG = log.getLogger(__name__)

sysinv/sysinv/sysinv/sysinv/api/controllers/v1/load.py

@@ -18,18 +18,16 @@
 # Copyright (c) 2015-2016 Wind River Systems, Inc.
 #
 
-
 import jsonpatch
-import socket
-
 import pecan
-import six
 from pecan import rest
-
+import six
+import socket
 import wsme
 from wsme import types as wtypes
 import wsmeext.pecan as wsme_pecan
 
+from sysinv._i18n import _
 from sysinv.api.controllers.v1 import base
 from sysinv.api.controllers.v1 import collection
 from sysinv.api.controllers.v1 import link
@@ -41,7 +39,6 @@ from sysinv.common import exception
 from sysinv.common import utils as cutils
 from sysinv import objects
 from sysinv.openstack.common import log
-from sysinv.openstack.common.gettextutils import _
 from sysinv.openstack.common.rpc import common
 
 LOG = log.getLogger(__name__)

sysinv/sysinv/sysinv/sysinv/api/controllers/v1/lvg.py

@@ -19,17 +19,16 @@
 # Copyright (c) 2013-2017 Wind River Systems, Inc.
 #
 
-
 import jsonpatch
-import six
-
 import pecan
 from pecan import rest
-
+import six
 import wsme
 from wsme import types as wtypes
 import wsmeext.pecan as wsme_pecan
 
+from oslo_serialization import jsonutils
+from sysinv._i18n import _
 from sysinv.api.controllers.v1 import base
 from sysinv.api.controllers.v1 import collection
 from sysinv.api.controllers.v1 import pv as pv_api
@@ -42,8 +41,6 @@ from sysinv.common import utils as cutils
 from sysinv import objects
 from sysinv.openstack.common import log
 from sysinv.openstack.common import uuidutils
-from sysinv.openstack.common.gettextutils import _
-from oslo_serialization import jsonutils
 from sysinv.common.storage_backend_conf import StorageBackendConfig
 
 LOG = log.getLogger(__name__)

sysinv/sysinv/sysinv/sysinv/api/controllers/v1/memory.py

@@ -18,17 +18,15 @@
 # Copyright (c) 2013-2016 Wind River Systems, Inc.
 #
 
-
 import jsonpatch
-import six
-
 import pecan
 from pecan import rest
-
+import six
 import wsme
 from wsme import types as wtypes
 import wsmeext.pecan as wsme_pecan
 
+from sysinv._i18n import _
 from sysinv.api.controllers.v1 import base
 from sysinv.api.controllers.v1 import collection
 from sysinv.api.controllers.v1 import link
@@ -39,7 +37,6 @@ from sysinv.common import exception
 from sysinv.common import utils as cutils
 from sysinv import objects
 from sysinv.openstack.common import log
-from sysinv.openstack.common.gettextutils import _
 
 
 LOG = log.getLogger(__name__)

sysinv/sysinv/sysinv/sysinv/api/controllers/v1/network.py

@@ -18,17 +18,15 @@
 # Copyright (c) 2015 Wind River Systems, Inc.
 #
 
-
 import collections
-import uuid
-
 import pecan
 from pecan import rest
-
+import uuid
 import wsme
 from wsme import types as wtypes
 import wsmeext.pecan as wsme_pecan
 
+from sysinv._i18n import _
 from sysinv.api.controllers.v1 import address_pool
 from sysinv.api.controllers.v1 import base
 from sysinv.api.controllers.v1 import collection
@@ -39,7 +37,6 @@ from sysinv.common import exception
 from sysinv.common import utils as cutils
 from sysinv import objects
 from sysinv.openstack.common import log
-from sysinv.openstack.common.gettextutils import _
 
 LOG = log.getLogger(__name__)
 

sysinv/sysinv/sysinv/sysinv/api/controllers/v1/network_oam.py

@@ -19,7 +19,6 @@
 # Copyright (c) 2013-2017 Wind River Systems, Inc.
 #
 
-
 import copy
 import jsonpatch
 import pecan
@@ -33,6 +32,7 @@ from netaddr import IPAddress
 from netaddr import IPRange
 from netaddr import AddrFormatError
 
+from sysinv._i18n import _
 from sysinv.api.controllers.v1 import base
 from sysinv.api.controllers.v1 import collection
 from sysinv.api.controllers.v1 import link
@@ -43,7 +43,6 @@ from sysinv.common import exception
 from sysinv.common import utils as cutils
 from sysinv import objects
 from sysinv.openstack.common import log
-from sysinv.openstack.common.gettextutils import _
 
 
 LOG = log.getLogger(__name__)

sysinv/sysinv/sysinv/sysinv/api/controllers/v1/node.py

@@ -19,17 +19,15 @@
 # Copyright (c) 2013-2016 Wind River Systems, Inc.
 #
 
-
 import jsonpatch
-import six
-
 import pecan
 from pecan import rest
-
+import six
 import wsme
 from wsme import types as wtypes
 import wsmeext.pecan as wsme_pecan
 
+from sysinv._i18n import _
 from sysinv.api.controllers.v1 import base
 from sysinv.api.controllers.v1 import collection
 from sysinv.api.controllers.v1 import cpu
@@ -41,7 +39,6 @@ from sysinv.api.controllers.v1 import utils
 from sysinv.common import exception
 from sysinv.common import utils as cutils
 from sysinv import objects
-from sysinv.openstack.common.gettextutils import _
 from sysinv.openstack.common import log
 from sysinv.openstack.common import uuidutils
 

sysinv/sysinv/sysinv/sysinv/api/controllers/v1/ntp.py

@@ -19,16 +19,14 @@
 # Copyright (c) 2013-2019 Wind River Systems, Inc.
 #
 
-
 import jsonpatch
-
 import pecan
 from pecan import rest
-
 import wsme
 from wsme import types as wtypes
 import wsmeext.pecan as wsme_pecan
 
+from sysinv._i18n import _
 from sysinv.api.controllers.v1 import base
 from sysinv.api.controllers.v1 import collection
 from sysinv.api.controllers.v1 import link
@@ -38,7 +36,6 @@ from sysinv.common import constants
 from sysinv.common import exception
 from sysinv.common import utils as cutils
 from sysinv import objects
-from sysinv.openstack.common.gettextutils import _
 from sysinv.openstack.common import log
 
 from netaddr import IPAddress

sysinv/sysinv/sysinv/sysinv/api/controllers/v1/partition.py

@@ -6,15 +6,14 @@
 
 import jsonpatch
 import math
-import six
-
 import pecan
 from pecan import rest
-
+import six
 import wsme
 from wsme import types as wtypes
 import wsmeext.pecan as wsme_pecan
 
+from sysinv._i18n import _
 from sysinv.api.controllers.v1 import base
 from sysinv.api.controllers.v1 import collection
 from sysinv.api.controllers.v1 import link
@@ -24,7 +23,6 @@ from sysinv.common import constants
 from sysinv.common import exception
 from sysinv.common import utils as cutils
 from sysinv import objects
-from sysinv.openstack.common.gettextutils import _
 from sysinv.openstack.common import log
 from sysinv.openstack.common import uuidutils
 

sysinv/sysinv/sysinv/sysinv/api/controllers/v1/patch_api.py

@@ -5,8 +5,8 @@
 #
 from sysinv.api.controllers.v1.rest_api import rest_api_request
 from sysinv.api.controllers.v1.rest_api import get_token
-
 from sysinv.openstack.common import log
+
 LOG = log.getLogger(__name__)
 
 

sysinv/sysinv/sysinv/sysinv/api/controllers/v1/pci_device.py

@@ -3,16 +3,14 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-
 import jsonpatch
-
 import pecan
 from pecan import rest
-
 import wsme
 from wsme import types as wtypes
 import wsmeext.pecan as wsme_pecan
 
+from sysinv._i18n import _
 from sysinv.api.controllers.v1 import base
 from sysinv.api.controllers.v1 import collection
 from sysinv.api.controllers.v1 import link
@@ -23,7 +21,6 @@ from sysinv.common import exception
 from sysinv.common import utils as cutils
 from sysinv import objects
 from sysinv.openstack.common import log
-from sysinv.openstack.common.gettextutils import _
 
 LOG = log.getLogger(__name__)
 

sysinv/sysinv/sysinv/sysinv/api/controllers/v1/port.py

@@ -18,15 +18,13 @@
 # Copyright (c) 2013-2016 Wind River Systems, Inc.
 #
 
-
-import six
-
 import pecan
 from pecan import rest
-
+import six
 from wsme import types as wtypes
 import wsmeext.pecan as wsme_pecan
 
+from sysinv._i18n import _
 from sysinv.api.controllers.v1 import base
 from sysinv.api.controllers.v1 import collection
 from sysinv.api.controllers.v1 import link
@@ -36,7 +34,6 @@ from sysinv.api.controllers.v1 import types
 from sysinv.api.controllers.v1 import utils
 from sysinv.common import exception
 from sysinv import objects
-from sysinv.openstack.common.gettextutils import _
 from sysinv.openstack.common import log
 
 LOG = log.getLogger(__name__)

sysinv/sysinv/sysinv/sysinv/api/controllers/v1/profile.py

@@ -19,15 +19,16 @@
 # Copyright (c) 2013-2018 Wind River Systems, Inc.
 #
 
-
-import six
 import jsonpatch
 import pecan
-import wsme
-import wsmeext.pecan as wsme_pecan
-from oslo_config import cfg
 from pecan import expose
 from pecan import rest
+import six
+import wsme
+import wsmeext.pecan as wsme_pecan
+
+from oslo_config import cfg
+from sysinv._i18n import _
 from sysinv import objects
 from sysinv.api.controllers.v1 import base
 from sysinv.api.controllers.v1 import collection
@@ -56,7 +57,6 @@ import xml.etree.ElementTree as et
 from lxml import etree
 from sysinv.api.controllers.v1 import profile_utils
 from sysinv.openstack.common.db import exception as dbException
-from sysinv.openstack.common.gettextutils import _
 from wsme import types as wtypes
 from sysinv.common.storage_backend_conf import StorageBackendConfig
 

sysinv/sysinv/sysinv/sysinv/api/controllers/v1/profile_utils.py

@@ -19,11 +19,10 @@
 # Copyright (c) 2013-2015 Wind River Systems, Inc.
 #
 
-
 import netaddr
+from sysinv._i18n import _
 from sysinv.common import constants
 from sysinv.openstack.common import log
-from sysinv.openstack.common.gettextutils import _
 
 LOG = log.getLogger(__name__)
 

sysinv/sysinv/sysinv/sysinv/api/controllers/v1/ptp.py

@@ -7,14 +7,13 @@
 ########################################################################
 
 import jsonpatch
-
 import pecan
 from pecan import rest
-
 import wsme
 from wsme import types as wtypes
 import wsmeext.pecan as wsme_pecan
 
+from sysinv._i18n import _
 from sysinv.api.controllers.v1 import base
 from sysinv.api.controllers.v1 import collection
 from sysinv.api.controllers.v1 import link
@@ -23,7 +22,6 @@ from sysinv.api.controllers.v1 import utils
 from sysinv.common import exception
 from sysinv.common import utils as cutils
 from sysinv import objects
-from sysinv.openstack.common.gettextutils import _
 from sysinv.openstack.common import log
 
 

sysinv/sysinv/sysinv/sysinv/api/controllers/v1/pv.py

@@ -19,17 +19,15 @@
 # Copyright (c) 2013-2017 Wind River Systems, Inc.
 #
 
-
 import jsonpatch
-import six
-
 import pecan
 from pecan import rest
-
+import six
 import wsme
 from wsme import types as wtypes
 import wsmeext.pecan as wsme_pecan
 
+from sysinv._i18n import _
 from sysinv.api.controllers.v1 import base
 from sysinv.api.controllers.v1 import collection
 from sysinv.api.controllers.v1 import disk as disk_api
@@ -41,7 +39,6 @@ from sysinv.common import exception
 from sysinv.common.storage_backend_conf import StorageBackendConfig
 from sysinv.common import utils as cutils
 from sysinv import objects
-from sysinv.openstack.common.gettextutils import _
 from sysinv.openstack.common import log
 from sysinv.openstack.common.rpc import common as rpc_common
 from sysinv.openstack.common import uuidutils

sysinv/sysinv/sysinv/sysinv/api/controllers/v1/query.py

@@ -26,17 +26,17 @@
 # Copyright (c) 2013-2015 Wind River Systems, Inc.
 #
 
-import inspect
-import functools
-import six
 import ast
-
+import functools
+import inspect
+import six
 import wsme
 from wsme import types as wtypes
+
 from oslo_utils import strutils
 from oslo_utils import timeutils
+from sysinv._i18n import _
 from sysinv.openstack.common import log
-from sysinv.openstack.common.gettextutils import _
 
 LOG = log.getLogger(__name__)
 

sysinv/sysinv/sysinv/sysinv/api/controllers/v1/registry_image.py

@@ -6,16 +6,15 @@
 
 import pecan
 from pecan import rest
-
 import wsme
 from wsme import types as wtypes
 import wsmeext.pecan as wsme_pecan
 
+from oslo_log import log
+from sysinv._i18n import _
 from sysinv.api.controllers.v1 import base
 from sysinv.api.controllers.v1 import collection
 from sysinv.common import utils as cutils
-from oslo_log import log
-from sysinv.openstack.common.gettextutils import _
 
 
 LOG = log.getLogger(__name__)

sysinv/sysinv/sysinv/sysinv/api/controllers/v1/remotelogging.py

@@ -19,17 +19,15 @@
 # Copyright (c) 2013-2016 Wind River Systems, Inc.
 #
 
-
 import jsonpatch
-import re
-
 import pecan
 from pecan import rest
-
+import re
 import wsme
 from wsme import types as wtypes
 import wsmeext.pecan as wsme_pecan
 
+from sysinv._i18n import _
 from sysinv.api.controllers.v1 import base
 from sysinv.api.controllers.v1 import collection
 from sysinv.api.controllers.v1 import link
@@ -39,7 +37,6 @@ from sysinv.common import constants
 from sysinv.common import exception
 from sysinv.common import utils as cutils
 from sysinv import objects
-from sysinv.openstack.common.gettextutils import _
 from sysinv.openstack.common import log
 
 from netaddr import IPAddress

sysinv/sysinv/sysinv/sysinv/api/controllers/v1/route.py

@@ -18,16 +18,14 @@
 # Copyright (c) 2015-2016 Wind River Systems, Inc.
 #
 
-
 import netaddr
-import uuid
-
 import pecan
 from pecan import rest
-
+import uuid
 from wsme import types as wtypes
 import wsmeext.pecan as wsme_pecan
 
+from sysinv._i18n import _
 from sysinv.api.controllers.v1 import base
 from sysinv.api.controllers.v1 import collection
 from sysinv.api.controllers.v1 import types
@@ -37,7 +35,6 @@ from sysinv.common import constants
 from sysinv.common import utils as cutils
 from sysinv import objects
 from sysinv.openstack.common import log
-from sysinv.openstack.common.gettextutils import _
 
 LOG = log.getLogger(__name__)
 

sysinv/sysinv/sysinv/sysinv/api/controllers/v1/sdn_controller.py

@@ -18,14 +18,14 @@
 # Copyright (c) 2016 Wind River Systems, Inc.
 #
 
-import socket
 import pecan
 from pecan import rest
-
+import socket
 import wsme
 from wsme import types as wtypes
 import wsmeext.pecan as wsme_pecan
 
+from sysinv._i18n import _
 from sysinv.api.controllers.v1 import base
 from sysinv.api.controllers.v1 import collection
 from sysinv.api.controllers.v1 import link
@@ -36,7 +36,6 @@ from sysinv.common import exception
 from sysinv.common import utils as cutils
 from sysinv import objects
 from sysinv.openstack.common import excutils
-from sysinv.openstack.common.gettextutils import _
 from sysinv.openstack.common import log
 
 from fm_api import constants as fm_constants

sysinv/sysinv/sysinv/sysinv/api/controllers/v1/sensor.py

@@ -18,18 +18,16 @@
 # Copyright (c) 2013-2015 Wind River Systems, Inc.
 #
 
-
-import jsonpatch
-import six
 import copy
-
+import jsonpatch
 import pecan
 from pecan import rest
-
+import six
 import wsme
 from wsme import types as wtypes
 import wsmeext.pecan as wsme_pecan
 
+from sysinv._i18n import _
 from sysinv.api.controllers.v1 import base
 from sysinv.api.controllers.v1 import collection
 from sysinv.api.controllers.v1 import link
@@ -41,7 +39,6 @@ from sysinv.common import exception
 from sysinv.common import utils as cutils
 from sysinv import objects
 from sysinv.openstack.common import log
-from sysinv.openstack.common.gettextutils import _
 
 LOG = log.getLogger(__name__)
 

sysinv/sysinv/sysinv/sysinv/api/controllers/v1/sensorgroup.py

@@ -18,18 +18,17 @@
 # Copyright (c) 2013-2016 Wind River Systems, Inc.
 #
 
-
-import jsonpatch
-import six
 import copy
-import uuid
+import jsonpatch
 import pecan
 from pecan import rest
-
+import six
+import uuid
 import wsme
 from wsme import types as wtypes
 import wsmeext.pecan as wsme_pecan
 
+from sysinv._i18n import _
 from sysinv.api.controllers.v1 import base
 from sysinv.api.controllers.v1 import collection
 from sysinv.api.controllers.v1 import link
@@ -42,7 +41,6 @@ from sysinv.common import exception
 from sysinv.common import utils as cutils
 from sysinv import objects
 from sysinv.openstack.common import log
-from sysinv.openstack.common.gettextutils import _
 from sysinv.openstack.common import uuidutils
 
 LOG = log.getLogger(__name__)

sysinv/sysinv/sysinv/sysinv/api/controllers/v1/service.py

@@ -5,14 +5,15 @@
 #
 
 import jsonpatch
-import socket
 import pecan
-import six
 from pecan import rest
+import six
+import socket
 import wsme
 from wsme import types as wtypes
 import wsmeext.pecan as wsme_pecan
 
+from sysinv._i18n import _
 from sysinv.api.controllers.v1 import base
 from sysinv.api.controllers.v1 import link
 from sysinv.api.controllers.v1 import sm_api
@@ -21,7 +22,6 @@ from sysinv.common import constants
 from sysinv.common import exception
 from sysinv.common import utils as cutils
 from sysinv import objects
-from sysinv.openstack.common.gettextutils import _
 from sysinv.openstack.common import log
 
 LOG = log.getLogger(__name__)

sysinv/sysinv/sysinv/sysinv/api/controllers/v1/service_parameter.py

@@ -9,14 +9,16 @@
 
 import copy
 import pecan
-from fm_api import constants as fm_constants
-from fm_api import fm_api
 from pecan import rest
 import six
 import wsme
 from wsme import types as wtypes
 import wsmeext.pecan as wsme_pecan
 
+from fm_api import constants as fm_constants
+from fm_api import fm_api
+
+from sysinv._i18n import _
 from sysinv.api.controllers.v1 import base
 from sysinv.api.controllers.v1 import collection
 from sysinv.api.controllers.v1 import link
@@ -30,7 +32,6 @@ from sysinv.common import exception
 from sysinv.common import utils as cutils
 from sysinv.openstack.common import log
 from sysinv.openstack.common import excutils
-from sysinv.openstack.common.gettextutils import _
 from sysinv.openstack.common.rpc import common as rpc_common
 
 LOG = log.getLogger(__name__)

sysinv/sysinv/sysinv/sysinv/api/controllers/v1/servicegroup.py

@@ -12,9 +12,9 @@ import wsme
 from wsme import types as wtypes
 import wsmeext.pecan as wsme_pecan
 
+from sysinv._i18n import _
 from sysinv.api.controllers.v1 import base
 from sysinv.api.controllers.v1 import sm_api
-from sysinv.openstack.common.gettextutils import _
 from sysinv.openstack.common import log
 
 LOG = log.getLogger(__name__)

sysinv/sysinv/sysinv/sysinv/api/controllers/v1/servicenode.py

@@ -10,9 +10,9 @@ import wsme
 from wsme import types as wtypes
 import wsmeext.pecan as wsme_pecan
 
+from sysinv._i18n import _
 from sysinv.api.controllers.v1 import base
 from sysinv.api.controllers.v1 import sm_api
-from sysinv.openstack.common.gettextutils import _
 from sysinv.openstack.common import log
 
 LOG = log.getLogger(__name__)

sysinv/sysinv/sysinv/sysinv/api/controllers/v1/storage.py

@@ -19,19 +19,19 @@
 # Copyright (c) 2013-2019 Wind River Systems, Inc.
 #
 
-
 import jsonpatch
-import six
-import re
-
 import pecan
 from pecan import rest
-
+import re
+import six
 import subprocess
 import wsme
 from wsme import types as wtypes
 import wsmeext.pecan as wsme_pecan
 
+from oslo_config import cfg
+
+from sysinv._i18n import _
 from sysinv.api.controllers.v1 import base
 from sysinv.api.controllers.v1 import collection
 from sysinv.api.controllers.v1 import disk
@@ -45,10 +45,8 @@ from sysinv.common import utils as cutils
 from sysinv import objects
 from sysinv.openstack.common import log
 from sysinv.openstack.common import uuidutils
-from sysinv.openstack.common.gettextutils import _
 from sysinv.common.storage_backend_conf import StorageBackendConfig
 
-from oslo_config import cfg
 
 journal_opts = [
                 cfg.IntOpt('journal_max_size',

sysinv/sysinv/sysinv/sysinv/api/controllers/v1/storage_backend.py

@@ -19,15 +19,13 @@
 # Copyright (c) 2013-2018 Wind River Systems, Inc.
 #
 
-
 import pecan
-
 from pecan import rest
-
 import wsme
 from wsme import types as wtypes
 import wsmeext.pecan as wsme_pecan
 
+from sysinv._i18n import _
 from sysinv.api.controllers.v1 import base
 from sysinv.api.controllers.v1 import collection
 from sysinv.api.controllers.v1 import link
@@ -39,7 +37,6 @@ from sysinv.common import exception
 from sysinv.common import utils as cutils
 from sysinv import objects
 from sysinv.openstack.common import log
-from sysinv.openstack.common.gettextutils import _
 from sysinv.openstack.common import uuidutils
 
 # The following four imports implicitly pull in constants and functionality

sysinv/sysinv/sysinv/sysinv/api/controllers/v1/storage_ceph.py

@@ -21,19 +21,18 @@
 
 import copy
 import jsonpatch
-import re
-
-from oslo_utils import strutils
-from oslo_serialization import jsonutils
-
 import pecan
 from pecan import rest
+import re
 import six
-
 import wsme
 from wsme import types as wtypes
 import wsmeext.pecan as wsme_pecan
 
+from oslo_serialization import jsonutils
+from oslo_utils import strutils
+
+from sysinv._i18n import _
 from sysinv.api.controllers.v1 import base
 from sysinv.api.controllers.v1 import collection
 from sysinv.api.controllers.v1 import link
@@ -49,7 +48,6 @@ from sysinv.common.storage_backend_conf import K8RbdProvisioner
 from sysinv import objects
 from sysinv.openstack.common import log
 from sysinv.openstack.common import uuidutils
-from sysinv.openstack.common.gettextutils import _
 
 
 LOG = log.getLogger(__name__)

sysinv/sysinv/sysinv/sysinv/api/controllers/v1/storage_ceph_external.py

@@ -22,20 +22,19 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-import jsonpatch
 import copy
+import jsonpatch
 import os
-from oslo_serialization import jsonutils
-
 import pecan
 from pecan import rest
 from pecan import expose
 import six
-
 import wsme
 from wsme import types as wtypes
 import wsmeext.pecan as wsme_pecan
 
+from oslo_serialization import jsonutils
+from sysinv._i18n import _
 from sysinv.api.controllers.v1 import base
 from sysinv.api.controllers.v1 import collection
 from sysinv.api.controllers.v1 import link
@@ -48,7 +47,6 @@ from sysinv.common import utils as cutils
 from sysinv import objects
 from sysinv.openstack.common import log
 from sysinv.openstack.common import uuidutils
-from sysinv.openstack.common.gettextutils import _
 
 LOG = log.getLogger(__name__)
 

sysinv/sysinv/sysinv/sysinv/api/controllers/v1/storage_external.py

@@ -19,20 +19,19 @@
 # Copyright (c) 2013-2018 Wind River Systems, Inc.
 #
 
-import jsonpatch
-import copy
 import ast
-
-from oslo_serialization import jsonutils
-
+import copy
+import jsonpatch
 import pecan
 from pecan import rest
 import six
-
 import wsme
 from wsme import types as wtypes
 import wsmeext.pecan as wsme_pecan
 
+from oslo_serialization import jsonutils
+
+from sysinv._i18n import _
 from sysinv.api.controllers.v1 import base
 from sysinv.api.controllers.v1 import collection
 from sysinv.api.controllers.v1 import link
@@ -45,7 +44,6 @@ from sysinv.common import utils as cutils
 from sysinv import objects
 from sysinv.openstack.common import log
 from sysinv.openstack.common import uuidutils
-from sysinv.openstack.common.gettextutils import _
 
 LOG = log.getLogger(__name__)
 

sysinv/sysinv/sysinv/sysinv/api/controllers/v1/storage_file.py

@@ -19,19 +19,18 @@
 # Copyright (c) 2013-2018 Wind River Systems, Inc.
 #
 
-import jsonpatch
 import copy
-
-from oslo_serialization import jsonutils
-
+import jsonpatch
 import pecan
 from pecan import rest
 import six
-
 import wsme
 from wsme import types as wtypes
 import wsmeext.pecan as wsme_pecan
 
+from oslo_serialization import jsonutils
+
+from sysinv._i18n import _
 from sysinv.api.controllers.v1 import base
 from sysinv.api.controllers.v1 import collection
 from sysinv.api.controllers.v1 import link
@@ -44,7 +43,6 @@ from sysinv.common import utils as cutils
 from sysinv import objects
 from sysinv.openstack.common import log
 from sysinv.openstack.common import uuidutils
-from sysinv.openstack.common.gettextutils import _
 
 LOG = log.getLogger(__name__)
 

sysinv/sysinv/sysinv/sysinv/api/controllers/v1/storage_lvm.py

@@ -19,20 +19,19 @@
 # Copyright (c) 2013-2018 Wind River Systems, Inc.
 #
 
-import jsonpatch
 import copy
+import jsonpatch
 import math
-
-from oslo_serialization import jsonutils
-
 import pecan
 from pecan import rest
 import six
-
 import wsme
 from wsme import types as wtypes
 import wsmeext.pecan as wsme_pecan
 
+from oslo_serialization import jsonutils
+
+from sysinv._i18n import _
 from sysinv.api.controllers.v1 import base
 from sysinv.api.controllers.v1 import collection
 from sysinv.api.controllers.v1 import link
@@ -45,7 +44,6 @@ from sysinv.common import utils as cutils
 from sysinv import objects
 from sysinv.openstack.common import log
 from sysinv.openstack.common import uuidutils
-from sysinv.openstack.common.gettextutils import _
 
 
 LOG = log.getLogger(__name__)

sysinv/sysinv/sysinv/sysinv/api/controllers/v1/storage_tier.py

@@ -19,19 +19,17 @@
 # Copyright (c) 2013-2018 Wind River Systems, Inc.
 #
 
-
 import copy
 import jsonpatch
 import os
-import six
-
 import pecan
 from pecan import rest
-
+import six
 import wsme
 from wsme import types as wtypes
 import wsmeext.pecan as wsme_pecan
 
+from sysinv._i18n import _
 from sysinv.api.controllers.v1 import base
 from sysinv.api.controllers.v1 import collection
 from sysinv.api.controllers.v1 import link
@@ -44,7 +42,6 @@ from sysinv.common import constants
 from sysinv.common import exception
 from sysinv.common import utils as cutils
 from sysinv import objects
-from sysinv.openstack.common.gettextutils import _
 from sysinv.openstack.common import log
 from sysinv.openstack.common import uuidutils
 

sysinv/sysinv/sysinv/sysinv/api/controllers/v1/system.py

@@ -21,15 +21,14 @@
 
 import jsonpatch
 import os
-import six
-
 import pecan
 from pecan import rest
-
+import six
 import wsme
 from wsme import types as wtypes
 import wsmeext.pecan as wsme_pecan
 
+from sysinv._i18n import _
 from sysinv.api.controllers.v1 import base
 from sysinv.api.controllers.v1 import collection
 from sysinv.api.controllers.v1 import link
@@ -42,7 +41,6 @@ from sysinv.common import exception
 from sysinv.common import utils as cutils
 from sysinv import objects
 from sysinv.openstack.common import log
-from sysinv.openstack.common.gettextutils import _
 
 LOG = log.getLogger(__name__)
 

sysinv/sysinv/sysinv/sysinv/api/controllers/v1/types.py

@@ -19,17 +19,17 @@
 # Copyright (c) 2013-2015 Wind River Systems, Inc.
 #
 
-from oslo_utils import strutils
 import re
 import six
-
 import wsme
 from wsme import types as wtypes
 
+from oslo_utils import strutils
+
+from sysinv._i18n import _
 from sysinv.common import exception
 from sysinv.common import utils
 from sysinv.api.controllers.v1 import utils as apiutils
-from sysinv.openstack.common.gettextutils import _
 
 
 class MACAddressType(wtypes.UserType):

sysinv/sysinv/sysinv/sysinv/api/controllers/v1/upgrade.py

@@ -7,16 +7,18 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 # coding=utf-8
 #
+
+import os
 import pecan
 from pecan import rest
 from pecan import expose
-import os
 import six
 import socket
 import wsme
 from wsme import types as wtypes
 import wsmeext.pecan as wsme_pecan
 
+from sysinv._i18n import _
 from sysinv.api.controllers.v1 import base
 from sysinv.api.controllers.v1 import collection
 from sysinv.api.controllers.v1 import link
@@ -28,7 +30,6 @@ from sysinv.common import utils as cutils
 from sysinv.common import constants
 from sysinv import objects
 from sysinv.openstack.common import log
-from sysinv.openstack.common.gettextutils import _
 
 LOG = log.getLogger(__name__)
 

sysinv/sysinv/sysinv/sysinv/api/controllers/v1/user.py

@@ -19,9 +19,11 @@
 
 import jsonpatch
 import pecan
+from pecan import rest
 import wsme
 import wsmeext.pecan as wsme_pecan
-from pecan import rest
+
+from sysinv._i18n import _
 from sysinv import objects
 from sysinv.api.controllers.v1 import base
 from sysinv.api.controllers.v1 import collection
@@ -32,7 +34,6 @@ from sysinv.common import constants
 from sysinv.common import exception
 from sysinv.common import utils as cutils
 from sysinv.openstack.common import log
-from sysinv.openstack.common.gettextutils import _
 from wsme import types as wtypes
 
 LOG = log.getLogger(__name__)

sysinv/sysinv/sysinv/sysinv/api/controllers/v1/utils.py

@@ -19,25 +19,26 @@
 # Copyright (c) 2013-2018 Wind River Systems, Inc.
 #
 
-import subprocess
-import socket
 import jsonpatch
+import netaddr
 import os
 import pecan
 import re
+import socket
+import subprocess
 import wsme
-import netaddr
+
+from fm_api import constants as fm_constants
 import tsconfig.tsconfig as tsc
 
 from oslo_config import cfg
+from sysinv._i18n import _
 from sysinv.common import constants
 from sysinv.common import exception
 from sysinv.common import health
 from sysinv.helm import common as helm_common
-from sysinv.openstack.common.gettextutils import _
 from sysinv.openstack.common import log
 
-from fm_api import constants as fm_constants
 
 LOG = log.getLogger(__name__)
 

sysinv/sysinv/sysinv/sysinv/api/hooks.py

@@ -19,6 +19,7 @@
 # Copyright (c) 2013-2018 Wind River Systems, Inc.
 #
 
+import re
 import time
 from six.moves.urllib.parse import urlparse
 import webob
@@ -27,6 +28,7 @@ from oslo_config import cfg
 from oslo_serialization import jsonutils
 from pecan import hooks
 
+from sysinv._i18n import _
 from sysinv.common import context
 from sysinv.common import utils
 from sysinv.conductor import rpcapi
@@ -35,9 +37,7 @@ from sysinv.openstack.common import policy
 from webob import exc
 
 from sysinv.openstack.common import log
-from sysinv.openstack.common.gettextutils import _
 
-import re
 
 LOG = log.getLogger(__name__)
 

sysinv/sysinv/sysinv/sysinv/api/middleware/auth_token.py

@@ -13,14 +13,14 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import re
 import json
+import re
 
 from keystonemiddleware import auth_token
 
+from sysinv._i18n import _
 from sysinv.common import utils
 from sysinv.common import exception
-from sysinv.openstack.common.gettextutils import _
 from sysinv.openstack.common import log
 
 LOG = log.getLogger(__name__)

sysinv/sysinv/sysinv/sysinv/cmd/__init__.py

@@ -22,5 +22,4 @@ import eventlet
 
 eventlet.monkey_patch(os=False)
 
-from sysinv.openstack.common import gettextutils
-gettextutils.install('sysinv')
+import sysinv._i18n  # noqa

sysinv/sysinv/sysinv/sysinv/cmd/dnsmasq_lease_update.py

@@ -30,16 +30,14 @@ This file was based on dhcpbridge.py from nova
 
 from __future__ import print_function
 
-import sys
 import os
+import sys
 
 from oslo_config import cfg
-
+from sysinv._i18n import _
 from sysinv.common import service as sysinv_service
-
-from sysinv.openstack.common import context
 from sysinv.conductor import rpcapi as conductor_rpcapi
-from sysinv.openstack.common.gettextutils import _
+from sysinv.openstack.common import context
 from sysinv.openstack.common import log
 
 CONF = cfg.CONF

sysinv/sysinv/sysinv/sysinv/cmd/manage-partitions

@@ -15,26 +15,24 @@ Manage Disk partitions on this host and provide inventory updates
 
 import json
 import math
-import re
 import os
+import re
 import shutil
 import socket
 import subprocess
+import sys
 import time
 
-import sys
 from collections import defaultdict
 
 from oslo_config import cfg
-
+from sysinv._i18n import _
 from sysinv.common import constants
 from sysinv.common import service as sysinv_service
-
+from sysinv.common import utils
+from sysinv.conductor import rpcapi as conductor_rpcapi
 from sysinv.openstack.common import context
 from sysinv.openstack.common import log
-from sysinv.common import utils
-from sysinv.openstack.common.gettextutils import _
-from sysinv.conductor import rpcapi as conductor_rpcapi
 
 CONF = cfg.CONF
 LOG = log.getLogger(__name__)

sysinv/sysinv/sysinv/sysinv/cmd/upgrade.py

@@ -12,13 +12,12 @@ Sysinv upgrade utilities.
 import sys
 
 from oslo_config import cfg
-
+from sysinv._i18n import _
 from sysinv.common import constants
 from sysinv.common import service
 from sysinv.common import utils
 from sysinv.db import api as dbapi
 from sysinv.openstack.common import log
-from sysinv.openstack.common.gettextutils import _
 
 from tsconfig.tsconfig import system_mode
 

sysinv/sysinv/sysinv/sysinv/common/exception.py

@@ -28,9 +28,8 @@ SHOULD include dedicated exception logging.
 import six
 
 from oslo_config import cfg
-
+from sysinv._i18n import _
 from sysinv.openstack.common import log as logging
-from sysinv.openstack.common.gettextutils import _
 
 LOG = logging.getLogger(__name__)
 

sysinv/sysinv/sysinv/sysinv/common/fernet.py

@@ -11,9 +11,9 @@ from grp import getgrnam
 from pwd import getpwnam
 
 from oslo_config import cfg
+from sysinv._i18n import _
 from sysinv.common import exception
 from sysinv.openstack.common import log as logging
-from sysinv.openstack.common.gettextutils import _
 
 CONF = cfg.CONF
 

sysinv/sysinv/sysinv/sysinv/common/health.py

@@ -10,6 +10,7 @@ from controllerconfig import backup_restore
 
 from fm_api import fm_api
 
+from sysinv._i18n import _
 from sysinv.common import ceph
 from sysinv.common import constants
 from sysinv.common import utils
@@ -18,7 +19,6 @@ from sysinv.common.storage_backend_conf import StorageBackendConfig
 from sysinv.api.controllers.v1 import patch_api
 from sysinv.api.controllers.v1 import vim_api
 from sysinv.openstack.common import log
-from sysinv.openstack.common.gettextutils import _
 
 import cgcs_patch.constants as patch_constants
 

sysinv/sysinv/sysinv/sysinv/common/images.py

@@ -25,14 +25,13 @@ import os
 import re
 
 from oslo_config import cfg
-
+from sysinv._i18n import _
 from sysinv.common import exception
 from sysinv.common import image_service as service
 from sysinv.common import utils
 from sysinv.openstack.common import fileutils
 from sysinv.openstack.common import log as logging
 from sysinv.openstack.common import strutils
-from sysinv.openstack.common.gettextutils import _
 
 LOG = logging.getLogger(__name__)
 

sysinv/sysinv/sysinv/sysinv/common/policy.py

@@ -20,10 +20,9 @@
 import os.path
 
 from oslo_config import cfg
-
+from sysinv._i18n import _
 from sysinv.common import exception
 from sysinv.common import utils
-from sysinv.openstack.common.gettextutils import _
 from sysinv.openstack.common import policy
 
 

sysinv/sysinv/sysinv/sysinv/common/service_parameter.py

@@ -11,11 +11,11 @@ import netaddr
 import pecan
 import wsme
 
+from sysinv._i18n import _
 from sysinv.common import constants
 from sysinv.common import exception
 from sysinv.common import utils as cutils
 from sysinv.openstack.common import log
-from sysinv.openstack.common.gettextutils import _
 
 LOG = log.getLogger(__name__)
 

sysinv/sysinv/sysinv/sysinv/common/utils.py

@@ -58,15 +58,16 @@ from eventlet.green import subprocess
 from eventlet import greenthread
 import netaddr
 
+from oslo_concurrency import lockutils
 from oslo_config import cfg
 
 from fm_api import constants as fm_constants
+
+from sysinv._i18n import _
 from sysinv.common import exception
 from sysinv.common import constants
 from sysinv.helm import common as helm_common
 from sysinv.openstack.common import log as logging
-from sysinv.openstack.common.gettextutils import _
-from oslo_concurrency import lockutils
 
 
 try:

sysinv/sysinv/sysinv/sysinv/common/wsgi_service.py

@@ -15,13 +15,14 @@
 
 import socket
 from netaddr import IPAddress
+
 from oslo_config import cfg
 from oslo_log import log
 from oslo_service import service
 from oslo_service import wsgi
+from sysinv._i18n import _
 from sysinv.api import app
 from sysinv.common import exception
-from sysinv.openstack.common.gettextutils import _
 
 
 CONF = cfg.CONF

sysinv/sysinv/sysinv/sysinv/conductor/ceph.py

@@ -21,6 +21,7 @@ from requests.exceptions import ReadTimeout
 
 from cephclient import wrapper as ceph
 from fm_api import fm_api
+from sysinv._i18n import _
 from sysinv.common import constants
 from sysinv.common import exception
 from sysinv.common import utils as cutils
@@ -28,7 +29,6 @@ from sysinv.openstack.common import log as logging
 from sysinv.openstack.common import uuidutils
 from sysinv.common.storage_backend_conf import StorageBackendConfig
 
-from sysinv.openstack.common.gettextutils import _
 from sysinv.openstack.common import rpc
 from sysinv.openstack.common.rpc.common import CommonRpcContext
 

sysinv/sysinv/sysinv/sysinv/conductor/kube_app.py

@@ -32,6 +32,7 @@ from eventlet import Timeout
 from fm_api import constants as fm_constants
 from fm_api import fm_api
 from oslo_log import log as logging
+from sysinv._i18n import _
 from sysinv.api.controllers.v1 import kube_app
 from sysinv.common import constants
 from sysinv.common import exception
@@ -43,7 +44,6 @@ from sysinv.conductor import openstack
 from sysinv.helm import common
 from sysinv.helm import helm
 from sysinv.helm import utils as helm_utils
-from sysinv.openstack.common.gettextutils import _
 
 
 # Log and config

sysinv/sysinv/sysinv/sysinv/conductor/manager.py

@@ -65,6 +65,7 @@ from oslo_config import cfg
 from platform_util.license import license
 from sqlalchemy.orm import exc
 from six.moves import http_client as httplib
+from sysinv._i18n import _
 from sysinv.agent import rpcapi as agent_rpcapi
 from sysinv.api.controllers.v1 import address_pool
 from sysinv.api.controllers.v1 import cpu_utils
@@ -100,7 +101,6 @@ from sysinv.openstack.common import log
 from sysinv.openstack.common import periodic_task
 from sysinv.openstack.common import timeutils
 from sysinv.openstack.common import uuidutils
-from sysinv.openstack.common.gettextutils import _
 from sysinv.puppet import common as puppet_common
 from sysinv.puppet import puppet
 from sysinv.helm import common as helm_common

sysinv/sysinv/sysinv/sysinv/conductor/openstack.py

@@ -13,12 +13,12 @@
 
 import keyring
 from cinderclient.v2 import client as cinder_client_v2
+from oslo_config import cfg
+from sysinv._i18n import _
 from sysinv.common import constants
 from sysinv.common import exception
 from sysinv.common.storage_backend_conf import StorageBackendConfig
-from sysinv.openstack.common.gettextutils import _
 from sysinv.openstack.common import log as logging
-from oslo_config import cfg
 from keystoneclient.v3 import client as keystone_client
 from keystoneclient.auth.identity import v3
 from keystoneclient import session

sysinv/sysinv/sysinv/sysinv/db/sqlalchemy/api.py

@@ -26,7 +26,6 @@ import re
 
 from oslo_config import cfg
 from oslo_db import exception as db_exc
-
 from oslo_db.sqlalchemy import enginefacade
 from oslo_db.sqlalchemy import utils as db_utils
 
@@ -41,6 +40,7 @@ from sqlalchemy.orm.exc import DetachedInstanceError
 from sqlalchemy.orm.exc import MultipleResultsFound
 from sqlalchemy.orm.exc import NoResultFound
 
+from sysinv._i18n import _
 from sysinv import objects
 from sysinv.common import constants
 from sysinv.common import exception
@@ -50,7 +50,6 @@ from sysinv.db.sqlalchemy import models
 
 from sysinv.openstack.common import log
 from sysinv.openstack.common import uuidutils
-from sysinv.openstack.common.gettextutils import _
 
 CONF = cfg.CONF
 CONF.import_opt('connection',

sysinv/sysinv/sysinv/sysinv/db/sqlalchemy/migration.py

@@ -23,10 +23,10 @@ import migrate
 from migrate.versioning import util as migrate_util
 import sqlalchemy
 
+from oslo_db.sqlalchemy import enginefacade
+from sysinv._i18n import _
 from sysinv.common import exception
 from sysinv.db import migration
-from sysinv.openstack.common.gettextutils import _
-from oslo_db.sqlalchemy import enginefacade
 
 
 @migrate_util.decorator

sysinv/sysinv/sysinv/sysinv/objects/base.py

@@ -22,10 +22,10 @@ import collections
 import copy
 import six
 
+from sysinv._i18n import _
 from sysinv.common import exception
 from sysinv.objects import utils as obj_utils
 from sysinv.openstack.common import context
-from sysinv.openstack.common.gettextutils import _
 from sysinv.openstack.common import log as logging
 from sysinv.openstack.common.rpc import common as rpc_common
 from sysinv.openstack.common.rpc import serializer as rpc_serializer

sysinv/sysinv/sysinv/sysinv/objects/utils.py

@@ -25,8 +25,8 @@ import netaddr
 import uuid
 import six
 
+from sysinv._i18n import _
 from sysinv.common import constants
-from sysinv.openstack.common.gettextutils import _
 from sysinv.openstack.common import timeutils
 
 

sysinv/sysinv/sysinv/sysinv/openstack/common/config/generator.py

@@ -29,11 +29,8 @@ import textwrap
 import six
 
 from oslo_config import cfg
-
-from sysinv.openstack.common import gettextutils
 from sysinv.openstack.common import importutils
 
-gettextutils.install('sysinv')
 
 STROPT = "StrOpt"
 BOOLOPT = "BoolOpt"

sysinv/sysinv/sysinv/sysinv/openstack/common/db/exception.py

@@ -16,7 +16,7 @@
 
 """DB related custom exceptions."""
 
-from sysinv.openstack.common.gettextutils import _
+from sysinv._i18n import _
 
 
 class DBError(Exception):

sysinv/sysinv/sysinv/sysinv/openstack/common/db/sqlalchemy/session.py

@@ -257,9 +257,9 @@ import sqlalchemy.orm
 from sqlalchemy.pool import NullPool, StaticPool
 from sqlalchemy.sql.expression import literal_column
 
+from sysinv._i18n import _
 from sysinv.openstack.common.db import exception
 from sysinv.openstack.common import log as logging
-from sysinv.openstack.common.gettextutils import _
 from sysinv.openstack.common import timeutils
 
 DEFAULT = 'DEFAULT'

sysinv/sysinv/sysinv/sysinv/openstack/common/db/sqlalchemy/utils.py

@@ -22,7 +22,7 @@
 
 import sqlalchemy
 
-from sysinv.openstack.common.gettextutils import _
+from sysinv._i18n import _
 from sysinv.openstack.common import log as logging
 
 

sysinv/sysinv/sysinv/sysinv/openstack/common/excutils.py

@@ -21,11 +21,11 @@ Exception related utilities.
 
 import contextlib
 import logging
+import six
 import sys
 import traceback
-import six
 
-from sysinv.openstack.common.gettextutils import _
+from sysinv._i18n import _
 
 
 @contextlib.contextmanager

sysinv/sysinv/sysinv/sysinv/openstack/common/fileutils.py

@@ -20,8 +20,8 @@ import contextlib
 import errno
 import os
 
+from sysinv._i18n import _
 from sysinv.openstack.common import excutils
-from sysinv.openstack.common.gettextutils import _
 from sysinv.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)