diff --git a/nova_powervm/virt/powervm/driver.py b/nova_powervm/virt/powervm/driver.py index d2b45806..c9590ae0 100644 --- a/nova_powervm/virt/powervm/driver.py +++ b/nova_powervm/virt/powervm/driver.py @@ -19,12 +19,12 @@ from nova import context as ctx from nova import exception from nova.i18n import _LI, _ from nova.objects import flavor as flavor_obj -from nova.openstack.common import log as logging from nova.virt import configdrive from nova.virt import driver import time from oslo.config import cfg +from oslo_log import log as logging import taskflow.engines from taskflow.patterns import linear_flow as lf diff --git a/nova_powervm/virt/powervm/fake_driver.py b/nova_powervm/virt/powervm/fake_driver.py index 60826952..e5a5e38e 100644 --- a/nova_powervm/virt/powervm/fake_driver.py +++ b/nova_powervm/virt/powervm/fake_driver.py @@ -15,10 +15,11 @@ # under the License. -from nova.openstack.common import log as logging from nova.virt import driver from nova.virt import fake +from oslo_log import log as logging + LOG = logging.getLogger(__name__) diff --git a/nova_powervm/virt/powervm/host.py b/nova_powervm/virt/powervm/host.py index 8fcaa799..bcedf68e 100644 --- a/nova_powervm/virt/powervm/host.py +++ b/nova_powervm/virt/powervm/host.py @@ -18,9 +18,9 @@ import math 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 oslo.serialization import jsonutils +from oslo_log import log as logging LOG = logging.getLogger(__name__) diff --git a/nova_powervm/virt/powervm/localdisk.py b/nova_powervm/virt/powervm/localdisk.py index 6d643b40..bfe98019 100644 --- a/nova_powervm/virt/powervm/localdisk.py +++ b/nova_powervm/virt/powervm/localdisk.py @@ -19,12 +19,12 @@ import abc from oslo.config import cfg from oslo.utils import units +from oslo_log import log as logging import six from nova import exception as nova_exc from nova import image from nova.i18n import _LI, _LE -from nova.openstack.common import log as logging from pypowervm import exceptions as pvm_exc from pypowervm.jobs import upload_lv from pypowervm.wrappers import constants as pvm_consts diff --git a/nova_powervm/virt/powervm/media.py b/nova_powervm/virt/powervm/media.py index 96259643..0f37404b 100644 --- a/nova_powervm/virt/powervm/media.py +++ b/nova_powervm/virt/powervm/media.py @@ -18,11 +18,11 @@ import abc from nova.api.metadata import base as instance_metadata from nova.i18n import _LE from nova.i18n import _LI -from nova.openstack.common import log as logging from nova.virt import configdrive import os from oslo.config import cfg +from oslo_log import log as logging from pypowervm.jobs import upload_lv from pypowervm.wrappers import constants as pvmc diff --git a/nova_powervm/virt/powervm/tasks/destroy.py b/nova_powervm/virt/powervm/tasks/destroy.py index f762960e..f5d85a1e 100644 --- a/nova_powervm/virt/powervm/tasks/destroy.py +++ b/nova_powervm/virt/powervm/tasks/destroy.py @@ -15,7 +15,6 @@ # under the License. from nova.i18n import _LI -from nova.openstack.common import log as logging from pypowervm.jobs import power from pypowervm.wrappers import logical_partition as lpar_w @@ -24,6 +23,8 @@ from taskflow import task from nova_powervm.virt.powervm import media from nova_powervm.virt.powervm import vm +from oslo_log import log as logging + LOG = logging.getLogger(__name__) diff --git a/nova_powervm/virt/powervm/tasks/spawn.py b/nova_powervm/virt/powervm/tasks/spawn.py index 5288142d..3cd544de 100644 --- a/nova_powervm/virt/powervm/tasks/spawn.py +++ b/nova_powervm/virt/powervm/tasks/spawn.py @@ -16,10 +16,10 @@ from nova.i18n import _LI from nova.i18n import _LW -from nova.openstack.common import log as logging from pypowervm.jobs import power from pypowervm.wrappers import logical_partition as pvm_lpar +from oslo_log import log as logging from taskflow import task from taskflow.types import failure as task_fail diff --git a/nova_powervm/virt/powervm/vios.py b/nova_powervm/virt/powervm/vios.py index 5c069093..8012d253 100644 --- a/nova_powervm/virt/powervm/vios.py +++ b/nova_powervm/virt/powervm/vios.py @@ -17,10 +17,10 @@ import abc from oslo.config import cfg +from oslo_log import log as logging import six from nova.i18n import _LE -from nova.openstack.common import log as logging from pypowervm import exceptions as pvm_exc from pypowervm.wrappers import constants as pvm_consts from pypowervm.wrappers import logical_partition as pvm_lpar diff --git a/nova_powervm/virt/powervm/vm.py b/nova_powervm/virt/powervm/vm.py index f3eacf26..ad7aac51 100644 --- a/nova_powervm/virt/powervm/vm.py +++ b/nova_powervm/virt/powervm/vm.py @@ -15,11 +15,11 @@ # under the License. from oslo.config import cfg +from oslo_log import log as logging from nova.compute import power_state from nova import exception from nova.i18n import _LI, _LE -from nova.openstack.common import log as logging from nova.virt import hardware from pypowervm import exceptions as pvm_exc from pypowervm.jobs import cna diff --git a/requirements.txt b/requirements.txt index db2aa3d6..d810d0e2 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,8 @@ pbr>=0.5.21,<1.0 Babel>=1.3 six>=1.7.0 +oslo.config>=1.4.0 # Apache-2.0 +oslo.log>=0.1.0 # Apache-2.0 oslo.serialization>=1.0.0 # Apache-2.0 oslo.utils>=1.0.0 # Apache-2.0 -oslo.config>=1.4.0 # Apache-2.0 taskflow>=0.6 \ No newline at end of file