11 files changed, 12 insertions, 11 deletions
diff --git a/nova/virt/vmwareapi/driver.py b/nova/virt/vmwareapi/driver.py
index 0657bab45e..cc92ad665c 100644
--- a/nova/virt/vmwareapi/driver.py
+++ b/nova/virt/vmwareapi/driver.py
@@ -22,6 +22,7 @@ A connection to the VMware vCenter platform.
 import re
 
 from oslo_config import cfg
+from oslo_log import log as logging
 from oslo_serialization import jsonutils
 from oslo_vmware import api
 from oslo_vmware import exceptions as vexc
@@ -31,7 +32,6 @@ from oslo_vmware import vim_util
 
 from nova import exception
 from nova.i18n import _, _LI, _LW
-from nova.openstack.common import log as logging
 from nova.virt import driver
 from nova.virt.vmwareapi import constants
 from nova.virt.vmwareapi import error_util
diff --git a/nova/virt/vmwareapi/ds_util.py b/nova/virt/vmwareapi/ds_util.py
index c0ff57670c..034879dbd1 100644
--- a/nova/virt/vmwareapi/ds_util.py
+++ b/nova/virt/vmwareapi/ds_util.py
@@ -15,14 +15,15 @@
 """
 Datastore utility functions
 """
+
 import posixpath
 
+from oslo_log import log as logging
 from oslo_vmware import exceptions as vexc
 from oslo_vmware import pbm
 
 from nova import exception
 from nova.i18n import _, _LE, _LI
-from nova.openstack.common import log as logging
 from nova.virt.vmwareapi import constants
 from nova.virt.vmwareapi import vim_util
 from nova.virt.vmwareapi import vm_util
diff --git a/nova/virt/vmwareapi/imagecache.py b/nova/virt/vmwareapi/imagecache.py
index d594cb0e99..30532524e7 100644
--- a/nova/virt/vmwareapi/imagecache.py
+++ b/nova/virt/vmwareapi/imagecache.py
@@ -37,11 +37,11 @@ This will ensure that a image is not deleted during the spawn.
 
 from oslo_concurrency import lockutils
 from oslo_config import cfg
+from oslo_log import log as logging
 from oslo_utils import timeutils
 from oslo_vmware import exceptions as vexc
 
 from nova.i18n import _LI, _LW
-from nova.openstack.common import log as logging
 from nova.virt import imagecache
 from nova.virt.vmwareapi import ds_util
 from nova.virt.vmwareapi import vim_util
diff --git a/nova/virt/vmwareapi/images.py b/nova/virt/vmwareapi/images.py
index cc38d14a9b..1f47483903 100644
--- a/nova/virt/vmwareapi/images.py
+++ b/nova/virt/vmwareapi/images.py
@@ -23,6 +23,7 @@ import tempfile
 
 from lxml import etree
 from oslo_config import cfg
+from oslo_log import log as logging
 from oslo_utils import strutils
 from oslo_utils import units
 from oslo_vmware import rw_handles
@@ -30,7 +31,6 @@ from oslo_vmware import rw_handles
 from nova import exception
 from nova.i18n import _, _LI
 from nova import image
-from nova.openstack.common import log as logging
 from nova.virt.vmwareapi import constants
 from nova.virt.vmwareapi import io_util
 
diff --git a/nova/virt/vmwareapi/io_util.py b/nova/virt/vmwareapi/io_util.py
index 8970375e2a..57d49ab071 100644
--- a/nova/virt/vmwareapi/io_util.py
+++ b/nova/virt/vmwareapi/io_util.py
@@ -22,11 +22,11 @@ to the write using a LightQueue as a Pipe between the reader and the writer.
 from eventlet import event
 from eventlet import greenthread
 from eventlet import queue
+from oslo_log import log as logging
 
 from nova import exception
 from nova.i18n import _
 from nova import image
-from nova.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)
 IMAGE_API = image.API()
diff --git a/nova/virt/vmwareapi/network_util.py b/nova/virt/vmwareapi/network_util.py
index e802a93a52..97f5119c9c 100644
--- a/nova/virt/vmwareapi/network_util.py
+++ b/nova/virt/vmwareapi/network_util.py
@@ -17,11 +17,11 @@
 """
 Utility functions for ESX Networking.
 """
+from oslo_log import log as logging
 from oslo_vmware import exceptions as vexc
 
 from nova import exception
 from nova.i18n import _
-from nova.openstack.common import log as logging
 from nova.virt.vmwareapi import vim_util
 from nova.virt.vmwareapi import vm_util
 
diff --git a/nova/virt/vmwareapi/vif.py b/nova/virt/vmwareapi/vif.py
index c37c0d2977..3d228d70ae 100644
--- a/nova/virt/vmwareapi/vif.py
+++ b/nova/virt/vmwareapi/vif.py
@@ -16,12 +16,12 @@
 """VIF drivers for VMware."""
 
 from oslo_config import cfg
+from oslo_log import log as logging
 from oslo_vmware import exceptions as vexc
 
 from nova import exception
 from nova.i18n import _LW
 from nova.network import model
-from nova.openstack.common import log as logging
 from nova.virt.vmwareapi import network_util
 from nova.virt.vmwareapi import vim_util
 from nova.virt.vmwareapi import vm_util
diff --git a/nova/virt/vmwareapi/vim_util.py b/nova/virt/vmwareapi/vim_util.py
index 2041601f9c..d22251a80f 100644
--- a/nova/virt/vmwareapi/vim_util.py
+++ b/nova/virt/vmwareapi/vim_util.py
@@ -18,11 +18,11 @@ The VMware API utility module.
 """
 
 from oslo_config import cfg
+from oslo_log import log as logging
 from oslo_vmware import vim_util as vutil
 import suds
 
 from nova.i18n import _LW
-from nova.openstack.common import log as logging
 
 vmware_opts = cfg.IntOpt('maximum_objects', default=100,
                          help='The maximum number of ObjectContent data '
diff --git a/nova/virt/vmwareapi/vm_util.py b/nova/virt/vmwareapi/vm_util.py
index de496c211e..aba20deca4 100644
--- a/nova/virt/vmwareapi/vm_util.py
+++ b/nova/virt/vmwareapi/vm_util.py
@@ -23,6 +23,7 @@ import copy
 import functools
 
 from oslo_config import cfg
+from oslo_log import log as logging
 from oslo_utils import excutils
 from oslo_utils import units
 from oslo_vmware import exceptions as vexc
@@ -32,7 +33,6 @@ from oslo_vmware import pbm
 from nova import exception
 from nova.i18n import _, _LI, _LW
 from nova.network import model as network_model
-from nova.openstack.common import log as logging
 from nova.virt.vmwareapi import constants
 from nova.virt.vmwareapi import vim_util
 
diff --git a/nova/virt/vmwareapi/vmops.py b/nova/virt/vmwareapi/vmops.py
index 19b88916d8..75e7524206 100644
--- a/nova/virt/vmwareapi/vmops.py
+++ b/nova/virt/vmwareapi/vmops.py
@@ -26,6 +26,7 @@ import time
 import decorator
 from oslo_concurrency import lockutils
 from oslo_config import cfg
+from oslo_log import log as logging
 from oslo_utils import excutils
 from oslo_utils import strutils
 from oslo_utils import units
@@ -41,7 +42,6 @@ from nova import context as nova_context
 from nova import exception
 from nova.i18n import _, _LE, _LI, _LW
 from nova import objects
-from nova.openstack.common import log as logging
 from nova.openstack.common import uuidutils
 from nova import utils
 from nova.virt import configdrive
diff --git a/nova/virt/vmwareapi/volumeops.py b/nova/virt/vmwareapi/volumeops.py
index 6c2381aa92..2c62857323 100644
--- a/nova/virt/vmwareapi/volumeops.py
+++ b/nova/virt/vmwareapi/volumeops.py
@@ -18,12 +18,12 @@ Management class for Storage-related functions (attach, detach, etc).
 """
 
 from oslo_config import cfg
+from oslo_log import log as logging
 from oslo_vmware import vim_util as vutil
 
 from nova.compute import vm_states
 from nova import exception
 from nova.i18n import _, _LI
-from nova.openstack.common import log as logging
 from nova.virt.vmwareapi import constants
 from nova.virt.vmwareapi import vim_util
 from nova.virt.vmwareapi import vm_util