Use oslo.log

Convert the use of the incubated version of the log module
to the new oslo.log library.

Sync oslo-incubator modules to update their imports as well.

Co-Authored-By: Doug Hellmann <doug@doughellmann.com>
Change-Id: Ic4932e3f58191869c30bd07a010a6e9fdcb2a12c

nova/scheduler/client/report.py

@@ -13,11 +13,11 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from oslo_log import log as logging
 
 from nova import conductor
 from nova import exception
 from nova.i18n import _LI
-from nova.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)
 

nova/scheduler/filter_scheduler.py

@@ -22,10 +22,10 @@ Weighing Functions.
 import random
 
 from oslo_config import cfg
+from oslo_log import log as logging
 
 from nova import exception
 from nova.i18n import _
-from nova.openstack.common import log as logging
 from nova import rpc
 from nova.scheduler import driver
 from nova.scheduler import scheduler_options

nova/scheduler/filters/affinity_filter.py

@@ -16,10 +16,10 @@
 
 
 import netaddr
+from oslo_log import log as logging
 import six
 
 from nova.compute import api as compute
-from nova.openstack.common import log as logging
 from nova.scheduler import filters
 
 LOG = logging.getLogger(__name__)

nova/scheduler/filters/aggregate_image_properties_isolation.py

@@ -14,8 +14,8 @@
 #    under the License.
 
 from oslo_config import cfg
+from oslo_log import log as logging
 
-from nova.openstack.common import log as logging
 from nova.scheduler import filters
 from nova.scheduler.filters import utils
 

nova/scheduler/filters/aggregate_instance_extra_specs.py

@@ -14,7 +14,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from nova.openstack.common import log as logging
+from oslo_log import log as logging
+
 from nova.scheduler import filters
 from nova.scheduler.filters import extra_specs_ops
 from nova.scheduler.filters import utils

nova/scheduler/filters/aggregate_multitenancy_isolation.py

@@ -13,7 +13,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from nova.openstack.common import log as logging
+from oslo_log import log as logging
+
 from nova.scheduler import filters
 from nova.scheduler.filters import utils
 

nova/scheduler/filters/availability_zone_filter.py

@@ -14,8 +14,8 @@
 #    under the License.
 
 from oslo_config import cfg
+from oslo_log import log as logging
 
-from nova.openstack.common import log as logging
 from nova.scheduler import filters
 from nova.scheduler.filters import utils
 

nova/scheduler/filters/compute_capabilities_filter.py

@@ -13,10 +13,10 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from oslo_log import log as logging
 from oslo_serialization import jsonutils
 import six
 
-from nova.openstack.common import log as logging
 from nova.scheduler import filters
 from nova.scheduler.filters import extra_specs_ops
 

nova/scheduler/filters/compute_filter.py

@@ -14,9 +14,9 @@
 #    under the License.
 
 from oslo_config import cfg
+from oslo_log import log as logging
 
 from nova.i18n import _LW
-from nova.openstack.common import log as logging
 from nova.scheduler import filters
 from nova import servicegroup
 

nova/scheduler/filters/core_filter.py

@@ -16,9 +16,9 @@
 #    under the License.
 
 from oslo_config import cfg
+from oslo_log import log as logging
 
 from nova.i18n import _LW
-from nova.openstack.common import log as logging
 from nova.scheduler import filters
 from nova.scheduler.filters import utils
 

nova/scheduler/filters/disk_filter.py

@@ -14,9 +14,9 @@
 #    under the License.
 
 from oslo_config import cfg
+from oslo_log import log as logging
 
 from nova.i18n import _LW
-from nova.openstack.common import log as logging
 from nova.scheduler import filters
 from nova.scheduler.filters import utils
 

nova/scheduler/filters/exact_core_filter.py

@@ -14,9 +14,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from oslo_log import log as logging
 
 from nova.i18n import _LW
-from nova.openstack.common import log as logging
 from nova.scheduler import filters
 
 LOG = logging.getLogger(__name__)

nova/scheduler/filters/exact_disk_filter.py

@@ -13,7 +13,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from nova.openstack.common import log as logging
+from oslo_log import log as logging
+
 from nova.scheduler import filters
 
 LOG = logging.getLogger(__name__)

nova/scheduler/filters/exact_ram_filter.py

@@ -13,7 +13,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from nova.openstack.common import log as logging
+from oslo_log import log as logging
+
 from nova.scheduler import filters
 
 LOG = logging.getLogger(__name__)

nova/scheduler/filters/image_props_filter.py

@@ -16,10 +16,11 @@
 #    under the License.
 from distutils import versionpredicate
 
+from oslo_log import log as logging
+
 from nova.compute import arch
 from nova.compute import hv_type
 from nova.compute import vm_mode
-from nova.openstack.common import log as logging
 from nova.scheduler import filters
 from nova import utils
 

nova/scheduler/filters/io_ops_filter.py

@@ -14,9 +14,9 @@
 #    under the License.
 
 from oslo_config import cfg
+from oslo_log import log as logging
 
 from nova.i18n import _LW
-from nova.openstack.common import log as logging
 from nova.scheduler import filters
 from nova.scheduler.filters import utils
 

nova/scheduler/filters/metrics_filter.py

@@ -14,8 +14,8 @@
 #    under the License.
 
 from oslo_config import cfg
+from oslo_log import log as logging
 
-from nova.openstack.common import log as logging
 from nova.scheduler import filters
 from nova.scheduler import utils
 

nova/scheduler/filters/num_instances_filter.py

@@ -14,9 +14,9 @@
 #    under the License.
 
 from oslo_config import cfg
+from oslo_log import log as logging
 
 from nova.i18n import _LW
-from nova.openstack.common import log as logging
 from nova.scheduler import filters
 from nova.scheduler.filters import utils
 

nova/scheduler/filters/pci_passthrough_filter.py

@@ -13,7 +13,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from nova.openstack.common import log as logging
+from oslo_log import log as logging
+
 from nova.scheduler import filters
 
 LOG = logging.getLogger(__name__)

nova/scheduler/filters/ram_filter.py

@@ -15,9 +15,9 @@
 #    under the License.
 
 from oslo_config import cfg
+from oslo_log import log as logging
 
 from nova.i18n import _LW
-from nova.openstack.common import log as logging
 from nova.scheduler import filters
 from nova.scheduler.filters import utils
 

nova/scheduler/filters/retry_filter.py

@@ -13,7 +13,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from nova.openstack.common import log as logging
+from oslo_log import log as logging
+
 from nova.scheduler import filters
 
 LOG = logging.getLogger(__name__)

nova/scheduler/filters/trusted_filter.py

@@ -44,13 +44,13 @@ the Open Attestation project at:
 """
 
 from oslo_config import cfg
+from oslo_log import log as logging
 from oslo_serialization import jsonutils
 from oslo_utils import timeutils
 import requests
 
 from nova import context
 from nova import objects
-from nova.openstack.common import log as logging
 from nova.scheduler import filters
 
 LOG = logging.getLogger(__name__)

nova/scheduler/filters/utils.py

@@ -16,9 +16,10 @@
 
 import collections
 
+from oslo_log import log as logging
+
 from nova.i18n import _LI
 from nova import objects
-from nova.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)
 

nova/scheduler/host_manager.py

@@ -22,6 +22,7 @@ import UserDict
 
 import iso8601
 from oslo_config import cfg
+from oslo_log import log as logging
 from oslo_serialization import jsonutils
 from oslo_utils import timeutils
 
@@ -30,7 +31,6 @@ from nova.compute import vm_states
 from nova import exception
 from nova.i18n import _, _LI, _LW
 from nova import objects
-from nova.openstack.common import log as logging
 from nova.pci import stats as pci_stats
 from nova.scheduler import filters
 from nova.scheduler import weights
@@ -344,7 +344,7 @@ class HostManager(object):
                         ignored_hosts.append(host)
             ignored_hosts_str = ', '.join(ignored_hosts)
             msg = _('Host filter ignoring hosts: %s')
-            LOG.audit(msg % ignored_hosts_str)
+            LOG.info(msg % ignored_hosts_str)
 
         def _match_forced_hosts(host_map, hosts_to_force):
             forced_hosts = []
@@ -360,7 +360,7 @@ class HostManager(object):
                 forced_hosts_str = ', '.join(hosts_to_force)
                 msg = _("No hosts matched due to not matching "
                         "'force_hosts' value of '%s'")
-            LOG.audit(msg % forced_hosts_str)
+            LOG.info(msg % forced_hosts_str)
 
         def _match_forced_nodes(host_map, nodes_to_force):
             forced_nodes = []
@@ -376,7 +376,7 @@ class HostManager(object):
                 forced_nodes_str = ', '.join(nodes_to_force)
                 msg = _("No nodes matched due to not matching "
                         "'force_nodes' value of '%s'")
-            LOG.audit(msg % forced_nodes_str)
+            LOG.info(msg % forced_nodes_str)
 
         if filter_class_names is None:
             filters = self.default_filters

nova/scheduler/ironic_host_manager.py

@@ -23,9 +23,9 @@ subdivided into multiple instances.
 """
 import iso8601
 from oslo_config import cfg
+from oslo_log import log as logging
 from oslo_utils import timeutils
 
-from nova.openstack.common import log as logging
 from nova.scheduler import host_manager
 
 host_manager_opts = [

nova/scheduler/manager.py

@@ -20,6 +20,7 @@ Scheduler Service
 """
 
 from oslo_config import cfg
+from oslo_log import log as logging
 import oslo_messaging as messaging
 from oslo_serialization import jsonutils
 from oslo_utils import importutils
@@ -27,7 +28,6 @@ from oslo_utils import importutils
 from nova import exception
 from nova import manager
 from nova import objects
-from nova.openstack.common import log as logging
 from nova.openstack.common import periodic_task
 from nova import quota
 

nova/scheduler/scheduler_options.py

@@ -24,12 +24,12 @@ import datetime
 import os
 
 from oslo_config import cfg
+from oslo_log import log as logging
 from oslo_serialization import jsonutils
 from oslo_utils import excutils
 from oslo_utils import timeutils
 
 from nova.i18n import _LE
-from nova.openstack.common import log as logging
 
 
 scheduler_json_config_location_opt = cfg.StrOpt(

nova/scheduler/utils.py

@@ -19,6 +19,7 @@ import functools
 import sys
 
 from oslo_config import cfg
+from oslo_log import log as logging
 import oslo_messaging as messaging
 from oslo_serialization import jsonutils
 
@@ -30,7 +31,6 @@ from nova import notifications
 from nova import objects
 from nova.objects import base as obj_base
 from nova.objects import instance as instance_obj
-from nova.openstack.common import log as logging
 from nova import rpc