Deprecate sysinv.openstack.common.log

Sysinv had partially converted to oslo_log, but
not all the files had been updated.  This completes
that conversion and completely removes
 - sysinv.openstack.common.log.py
 - sysinv.openstack.common.log_handler.py

Most of the changes in this review are:

Old Code:
  from sysinv.openstack.common import log

New Code:
  from oslo_log import log

Two main differences are:
 - verbose flag was removed from oslo_log config in 2017
 - oslo_log automatically prefixes each line with config type (sysinv)
   Old Prefix:
     2019-11-01 16:39:24.142 72561 INFO
  New Prefix:
     sysinv 2019-11-05 18:55:03.620 96275 INFO

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

sysinv/sysinv/sysinv/etc/sysinv/sysinv.conf.cgts

@@ -128,17 +128,13 @@
 
 
 #
-# Options defined in sysinv.openstack.common.log
+# Options defined in oslo_log
 #
 
 # Print debugging output (set logging level to DEBUG instead
 # of default WARNING level). (boolean value)
 #debug=false
 
-# Print more verbose output (set logging level to INFO instead
-# of default WARNING level). (boolean value)
-#verbose=false
-
 # Log output to standard error (boolean value)
 #use_stderr=true
 

sysinv/sysinv/sysinv/etc/sysinv/sysinv.conf.sample

@@ -128,17 +128,13 @@
 
 
 #
-# Options defined in sysinv.openstack.common.log
+# Options defined in oslo_log
 #
 
 # Print debugging output (set logging level to DEBUG instead
 # of default WARNING level). (boolean value)
 #debug=false
 
-# Print more verbose output (set logging level to INFO instead
-# of default WARNING level). (boolean value)
-#verbose=false
-
 # Log output to standard error (boolean value)
 #use_stderr=true
 

sysinv/sysinv/sysinv/openstack-common.conf

@@ -14,8 +14,6 @@ module=install_venv_common
 module=jsonutils
 module=local
 module=lockutils
-module=log
-module=log_handler
 module=loopingcall
 module=network_utils
 module=notifier

sysinv/sysinv/sysinv/sysinv/agent/disk.py

@@ -17,14 +17,12 @@ import re
 import subprocess
 import sys
 
-
-from sysinv.common import utils
+from oslo_log import log as logging
 from sysinv.common import constants
+from sysinv.common import utils
 from sysinv.conductor import rpcapi as conductor_rpcapi
-from sysinv.openstack.common import log as logging
 from sysinv.openstack.common import context
 
-
 LOG = logging.getLogger(__name__)
 
 

sysinv/sysinv/sysinv/sysinv/agent/lvg.py

@@ -14,8 +14,8 @@
 import subprocess
 import sys
 
+from oslo_log import log as logging
 from sysinv.common import constants
-from sysinv.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)
 

sysinv/sysinv/sysinv/sysinv/agent/manager.py

@@ -49,6 +49,9 @@ import yaml
 
 from six.moves import configparser
 from six import StringIO
+
+from oslo_config import cfg
+from oslo_log import log
 from sysinv.agent import disk
 from sysinv.agent import partition
 from sysinv.agent import pv
@@ -64,18 +67,13 @@ from sysinv.objects import base as objects_base
 from sysinv.puppet import common as puppet
 from sysinv.conductor import rpcapi as conductor_rpcapi
 from sysinv.openstack.common import context as mycontext
-from sysinv.openstack.common import log
 from sysinv.openstack.common import periodic_task
 from sysinv.openstack.common.rpc.common import Timeout
 from sysinv.openstack.common.rpc.common import serialize_remote_exception
-from oslo_config import cfg
-
-
 from sysinv.openstack.common.rpc.common import RemoteError
 
 import tsconfig.tsconfig as tsc
 
-
 MANAGER_TOPIC = 'sysinv.agent_manager'
 
 LOG = log.getLogger(__name__)

sysinv/sysinv/sysinv/sysinv/agent/node.py

@@ -17,7 +17,7 @@ from os.path import isfile
 from os.path import join
 import re
 
-from sysinv.openstack.common import log as logging
+from oslo_log import log as logging
 import tsconfig.tsconfig as tsc
 
 LOG = logging.getLogger(__name__)

sysinv/sysinv/sysinv/sysinv/agent/partition.py

@@ -14,9 +14,10 @@
 import pyudev
 import subprocess
 import sys
-from sysinv.common import utils as utils
+
+from oslo_log import log as logging
 from sysinv.common import constants
-from sysinv.openstack.common import log as logging
+from sysinv.common import utils as utils
 
 LOG = logging.getLogger(__name__)
 

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

@@ -16,10 +16,10 @@ import os
 import shlex
 import subprocess
 
+from oslo_log import log as logging
 from sysinv._i18n import _
 from sysinv.common import constants
 from sysinv.common import utils
-from sysinv.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)
 

sysinv/sysinv/sysinv/sysinv/agent/pv.py

@@ -14,10 +14,11 @@
 import json
 import subprocess
 import sys
+
+from oslo_log import log as logging
 from sysinv.common import constants
 from sysinv.common import exception
 from sysinv.common import utils as cutils
-from sysinv.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)
 

sysinv/sysinv/sysinv/sysinv/agent/rpcapi.py

@@ -23,9 +23,9 @@
 Client side of the agent RPC API.
 """
 
+from oslo_log import log
 from sysinv.objects import base as objects_base
 import sysinv.openstack.common.rpc.proxy
-from sysinv.openstack.common import log
 
 LOG = log.getLogger(__name__)
 

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

@@ -26,6 +26,7 @@ import uuid
 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
@@ -36,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 import log
 
 LOG = log.getLogger(__name__)
 

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

@@ -28,6 +28,7 @@ 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
@@ -37,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 import log
 
 LOG = log.getLogger(__name__)
 

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

@@ -27,6 +27,7 @@ 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
@@ -39,7 +40,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 import log
 from sysinv.openstack.common import uuidutils
 
 from sysinv.common.storage_backend_conf import StorageBackendConfig

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

@@ -31,6 +31,7 @@ from cryptography.hazmat.backends import default_backend
 from pecan import expose
 from pecan import rest
 
+from oslo_log import log
 from sysinv._i18n import _
 from sysinv import objects
 from sysinv.api.controllers.v1 import base
@@ -41,7 +42,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 import log
 from wsme import types as wtypes
 
 LOG = log.getLogger(__name__)

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

@@ -25,6 +25,7 @@ import uuid
 import wsme
 import wsmeext.pecan as wsme_pecan
 
+from oslo_log import log
 from sysinv._i18n import _
 from sysinv import objects
 from sysinv.api.controllers.v1 import base
@@ -38,7 +39,6 @@ from sysinv.common import ceph
 from sysinv.common import constants
 from sysinv.common import exception
 from sysinv.common import utils as cutils
-from sysinv.openstack.common import log
 
 from wsme import types as wtypes
 

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

@@ -17,6 +17,7 @@ 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
@@ -28,7 +29,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 import log
 
 LOG = log.getLogger(__name__)
 

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

@@ -27,6 +27,7 @@ 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
@@ -37,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 import log
 
 LOG = log.getLogger(__name__)
 

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

@@ -27,6 +27,7 @@ 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
@@ -38,7 +39,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 import log
 
 LOG = log.getLogger(__name__)
 

sysinv/sysinv/sysinv/sysinv/api/controllers/v1/cpu_utils.py

@@ -7,9 +7,9 @@
 import pecan
 import wsme
 
+from oslo_log import log
 from sysinv.common import constants
 from sysinv.common import utils as cutils
-from sysinv.openstack.common import log
 
 LOG = log.getLogger(__name__)
 

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

@@ -20,7 +20,6 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-
 import jsonpatch
 import pecan
 from pecan import rest
@@ -29,6 +28,7 @@ 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
@@ -38,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 import log
 
 LOG = log.getLogger(__name__)
 

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

@@ -25,6 +25,7 @@ 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
@@ -37,7 +38,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 import log
 
 LOG = log.getLogger(__name__)
 

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

@@ -26,6 +26,7 @@ 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
@@ -36,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 import log
 
 from netaddr import IPAddress
 from netaddr import AddrFormatError

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

@@ -26,6 +26,7 @@ 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
@@ -36,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 import log
 
 LOG = log.getLogger(__name__)
 

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

@@ -26,6 +26,7 @@ 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
@@ -35,7 +36,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 import log
 
 LOG = log.getLogger(__name__)
 

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

@@ -12,12 +12,12 @@ import wsme
 import wsmeext.pecan as wsme_pecan
 from wsme import types as wtypes
 
+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.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
 
 LOG = log.getLogger(__name__)

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

@@ -9,9 +9,8 @@ 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.openstack.common import log
-
 
 LOG = log.getLogger(__name__)
 

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

@@ -12,12 +12,11 @@ from wsme import types as wtypes
 import wsmeext.pecan as wsme_pecan
 import yaml
 
+from oslo_log import log
 from sysinv._i18n import _
 from sysinv import objects
 from sysinv.common import exception
 from sysinv.helm import common
-from sysinv.openstack.common import log
-
 
 LOG = log.getLogger(__name__)
 

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

@@ -47,6 +47,7 @@ from fm_api import fm_api
 from pecan import expose
 from pecan import rest
 
+from oslo_log import log
 from sysinv import objects
 from sysinv._i18n import _
 from sysinv.api.controllers.v1 import ethernet_port
@@ -89,12 +90,10 @@ from sysinv.common import ceph
 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 import uuidutils
 from sysinv.common.storage_backend_conf import StorageBackendConfig
 from sysinv.common import health
 
-
 LOG = log.getLogger(__name__)
 KEYRING_BM_SERVICE = "BM"
 ERR_CODE_LOCK_SOLE_SERVICE_PROVIDER = "-1003"

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

@@ -11,6 +11,7 @@ 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
@@ -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 import log
 
 LOG = log.getLogger(__name__)
 

sysinv/sysinv/sysinv/sysinv/api/controllers/v1/hwmon_api.py

@@ -4,9 +4,10 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 import json
+
+from oslo_log import log
 from sysinv.api.controllers.v1.rest_api import rest_api_request
 
-from sysinv.openstack.common import log
 LOG = log.getLogger(__name__)
 
 

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

@@ -21,19 +21,18 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-
+import copy
 import jsonpatch
-import six
-import uuid
-
 import pecan
 from pecan import rest
-import copy
-import wsme
+import six
 import string
+import uuid
+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 address
 from sysinv.api.controllers.v1 import address_pool
@@ -51,8 +50,8 @@ from sysinv.common import exception
 from sysinv.common import utils as cutils
 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 fm_api import constants as fm_constants
 from fm_api import fm_api
 

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

@@ -9,6 +9,7 @@ import wsme
 import wsmeext.pecan as wsme_pecan
 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 base
@@ -21,7 +22,6 @@ from sysinv.common import exception
 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.rpc import common as rpc_common
 
 LOG = log.getLogger(__name__)

sysinv/sysinv/sysinv/sysinv/api/controllers/v1/license.py

@@ -24,8 +24,8 @@ import pecan
 from pecan import expose
 from pecan import rest
 
+from oslo_log import log
 from sysinv.common import utils as cutils
-from sysinv.openstack.common import log
 from sysinv.openstack.common.rpc.common import RemoteError
 from tsconfig import tsconfig
 

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

@@ -25,6 +25,7 @@ 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
@@ -36,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 import log
 
 LOG = log.getLogger(__name__)
 

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

@@ -25,6 +25,7 @@ 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
@@ -36,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 import log
 
 LOG = log.getLogger(__name__)
 

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

@@ -25,6 +25,7 @@ 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
@@ -34,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 import log
 
 LOG = log.getLogger(__name__)
 

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

@@ -27,6 +27,7 @@ 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
@@ -38,7 +39,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 import log
 from sysinv.openstack.common.rpc import common
 
 LOG = log.getLogger(__name__)

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

@@ -27,6 +27,7 @@ import wsme
 from wsme import types as wtypes
 import wsmeext.pecan as wsme_pecan
 
+from oslo_log import log
 from oslo_serialization import jsonutils
 from sysinv._i18n import _
 from sysinv.api.controllers.v1 import base
@@ -39,7 +40,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 import log
 from sysinv.openstack.common import uuidutils
 from sysinv.common.storage_backend_conf import StorageBackendConfig
 

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

@@ -26,6 +26,7 @@ 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
@@ -36,8 +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 import log
-
 
 LOG = log.getLogger(__name__)
 

sysinv/sysinv/sysinv/sysinv/api/controllers/v1/mtce_api.py

@@ -3,11 +3,13 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 #
-import time
 import json
+import time
+
+from oslo_log import log
 from sysinv.api.controllers.v1.rest_api import rest_api_request
 from sysinv.common import exception as si_exception
-from sysinv.openstack.common import log
+
 LOG = log.getLogger(__name__)
 
 

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

@@ -26,6 +26,7 @@ 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 address_pool
 from sysinv.api.controllers.v1 import base
@@ -36,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 import log
 
 LOG = log.getLogger(__name__)
 

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

@@ -32,6 +32,7 @@ from netaddr import IPAddress
 from netaddr import IPRange
 from netaddr import AddrFormatError
 
+from oslo_log import log
 from sysinv._i18n import _
 from sysinv.api.controllers.v1 import base
 from sysinv.api.controllers.v1 import collection
@@ -42,8 +43,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 import log
-
 
 LOG = log.getLogger(__name__)
 

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

@@ -27,6 +27,7 @@ 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
@@ -39,7 +40,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 import log
 from sysinv.openstack.common import uuidutils
 
 LOG = log.getLogger(__name__)

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

@@ -26,6 +26,7 @@ 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
@@ -36,12 +37,10 @@ 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 import log
 
 from netaddr import IPAddress
 from netaddr import AddrFormatError
 
-
 LOG = log.getLogger(__name__)
 
 

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

@@ -13,6 +13,7 @@ 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
@@ -23,7 +24,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 import log
 from sysinv.openstack.common import uuidutils
 
 LOG = log.getLogger(__name__)

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

@@ -3,9 +3,9 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 #
+from oslo_log import log
 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

@@ -10,6 +10,7 @@ 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
@@ -20,7 +21,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 import log
 
 LOG = log.getLogger(__name__)
 

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

@@ -24,6 +24,7 @@ import six
 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
@@ -34,7 +35,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 import log
 
 LOG = log.getLogger(__name__)
 

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

@@ -28,6 +28,7 @@ import wsme
 import wsmeext.pecan as wsme_pecan
 
 from oslo_config import cfg
+from oslo_log import log
 from sysinv._i18n import _
 from sysinv import objects
 from sysinv.api.controllers.v1 import base
@@ -52,7 +53,6 @@ from sysinv.common import ceph
 from sysinv.common import constants
 from sysinv.common import exception
 from sysinv.common import utils as cutils
-from sysinv.openstack.common import log
 import xml.etree.ElementTree as et
 from lxml import etree
 from sysinv.api.controllers.v1 import profile_utils

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

@@ -20,9 +20,10 @@
 #
 
 import netaddr
+
+from oslo_log import log
 from sysinv._i18n import _
 from sysinv.common import constants
-from sysinv.openstack.common import log
 
 LOG = log.getLogger(__name__)
 

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

@@ -13,6 +13,7 @@ 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
@@ -22,8 +23,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 import log
-
 
 LOG = log.getLogger(__name__)
 

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

@@ -27,6 +27,7 @@ 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
@@ -39,7 +40,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 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

@@ -33,10 +33,10 @@ import six
 import wsme
 from wsme import types as wtypes
 
+from oslo_log import log
 from oslo_utils import strutils
 from oslo_utils import timeutils
 from sysinv._i18n import _
-from sysinv.openstack.common import log
 
 LOG = log.getLogger(__name__)
 

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

@@ -27,6 +27,7 @@ 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
@@ -37,12 +38,10 @@ 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 import log
 
 from netaddr import IPAddress
 from netaddr import AddrFormatError
 
-
 LOG = log.getLogger(__name__)
 
 logTransportEnum = wtypes.Enum(str, 'udp', 'tcp', 'tls')

sysinv/sysinv/sysinv/sysinv/api/controllers/v1/rest_api.py

@@ -10,6 +10,8 @@ from six.moves.urllib.request import urlopen
 from six.moves.urllib.request import Request
 from six.moves.urllib.error import HTTPError
 from six.moves.urllib.error import URLError
+
+from oslo_log import log
 from sysinv.common import configp
 from sysinv.common import exception as si_exception
 from sysinv.openstack.common.keystone_objects import Token
@@ -17,7 +19,6 @@ from sysinv.openstack.common.keystone_objects import Token
 from sysinv.common.exception import OpenStackException
 from sysinv.common.exception import OpenStackRestAPIException
 
-from sysinv.openstack.common import log
 LOG = log.getLogger(__name__)
 
 

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

@@ -25,6 +25,7 @@ import uuid
 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
@@ -34,7 +35,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 import log
 
 LOG = log.getLogger(__name__)
 

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

@@ -25,6 +25,7 @@ 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
@@ -36,7 +37,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 import log
 
 from fm_api import constants as fm_constants
 from fm_api import fm_api

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

@@ -27,6 +27,7 @@ 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
@@ -38,7 +39,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 import log
 
 LOG = log.getLogger(__name__)
 

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

@@ -28,6 +28,7 @@ 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
@@ -40,7 +41,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 import log
 from sysinv.openstack.common import uuidutils
 
 LOG = log.getLogger(__name__)

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

@@ -13,6 +13,7 @@ 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 link
@@ -22,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 import log
 
 LOG = log.getLogger(__name__)
 

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

@@ -18,6 +18,7 @@ import wsmeext.pecan as wsme_pecan
 from fm_api import constants as fm_constants
 from fm_api import fm_api
 
+from oslo_log import log
 from sysinv._i18n import _
 from sysinv.api.controllers.v1 import base
 from sysinv.api.controllers.v1 import collection
@@ -30,7 +31,6 @@ from sysinv.common import constants
 from sysinv.common import service_parameter
 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.rpc import common as rpc_common
 

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

@@ -12,10 +12,10 @@ 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 sm_api
-from sysinv.openstack.common import log
 
 LOG = log.getLogger(__name__)
 

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

@@ -10,10 +10,10 @@ 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 sm_api
-from sysinv.openstack.common import log
 
 LOG = log.getLogger(__name__)
 

sysinv/sysinv/sysinv/sysinv/api/controllers/v1/sm_api.py

@@ -6,9 +6,10 @@
 import json
 import pecan
 import socket
+
+from oslo_log import log
 from sysinv.api.controllers.v1.rest_api import get_token
 from sysinv.api.controllers.v1.rest_api import rest_api_request
-from sysinv.openstack.common import log
 
 LOG = log.getLogger(__name__)
 

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

@@ -30,6 +30,7 @@ from wsme import types as wtypes
 import wsmeext.pecan as wsme_pecan
 
 from oslo_config import cfg
+from oslo_log import log
 
 from sysinv._i18n import _
 from sysinv.api.controllers.v1 import base
@@ -43,7 +44,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 import log
 from sysinv.openstack.common import uuidutils
 from sysinv.common.storage_backend_conf import StorageBackendConfig
 

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

@@ -25,6 +25,7 @@ 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
@@ -36,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 import log
 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

@@ -29,6 +29,7 @@ import wsme
 from wsme import types as wtypes
 import wsmeext.pecan as wsme_pecan
 
+from oslo_log import log
 from oslo_serialization import jsonutils
 from oslo_utils import strutils
 
@@ -46,7 +47,6 @@ from sysinv.common import utils as cutils
 from sysinv.common.storage_backend_conf import StorageBackendConfig
 from sysinv.common.storage_backend_conf import K8RbdProvisioner
 from sysinv import objects
-from sysinv.openstack.common import log
 from sysinv.openstack.common import uuidutils
 
 

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

@@ -33,6 +33,7 @@ import wsme
 from wsme import types as wtypes
 import wsmeext.pecan as wsme_pecan
 
+from oslo_log import log
 from oslo_serialization import jsonutils
 from sysinv._i18n import _
 from sysinv.api.controllers.v1 import base
@@ -45,7 +46,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 import log
 from sysinv.openstack.common import uuidutils
 
 LOG = log.getLogger(__name__)

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

@@ -29,6 +29,7 @@ import wsme
 from wsme import types as wtypes
 import wsmeext.pecan as wsme_pecan
 
+from oslo_log import log
 from oslo_serialization import jsonutils
 
 from sysinv._i18n import _
@@ -42,7 +43,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 import log
 from sysinv.openstack.common import uuidutils
 
 LOG = log.getLogger(__name__)

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

@@ -28,6 +28,7 @@ import wsme
 from wsme import types as wtypes
 import wsmeext.pecan as wsme_pecan
 
+from oslo_log import log
 from oslo_serialization import jsonutils
 
 from sysinv._i18n import _
@@ -41,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 import log
 from sysinv.openstack.common import uuidutils
 
 LOG = log.getLogger(__name__)

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

@@ -29,6 +29,7 @@ import wsme
 from wsme import types as wtypes
 import wsmeext.pecan as wsme_pecan
 
+from oslo_log import log
 from oslo_serialization import jsonutils
 
 from sysinv._i18n import _
@@ -42,10 +43,8 @@ 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 import log
 from sysinv.openstack.common import uuidutils
 
-
 LOG = log.getLogger(__name__)
 
 HIERA_DATA = {

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

@@ -29,6 +29,7 @@ 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
@@ -36,13 +37,11 @@ from sysinv.api.controllers.v1 import link
 from sysinv.api.controllers.v1 import types
 from sysinv.api.controllers.v1 import utils
 from sysinv.api.controllers.v1 import storage as storage_api
-
 from sysinv.common import ceph
 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 import log
 from sysinv.openstack.common import uuidutils
 
 LOG = log.getLogger(__name__)

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

@@ -28,6 +28,7 @@ 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
@@ -40,7 +41,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 import log
 
 LOG = log.getLogger(__name__)
 

sysinv/sysinv/sysinv/sysinv/api/controllers/v1/trapdest.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 oslo_log import log
 from sysinv.api.controllers.v1 import base
 from sysinv.api.controllers.v1 import collection
 from sysinv.api.controllers.v1 import link
@@ -28,7 +27,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 import log
 
 LOG = log.getLogger(__name__)
 

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

@@ -18,6 +18,7 @@ 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
@@ -29,7 +30,6 @@ from sysinv.common import exception
 from sysinv.common import utils as cutils
 from sysinv.common import constants
 from sysinv import objects
-from sysinv.openstack.common import log
 
 LOG = log.getLogger(__name__)
 

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

@@ -23,6 +23,7 @@ from pecan import rest
 import wsme
 import wsmeext.pecan as wsme_pecan
 
+from oslo_log import log
 from sysinv._i18n import _
 from sysinv import objects
 from sysinv.api.controllers.v1 import base
@@ -33,7 +34,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 import log
 from wsme import types as wtypes
 
 LOG = log.getLogger(__name__)

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

@@ -32,13 +32,12 @@ from fm_api import constants as fm_constants
 import tsconfig.tsconfig as tsc
 
 from oslo_config import cfg
+from oslo_log import log
 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 import log
-
 
 LOG = log.getLogger(__name__)
 

sysinv/sysinv/sysinv/sysinv/api/controllers/v1/vim_api.py

@@ -4,10 +4,11 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 import json
+
+from oslo_log import log
 from sysinv.api.controllers.v1.rest_api import rest_api_request
 from sysinv.common import constants
 
-from sysinv.openstack.common import log
 LOG = log.getLogger(__name__)
 
 

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

@@ -26,6 +26,7 @@ import webob
 
 from oslo_config import cfg
 from oslo_serialization import jsonutils
+from oslo_log import log
 from pecan import hooks
 
 from sysinv._i18n import _
@@ -36,9 +37,6 @@ from sysinv.db import api as dbapi
 from sysinv.openstack.common import policy
 from webob import exc
 
-from sysinv.openstack.common import log
-
-
 LOG = log.getLogger(__name__)
 
 audit_log_name = "{}.{}".format(__name__, "auditor")

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

@@ -17,11 +17,10 @@ import json
 import re
 
 from keystonemiddleware import auth_token
-
+from oslo_log import log
 from sysinv._i18n import _
 from sysinv.common import utils
 from sysinv.common import exception
-from sysinv.openstack.common import log
 
 LOG = log.getLogger(__name__)
 

sysinv/sysinv/sysinv/sysinv/api/middleware/parsable_error.py

@@ -27,7 +27,7 @@ import six
 import webob
 from xml import etree as et
 
-from sysinv.openstack.common import log
+from oslo_log import log
 
 LOG = log.getLogger(__name__)
 

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

@@ -34,11 +34,11 @@ import os
 import sys
 
 from oslo_config import cfg
+from oslo_log import log
 from sysinv._i18n import _
 from sysinv.common import service as sysinv_service
 from sysinv.conductor import rpcapi as conductor_rpcapi
 from sysinv.openstack.common import context
-from sysinv.openstack.common import log
 
 CONF = cfg.CONF
 

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

@@ -26,13 +26,13 @@ import time
 from collections import defaultdict
 
 from oslo_config import cfg
+from oslo_log import log
 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
 
 CONF = cfg.CONF
 LOG = log.getLogger(__name__)

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

@@ -12,12 +12,12 @@ Sysinv upgrade utilities.
 import sys
 
 from oslo_config import cfg
+from oslo_log import log
 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 tsconfig.tsconfig import system_mode
 

sysinv/sysinv/sysinv/sysinv/common/ceph.py

@@ -12,21 +12,21 @@
 
 from __future__ import absolute_import
 
-import shutil
-import subprocess
 import os
 import pecan
 import requests
+import shutil
+import subprocess
 import tempfile
 
 from cephclient import wrapper as ceph
 from requests.exceptions import ReadTimeout
 from contextlib import contextmanager
 
+from oslo_log import log as logging
 from sysinv.common import constants
 from sysinv.common import exception
 from sysinv.common import utils as cutils
-from sysinv.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)
 

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

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

sysinv/sysinv/sysinv/sysinv/common/extension_manager.py

@@ -21,8 +21,7 @@ Base class for plugin loader.
 
 from stevedore import enabled
 
-from sysinv.openstack.common import log
-
+from oslo_log import log
 
 LOG = log.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 oslo_log import log as logging
 from sysinv._i18n import _
 from sysinv.common import exception
-from sysinv.openstack.common import log as logging
 
 CONF = cfg.CONF
 

sysinv/sysinv/sysinv/sysinv/common/fm.py

@@ -9,10 +9,11 @@
 
 from keystoneauth1.access import service_catalog as k_service_catalog
 from oslo_config import cfg
+from oslo_log import log
+
 from fm_api import constants as fm_constants
 from fm_api import fm_api
 import fmclient as fm_client
-from sysinv.openstack.common import log
 
 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 oslo_log import log
 from sysinv._i18n import _
 from sysinv.common import ceph
 from sysinv.common import constants
@@ -18,7 +19,6 @@ from sysinv.common.fm import fmclient
 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
 
 import cgcs_patch.constants as patch_constants
 

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

@@ -25,12 +25,12 @@ import os
 import re
 
 from oslo_config import cfg
+from oslo_log import log as logging
 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
 
 LOG = logging.getLogger(__name__)

sysinv/sysinv/sysinv/sysinv/common/interface.py

@@ -8,8 +8,8 @@
 
 import collections
 
+from oslo_log import log
 from sysinv.common import constants
-from sysinv.openstack.common import log
 
 LOG = log.getLogger(__name__)
 

sysinv/sysinv/sysinv/sysinv/common/kubernetes.py

@@ -21,8 +21,8 @@ from kubernetes.client import Configuration
 from kubernetes.client.rest import ApiException
 from six.moves import http_client as httplib
 
+from oslo_log import log as logging
 from sysinv.common import exception
-from sysinv.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)
 

sysinv/sysinv/sysinv/sysinv/common/service.py

@@ -20,13 +20,13 @@
 import socket
 
 from oslo_config import cfg
-
+from oslo_log import log as logging
+from oslo_service import service
 from sysinv.openstack.common import context
-from sysinv.openstack.common import log
 from sysinv.openstack.common import periodic_task
 from sysinv.openstack.common import rpc
 from sysinv.openstack.common.rpc import service as rpc_service
-from oslo_service import service
+from sysinv import version
 
 
 cfg.CONF.register_opts([
@@ -58,17 +58,20 @@ class PeriodicService(rpc_service.Service, periodic_task.PeriodicTasks):
 def prepare_service(argv=None):
     if argv is None:
         argv = []
+    logging.register_options(cfg.CONF)
+
+    extra_log_level_defaults = [
+        'qpid.messaging=INFO',
+        'keystoneclient=INFO',
+        'eventlet.wsgi.server=WARN'
+    ]
+    logging.set_defaults(default_log_levels=logging.get_default_log_levels() +
+                         extra_log_level_defaults)
     rpc.set_defaults(control_exchange='sysinv')
-    cfg.set_defaults(log.log_opts,
-                     default_log_levels=['amqplib=WARN',
-                                         'qpid.messaging=INFO',
-                                         'sqlalchemy=WARN',
-                                         'keystoneclient=INFO',
-                                         'stevedore=INFO',
-                                         'eventlet.wsgi.server=WARN'
-                                         ])
-    cfg.CONF(argv[1:], project='sysinv')
-    log.setup('sysinv')
+    cfg.CONF(argv[1:],
+             project='sysinv',
+             version=version.version_string())
+    logging.setup(cfg.CONF, 'sysinv')
 
 
 def process_launcher():

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

@@ -11,11 +11,11 @@ import netaddr
 import pecan
 import wsme
 
+from oslo_log import log
 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
 
 LOG = log.getLogger(__name__)
 

sysinv/sysinv/sysinv/sysinv/common/storage_backend_conf.py

@@ -11,14 +11,13 @@
 """ System Inventory Storage Backend Utilities and helper functions."""
 
 
-import pecan
 import ast
+import pecan
 
+from oslo_log import log
 from sysinv.common import constants
 from sysinv.common import exception
 from sysinv.common import utils as cutils
-from sysinv.openstack.common import log
-
 
 LOG = log.getLogger(__name__)
 

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

@@ -60,6 +60,7 @@ import netaddr
 
 from oslo_concurrency import lockutils
 from oslo_config import cfg
+from oslo_log import log as logging
 
 from fm_api import constants as fm_constants
 
@@ -67,7 +68,6 @@ 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
 
 
 try:

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

@@ -21,11 +21,11 @@ from requests.exceptions import ReadTimeout
 
 from cephclient import wrapper as ceph
 from fm_api import fm_api
+from oslo_log import log as logging
 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 as logging
 from sysinv.openstack.common import uuidutils
 from sysinv.common.storage_backend_conf import StorageBackendConfig
 

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

@@ -62,6 +62,7 @@ from fm_api import fm_api
 from netaddr import IPAddress
 from netaddr import IPNetwork
 from oslo_config import cfg
+from oslo_log import log
 from platform_util.license import license
 from sqlalchemy.orm import exc
 from six.moves import http_client as httplib
@@ -97,7 +98,6 @@ from sysinv.objects import kube_app as kubeapp_obj
 from sysinv.openstack.common import context as ctx
 from sysinv.openstack.common import excutils
 from sysinv.openstack.common import jsonutils
-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