diff options
| author | Davanum Srinivas <dims@linux.vnet.ibm.com> | 2015-01-10 22:26:32 -0500 |
|---|---|---|
| committer | Davanum Srinivas <davanum@gmail.com> | 2015-02-06 06:03:10 -0500 |
| commit | af2d6c9576b1ac5f3b3768870bb15d9b5cf1610b (patch) | |
| tree | 5a6d58e8d0c6cc68a732418dfbd24015460f88b1 /nova | |
| parent | ff219370f3e1c836603b218dd3225f81ba3938b4 (diff) | |
| download | nova-af2d6c9576b1ac5f3b3768870bb15d9b5cf1610b.tar.gz | |
Switch to using oslo_* instead of oslo.*
The oslo team is recommending everyone to switch to the
non-namespaced versions of libraries. Updating the hacking
rule to include a check to prevent oslo.* import from
creeping back in.
This commit includes:
- using oslo_utils instead of oslo.utils
- using oslo_serialization instead of oslo.serialization
- using oslo_db instead of oslo.db
- using oslo_i18n instead of oslo.i18n
- using oslo_middleware instead of oslo.middleware
- using oslo_config instead of oslo.config
- using oslo_messaging instead of "from oslo import messaging"
- using oslo_vmware instead of oslo.vmware
Change-Id: I3e2eb147b321ce3e928817b62abcb7d023c5f13f
Diffstat (limited to 'nova')
554 files changed, 995 insertions, 963 deletions
diff --git a/nova/api/auth.py b/nova/api/auth.py index f61c218285..d9db49fa0a 100644 --- a/nova/api/auth.py +++ b/nova/api/auth.py @@ -16,9 +16,9 @@ Common Auth Middleware. """ -from oslo.config import cfg -from oslo.middleware import request_id -from oslo.serialization import jsonutils +from oslo_config import cfg +from oslo_middleware import request_id +from oslo_serialization import jsonutils import webob.dec import webob.exc diff --git a/nova/api/compute_req_id.py b/nova/api/compute_req_id.py index 711756e686..c8e0eedbf5 100644 --- a/nova/api/compute_req_id.py +++ b/nova/api/compute_req_id.py @@ -23,7 +23,7 @@ Responses for APIv3 are taken care of by the request_id middleware provided in oslo. """ -from oslo.middleware import base +from oslo_middleware import base import webob.dec from nova.openstack.common import context diff --git a/nova/api/ec2/__init__.py b/nova/api/ec2/__init__.py index 5b88a2dc01..68027c040d 100644 --- a/nova/api/ec2/__init__.py +++ b/nova/api/ec2/__init__.py @@ -20,11 +20,11 @@ Starting point for routing EC2 requests. import hashlib -from oslo.config import cfg -from oslo.serialization import jsonutils -from oslo.utils import importutils -from oslo.utils import netutils -from oslo.utils import timeutils +from oslo_config import cfg +from oslo_serialization import jsonutils +from oslo_utils import importutils +from oslo_utils import netutils +from oslo_utils import timeutils import requests import six import webob diff --git a/nova/api/ec2/apirequest.py b/nova/api/ec2/apirequest.py index f20705da78..c65dfcd994 100644 --- a/nova/api/ec2/apirequest.py +++ b/nova/api/ec2/apirequest.py @@ -23,7 +23,7 @@ import datetime from xml.dom import minidom from lxml import etree -from oslo.utils import encodeutils +from oslo_utils import encodeutils import six from nova.api.ec2 import ec2utils diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py index 12f8e4b9f3..653d84bb0a 100644 --- a/nova/api/ec2/cloud.py +++ b/nova/api/ec2/cloud.py @@ -23,8 +23,8 @@ datastore. import base64 import time -from oslo.config import cfg -from oslo.utils import timeutils +from oslo_config import cfg +from oslo_utils import timeutils from nova.api.ec2 import ec2utils from nova.api.ec2 import inst_state diff --git a/nova/api/ec2/ec2utils.py b/nova/api/ec2/ec2utils.py index 8649ba3188..2f11fd1ee9 100644 --- a/nova/api/ec2/ec2utils.py +++ b/nova/api/ec2/ec2utils.py @@ -17,7 +17,7 @@ import functools import re -from oslo.utils import timeutils +from oslo_utils import timeutils from nova import context from nova import exception diff --git a/nova/api/ec2/faults.py b/nova/api/ec2/faults.py index 28574baac2..552e13f95b 100644 --- a/nova/api/ec2/faults.py +++ b/nova/api/ec2/faults.py @@ -10,7 +10,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.config import cfg +from oslo_config import cfg import webob.dec import webob.exc diff --git a/nova/api/metadata/base.py b/nova/api/metadata/base.py index 5e79903120..2a8f8d10e3 100644 --- a/nova/api/metadata/base.py +++ b/nova/api/metadata/base.py @@ -20,10 +20,10 @@ import base64 import os import posixpath -from oslo.config import cfg -from oslo.serialization import jsonutils -from oslo.utils import importutils -from oslo.utils import timeutils +from oslo_config import cfg +from oslo_serialization import jsonutils +from oslo_utils import importutils +from oslo_utils import timeutils from nova.api.ec2 import ec2utils from nova.api.metadata import password diff --git a/nova/api/metadata/handler.py b/nova/api/metadata/handler.py index a07ad99eec..6dc612450a 100644 --- a/nova/api/metadata/handler.py +++ b/nova/api/metadata/handler.py @@ -19,7 +19,7 @@ import hashlib import hmac import os -from oslo.config import cfg +from oslo_config import cfg import six import webob.dec import webob.exc diff --git a/nova/api/metadata/vendordata_json.py b/nova/api/metadata/vendordata_json.py index 73a83e8349..765a23197d 100644 --- a/nova/api/metadata/vendordata_json.py +++ b/nova/api/metadata/vendordata_json.py @@ -17,8 +17,8 @@ import errno -from oslo.config import cfg -from oslo.serialization import jsonutils +from oslo_config import cfg +from oslo_serialization import jsonutils from nova.api.metadata import base from nova.i18n import _LW diff --git a/nova/api/openstack/__init__.py b/nova/api/openstack/__init__.py index ef7022dd80..61267325c6 100644 --- a/nova/api/openstack/__init__.py +++ b/nova/api/openstack/__init__.py @@ -18,7 +18,7 @@ WSGI middleware for OpenStack API controllers. """ -from oslo.config import cfg +from oslo_config import cfg import routes import stevedore import webob.dec diff --git a/nova/api/openstack/auth.py b/nova/api/openstack/auth.py index e0aa32b400..469bf2181d 100644 --- a/nova/api/openstack/auth.py +++ b/nova/api/openstack/auth.py @@ -14,7 +14,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.config import cfg +from oslo_config import cfg import webob.dec import webob.exc diff --git a/nova/api/openstack/common.py b/nova/api/openstack/common.py index 0aae51b063..37dbb95747 100644 --- a/nova/api/openstack/common.py +++ b/nova/api/openstack/common.py @@ -19,7 +19,7 @@ import itertools import os import re -from oslo.config import cfg +from oslo_config import cfg import six.moves.urllib.parse as urlparse import webob from webob import exc diff --git a/nova/api/openstack/compute/__init__.py b/nova/api/openstack/compute/__init__.py index 300e7c8fb4..eee14b4bb3 100644 --- a/nova/api/openstack/compute/__init__.py +++ b/nova/api/openstack/compute/__init__.py @@ -18,7 +18,7 @@ WSGI middleware for OpenStack Compute API. """ -from oslo.config import cfg +from oslo_config import cfg import nova.api.openstack from nova.api.openstack.compute import consoles diff --git a/nova/api/openstack/compute/contrib/__init__.py b/nova/api/openstack/compute/contrib/__init__.py index e4d9dea64c..a604694055 100644 --- a/nova/api/openstack/compute/contrib/__init__.py +++ b/nova/api/openstack/compute/contrib/__init__.py @@ -19,7 +19,7 @@ It can't be called 'extensions' because that causes namespacing problems. """ -from oslo.config import cfg +from oslo_config import cfg from nova.api.openstack import extensions from nova.openstack.common import log as logging diff --git a/nova/api/openstack/compute/contrib/admin_actions.py b/nova/api/openstack/compute/contrib/admin_actions.py index 6a5512dc3d..c234f70a6b 100644 --- a/nova/api/openstack/compute/contrib/admin_actions.py +++ b/nova/api/openstack/compute/contrib/admin_actions.py @@ -15,7 +15,7 @@ import os.path import traceback -from oslo.utils import strutils +from oslo_utils import strutils import six import webob from webob import exc diff --git a/nova/api/openstack/compute/contrib/assisted_volume_snapshots.py b/nova/api/openstack/compute/contrib/assisted_volume_snapshots.py index 5ff345dbab..c5bb8238ce 100644 --- a/nova/api/openstack/compute/contrib/assisted_volume_snapshots.py +++ b/nova/api/openstack/compute/contrib/assisted_volume_snapshots.py @@ -12,7 +12,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils import six import webob diff --git a/nova/api/openstack/compute/contrib/availability_zone.py b/nova/api/openstack/compute/contrib/availability_zone.py index c6dd01aa72..69f4a15858 100644 --- a/nova/api/openstack/compute/contrib/availability_zone.py +++ b/nova/api/openstack/compute/contrib/availability_zone.py @@ -12,7 +12,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.config import cfg +from oslo_config import cfg from nova.api.openstack import extensions from nova.api.openstack import wsgi diff --git a/nova/api/openstack/compute/contrib/baremetal_nodes.py b/nova/api/openstack/compute/contrib/baremetal_nodes.py index 1b89f214aa..1c1969b4ca 100644 --- a/nova/api/openstack/compute/contrib/baremetal_nodes.py +++ b/nova/api/openstack/compute/contrib/baremetal_nodes.py @@ -15,8 +15,8 @@ """The bare-metal admin extension with Ironic Proxy.""" -from oslo.config import cfg -from oslo.utils import importutils +from oslo_config import cfg +from oslo_utils import importutils import webob from nova.api.openstack import extensions diff --git a/nova/api/openstack/compute/contrib/cells.py b/nova/api/openstack/compute/contrib/cells.py index 8a9702546f..c75ba263b6 100644 --- a/nova/api/openstack/compute/contrib/cells.py +++ b/nova/api/openstack/compute/contrib/cells.py @@ -16,10 +16,10 @@ """The cells extension.""" -from oslo.config import cfg -from oslo import messaging -from oslo.utils import strutils -from oslo.utils import timeutils +from oslo_config import cfg +import oslo_messaging as messaging +from oslo_utils import strutils +from oslo_utils import timeutils import six from webob import exc diff --git a/nova/api/openstack/compute/contrib/cloudpipe.py b/nova/api/openstack/compute/contrib/cloudpipe.py index 091eb4c264..719b12571e 100644 --- a/nova/api/openstack/compute/contrib/cloudpipe.py +++ b/nova/api/openstack/compute/contrib/cloudpipe.py @@ -14,8 +14,8 @@ """Connect your vlan to the world.""" -from oslo.config import cfg -from oslo.utils import timeutils +from oslo_config import cfg +from oslo_utils import timeutils from webob import exc from nova.api.openstack import extensions diff --git a/nova/api/openstack/compute/contrib/disk_config.py b/nova/api/openstack/compute/contrib/disk_config.py index 7eecec5cee..eb8b05aa01 100644 --- a/nova/api/openstack/compute/contrib/disk_config.py +++ b/nova/api/openstack/compute/contrib/disk_config.py @@ -14,7 +14,7 @@ """Disk Config extension.""" -from oslo.utils import strutils +from oslo_utils import strutils from webob import exc from nova.api.openstack import extensions diff --git a/nova/api/openstack/compute/contrib/evacuate.py b/nova/api/openstack/compute/contrib/evacuate.py index f62a855011..66318d6ded 100644 --- a/nova/api/openstack/compute/contrib/evacuate.py +++ b/nova/api/openstack/compute/contrib/evacuate.py @@ -13,7 +13,7 @@ # under the License. -from oslo.utils import strutils +from oslo_utils import strutils from webob import exc from nova.api.openstack import common diff --git a/nova/api/openstack/compute/contrib/floating_ip_dns.py b/nova/api/openstack/compute/contrib/floating_ip_dns.py index e239c9f0f7..d8745a63fc 100644 --- a/nova/api/openstack/compute/contrib/floating_ip_dns.py +++ b/nova/api/openstack/compute/contrib/floating_ip_dns.py @@ -14,7 +14,7 @@ import urllib -from oslo.utils import netutils +from oslo_utils import netutils import webob from nova.api.openstack import extensions diff --git a/nova/api/openstack/compute/contrib/floating_ips_bulk.py b/nova/api/openstack/compute/contrib/floating_ips_bulk.py index 9e9d1a77ac..a4c76d8df3 100644 --- a/nova/api/openstack/compute/contrib/floating_ips_bulk.py +++ b/nova/api/openstack/compute/contrib/floating_ips_bulk.py @@ -13,7 +13,7 @@ # under the License. import netaddr -from oslo.config import cfg +from oslo_config import cfg import six import webob.exc diff --git a/nova/api/openstack/compute/contrib/fping.py b/nova/api/openstack/compute/contrib/fping.py index df5bb24412..be0c7fd287 100644 --- a/nova/api/openstack/compute/contrib/fping.py +++ b/nova/api/openstack/compute/contrib/fping.py @@ -17,7 +17,7 @@ import itertools import os -from oslo.config import cfg +from oslo_config import cfg from webob import exc from nova.api.openstack import common diff --git a/nova/api/openstack/compute/contrib/hide_server_addresses.py b/nova/api/openstack/compute/contrib/hide_server_addresses.py index d8bef0ff47..3ca073e501 100644 --- a/nova/api/openstack/compute/contrib/hide_server_addresses.py +++ b/nova/api/openstack/compute/contrib/hide_server_addresses.py @@ -15,7 +15,7 @@ """Extension for hiding server addresses in certain states.""" -from oslo.config import cfg +from oslo_config import cfg from nova.api.openstack import extensions from nova.api.openstack import wsgi diff --git a/nova/api/openstack/compute/contrib/instance_usage_audit_log.py b/nova/api/openstack/compute/contrib/instance_usage_audit_log.py index 5e4c2c0d01..7baea795ff 100644 --- a/nova/api/openstack/compute/contrib/instance_usage_audit_log.py +++ b/nova/api/openstack/compute/contrib/instance_usage_audit_log.py @@ -16,7 +16,7 @@ import datetime -from oslo.config import cfg +from oslo_config import cfg import webob.exc from nova.api.openstack import extensions diff --git a/nova/api/openstack/compute/contrib/os_tenant_networks.py b/nova/api/openstack/compute/contrib/os_tenant_networks.py index 8925017d73..c582416934 100644 --- a/nova/api/openstack/compute/contrib/os_tenant_networks.py +++ b/nova/api/openstack/compute/contrib/os_tenant_networks.py @@ -16,7 +16,7 @@ import netaddr import netaddr.core as netexc -from oslo.config import cfg +from oslo_config import cfg import six import webob from webob import exc diff --git a/nova/api/openstack/compute/contrib/quotas.py b/nova/api/openstack/compute/contrib/quotas.py index 6c0af03c70..5faf996bb5 100644 --- a/nova/api/openstack/compute/contrib/quotas.py +++ b/nova/api/openstack/compute/contrib/quotas.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.utils import strutils +from oslo_utils import strutils import six.moves.urllib.parse as urlparse import webob diff --git a/nova/api/openstack/compute/contrib/rescue.py b/nova/api/openstack/compute/contrib/rescue.py index 102b42297c..cf8e879d2d 100644 --- a/nova/api/openstack/compute/contrib/rescue.py +++ b/nova/api/openstack/compute/contrib/rescue.py @@ -14,7 +14,7 @@ """The rescue mode extension.""" -from oslo.config import cfg +from oslo_config import cfg import webob from webob import exc diff --git a/nova/api/openstack/compute/contrib/security_groups.py b/nova/api/openstack/compute/contrib/security_groups.py index d3a17cda2d..7a2a34231d 100644 --- a/nova/api/openstack/compute/contrib/security_groups.py +++ b/nova/api/openstack/compute/contrib/security_groups.py @@ -19,7 +19,7 @@ import contextlib from xml.dom import minidom -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils import six import webob from webob import exc diff --git a/nova/api/openstack/compute/contrib/simple_tenant_usage.py b/nova/api/openstack/compute/contrib/simple_tenant_usage.py index 5356b29826..b70a76bdaa 100644 --- a/nova/api/openstack/compute/contrib/simple_tenant_usage.py +++ b/nova/api/openstack/compute/contrib/simple_tenant_usage.py @@ -16,7 +16,7 @@ import datetime import iso8601 -from oslo.utils import timeutils +from oslo_utils import timeutils import six import six.moves.urllib.parse as urlparse from webob import exc diff --git a/nova/api/openstack/compute/contrib/volumes.py b/nova/api/openstack/compute/contrib/volumes.py index 11c6f502c5..9eca0afd20 100644 --- a/nova/api/openstack/compute/contrib/volumes.py +++ b/nova/api/openstack/compute/contrib/volumes.py @@ -15,7 +15,7 @@ """The volumes extension.""" -from oslo.utils import strutils +from oslo_utils import strutils import webob from webob import exc diff --git a/nova/api/openstack/compute/extensions.py b/nova/api/openstack/compute/extensions.py index cd5c53a4a9..2f48277f60 100644 --- a/nova/api/openstack/compute/extensions.py +++ b/nova/api/openstack/compute/extensions.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.config import cfg +from oslo_config import cfg from nova.api.openstack import extensions as base_extensions from nova.openstack.common import log as logging diff --git a/nova/api/openstack/compute/flavors.py b/nova/api/openstack/compute/flavors.py index c9c5a29faf..ed47389f4d 100644 --- a/nova/api/openstack/compute/flavors.py +++ b/nova/api/openstack/compute/flavors.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.utils import strutils +from oslo_utils import strutils import webob from nova.api.openstack import common diff --git a/nova/api/openstack/compute/limits.py b/nova/api/openstack/compute/limits.py index 4c586af25d..13d1111bde 100644 --- a/nova/api/openstack/compute/limits.py +++ b/nova/api/openstack/compute/limits.py @@ -38,8 +38,8 @@ import math import re import time -from oslo.serialization import jsonutils -from oslo.utils import importutils +from oslo_serialization import jsonutils +from oslo_utils import importutils import webob.dec import webob.exc diff --git a/nova/api/openstack/compute/plugins/v3/assisted_volume_snapshots.py b/nova/api/openstack/compute/plugins/v3/assisted_volume_snapshots.py index a19dd940dc..f9cae99599 100644 --- a/nova/api/openstack/compute/plugins/v3/assisted_volume_snapshots.py +++ b/nova/api/openstack/compute/plugins/v3/assisted_volume_snapshots.py @@ -16,7 +16,7 @@ """The Assisted volume snapshots extension.""" -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils import six from webob import exc diff --git a/nova/api/openstack/compute/plugins/v3/availability_zone.py b/nova/api/openstack/compute/plugins/v3/availability_zone.py index 8d0c344f59..f101fe7791 100644 --- a/nova/api/openstack/compute/plugins/v3/availability_zone.py +++ b/nova/api/openstack/compute/plugins/v3/availability_zone.py @@ -12,7 +12,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.config import cfg +from oslo_config import cfg from nova.api.openstack.compute.schemas.v3 import availability_zone as schema from nova.api.openstack import extensions diff --git a/nova/api/openstack/compute/plugins/v3/baremetal_nodes.py b/nova/api/openstack/compute/plugins/v3/baremetal_nodes.py index 5574591d82..d7fc264ff0 100644 --- a/nova/api/openstack/compute/plugins/v3/baremetal_nodes.py +++ b/nova/api/openstack/compute/plugins/v3/baremetal_nodes.py @@ -16,8 +16,8 @@ """The bare-metal admin extension.""" -from oslo.config import cfg -from oslo.utils import importutils +from oslo_config import cfg +from oslo_utils import importutils import webob from nova.api.openstack import extensions diff --git a/nova/api/openstack/compute/plugins/v3/block_device_mapping_v1.py b/nova/api/openstack/compute/plugins/v3/block_device_mapping_v1.py index c48535808b..1a1440bd7c 100644 --- a/nova/api/openstack/compute/plugins/v3/block_device_mapping_v1.py +++ b/nova/api/openstack/compute/plugins/v3/block_device_mapping_v1.py @@ -15,7 +15,7 @@ """The legacy block device mappings extension.""" -from oslo.utils import strutils +from oslo_utils import strutils from webob import exc from nova.api.openstack.compute.schemas.v3 import block_device_mapping_v1 as \ diff --git a/nova/api/openstack/compute/plugins/v3/cells.py b/nova/api/openstack/compute/plugins/v3/cells.py index 317e45a505..275bf88c06 100644 --- a/nova/api/openstack/compute/plugins/v3/cells.py +++ b/nova/api/openstack/compute/plugins/v3/cells.py @@ -16,9 +16,9 @@ """The cells extension.""" -from oslo.config import cfg -from oslo import messaging -from oslo.utils import strutils +from oslo_config import cfg +import oslo_messaging as messaging +from oslo_utils import strutils import six from webob import exc diff --git a/nova/api/openstack/compute/plugins/v3/cloudpipe.py b/nova/api/openstack/compute/plugins/v3/cloudpipe.py index 76f598719c..21d9de4cc9 100644 --- a/nova/api/openstack/compute/plugins/v3/cloudpipe.py +++ b/nova/api/openstack/compute/plugins/v3/cloudpipe.py @@ -14,8 +14,8 @@ """Connect your vlan to the world.""" -from oslo.config import cfg -from oslo.utils import timeutils +from oslo_config import cfg +from oslo_utils import timeutils from webob import exc from nova.api.openstack.compute.schemas.v3 import cloudpipe diff --git a/nova/api/openstack/compute/plugins/v3/disk_config.py b/nova/api/openstack/compute/plugins/v3/disk_config.py index e5a58660de..bbe892ba1d 100644 --- a/nova/api/openstack/compute/plugins/v3/disk_config.py +++ b/nova/api/openstack/compute/plugins/v3/disk_config.py @@ -14,7 +14,7 @@ """Disk Config extension.""" -from oslo.utils import strutils +from oslo_utils import strutils from webob import exc from nova.api.openstack.compute.schemas.v3 import disk_config diff --git a/nova/api/openstack/compute/plugins/v3/evacuate.py b/nova/api/openstack/compute/plugins/v3/evacuate.py index b52f042acf..2f709c5b84 100644 --- a/nova/api/openstack/compute/plugins/v3/evacuate.py +++ b/nova/api/openstack/compute/plugins/v3/evacuate.py @@ -13,8 +13,8 @@ # under the License. -from oslo.config import cfg -from oslo.utils import strutils +from oslo_config import cfg +from oslo_utils import strutils from webob import exc from nova.api.openstack import common diff --git a/nova/api/openstack/compute/plugins/v3/flavors.py b/nova/api/openstack/compute/plugins/v3/flavors.py index 8fbefd8775..f93a421033 100644 --- a/nova/api/openstack/compute/plugins/v3/flavors.py +++ b/nova/api/openstack/compute/plugins/v3/flavors.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.utils import strutils +from oslo_utils import strutils import webob from nova.api.openstack import common diff --git a/nova/api/openstack/compute/plugins/v3/floating_ip_dns.py b/nova/api/openstack/compute/plugins/v3/floating_ip_dns.py index 9f9f54dae5..518b72c5b4 100644 --- a/nova/api/openstack/compute/plugins/v3/floating_ip_dns.py +++ b/nova/api/openstack/compute/plugins/v3/floating_ip_dns.py @@ -14,7 +14,7 @@ import urllib -from oslo.utils import netutils +from oslo_utils import netutils import webob from nova.api.openstack.compute.schemas.v3 import floating_ip_dns diff --git a/nova/api/openstack/compute/plugins/v3/floating_ips_bulk.py b/nova/api/openstack/compute/plugins/v3/floating_ips_bulk.py index bd76b59a75..ef509e6950 100644 --- a/nova/api/openstack/compute/plugins/v3/floating_ips_bulk.py +++ b/nova/api/openstack/compute/plugins/v3/floating_ips_bulk.py @@ -13,7 +13,7 @@ # under the License. import netaddr -from oslo.config import cfg +from oslo_config import cfg import six import webob.exc diff --git a/nova/api/openstack/compute/plugins/v3/fping.py b/nova/api/openstack/compute/plugins/v3/fping.py index 2bd08eacf7..ddd5f2213e 100644 --- a/nova/api/openstack/compute/plugins/v3/fping.py +++ b/nova/api/openstack/compute/plugins/v3/fping.py @@ -17,7 +17,7 @@ import itertools import os -from oslo.config import cfg +from oslo_config import cfg from webob import exc from nova.api.openstack import common diff --git a/nova/api/openstack/compute/plugins/v3/hide_server_addresses.py b/nova/api/openstack/compute/plugins/v3/hide_server_addresses.py index 1d4f9df8b9..178f10c97b 100644 --- a/nova/api/openstack/compute/plugins/v3/hide_server_addresses.py +++ b/nova/api/openstack/compute/plugins/v3/hide_server_addresses.py @@ -15,7 +15,7 @@ """Extension for hiding server addresses in certain states.""" -from oslo.config import cfg +from oslo_config import cfg from nova.api.openstack import extensions from nova.api.openstack import wsgi diff --git a/nova/api/openstack/compute/plugins/v3/instance_usage_audit_log.py b/nova/api/openstack/compute/plugins/v3/instance_usage_audit_log.py index 8305b8d03b..247dc89071 100644 --- a/nova/api/openstack/compute/plugins/v3/instance_usage_audit_log.py +++ b/nova/api/openstack/compute/plugins/v3/instance_usage_audit_log.py @@ -16,7 +16,7 @@ import datetime -from oslo.config import cfg +from oslo_config import cfg import webob.exc from nova.api.openstack import extensions diff --git a/nova/api/openstack/compute/plugins/v3/migrate_server.py b/nova/api/openstack/compute/plugins/v3/migrate_server.py index 6cc18d72b9..b2028cbb54 100644 --- a/nova/api/openstack/compute/plugins/v3/migrate_server.py +++ b/nova/api/openstack/compute/plugins/v3/migrate_server.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.utils import strutils +from oslo_utils import strutils from webob import exc from nova.api.openstack import common diff --git a/nova/api/openstack/compute/plugins/v3/pci.py b/nova/api/openstack/compute/plugins/v3/pci.py index db8a060b48..7af2dae44d 100644 --- a/nova/api/openstack/compute/plugins/v3/pci.py +++ b/nova/api/openstack/compute/plugins/v3/pci.py @@ -14,7 +14,7 @@ # under the License. -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils import webob.exc from nova.api.openstack import extensions diff --git a/nova/api/openstack/compute/plugins/v3/quota_sets.py b/nova/api/openstack/compute/plugins/v3/quota_sets.py index dabda37963..4e87b18082 100644 --- a/nova/api/openstack/compute/plugins/v3/quota_sets.py +++ b/nova/api/openstack/compute/plugins/v3/quota_sets.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.utils import strutils +from oslo_utils import strutils import six.moves.urllib.parse as urlparse import webob diff --git a/nova/api/openstack/compute/plugins/v3/rescue.py b/nova/api/openstack/compute/plugins/v3/rescue.py index fc75914156..b3dcca9bdd 100644 --- a/nova/api/openstack/compute/plugins/v3/rescue.py +++ b/nova/api/openstack/compute/plugins/v3/rescue.py @@ -14,7 +14,7 @@ """The rescue mode extension.""" -from oslo.config import cfg +from oslo_config import cfg from webob import exc from nova.api.openstack import common diff --git a/nova/api/openstack/compute/plugins/v3/security_groups.py b/nova/api/openstack/compute/plugins/v3/security_groups.py index 54b224fc36..cbe8a966b7 100644 --- a/nova/api/openstack/compute/plugins/v3/security_groups.py +++ b/nova/api/openstack/compute/plugins/v3/security_groups.py @@ -15,7 +15,7 @@ # under the License. """The security groups extension.""" -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils from webob import exc from nova.api.openstack import common diff --git a/nova/api/openstack/compute/plugins/v3/servers.py b/nova/api/openstack/compute/plugins/v3/servers.py index 09f5e82ef9..f4e0a18f14 100644 --- a/nova/api/openstack/compute/plugins/v3/servers.py +++ b/nova/api/openstack/compute/plugins/v3/servers.py @@ -17,10 +17,10 @@ import base64 import re -from oslo.config import cfg -from oslo import messaging -from oslo.utils import strutils -from oslo.utils import timeutils +from oslo_config import cfg +import oslo_messaging as messaging +from oslo_utils import strutils +from oslo_utils import timeutils import six import stevedore import webob diff --git a/nova/api/openstack/compute/plugins/v3/simple_tenant_usage.py b/nova/api/openstack/compute/plugins/v3/simple_tenant_usage.py index 024fe8e653..bbcfb4bec5 100644 --- a/nova/api/openstack/compute/plugins/v3/simple_tenant_usage.py +++ b/nova/api/openstack/compute/plugins/v3/simple_tenant_usage.py @@ -16,7 +16,7 @@ import datetime import iso8601 -from oslo.utils import timeutils +from oslo_utils import timeutils import six import six.moves.urllib.parse as urlparse from webob import exc diff --git a/nova/api/openstack/compute/plugins/v3/tenant_networks.py b/nova/api/openstack/compute/plugins/v3/tenant_networks.py index 1218cbd16a..a32c5af52d 100644 --- a/nova/api/openstack/compute/plugins/v3/tenant_networks.py +++ b/nova/api/openstack/compute/plugins/v3/tenant_networks.py @@ -16,7 +16,7 @@ import netaddr import netaddr.core as netexc -from oslo.config import cfg +from oslo_config import cfg import six from webob import exc diff --git a/nova/api/openstack/compute/plugins/v3/volumes.py b/nova/api/openstack/compute/plugins/v3/volumes.py index be30179a57..82226b937b 100644 --- a/nova/api/openstack/compute/plugins/v3/volumes.py +++ b/nova/api/openstack/compute/plugins/v3/volumes.py @@ -15,7 +15,7 @@ """The volumes extension.""" -from oslo.utils import strutils +from oslo_utils import strutils from webob import exc from nova.api.openstack import common diff --git a/nova/api/openstack/compute/servers.py b/nova/api/openstack/compute/servers.py index 14fd88cb19..8f77783f93 100644 --- a/nova/api/openstack/compute/servers.py +++ b/nova/api/openstack/compute/servers.py @@ -19,11 +19,11 @@ import os import re import sys -from oslo.config import cfg -from oslo import messaging -from oslo.utils import netutils -from oslo.utils import strutils -from oslo.utils import timeutils +from oslo_config import cfg +import oslo_messaging as messaging +from oslo_utils import netutils +from oslo_utils import strutils +from oslo_utils import timeutils import six import webob from webob import exc diff --git a/nova/api/openstack/compute/versions.py b/nova/api/openstack/compute/versions.py index ededd05c22..6813d48fa0 100644 --- a/nova/api/openstack/compute/versions.py +++ b/nova/api/openstack/compute/versions.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.config import cfg +from oslo_config import cfg from nova.api.openstack.compute.views import versions as views_versions from nova.api.openstack import wsgi diff --git a/nova/api/openstack/compute/views/images.py b/nova/api/openstack/compute/views/images.py index a4ad323c31..587807c4d6 100644 --- a/nova/api/openstack/compute/views/images.py +++ b/nova/api/openstack/compute/views/images.py @@ -14,7 +14,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.utils import timeutils +from oslo_utils import timeutils from nova.api.openstack import common from nova.image import glance diff --git a/nova/api/openstack/compute/views/limits.py b/nova/api/openstack/compute/views/limits.py index 2396a067b1..431721f2b9 100644 --- a/nova/api/openstack/compute/views/limits.py +++ b/nova/api/openstack/compute/views/limits.py @@ -15,7 +15,7 @@ import datetime -from oslo.utils import timeutils +from oslo_utils import timeutils class ViewBuilder(object): diff --git a/nova/api/openstack/compute/views/servers.py b/nova/api/openstack/compute/views/servers.py index fccb90f692..d0518f8531 100644 --- a/nova/api/openstack/compute/views/servers.py +++ b/nova/api/openstack/compute/views/servers.py @@ -16,7 +16,7 @@ import hashlib -from oslo.utils import timeutils +from oslo_utils import timeutils from nova.api.openstack import common from nova.api.openstack.compute.views import addresses as views_addresses diff --git a/nova/api/openstack/extensions.py b/nova/api/openstack/extensions.py index 49f22ab18e..bf6165b4ab 100644 --- a/nova/api/openstack/extensions.py +++ b/nova/api/openstack/extensions.py @@ -18,7 +18,7 @@ import abc import functools import os -from oslo.utils import importutils +from oslo_utils import importutils import six import webob.dec import webob.exc diff --git a/nova/api/openstack/wsgi.py b/nova/api/openstack/wsgi.py index 9c6f99b498..c73e76ea60 100644 --- a/nova/api/openstack/wsgi.py +++ b/nova/api/openstack/wsgi.py @@ -19,8 +19,8 @@ import inspect import math import time -from oslo.serialization import jsonutils -from oslo.utils import strutils +from oslo_serialization import jsonutils +from oslo_utils import strutils import six import webob diff --git a/nova/api/sizelimit.py b/nova/api/sizelimit.py index a563a7d2d6..0d8587d824 100644 --- a/nova/api/sizelimit.py +++ b/nova/api/sizelimit.py @@ -15,7 +15,7 @@ Request Body limiting middleware. """ -from oslo.middleware import sizelimit +from oslo_middleware import sizelimit # TODO(ekudryashova): Remove below aliases when grenade jobs diff --git a/nova/api/validation/validators.py b/nova/api/validation/validators.py index 6e74b8712a..e775eb94a0 100644 --- a/nova/api/validation/validators.py +++ b/nova/api/validation/validators.py @@ -21,7 +21,7 @@ import re import jsonschema import netaddr -from oslo.utils import timeutils +from oslo_utils import timeutils import rfc3986 import six diff --git a/nova/availability_zones.py b/nova/availability_zones.py index a9483192da..7389605d68 100644 --- a/nova/availability_zones.py +++ b/nova/availability_zones.py @@ -17,7 +17,7 @@ import collections -from oslo.config import cfg +from oslo_config import cfg from nova import objects from nova.openstack.common import memorycache diff --git a/nova/baserpc.py b/nova/baserpc.py index c794141a0d..95336a9da6 100644 --- a/nova/baserpc.py +++ b/nova/baserpc.py @@ -18,9 +18,9 @@ Base RPC client and server common to all services. """ -from oslo.config import cfg -from oslo import messaging -from oslo.serialization import jsonutils +from oslo_config import cfg +import oslo_messaging as messaging +from oslo_serialization import jsonutils from nova import rpc diff --git a/nova/block_device.py b/nova/block_device.py index 085466be9d..27f93386ba 100644 --- a/nova/block_device.py +++ b/nova/block_device.py @@ -15,8 +15,8 @@ import re -from oslo.config import cfg -from oslo.utils import strutils +from oslo_config import cfg +from oslo_utils import strutils from nova import exception from nova.i18n import _ diff --git a/nova/cells/manager.py b/nova/cells/manager.py index 2280301762..3cef250960 100644 --- a/nova/cells/manager.py +++ b/nova/cells/manager.py @@ -19,10 +19,10 @@ Cells Service Manager import datetime import time -from oslo.config import cfg -from oslo import messaging as oslo_messaging -from oslo.utils import importutils -from oslo.utils import timeutils +from oslo_config import cfg +import oslo_messaging +from oslo_utils import importutils +from oslo_utils import timeutils from nova.cells import messaging from nova.cells import state as cells_state diff --git a/nova/cells/messaging.py b/nova/cells/messaging.py index 7918530023..834da7e1ce 100644 --- a/nova/cells/messaging.py +++ b/nova/cells/messaging.py @@ -30,12 +30,12 @@ import sys import traceback from eventlet import queue -from oslo.config import cfg -from oslo import messaging -from oslo.serialization import jsonutils -from oslo.utils import excutils -from oslo.utils import importutils -from oslo.utils import timeutils +from oslo_config import cfg +import oslo_messaging as messaging +from oslo_serialization import jsonutils +from oslo_utils import excutils +from oslo_utils import importutils +from oslo_utils import timeutils import six from nova.cells import state as cells_state diff --git a/nova/cells/opts.py b/nova/cells/opts.py index cb1dfe52da..b46ab3319d 100644 --- a/nova/cells/opts.py +++ b/nova/cells/opts.py @@ -16,7 +16,7 @@ Global cells config options """ -from oslo.config import cfg +from oslo_config import cfg cells_opts = [ diff --git a/nova/cells/rpc_driver.py b/nova/cells/rpc_driver.py index 568d677fc5..62209a30fb 100644 --- a/nova/cells/rpc_driver.py +++ b/nova/cells/rpc_driver.py @@ -17,8 +17,8 @@ """ Cells RPC Communication Driver """ -from oslo.config import cfg -from oslo import messaging +from oslo_config import cfg +import oslo_messaging as messaging from nova.cells import driver from nova import rpc diff --git a/nova/cells/rpcapi.py b/nova/cells/rpcapi.py index a0a500670b..185b7507bd 100644 --- a/nova/cells/rpcapi.py +++ b/nova/cells/rpcapi.py @@ -23,9 +23,9 @@ services. That communication is handled by the cells driver via the messging module. """ -from oslo.config import cfg -from oslo import messaging -from oslo.serialization import jsonutils +from oslo_config import cfg +import oslo_messaging as messaging +from oslo_serialization import jsonutils from nova import exception from nova.i18n import _LE diff --git a/nova/cells/scheduler.py b/nova/cells/scheduler.py index fd209a0fc4..e25e1494e0 100644 --- a/nova/cells/scheduler.py +++ b/nova/cells/scheduler.py @@ -19,7 +19,7 @@ Cells Scheduler import copy import time -from oslo.config import cfg +from oslo_config import cfg from nova.cells import filters from nova.cells import weights diff --git a/nova/cells/state.py b/nova/cells/state.py index 326218ce3b..a14bbfffe2 100644 --- a/nova/cells/state.py +++ b/nova/cells/state.py @@ -21,11 +21,11 @@ import datetime import functools import time -from oslo.config import cfg -from oslo.db import exception as db_exc -from oslo.serialization import jsonutils -from oslo.utils import timeutils -from oslo.utils import units +from oslo_config import cfg +from oslo_db import exception as db_exc +from oslo_serialization import jsonutils +from oslo_utils import timeutils +from oslo_utils import units from nova.cells import rpc_driver from nova import context diff --git a/nova/cells/weights/mute_child.py b/nova/cells/weights/mute_child.py index 72b78c0c10..874bc3b29e 100644 --- a/nova/cells/weights/mute_child.py +++ b/nova/cells/weights/mute_child.py @@ -18,8 +18,8 @@ If a child cell hasn't sent capacity or capability updates in a while, downgrade its likelihood of being chosen for scheduling requests. """ -from oslo.config import cfg -from oslo.utils import timeutils +from oslo_config import cfg +from oslo_utils import timeutils from nova.cells import weights from nova.i18n import _LW diff --git a/nova/cells/weights/ram_by_instance_type.py b/nova/cells/weights/ram_by_instance_type.py index 1185f39571..fb54edefb9 100644 --- a/nova/cells/weights/ram_by_instance_type.py +++ b/nova/cells/weights/ram_by_instance_type.py @@ -16,7 +16,7 @@ """ Weigh cells by memory needed in a way that spreads instances. """ -from oslo.config import cfg +from oslo_config import cfg from nova.cells import weights diff --git a/nova/cells/weights/weight_offset.py b/nova/cells/weights/weight_offset.py index e8797b0a53..01ff35ed1e 100644 --- a/nova/cells/weights/weight_offset.py +++ b/nova/cells/weights/weight_offset.py @@ -18,7 +18,7 @@ Weigh cells by their weight_offset in the DB. Cells with higher weight_offsets in the DB will be preferred. """ -from oslo.config import cfg +from oslo_config import cfg from nova.cells import weights diff --git a/nova/cert/manager.py b/nova/cert/manager.py index 795488f529..f986a51525 100644 --- a/nova/cert/manager.py +++ b/nova/cert/manager.py @@ -24,7 +24,7 @@ Cert manager manages x509 certificates. import base64 -from oslo import messaging +import oslo_messaging as messaging from nova import crypto from nova import manager diff --git a/nova/cert/rpcapi.py b/nova/cert/rpcapi.py index 48cdd0ea21..570707add8 100644 --- a/nova/cert/rpcapi.py +++ b/nova/cert/rpcapi.py @@ -16,8 +16,8 @@ Client side of the cert manager RPC API. """ -from oslo.config import cfg -from oslo import messaging +from oslo_config import cfg +import oslo_messaging as messaging from nova import rpc diff --git a/nova/cloudpipe/pipelib.py b/nova/cloudpipe/pipelib.py index 0bc929b77f..0d7f5bd6f8 100644 --- a/nova/cloudpipe/pipelib.py +++ b/nova/cloudpipe/pipelib.py @@ -24,7 +24,7 @@ import os import string import zipfile -from oslo.config import cfg +from oslo_config import cfg from nova import compute from nova.compute import flavors diff --git a/nova/cmd/all.py b/nova/cmd/all.py index c4ce244b92..a362be4d18 100644 --- a/nova/cmd/all.py +++ b/nova/cmd/all.py @@ -26,7 +26,7 @@ continue attempting to launch the rest of the services. import sys -from oslo.config import cfg +from oslo_config import cfg from nova import config from nova.i18n import _LE diff --git a/nova/cmd/api.py b/nova/cmd/api.py index 8b94beaeb3..25548cddb4 100644 --- a/nova/cmd/api.py +++ b/nova/cmd/api.py @@ -22,7 +22,7 @@ Starts both the EC2 and OpenStack APIs in separate greenthreads. import sys -from oslo.config import cfg +from oslo_config import cfg from nova import config from nova import objects diff --git a/nova/cmd/api_ec2.py b/nova/cmd/api_ec2.py index 65b4de9e47..bf8c0436d0 100644 --- a/nova/cmd/api_ec2.py +++ b/nova/cmd/api_ec2.py @@ -18,7 +18,7 @@ import sys -from oslo.config import cfg +from oslo_config import cfg from nova import config from nova import objects diff --git a/nova/cmd/api_metadata.py b/nova/cmd/api_metadata.py index bcbd8ac3e1..bb14e67cc9 100644 --- a/nova/cmd/api_metadata.py +++ b/nova/cmd/api_metadata.py @@ -18,7 +18,7 @@ import sys -from oslo.config import cfg +from oslo_config import cfg from nova.conductor import rpcapi as conductor_rpcapi from nova import config diff --git a/nova/cmd/api_os_compute.py b/nova/cmd/api_os_compute.py index 89aec67440..27d38f853b 100644 --- a/nova/cmd/api_os_compute.py +++ b/nova/cmd/api_os_compute.py @@ -18,7 +18,7 @@ import sys -from oslo.config import cfg +from oslo_config import cfg from nova import config from nova import objects diff --git a/nova/cmd/baseproxy.py b/nova/cmd/baseproxy.py index 208db4d5a1..8e52788a8f 100644 --- a/nova/cmd/baseproxy.py +++ b/nova/cmd/baseproxy.py @@ -20,7 +20,7 @@ for Openstack Nova.""" import os import sys -from oslo.config import cfg +from oslo_config import cfg from nova import config from nova.console import websocketproxy diff --git a/nova/cmd/cells.py b/nova/cmd/cells.py index 5cf85dc3a5..744529e8ce 100644 --- a/nova/cmd/cells.py +++ b/nova/cmd/cells.py @@ -17,7 +17,7 @@ import sys -from oslo.config import cfg +from oslo_config import cfg from nova import config from nova import objects diff --git a/nova/cmd/cert.py b/nova/cmd/cert.py index b260322ad4..09de2b509e 100644 --- a/nova/cmd/cert.py +++ b/nova/cmd/cert.py @@ -16,7 +16,7 @@ import sys -from oslo.config import cfg +from oslo_config import cfg from nova import config from nova.openstack.common import log as logging diff --git a/nova/cmd/compute.py b/nova/cmd/compute.py index 8555d8f104..fd40a3a4dc 100644 --- a/nova/cmd/compute.py +++ b/nova/cmd/compute.py @@ -19,7 +19,7 @@ import sys import traceback -from oslo.config import cfg +from oslo_config import cfg from nova.conductor import rpcapi as conductor_rpcapi from nova import config diff --git a/nova/cmd/conductor.py b/nova/cmd/conductor.py index d7e2071820..26861e88a3 100644 --- a/nova/cmd/conductor.py +++ b/nova/cmd/conductor.py @@ -16,8 +16,8 @@ import sys -from oslo.config import cfg from oslo_concurrency import processutils +from oslo_config import cfg from nova import config from nova import objects diff --git a/nova/cmd/console.py b/nova/cmd/console.py index 4e40780ef1..9b7ba3fd4b 100644 --- a/nova/cmd/console.py +++ b/nova/cmd/console.py @@ -17,7 +17,7 @@ import sys -from oslo.config import cfg +from oslo_config import cfg from nova import config from nova.openstack.common import log as logging diff --git a/nova/cmd/consoleauth.py b/nova/cmd/consoleauth.py index 238007ffc9..99b9e46c5f 100644 --- a/nova/cmd/consoleauth.py +++ b/nova/cmd/consoleauth.py @@ -17,7 +17,7 @@ import sys -from oslo.config import cfg +from oslo_config import cfg from nova import config from nova import objects diff --git a/nova/cmd/dhcpbridge.py b/nova/cmd/dhcpbridge.py index dbc1d7f7c7..1971af4a5d 100644 --- a/nova/cmd/dhcpbridge.py +++ b/nova/cmd/dhcpbridge.py @@ -24,9 +24,9 @@ import os import sys import traceback -from oslo.config import cfg -from oslo.serialization import jsonutils -from oslo.utils import importutils +from oslo_config import cfg +from oslo_serialization import jsonutils +from oslo_utils import importutils from nova.conductor import rpcapi as conductor_rpcapi from nova import config diff --git a/nova/cmd/manage.py b/nova/cmd/manage.py index ea07b40bdd..753a975db4 100644 --- a/nova/cmd/manage.py +++ b/nova/cmd/manage.py @@ -60,9 +60,9 @@ import sys import decorator import netaddr -from oslo.config import cfg -from oslo import messaging -from oslo.utils import importutils +from oslo_config import cfg +import oslo_messaging as messaging +from oslo_utils import importutils import six from nova.api.ec2 import ec2utils diff --git a/nova/cmd/network.py b/nova/cmd/network.py index c6e0d0cf61..f28fbb098a 100644 --- a/nova/cmd/network.py +++ b/nova/cmd/network.py @@ -19,7 +19,7 @@ import sys import traceback -from oslo.config import cfg +from oslo_config import cfg from nova.conductor import rpcapi as conductor_rpcapi from nova import config diff --git a/nova/cmd/novnc.py b/nova/cmd/novnc.py index ea143746bc..dc96e2fac1 100644 --- a/nova/cmd/novnc.py +++ b/nova/cmd/novnc.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.config import cfg +from oslo_config import cfg opts = [ cfg.BoolOpt('record', diff --git a/nova/cmd/novncproxy.py b/nova/cmd/novncproxy.py index caf63c97df..e7dc1fa010 100644 --- a/nova/cmd/novncproxy.py +++ b/nova/cmd/novncproxy.py @@ -18,7 +18,7 @@ Websocket proxy that is compatible with OpenStack Nova noVNC consoles. Leverages websockify.py by Joel Martin """ -from oslo.config import cfg +from oslo_config import cfg from nova.cmd import baseproxy diff --git a/nova/cmd/scheduler.py b/nova/cmd/scheduler.py index ad2f9dad9e..6c57dcef8f 100644 --- a/nova/cmd/scheduler.py +++ b/nova/cmd/scheduler.py @@ -18,7 +18,7 @@ import sys -from oslo.config import cfg +from oslo_config import cfg from nova import config from nova import objects diff --git a/nova/cmd/serialproxy.py b/nova/cmd/serialproxy.py index c6b5d0e155..e12361f42a 100644 --- a/nova/cmd/serialproxy.py +++ b/nova/cmd/serialproxy.py @@ -18,7 +18,7 @@ Serial consoles. Leverages websockify.py by Joel Martin. Based on nova-novncproxy. """ -from oslo.config import cfg +from oslo_config import cfg from nova.cmd import baseproxy diff --git a/nova/cmd/spicehtml5proxy.py b/nova/cmd/spicehtml5proxy.py index 7808aa6dcd..efb7a5a139 100644 --- a/nova/cmd/spicehtml5proxy.py +++ b/nova/cmd/spicehtml5proxy.py @@ -18,7 +18,7 @@ Websocket proxy that is compatible with OpenStack Nova SPICE HTML5 consoles. Leverages websockify.py by Joel Martin """ -from oslo.config import cfg +from oslo_config import cfg from nova.cmd import baseproxy diff --git a/nova/compute/__init__.py b/nova/compute/__init__.py index 38880b7bd4..feb11b0c62 100644 --- a/nova/compute/__init__.py +++ b/nova/compute/__init__.py @@ -14,7 +14,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.utils import importutils +from oslo_utils import importutils # Importing full names to not pollute the namespace and cause possible # collisions with use of 'from nova.compute import <foo>' elsewhere. diff --git a/nova/compute/api.py b/nova/compute/api.py index d1b510cc41..d08decfef3 100644 --- a/nova/compute/api.py +++ b/nova/compute/api.py @@ -25,12 +25,12 @@ import re import string import uuid -from oslo.config import cfg -from oslo.serialization import jsonutils -from oslo.utils import excutils -from oslo.utils import strutils -from oslo.utils import timeutils -from oslo.utils import units +from oslo_config import cfg +from oslo_serialization import jsonutils +from oslo_utils import excutils +from oslo_utils import strutils +from oslo_utils import timeutils +from oslo_utils import units import six from nova import availability_zones diff --git a/nova/compute/cells_api.py b/nova/compute/cells_api.py index d04ad30a02..8e9081af0f 100644 --- a/nova/compute/cells_api.py +++ b/nova/compute/cells_api.py @@ -16,7 +16,7 @@ """Compute API that proxies via Cells Service.""" -from oslo import messaging +import oslo_messaging as messaging from nova import availability_zones from nova import block_device diff --git a/nova/compute/claims.py b/nova/compute/claims.py index 1cb03779d7..e0e31caa4a 100644 --- a/nova/compute/claims.py +++ b/nova/compute/claims.py @@ -17,7 +17,7 @@ Claim objects for use with resource tracking. """ -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils from nova import context from nova import exception diff --git a/nova/compute/flavors.py b/nova/compute/flavors.py index 4b3224744d..f2b59ca95c 100644 --- a/nova/compute/flavors.py +++ b/nova/compute/flavors.py @@ -21,8 +21,8 @@ import re import uuid -from oslo.config import cfg -from oslo.utils import strutils +from oslo_config import cfg +from oslo_utils import strutils import six from nova.api.validation import parameter_types diff --git a/nova/compute/manager.py b/nova/compute/manager.py index 0130cfe3c7..53e57defb5 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -40,12 +40,12 @@ from eventlet import greenthread import eventlet.semaphore import eventlet.timeout from keystoneclient import exceptions as keystone_exception -from oslo.config import cfg -from oslo import messaging -from oslo.serialization import jsonutils -from oslo.utils import excutils -from oslo.utils import strutils -from oslo.utils import timeutils +from oslo_config import cfg +import oslo_messaging as messaging +from oslo_serialization import jsonutils +from oslo_utils import excutils +from oslo_utils import strutils +from oslo_utils import timeutils import six from nova import block_device diff --git a/nova/compute/monitors/__init__.py b/nova/compute/monitors/__init__.py index e6435e3e30..360b27dbec 100644 --- a/nova/compute/monitors/__init__.py +++ b/nova/compute/monitors/__init__.py @@ -23,8 +23,8 @@ that needs to be implemented by Resource Monitor. import functools import types -from oslo.config import cfg -from oslo.utils import timeutils +from oslo_config import cfg +from oslo_utils import timeutils import six from nova.i18n import _, _LW diff --git a/nova/compute/monitors/virt/cpu_monitor.py b/nova/compute/monitors/virt/cpu_monitor.py index 691210b2dc..06b1606994 100644 --- a/nova/compute/monitors/virt/cpu_monitor.py +++ b/nova/compute/monitors/virt/cpu_monitor.py @@ -17,8 +17,8 @@ CPU monitor based on compute driver to retrieve CPU information """ -from oslo.config import cfg -from oslo.utils import timeutils +from oslo_config import cfg +from oslo_utils import timeutils from nova.compute import monitors from nova.compute.monitors import cpu_monitor as monitor diff --git a/nova/compute/resource_tracker.py b/nova/compute/resource_tracker.py index d44f0ed4d5..84b376245e 100644 --- a/nova/compute/resource_tracker.py +++ b/nova/compute/resource_tracker.py @@ -20,9 +20,9 @@ model. """ import copy -from oslo.config import cfg -from oslo.serialization import jsonutils -from oslo.utils import importutils +from oslo_config import cfg +from oslo_serialization import jsonutils +from oslo_utils import importutils from nova.compute import claims from nova.compute import flavors diff --git a/nova/compute/rpcapi.py b/nova/compute/rpcapi.py index b2fdb6d386..c1b3c41626 100644 --- a/nova/compute/rpcapi.py +++ b/nova/compute/rpcapi.py @@ -16,9 +16,9 @@ Client side of the compute RPC API. """ -from oslo.config import cfg -from oslo import messaging -from oslo.serialization import jsonutils +from oslo_config import cfg +import oslo_messaging as messaging +from oslo_serialization import jsonutils from nova import exception from nova.i18n import _, _LW diff --git a/nova/compute/stats.py b/nova/compute/stats.py index 0b83b90844..55a88c36e8 100644 --- a/nova/compute/stats.py +++ b/nova/compute/stats.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils from nova.compute import task_states from nova.compute import vm_states diff --git a/nova/compute/utils.py b/nova/compute/utils.py index ccfb600055..7d3e8aae50 100644 --- a/nova/compute/utils.py +++ b/nova/compute/utils.py @@ -18,8 +18,8 @@ import itertools import string import traceback -from oslo.config import cfg -from oslo.utils import encodeutils +from oslo_config import cfg +from oslo_utils import encodeutils from nova import block_device from nova.compute import power_state diff --git a/nova/conductor/__init__.py b/nova/conductor/__init__.py index a1e2fad919..04a9609c0e 100644 --- a/nova/conductor/__init__.py +++ b/nova/conductor/__init__.py @@ -12,14 +12,14 @@ # License for the specific language governing permissions and limitations # under the License. -import oslo.config.cfg +import oslo_config.cfg from nova.conductor import api as conductor_api def API(*args, **kwargs): use_local = kwargs.pop('use_local', False) - if oslo.config.cfg.CONF.conductor.use_local or use_local: + if oslo_config.cfg.CONF.conductor.use_local or use_local: api = conductor_api.LocalAPI else: api = conductor_api.API @@ -28,7 +28,7 @@ def API(*args, **kwargs): def ComputeTaskAPI(*args, **kwargs): use_local = kwargs.pop('use_local', False) - if oslo.config.cfg.CONF.conductor.use_local or use_local: + if oslo_config.cfg.CONF.conductor.use_local or use_local: api = conductor_api.LocalComputeTaskAPI else: api = conductor_api.ComputeTaskAPI diff --git a/nova/conductor/api.py b/nova/conductor/api.py index 5d5f30ba82..d8b34d0cbb 100644 --- a/nova/conductor/api.py +++ b/nova/conductor/api.py @@ -14,8 +14,8 @@ """Handles all requests to the conductor service.""" -from oslo.config import cfg -from oslo import messaging +from oslo_config import cfg +import oslo_messaging as messaging from nova import baserpc from nova.conductor import manager diff --git a/nova/conductor/manager.py b/nova/conductor/manager.py index 88ee72c154..213c269b89 100644 --- a/nova/conductor/manager.py +++ b/nova/conductor/manager.py @@ -17,10 +17,10 @@ import copy import itertools -from oslo import messaging -from oslo.serialization import jsonutils -from oslo.utils import excutils -from oslo.utils import timeutils +import oslo_messaging as messaging +from oslo_serialization import jsonutils +from oslo_utils import excutils +from oslo_utils import timeutils import six from nova.api.ec2 import ec2utils diff --git a/nova/conductor/rpcapi.py b/nova/conductor/rpcapi.py index 6c21b74cec..5ad8325f7e 100644 --- a/nova/conductor/rpcapi.py +++ b/nova/conductor/rpcapi.py @@ -15,9 +15,9 @@ """Client side of the conductor RPC API.""" -from oslo.config import cfg -from oslo import messaging -from oslo.serialization import jsonutils +from oslo_config import cfg +import oslo_messaging as messaging +from oslo_serialization import jsonutils from nova.objects import base as objects_base from nova import rpc diff --git a/nova/conductor/tasks/live_migrate.py b/nova/conductor/tasks/live_migrate.py index b4663055b4..204f652030 100644 --- a/nova/conductor/tasks/live_migrate.py +++ b/nova/conductor/tasks/live_migrate.py @@ -10,7 +10,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.config import cfg +from oslo_config import cfg from nova.compute import power_state from nova.compute import rpcapi as compute_rpcapi diff --git a/nova/config.py b/nova/config.py index 9cbf5de911..9fa4609f06 100644 --- a/nova/config.py +++ b/nova/config.py @@ -15,8 +15,8 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.config import cfg -from oslo.db import options +from oslo_config import cfg +from oslo_db import options from nova import debugger from nova.openstack.common import log diff --git a/nova/console/api.py b/nova/console/api.py index 5b1dbb7050..95dff4b4f7 100644 --- a/nova/console/api.py +++ b/nova/console/api.py @@ -15,7 +15,7 @@ """Handles ConsoleProxy API requests.""" -from oslo.config import cfg +from oslo_config import cfg from nova.compute import rpcapi as compute_rpcapi from nova.console import rpcapi as console_rpcapi diff --git a/nova/console/manager.py b/nova/console/manager.py index 238a88c399..2ba313fa46 100644 --- a/nova/console/manager.py +++ b/nova/console/manager.py @@ -17,9 +17,9 @@ import socket -from oslo.config import cfg -from oslo import messaging -from oslo.utils import importutils +from oslo_config import cfg +import oslo_messaging as messaging +from oslo_utils import importutils from nova.compute import rpcapi as compute_rpcapi from nova import exception diff --git a/nova/console/rpcapi.py b/nova/console/rpcapi.py index 3dae13f36f..5632e77a19 100644 --- a/nova/console/rpcapi.py +++ b/nova/console/rpcapi.py @@ -16,8 +16,8 @@ Client side of the console RPC API. """ -from oslo.config import cfg -from oslo import messaging +from oslo_config import cfg +import oslo_messaging as messaging from nova import rpc diff --git a/nova/console/serial.py b/nova/console/serial.py index 9370e367d9..58f10de9b0 100644 --- a/nova/console/serial.py +++ b/nova/console/serial.py @@ -16,7 +16,7 @@ import socket -from oslo.config import cfg +from oslo_config import cfg import six.moves from nova import exception diff --git a/nova/console/vmrc_manager.py b/nova/console/vmrc_manager.py index 738ec099b1..fe9767afbd 100644 --- a/nova/console/vmrc_manager.py +++ b/nova/console/vmrc_manager.py @@ -15,8 +15,8 @@ """VMRC Console Manager.""" -from oslo.config import cfg -from oslo.utils import importutils +from oslo_config import cfg +from oslo_utils import importutils from nova.compute import rpcapi as compute_rpcapi from nova import exception diff --git a/nova/console/xvp.py b/nova/console/xvp.py index 3f127c19f9..0e971b2173 100644 --- a/nova/console/xvp.py +++ b/nova/console/xvp.py @@ -19,9 +19,9 @@ import os import signal import jinja2 -from oslo.config import cfg -from oslo.utils import excutils from oslo_concurrency import processutils +from oslo_config import cfg +from oslo_utils import excutils from nova import context from nova import db diff --git a/nova/consoleauth/__init__.py b/nova/consoleauth/__init__.py index 5536775862..e770d6700d 100644 --- a/nova/consoleauth/__init__.py +++ b/nova/consoleauth/__init__.py @@ -16,7 +16,7 @@ """Module to authenticate Consoles.""" -from oslo.config import cfg +from oslo_config import cfg consoleauth_topic_opt = cfg.StrOpt('consoleauth_topic', diff --git a/nova/consoleauth/manager.py b/nova/consoleauth/manager.py index 1d755815c2..dcbbe6b0a7 100644 --- a/nova/consoleauth/manager.py +++ b/nova/consoleauth/manager.py @@ -18,9 +18,9 @@ import time -from oslo.config import cfg -from oslo import messaging -from oslo.serialization import jsonutils +from oslo_config import cfg +import oslo_messaging as messaging +from oslo_serialization import jsonutils from nova.cells import rpcapi as cells_rpcapi from nova.compute import rpcapi as compute_rpcapi diff --git a/nova/consoleauth/rpcapi.py b/nova/consoleauth/rpcapi.py index 0402fda8df..7273c5d3ee 100644 --- a/nova/consoleauth/rpcapi.py +++ b/nova/consoleauth/rpcapi.py @@ -16,8 +16,8 @@ Client side of the consoleauth RPC API. """ -from oslo.config import cfg -from oslo import messaging +from oslo_config import cfg +import oslo_messaging as messaging from nova import rpc diff --git a/nova/context.py b/nova/context.py index 18fc2e195e..622f424d73 100644 --- a/nova/context.py +++ b/nova/context.py @@ -21,7 +21,7 @@ import copy from keystoneclient import auth from keystoneclient import service_catalog -from oslo.utils import timeutils +from oslo_utils import timeutils import six from nova import exception diff --git a/nova/crypto.py b/nova/crypto.py index ad806fd2d3..ece455cd28 100644 --- a/nova/crypto.py +++ b/nova/crypto.py @@ -28,10 +28,10 @@ import re import string import struct -from oslo.config import cfg -from oslo.utils import excutils -from oslo.utils import timeutils from oslo_concurrency import processutils +from oslo_config import cfg +from oslo_utils import excutils +from oslo_utils import timeutils from pyasn1.codec.der import encoder as der_encoder from pyasn1.type import univ diff --git a/nova/db/api.py b/nova/db/api.py index c5d5083b7c..d0f4956193 100644 --- a/nova/db/api.py +++ b/nova/db/api.py @@ -27,8 +27,8 @@ these objects be simple dictionaries. """ -from oslo.config import cfg -from oslo.db import concurrency +from oslo_config import cfg +from oslo_db import concurrency from nova.cells import rpcapi as cells_rpcapi from nova.i18n import _LE diff --git a/nova/db/base.py b/nova/db/base.py index 2bbea94a2c..28fdda0ca0 100644 --- a/nova/db/base.py +++ b/nova/db/base.py @@ -16,8 +16,8 @@ """Base class for classes that need modular database access.""" -from oslo.config import cfg -from oslo.utils import importutils +from oslo_config import cfg +from oslo_utils import importutils db_driver_opt = cfg.StrOpt('db_driver', default='nova.db', diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py index ca72ba661d..58aa1f901c 100644 --- a/nova/db/sqlalchemy/api.py +++ b/nova/db/sqlalchemy/api.py @@ -26,12 +26,12 @@ import threading import time import uuid -from oslo.config import cfg -from oslo.db import exception as db_exc -from oslo.db.sqlalchemy import session as db_session -from oslo.db.sqlalchemy import utils as sqlalchemyutils -from oslo.utils import excutils -from oslo.utils import timeutils +from oslo_config import cfg +from oslo_db import exception as db_exc +from oslo_db.sqlalchemy import session as db_session +from oslo_db.sqlalchemy import utils as sqlalchemyutils +from oslo_utils import excutils +from oslo_utils import timeutils import retrying import six from sqlalchemy import and_ diff --git a/nova/db/sqlalchemy/migrate_repo/versions/230_add_details_column_to_instance_actions_events.py b/nova/db/sqlalchemy/migrate_repo/versions/230_add_details_column_to_instance_actions_events.py index b380a43033..51856c1e66 100644 --- a/nova/db/sqlalchemy/migrate_repo/versions/230_add_details_column_to_instance_actions_events.py +++ b/nova/db/sqlalchemy/migrate_repo/versions/230_add_details_column_to_instance_actions_events.py @@ -12,7 +12,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.db.sqlalchemy import utils +from oslo_db.sqlalchemy import utils from sqlalchemy import Column, String, Text from nova.db.sqlalchemy import api diff --git a/nova/db/sqlalchemy/migrate_repo/versions/233_add_stats_in_compute_nodes.py b/nova/db/sqlalchemy/migrate_repo/versions/233_add_stats_in_compute_nodes.py index dc54759ed0..39c40f13bc 100644 --- a/nova/db/sqlalchemy/migrate_repo/versions/233_add_stats_in_compute_nodes.py +++ b/nova/db/sqlalchemy/migrate_repo/versions/233_add_stats_in_compute_nodes.py @@ -14,7 +14,7 @@ # under the License. -from oslo.utils import timeutils +from oslo_utils import timeutils from sqlalchemy import Column from sqlalchemy import DateTime from sqlalchemy import ForeignKey diff --git a/nova/db/sqlalchemy/migrate_repo/versions/267_instance_uuid_non_nullable.py b/nova/db/sqlalchemy/migrate_repo/versions/267_instance_uuid_non_nullable.py index 440e20faee..5be324d2f5 100644 --- a/nova/db/sqlalchemy/migrate_repo/versions/267_instance_uuid_non_nullable.py +++ b/nova/db/sqlalchemy/migrate_repo/versions/267_instance_uuid_non_nullable.py @@ -13,7 +13,7 @@ # under the License. from migrate import UniqueConstraint -from oslo.db.sqlalchemy import utils +from oslo_db.sqlalchemy import utils from sqlalchemy import MetaData from sqlalchemy.sql import null diff --git a/nova/db/sqlalchemy/migration.py b/nova/db/sqlalchemy/migration.py index e3d66f16f9..b0965a5f2b 100644 --- a/nova/db/sqlalchemy/migration.py +++ b/nova/db/sqlalchemy/migration.py @@ -19,7 +19,7 @@ import os from migrate import exceptions as versioning_exceptions from migrate.versioning import api as versioning_api from migrate.versioning.repository import Repository -from oslo.db.sqlalchemy import utils as db_utils +from oslo_db.sqlalchemy import utils as db_utils import sqlalchemy from sqlalchemy.sql import null diff --git a/nova/db/sqlalchemy/models.py b/nova/db/sqlalchemy/models.py index cb69b34db7..edc048ce41 100644 --- a/nova/db/sqlalchemy/models.py +++ b/nova/db/sqlalchemy/models.py @@ -19,9 +19,9 @@ SQLAlchemy models for nova data. """ -from oslo.config import cfg -from oslo.db.sqlalchemy import models -from oslo.utils import timeutils +from oslo_config import cfg +from oslo_db.sqlalchemy import models +from oslo_utils import timeutils from sqlalchemy import (Column, Index, Integer, BigInteger, Enum, String, schema, Unicode) from sqlalchemy.dialects.mysql import MEDIUMTEXT diff --git a/nova/db/sqlalchemy/types.py b/nova/db/sqlalchemy/types.py index 87408c33f7..b216abbae7 100644 --- a/nova/db/sqlalchemy/types.py +++ b/nova/db/sqlalchemy/types.py @@ -16,7 +16,7 @@ """Custom SQLAlchemy types.""" import netaddr -from oslo.utils import netutils +from oslo_utils import netutils from sqlalchemy.dialects import postgresql from sqlalchemy import types diff --git a/nova/db/sqlalchemy/utils.py b/nova/db/sqlalchemy/utils.py index 0e4b335f98..a8dda66319 100644 --- a/nova/db/sqlalchemy/utils.py +++ b/nova/db/sqlalchemy/utils.py @@ -13,8 +13,8 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.db import exception as db_exc -from oslo.db.sqlalchemy import utils as oslodbutils +from oslo_db import exception as db_exc +from oslo_db.sqlalchemy import utils as oslodbutils from sqlalchemy.exc import OperationalError from sqlalchemy.ext.compiler import compiles from sqlalchemy import MetaData diff --git a/nova/debugger.py b/nova/debugger.py index 16b47454c4..31fdba5936 100644 --- a/nova/debugger.py +++ b/nova/debugger.py @@ -27,7 +27,7 @@ def enabled(): def register_cli_opts(): - from oslo.config import cfg + from oslo_config import cfg cli_opts = [ cfg.StrOpt('host', @@ -50,7 +50,7 @@ def register_cli_opts(): def init(): - from oslo.config import cfg + from oslo_config import cfg CONF = cfg.CONF # NOTE(markmc): gracefully handle the CLI options not being registered diff --git a/nova/exception.py b/nova/exception.py index 0957c42e04..be2cf361e3 100644 --- a/nova/exception.py +++ b/nova/exception.py @@ -25,8 +25,8 @@ SHOULD include dedicated exception logging. import functools import sys -from oslo.config import cfg -from oslo.utils import excutils +from oslo_config import cfg +from oslo_utils import excutils import webob.exc from nova.i18n import _, _LE diff --git a/nova/hacking/checks.py b/nova/hacking/checks.py index 4b56e4d551..db6977fa63 100644 --- a/nova/hacking/checks.py +++ b/nova/hacking/checks.py @@ -102,7 +102,15 @@ decorator_re = re.compile(r"@.*") # TODO(dims): When other oslo libraries switch over non-namespace'd # imports, we need to add them to the regexp below. -oslo_namespace_imports = re.compile(r"from[\s]*oslo[.](concurrency)") +oslo_namespace_imports = re.compile(r"from[\s]*oslo[.]" + r"(concurrency|config|db|i18n|messaging|" + r"middleware|serialization|utils|vmware)") +oslo_namespace_imports_2 = re.compile(r"from[\s]*oslo[\s]*import[\s]*" + r"(concurrency|config|db|i18n|messaging|" + r"middleware|serialization|utils|vmware)") +oslo_namespace_imports_3 = re.compile(r"import[\s]*oslo\." + r"(concurrency|config|db|i18n|messaging|" + r"middleware|serialization|utils|vmware)") class BaseASTChecker(ast.NodeVisitor): @@ -479,6 +487,16 @@ def check_oslo_namespace_imports(logical_line, blank_before, filename): logical_line.replace('oslo.', 'oslo_'), logical_line) yield(0, msg) + match = re.match(oslo_namespace_imports_2, logical_line) + if match: + msg = ("N333: 'module %s should not be imported " + "from oslo namespace.") % match.group(1) + yield(0, msg) + match = re.match(oslo_namespace_imports_3, logical_line) + if match: + msg = ("N333: 'module %s should not be imported " + "from oslo namespace.") % match.group(1) + yield(0, msg) def assert_true_or_false_with_in(logical_line): diff --git a/nova/i18n.py b/nova/i18n.py index 9057911d9f..05378e80c2 100644 --- a/nova/i18n.py +++ b/nova/i18n.py @@ -18,11 +18,11 @@ See http://docs.openstack.org/developer/oslo.i18n/usage.html . """ -from oslo import i18n +import oslo_i18n DOMAIN = 'nova' -_translators = i18n.TranslatorFactory(domain=DOMAIN) +_translators = oslo_i18n.TranslatorFactory(domain=DOMAIN) # The primary translation function using the well-known name "_" _ = _translators.primary @@ -39,8 +39,8 @@ _LC = _translators.log_critical def translate(value, user_locale): - return i18n.translate(value, user_locale) + return oslo_i18n.translate(value, user_locale) def get_available_languages(): - return i18n.get_available_languages(DOMAIN) + return oslo_i18n.get_available_languages(DOMAIN) diff --git a/nova/image/download/__init__.py b/nova/image/download/__init__.py index 87235a7dff..1696c8c48c 100644 --- a/nova/image/download/__init__.py +++ b/nova/image/download/__init__.py @@ -15,7 +15,7 @@ import logging -from oslo.config import cfg +from oslo_config import cfg import stevedore.driver import stevedore.extension diff --git a/nova/image/download/file.py b/nova/image/download/file.py index a3acf9f7fb..0977e46570 100644 --- a/nova/image/download/file.py +++ b/nova/image/download/file.py @@ -15,7 +15,7 @@ import logging -from oslo.config import cfg +from oslo_config import cfg from nova import exception from nova.i18n import _, _LI diff --git a/nova/image/glance.py b/nova/image/glance.py index d93445981a..bb91045964 100644 --- a/nova/image/glance.py +++ b/nova/image/glance.py @@ -25,10 +25,10 @@ import time import glanceclient import glanceclient.exc -from oslo.config import cfg -from oslo.serialization import jsonutils -from oslo.utils import netutils -from oslo.utils import timeutils +from oslo_config import cfg +from oslo_serialization import jsonutils +from oslo_utils import netutils +from oslo_utils import timeutils import six import six.moves.urllib.parse as urlparse diff --git a/nova/image/s3.py b/nova/image/s3.py index 38814c1da1..1835028107 100644 --- a/nova/image/s3.py +++ b/nova/image/s3.py @@ -26,8 +26,8 @@ import tempfile import boto.s3.connection import eventlet from lxml import etree -from oslo.config import cfg from oslo_concurrency import processutils +from oslo_config import cfg from nova.api.ec2 import ec2utils import nova.cert.rpcapi diff --git a/nova/ipv6/api.py b/nova/ipv6/api.py index da8102e0c8..f57a4554d8 100644 --- a/nova/ipv6/api.py +++ b/nova/ipv6/api.py @@ -12,7 +12,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.config import cfg +from oslo_config import cfg from nova import utils diff --git a/nova/keymgr/__init__.py b/nova/keymgr/__init__.py index f589e18363..79880b4d70 100644 --- a/nova/keymgr/__init__.py +++ b/nova/keymgr/__init__.py @@ -14,8 +14,8 @@ # under the License. -from oslo.config import cfg -from oslo.utils import importutils +from oslo_config import cfg +from oslo_utils import importutils keymgr_opts = [ diff --git a/nova/keymgr/barbican.py b/nova/keymgr/barbican.py index d9de15950f..1c69d69d70 100644 --- a/nova/keymgr/barbican.py +++ b/nova/keymgr/barbican.py @@ -23,8 +23,8 @@ import binascii from barbicanclient import client as barbican_client from keystoneclient import session -from oslo.config import cfg -from oslo.utils import excutils +from oslo_config import cfg +from oslo_utils import excutils from nova import exception from nova.i18n import _ diff --git a/nova/keymgr/conf_key_mgr.py b/nova/keymgr/conf_key_mgr.py index 3cb44a5a80..fac967429f 100644 --- a/nova/keymgr/conf_key_mgr.py +++ b/nova/keymgr/conf_key_mgr.py @@ -31,7 +31,7 @@ encrypted with a key provided by this key manager actually share the same encryption key so *any* volume can be decrypted once the fixed key is known. """ -from oslo.config import cfg +from oslo_config import cfg from nova.i18n import _ from nova.keymgr import single_key_mgr diff --git a/nova/loadables.py b/nova/loadables.py index c29d29a033..4d727d2753 100644 --- a/nova/loadables.py +++ b/nova/loadables.py @@ -42,7 +42,7 @@ import inspect import os import sys -from oslo.utils import importutils +from oslo_utils import importutils from nova import exception diff --git a/nova/manager.py b/nova/manager.py index 8ff807dfee..6be6572313 100644 --- a/nova/manager.py +++ b/nova/manager.py @@ -51,7 +51,7 @@ This module provides Manager, a base class for managers. """ -from oslo.config import cfg +from oslo_config import cfg from nova.db import base from nova.openstack.common import log as logging diff --git a/nova/netconf.py b/nova/netconf.py index 6d43693afc..c320da9eb0 100644 --- a/nova/netconf.py +++ b/nova/netconf.py @@ -17,8 +17,8 @@ import socket -from oslo.config import cfg -from oslo.utils import netutils +from oslo_config import cfg +from oslo_utils import netutils CONF = cfg.CONF diff --git a/nova/network/__init__.py b/nova/network/__init__.py index cc22c2a5c5..1c5baab6a0 100644 --- a/nova/network/__init__.py +++ b/nova/network/__init__.py @@ -14,21 +14,21 @@ # License for the specific language governing permissions and limitations # under the License. -import oslo.config.cfg -from oslo.utils import importutils +import oslo_config.cfg +from oslo_utils import importutils _network_opts = [ - oslo.config.cfg.StrOpt('network_api_class', + oslo_config.cfg.StrOpt('network_api_class', default='nova.network.api.API', help='The full class name of the ' 'network API class to use'), ] -oslo.config.cfg.CONF.register_opts(_network_opts) +oslo_config.cfg.CONF.register_opts(_network_opts) def API(skip_policy_check=False): - network_api_class = oslo.config.cfg.CONF.network_api_class + network_api_class = oslo_config.cfg.CONF.network_api_class if 'quantumv2' in network_api_class: network_api_class = network_api_class.replace('quantumv2', 'neutronv2') cls = importutils.import_class(network_api_class) diff --git a/nova/network/api.py b/nova/network/api.py index 9ee04665a4..a228546f2d 100644 --- a/nova/network/api.py +++ b/nova/network/api.py @@ -18,7 +18,7 @@ import functools -from oslo.config import cfg +from oslo_config import cfg from nova import exception from nova.i18n import _LI diff --git a/nova/network/base_api.py b/nova/network/base_api.py index 475dd15d3d..4adc80dd34 100644 --- a/nova/network/base_api.py +++ b/nova/network/base_api.py @@ -16,8 +16,8 @@ import functools import inspect -from oslo.utils import excutils from oslo_concurrency import lockutils +from oslo_utils import excutils from nova.db import base from nova import hooks diff --git a/nova/network/driver.py b/nova/network/driver.py index c9ab8f8a7e..97d8255f8f 100644 --- a/nova/network/driver.py +++ b/nova/network/driver.py @@ -14,8 +14,8 @@ import sys -from oslo.config import cfg -from oslo.utils import importutils +from oslo_config import cfg +from oslo_utils import importutils from nova.i18n import _LE, _LI from nova.openstack.common import log as logging diff --git a/nova/network/floating_ips.py b/nova/network/floating_ips.py index bf9e16a61c..b01ef2aa6d 100644 --- a/nova/network/floating_ips.py +++ b/nova/network/floating_ips.py @@ -15,11 +15,11 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.config import cfg -from oslo import messaging -from oslo.utils import excutils -from oslo.utils import importutils from oslo_concurrency import processutils +from oslo_config import cfg +import oslo_messaging as messaging +from oslo_utils import excutils +from oslo_utils import importutils import six from nova import context diff --git a/nova/network/ldapdns.py b/nova/network/ldapdns.py index c0815f1189..9909a138a3 100644 --- a/nova/network/ldapdns.py +++ b/nova/network/ldapdns.py @@ -20,7 +20,7 @@ except ImportError: import time -from oslo.config import cfg +from oslo_config import cfg from nova import exception from nova.i18n import _, _LW diff --git a/nova/network/linux_net.py b/nova/network/linux_net.py index f08c4994d6..129f666673 100644 --- a/nova/network/linux_net.py +++ b/nova/network/linux_net.py @@ -24,12 +24,12 @@ import re import time import netaddr -from oslo.config import cfg -from oslo.serialization import jsonutils -from oslo.utils import excutils -from oslo.utils import importutils -from oslo.utils import timeutils from oslo_concurrency import processutils +from oslo_config import cfg +from oslo_serialization import jsonutils +from oslo_utils import excutils +from oslo_utils import importutils +from oslo_utils import timeutils import six from nova import exception diff --git a/nova/network/manager.py b/nova/network/manager.py index 7ca9f23c39..aa02709dc9 100644 --- a/nova/network/manager.py +++ b/nova/network/manager.py @@ -34,13 +34,13 @@ import uuid import eventlet import netaddr -from oslo.config import cfg -from oslo import messaging -from oslo.utils import excutils -from oslo.utils import importutils -from oslo.utils import netutils -from oslo.utils import strutils -from oslo.utils import timeutils +from oslo_config import cfg +import oslo_messaging as messaging +from oslo_utils import excutils +from oslo_utils import importutils +from oslo_utils import netutils +from oslo_utils import strutils +from oslo_utils import timeutils from nova import conductor from nova import context diff --git a/nova/network/minidns.py b/nova/network/minidns.py index 2cee8f985c..71174391c6 100644 --- a/nova/network/minidns.py +++ b/nova/network/minidns.py @@ -16,7 +16,7 @@ import os import shutil import tempfile -from oslo.config import cfg +from oslo_config import cfg from nova import exception from nova.i18n import _, _LI, _LW diff --git a/nova/network/model.py b/nova/network/model.py index b5b1b64764..e612438437 100644 --- a/nova/network/model.py +++ b/nova/network/model.py @@ -17,7 +17,7 @@ import functools import eventlet import netaddr -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils import six from nova import exception diff --git a/nova/network/neutronv2/api.py b/nova/network/neutronv2/api.py index 9a089fcf36..9b8335dd1b 100644 --- a/nova/network/neutronv2/api.py +++ b/nova/network/neutronv2/api.py @@ -20,9 +20,9 @@ import uuid from neutronclient.common import exceptions as neutron_client_exc from neutronclient.v2_0 import client as clientv20 -from oslo.config import cfg -from oslo.utils import excutils from oslo_concurrency import lockutils +from oslo_config import cfg +from oslo_utils import excutils import six from nova.api.openstack import extensions diff --git a/nova/network/rpcapi.py b/nova/network/rpcapi.py index e043f4d850..02c41fa8de 100644 --- a/nova/network/rpcapi.py +++ b/nova/network/rpcapi.py @@ -16,9 +16,9 @@ Client side of the network RPC API. """ -from oslo.config import cfg -from oslo import messaging -from oslo.serialization import jsonutils +from oslo_config import cfg +import oslo_messaging as messaging +from oslo_serialization import jsonutils from nova.objects import base as objects_base from nova import rpc diff --git a/nova/network/security_group/neutron_driver.py b/nova/network/security_group/neutron_driver.py index be6074d0d5..6e85f00dd3 100644 --- a/nova/network/security_group/neutron_driver.py +++ b/nova/network/security_group/neutron_driver.py @@ -17,8 +17,8 @@ import sys from neutronclient.common import exceptions as n_exc from neutronclient.neutron import v2_0 as neutronv20 -from oslo.config import cfg -from oslo.utils import excutils +from oslo_config import cfg +from oslo_utils import excutils import six from webob import exc diff --git a/nova/network/security_group/openstack_driver.py b/nova/network/security_group/openstack_driver.py index 5b6b544169..6dfe0a69cf 100644 --- a/nova/network/security_group/openstack_driver.py +++ b/nova/network/security_group/openstack_driver.py @@ -13,8 +13,8 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.config import cfg -from oslo.utils import importutils +from oslo_config import cfg +from oslo_utils import importutils security_group_opts = [ cfg.StrOpt('security_group_api', diff --git a/nova/network/security_group/security_group_base.py b/nova/network/security_group/security_group_base.py index 09199e4073..54ff5e47c0 100644 --- a/nova/network/security_group/security_group_base.py +++ b/nova/network/security_group/security_group_base.py @@ -19,7 +19,7 @@ import urllib -from oslo.config import cfg +from oslo_config import cfg from nova import exception from nova.i18n import _ diff --git a/nova/notifications.py b/nova/notifications.py index d227795dec..70440f51f1 100644 --- a/nova/notifications.py +++ b/nova/notifications.py @@ -20,9 +20,9 @@ the system. import datetime -from oslo.config import cfg -from oslo.utils import excutils -from oslo.utils import timeutils +from oslo_config import cfg +from oslo_utils import excutils +from oslo_utils import timeutils import six import nova.context diff --git a/nova/objects/base.py b/nova/objects/base.py index c4c3f9f594..ae1ad3f196 100644 --- a/nova/objects/base.py +++ b/nova/objects/base.py @@ -22,8 +22,8 @@ import functools import traceback import netaddr -from oslo import messaging -from oslo.utils import timeutils +import oslo_messaging as messaging +from oslo_utils import timeutils import six from nova import context diff --git a/nova/objects/compute_node.py b/nova/objects/compute_node.py index 6a7da7d86e..ccd56f8471 100644 --- a/nova/objects/compute_node.py +++ b/nova/objects/compute_node.py @@ -12,7 +12,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils from nova import db from nova import exception diff --git a/nova/objects/fields.py b/nova/objects/fields.py index 87c9940885..b8d4f8de9e 100644 --- a/nova/objects/fields.py +++ b/nova/objects/fields.py @@ -17,7 +17,7 @@ import datetime import iso8601 import netaddr -from oslo.utils import timeutils +from oslo_utils import timeutils import six from nova.i18n import _ diff --git a/nova/objects/fixed_ip.py b/nova/objects/fixed_ip.py index d58266e1b3..025aee0189 100644 --- a/nova/objects/fixed_ip.py +++ b/nova/objects/fixed_ip.py @@ -12,7 +12,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.utils import timeutils +from oslo_utils import timeutils from nova import db from nova import exception diff --git a/nova/objects/instance.py b/nova/objects/instance.py index 2064b77000..18814a90c9 100644 --- a/nova/objects/instance.py +++ b/nova/objects/instance.py @@ -14,9 +14,9 @@ import copy -from oslo.config import cfg -from oslo.serialization import jsonutils -from oslo.utils import timeutils +from oslo_config import cfg +from oslo_serialization import jsonutils +from oslo_utils import timeutils from nova.cells import opts as cells_opts from nova.cells import rpcapi as cells_rpcapi diff --git a/nova/objects/instance_action.py b/nova/objects/instance_action.py index a82c7ecd56..611774cdb9 100644 --- a/nova/objects/instance_action.py +++ b/nova/objects/instance_action.py @@ -12,7 +12,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.utils import timeutils +from oslo_utils import timeutils from nova import db from nova import objects diff --git a/nova/objects/instance_numa_topology.py b/nova/objects/instance_numa_topology.py index cb1284ffc5..e08670dae6 100644 --- a/nova/objects/instance_numa_topology.py +++ b/nova/objects/instance_numa_topology.py @@ -12,7 +12,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils from nova import db from nova import exception diff --git a/nova/objects/instance_pci_requests.py b/nova/objects/instance_pci_requests.py index 5928baf028..6d5e3217ad 100644 --- a/nova/objects/instance_pci_requests.py +++ b/nova/objects/instance_pci_requests.py @@ -10,7 +10,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils from nova import db from nova.objects import base diff --git a/nova/objects/network.py b/nova/objects/network.py index 849926c40d..c39a647280 100644 --- a/nova/objects/network.py +++ b/nova/objects/network.py @@ -13,7 +13,7 @@ # under the License. import netaddr -from oslo.config import cfg +from oslo_config import cfg from nova import db from nova import exception diff --git a/nova/objects/numa.py b/nova/objects/numa.py index 2c628878f0..4b93303f9d 100644 --- a/nova/objects/numa.py +++ b/nova/objects/numa.py @@ -12,7 +12,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils from nova import exception from nova.objects import base diff --git a/nova/objects/pci_device.py b/nova/objects/pci_device.py index 95c6c13794..384f83231c 100644 --- a/nova/objects/pci_device.py +++ b/nova/objects/pci_device.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils from nova import db from nova import objects diff --git a/nova/objects/pci_device_pool.py b/nova/objects/pci_device_pool.py index 552e32ebb2..81978c6214 100644 --- a/nova/objects/pci_device_pool.py +++ b/nova/objects/pci_device_pool.py @@ -15,7 +15,7 @@ import copy -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils import six from nova import objects diff --git a/nova/objectstore/s3server.py b/nova/objectstore/s3server.py index 1dc6a264be..699101a2cc 100644 --- a/nova/objectstore/s3server.py +++ b/nova/objectstore/s3server.py @@ -38,7 +38,7 @@ import os import os.path import urllib -from oslo.config import cfg +from oslo_config import cfg import routes import six import webob diff --git a/nova/openstack/common/cliutils.py b/nova/openstack/common/cliutils.py index 081af5f973..846a3e1d4f 100644 --- a/nova/openstack/common/cliutils.py +++ b/nova/openstack/common/cliutils.py @@ -20,8 +20,8 @@ import os import sys import textwrap -from oslo.utils import encodeutils -from oslo.utils import strutils +from oslo_utils import encodeutils +from oslo_utils import strutils import prettytable import six from six import moves diff --git a/nova/openstack/common/config/generator.py b/nova/openstack/common/config/generator.py index 74e592055b..ef90f16839 100644 --- a/nova/openstack/common/config/generator.py +++ b/nova/openstack/common/config/generator.py @@ -27,8 +27,8 @@ import socket import sys import textwrap -from oslo.config import cfg -from oslo.utils import importutils +from oslo_config import cfg +from oslo_utils import importutils import six import stevedore.named @@ -104,7 +104,7 @@ def generate(argv): # and the list of Opt instances for that group. if parsed_args.libraries: loader = stevedore.named.NamedExtensionManager( - 'oslo.config.opts', + 'oslo_config.opts', names=list(set(parsed_args.libraries)), invoke_on_load=False, on_load_failure_callback=raise_extension_exception diff --git a/nova/openstack/common/eventlet_backdoor.py b/nova/openstack/common/eventlet_backdoor.py index 764b8c03bc..0253a7a784 100644 --- a/nova/openstack/common/eventlet_backdoor.py +++ b/nova/openstack/common/eventlet_backdoor.py @@ -27,7 +27,7 @@ import traceback import eventlet.backdoor import greenlet -from oslo.config import cfg +from oslo_config import cfg from nova.openstack.common._i18n import _LI from nova.openstack.common import log as logging diff --git a/nova/openstack/common/fileutils.py b/nova/openstack/common/fileutils.py index ec26eaf9cd..64cee1cea5 100644 --- a/nova/openstack/common/fileutils.py +++ b/nova/openstack/common/fileutils.py @@ -19,7 +19,7 @@ import logging import os import tempfile -from oslo.utils import excutils +from oslo_utils import excutils LOG = logging.getLogger(__name__) diff --git a/nova/openstack/common/imageutils.py b/nova/openstack/common/imageutils.py index 1e9eef2b88..b37ce24aee 100644 --- a/nova/openstack/common/imageutils.py +++ b/nova/openstack/common/imageutils.py @@ -21,7 +21,7 @@ Helper methods to deal with images. import re -from oslo.utils import strutils +from oslo_utils import strutils from nova.openstack.common._i18n import _ diff --git a/nova/openstack/common/log.py b/nova/openstack/common/log.py index 922c992245..b23e21f4ed 100644 --- a/nova/openstack/common/log.py +++ b/nova/openstack/common/log.py @@ -38,9 +38,9 @@ import socket import sys import traceback -from oslo.config import cfg -from oslo.serialization import jsonutils -from oslo.utils import importutils +from oslo_config import cfg +from oslo_serialization import jsonutils +from oslo_utils import importutils import six from six import moves diff --git a/nova/openstack/common/memorycache.py b/nova/openstack/common/memorycache.py index f793c93716..e5d7dd2daa 100644 --- a/nova/openstack/common/memorycache.py +++ b/nova/openstack/common/memorycache.py @@ -18,8 +18,8 @@ import copy -from oslo.config import cfg -from oslo.utils import timeutils +from oslo_config import cfg +from oslo_utils import timeutils memcache_opts = [ cfg.ListOpt('memcached_servers', diff --git a/nova/openstack/common/middleware/request_id.py b/nova/openstack/common/middleware/request_id.py index 92f57e0c94..a09e044361 100644 --- a/nova/openstack/common/middleware/request_id.py +++ b/nova/openstack/common/middleware/request_id.py @@ -12,7 +12,7 @@ """Compatibility shim for Kilo, while operators migrate to oslo.middleware.""" -from oslo.middleware import request_id +from oslo_middleware import request_id from nova.openstack.common import versionutils diff --git a/nova/openstack/common/periodic_task.py b/nova/openstack/common/periodic_task.py index 679a1d9e0a..4c64aaefb5 100644 --- a/nova/openstack/common/periodic_task.py +++ b/nova/openstack/common/periodic_task.py @@ -15,7 +15,7 @@ import copy import random import time -from oslo.config import cfg +from oslo_config import cfg import six from nova.openstack.common._i18n import _, _LE, _LI diff --git a/nova/openstack/common/policy.py b/nova/openstack/common/policy.py index 17e4e7f3de..74c143358d 100644 --- a/nova/openstack/common/policy.py +++ b/nova/openstack/common/policy.py @@ -94,8 +94,8 @@ import copy import os import re -from oslo.config import cfg -from oslo.serialization import jsonutils +from oslo_config import cfg +from oslo_serialization import jsonutils import six import six.moves.urllib.parse as urlparse import six.moves.urllib.request as urlrequest diff --git a/nova/openstack/common/report/generators/conf.py b/nova/openstack/common/report/generators/conf.py index f947ce2f64..8ceee08f9e 100644 --- a/nova/openstack/common/report/generators/conf.py +++ b/nova/openstack/common/report/generators/conf.py @@ -19,7 +19,7 @@ generators for generating the model in :mod:`openstack.common.report.models.conf`. """ -from oslo.config import cfg +from oslo_config import cfg from nova.openstack.common.report.models import conf as cm diff --git a/nova/openstack/common/report/guru_meditation_report.py b/nova/openstack/common/report/guru_meditation_report.py index 8310d3c847..80fd116264 100644 --- a/nova/openstack/common/report/guru_meditation_report.py +++ b/nova/openstack/common/report/guru_meditation_report.py @@ -56,7 +56,7 @@ import os import signal import sys -from oslo.utils import timeutils +from oslo_utils import timeutils from nova.openstack.common.report.generators import conf as cgen from nova.openstack.common.report.generators import threading as tgen diff --git a/nova/openstack/common/report/views/json/generic.py b/nova/openstack/common/report/views/json/generic.py index 7c4fbc2901..e5e1098d46 100644 --- a/nova/openstack/common/report/views/json/generic.py +++ b/nova/openstack/common/report/views/json/generic.py @@ -25,7 +25,7 @@ such strings specially) import copy -from oslo.serialization import jsonutils as json +from oslo_serialization import jsonutils as json from nova.openstack.common.report import utils as utils diff --git a/nova/openstack/common/service.py b/nova/openstack/common/service.py index 616db6afa4..c8bf13a78f 100644 --- a/nova/openstack/common/service.py +++ b/nova/openstack/common/service.py @@ -35,7 +35,7 @@ except ImportError: import eventlet from eventlet import event -from oslo.config import cfg +from oslo_config import cfg from nova.openstack.common import eventlet_backdoor from nova.openstack.common._i18n import _LE, _LI, _LW diff --git a/nova/openstack/common/sslutils.py b/nova/openstack/common/sslutils.py index 69b6fef80c..1fa64ef903 100644 --- a/nova/openstack/common/sslutils.py +++ b/nova/openstack/common/sslutils.py @@ -16,7 +16,7 @@ import copy import os import ssl -from oslo.config import cfg +from oslo_config import cfg from nova.openstack.common._i18n import _ diff --git a/nova/paths.py b/nova/paths.py index 5fc556057a..4f683741da 100644 --- a/nova/paths.py +++ b/nova/paths.py @@ -18,7 +18,7 @@ import os import sys -from oslo.config import cfg +from oslo_config import cfg path_opts = [ cfg.StrOpt('pybasedir', diff --git a/nova/pci/request.py b/nova/pci/request.py index cb0ae049bc..82bdcd5852 100644 --- a/nova/pci/request.py +++ b/nova/pci/request.py @@ -39,8 +39,8 @@ import copy import jsonschema -from oslo.config import cfg -from oslo.serialization import jsonutils +from oslo_config import cfg +from oslo_serialization import jsonutils import six from nova import exception diff --git a/nova/pci/stats.py b/nova/pci/stats.py index 41737812f1..8ce2ed698e 100644 --- a/nova/pci/stats.py +++ b/nova/pci/stats.py @@ -16,7 +16,7 @@ import copy -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils from nova import exception from nova.i18n import _LE diff --git a/nova/pci/whitelist.py b/nova/pci/whitelist.py index 0d48405836..74de26dd78 100644 --- a/nova/pci/whitelist.py +++ b/nova/pci/whitelist.py @@ -14,8 +14,8 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.config import cfg -from oslo.serialization import jsonutils +from oslo_config import cfg +from oslo_serialization import jsonutils from nova import exception from nova.i18n import _ diff --git a/nova/quota.py b/nova/quota.py index 541918822c..79f50aa89a 100644 --- a/nova/quota.py +++ b/nova/quota.py @@ -18,9 +18,9 @@ import datetime -from oslo.config import cfg -from oslo.utils import importutils -from oslo.utils import timeutils +from oslo_config import cfg +from oslo_utils import importutils +from oslo_utils import timeutils import six from nova import db diff --git a/nova/rdp/__init__.py b/nova/rdp/__init__.py index ef30ba184b..a8879f782e 100644 --- a/nova/rdp/__init__.py +++ b/nova/rdp/__init__.py @@ -14,7 +14,7 @@ """Module for RDP Proxying.""" -from oslo.config import cfg +from oslo_config import cfg rdp_opts = [ diff --git a/nova/rpc.py b/nova/rpc.py index 84cd592ccc..29008e5985 100644 --- a/nova/rpc.py +++ b/nova/rpc.py @@ -26,9 +26,9 @@ __all__ = [ 'TRANSPORT_ALIASES', ] -from oslo.config import cfg -from oslo import messaging -from oslo.serialization import jsonutils +from oslo_config import cfg +import oslo_messaging as messaging +from oslo_serialization import jsonutils import nova.context import nova.exception diff --git a/nova/scheduler/chance.py b/nova/scheduler/chance.py index 528711ce2f..f2b0528444 100644 --- a/nova/scheduler/chance.py +++ b/nova/scheduler/chance.py @@ -21,7 +21,7 @@ Chance (Random) Scheduler implementation import random -from oslo.config import cfg +from oslo_config import cfg from nova import exception from nova.i18n import _ diff --git a/nova/scheduler/client/__init__.py b/nova/scheduler/client/__init__.py index 338a95ad58..6c349d3c00 100644 --- a/nova/scheduler/client/__init__.py +++ b/nova/scheduler/client/__init__.py @@ -15,7 +15,7 @@ import functools -from oslo.utils import importutils +from oslo_utils import importutils from nova.scheduler import utils diff --git a/nova/scheduler/driver.py b/nova/scheduler/driver.py index 1f7e6debe3..91b0cd4f2f 100644 --- a/nova/scheduler/driver.py +++ b/nova/scheduler/driver.py @@ -19,8 +19,8 @@ Scheduler base class that all Schedulers should inherit from """ -from oslo.config import cfg -from oslo.utils import importutils +from oslo_config import cfg +from oslo_utils import importutils from nova import db from nova.i18n import _ diff --git a/nova/scheduler/filter_scheduler.py b/nova/scheduler/filter_scheduler.py index 80acc020a7..c24687c0a1 100644 --- a/nova/scheduler/filter_scheduler.py +++ b/nova/scheduler/filter_scheduler.py @@ -21,7 +21,7 @@ Weighing Functions. import random -from oslo.config import cfg +from oslo_config import cfg from nova import exception from nova.i18n import _ diff --git a/nova/scheduler/filters/aggregate_image_properties_isolation.py b/nova/scheduler/filters/aggregate_image_properties_isolation.py index 7ff9e4ff02..4fad37bd29 100644 --- a/nova/scheduler/filters/aggregate_image_properties_isolation.py +++ b/nova/scheduler/filters/aggregate_image_properties_isolation.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.config import cfg +from oslo_config import cfg from nova.openstack.common import log as logging from nova.scheduler import filters diff --git a/nova/scheduler/filters/availability_zone_filter.py b/nova/scheduler/filters/availability_zone_filter.py index 02476e519f..534474fded 100644 --- a/nova/scheduler/filters/availability_zone_filter.py +++ b/nova/scheduler/filters/availability_zone_filter.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.config import cfg +from oslo_config import cfg from nova.openstack.common import log as logging from nova.scheduler import filters diff --git a/nova/scheduler/filters/compute_capabilities_filter.py b/nova/scheduler/filters/compute_capabilities_filter.py index c05d9c35c7..aa3994671d 100644 --- a/nova/scheduler/filters/compute_capabilities_filter.py +++ b/nova/scheduler/filters/compute_capabilities_filter.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils import six from nova.openstack.common import log as logging diff --git a/nova/scheduler/filters/compute_filter.py b/nova/scheduler/filters/compute_filter.py index 8cad68ff43..0dbfcf2657 100644 --- a/nova/scheduler/filters/compute_filter.py +++ b/nova/scheduler/filters/compute_filter.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.config import cfg +from oslo_config import cfg from nova.i18n import _LW from nova.openstack.common import log as logging diff --git a/nova/scheduler/filters/core_filter.py b/nova/scheduler/filters/core_filter.py index d588a22dfd..9d00917c87 100644 --- a/nova/scheduler/filters/core_filter.py +++ b/nova/scheduler/filters/core_filter.py @@ -15,7 +15,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.config import cfg +from oslo_config import cfg from nova.i18n import _LW from nova.openstack.common import log as logging diff --git a/nova/scheduler/filters/disk_filter.py b/nova/scheduler/filters/disk_filter.py index 75e1cf03d8..c2e53f4c3a 100644 --- a/nova/scheduler/filters/disk_filter.py +++ b/nova/scheduler/filters/disk_filter.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.config import cfg +from oslo_config import cfg from nova.i18n import _LW from nova.openstack.common import log as logging diff --git a/nova/scheduler/filters/io_ops_filter.py b/nova/scheduler/filters/io_ops_filter.py index e22167a131..f721c76e15 100644 --- a/nova/scheduler/filters/io_ops_filter.py +++ b/nova/scheduler/filters/io_ops_filter.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.config import cfg +from oslo_config import cfg from nova.i18n import _LW from nova.openstack.common import log as logging diff --git a/nova/scheduler/filters/isolated_hosts_filter.py b/nova/scheduler/filters/isolated_hosts_filter.py index 6d383dde09..a77cd2f919 100644 --- a/nova/scheduler/filters/isolated_hosts_filter.py +++ b/nova/scheduler/filters/isolated_hosts_filter.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.config import cfg +from oslo_config import cfg from nova.scheduler import filters diff --git a/nova/scheduler/filters/json_filter.py b/nova/scheduler/filters/json_filter.py index 6f3e914af0..e3f59b2be0 100644 --- a/nova/scheduler/filters/json_filter.py +++ b/nova/scheduler/filters/json_filter.py @@ -16,7 +16,7 @@ import operator -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils import six from nova.scheduler import filters diff --git a/nova/scheduler/filters/metrics_filter.py b/nova/scheduler/filters/metrics_filter.py index 3118a693ef..a520410194 100644 --- a/nova/scheduler/filters/metrics_filter.py +++ b/nova/scheduler/filters/metrics_filter.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.config import cfg +from oslo_config import cfg from nova.openstack.common import log as logging from nova.scheduler import filters diff --git a/nova/scheduler/filters/num_instances_filter.py b/nova/scheduler/filters/num_instances_filter.py index ea8953d0ef..b596a0ce62 100644 --- a/nova/scheduler/filters/num_instances_filter.py +++ b/nova/scheduler/filters/num_instances_filter.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.config import cfg +from oslo_config import cfg from nova.i18n import _LW from nova.openstack.common import log as logging diff --git a/nova/scheduler/filters/numa_topology_filter.py b/nova/scheduler/filters/numa_topology_filter.py index e0d2fe8d59..9562406c8c 100644 --- a/nova/scheduler/filters/numa_topology_filter.py +++ b/nova/scheduler/filters/numa_topology_filter.py @@ -10,7 +10,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.config import cfg +from oslo_config import cfg from nova.scheduler import filters from nova.virt import hardware diff --git a/nova/scheduler/filters/ram_filter.py b/nova/scheduler/filters/ram_filter.py index 4677d2feb3..1ebf9d15f7 100644 --- a/nova/scheduler/filters/ram_filter.py +++ b/nova/scheduler/filters/ram_filter.py @@ -14,7 +14,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.config import cfg +from oslo_config import cfg from nova.i18n import _LW from nova.openstack.common import log as logging diff --git a/nova/scheduler/filters/trusted_filter.py b/nova/scheduler/filters/trusted_filter.py index 4fd33f6c0e..3b62a12cd6 100644 --- a/nova/scheduler/filters/trusted_filter.py +++ b/nova/scheduler/filters/trusted_filter.py @@ -43,9 +43,9 @@ the Open Attestation project at: https://github.com/OpenAttestation/OpenAttestation """ -from oslo.config import cfg -from oslo.serialization import jsonutils -from oslo.utils import timeutils +from oslo_config import cfg +from oslo_serialization import jsonutils +from oslo_utils import timeutils import requests from nova import context diff --git a/nova/scheduler/host_manager.py b/nova/scheduler/host_manager.py index 65e2ff907f..f58a8ee7c3 100644 --- a/nova/scheduler/host_manager.py +++ b/nova/scheduler/host_manager.py @@ -20,9 +20,9 @@ Manage hosts in the current zone. import collections import UserDict -from oslo.config import cfg -from oslo.serialization import jsonutils -from oslo.utils import timeutils +from oslo_config import cfg +from oslo_serialization import jsonutils +from oslo_utils import timeutils from nova.compute import task_states from nova.compute import vm_states diff --git a/nova/scheduler/ironic_host_manager.py b/nova/scheduler/ironic_host_manager.py index 59f3839a4c..7d90fa4466 100644 --- a/nova/scheduler/ironic_host_manager.py +++ b/nova/scheduler/ironic_host_manager.py @@ -21,9 +21,9 @@ This host manager will consume all cpu's, disk space, and ram from a host / node as it is supporting Baremetal hosts, which can not be subdivided into multiple instances. """ -from oslo.config import cfg -from oslo.serialization import jsonutils -from oslo.utils import timeutils +from oslo_config import cfg +from oslo_serialization import jsonutils +from oslo_utils import timeutils from nova.openstack.common import log as logging from nova.scheduler import host_manager diff --git a/nova/scheduler/manager.py b/nova/scheduler/manager.py index a272654e46..1599e31ce1 100644 --- a/nova/scheduler/manager.py +++ b/nova/scheduler/manager.py @@ -19,10 +19,10 @@ Scheduler Service """ -from oslo.config import cfg -from oslo import messaging -from oslo.serialization import jsonutils -from oslo.utils import importutils +from oslo_config import cfg +import oslo_messaging as messaging +from oslo_serialization import jsonutils +from oslo_utils import importutils from nova import exception from nova import manager diff --git a/nova/scheduler/rpcapi.py b/nova/scheduler/rpcapi.py index 2bcdabee49..329f561a5d 100644 --- a/nova/scheduler/rpcapi.py +++ b/nova/scheduler/rpcapi.py @@ -16,8 +16,8 @@ Client side of the scheduler manager RPC API. """ -from oslo.config import cfg -from oslo import messaging +from oslo_config import cfg +import oslo_messaging as messaging from nova.objects import base as objects_base from nova import rpc diff --git a/nova/scheduler/scheduler_options.py b/nova/scheduler/scheduler_options.py index 43d04a3f9d..dca38afb34 100644 --- a/nova/scheduler/scheduler_options.py +++ b/nova/scheduler/scheduler_options.py @@ -23,10 +23,10 @@ dynamic configuration. import datetime import os -from oslo.config import cfg -from oslo.serialization import jsonutils -from oslo.utils import excutils -from oslo.utils import timeutils +from oslo_config import cfg +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 diff --git a/nova/scheduler/utils.py b/nova/scheduler/utils.py index c146dcd606..c87796b625 100644 --- a/nova/scheduler/utils.py +++ b/nova/scheduler/utils.py @@ -18,9 +18,9 @@ import collections import functools import sys -from oslo.config import cfg -from oslo import messaging -from oslo.serialization import jsonutils +from oslo_config import cfg +import oslo_messaging as messaging +from oslo_serialization import jsonutils from nova.compute import flavors from nova.compute import utils as compute_utils diff --git a/nova/scheduler/weights/io_ops.py b/nova/scheduler/weights/io_ops.py index 37f1895519..40b36b6130 100644 --- a/nova/scheduler/weights/io_ops.py +++ b/nova/scheduler/weights/io_ops.py @@ -21,7 +21,7 @@ option to a positive number and the weighing has the opposite effect of the default. """ -from oslo.config import cfg +from oslo_config import cfg from nova.scheduler import weights diff --git a/nova/scheduler/weights/metrics.py b/nova/scheduler/weights/metrics.py index db21498391..602a779945 100644 --- a/nova/scheduler/weights/metrics.py +++ b/nova/scheduler/weights/metrics.py @@ -26,7 +26,7 @@ in the configuration file as the followings: The final weight would be name1.value * 1.0 + name2.value * -1.0. """ -from oslo.config import cfg +from oslo_config import cfg from nova import exception from nova.scheduler import utils diff --git a/nova/scheduler/weights/ram.py b/nova/scheduler/weights/ram.py index b17ccbe0fa..740a3d2843 100644 --- a/nova/scheduler/weights/ram.py +++ b/nova/scheduler/weights/ram.py @@ -20,7 +20,7 @@ stacking, you can set the 'ram_weight_multiplier' option to a negative number and the weighing has the opposite effect of the default. """ -from oslo.config import cfg +from oslo_config import cfg from nova.scheduler import weights diff --git a/nova/service.py b/nova/service.py index b3c5264189..dcc3323422 100644 --- a/nova/service.py +++ b/nova/service.py @@ -21,10 +21,10 @@ import os import random import sys -from oslo.config import cfg -from oslo import messaging -from oslo.utils import importutils from oslo_concurrency import processutils +from oslo_config import cfg +import oslo_messaging as messaging +from oslo_utils import importutils from nova import baserpc from nova import conductor diff --git a/nova/servicegroup/api.py b/nova/servicegroup/api.py index bde988faa9..07dcec13ba 100644 --- a/nova/servicegroup/api.py +++ b/nova/servicegroup/api.py @@ -16,8 +16,8 @@ """Define APIs for the servicegroup access.""" -from oslo.config import cfg -from oslo.utils import importutils +from oslo_config import cfg +from oslo_utils import importutils from nova.i18n import _, _LW from nova.openstack.common import log as logging diff --git a/nova/servicegroup/drivers/db.py b/nova/servicegroup/drivers/db.py index 72f9262bff..4a14259b69 100644 --- a/nova/servicegroup/drivers/db.py +++ b/nova/servicegroup/drivers/db.py @@ -13,8 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -from oslo.config import cfg -from oslo.utils import timeutils +from oslo_config import cfg +from oslo_utils import timeutils import six from nova import conductor diff --git a/nova/servicegroup/drivers/mc.py b/nova/servicegroup/drivers/mc.py index bc993e0af7..0534ceb973 100644 --- a/nova/servicegroup/drivers/mc.py +++ b/nova/servicegroup/drivers/mc.py @@ -17,8 +17,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -from oslo.config import cfg -from oslo.utils import timeutils +from oslo_config import cfg +from oslo_utils import timeutils from nova import conductor from nova import context diff --git a/nova/servicegroup/drivers/zk.py b/nova/servicegroup/drivers/zk.py index 7d2ca5f340..b391d173f5 100644 --- a/nova/servicegroup/drivers/zk.py +++ b/nova/servicegroup/drivers/zk.py @@ -17,8 +17,8 @@ import os import eventlet -from oslo.config import cfg -from oslo.utils import importutils +from oslo_config import cfg +from oslo_utils import importutils from nova import exception from nova.i18n import _LE, _LW diff --git a/nova/spice/__init__.py b/nova/spice/__init__.py index 5db3bbb887..4efb6d3b9f 100644 --- a/nova/spice/__init__.py +++ b/nova/spice/__init__.py @@ -15,7 +15,7 @@ """Module for SPICE Proxying.""" -from oslo.config import cfg +from oslo_config import cfg spice_opts = [ diff --git a/nova/test.py b/nova/test.py index 673e953ab7..cb0a17b1ea 100644 --- a/nova/test.py +++ b/nova/test.py @@ -31,10 +31,10 @@ import mock import os import fixtures -from oslo.config import cfg -from oslo.config import fixture as config_fixture -from oslo.utils import timeutils from oslo_concurrency import lockutils +from oslo_config import cfg +from oslo_config import fixture as config_fixture +from oslo_utils import timeutils from oslotest import moxstubout import six import testtools diff --git a/nova/tests/fixtures.py b/nova/tests/fixtures.py index 3e97c52794..eca825a6ca 100644 --- a/nova/tests/fixtures.py +++ b/nova/tests/fixtures.py @@ -24,8 +24,8 @@ import uuid import warnings import fixtures -from oslo.config import cfg -from oslo.messaging import conffixture as messaging_conffixture +from oslo_config import cfg +from oslo_messaging import conffixture as messaging_conffixture from nova.db import migration from nova.db.sqlalchemy import api as session diff --git a/nova/tests/functional/api/client.py b/nova/tests/functional/api/client.py index a03b031aa7..ed542c9d92 100644 --- a/nova/tests/functional/api/client.py +++ b/nova/tests/functional/api/client.py @@ -14,7 +14,7 @@ import urllib -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils import requests from nova.openstack.common import log as logging diff --git a/nova/tests/functional/api_samples_test_base.py b/nova/tests/functional/api_samples_test_base.py index cc2a4ef87d..a5b6d1a61d 100644 --- a/nova/tests/functional/api_samples_test_base.py +++ b/nova/tests/functional/api_samples_test_base.py @@ -16,8 +16,8 @@ import os import re -from oslo.serialization import jsonutils -from oslo.utils import importutils +from oslo_serialization import jsonutils +from oslo_utils import importutils import six from nova import test diff --git a/nova/tests/functional/integrated_helpers.py b/nova/tests/functional/integrated_helpers.py index e9cf11a040..352325280d 100644 --- a/nova/tests/functional/integrated_helpers.py +++ b/nova/tests/functional/integrated_helpers.py @@ -21,7 +21,7 @@ import random import string import uuid -from oslo.config import cfg +from oslo_config import cfg from nova import crypto import nova.image.glance diff --git a/nova/tests/functional/test_api_samples.py b/nova/tests/functional/test_api_samples.py index 28910162d4..7efa56e3c7 100644 --- a/nova/tests/functional/test_api_samples.py +++ b/nova/tests/functional/test_api_samples.py @@ -23,10 +23,10 @@ import urllib import uuid as uuid_lib import mock -from oslo.config import cfg -from oslo.serialization import jsonutils -from oslo.utils import importutils -from oslo.utils import timeutils +from oslo_config import cfg +from oslo_serialization import jsonutils +from oslo_utils import importutils +from oslo_utils import timeutils from nova.api.metadata import password from nova.api.openstack.compute.contrib import fping diff --git a/nova/tests/functional/test_extensions.py b/nova/tests/functional/test_extensions.py index b660a11f3b..42ff64277f 100644 --- a/nova/tests/functional/test_extensions.py +++ b/nova/tests/functional/test_extensions.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.config import cfg +from oslo_config import cfg # Import extensions to pull in osapi_compute_extension CONF option used below. from nova.openstack.common import log as logging diff --git a/nova/tests/functional/test_servers.py b/nova/tests/functional/test_servers.py index 35fb6effc9..a9cd9c3703 100644 --- a/nova/tests/functional/test_servers.py +++ b/nova/tests/functional/test_servers.py @@ -17,7 +17,7 @@ import datetime import time import zlib -from oslo.utils import timeutils +from oslo_utils import timeutils from nova import context from nova import exception diff --git a/nova/tests/functional/v3/api_sample_base.py b/nova/tests/functional/v3/api_sample_base.py index 408c9124f3..5c2655f117 100644 --- a/nova/tests/functional/v3/api_sample_base.py +++ b/nova/tests/functional/v3/api_sample_base.py @@ -14,7 +14,7 @@ import os -from oslo.config import cfg +from oslo_config import cfg from nova.api.openstack import API_V3_CORE_EXTENSIONS # noqa from nova import test diff --git a/nova/tests/functional/v3/test_availability_zone.py b/nova/tests/functional/v3/test_availability_zone.py index 20b53aaf68..78c9ffebd7 100644 --- a/nova/tests/functional/v3/test_availability_zone.py +++ b/nova/tests/functional/v3/test_availability_zone.py @@ -12,7 +12,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.config import cfg +from oslo_config import cfg from nova.tests.functional.v3 import test_servers diff --git a/nova/tests/functional/v3/test_cloudpipe.py b/nova/tests/functional/v3/test_cloudpipe.py index 78238328f5..6616ba0a01 100644 --- a/nova/tests/functional/v3/test_cloudpipe.py +++ b/nova/tests/functional/v3/test_cloudpipe.py @@ -14,7 +14,7 @@ import uuid as uuid_lib -from oslo.config import cfg +from oslo_config import cfg from nova.cloudpipe import pipelib from nova.network import api as network_api diff --git a/nova/tests/functional/v3/test_console_auth_tokens.py b/nova/tests/functional/v3/test_console_auth_tokens.py index bc0abfafa7..9cebb98e1d 100644 --- a/nova/tests/functional/v3/test_console_auth_tokens.py +++ b/nova/tests/functional/v3/test_console_auth_tokens.py @@ -14,7 +14,7 @@ import re -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils from nova.tests.functional.v3 import test_servers diff --git a/nova/tests/functional/v3/test_extension_info.py b/nova/tests/functional/v3/test_extension_info.py index b4f5961126..b0c0eded97 100644 --- a/nova/tests/functional/v3/test_extension_info.py +++ b/nova/tests/functional/v3/test_extension_info.py @@ -16,7 +16,7 @@ import re import mock -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils from nova.api.openstack import extensions as api_extensions from nova.tests.functional.v3 import api_sample_base diff --git a/nova/tests/functional/v3/test_floating_ips.py b/nova/tests/functional/v3/test_floating_ips.py index 574df2ce34..6b59438f34 100644 --- a/nova/tests/functional/v3/test_floating_ips.py +++ b/nova/tests/functional/v3/test_floating_ips.py @@ -13,7 +13,7 @@ # under the License. -from oslo.config import cfg +from oslo_config import cfg from nova import context from nova.tests.functional.v3 import api_sample_base diff --git a/nova/tests/functional/v3/test_floating_ips_bulk.py b/nova/tests/functional/v3/test_floating_ips_bulk.py index 5129ddf1a8..1c780a0260 100644 --- a/nova/tests/functional/v3/test_floating_ips_bulk.py +++ b/nova/tests/functional/v3/test_floating_ips_bulk.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.config import cfg +from oslo_config import cfg from nova import context from nova.tests.functional.v3 import api_sample_base diff --git a/nova/tests/functional/v3/test_hide_server_addresses.py b/nova/tests/functional/v3/test_hide_server_addresses.py index 1916c75294..7ad5a935db 100644 --- a/nova/tests/functional/v3/test_hide_server_addresses.py +++ b/nova/tests/functional/v3/test_hide_server_addresses.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.config import cfg +from oslo_config import cfg from nova.compute import vm_states from nova.tests.functional.v3 import test_servers diff --git a/nova/tests/functional/v3/test_networks_associate.py b/nova/tests/functional/v3/test_networks_associate.py index 9de2127942..e8a09501e3 100644 --- a/nova/tests/functional/v3/test_networks_associate.py +++ b/nova/tests/functional/v3/test_networks_associate.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.config import cfg +from oslo_config import cfg from nova.network import api as network_api from nova.tests.functional.v3 import api_sample_base diff --git a/nova/tests/functional/v3/test_pci.py b/nova/tests/functional/v3/test_pci.py index ca2f2889eb..424b5c138e 100644 --- a/nova/tests/functional/v3/test_pci.py +++ b/nova/tests/functional/v3/test_pci.py @@ -13,7 +13,7 @@ # under the License. import mock -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils from nova import db from nova.tests.functional.v3 import api_sample_base diff --git a/nova/tests/functional/v3/test_services.py b/nova/tests/functional/v3/test_services.py index 0d7ee35067..d839d9f123 100644 --- a/nova/tests/functional/v3/test_services.py +++ b/nova/tests/functional/v3/test_services.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.utils import timeutils +from oslo_utils import timeutils from nova import db from nova.tests.functional.v3 import api_sample_base diff --git a/nova/tests/functional/v3/test_shelve.py b/nova/tests/functional/v3/test_shelve.py index 6950eba8ec..75d3f87c98 100644 --- a/nova/tests/functional/v3/test_shelve.py +++ b/nova/tests/functional/v3/test_shelve.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.config import cfg +from oslo_config import cfg from nova.tests.functional.v3 import test_servers diff --git a/nova/tests/functional/v3/test_simple_tenant_usage.py b/nova/tests/functional/v3/test_simple_tenant_usage.py index 1d5f95a0f0..b1aae0550e 100644 --- a/nova/tests/functional/v3/test_simple_tenant_usage.py +++ b/nova/tests/functional/v3/test_simple_tenant_usage.py @@ -15,7 +15,7 @@ import datetime import urllib -from oslo.utils import timeutils +from oslo_utils import timeutils from nova.tests.functional.v3 import test_servers diff --git a/nova/tests/functional/v3/test_tenant_networks.py b/nova/tests/functional/v3/test_tenant_networks.py index 5e5ed0ecf9..d7f16c8118 100644 --- a/nova/tests/functional/v3/test_tenant_networks.py +++ b/nova/tests/functional/v3/test_tenant_networks.py @@ -14,8 +14,8 @@ # under the License. -from oslo.config import cfg -from oslo.serialization import jsonutils +from oslo_config import cfg +from oslo_serialization import jsonutils import nova.quota from nova.tests.functional.v3 import api_sample_base diff --git a/nova/tests/unit/api/ec2/test_apirequest.py b/nova/tests/unit/api/ec2/test_apirequest.py index 4b2dee96f8..f8ee8c8249 100644 --- a/nova/tests/unit/api/ec2/test_apirequest.py +++ b/nova/tests/unit/api/ec2/test_apirequest.py @@ -18,7 +18,7 @@ import copy -from oslo.utils import timeutils +from oslo_utils import timeutils from nova.api.ec2 import apirequest from nova import test diff --git a/nova/tests/unit/api/ec2/test_cinder_cloud.py b/nova/tests/unit/api/ec2/test_cinder_cloud.py index 89002a494d..dbb90f5741 100644 --- a/nova/tests/unit/api/ec2/test_cinder_cloud.py +++ b/nova/tests/unit/api/ec2/test_cinder_cloud.py @@ -20,7 +20,7 @@ import copy import uuid import fixtures -from oslo.config import cfg +from oslo_config import cfg from nova.api.ec2 import cloud from nova.api.ec2 import ec2utils diff --git a/nova/tests/unit/api/ec2/test_cloud.py b/nova/tests/unit/api/ec2/test_cloud.py index 9a41d75a49..24069d2738 100644 --- a/nova/tests/unit/api/ec2/test_cloud.py +++ b/nova/tests/unit/api/ec2/test_cloud.py @@ -27,8 +27,8 @@ import tempfile import fixtures import iso8601 import mock -from oslo.config import cfg -from oslo.utils import timeutils +from oslo_config import cfg +from oslo_utils import timeutils from nova.api.ec2 import cloud from nova.api.ec2 import ec2utils diff --git a/nova/tests/unit/api/ec2/test_ec2_validate.py b/nova/tests/unit/api/ec2/test_ec2_validate.py index 53ae8c110e..7e05606213 100644 --- a/nova/tests/unit/api/ec2/test_ec2_validate.py +++ b/nova/tests/unit/api/ec2/test_ec2_validate.py @@ -16,8 +16,8 @@ import datetime -from oslo.config import cfg -from oslo.utils import timeutils +from oslo_config import cfg +from oslo_utils import timeutils from nova.api.ec2 import cloud from nova.api.ec2 import ec2utils diff --git a/nova/tests/unit/api/ec2/test_middleware.py b/nova/tests/unit/api/ec2/test_middleware.py index 7f925489e0..d3f84a34c1 100644 --- a/nova/tests/unit/api/ec2/test_middleware.py +++ b/nova/tests/unit/api/ec2/test_middleware.py @@ -16,8 +16,8 @@ from lxml import etree import mock -from oslo.config import cfg -from oslo.utils import timeutils +from oslo_config import cfg +from oslo_utils import timeutils import requests import webob import webob.dec diff --git a/nova/tests/unit/api/openstack/common.py b/nova/tests/unit/api/openstack/common.py index 972958a329..cec86f87d1 100644 --- a/nova/tests/unit/api/openstack/common.py +++ b/nova/tests/unit/api/openstack/common.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils import webob diff --git a/nova/tests/unit/api/openstack/compute/admin_only_action_common.py b/nova/tests/unit/api/openstack/compute/admin_only_action_common.py index ce99d1069b..f8bcfbf5b7 100644 --- a/nova/tests/unit/api/openstack/compute/admin_only_action_common.py +++ b/nova/tests/unit/api/openstack/compute/admin_only_action_common.py @@ -12,8 +12,8 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.serialization import jsonutils -from oslo.utils import timeutils +from oslo_serialization import jsonutils +from oslo_utils import timeutils import webob from nova.compute import vm_states diff --git a/nova/tests/unit/api/openstack/compute/contrib/test_attach_interfaces.py b/nova/tests/unit/api/openstack/compute/contrib/test_attach_interfaces.py index b0687cd3bd..9132e4c16b 100644 --- a/nova/tests/unit/api/openstack/compute/contrib/test_attach_interfaces.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_attach_interfaces.py @@ -14,8 +14,8 @@ # under the License. import mock -from oslo.config import cfg -from oslo.serialization import jsonutils +from oslo_config import cfg +from oslo_serialization import jsonutils from nova.api.openstack.compute.contrib import attach_interfaces \ as attach_interfaces_v2 diff --git a/nova/tests/unit/api/openstack/compute/contrib/test_availability_zone.py b/nova/tests/unit/api/openstack/compute/contrib/test_availability_zone.py index 8e04925bec..d39ec466ee 100644 --- a/nova/tests/unit/api/openstack/compute/contrib/test_availability_zone.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_availability_zone.py @@ -14,8 +14,8 @@ import datetime -from oslo.config import cfg -from oslo.serialization import jsonutils +from oslo_config import cfg +from oslo_serialization import jsonutils import webob from nova.api.openstack.compute.contrib import availability_zone as az_v2 diff --git a/nova/tests/unit/api/openstack/compute/contrib/test_block_device_mapping.py b/nova/tests/unit/api/openstack/compute/contrib/test_block_device_mapping.py index 17a9b01276..31c13ffbd1 100644 --- a/nova/tests/unit/api/openstack/compute/contrib/test_block_device_mapping.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_block_device_mapping.py @@ -15,8 +15,8 @@ import mock from mox3 import mox -from oslo.config import cfg -from oslo.serialization import jsonutils +from oslo_config import cfg +from oslo_serialization import jsonutils from webob import exc from nova.api.openstack.compute import extensions diff --git a/nova/tests/unit/api/openstack/compute/contrib/test_block_device_mapping_v1.py b/nova/tests/unit/api/openstack/compute/contrib/test_block_device_mapping_v1.py index 0074937958..92a812ebb8 100644 --- a/nova/tests/unit/api/openstack/compute/contrib/test_block_device_mapping_v1.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_block_device_mapping_v1.py @@ -15,8 +15,8 @@ import mock from mox3 import mox -from oslo.config import cfg -from oslo.serialization import jsonutils +from oslo_config import cfg +from oslo_serialization import jsonutils from webob import exc from nova.api.openstack.compute import extensions diff --git a/nova/tests/unit/api/openstack/compute/contrib/test_cells.py b/nova/tests/unit/api/openstack/compute/contrib/test_cells.py index a5ef50d077..1e4ef8dd9e 100644 --- a/nova/tests/unit/api/openstack/compute/contrib/test_cells.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_cells.py @@ -15,7 +15,7 @@ import copy -from oslo.utils import timeutils +from oslo_utils import timeutils from webob import exc from nova.api.openstack.compute.contrib import cells as cells_ext_v2 diff --git a/nova/tests/unit/api/openstack/compute/contrib/test_cloudpipe.py b/nova/tests/unit/api/openstack/compute/contrib/test_cloudpipe.py index 2a919e6b04..97113dbb1d 100644 --- a/nova/tests/unit/api/openstack/compute/contrib/test_cloudpipe.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_cloudpipe.py @@ -15,8 +15,8 @@ import uuid as uuid_lib -from oslo.config import cfg -from oslo.utils import timeutils +from oslo_config import cfg +from oslo_utils import timeutils from webob import exc from nova.api.openstack.compute.contrib import cloudpipe as cloudpipe_v2 diff --git a/nova/tests/unit/api/openstack/compute/contrib/test_config_drive.py b/nova/tests/unit/api/openstack/compute/contrib/test_config_drive.py index 5c2a42526f..4f1af8ab7e 100644 --- a/nova/tests/unit/api/openstack/compute/contrib/test_config_drive.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_config_drive.py @@ -15,8 +15,8 @@ import datetime -from oslo.config import cfg -from oslo.serialization import jsonutils +from oslo_config import cfg +from oslo_serialization import jsonutils import webob from nova.api.openstack.compute import plugins diff --git a/nova/tests/unit/api/openstack/compute/contrib/test_console_auth_tokens.py b/nova/tests/unit/api/openstack/compute/contrib/test_console_auth_tokens.py index e8d3864281..07681cd716 100644 --- a/nova/tests/unit/api/openstack/compute/contrib/test_console_auth_tokens.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_console_auth_tokens.py @@ -15,7 +15,7 @@ import copy -from oslo.config import cfg +from oslo_config import cfg import webob from nova.api.openstack.compute.contrib import console_auth_tokens \ diff --git a/nova/tests/unit/api/openstack/compute/contrib/test_createserverext.py b/nova/tests/unit/api/openstack/compute/contrib/test_createserverext.py index eae4ab57b2..0b52fd971c 100644 --- a/nova/tests/unit/api/openstack/compute/contrib/test_createserverext.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_createserverext.py @@ -15,7 +15,7 @@ import base64 -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils import webob from nova.compute import api as compute_api diff --git a/nova/tests/unit/api/openstack/compute/contrib/test_disk_config.py b/nova/tests/unit/api/openstack/compute/contrib/test_disk_config.py index 71e7d332ff..20ee2d8812 100644 --- a/nova/tests/unit/api/openstack/compute/contrib/test_disk_config.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_disk_config.py @@ -15,7 +15,7 @@ import datetime -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils from nova.api.openstack import compute from nova.compute import api as compute_api diff --git a/nova/tests/unit/api/openstack/compute/contrib/test_evacuate.py b/nova/tests/unit/api/openstack/compute/contrib/test_evacuate.py index b4b84cf08b..933dd02b54 100644 --- a/nova/tests/unit/api/openstack/compute/contrib/test_evacuate.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_evacuate.py @@ -14,7 +14,7 @@ import uuid -from oslo.config import cfg +from oslo_config import cfg import webob from nova.api.openstack.compute.contrib import evacuate as evacuate_v2 diff --git a/nova/tests/unit/api/openstack/compute/contrib/test_extended_availability_zone.py b/nova/tests/unit/api/openstack/compute/contrib/test_extended_availability_zone.py index 35f77078b3..be08ac45c8 100644 --- a/nova/tests/unit/api/openstack/compute/contrib/test_extended_availability_zone.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_extended_availability_zone.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils import webob from nova import availability_zones diff --git a/nova/tests/unit/api/openstack/compute/contrib/test_extended_ips.py b/nova/tests/unit/api/openstack/compute/contrib/test_extended_ips.py index c5ccdf3c1a..4f8743f21d 100644 --- a/nova/tests/unit/api/openstack/compute/contrib/test_extended_ips.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_extended_ips.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils import webob from nova import compute diff --git a/nova/tests/unit/api/openstack/compute/contrib/test_extended_ips_mac.py b/nova/tests/unit/api/openstack/compute/contrib/test_extended_ips_mac.py index 47661f4f71..9ad5a3acc0 100644 --- a/nova/tests/unit/api/openstack/compute/contrib/test_extended_ips_mac.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_extended_ips_mac.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils import webob from nova.api.openstack.compute.contrib import extended_ips_mac diff --git a/nova/tests/unit/api/openstack/compute/contrib/test_extended_rescue_with_image.py b/nova/tests/unit/api/openstack/compute/contrib/test_extended_rescue_with_image.py index 42a8382595..7219bd11a2 100644 --- a/nova/tests/unit/api/openstack/compute/contrib/test_extended_rescue_with_image.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_extended_rescue_with_image.py @@ -13,7 +13,7 @@ # under the License. import mock -from oslo.config import cfg +from oslo_config import cfg from nova.api.openstack import common from nova.api.openstack.compute.contrib import rescue diff --git a/nova/tests/unit/api/openstack/compute/contrib/test_extended_server_attributes.py b/nova/tests/unit/api/openstack/compute/contrib/test_extended_server_attributes.py index e3e6922454..53bfdebae5 100644 --- a/nova/tests/unit/api/openstack/compute/contrib/test_extended_server_attributes.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_extended_server_attributes.py @@ -13,8 +13,8 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.config import cfg -from oslo.serialization import jsonutils +from oslo_config import cfg +from oslo_serialization import jsonutils import webob from nova import compute diff --git a/nova/tests/unit/api/openstack/compute/contrib/test_extended_status.py b/nova/tests/unit/api/openstack/compute/contrib/test_extended_status.py index d1f0589236..a3b33373f7 100644 --- a/nova/tests/unit/api/openstack/compute/contrib/test_extended_status.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_extended_status.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils import webob from nova import compute diff --git a/nova/tests/unit/api/openstack/compute/contrib/test_extended_virtual_interfaces_net.py b/nova/tests/unit/api/openstack/compute/contrib/test_extended_virtual_interfaces_net.py index dd8e203f9b..b9b2815a8f 100644 --- a/nova/tests/unit/api/openstack/compute/contrib/test_extended_virtual_interfaces_net.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_extended_virtual_interfaces_net.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils import webob from nova.api.openstack.compute.contrib import extended_virtual_interfaces_net diff --git a/nova/tests/unit/api/openstack/compute/contrib/test_extended_volumes.py b/nova/tests/unit/api/openstack/compute/contrib/test_extended_volumes.py index 96dae359f7..e2504bf86d 100644 --- a/nova/tests/unit/api/openstack/compute/contrib/test_extended_volumes.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_extended_volumes.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils import webob from nova import compute diff --git a/nova/tests/unit/api/openstack/compute/contrib/test_flavor_disabled.py b/nova/tests/unit/api/openstack/compute/contrib/test_flavor_disabled.py index 1cf1834cbd..7262f2f359 100644 --- a/nova/tests/unit/api/openstack/compute/contrib/test_flavor_disabled.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_flavor_disabled.py @@ -12,7 +12,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils import webob from nova.compute import flavors diff --git a/nova/tests/unit/api/openstack/compute/contrib/test_flavor_manage.py b/nova/tests/unit/api/openstack/compute/contrib/test_flavor_manage.py index 9139569200..1c7aaa360d 100644 --- a/nova/tests/unit/api/openstack/compute/contrib/test_flavor_manage.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_flavor_manage.py @@ -16,7 +16,7 @@ import datetime import mock -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils import webob from nova.api.openstack.compute.contrib import flavor_access diff --git a/nova/tests/unit/api/openstack/compute/contrib/test_flavor_rxtx.py b/nova/tests/unit/api/openstack/compute/contrib/test_flavor_rxtx.py index ae7b20c5a9..c2756b25ac 100644 --- a/nova/tests/unit/api/openstack/compute/contrib/test_flavor_rxtx.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_flavor_rxtx.py @@ -12,7 +12,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils import webob from nova.compute import flavors diff --git a/nova/tests/unit/api/openstack/compute/contrib/test_flavor_swap.py b/nova/tests/unit/api/openstack/compute/contrib/test_flavor_swap.py index 12b0cc25d2..65de9c6cfd 100644 --- a/nova/tests/unit/api/openstack/compute/contrib/test_flavor_swap.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_flavor_swap.py @@ -12,7 +12,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils import webob from nova.compute import flavors diff --git a/nova/tests/unit/api/openstack/compute/contrib/test_flavorextradata.py b/nova/tests/unit/api/openstack/compute/contrib/test_flavorextradata.py index 1299b6c88d..f5d9164fdd 100644 --- a/nova/tests/unit/api/openstack/compute/contrib/test_flavorextradata.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_flavorextradata.py @@ -15,7 +15,7 @@ import datetime -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils import webob from nova.compute import flavors diff --git a/nova/tests/unit/api/openstack/compute/contrib/test_floating_ips_bulk.py b/nova/tests/unit/api/openstack/compute/contrib/test_floating_ips_bulk.py index b885014a87..5f1c21777b 100644 --- a/nova/tests/unit/api/openstack/compute/contrib/test_floating_ips_bulk.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_floating_ips_bulk.py @@ -14,7 +14,7 @@ import mock import netaddr -from oslo.config import cfg +from oslo_config import cfg import webob from nova.api.openstack.compute.contrib import floating_ips_bulk as fipbulk_v2 diff --git a/nova/tests/unit/api/openstack/compute/contrib/test_hide_server_addresses.py b/nova/tests/unit/api/openstack/compute/contrib/test_hide_server_addresses.py index d32b6e8b3f..32167aaab6 100644 --- a/nova/tests/unit/api/openstack/compute/contrib/test_hide_server_addresses.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_hide_server_addresses.py @@ -15,7 +15,7 @@ import itertools -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils import webob from nova import compute diff --git a/nova/tests/unit/api/openstack/compute/contrib/test_image_size.py b/nova/tests/unit/api/openstack/compute/contrib/test_image_size.py index b4e280145f..5f75aae496 100644 --- a/nova/tests/unit/api/openstack/compute/contrib/test_image_size.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_image_size.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils import webob from nova.image import glance diff --git a/nova/tests/unit/api/openstack/compute/contrib/test_instance_usage_audit_log.py b/nova/tests/unit/api/openstack/compute/contrib/test_instance_usage_audit_log.py index f1ac249371..082d5409e4 100644 --- a/nova/tests/unit/api/openstack/compute/contrib/test_instance_usage_audit_log.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_instance_usage_audit_log.py @@ -15,7 +15,7 @@ import datetime -from oslo.utils import timeutils +from oslo_utils import timeutils from nova.api.openstack.compute.contrib import instance_usage_audit_log as ial from nova.api.openstack.compute.plugins.v3 import instance_usage_audit_log as \ diff --git a/nova/tests/unit/api/openstack/compute/contrib/test_keypairs.py b/nova/tests/unit/api/openstack/compute/contrib/test_keypairs.py index 21025352c1..e0bd55e072 100644 --- a/nova/tests/unit/api/openstack/compute/contrib/test_keypairs.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_keypairs.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils import webob from nova.api.openstack.compute.contrib import keypairs as keypairs_v2 diff --git a/nova/tests/unit/api/openstack/compute/contrib/test_multinic.py b/nova/tests/unit/api/openstack/compute/contrib/test_multinic.py index dcf1dd299f..decc6fc5e8 100644 --- a/nova/tests/unit/api/openstack/compute/contrib/test_multinic.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_multinic.py @@ -14,7 +14,7 @@ # under the License. import mock -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils import webob from nova import compute diff --git a/nova/tests/unit/api/openstack/compute/contrib/test_multiple_create.py b/nova/tests/unit/api/openstack/compute/contrib/test_multiple_create.py index 5ce8a89459..eccac74eec 100644 --- a/nova/tests/unit/api/openstack/compute/contrib/test_multiple_create.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_multiple_create.py @@ -16,7 +16,7 @@ import datetime import uuid -from oslo.config import cfg +from oslo_config import cfg import webob from nova.api.openstack.compute import plugins diff --git a/nova/tests/unit/api/openstack/compute/contrib/test_networks.py b/nova/tests/unit/api/openstack/compute/contrib/test_networks.py index c5ac9b3cd2..c0c800a591 100644 --- a/nova/tests/unit/api/openstack/compute/contrib/test_networks.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_networks.py @@ -22,7 +22,7 @@ import uuid import iso8601 import mock import netaddr -from oslo.config import cfg +from oslo_config import cfg import webob from nova.api.openstack.compute.contrib import networks_associate diff --git a/nova/tests/unit/api/openstack/compute/contrib/test_neutron_security_groups.py b/nova/tests/unit/api/openstack/compute/contrib/test_neutron_security_groups.py index 356f9864be..ae103ba5e5 100644 --- a/nova/tests/unit/api/openstack/compute/contrib/test_neutron_security_groups.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_neutron_security_groups.py @@ -17,8 +17,8 @@ import uuid import mock from neutronclient.common import exceptions as n_exc from neutronclient.neutron import v2_0 as neutronv20 -from oslo.config import cfg -from oslo.serialization import jsonutils +from oslo_config import cfg +from oslo_serialization import jsonutils import webob from nova.api.openstack.compute.contrib import security_groups diff --git a/nova/tests/unit/api/openstack/compute/contrib/test_pci.py b/nova/tests/unit/api/openstack/compute/contrib/test_pci.py index 96ac7e82b9..9926285809 100644 --- a/nova/tests/unit/api/openstack/compute/contrib/test_pci.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_pci.py @@ -13,7 +13,7 @@ # under the License. -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils from webob import exc from nova.api.openstack.compute.plugins.v3 import pci diff --git a/nova/tests/unit/api/openstack/compute/contrib/test_rescue.py b/nova/tests/unit/api/openstack/compute/contrib/test_rescue.py index f8de7de291..a9df52c4b2 100644 --- a/nova/tests/unit/api/openstack/compute/contrib/test_rescue.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_rescue.py @@ -13,8 +13,8 @@ # under the License. import mock -from oslo.config import cfg -from oslo.serialization import jsonutils +from oslo_config import cfg +from oslo_serialization import jsonutils import webob from nova import compute diff --git a/nova/tests/unit/api/openstack/compute/contrib/test_scheduler_hints.py b/nova/tests/unit/api/openstack/compute/contrib/test_scheduler_hints.py index 03d757677f..7b0d77c920 100644 --- a/nova/tests/unit/api/openstack/compute/contrib/test_scheduler_hints.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_scheduler_hints.py @@ -15,8 +15,8 @@ import datetime -from oslo.config import cfg -from oslo.serialization import jsonutils +from oslo_config import cfg +from oslo_serialization import jsonutils from nova.api.openstack import compute from nova.api.openstack.compute import plugins diff --git a/nova/tests/unit/api/openstack/compute/contrib/test_security_group_default_rules.py b/nova/tests/unit/api/openstack/compute/contrib/test_security_group_default_rules.py index 5b50143dfb..d27aa88a65 100644 --- a/nova/tests/unit/api/openstack/compute/contrib/test_security_group_default_rules.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_security_group_default_rules.py @@ -13,7 +13,7 @@ # under the License. import mock -from oslo.config import cfg +from oslo_config import cfg import webob from nova.api.openstack.compute.contrib import \ diff --git a/nova/tests/unit/api/openstack/compute/contrib/test_security_groups.py b/nova/tests/unit/api/openstack/compute/contrib/test_security_groups.py index 4acadbcd6d..f339663b4f 100644 --- a/nova/tests/unit/api/openstack/compute/contrib/test_security_groups.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_security_groups.py @@ -15,8 +15,8 @@ import mock from mox3 import mox -from oslo.config import cfg -from oslo.serialization import jsonutils +from oslo_config import cfg +from oslo_serialization import jsonutils import webob from nova.api.openstack.compute.contrib import security_groups as secgroups_v2 diff --git a/nova/tests/unit/api/openstack/compute/contrib/test_server_diagnostics.py b/nova/tests/unit/api/openstack/compute/contrib/test_server_diagnostics.py index d32eb94271..e9dc2a5d04 100644 --- a/nova/tests/unit/api/openstack/compute/contrib/test_server_diagnostics.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_server_diagnostics.py @@ -14,7 +14,7 @@ # under the License. import mock -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils from nova.api.openstack import compute from nova.compute import api as compute_api diff --git a/nova/tests/unit/api/openstack/compute/contrib/test_server_external_events.py b/nova/tests/unit/api/openstack/compute/contrib/test_server_external_events.py index 519cb8cef0..18320f67ba 100644 --- a/nova/tests/unit/api/openstack/compute/contrib/test_server_external_events.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_server_external_events.py @@ -13,7 +13,7 @@ # under the License. import mock -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils import webob from nova.api.openstack.compute.contrib import server_external_events \ diff --git a/nova/tests/unit/api/openstack/compute/contrib/test_server_group_quotas.py b/nova/tests/unit/api/openstack/compute/contrib/test_server_group_quotas.py index 81a9ebbbd8..ce8890bc54 100644 --- a/nova/tests/unit/api/openstack/compute/contrib/test_server_group_quotas.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_server_group_quotas.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.config import cfg +from oslo_config import cfg import webob from nova.api.openstack.compute.contrib import server_groups diff --git a/nova/tests/unit/api/openstack/compute/contrib/test_server_password.py b/nova/tests/unit/api/openstack/compute/contrib/test_server_password.py index 28ab2afc8c..3adf8088b4 100644 --- a/nova/tests/unit/api/openstack/compute/contrib/test_server_password.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_server_password.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.config import cfg +from oslo_config import cfg from nova.api.metadata import password from nova.api.openstack.compute.contrib import server_password \ diff --git a/nova/tests/unit/api/openstack/compute/contrib/test_server_usage.py b/nova/tests/unit/api/openstack/compute/contrib/test_server_usage.py index 410ed3a9e4..36806dde4b 100644 --- a/nova/tests/unit/api/openstack/compute/contrib/test_server_usage.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_server_usage.py @@ -15,8 +15,8 @@ import datetime -from oslo.serialization import jsonutils -from oslo.utils import timeutils +from oslo_serialization import jsonutils +from oslo_utils import timeutils from nova import compute from nova import db diff --git a/nova/tests/unit/api/openstack/compute/contrib/test_services.py b/nova/tests/unit/api/openstack/compute/contrib/test_services.py index 94e2f14d86..02454b2e5e 100644 --- a/nova/tests/unit/api/openstack/compute/contrib/test_services.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_services.py @@ -18,7 +18,7 @@ import datetime import iso8601 import mock -from oslo.utils import timeutils +from oslo_utils import timeutils import webob.exc from nova.api.openstack.compute.contrib import services as services_v2 diff --git a/nova/tests/unit/api/openstack/compute/contrib/test_simple_tenant_usage.py b/nova/tests/unit/api/openstack/compute/contrib/test_simple_tenant_usage.py index d0126f17b2..a5d65698f2 100644 --- a/nova/tests/unit/api/openstack/compute/contrib/test_simple_tenant_usage.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_simple_tenant_usage.py @@ -16,7 +16,7 @@ import datetime import mock -from oslo.utils import timeutils +from oslo_utils import timeutils import webob from nova.api.openstack.compute.contrib import simple_tenant_usage as \ diff --git a/nova/tests/unit/api/openstack/compute/contrib/test_volumes.py b/nova/tests/unit/api/openstack/compute/contrib/test_volumes.py index bcb88f2fd6..b377ebb69a 100644 --- a/nova/tests/unit/api/openstack/compute/contrib/test_volumes.py +++ b/nova/tests/unit/api/openstack/compute/contrib/test_volumes.py @@ -17,8 +17,8 @@ import datetime import mock -from oslo.config import cfg -from oslo.serialization import jsonutils +from oslo_config import cfg +from oslo_serialization import jsonutils import webob from webob import exc diff --git a/nova/tests/unit/api/openstack/compute/plugins/v3/test_extended_volumes.py b/nova/tests/unit/api/openstack/compute/plugins/v3/test_extended_volumes.py index fb7a73dfac..07d017afb3 100644 --- a/nova/tests/unit/api/openstack/compute/plugins/v3/test_extended_volumes.py +++ b/nova/tests/unit/api/openstack/compute/plugins/v3/test_extended_volumes.py @@ -14,7 +14,7 @@ # under the License. import mock -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils import webob from nova.api.openstack.compute.plugins.v3 import extended_volumes diff --git a/nova/tests/unit/api/openstack/compute/plugins/v3/test_servers.py b/nova/tests/unit/api/openstack/compute/plugins/v3/test_servers.py index 0e225282e4..881ff984f3 100644 --- a/nova/tests/unit/api/openstack/compute/plugins/v3/test_servers.py +++ b/nova/tests/unit/api/openstack/compute/plugins/v3/test_servers.py @@ -24,9 +24,9 @@ import uuid import iso8601 import mock from mox3 import mox -from oslo.config import cfg -from oslo.serialization import jsonutils -from oslo.utils import timeutils +from oslo_config import cfg +from oslo_serialization import jsonutils +from oslo_utils import timeutils import six.moves.urllib.parse as urlparse import testtools import webob diff --git a/nova/tests/unit/api/openstack/compute/plugins/v3/test_user_data.py b/nova/tests/unit/api/openstack/compute/plugins/v3/test_user_data.py index 0e10c283f7..2119c24c68 100644 --- a/nova/tests/unit/api/openstack/compute/plugins/v3/test_user_data.py +++ b/nova/tests/unit/api/openstack/compute/plugins/v3/test_user_data.py @@ -18,8 +18,8 @@ import base64 import datetime import uuid -from oslo.config import cfg -from oslo.serialization import jsonutils +from oslo_config import cfg +from oslo_serialization import jsonutils from nova.api.openstack.compute import plugins from nova.api.openstack.compute.plugins.v3 import servers diff --git a/nova/tests/unit/api/openstack/compute/test_api.py b/nova/tests/unit/api/openstack/compute/test_api.py index 7165f1b4d5..e0b58b2d92 100644 --- a/nova/tests/unit/api/openstack/compute/test_api.py +++ b/nova/tests/unit/api/openstack/compute/test_api.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils import webob import webob.dec import webob.exc diff --git a/nova/tests/unit/api/openstack/compute/test_consoles.py b/nova/tests/unit/api/openstack/compute/test_consoles.py index 777e17935c..ce1c01d8f1 100644 --- a/nova/tests/unit/api/openstack/compute/test_consoles.py +++ b/nova/tests/unit/api/openstack/compute/test_consoles.py @@ -17,7 +17,7 @@ import datetime import uuid as stdlib_uuid -from oslo.utils import timeutils +from oslo_utils import timeutils import webob from nova.api.openstack.compute import consoles as consoles_v2 diff --git a/nova/tests/unit/api/openstack/compute/test_extensions.py b/nova/tests/unit/api/openstack/compute/test_extensions.py index 47fe5123e9..9acb01b336 100644 --- a/nova/tests/unit/api/openstack/compute/test_extensions.py +++ b/nova/tests/unit/api/openstack/compute/test_extensions.py @@ -15,8 +15,8 @@ # under the License. import iso8601 -from oslo.config import cfg -from oslo.serialization import jsonutils +from oslo_config import cfg +from oslo_serialization import jsonutils import webob from nova.api.openstack import compute diff --git a/nova/tests/unit/api/openstack/compute/test_image_metadata.py b/nova/tests/unit/api/openstack/compute/test_image_metadata.py index 8eac0d65f3..da0f7eb00d 100644 --- a/nova/tests/unit/api/openstack/compute/test_image_metadata.py +++ b/nova/tests/unit/api/openstack/compute/test_image_metadata.py @@ -16,7 +16,7 @@ import copy import mock -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils import webob from nova.api.openstack.compute import image_metadata diff --git a/nova/tests/unit/api/openstack/compute/test_limits.py b/nova/tests/unit/api/openstack/compute/test_limits.py index 0c7615ddf1..764063236b 100644 --- a/nova/tests/unit/api/openstack/compute/test_limits.py +++ b/nova/tests/unit/api/openstack/compute/test_limits.py @@ -21,7 +21,7 @@ import httplib import StringIO import mock -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils import six import webob diff --git a/nova/tests/unit/api/openstack/compute/test_microversions.py b/nova/tests/unit/api/openstack/compute/test_microversions.py index 48ef8e0aeb..dedbedd183 100644 --- a/nova/tests/unit/api/openstack/compute/test_microversions.py +++ b/nova/tests/unit/api/openstack/compute/test_microversions.py @@ -13,8 +13,8 @@ # under the License. import mock -from oslo.config import cfg -from oslo.serialization import jsonutils +from oslo_config import cfg +from oslo_serialization import jsonutils from nova.api.openstack import api_version_request as api_version from nova import test diff --git a/nova/tests/unit/api/openstack/compute/test_plugin_framework.py b/nova/tests/unit/api/openstack/compute/test_plugin_framework.py index 5b4ce6fa5d..7e9edaabf7 100644 --- a/nova/tests/unit/api/openstack/compute/test_plugin_framework.py +++ b/nova/tests/unit/api/openstack/compute/test_plugin_framework.py @@ -13,8 +13,8 @@ # under the License. import mock -from oslo.config import cfg -from oslo.serialization import jsonutils +from oslo_config import cfg +from oslo_serialization import jsonutils from nova import test from nova.tests.unit.api.openstack import fakes diff --git a/nova/tests/unit/api/openstack/compute/test_server_actions.py b/nova/tests/unit/api/openstack/compute/test_server_actions.py index ca7d6ed02e..98f3e84702 100644 --- a/nova/tests/unit/api/openstack/compute/test_server_actions.py +++ b/nova/tests/unit/api/openstack/compute/test_server_actions.py @@ -18,8 +18,8 @@ import uuid import mock from mox3 import mox -from oslo.config import cfg -from oslo.serialization import jsonutils +from oslo_config import cfg +from oslo_serialization import jsonutils import webob from nova.api.openstack.compute import plugins diff --git a/nova/tests/unit/api/openstack/compute/test_server_metadata.py b/nova/tests/unit/api/openstack/compute/test_server_metadata.py index ba9126f0f1..afd9748b04 100644 --- a/nova/tests/unit/api/openstack/compute/test_server_metadata.py +++ b/nova/tests/unit/api/openstack/compute/test_server_metadata.py @@ -16,9 +16,9 @@ import uuid import mock -from oslo.config import cfg -from oslo.serialization import jsonutils -from oslo.utils import timeutils +from oslo_config import cfg +from oslo_serialization import jsonutils +from oslo_utils import timeutils import six import webob diff --git a/nova/tests/unit/api/openstack/compute/test_servers.py b/nova/tests/unit/api/openstack/compute/test_servers.py index a43ed1c8a8..07ca945bcc 100644 --- a/nova/tests/unit/api/openstack/compute/test_servers.py +++ b/nova/tests/unit/api/openstack/compute/test_servers.py @@ -24,9 +24,9 @@ import uuid import iso8601 import mock -from oslo.config import cfg -from oslo.serialization import jsonutils -from oslo.utils import timeutils +from oslo_config import cfg +from oslo_serialization import jsonutils +from oslo_utils import timeutils import six.moves.urllib.parse as urlparse import testtools import webob diff --git a/nova/tests/unit/api/openstack/compute/test_urlmap.py b/nova/tests/unit/api/openstack/compute/test_urlmap.py index c95cb95d2c..6f6c7e01a9 100644 --- a/nova/tests/unit/api/openstack/compute/test_urlmap.py +++ b/nova/tests/unit/api/openstack/compute/test_urlmap.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils import webob from nova import test diff --git a/nova/tests/unit/api/openstack/compute/test_v21_extensions.py b/nova/tests/unit/api/openstack/compute/test_v21_extensions.py index 6f827acfa7..9a968ab03d 100644 --- a/nova/tests/unit/api/openstack/compute/test_v21_extensions.py +++ b/nova/tests/unit/api/openstack/compute/test_v21_extensions.py @@ -14,7 +14,7 @@ # under the License. import mock -from oslo.config import cfg +from oslo_config import cfg import stevedore import webob.exc diff --git a/nova/tests/unit/api/openstack/compute/test_v3_extensions.py b/nova/tests/unit/api/openstack/compute/test_v3_extensions.py index da6aa43d7f..ad2ceb4190 100644 --- a/nova/tests/unit/api/openstack/compute/test_v3_extensions.py +++ b/nova/tests/unit/api/openstack/compute/test_v3_extensions.py @@ -12,7 +12,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.config import cfg +from oslo_config import cfg import stevedore import webob.exc diff --git a/nova/tests/unit/api/openstack/compute/test_versions.py b/nova/tests/unit/api/openstack/compute/test_versions.py index e1fcb018d5..d9266c5fb9 100644 --- a/nova/tests/unit/api/openstack/compute/test_versions.py +++ b/nova/tests/unit/api/openstack/compute/test_versions.py @@ -16,7 +16,7 @@ import copy import uuid as stdlib_uuid -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils import webob from nova.api.openstack.compute import views diff --git a/nova/tests/unit/api/openstack/fakes.py b/nova/tests/unit/api/openstack/fakes.py index eb192c8513..e628a2a24a 100644 --- a/nova/tests/unit/api/openstack/fakes.py +++ b/nova/tests/unit/api/openstack/fakes.py @@ -16,9 +16,9 @@ import datetime import uuid -from oslo.serialization import jsonutils -from oslo.utils import netutils -from oslo.utils import timeutils +from oslo_serialization import jsonutils +from oslo_utils import netutils +from oslo_utils import timeutils import routes import six import webob diff --git a/nova/tests/unit/api/openstack/test_faults.py b/nova/tests/unit/api/openstack/test_faults.py index b0bb8a814c..09a70aab61 100644 --- a/nova/tests/unit/api/openstack/test_faults.py +++ b/nova/tests/unit/api/openstack/test_faults.py @@ -15,7 +15,7 @@ # under the License. import mock -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils import webob import webob.dec import webob.exc @@ -29,7 +29,7 @@ from nova import test class TestFaultWrapper(test.NoDBTestCase): """Tests covering `nova.api.openstack:FaultWrapper` class.""" - @mock.patch('oslo.i18n.translate') + @mock.patch('oslo_i18n.translate') @mock.patch('nova.i18n.get_available_languages') def test_safe_exception_translated(self, mock_languages, mock_translate): def fake_translate(value, locale): diff --git a/nova/tests/unit/api/test_auth.py b/nova/tests/unit/api/test_auth.py index 8edc98fd62..8de0620bff 100644 --- a/nova/tests/unit/api/test_auth.py +++ b/nova/tests/unit/api/test_auth.py @@ -12,9 +12,9 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.config import cfg -from oslo.middleware import request_id -from oslo.serialization import jsonutils +from oslo_config import cfg +from oslo_middleware import request_id +from oslo_serialization import jsonutils import webob import webob.exc diff --git a/nova/tests/unit/cast_as_call.py b/nova/tests/unit/cast_as_call.py index f75600a3b5..fc406a819e 100644 --- a/nova/tests/unit/cast_as_call.py +++ b/nova/tests/unit/cast_as_call.py @@ -13,7 +13,7 @@ # under the License. import fixtures -from oslo import messaging +import oslo_messaging as messaging class CastAsCall(fixtures.Fixture): diff --git a/nova/tests/unit/cells/fakes.py b/nova/tests/unit/cells/fakes.py index 983e450262..fa20d82029 100644 --- a/nova/tests/unit/cells/fakes.py +++ b/nova/tests/unit/cells/fakes.py @@ -16,7 +16,7 @@ Fakes For Cells tests. """ -from oslo.config import cfg +from oslo_config import cfg from nova.cells import driver from nova.cells import manager as cells_manager diff --git a/nova/tests/unit/cells/test_cells_manager.py b/nova/tests/unit/cells/test_cells_manager.py index 38cff5cb55..17b32e180a 100644 --- a/nova/tests/unit/cells/test_cells_manager.py +++ b/nova/tests/unit/cells/test_cells_manager.py @@ -19,8 +19,8 @@ import copy import datetime import mock -from oslo.config import cfg -from oslo.utils import timeutils +from oslo_config import cfg +from oslo_utils import timeutils from nova.cells import messaging from nova.cells import utils as cells_utils diff --git a/nova/tests/unit/cells/test_cells_messaging.py b/nova/tests/unit/cells/test_cells_messaging.py index e9ae693cf4..fa25e5ca42 100644 --- a/nova/tests/unit/cells/test_cells_messaging.py +++ b/nova/tests/unit/cells/test_cells_messaging.py @@ -21,10 +21,10 @@ import contextlib import mock from mox3 import mox -from oslo.config import cfg -from oslo import messaging as oslo_messaging -from oslo.serialization import jsonutils -from oslo.utils import timeutils +from oslo_config import cfg +import oslo_messaging +from oslo_serialization import jsonutils +from oslo_utils import timeutils from nova.cells import messaging from nova.cells import utils as cells_utils diff --git a/nova/tests/unit/cells/test_cells_rpc_driver.py b/nova/tests/unit/cells/test_cells_rpc_driver.py index bf5a656c9d..29ab8a9f21 100644 --- a/nova/tests/unit/cells/test_cells_rpc_driver.py +++ b/nova/tests/unit/cells/test_cells_rpc_driver.py @@ -19,8 +19,8 @@ Tests For Cells RPC Communication Driver import mock from mox3 import mox -from oslo.config import cfg -from oslo import messaging as oslo_messaging +from oslo_config import cfg +import oslo_messaging from nova.cells import messaging from nova.cells import rpc_driver diff --git a/nova/tests/unit/cells/test_cells_rpcapi.py b/nova/tests/unit/cells/test_cells_rpcapi.py index 0822af35d7..7bb66c0447 100644 --- a/nova/tests/unit/cells/test_cells_rpcapi.py +++ b/nova/tests/unit/cells/test_cells_rpcapi.py @@ -16,7 +16,7 @@ Tests For Cells RPCAPI """ -from oslo.config import cfg +from oslo_config import cfg import six from nova.cells import rpcapi as cells_rpcapi diff --git a/nova/tests/unit/cells/test_cells_scheduler.py b/nova/tests/unit/cells/test_cells_scheduler.py index 37b51d88df..6e34424470 100644 --- a/nova/tests/unit/cells/test_cells_scheduler.py +++ b/nova/tests/unit/cells/test_cells_scheduler.py @@ -18,7 +18,7 @@ Tests For CellsScheduler import copy import time -from oslo.config import cfg +from oslo_config import cfg from nova import block_device from nova.cells import filters diff --git a/nova/tests/unit/cells/test_cells_state_manager.py b/nova/tests/unit/cells/test_cells_state_manager.py index 7900fae71e..36c2dee025 100644 --- a/nova/tests/unit/cells/test_cells_state_manager.py +++ b/nova/tests/unit/cells/test_cells_state_manager.py @@ -19,8 +19,8 @@ Tests For CellStateManager import time import mock -from oslo.config import cfg -from oslo.db import exception as db_exc +from oslo_config import cfg +from oslo_db import exception as db_exc import six from nova.cells import state diff --git a/nova/tests/unit/cells/test_cells_weights.py b/nova/tests/unit/cells/test_cells_weights.py index 41f0fe4990..a69d1a0863 100644 --- a/nova/tests/unit/cells/test_cells_weights.py +++ b/nova/tests/unit/cells/test_cells_weights.py @@ -20,7 +20,7 @@ Cells with higher weights should be given priority for new builds. import datetime -from oslo.utils import timeutils +from oslo_utils import timeutils from nova.cells import state from nova.cells import weights diff --git a/nova/tests/unit/cert/test_rpcapi.py b/nova/tests/unit/cert/test_rpcapi.py index f74b91c8da..ab7569ea65 100644 --- a/nova/tests/unit/cert/test_rpcapi.py +++ b/nova/tests/unit/cert/test_rpcapi.py @@ -19,7 +19,7 @@ Unit Tests for nova.cert.rpcapi import contextlib import mock -from oslo.config import cfg +from oslo_config import cfg from nova.cert import rpcapi as cert_rpcapi from nova import context diff --git a/nova/tests/unit/compute/test_claims.py b/nova/tests/unit/compute/test_claims.py index 7eac61bec4..940e531c17 100644 --- a/nova/tests/unit/compute/test_claims.py +++ b/nova/tests/unit/compute/test_claims.py @@ -18,7 +18,7 @@ import uuid import mock -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils from nova.compute import claims from nova import db diff --git a/nova/tests/unit/compute/test_compute.py b/nova/tests/unit/compute/test_compute.py index a75ddaf260..76c0f1dc76 100644 --- a/nova/tests/unit/compute/test_compute.py +++ b/nova/tests/unit/compute/test_compute.py @@ -29,12 +29,12 @@ import uuid from eventlet import greenthread import mock from mox3 import mox -from oslo.config import cfg -from oslo import messaging -from oslo.serialization import jsonutils -from oslo.utils import importutils -from oslo.utils import timeutils -from oslo.utils import units +from oslo_config import cfg +import oslo_messaging as messaging +from oslo_serialization import jsonutils +from oslo_utils import importutils +from oslo_utils import timeutils +from oslo_utils import units import six import testtools from testtools import matchers as testtools_matchers diff --git a/nova/tests/unit/compute/test_compute_api.py b/nova/tests/unit/compute/test_compute_api.py index 9a914932a4..7b0fe25a98 100644 --- a/nova/tests/unit/compute/test_compute_api.py +++ b/nova/tests/unit/compute/test_compute_api.py @@ -20,7 +20,7 @@ import datetime import iso8601 import mock from mox3 import mox -from oslo.utils import timeutils +from oslo_utils import timeutils from nova.compute import api as compute_api from nova.compute import arch diff --git a/nova/tests/unit/compute/test_compute_cells.py b/nova/tests/unit/compute/test_compute_cells.py index 15da4e8bfb..15e68c7421 100644 --- a/nova/tests/unit/compute/test_compute_cells.py +++ b/nova/tests/unit/compute/test_compute_cells.py @@ -19,8 +19,8 @@ import functools import inspect import mock -from oslo.config import cfg -from oslo.utils import timeutils +from oslo_config import cfg +from oslo_utils import timeutils from nova import block_device from nova.cells import manager diff --git a/nova/tests/unit/compute/test_compute_mgr.py b/nova/tests/unit/compute/test_compute_mgr.py index b9b36085b0..59fc514946 100644 --- a/nova/tests/unit/compute/test_compute_mgr.py +++ b/nova/tests/unit/compute/test_compute_mgr.py @@ -20,10 +20,10 @@ from cinderclient import exceptions as cinder_exception from eventlet import event as eventlet_event import mock from mox3 import mox -from oslo.config import cfg -from oslo import messaging -from oslo.utils import importutils -from oslo.utils import timeutils +from oslo_config import cfg +import oslo_messaging as messaging +from oslo_utils import importutils +from oslo_utils import timeutils from nova.compute import build_results from nova.compute import manager diff --git a/nova/tests/unit/compute/test_compute_utils.py b/nova/tests/unit/compute/test_compute_utils.py index af4fa963b2..b656c4cee9 100644 --- a/nova/tests/unit/compute/test_compute_utils.py +++ b/nova/tests/unit/compute/test_compute_utils.py @@ -21,10 +21,10 @@ import string import uuid import mock -from oslo.config import cfg -from oslo.serialization import jsonutils -from oslo.utils import encodeutils -from oslo.utils import importutils +from oslo_config import cfg +from oslo_serialization import jsonutils +from oslo_utils import encodeutils +from oslo_utils import importutils import six import testtools diff --git a/nova/tests/unit/compute/test_compute_xen.py b/nova/tests/unit/compute/test_compute_xen.py index 54f0e188c8..5b036ce399 100644 --- a/nova/tests/unit/compute/test_compute_xen.py +++ b/nova/tests/unit/compute/test_compute_xen.py @@ -12,8 +12,8 @@ """Tests for expectations of behaviour from the Xen driver.""" -from oslo.config import cfg -from oslo.utils import importutils +from oslo_config import cfg +from oslo_utils import importutils from nova.compute import power_state from nova import context diff --git a/nova/tests/unit/compute/test_keypairs.py b/nova/tests/unit/compute/test_keypairs.py index ff0256fb2d..30c3c8c35c 100644 --- a/nova/tests/unit/compute/test_keypairs.py +++ b/nova/tests/unit/compute/test_keypairs.py @@ -14,7 +14,7 @@ # under the License. """Tests for keypair API.""" -from oslo.config import cfg +from oslo_config import cfg import six from nova.compute import api as compute_api diff --git a/nova/tests/unit/compute/test_multiple_nodes.py b/nova/tests/unit/compute/test_multiple_nodes.py index e407624bb7..9cb68c1ffd 100644 --- a/nova/tests/unit/compute/test_multiple_nodes.py +++ b/nova/tests/unit/compute/test_multiple_nodes.py @@ -14,8 +14,8 @@ # under the License. """Tests for compute service with multiple compute nodes.""" -from oslo.config import cfg -from oslo.utils import importutils +from oslo_config import cfg +from oslo_utils import importutils from nova import context from nova import db diff --git a/nova/tests/unit/compute/test_resource_tracker.py b/nova/tests/unit/compute/test_resource_tracker.py index 855054354e..4f11912db8 100644 --- a/nova/tests/unit/compute/test_resource_tracker.py +++ b/nova/tests/unit/compute/test_resource_tracker.py @@ -18,9 +18,9 @@ import uuid import mock -from oslo.config import cfg -from oslo.serialization import jsonutils -from oslo.utils import timeutils +from oslo_config import cfg +from oslo_serialization import jsonutils +from oslo_utils import timeutils from nova.compute import flavors from nova.compute import resource_tracker diff --git a/nova/tests/unit/compute/test_resources.py b/nova/tests/unit/compute/test_resources.py index bf3d634983..cd31029710 100644 --- a/nova/tests/unit/compute/test_resources.py +++ b/nova/tests/unit/compute/test_resources.py @@ -16,7 +16,7 @@ """Tests for the compute extra resources framework.""" -from oslo.config import cfg +from oslo_config import cfg from stevedore import extension from stevedore import named diff --git a/nova/tests/unit/compute/test_rpcapi.py b/nova/tests/unit/compute/test_rpcapi.py index 7a3facd48c..4b03f1505b 100644 --- a/nova/tests/unit/compute/test_rpcapi.py +++ b/nova/tests/unit/compute/test_rpcapi.py @@ -19,8 +19,8 @@ Unit Tests for nova.compute.rpcapi import contextlib import mock -from oslo.config import cfg -from oslo.serialization import jsonutils +from oslo_config import cfg +from oslo_serialization import jsonutils from nova.compute import rpcapi as compute_rpcapi from nova import context diff --git a/nova/tests/unit/compute/test_shelve.py b/nova/tests/unit/compute/test_shelve.py index 2bc0a48d2d..13835c9119 100644 --- a/nova/tests/unit/compute/test_shelve.py +++ b/nova/tests/unit/compute/test_shelve.py @@ -12,8 +12,8 @@ import mock from mox3 import mox -from oslo.config import cfg -from oslo.utils import timeutils +from oslo_config import cfg +from oslo_utils import timeutils from nova.compute import claims from nova.compute import task_states diff --git a/nova/tests/unit/conductor/test_conductor.py b/nova/tests/unit/conductor/test_conductor.py index 30c3af199a..63fe9cf628 100644 --- a/nova/tests/unit/conductor/test_conductor.py +++ b/nova/tests/unit/conductor/test_conductor.py @@ -20,9 +20,9 @@ import uuid import mock from mox3 import mox -from oslo.config import cfg -from oslo import messaging -from oslo.utils import timeutils +from oslo_config import cfg +import oslo_messaging as messaging +from oslo_utils import timeutils import six from nova.api.ec2 import ec2utils diff --git a/nova/tests/unit/conf_fixture.py b/nova/tests/unit/conf_fixture.py index f39cb7c953..22617f5b69 100644 --- a/nova/tests/unit/conf_fixture.py +++ b/nova/tests/unit/conf_fixture.py @@ -14,8 +14,8 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.config import cfg -from oslo.config import fixture as config_fixture +from oslo_config import cfg +from oslo_config import fixture as config_fixture from nova import config from nova import ipv6 diff --git a/nova/tests/unit/console/test_console.py b/nova/tests/unit/console/test_console.py index ba09272978..f15df4516f 100644 --- a/nova/tests/unit/console/test_console.py +++ b/nova/tests/unit/console/test_console.py @@ -16,8 +16,8 @@ """Tests For Console proxy.""" -from oslo.config import cfg -from oslo.utils import importutils +from oslo_config import cfg +from oslo_utils import importutils from nova.compute import rpcapi as compute_rpcapi from nova.console import api as console_api diff --git a/nova/tests/unit/console/test_rpcapi.py b/nova/tests/unit/console/test_rpcapi.py index 6900625003..74265b598b 100644 --- a/nova/tests/unit/console/test_rpcapi.py +++ b/nova/tests/unit/console/test_rpcapi.py @@ -19,7 +19,7 @@ Unit Tests for nova.console.rpcapi import contextlib import mock -from oslo.config import cfg +from oslo_config import cfg from nova.console import rpcapi as console_rpcapi from nova import context diff --git a/nova/tests/unit/consoleauth/test_consoleauth.py b/nova/tests/unit/consoleauth/test_consoleauth.py index cf6e79736b..801da31cfc 100644 --- a/nova/tests/unit/consoleauth/test_consoleauth.py +++ b/nova/tests/unit/consoleauth/test_consoleauth.py @@ -19,7 +19,7 @@ Tests for Consoleauth Code. """ from mox3 import mox -from oslo.utils import timeutils +from oslo_utils import timeutils from nova.consoleauth import manager from nova import context diff --git a/nova/tests/unit/consoleauth/test_rpcapi.py b/nova/tests/unit/consoleauth/test_rpcapi.py index 11cd07a5d3..8731782a67 100644 --- a/nova/tests/unit/consoleauth/test_rpcapi.py +++ b/nova/tests/unit/consoleauth/test_rpcapi.py @@ -19,7 +19,7 @@ Unit Tests for nova.consoleauth.rpcapi import contextlib import mock -from oslo.config import cfg +from oslo_config import cfg from nova.consoleauth import rpcapi as consoleauth_rpcapi from nova import context diff --git a/nova/tests/unit/db/test_db_api.py b/nova/tests/unit/db/test_db_api.py index a4221a6979..13e72411df 100644 --- a/nova/tests/unit/db/test_db_api.py +++ b/nova/tests/unit/db/test_db_api.py @@ -26,12 +26,12 @@ import uuid as stdlib_uuid import iso8601 import mock import netaddr -from oslo.config import cfg -from oslo.db import exception as db_exc -from oslo.db.sqlalchemy import test_base -from oslo.db.sqlalchemy import utils as sqlalchemyutils -from oslo.serialization import jsonutils -from oslo.utils import timeutils +from oslo_config import cfg +from oslo_db import exception as db_exc +from oslo_db.sqlalchemy import test_base +from oslo_db.sqlalchemy import utils as sqlalchemyutils +from oslo_serialization import jsonutils +from oslo_utils import timeutils import six from sqlalchemy import Column from sqlalchemy.dialects import sqlite diff --git a/nova/tests/unit/db/test_migration_utils.py b/nova/tests/unit/db/test_migration_utils.py index b76108884a..ceb081a215 100644 --- a/nova/tests/unit/db/test_migration_utils.py +++ b/nova/tests/unit/db/test_migration_utils.py @@ -15,8 +15,8 @@ import uuid -from oslo.db.sqlalchemy import test_base -from oslo.db.sqlalchemy import utils as oslodbutils +from oslo_db.sqlalchemy import test_base +from oslo_db.sqlalchemy import utils as oslodbutils import sqlalchemy from sqlalchemy import Integer, String from sqlalchemy import MetaData, Table, Column diff --git a/nova/tests/unit/db/test_migrations.py b/nova/tests/unit/db/test_migrations.py index aadfb38577..f97f17add8 100644 --- a/nova/tests/unit/db/test_migrations.py +++ b/nova/tests/unit/db/test_migrations.py @@ -39,9 +39,9 @@ import os from migrate import UniqueConstraint from migrate.versioning import repository import mock -from oslo.db.sqlalchemy import test_base -from oslo.db.sqlalchemy import test_migrations -from oslo.db.sqlalchemy import utils as oslodbutils +from oslo_db.sqlalchemy import test_base +from oslo_db.sqlalchemy import test_migrations +from oslo_db.sqlalchemy import utils as oslodbutils import sqlalchemy from sqlalchemy.engine import reflection import sqlalchemy.exc diff --git a/nova/tests/unit/db/test_sqlalchemy_migration.py b/nova/tests/unit/db/test_sqlalchemy_migration.py index da1e7dc770..73b378011f 100644 --- a/nova/tests/unit/db/test_sqlalchemy_migration.py +++ b/nova/tests/unit/db/test_sqlalchemy_migration.py @@ -13,7 +13,7 @@ # under the License. from migrate import UniqueConstraint -from oslo.db.sqlalchemy import utils as db_utils +from oslo_db.sqlalchemy import utils as db_utils from nova.db.sqlalchemy import api as db_api from nova.db.sqlalchemy import migration diff --git a/nova/tests/unit/fake_block_device.py b/nova/tests/unit/fake_block_device.py index 6f27eb3749..852e3a3a97 100644 --- a/nova/tests/unit/fake_block_device.py +++ b/nova/tests/unit/fake_block_device.py @@ -15,7 +15,7 @@ import uuid -from oslo.utils import timeutils +from oslo_utils import timeutils from nova import block_device diff --git a/nova/tests/unit/fake_instance.py b/nova/tests/unit/fake_instance.py index 2ed91bcf85..c238a848d5 100644 --- a/nova/tests/unit/fake_instance.py +++ b/nova/tests/unit/fake_instance.py @@ -15,7 +15,7 @@ import datetime import uuid -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils from nova import objects from nova.objects import fields diff --git a/nova/tests/unit/fake_ldap.py b/nova/tests/unit/fake_ldap.py index e047ebf8e2..fe42e8445c 100644 --- a/nova/tests/unit/fake_ldap.py +++ b/nova/tests/unit/fake_ldap.py @@ -23,7 +23,7 @@ library to work with nova. import fnmatch -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils class Store(object): diff --git a/nova/tests/unit/fake_network.py b/nova/tests/unit/fake_network.py index 847ff783fc..3c853e7844 100644 --- a/nova/tests/unit/fake_network.py +++ b/nova/tests/unit/fake_network.py @@ -13,8 +13,8 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.config import cfg -from oslo.serialization import jsonutils +from oslo_config import cfg +from oslo_serialization import jsonutils from nova.compute import api as compute_api from nova.compute import manager as compute_manager diff --git a/nova/tests/unit/fake_notifier.py b/nova/tests/unit/fake_notifier.py index dfe1d4b566..5ff7e9094d 100644 --- a/nova/tests/unit/fake_notifier.py +++ b/nova/tests/unit/fake_notifier.py @@ -15,8 +15,8 @@ import collections import functools -from oslo import messaging -from oslo.serialization import jsonutils +import oslo_messaging as messaging +from oslo_serialization import jsonutils from nova import rpc diff --git a/nova/tests/unit/fake_volume.py b/nova/tests/unit/fake_volume.py index 515dfbcf7f..13571016ac 100644 --- a/nova/tests/unit/fake_volume.py +++ b/nova/tests/unit/fake_volume.py @@ -14,8 +14,8 @@ import uuid -from oslo.config import cfg -from oslo.utils import timeutils +from oslo_config import cfg +from oslo_utils import timeutils from nova import exception from nova.openstack.common import log as logging diff --git a/nova/tests/unit/image/fake.py b/nova/tests/unit/image/fake.py index 6ee6fab12e..12bb25e7d5 100644 --- a/nova/tests/unit/image/fake.py +++ b/nova/tests/unit/image/fake.py @@ -20,7 +20,7 @@ import copy import datetime import uuid -from oslo.config import cfg +from oslo_config import cfg from nova.compute import arch from nova import exception diff --git a/nova/tests/unit/image/test_glance.py b/nova/tests/unit/image/test_glance.py index 6a39b1b4da..bda45ca9f9 100644 --- a/nova/tests/unit/image/test_glance.py +++ b/nova/tests/unit/image/test_glance.py @@ -18,8 +18,8 @@ import datetime import glanceclient.exc import mock -from oslo.config import cfg -from oslo.utils import netutils +from oslo_config import cfg +from oslo_utils import netutils import testtools from nova import context @@ -199,7 +199,7 @@ class TestGetImageService(test.NoDBTestCase): class TestCreateGlanceClient(test.NoDBTestCase): - @mock.patch('oslo.utils.netutils.is_valid_ipv6') + @mock.patch('oslo_utils.netutils.is_valid_ipv6') @mock.patch('glanceclient.Client') def test_headers_passed_glanceclient(self, init_mock, ipv6_mock): self.flags(auth_strategy='keystone') diff --git a/nova/tests/unit/keymgr/test_conf_key_mgr.py b/nova/tests/unit/keymgr/test_conf_key_mgr.py index 38bed78acf..ee9b5a2cc2 100644 --- a/nova/tests/unit/keymgr/test_conf_key_mgr.py +++ b/nova/tests/unit/keymgr/test_conf_key_mgr.py @@ -19,7 +19,7 @@ Test cases for the conf key manager. import array -from oslo.config import cfg +from oslo_config import cfg from nova.keymgr import conf_key_mgr from nova.keymgr import key diff --git a/nova/tests/unit/network/test_linux_net.py b/nova/tests/unit/network/test_linux_net.py index 63d804e864..ef3f7a7747 100644 --- a/nova/tests/unit/network/test_linux_net.py +++ b/nova/tests/unit/network/test_linux_net.py @@ -21,10 +21,10 @@ import time import mock from mox3 import mox -from oslo.config import cfg -from oslo.serialization import jsonutils -from oslo.utils import timeutils from oslo_concurrency import processutils +from oslo_config import cfg +from oslo_serialization import jsonutils +from oslo_utils import timeutils from nova import context from nova import db diff --git a/nova/tests/unit/network/test_manager.py b/nova/tests/unit/network/test_manager.py index 5612841ad2..ec5445c506 100644 --- a/nova/tests/unit/network/test_manager.py +++ b/nova/tests/unit/network/test_manager.py @@ -21,12 +21,12 @@ import fixtures import mock from mox3 import mox import netaddr -from oslo.config import cfg -from oslo.db import exception as db_exc -from oslo import messaging -from oslo.utils import importutils -from oslo.utils import netutils from oslo_concurrency import processutils +from oslo_config import cfg +from oslo_db import exception as db_exc +import oslo_messaging as messaging +from oslo_utils import importutils +from oslo_utils import netutils import six from nova import context diff --git a/nova/tests/unit/network/test_neutronv2.py b/nova/tests/unit/network/test_neutronv2.py index 20b0209462..3fd29a8f58 100644 --- a/nova/tests/unit/network/test_neutronv2.py +++ b/nova/tests/unit/network/test_neutronv2.py @@ -23,8 +23,8 @@ import mock from mox3 import mox from neutronclient.common import exceptions from neutronclient.v2_0 import client -from oslo.config import cfg -from oslo.serialization import jsonutils +from oslo_config import cfg +from oslo_serialization import jsonutils import six from nova.compute import flavors diff --git a/nova/tests/unit/network/test_rpcapi.py b/nova/tests/unit/network/test_rpcapi.py index d5043d914f..d11756825a 100644 --- a/nova/tests/unit/network/test_rpcapi.py +++ b/nova/tests/unit/network/test_rpcapi.py @@ -19,7 +19,7 @@ Unit Tests for nova.network.rpcapi import collections from mox3 import mox -from oslo.config import cfg +from oslo_config import cfg from nova import context from nova.network import rpcapi as network_rpcapi diff --git a/nova/tests/unit/objects/test_aggregate.py b/nova/tests/unit/objects/test_aggregate.py index f930b44816..476955aa23 100644 --- a/nova/tests/unit/objects/test_aggregate.py +++ b/nova/tests/unit/objects/test_aggregate.py @@ -13,7 +13,7 @@ # under the License. import mock -from oslo.utils import timeutils +from oslo_utils import timeutils from nova import db from nova import exception diff --git a/nova/tests/unit/objects/test_bandwidth_usage.py b/nova/tests/unit/objects/test_bandwidth_usage.py index 933e7ff643..cea445930b 100644 --- a/nova/tests/unit/objects/test_bandwidth_usage.py +++ b/nova/tests/unit/objects/test_bandwidth_usage.py @@ -14,7 +14,7 @@ import datetime import iso8601 import mock -from oslo.utils import timeutils +from oslo_utils import timeutils from nova import context from nova import db diff --git a/nova/tests/unit/objects/test_compute_node.py b/nova/tests/unit/objects/test_compute_node.py index b8c6e635ea..3863d47832 100644 --- a/nova/tests/unit/objects/test_compute_node.py +++ b/nova/tests/unit/objects/test_compute_node.py @@ -13,8 +13,8 @@ # under the License. import mock -from oslo.serialization import jsonutils -from oslo.utils import timeutils +from oslo_serialization import jsonutils +from oslo_utils import timeutils from nova import db from nova import exception diff --git a/nova/tests/unit/objects/test_fields.py b/nova/tests/unit/objects/test_fields.py index 5cc52ce2a0..4b4f33826e 100644 --- a/nova/tests/unit/objects/test_fields.py +++ b/nova/tests/unit/objects/test_fields.py @@ -16,7 +16,7 @@ import datetime import iso8601 import netaddr -from oslo.utils import timeutils +from oslo_utils import timeutils from nova.network import model as network_model from nova.objects import base as obj_base diff --git a/nova/tests/unit/objects/test_fixed_ip.py b/nova/tests/unit/objects/test_fixed_ip.py index 14a27ee006..fc03b0a8fb 100644 --- a/nova/tests/unit/objects/test_fixed_ip.py +++ b/nova/tests/unit/objects/test_fixed_ip.py @@ -17,7 +17,7 @@ import datetime import iso8601 import mock import netaddr -from oslo.utils import timeutils +from oslo_utils import timeutils from nova import exception from nova.objects import fixed_ip diff --git a/nova/tests/unit/objects/test_instance.py b/nova/tests/unit/objects/test_instance.py index 678f627d29..f019c9ba75 100644 --- a/nova/tests/unit/objects/test_instance.py +++ b/nova/tests/unit/objects/test_instance.py @@ -18,8 +18,8 @@ import iso8601 import mock from mox3 import mox import netaddr -from oslo.serialization import jsonutils -from oslo.utils import timeutils +from oslo_serialization import jsonutils +from oslo_utils import timeutils from nova.cells import rpcapi as cells_rpcapi from nova.compute import flavors diff --git a/nova/tests/unit/objects/test_instance_action.py b/nova/tests/unit/objects/test_instance_action.py index 488ba6fa2a..63a28ec794 100644 --- a/nova/tests/unit/objects/test_instance_action.py +++ b/nova/tests/unit/objects/test_instance_action.py @@ -15,7 +15,7 @@ import traceback import mock -from oslo.utils import timeutils +from oslo_utils import timeutils from nova import db from nova.objects import instance_action diff --git a/nova/tests/unit/objects/test_instance_numa_topology.py b/nova/tests/unit/objects/test_instance_numa_topology.py index f3b73f2e71..9a5269a1b2 100644 --- a/nova/tests/unit/objects/test_instance_numa_topology.py +++ b/nova/tests/unit/objects/test_instance_numa_topology.py @@ -14,7 +14,7 @@ import copy import uuid import mock -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils from nova import exception from nova import objects diff --git a/nova/tests/unit/objects/test_instance_pci_requests.py b/nova/tests/unit/objects/test_instance_pci_requests.py index 541d503ff4..cb53b4641a 100644 --- a/nova/tests/unit/objects/test_instance_pci_requests.py +++ b/nova/tests/unit/objects/test_instance_pci_requests.py @@ -11,7 +11,7 @@ # under the License. import mock -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils from nova import objects from nova.tests.unit.objects import test_objects diff --git a/nova/tests/unit/objects/test_keypair.py b/nova/tests/unit/objects/test_keypair.py index 5113bf582b..cd1630cf7e 100644 --- a/nova/tests/unit/objects/test_keypair.py +++ b/nova/tests/unit/objects/test_keypair.py @@ -12,7 +12,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.utils import timeutils +from oslo_utils import timeutils from nova import db from nova import exception diff --git a/nova/tests/unit/objects/test_migration.py b/nova/tests/unit/objects/test_migration.py index b52a2c2efe..327aac890f 100644 --- a/nova/tests/unit/objects/test_migration.py +++ b/nova/tests/unit/objects/test_migration.py @@ -12,7 +12,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.utils import timeutils +from oslo_utils import timeutils from nova import context from nova import db diff --git a/nova/tests/unit/objects/test_objects.py b/nova/tests/unit/objects/test_objects.py index 5eca0f3b57..9f31d89c7a 100644 --- a/nova/tests/unit/objects/test_objects.py +++ b/nova/tests/unit/objects/test_objects.py @@ -21,8 +21,8 @@ import os import pprint import mock -from oslo.serialization import jsonutils -from oslo.utils import timeutils +from oslo_serialization import jsonutils +from oslo_utils import timeutils import six from testtools import matchers diff --git a/nova/tests/unit/objects/test_service.py b/nova/tests/unit/objects/test_service.py index 2d837a676d..ceb87f987b 100644 --- a/nova/tests/unit/objects/test_service.py +++ b/nova/tests/unit/objects/test_service.py @@ -13,8 +13,8 @@ # under the License. import mock -from oslo.serialization import jsonutils -from oslo.utils import timeutils +from oslo_serialization import jsonutils +from oslo_utils import timeutils from nova import db from nova import exception diff --git a/nova/tests/unit/pci/test_stats.py b/nova/tests/unit/pci/test_stats.py index 840a4e8c8e..dc217943e0 100644 --- a/nova/tests/unit/pci/test_stats.py +++ b/nova/tests/unit/pci/test_stats.py @@ -14,7 +14,7 @@ # under the License. import mock -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils from nova import exception from nova import objects diff --git a/nova/tests/unit/policy_fixture.py b/nova/tests/unit/policy_fixture.py index 29a808416f..9883e1abd5 100644 --- a/nova/tests/unit/policy_fixture.py +++ b/nova/tests/unit/policy_fixture.py @@ -15,8 +15,8 @@ import os import fixtures -from oslo.config import cfg -from oslo.serialization import jsonutils +from oslo_config import cfg +from oslo_serialization import jsonutils from nova.openstack.common import policy as common_policy import nova.policy diff --git a/nova/tests/unit/scheduler/fakes.py b/nova/tests/unit/scheduler/fakes.py index 268285bd48..7f11f7ce5b 100644 --- a/nova/tests/unit/scheduler/fakes.py +++ b/nova/tests/unit/scheduler/fakes.py @@ -17,7 +17,7 @@ Fakes For Scheduler tests. """ from mox3 import mox -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils from nova.compute import vm_states from nova import db diff --git a/nova/tests/unit/scheduler/filters/test_affinity_filters.py b/nova/tests/unit/scheduler/filters/test_affinity_filters.py index 25e4d7a1eb..ac1f01a464 100644 --- a/nova/tests/unit/scheduler/filters/test_affinity_filters.py +++ b/nova/tests/unit/scheduler/filters/test_affinity_filters.py @@ -11,7 +11,7 @@ # under the License. import mock -from oslo.config import cfg +from oslo_config import cfg from nova.scheduler.filters import affinity_filter from nova import test diff --git a/nova/tests/unit/scheduler/filters/test_json_filters.py b/nova/tests/unit/scheduler/filters/test_json_filters.py index c5ddca7520..d26a9fa00e 100644 --- a/nova/tests/unit/scheduler/filters/test_json_filters.py +++ b/nova/tests/unit/scheduler/filters/test_json_filters.py @@ -10,7 +10,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils from nova.scheduler.filters import json_filter from nova import test diff --git a/nova/tests/unit/scheduler/filters/test_numa_topology_filters.py b/nova/tests/unit/scheduler/filters/test_numa_topology_filters.py index 17a2948d78..2468a69d17 100644 --- a/nova/tests/unit/scheduler/filters/test_numa_topology_filters.py +++ b/nova/tests/unit/scheduler/filters/test_numa_topology_filters.py @@ -11,7 +11,7 @@ # under the License. import mock -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils from nova import objects from nova.objects import base as obj_base diff --git a/nova/tests/unit/scheduler/filters/test_trusted_filters.py b/nova/tests/unit/scheduler/filters/test_trusted_filters.py index 6bf47e8a86..ad35394495 100644 --- a/nova/tests/unit/scheduler/filters/test_trusted_filters.py +++ b/nova/tests/unit/scheduler/filters/test_trusted_filters.py @@ -11,9 +11,9 @@ # under the License. import mock -from oslo.config import cfg -from oslo.serialization import jsonutils -from oslo.utils import timeutils +from oslo_config import cfg +from oslo_serialization import jsonutils +from oslo_utils import timeutils import requests from nova.scheduler.filters import trusted_filter diff --git a/nova/tests/unit/scheduler/ironic_fakes.py b/nova/tests/unit/scheduler/ironic_fakes.py index 62033e9c2d..288226b071 100644 --- a/nova/tests/unit/scheduler/ironic_fakes.py +++ b/nova/tests/unit/scheduler/ironic_fakes.py @@ -16,7 +16,7 @@ Fake nodes for Ironic host manager tests. """ -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils COMPUTE_NODES = [ diff --git a/nova/tests/unit/scheduler/test_caching_scheduler.py b/nova/tests/unit/scheduler/test_caching_scheduler.py index 15525f1b20..1527407bf9 100644 --- a/nova/tests/unit/scheduler/test_caching_scheduler.py +++ b/nova/tests/unit/scheduler/test_caching_scheduler.py @@ -14,7 +14,7 @@ # under the License. import mock -from oslo.utils import timeutils +from oslo_utils import timeutils from nova import exception from nova.scheduler import caching_scheduler diff --git a/nova/tests/unit/scheduler/test_client.py b/nova/tests/unit/scheduler/test_client.py index 54972e0bcd..b9eef95614 100644 --- a/nova/tests/unit/scheduler/test_client.py +++ b/nova/tests/unit/scheduler/test_client.py @@ -14,7 +14,7 @@ # under the License. import mock -from oslo import messaging +import oslo_messaging as messaging from nova.conductor import api as conductor_api from nova import context diff --git a/nova/tests/unit/scheduler/test_host_manager.py b/nova/tests/unit/scheduler/test_host_manager.py index c45f86a7f8..950e57af1d 100644 --- a/nova/tests/unit/scheduler/test_host_manager.py +++ b/nova/tests/unit/scheduler/test_host_manager.py @@ -17,7 +17,7 @@ Tests For HostManager """ import mock -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils import six from nova.compute import task_states diff --git a/nova/tests/unit/scheduler/test_ironic_host_manager.py b/nova/tests/unit/scheduler/test_ironic_host_manager.py index 2838c53417..35cf1bda35 100644 --- a/nova/tests/unit/scheduler/test_ironic_host_manager.py +++ b/nova/tests/unit/scheduler/test_ironic_host_manager.py @@ -18,7 +18,7 @@ Tests For IronicHostManager """ import mock -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils from nova import db from nova import exception diff --git a/nova/tests/unit/scheduler/test_rpcapi.py b/nova/tests/unit/scheduler/test_rpcapi.py index 1cc4547d58..3498c6c9c9 100644 --- a/nova/tests/unit/scheduler/test_rpcapi.py +++ b/nova/tests/unit/scheduler/test_rpcapi.py @@ -17,7 +17,7 @@ Unit Tests for nova.scheduler.rpcapi """ from mox3 import mox -from oslo.config import cfg +from oslo_config import cfg from nova import context from nova.scheduler import rpcapi as scheduler_rpcapi diff --git a/nova/tests/unit/scheduler/test_scheduler.py b/nova/tests/unit/scheduler/test_scheduler.py index da7b604b22..fb786250fe 100644 --- a/nova/tests/unit/scheduler/test_scheduler.py +++ b/nova/tests/unit/scheduler/test_scheduler.py @@ -18,7 +18,7 @@ Tests For Scheduler """ import mock -from oslo.config import cfg +from oslo_config import cfg from nova.compute import api as compute_api from nova import context diff --git a/nova/tests/unit/scheduler/test_scheduler_options.py b/nova/tests/unit/scheduler/test_scheduler_options.py index 29d42ccd2f..af3437996c 100644 --- a/nova/tests/unit/scheduler/test_scheduler_options.py +++ b/nova/tests/unit/scheduler/test_scheduler_options.py @@ -19,7 +19,7 @@ Tests For PickledScheduler. import datetime import StringIO -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils from nova.scheduler import scheduler_options from nova import test diff --git a/nova/tests/unit/scheduler/test_scheduler_utils.py b/nova/tests/unit/scheduler/test_scheduler_utils.py index 0d184c206b..1c305d726d 100644 --- a/nova/tests/unit/scheduler/test_scheduler_utils.py +++ b/nova/tests/unit/scheduler/test_scheduler_utils.py @@ -20,7 +20,7 @@ import uuid import mock from mox3 import mox -from oslo.config import cfg +from oslo_config import cfg from nova.compute import flavors from nova.compute import utils as compute_utils diff --git a/nova/tests/unit/servicegroup/test_db_servicegroup.py b/nova/tests/unit/servicegroup/test_db_servicegroup.py index 1cb47a6ce4..658bac08b2 100644 --- a/nova/tests/unit/servicegroup/test_db_servicegroup.py +++ b/nova/tests/unit/servicegroup/test_db_servicegroup.py @@ -15,7 +15,7 @@ import datetime import fixtures -from oslo.utils import timeutils +from oslo_utils import timeutils from nova import context from nova import db diff --git a/nova/tests/unit/servicegroup/test_mc_servicegroup.py b/nova/tests/unit/servicegroup/test_mc_servicegroup.py index b04d86de7d..8615369169 100644 --- a/nova/tests/unit/servicegroup/test_mc_servicegroup.py +++ b/nova/tests/unit/servicegroup/test_mc_servicegroup.py @@ -16,7 +16,7 @@ # under the License. import fixtures -from oslo.utils import timeutils +from oslo_utils import timeutils from nova import context from nova import db diff --git a/nova/tests/unit/test_availability_zones.py b/nova/tests/unit/test_availability_zones.py index 2066a8f370..a6c066ca4a 100644 --- a/nova/tests/unit/test_availability_zones.py +++ b/nova/tests/unit/test_availability_zones.py @@ -17,7 +17,7 @@ Tests for availability zones """ -from oslo.config import cfg +from oslo_config import cfg from nova import availability_zones as az from nova import context diff --git a/nova/tests/unit/test_baserpc.py b/nova/tests/unit/test_baserpc.py index d9013fb99e..1d427f6eed 100644 --- a/nova/tests/unit/test_baserpc.py +++ b/nova/tests/unit/test_baserpc.py @@ -18,7 +18,7 @@ Test the base rpc API. """ -from oslo.config import cfg +from oslo_config import cfg from nova import baserpc from nova import context diff --git a/nova/tests/unit/test_configdrive2.py b/nova/tests/unit/test_configdrive2.py index 606fbc5c05..6e3e52d0ce 100644 --- a/nova/tests/unit/test_configdrive2.py +++ b/nova/tests/unit/test_configdrive2.py @@ -18,7 +18,7 @@ import os import tempfile from mox3 import mox -from oslo.config import cfg +from oslo_config import cfg from nova import context from nova.openstack.common import fileutils diff --git a/nova/tests/unit/test_fixtures.py b/nova/tests/unit/test_fixtures.py index 39f24f02d0..63cd10cc59 100644 --- a/nova/tests/unit/test_fixtures.py +++ b/nova/tests/unit/test_fixtures.py @@ -18,7 +18,7 @@ import logging import sys import fixtures as fx -from oslo.config import cfg +from oslo_config import cfg import testtools from nova.db.sqlalchemy import api as session diff --git a/nova/tests/unit/test_hacking.py b/nova/tests/unit/test_hacking.py index 5123687911..307ab266b6 100644 --- a/nova/tests/unit/test_hacking.py +++ b/nova/tests/unit/test_hacking.py @@ -444,6 +444,20 @@ class HackingTestCase(test.NoDBTestCase): self._assert_has_errors(code, checks.check_oslo_namespace_imports, expected_errors=[(1, 0, "N333")]) + def test_oslo_namespace_imports_check_2(self): + code = """ + from oslo import i18n + """ + self._assert_has_errors(code, checks.check_oslo_namespace_imports, + expected_errors=[(1, 0, "N333")]) + + def test_oslo_namespace_imports_check_3(self): + code = """ + import oslo.messaging + """ + self._assert_has_errors(code, checks.check_oslo_namespace_imports, + expected_errors=[(1, 0, "N333")]) + def test_oslo_assert_raises_regexp(self): code = """ self.assertRaisesRegexp(ValueError, diff --git a/nova/tests/unit/test_linuxscsi.py b/nova/tests/unit/test_linuxscsi.py index 8b1a26a546..432ca468d0 100644 --- a/nova/tests/unit/test_linuxscsi.py +++ b/nova/tests/unit/test_linuxscsi.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.config import cfg +from oslo_config import cfg from nova.openstack.common import log as logging from nova.storage import linuxscsi diff --git a/nova/tests/unit/test_metadata.py b/nova/tests/unit/test_metadata.py index 076fe93f22..b40d25cee4 100644 --- a/nova/tests/unit/test_metadata.py +++ b/nova/tests/unit/test_metadata.py @@ -27,8 +27,8 @@ except ImportError: import pickle import mock -from oslo.config import cfg -from oslo.serialization import jsonutils +from oslo_config import cfg +from oslo_serialization import jsonutils import webob from nova.api.metadata import base diff --git a/nova/tests/unit/test_notifications.py b/nova/tests/unit/test_notifications.py index 62f528ce92..44a1bd0941 100644 --- a/nova/tests/unit/test_notifications.py +++ b/nova/tests/unit/test_notifications.py @@ -18,7 +18,7 @@ import copy import mock -from oslo.config import cfg +from oslo_config import cfg from nova.compute import flavors from nova.compute import task_states diff --git a/nova/tests/unit/test_objectstore.py b/nova/tests/unit/test_objectstore.py index 122f91dbf6..e2f7942e86 100644 --- a/nova/tests/unit/test_objectstore.py +++ b/nova/tests/unit/test_objectstore.py @@ -25,7 +25,7 @@ import tempfile import boto from boto import exception as boto_exception from boto.s3 import connection as s3 -from oslo.config import cfg +from oslo_config import cfg from nova.objectstore import s3server from nova import test diff --git a/nova/tests/unit/test_pipelib.py b/nova/tests/unit/test_pipelib.py index 99d840a839..9f8d65e234 100644 --- a/nova/tests/unit/test_pipelib.py +++ b/nova/tests/unit/test_pipelib.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.config import cfg +from oslo_config import cfg from nova.cloudpipe import pipelib from nova import context diff --git a/nova/tests/unit/test_quota.py b/nova/tests/unit/test_quota.py index 75603d9d51..d02cc543ec 100644 --- a/nova/tests/unit/test_quota.py +++ b/nova/tests/unit/test_quota.py @@ -16,8 +16,8 @@ import datetime -from oslo.config import cfg -from oslo.utils import timeutils +from oslo_config import cfg +from oslo_utils import timeutils from nova import compute from nova.compute import flavors diff --git a/nova/tests/unit/test_service.py b/nova/tests/unit/test_service.py index 16cc4481b0..6f33fef03e 100644 --- a/nova/tests/unit/test_service.py +++ b/nova/tests/unit/test_service.py @@ -22,8 +22,8 @@ import sys import mock from mox3 import mox -from oslo.config import cfg from oslo_concurrency import processutils +from oslo_config import cfg import testtools from nova import context diff --git a/nova/tests/unit/test_test.py b/nova/tests/unit/test_test.py index 49daeabdf5..4d63e105b6 100644 --- a/nova/tests/unit/test_test.py +++ b/nova/tests/unit/test_test.py @@ -16,8 +16,8 @@ """Tests for the testing base code.""" -from oslo.config import cfg -from oslo import messaging +from oslo_config import cfg +import oslo_messaging as messaging from nova.openstack.common import log as logging from nova import rpc diff --git a/nova/tests/unit/test_utils.py b/nova/tests/unit/test_utils.py index 764682675f..a66e10d35d 100644 --- a/nova/tests/unit/test_utils.py +++ b/nova/tests/unit/test_utils.py @@ -24,9 +24,9 @@ import tempfile import mock from mox3 import mox import netaddr -from oslo.config import cfg -from oslo.utils import timeutils from oslo_concurrency import processutils +from oslo_config import cfg +from oslo_utils import timeutils import nova from nova import exception diff --git a/nova/tests/unit/test_versions.py b/nova/tests/unit/test_versions.py index 06baca8b05..7dfbd4928d 100644 --- a/nova/tests/unit/test_versions.py +++ b/nova/tests/unit/test_versions.py @@ -15,7 +15,7 @@ import __builtin__ import StringIO -from oslo.config import cfg +from oslo_config import cfg from nova import test from nova import version diff --git a/nova/tests/unit/test_wsgi.py b/nova/tests/unit/test_wsgi.py index 2534022aaa..a99c9fd248 100644 --- a/nova/tests/unit/test_wsgi.py +++ b/nova/tests/unit/test_wsgi.py @@ -23,7 +23,7 @@ import tempfile import eventlet import eventlet.wsgi import mock -from oslo.config import cfg +from oslo_config import cfg import requests import testtools import webob diff --git a/nova/tests/unit/utils.py b/nova/tests/unit/utils.py index a3204e0086..1992125de9 100644 --- a/nova/tests/unit/utils.py +++ b/nova/tests/unit/utils.py @@ -18,7 +18,7 @@ import socket import sys import mock -from oslo.config import cfg +from oslo_config import cfg from nova.compute import flavors import nova.context diff --git a/nova/tests/unit/virt/disk/vfs/test_localfs.py b/nova/tests/unit/virt/disk/vfs/test_localfs.py index ae034a9db0..6fd7134bd6 100644 --- a/nova/tests/unit/virt/disk/vfs/test_localfs.py +++ b/nova/tests/unit/virt/disk/vfs/test_localfs.py @@ -15,8 +15,8 @@ import tempfile import mock -from oslo.config import cfg from oslo_concurrency import processutils +from oslo_config import cfg from nova import exception from nova import test diff --git a/nova/tests/unit/virt/hyperv/test_hostops.py b/nova/tests/unit/virt/hyperv/test_hostops.py index b612dd4a27..2d7ed9500d 100644 --- a/nova/tests/unit/virt/hyperv/test_hostops.py +++ b/nova/tests/unit/virt/hyperv/test_hostops.py @@ -16,9 +16,9 @@ import datetime import mock -from oslo.config import cfg -from oslo.serialization import jsonutils -from oslo.utils import units +from oslo_config import cfg +from oslo_serialization import jsonutils +from oslo_utils import units from nova.tests.unit.virt.hyperv import test_base from nova.virt.hyperv import constants diff --git a/nova/tests/unit/virt/hyperv/test_hypervapi.py b/nova/tests/unit/virt/hyperv/test_hypervapi.py index a7afc94509..e03007ea1c 100644 --- a/nova/tests/unit/virt/hyperv/test_hypervapi.py +++ b/nova/tests/unit/virt/hyperv/test_hypervapi.py @@ -23,8 +23,8 @@ import uuid import mock from mox3 import mox -from oslo.config import cfg -from oslo.utils import units +from oslo_config import cfg +from oslo_utils import units from nova.api.metadata import base as instance_metadata from nova.compute import power_state diff --git a/nova/tests/unit/virt/hyperv/test_imagecache.py b/nova/tests/unit/virt/hyperv/test_imagecache.py index 72ce5cce6f..4069594f45 100644 --- a/nova/tests/unit/virt/hyperv/test_imagecache.py +++ b/nova/tests/unit/virt/hyperv/test_imagecache.py @@ -16,7 +16,7 @@ import os import mock -from oslo.config import cfg +from oslo_config import cfg from nova import exception from nova import test diff --git a/nova/tests/unit/virt/hyperv/test_livemigrationops.py b/nova/tests/unit/virt/hyperv/test_livemigrationops.py index 1a0f24c256..378135df3d 100644 --- a/nova/tests/unit/virt/hyperv/test_livemigrationops.py +++ b/nova/tests/unit/virt/hyperv/test_livemigrationops.py @@ -14,7 +14,7 @@ # under the License. import mock -from oslo.config import cfg +from oslo_config import cfg from nova.tests.unit import fake_instance from nova.tests.unit.virt.hyperv import test_base diff --git a/nova/tests/unit/virt/hyperv/test_utilsfactory.py b/nova/tests/unit/virt/hyperv/test_utilsfactory.py index 77b8a92a8e..e656a05785 100644 --- a/nova/tests/unit/virt/hyperv/test_utilsfactory.py +++ b/nova/tests/unit/virt/hyperv/test_utilsfactory.py @@ -18,7 +18,7 @@ Unit tests for the Hyper-V utils factory. """ import mock -from oslo.config import cfg +from oslo_config import cfg from nova import test from nova.virt.hyperv import hostutils diff --git a/nova/tests/unit/virt/hyperv/test_vhdutils.py b/nova/tests/unit/virt/hyperv/test_vhdutils.py index ba4acc8642..f69e8fdc00 100644 --- a/nova/tests/unit/virt/hyperv/test_vhdutils.py +++ b/nova/tests/unit/virt/hyperv/test_vhdutils.py @@ -13,7 +13,7 @@ # under the License. import mock -from oslo.utils import units +from oslo_utils import units from nova import test from nova.virt.hyperv import constants diff --git a/nova/tests/unit/virt/hyperv/test_vmops.py b/nova/tests/unit/virt/hyperv/test_vmops.py index 884a63a470..817c658f6a 100644 --- a/nova/tests/unit/virt/hyperv/test_vmops.py +++ b/nova/tests/unit/virt/hyperv/test_vmops.py @@ -16,9 +16,9 @@ import os from eventlet import timeout as etimeout import mock -from oslo.config import cfg -from oslo.utils import units from oslo_concurrency import processutils +from oslo_config import cfg +from oslo_utils import units from nova import exception from nova.tests.unit import fake_instance diff --git a/nova/tests/unit/virt/hyperv/test_volumeutils.py b/nova/tests/unit/virt/hyperv/test_volumeutils.py index 66ece19691..0a3f661cc2 100644 --- a/nova/tests/unit/virt/hyperv/test_volumeutils.py +++ b/nova/tests/unit/virt/hyperv/test_volumeutils.py @@ -15,7 +15,7 @@ # under the License. import mock -from oslo.config import cfg +from oslo_config import cfg from nova.tests.unit.virt.hyperv import test_basevolumeutils from nova.virt.hyperv import vmutils diff --git a/nova/tests/unit/virt/hyperv/test_volumeutilsv2.py b/nova/tests/unit/virt/hyperv/test_volumeutilsv2.py index 261cce0ee7..5c73f0ce6a 100644 --- a/nova/tests/unit/virt/hyperv/test_volumeutilsv2.py +++ b/nova/tests/unit/virt/hyperv/test_volumeutilsv2.py @@ -13,7 +13,7 @@ # under the License. import mock -from oslo.config import cfg +from oslo_config import cfg from nova import test from nova.virt.hyperv import vmutils diff --git a/nova/tests/unit/virt/ironic/test_client_wrapper.py b/nova/tests/unit/virt/ironic/test_client_wrapper.py index 9d20a3eb6b..b3b55fc645 100644 --- a/nova/tests/unit/virt/ironic/test_client_wrapper.py +++ b/nova/tests/unit/virt/ironic/test_client_wrapper.py @@ -16,7 +16,7 @@ from ironicclient import client as ironic_client from ironicclient import exc as ironic_exception import mock -from oslo.config import cfg +from oslo_config import cfg from nova import exception from nova import test diff --git a/nova/tests/unit/virt/ironic/test_driver.py b/nova/tests/unit/virt/ironic/test_driver.py index 8dbdbcc4b3..7e3b1d4cb0 100644 --- a/nova/tests/unit/virt/ironic/test_driver.py +++ b/nova/tests/unit/virt/ironic/test_driver.py @@ -17,8 +17,8 @@ from ironicclient import exc as ironic_exception import mock -from oslo.config import cfg -from oslo.serialization import jsonutils +from oslo_config import cfg +from oslo_serialization import jsonutils from nova.api.metadata import base as instance_metadata from nova.compute import power_state as nova_states diff --git a/nova/tests/unit/virt/ironic/test_patcher.py b/nova/tests/unit/virt/ironic/test_patcher.py index a69e8cacfe..79c8617093 100644 --- a/nova/tests/unit/virt/ironic/test_patcher.py +++ b/nova/tests/unit/virt/ironic/test_patcher.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.config import cfg +from oslo_config import cfg from nova import context as nova_context from nova import test diff --git a/nova/tests/unit/virt/libvirt/test_config.py b/nova/tests/unit/virt/libvirt/test_config.py index 77e34871a8..d9f3f9f3a3 100644 --- a/nova/tests/unit/virt/libvirt/test_config.py +++ b/nova/tests/unit/virt/libvirt/test_config.py @@ -13,7 +13,7 @@ # under the License. from lxml import etree -from oslo.utils import units +from oslo_utils import units from nova.compute import arch from nova import test diff --git a/nova/tests/unit/virt/libvirt/test_driver.py b/nova/tests/unit/virt/libvirt/test_driver.py index 89e7abcb59..e73533a24c 100644 --- a/nova/tests/unit/virt/libvirt/test_driver.py +++ b/nova/tests/unit/virt/libvirt/test_driver.py @@ -32,14 +32,14 @@ import fixtures from lxml import etree import mock from mox3 import mox -from oslo.config import cfg -from oslo.serialization import jsonutils -from oslo.utils import encodeutils -from oslo.utils import importutils -from oslo.utils import timeutils -from oslo.utils import units from oslo_concurrency import lockutils from oslo_concurrency import processutils +from oslo_config import cfg +from oslo_serialization import jsonutils +from oslo_utils import encodeutils +from oslo_utils import importutils +from oslo_utils import timeutils +from oslo_utils import units import six from nova.api.metadata import base as instance_metadata diff --git a/nova/tests/unit/virt/libvirt/test_imagebackend.py b/nova/tests/unit/virt/libvirt/test_imagebackend.py index bb91c4d687..4739a59322 100644 --- a/nova/tests/unit/virt/libvirt/test_imagebackend.py +++ b/nova/tests/unit/virt/libvirt/test_imagebackend.py @@ -21,10 +21,10 @@ import tempfile import fixtures import mock -from oslo.config import cfg -from oslo.config import fixture as config_fixture -from oslo.utils import units from oslo_concurrency import lockutils +from oslo_config import cfg +from oslo_config import fixture as config_fixture +from oslo_utils import units from nova import context from nova import exception diff --git a/nova/tests/unit/virt/libvirt/test_imagecache.py b/nova/tests/unit/virt/libvirt/test_imagecache.py index d2074ca1a4..21bcdb93f0 100644 --- a/nova/tests/unit/virt/libvirt/test_imagecache.py +++ b/nova/tests/unit/virt/libvirt/test_imagecache.py @@ -21,10 +21,10 @@ import os import time import mock -from oslo.config import cfg -from oslo.serialization import jsonutils -from oslo.utils import importutils from oslo_concurrency import processutils +from oslo_config import cfg +from oslo_serialization import jsonutils +from oslo_utils import importutils from nova import conductor from nova import context diff --git a/nova/tests/unit/virt/libvirt/test_lvm.py b/nova/tests/unit/virt/libvirt/test_lvm.py index 02c7235ed1..aba27a81d4 100644 --- a/nova/tests/unit/virt/libvirt/test_lvm.py +++ b/nova/tests/unit/virt/libvirt/test_lvm.py @@ -16,8 +16,8 @@ import contextlib import mock -from oslo.config import cfg from oslo_concurrency import processutils +from oslo_config import cfg from nova import exception from nova import test diff --git a/nova/tests/unit/virt/libvirt/test_utils.py b/nova/tests/unit/virt/libvirt/test_utils.py index 83223d5128..8a35f82490 100644 --- a/nova/tests/unit/virt/libvirt/test_utils.py +++ b/nova/tests/unit/virt/libvirt/test_utils.py @@ -18,8 +18,8 @@ import os import tempfile import mock -from oslo.config import cfg from oslo_concurrency import processutils +from oslo_config import cfg from nova import exception from nova.openstack.common import fileutils diff --git a/nova/tests/unit/virt/libvirt/test_vif.py b/nova/tests/unit/virt/libvirt/test_vif.py index 73e9d3cb98..a33a4d149d 100644 --- a/nova/tests/unit/virt/libvirt/test_vif.py +++ b/nova/tests/unit/virt/libvirt/test_vif.py @@ -16,8 +16,8 @@ import contextlib from lxml import etree import mock -from oslo.config import cfg from oslo_concurrency import processutils +from oslo_config import cfg from nova import exception from nova.network import linux_net diff --git a/nova/tests/unit/virt/libvirt/test_volume.py b/nova/tests/unit/virt/libvirt/test_volume.py index 7a145d0ffb..c3830a5bcf 100644 --- a/nova/tests/unit/virt/libvirt/test_volume.py +++ b/nova/tests/unit/virt/libvirt/test_volume.py @@ -21,8 +21,8 @@ import time import eventlet import fixtures import mock -from oslo.config import cfg from oslo_concurrency import processutils +from oslo_config import cfg from nova import exception from nova.storage import linuxscsi diff --git a/nova/tests/unit/virt/test_block_device.py b/nova/tests/unit/virt/test_block_device.py index b67e04f3f6..a64b94d1ef 100644 --- a/nova/tests/unit/virt/test_block_device.py +++ b/nova/tests/unit/virt/test_block_device.py @@ -15,7 +15,7 @@ import contextlib import mock -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils from nova import block_device from nova import context diff --git a/nova/tests/unit/virt/test_configdrive.py b/nova/tests/unit/virt/test_configdrive.py index b8dc717b80..43c24fde39 100644 --- a/nova/tests/unit/virt/test_configdrive.py +++ b/nova/tests/unit/virt/test_configdrive.py @@ -12,7 +12,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.utils import strutils +from oslo_utils import strutils from nova import test from nova.virt import configdrive diff --git a/nova/tests/unit/virt/test_hardware.py b/nova/tests/unit/virt/test_hardware.py index 86b9e94c13..8f8b1c6eaf 100644 --- a/nova/tests/unit/virt/test_hardware.py +++ b/nova/tests/unit/virt/test_hardware.py @@ -15,7 +15,7 @@ import uuid import mock -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils import six from nova import context diff --git a/nova/tests/unit/virt/test_imagecache.py b/nova/tests/unit/virt/test_imagecache.py index d61d7e4bbd..09814b3b7b 100644 --- a/nova/tests/unit/virt/test_imagecache.py +++ b/nova/tests/unit/virt/test_imagecache.py @@ -12,7 +12,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.config import cfg +from oslo_config import cfg from nova import block_device from nova.compute import vm_states diff --git a/nova/tests/unit/virt/test_virt_drivers.py b/nova/tests/unit/virt/test_virt_drivers.py index 6da47cb16f..b6e326dbaa 100644 --- a/nova/tests/unit/virt/test_virt_drivers.py +++ b/nova/tests/unit/virt/test_virt_drivers.py @@ -19,9 +19,9 @@ import traceback import fixtures import mock import netaddr -from oslo.serialization import jsonutils -from oslo.utils import importutils -from oslo.utils import timeutils +from oslo_serialization import jsonutils +from oslo_utils import importutils +from oslo_utils import timeutils import six from nova.compute import manager diff --git a/nova/tests/unit/virt/vmwareapi/fake.py b/nova/tests/unit/virt/vmwareapi/fake.py index 11b99d5a5d..15e0155d24 100644 --- a/nova/tests/unit/virt/vmwareapi/fake.py +++ b/nova/tests/unit/virt/vmwareapi/fake.py @@ -21,9 +21,9 @@ A fake VMware VI API implementation. import collections -from oslo.serialization import jsonutils -from oslo.utils import units -from oslo.vmware import exceptions as vexc +from oslo_serialization import jsonutils +from oslo_utils import units +from oslo_vmware import exceptions as vexc from nova import exception from nova.openstack.common import log as logging diff --git a/nova/tests/unit/virt/vmwareapi/stubs.py b/nova/tests/unit/virt/vmwareapi/stubs.py index f15acffc19..a04c1d724e 100644 --- a/nova/tests/unit/virt/vmwareapi/stubs.py +++ b/nova/tests/unit/virt/vmwareapi/stubs.py @@ -20,7 +20,7 @@ Stubouts for the test suite import contextlib import mock -from oslo.vmware import exceptions as vexc +from oslo_vmware import exceptions as vexc from nova import db from nova.tests.unit import test_flavors diff --git a/nova/tests/unit/virt/vmwareapi/test_driver_api.py b/nova/tests/unit/virt/vmwareapi/test_driver_api.py index 0066eb8b43..ecd717d321 100644 --- a/nova/tests/unit/virt/vmwareapi/test_driver_api.py +++ b/nova/tests/unit/virt/vmwareapi/test_driver_api.py @@ -27,13 +27,13 @@ import datetime from eventlet import greenthread import mock from mox3 import mox -from oslo.config import cfg -from oslo.utils import timeutils -from oslo.utils import units -from oslo.vmware import exceptions as vexc -from oslo.vmware import pbm -from oslo.vmware import vim -from oslo.vmware import vim_util as oslo_vim_util +from oslo_config import cfg +from oslo_utils import timeutils +from oslo_utils import units +from oslo_vmware import exceptions as vexc +from oslo_vmware import pbm +from oslo_vmware import vim +from oslo_vmware import vim_util as oslo_vim_util import suds from nova import block_device diff --git a/nova/tests/unit/virt/vmwareapi/test_ds_util.py b/nova/tests/unit/virt/vmwareapi/test_ds_util.py index 41800a7dee..0823a5527f 100644 --- a/nova/tests/unit/virt/vmwareapi/test_ds_util.py +++ b/nova/tests/unit/virt/vmwareapi/test_ds_util.py @@ -16,8 +16,8 @@ import contextlib import re import mock -from oslo.utils import units -from oslo.vmware import exceptions as vexc +from oslo_utils import units +from oslo_vmware import exceptions as vexc from testtools import matchers from nova import exception diff --git a/nova/tests/unit/virt/vmwareapi/test_ds_util_datastore_selection.py b/nova/tests/unit/virt/vmwareapi/test_ds_util_datastore_selection.py index fb4ff094ec..cfa71f4135 100644 --- a/nova/tests/unit/virt/vmwareapi/test_ds_util_datastore_selection.py +++ b/nova/tests/unit/virt/vmwareapi/test_ds_util_datastore_selection.py @@ -14,7 +14,7 @@ import collections import re -from oslo.utils import units +from oslo_utils import units from nova import test from nova.virt.vmwareapi import ds_util diff --git a/nova/tests/unit/virt/vmwareapi/test_imagecache.py b/nova/tests/unit/virt/vmwareapi/test_imagecache.py index 851931288b..f0c6caf18f 100644 --- a/nova/tests/unit/virt/vmwareapi/test_imagecache.py +++ b/nova/tests/unit/virt/vmwareapi/test_imagecache.py @@ -16,8 +16,8 @@ import contextlib import datetime import mock -from oslo.config import cfg -from oslo.utils import timeutils +from oslo_config import cfg +from oslo_utils import timeutils from nova import objects from nova import test diff --git a/nova/tests/unit/virt/vmwareapi/test_images.py b/nova/tests/unit/virt/vmwareapi/test_images.py index 1741cbc841..ac08b94244 100644 --- a/nova/tests/unit/virt/vmwareapi/test_images.py +++ b/nova/tests/unit/virt/vmwareapi/test_images.py @@ -18,8 +18,8 @@ Test suite for images. import contextlib import mock -from oslo.utils import units -from oslo.vmware import rw_handles +from oslo_utils import units +from oslo_vmware import rw_handles from nova import exception from nova import test @@ -93,8 +93,8 @@ class VMwareImagesTestCase(test.NoDBTestCase): mock_image_service.show.return_value = metadata mock_get_remote_image_service.return_value = [mock_image_service, 'i'] - @mock.patch('oslo.vmware.rw_handles.ImageReadHandle') - @mock.patch('oslo.vmware.rw_handles.VmdkWriteHandle') + @mock.patch('oslo_vmware.rw_handles.ImageReadHandle') + @mock.patch('oslo_vmware.rw_handles.VmdkWriteHandle') def test_fetch_image_stream_optimized(self, mock_write_class, mock_read_class): diff --git a/nova/tests/unit/virt/vmwareapi/test_read_write_util.py b/nova/tests/unit/virt/vmwareapi/test_read_write_util.py index dfc26ed63f..7ee8ed4fde 100644 --- a/nova/tests/unit/virt/vmwareapi/test_read_write_util.py +++ b/nova/tests/unit/virt/vmwareapi/test_read_write_util.py @@ -14,7 +14,7 @@ # under the License. import mock -from oslo.config import cfg +from oslo_config import cfg import requests from nova import test diff --git a/nova/tests/unit/virt/vmwareapi/test_vif.py b/nova/tests/unit/virt/vmwareapi/test_vif.py index 2a4d086c36..947b480f49 100644 --- a/nova/tests/unit/virt/vmwareapi/test_vif.py +++ b/nova/tests/unit/virt/vmwareapi/test_vif.py @@ -16,8 +16,8 @@ import contextlib import mock -from oslo.config import cfg -from oslo.vmware import exceptions as vexc +from oslo_config import cfg +from oslo_vmware import exceptions as vexc from nova import exception from nova.network import model as network_model diff --git a/nova/tests/unit/virt/vmwareapi/test_vm_util.py b/nova/tests/unit/virt/vmwareapi/test_vm_util.py index 42e4f6fa02..aa27ec9c52 100644 --- a/nova/tests/unit/virt/vmwareapi/test_vm_util.py +++ b/nova/tests/unit/virt/vmwareapi/test_vm_util.py @@ -19,8 +19,8 @@ import contextlib import re import mock -from oslo.vmware import exceptions as vexc -from oslo.vmware import pbm +from oslo_vmware import exceptions as vexc +from oslo_vmware import pbm from nova import context from nova import exception diff --git a/nova/tests/unit/virt/vmwareapi/test_vmops.py b/nova/tests/unit/virt/vmwareapi/test_vmops.py index 867cf3e1d8..099b1b7510 100644 --- a/nova/tests/unit/virt/vmwareapi/test_vmops.py +++ b/nova/tests/unit/virt/vmwareapi/test_vmops.py @@ -15,8 +15,8 @@ import contextlib import mock -from oslo.utils import units -from oslo.vmware import exceptions as vexc +from oslo_utils import units +from oslo_vmware import exceptions as vexc from nova.compute import power_state from nova import context diff --git a/nova/tests/unit/virt/xenapi/stubs.py b/nova/tests/unit/virt/xenapi/stubs.py index 0a32ccba00..6134bbc67b 100644 --- a/nova/tests/unit/virt/xenapi/stubs.py +++ b/nova/tests/unit/virt/xenapi/stubs.py @@ -18,7 +18,7 @@ import random import sys import fixtures -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils from nova import test import nova.tests.unit.image.fake diff --git a/nova/tests/unit/virt/xenapi/test_driver.py b/nova/tests/unit/virt/xenapi/test_driver.py index 7962876739..432e754738 100644 --- a/nova/tests/unit/virt/xenapi/test_driver.py +++ b/nova/tests/unit/virt/xenapi/test_driver.py @@ -16,7 +16,7 @@ import math import mock -from oslo.utils import units +from oslo_utils import units from nova.compute import arch from nova.tests.unit.virt.xenapi import stubs diff --git a/nova/tests/unit/virt/xenapi/test_vm_utils.py b/nova/tests/unit/virt/xenapi/test_vm_utils.py index cb64bcde84..2efdb7c5c0 100644 --- a/nova/tests/unit/virt/xenapi/test_vm_utils.py +++ b/nova/tests/unit/virt/xenapi/test_vm_utils.py @@ -20,12 +20,12 @@ from eventlet import greenthread import fixtures import mock from mox3 import mox -from oslo.config import cfg -from oslo.config import fixture as config_fixture -from oslo.utils import timeutils -from oslo.utils import units from oslo_concurrency import lockutils from oslo_concurrency import processutils +from oslo_config import cfg +from oslo_config import fixture as config_fixture +from oslo_utils import timeutils +from oslo_utils import units import six from nova.compute import flavors diff --git a/nova/tests/unit/virt/xenapi/test_xenapi.py b/nova/tests/unit/virt/xenapi/test_xenapi.py index 0aa21708da..cace52087e 100644 --- a/nova/tests/unit/virt/xenapi/test_xenapi.py +++ b/nova/tests/unit/virt/xenapi/test_xenapi.py @@ -25,11 +25,11 @@ import uuid import mock from mox3 import mox -from oslo.config import cfg -from oslo.config import fixture as config_fixture -from oslo.serialization import jsonutils -from oslo.utils import importutils from oslo_concurrency import lockutils +from oslo_config import cfg +from oslo_config import fixture as config_fixture +from oslo_serialization import jsonutils +from oslo_utils import importutils from nova.compute import api as compute_api from nova.compute import arch diff --git a/nova/utils.py b/nova/utils.py index 967f3b452d..622f5a21dd 100644 --- a/nova/utils.py +++ b/nova/utils.py @@ -36,13 +36,13 @@ from xml.sax import saxutils import eventlet import netaddr -from oslo.config import cfg -from oslo import messaging -from oslo.utils import excutils -from oslo.utils import importutils -from oslo.utils import timeutils from oslo_concurrency import lockutils from oslo_concurrency import processutils +from oslo_config import cfg +import oslo_messaging as messaging +from oslo_utils import excutils +from oslo_utils import importutils +from oslo_utils import timeutils import six from nova import exception diff --git a/nova/version.py b/nova/version.py index f905b2bd55..a03e18513e 100644 --- a/nova/version.py +++ b/nova/version.py @@ -31,7 +31,7 @@ def _load_config(): # this module import ConfigParser - from oslo.config import cfg + from oslo_config import cfg from nova.openstack.common import log as logging diff --git a/nova/virt/block_device.py b/nova/virt/block_device.py index d32da09314..1d23ad078b 100644 --- a/nova/virt/block_device.py +++ b/nova/virt/block_device.py @@ -15,8 +15,8 @@ import functools import operator -from oslo.serialization import jsonutils -from oslo.utils import excutils +from oslo_serialization import jsonutils +from oslo_utils import excutils from nova import block_device from nova.i18n import _ diff --git a/nova/virt/configdrive.py b/nova/virt/configdrive.py index f4f18929e4..1fe23736f4 100644 --- a/nova/virt/configdrive.py +++ b/nova/virt/configdrive.py @@ -18,9 +18,9 @@ import os import shutil -from oslo.config import cfg -from oslo.utils import strutils -from oslo.utils import units +from oslo_config import cfg +from oslo_utils import strutils +from oslo_utils import units from nova import exception from nova.i18n import _LW diff --git a/nova/virt/disk/api.py b/nova/virt/disk/api.py index 6adb65ff8f..a78761e1d5 100644 --- a/nova/virt/disk/api.py +++ b/nova/virt/disk/api.py @@ -30,9 +30,9 @@ import tempfile if os.name != 'nt': import crypt -from oslo.config import cfg -from oslo.serialization import jsonutils from oslo_concurrency import processutils +from oslo_config import cfg +from oslo_serialization import jsonutils from nova import exception from nova.i18n import _ diff --git a/nova/virt/disk/mount/api.py b/nova/virt/disk/mount/api.py index 900fad561e..ce28d97569 100644 --- a/nova/virt/disk/mount/api.py +++ b/nova/virt/disk/mount/api.py @@ -16,7 +16,7 @@ import os import time -from oslo.utils import importutils +from oslo_utils import importutils from nova.i18n import _, _LI, _LW from nova.openstack.common import log as logging diff --git a/nova/virt/disk/mount/nbd.py b/nova/virt/disk/mount/nbd.py index 438d2cc9de..88f2a88f90 100644 --- a/nova/virt/disk/mount/nbd.py +++ b/nova/virt/disk/mount/nbd.py @@ -18,7 +18,7 @@ import random import re import time -from oslo.config import cfg +from oslo_config import cfg from nova.i18n import _, _LE, _LI, _LW from nova.openstack.common import log as logging diff --git a/nova/virt/disk/vfs/api.py b/nova/virt/disk/vfs/api.py index 57d6e762b4..7d2d0ee8af 100644 --- a/nova/virt/disk/vfs/api.py +++ b/nova/virt/disk/vfs/api.py @@ -16,7 +16,7 @@ from nova import exception from nova.i18n import _LI from nova.openstack.common import log as logging -from oslo.utils import importutils +from oslo_utils import importutils LOG = logging.getLogger(__name__) diff --git a/nova/virt/disk/vfs/guestfs.py b/nova/virt/disk/vfs/guestfs.py index 21fa23af7e..323a9dcf26 100644 --- a/nova/virt/disk/vfs/guestfs.py +++ b/nova/virt/disk/vfs/guestfs.py @@ -13,8 +13,8 @@ # under the License. from eventlet import tpool -from oslo.config import cfg -from oslo.utils import importutils +from oslo_config import cfg +from oslo_utils import importutils import six from nova import exception diff --git a/nova/virt/disk/vfs/localfs.py b/nova/virt/disk/vfs/localfs.py index c2b99ff785..048c3f12d1 100644 --- a/nova/virt/disk/vfs/localfs.py +++ b/nova/virt/disk/vfs/localfs.py @@ -15,7 +15,7 @@ import os import tempfile -from oslo.utils import excutils +from oslo_utils import excutils from nova import exception from nova.i18n import _ diff --git a/nova/virt/driver.py b/nova/virt/driver.py index 8ade83341a..51c0963f73 100644 --- a/nova/virt/driver.py +++ b/nova/virt/driver.py @@ -22,8 +22,8 @@ Driver base-classes: import sys -from oslo.config import cfg -from oslo.utils import importutils +from oslo_config import cfg +from oslo_utils import importutils from nova.i18n import _, _LE, _LI from nova.openstack.common import log as logging diff --git a/nova/virt/fake.py b/nova/virt/fake.py index 91ee697c1e..6a4c8fea55 100644 --- a/nova/virt/fake.py +++ b/nova/virt/fake.py @@ -25,8 +25,8 @@ semantics of real hypervisor connections. import contextlib -from oslo.config import cfg -from oslo.serialization import jsonutils +from oslo_config import cfg +from oslo_serialization import jsonutils from nova.compute import arch from nova.compute import hv_type diff --git a/nova/virt/firewall.py b/nova/virt/firewall.py index 21293ff1a9..1109946913 100644 --- a/nova/virt/firewall.py +++ b/nova/virt/firewall.py @@ -15,8 +15,8 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.config import cfg -from oslo.utils import importutils +from oslo_config import cfg +from oslo_utils import importutils from nova.compute import utils as compute_utils from nova import context diff --git a/nova/virt/hardware.py b/nova/virt/hardware.py index ddc84fbdd0..59a1b72133 100644 --- a/nova/virt/hardware.py +++ b/nova/virt/hardware.py @@ -15,9 +15,9 @@ import collections import itertools -from oslo.config import cfg -from oslo.serialization import jsonutils -from oslo.utils import units +from oslo_config import cfg +from oslo_serialization import jsonutils +from oslo_utils import units import six from nova import context diff --git a/nova/virt/hyperv/hostops.py b/nova/virt/hyperv/hostops.py index d6c8e49c0e..fa22169cc7 100644 --- a/nova/virt/hyperv/hostops.py +++ b/nova/virt/hyperv/hostops.py @@ -21,9 +21,9 @@ import os import platform import time -from oslo.config import cfg -from oslo.serialization import jsonutils -from oslo.utils import units +from oslo_config import cfg +from oslo_serialization import jsonutils +from oslo_utils import units from nova.compute import arch from nova.compute import hv_type diff --git a/nova/virt/hyperv/imagecache.py b/nova/virt/hyperv/imagecache.py index 640bbf5a2d..487d3b9278 100644 --- a/nova/virt/hyperv/imagecache.py +++ b/nova/virt/hyperv/imagecache.py @@ -17,9 +17,9 @@ Image caching and management. """ import os -from oslo.config import cfg -from oslo.utils import excutils -from oslo.utils import units +from oslo_config import cfg +from oslo_utils import excutils +from oslo_utils import units from nova.i18n import _ from nova.openstack.common import log as logging diff --git a/nova/virt/hyperv/livemigrationops.py b/nova/virt/hyperv/livemigrationops.py index 72fef72e96..e2e1720cbd 100644 --- a/nova/virt/hyperv/livemigrationops.py +++ b/nova/virt/hyperv/livemigrationops.py @@ -18,8 +18,8 @@ Management class for live migration VM operations. """ import functools -from oslo.config import cfg -from oslo.utils import excutils +from oslo_config import cfg +from oslo_utils import excutils from nova.i18n import _ from nova.openstack.common import log as logging diff --git a/nova/virt/hyperv/migrationops.py b/nova/virt/hyperv/migrationops.py index 0e721f0177..b34f8996fb 100644 --- a/nova/virt/hyperv/migrationops.py +++ b/nova/virt/hyperv/migrationops.py @@ -18,8 +18,8 @@ Management class for migration / resize operations. """ import os -from oslo.utils import excutils -from oslo.utils import units +from oslo_utils import excutils +from oslo_utils import units from nova import exception from nova.i18n import _, _LE diff --git a/nova/virt/hyperv/pathutils.py b/nova/virt/hyperv/pathutils.py index 5126fe9ae7..791884fe15 100644 --- a/nova/virt/hyperv/pathutils.py +++ b/nova/virt/hyperv/pathutils.py @@ -20,7 +20,7 @@ import sys if sys.platform == 'win32': import wmi -from oslo.config import cfg +from oslo_config import cfg from nova.i18n import _ from nova.openstack.common import log as logging diff --git a/nova/virt/hyperv/snapshotops.py b/nova/virt/hyperv/snapshotops.py index 34e41ca833..f4ac575591 100644 --- a/nova/virt/hyperv/snapshotops.py +++ b/nova/virt/hyperv/snapshotops.py @@ -18,7 +18,7 @@ Management class for VM snapshot operations. """ import os -from oslo.config import cfg +from oslo_config import cfg from nova.compute import task_states from nova.i18n import _LW diff --git a/nova/virt/hyperv/utilsfactory.py b/nova/virt/hyperv/utilsfactory.py index 88778008f8..d12df2f398 100644 --- a/nova/virt/hyperv/utilsfactory.py +++ b/nova/virt/hyperv/utilsfactory.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.config import cfg +from oslo_config import cfg from nova.i18n import _ from nova.openstack.common import log as logging diff --git a/nova/virt/hyperv/vhdutilsv2.py b/nova/virt/hyperv/vhdutilsv2.py index 068d809947..c9ac622ef7 100644 --- a/nova/virt/hyperv/vhdutilsv2.py +++ b/nova/virt/hyperv/vhdutilsv2.py @@ -26,7 +26,7 @@ if sys.platform == 'win32': from xml.etree import ElementTree -from oslo.utils import units +from oslo_utils import units from nova.i18n import _ from nova.virt.hyperv import constants diff --git a/nova/virt/hyperv/vif.py b/nova/virt/hyperv/vif.py index 2fa9fe83ac..0cea6b300a 100644 --- a/nova/virt/hyperv/vif.py +++ b/nova/virt/hyperv/vif.py @@ -16,7 +16,7 @@ import abc -from oslo.config import cfg +from oslo_config import cfg from nova.openstack.common import log as logging from nova.virt.hyperv import utilsfactory diff --git a/nova/virt/hyperv/vmops.py b/nova/virt/hyperv/vmops.py index 9042aff9f0..77a1944026 100644 --- a/nova/virt/hyperv/vmops.py +++ b/nova/virt/hyperv/vmops.py @@ -22,11 +22,11 @@ import os import time from eventlet import timeout as etimeout -from oslo.config import cfg -from oslo.utils import excutils -from oslo.utils import importutils -from oslo.utils import units from oslo_concurrency import processutils +from oslo_config import cfg +from oslo_utils import excutils +from oslo_utils import importutils +from oslo_utils import units from nova.api.metadata import base as instance_metadata from nova import exception diff --git a/nova/virt/hyperv/vmutils.py b/nova/virt/hyperv/vmutils.py index 4749269fad..795f361ef5 100644 --- a/nova/virt/hyperv/vmutils.py +++ b/nova/virt/hyperv/vmutils.py @@ -25,7 +25,7 @@ import uuid if sys.platform == 'win32': import wmi -from oslo.config import cfg +from oslo_config import cfg from nova import exception from nova.i18n import _, _LW diff --git a/nova/virt/hyperv/vmutilsv2.py b/nova/virt/hyperv/vmutilsv2.py index 34841ecc56..378d5971c4 100644 --- a/nova/virt/hyperv/vmutilsv2.py +++ b/nova/virt/hyperv/vmutilsv2.py @@ -24,7 +24,7 @@ import uuid if sys.platform == 'win32': import wmi -from oslo.config import cfg +from oslo_config import cfg from nova.openstack.common import log as logging from nova.virt.hyperv import constants diff --git a/nova/virt/hyperv/volumeops.py b/nova/virt/hyperv/volumeops.py index 6603678426..376e9a12b1 100644 --- a/nova/virt/hyperv/volumeops.py +++ b/nova/virt/hyperv/volumeops.py @@ -22,8 +22,8 @@ import os import re import time -from oslo.config import cfg -from oslo.utils import excutils +from oslo_config import cfg +from oslo_utils import excutils from nova import exception from nova.i18n import _, _LE, _LW diff --git a/nova/virt/hyperv/volumeutils.py b/nova/virt/hyperv/volumeutils.py index 7c9c8f8df8..29d4f37656 100644 --- a/nova/virt/hyperv/volumeutils.py +++ b/nova/virt/hyperv/volumeutils.py @@ -26,7 +26,7 @@ http://www.microsoft.com/en-us/download/details.aspx?id=34750 import re import time -from oslo.config import cfg +from oslo_config import cfg from nova.i18n import _ from nova.openstack.common import log as logging diff --git a/nova/virt/hyperv/volumeutilsv2.py b/nova/virt/hyperv/volumeutilsv2.py index 7eb27e3875..10d8dc9973 100644 --- a/nova/virt/hyperv/volumeutilsv2.py +++ b/nova/virt/hyperv/volumeutilsv2.py @@ -24,7 +24,7 @@ import time if sys.platform == 'win32': import wmi -from oslo.config import cfg +from oslo_config import cfg from nova.i18n import _ from nova.openstack.common import log as logging diff --git a/nova/virt/imagecache.py b/nova/virt/imagecache.py index 22cd974d79..b2af27efaa 100644 --- a/nova/virt/imagecache.py +++ b/nova/virt/imagecache.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.config import cfg +from oslo_config import cfg from nova.compute import task_states from nova.compute import vm_states diff --git a/nova/virt/images.py b/nova/virt/images.py index 2768ce007a..40f259a7fa 100644 --- a/nova/virt/images.py +++ b/nova/virt/images.py @@ -21,7 +21,7 @@ Handling of VM disk images. import os -from oslo.config import cfg +from oslo_config import cfg from nova import exception from nova.i18n import _, _LE diff --git a/nova/virt/ironic/client_wrapper.py b/nova/virt/ironic/client_wrapper.py index f74e0e2b17..a01e839aa9 100644 --- a/nova/virt/ironic/client_wrapper.py +++ b/nova/virt/ironic/client_wrapper.py @@ -17,8 +17,8 @@ import time -from oslo.config import cfg -from oslo.utils import importutils +from oslo_config import cfg +from oslo_utils import importutils from nova import exception from nova.i18n import _ diff --git a/nova/virt/ironic/driver.py b/nova/virt/ironic/driver.py index d2c12a5064..7641734bbb 100644 --- a/nova/virt/ironic/driver.py +++ b/nova/virt/ironic/driver.py @@ -27,10 +27,10 @@ import shutil import tempfile import time -from oslo.config import cfg -from oslo.serialization import jsonutils -from oslo.utils import excutils -from oslo.utils import importutils +from oslo_config import cfg +from oslo_serialization import jsonutils +from oslo_utils import excutils +from oslo_utils import importutils import six from nova.api.metadata import base as instance_metadata diff --git a/nova/virt/ironic/patcher.py b/nova/virt/ironic/patcher.py index d5a72b1c4d..ba35074fb7 100644 --- a/nova/virt/ironic/patcher.py +++ b/nova/virt/ironic/patcher.py @@ -20,7 +20,7 @@ Helper classes for Ironic HTTP PATCH creation. """ -from oslo.config import cfg +from oslo_config import cfg CONF = cfg.CONF CONF.import_opt('default_ephemeral_format', 'nova.virt.driver') diff --git a/nova/virt/libvirt/blockinfo.py b/nova/virt/libvirt/blockinfo.py index 472b9b9a06..69b509caf7 100644 --- a/nova/virt/libvirt/blockinfo.py +++ b/nova/virt/libvirt/blockinfo.py @@ -72,7 +72,7 @@ variables / types used import itertools import operator -from oslo.config import cfg +from oslo_config import cfg from nova import block_device from nova.compute import arch diff --git a/nova/virt/libvirt/config.py b/nova/virt/libvirt/config.py index 5e430b2269..65c51be418 100644 --- a/nova/virt/libvirt/config.py +++ b/nova/virt/libvirt/config.py @@ -26,7 +26,7 @@ helpers for populating up config object instances. import time from lxml import etree -from oslo.utils import units +from oslo_utils import units import six from nova import exception diff --git a/nova/virt/libvirt/driver.py b/nova/virt/libvirt/driver.py index a5c30e3694..d1262e47f4 100644 --- a/nova/virt/libvirt/driver.py +++ b/nova/virt/libvirt/driver.py @@ -45,15 +45,15 @@ import eventlet from eventlet import greenthread from eventlet import tpool from lxml import etree -from oslo.config import cfg -from oslo.serialization import jsonutils -from oslo.utils import encodeutils -from oslo.utils import excutils -from oslo.utils import importutils -from oslo.utils import strutils -from oslo.utils import timeutils -from oslo.utils import units from oslo_concurrency import processutils +from oslo_config import cfg +from oslo_serialization import jsonutils +from oslo_utils import encodeutils +from oslo_utils import excutils +from oslo_utils import importutils +from oslo_utils import strutils +from oslo_utils import timeutils +from oslo_utils import units import six from nova.api.metadata import base as instance_metadata diff --git a/nova/virt/libvirt/firewall.py b/nova/virt/libvirt/firewall.py index 1704943296..2bcdaa7275 100644 --- a/nova/virt/libvirt/firewall.py +++ b/nova/virt/libvirt/firewall.py @@ -18,8 +18,8 @@ import uuid from lxml import etree -from oslo.config import cfg -from oslo.utils import importutils +from oslo_config import cfg +from oslo_utils import importutils from nova.cloudpipe import pipelib from nova.i18n import _LI diff --git a/nova/virt/libvirt/host.py b/nova/virt/libvirt/host.py index 699103a541..95e266afe9 100644 --- a/nova/virt/libvirt/host.py +++ b/nova/virt/libvirt/host.py @@ -36,8 +36,8 @@ from eventlet import greenio from eventlet import greenthread from eventlet import patcher from eventlet import tpool -from oslo.config import cfg -from oslo.utils import excutils +from oslo_config import cfg +from oslo_utils import excutils from nova import context as nova_context from nova import exception diff --git a/nova/virt/libvirt/imagebackend.py b/nova/virt/libvirt/imagebackend.py index ebdf2db0cc..44a626bf25 100644 --- a/nova/virt/libvirt/imagebackend.py +++ b/nova/virt/libvirt/imagebackend.py @@ -19,10 +19,10 @@ import functools import os import shutil -from oslo.config import cfg -from oslo.serialization import jsonutils -from oslo.utils import excutils -from oslo.utils import units +from oslo_config import cfg +from oslo_serialization import jsonutils +from oslo_utils import excutils +from oslo_utils import units import six from nova import exception diff --git a/nova/virt/libvirt/imagecache.py b/nova/virt/libvirt/imagecache.py index f4ff2d9e4d..48cd8868b6 100644 --- a/nova/virt/libvirt/imagecache.py +++ b/nova/virt/libvirt/imagecache.py @@ -25,10 +25,10 @@ import os import re import time -from oslo.config import cfg -from oslo.serialization import jsonutils from oslo_concurrency import lockutils from oslo_concurrency import processutils +from oslo_config import cfg +from oslo_serialization import jsonutils from nova.i18n import _LE from nova.i18n import _LI diff --git a/nova/virt/libvirt/lvm.py b/nova/virt/libvirt/lvm.py index a7434a99b7..fef3ceb82f 100644 --- a/nova/virt/libvirt/lvm.py +++ b/nova/virt/libvirt/lvm.py @@ -21,9 +21,9 @@ import functools -from oslo.config import cfg -from oslo.utils import units from oslo_concurrency import processutils +from oslo_config import cfg +from oslo_utils import units import six from nova import exception diff --git a/nova/virt/libvirt/rbd_utils.py b/nova/virt/libvirt/rbd_utils.py index eb46daa589..8145d11f55 100644 --- a/nova/virt/libvirt/rbd_utils.py +++ b/nova/virt/libvirt/rbd_utils.py @@ -23,9 +23,9 @@ except ImportError: rados = None rbd = None -from oslo.serialization import jsonutils -from oslo.utils import excutils -from oslo.utils import units +from oslo_serialization import jsonutils +from oslo_utils import excutils +from oslo_utils import units from nova import exception from nova.i18n import _ diff --git a/nova/virt/libvirt/utils.py b/nova/virt/libvirt/utils.py index 99a56ad177..1dd9b414c0 100644 --- a/nova/virt/libvirt/utils.py +++ b/nova/virt/libvirt/utils.py @@ -23,8 +23,8 @@ import os import re from lxml import etree -from oslo.config import cfg from oslo_concurrency import processutils +from oslo_config import cfg from nova.compute import arch from nova.i18n import _ diff --git a/nova/virt/libvirt/vif.py b/nova/virt/libvirt/vif.py index b0c789babe..509df75c51 100644 --- a/nova/virt/libvirt/vif.py +++ b/nova/virt/libvirt/vif.py @@ -19,8 +19,8 @@ import copy -from oslo.config import cfg from oslo_concurrency import processutils +from oslo_config import cfg from nova import exception from nova.i18n import _ diff --git a/nova/virt/libvirt/volume.py b/nova/virt/libvirt/volume.py index b769d2680b..3c7bbc2a8e 100644 --- a/nova/virt/libvirt/volume.py +++ b/nova/virt/libvirt/volume.py @@ -22,9 +22,9 @@ import re import time import urllib2 -from oslo.config import cfg -from oslo.utils import strutils from oslo_concurrency import processutils +from oslo_config import cfg +from oslo_utils import strutils import six import six.moves.urllib.parse as urlparse diff --git a/nova/virt/netutils.py b/nova/virt/netutils.py index 04b95a6234..2d1d8e4648 100644 --- a/nova/virt/netutils.py +++ b/nova/virt/netutils.py @@ -23,7 +23,7 @@ import os import jinja2 import netaddr -from oslo.config import cfg +from oslo_config import cfg from nova.network import model from nova import paths diff --git a/nova/virt/storage_users.py b/nova/virt/storage_users.py index d9b6c7e212..dbb5c2a1e3 100644 --- a/nova/virt/storage_users.py +++ b/nova/virt/storage_users.py @@ -16,8 +16,8 @@ import os import time -from oslo.config import cfg -from oslo.serialization import jsonutils +from oslo_config import cfg +from oslo_serialization import jsonutils from nova.i18n import _LW from nova.openstack.common import log as logging diff --git a/nova/virt/vmwareapi/driver.py b/nova/virt/vmwareapi/driver.py index 1be638f2fb..98cd679196 100644 --- a/nova/virt/vmwareapi/driver.py +++ b/nova/virt/vmwareapi/driver.py @@ -21,13 +21,13 @@ A connection to the VMware vCenter platform. import re -from oslo.config import cfg -from oslo.serialization import jsonutils -from oslo.vmware import api -from oslo.vmware import exceptions as vexc -from oslo.vmware import pbm -from oslo.vmware import vim -from oslo.vmware import vim_util +from oslo_config import cfg +from oslo_serialization import jsonutils +from oslo_vmware import api +from oslo_vmware import exceptions as vexc +from oslo_vmware import pbm +from oslo_vmware import vim +from oslo_vmware import vim_util from nova import exception from nova.i18n import _, _LI, _LW diff --git a/nova/virt/vmwareapi/ds_util.py b/nova/virt/vmwareapi/ds_util.py index c9f4648aae..10af368a36 100644 --- a/nova/virt/vmwareapi/ds_util.py +++ b/nova/virt/vmwareapi/ds_util.py @@ -17,8 +17,8 @@ Datastore utility functions """ import posixpath -from oslo.vmware import exceptions as vexc -from oslo.vmware import pbm +from oslo_vmware import exceptions as vexc +from oslo_vmware import pbm from nova import exception from nova.i18n import _, _LE, _LI diff --git a/nova/virt/vmwareapi/error_util.py b/nova/virt/vmwareapi/error_util.py index 78921ae756..da5ca5bb72 100644 --- a/nova/virt/vmwareapi/error_util.py +++ b/nova/virt/vmwareapi/error_util.py @@ -16,7 +16,7 @@ """ Exception classes specific for the VMware driver. """ -from oslo.vmware import exceptions as vexc +from oslo_vmware import exceptions as vexc from nova.i18n import _ diff --git a/nova/virt/vmwareapi/host.py b/nova/virt/vmwareapi/host.py index fe1570ac25..1304ae7dd5 100644 --- a/nova/virt/vmwareapi/host.py +++ b/nova/virt/vmwareapi/host.py @@ -17,7 +17,7 @@ Management class for host-related functions (start, reboot, etc). """ -from oslo.utils import units +from oslo_utils import units from nova.compute import arch from nova.compute import hv_type diff --git a/nova/virt/vmwareapi/imagecache.py b/nova/virt/vmwareapi/imagecache.py index c66c058eec..d594cb0e99 100644 --- a/nova/virt/vmwareapi/imagecache.py +++ b/nova/virt/vmwareapi/imagecache.py @@ -35,10 +35,10 @@ the timestamp folder will be locked and the timestamps will be purged. This will ensure that a image is not deleted during the spawn. """ -from oslo.config import cfg -from oslo.utils import timeutils -from oslo.vmware import exceptions as vexc from oslo_concurrency import lockutils +from oslo_config import cfg +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 diff --git a/nova/virt/vmwareapi/images.py b/nova/virt/vmwareapi/images.py index e8a670e466..8179433e2c 100644 --- a/nova/virt/vmwareapi/images.py +++ b/nova/virt/vmwareapi/images.py @@ -19,10 +19,10 @@ Utility functions for Image transfer and manipulation. import os -from oslo.config import cfg -from oslo.utils import strutils -from oslo.utils import units -from oslo.vmware import rw_handles +from oslo_config import cfg +from oslo_utils import strutils +from oslo_utils import units +from oslo_vmware import rw_handles from nova import exception from nova.i18n import _LI diff --git a/nova/virt/vmwareapi/network_util.py b/nova/virt/vmwareapi/network_util.py index b76f7f2eef..e802a93a52 100644 --- a/nova/virt/vmwareapi/network_util.py +++ b/nova/virt/vmwareapi/network_util.py @@ -17,7 +17,7 @@ """ Utility functions for ESX Networking. """ -from oslo.vmware import exceptions as vexc +from oslo_vmware import exceptions as vexc from nova import exception from nova.i18n import _ diff --git a/nova/virt/vmwareapi/read_write_util.py b/nova/virt/vmwareapi/read_write_util.py index e325f23ad3..2a3d3f97e5 100644 --- a/nova/virt/vmwareapi/read_write_util.py +++ b/nova/virt/vmwareapi/read_write_util.py @@ -22,8 +22,8 @@ Collection of classes to handle image upload/download to/from Image service import urllib -from oslo.utils import netutils -from oslo.vmware import rw_handles +from oslo_utils import netutils +from oslo_vmware import rw_handles class VMwareHTTPReadFile(rw_handles.FileHandle): diff --git a/nova/virt/vmwareapi/vif.py b/nova/virt/vmwareapi/vif.py index 709e47a8e6..c37c0d2977 100644 --- a/nova/virt/vmwareapi/vif.py +++ b/nova/virt/vmwareapi/vif.py @@ -15,8 +15,8 @@ """VIF drivers for VMware.""" -from oslo.config import cfg -from oslo.vmware import exceptions as vexc +from oslo_config import cfg +from oslo_vmware import exceptions as vexc from nova import exception from nova.i18n import _LW diff --git a/nova/virt/vmwareapi/vim_util.py b/nova/virt/vmwareapi/vim_util.py index d4ad6cfb8d..2041601f9c 100644 --- a/nova/virt/vmwareapi/vim_util.py +++ b/nova/virt/vmwareapi/vim_util.py @@ -17,8 +17,8 @@ The VMware API utility module. """ -from oslo.config import cfg -from oslo.vmware import vim_util as vutil +from oslo_config import cfg +from oslo_vmware import vim_util as vutil import suds from nova.i18n import _LW diff --git a/nova/virt/vmwareapi/vm_util.py b/nova/virt/vmwareapi/vm_util.py index 8cb15a1e5b..7e5a7e0e38 100644 --- a/nova/virt/vmwareapi/vm_util.py +++ b/nova/virt/vmwareapi/vm_util.py @@ -22,12 +22,12 @@ import collections import copy import functools -from oslo.config import cfg -from oslo.utils import excutils -from oslo.utils import units -from oslo.vmware import exceptions as vexc -from oslo.vmware.objects import datastore as ds_obj -from oslo.vmware import pbm +from oslo_config import cfg +from oslo_utils import excutils +from oslo_utils import units +from oslo_vmware import exceptions as vexc +from oslo_vmware.objects import datastore as ds_obj +from oslo_vmware import pbm from nova import exception from nova.i18n import _, _LI, _LW diff --git a/nova/virt/vmwareapi/vmops.py b/nova/virt/vmwareapi/vmops.py index d4081ced0e..36393b1761 100644 --- a/nova/virt/vmwareapi/vmops.py +++ b/nova/virt/vmwareapi/vmops.py @@ -24,12 +24,12 @@ import os import time import decorator -from oslo.config import cfg -from oslo.utils import excutils -from oslo.utils import strutils -from oslo.utils import units -from oslo.vmware import exceptions as vexc from oslo_concurrency import lockutils +from oslo_config import cfg +from oslo_utils import excutils +from oslo_utils import strutils +from oslo_utils import units +from oslo_vmware import exceptions as vexc from nova.api.metadata import base as instance_metadata from nova import compute diff --git a/nova/virt/vmwareapi/volumeops.py b/nova/virt/vmwareapi/volumeops.py index 06a2e60045..6c2381aa92 100644 --- a/nova/virt/vmwareapi/volumeops.py +++ b/nova/virt/vmwareapi/volumeops.py @@ -17,8 +17,8 @@ Management class for Storage-related functions (attach, detach, etc). """ -from oslo.config import cfg -from oslo.vmware import vim_util as vutil +from oslo_config import cfg +from oslo_vmware import vim_util as vutil from nova.compute import vm_states from nova import exception diff --git a/nova/virt/xenapi/agent.py b/nova/virt/xenapi/agent.py index 40273b920f..141fd9f4c7 100644 --- a/nova/virt/xenapi/agent.py +++ b/nova/virt/xenapi/agent.py @@ -21,9 +21,9 @@ import sys import time import uuid -from oslo.config import cfg -from oslo.serialization import jsonutils -from oslo.utils import strutils +from oslo_config import cfg +from oslo_serialization import jsonutils +from oslo_utils import strutils from nova.api.metadata import password from nova.compute import utils as compute_utils diff --git a/nova/virt/xenapi/client/session.py b/nova/virt/xenapi/client/session.py index 780d6b5b30..324458d005 100644 --- a/nova/virt/xenapi/client/session.py +++ b/nova/virt/xenapi/client/session.py @@ -21,7 +21,7 @@ import xmlrpclib from eventlet import queue from eventlet import timeout -from oslo.config import cfg +from oslo_config import cfg from nova import context from nova import exception diff --git a/nova/virt/xenapi/driver.py b/nova/virt/xenapi/driver.py index 18472f9dc7..0ed36e57d1 100644 --- a/nova/virt/xenapi/driver.py +++ b/nova/virt/xenapi/driver.py @@ -25,9 +25,9 @@ A driver for XenServer or Xen Cloud Platform. import math -from oslo.config import cfg -from oslo.serialization import jsonutils -from oslo.utils import units +from oslo_config import cfg +from oslo_serialization import jsonutils +from oslo_utils import units import six.moves.urllib.parse as urlparse from nova.i18n import _, _LE, _LW diff --git a/nova/virt/xenapi/fake.py b/nova/virt/xenapi/fake.py index b0be5f31e6..06adf6188f 100644 --- a/nova/virt/xenapi/fake.py +++ b/nova/virt/xenapi/fake.py @@ -55,9 +55,9 @@ import uuid from xml.sax import saxutils import zlib -from oslo.serialization import jsonutils -from oslo.utils import timeutils -from oslo.utils import units +from oslo_serialization import jsonutils +from oslo_utils import timeutils +from oslo_utils import units from nova import exception from nova.i18n import _ diff --git a/nova/virt/xenapi/firewall.py b/nova/virt/xenapi/firewall.py index d3b3756d30..764f166ce5 100644 --- a/nova/virt/xenapi/firewall.py +++ b/nova/virt/xenapi/firewall.py @@ -15,7 +15,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils from nova import context from nova.openstack.common import log as logging diff --git a/nova/virt/xenapi/host.py b/nova/virt/xenapi/host.py index cadb11729e..ebee30d502 100644 --- a/nova/virt/xenapi/host.py +++ b/nova/virt/xenapi/host.py @@ -19,8 +19,8 @@ Management class for host-related functions (start, reboot, etc). import re -from oslo.config import cfg -from oslo.serialization import jsonutils +from oslo_config import cfg +from oslo_serialization import jsonutils from nova.compute import arch from nova.compute import hv_type diff --git a/nova/virt/xenapi/image/bittorrent.py b/nova/virt/xenapi/image/bittorrent.py index bcb2719f56..28dc939d47 100644 --- a/nova/virt/xenapi/image/bittorrent.py +++ b/nova/virt/xenapi/image/bittorrent.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.config import cfg +from oslo_config import cfg import pkg_resources import six.moves.urllib.parse as urlparse diff --git a/nova/virt/xenapi/image/glance.py b/nova/virt/xenapi/image/glance.py index 7eb69c39cd..85599b11a0 100644 --- a/nova/virt/xenapi/image/glance.py +++ b/nova/virt/xenapi/image/glance.py @@ -16,7 +16,7 @@ import functools import sys -from oslo.config import cfg +from oslo_config import cfg from nova.compute import utils as compute_utils from nova import exception diff --git a/nova/virt/xenapi/pool.py b/nova/virt/xenapi/pool.py index dc89df1757..a4c7bce0d4 100644 --- a/nova/virt/xenapi/pool.py +++ b/nova/virt/xenapi/pool.py @@ -17,8 +17,8 @@ Management class for Pool-related functions (join, eject, etc). """ -from oslo.config import cfg -from oslo.serialization import jsonutils +from oslo_config import cfg +from oslo_serialization import jsonutils import six import six.moves.urllib.parse as urlparse diff --git a/nova/virt/xenapi/vif.py b/nova/virt/xenapi/vif.py index 74408cb3c3..9cdb6d9a00 100644 --- a/nova/virt/xenapi/vif.py +++ b/nova/virt/xenapi/vif.py @@ -17,7 +17,7 @@ """VIF drivers for XenAPI.""" -from oslo.config import cfg +from oslo_config import cfg from nova.i18n import _ from nova.virt.xenapi import network_utils diff --git a/nova/virt/xenapi/vm_utils.py b/nova/virt/xenapi/vm_utils.py index 767c30774f..4c086e0ee1 100644 --- a/nova/virt/xenapi/vm_utils.py +++ b/nova/virt/xenapi/vm_utils.py @@ -28,13 +28,13 @@ from xml.dom import minidom from xml.parsers import expat from eventlet import greenthread -from oslo.config import cfg -from oslo.utils import excutils -from oslo.utils import importutils -from oslo.utils import strutils -from oslo.utils import timeutils -from oslo.utils import units from oslo_concurrency import processutils +from oslo_config import cfg +from oslo_utils import excutils +from oslo_utils import importutils +from oslo_utils import strutils +from oslo_utils import timeutils +from oslo_utils import units import six import six.moves.urllib.parse as urlparse diff --git a/nova/virt/xenapi/vmops.py b/nova/virt/xenapi/vmops.py index 19b45b19df..f56c41723e 100644 --- a/nova/virt/xenapi/vmops.py +++ b/nova/virt/xenapi/vmops.py @@ -24,14 +24,14 @@ import zlib from eventlet import greenthread import netaddr -from oslo.config import cfg -from oslo.serialization import jsonutils -from oslo.utils import excutils -from oslo.utils import importutils -from oslo.utils import netutils -from oslo.utils import strutils -from oslo.utils import timeutils -from oslo.utils import units +from oslo_config import cfg +from oslo_serialization import jsonutils +from oslo_utils import excutils +from oslo_utils import importutils +from oslo_utils import netutils +from oslo_utils import strutils +from oslo_utils import timeutils +from oslo_utils import units from nova import block_device from nova import compute diff --git a/nova/virt/xenapi/volume_utils.py b/nova/virt/xenapi/volume_utils.py index fa33dc6640..29a8df1a8e 100644 --- a/nova/virt/xenapi/volume_utils.py +++ b/nova/virt/xenapi/volume_utils.py @@ -22,7 +22,7 @@ import re import string from eventlet import greenthread -from oslo.config import cfg +from oslo_config import cfg from nova import exception from nova.i18n import _, _LW diff --git a/nova/virt/xenapi/volumeops.py b/nova/virt/xenapi/volumeops.py index b8730e8201..a59f58b275 100644 --- a/nova/virt/xenapi/volumeops.py +++ b/nova/virt/xenapi/volumeops.py @@ -17,7 +17,7 @@ Management class for Storage-related functions (attach, detach, etc). """ -from oslo.utils import excutils +from oslo_utils import excutils from nova import exception from nova.i18n import _LI, _LW diff --git a/nova/vnc/__init__.py b/nova/vnc/__init__.py index 006ee94796..eb68c67168 100644 --- a/nova/vnc/__init__.py +++ b/nova/vnc/__init__.py @@ -16,7 +16,7 @@ """Module for VNC Proxying.""" -from oslo.config import cfg +from oslo_config import cfg vnc_opts = [ diff --git a/nova/vnc/xvp_proxy.py b/nova/vnc/xvp_proxy.py index 2fe31e67bb..5eb9e6d5a5 100644 --- a/nova/vnc/xvp_proxy.py +++ b/nova/vnc/xvp_proxy.py @@ -22,7 +22,7 @@ import eventlet import eventlet.green import eventlet.greenio import eventlet.wsgi -from oslo.config import cfg +from oslo_config import cfg import webob from nova.consoleauth import rpcapi as consoleauth_rpcapi diff --git a/nova/volume/__init__.py b/nova/volume/__init__.py index 0ab9eba300..d447dfdb94 100644 --- a/nova/volume/__init__.py +++ b/nova/volume/__init__.py @@ -14,20 +14,20 @@ # License for the specific language governing permissions and limitations # under the License. -import oslo.config.cfg -from oslo.utils import importutils +import oslo_config.cfg +from oslo_utils import importutils _volume_opts = [ - oslo.config.cfg.StrOpt('volume_api_class', + oslo_config.cfg.StrOpt('volume_api_class', default='nova.volume.cinder.API', help='The full class name of the ' 'volume API class to use'), ] -oslo.config.cfg.CONF.register_opts(_volume_opts) +oslo_config.cfg.CONF.register_opts(_volume_opts) def API(): - volume_api_class = oslo.config.cfg.CONF.volume_api_class + volume_api_class = oslo_config.cfg.CONF.volume_api_class cls = importutils.import_class(volume_api_class) return cls() diff --git a/nova/volume/cinder.py b/nova/volume/cinder.py index 3bf64c3cfc..e27ef14cc3 100644 --- a/nova/volume/cinder.py +++ b/nova/volume/cinder.py @@ -26,8 +26,8 @@ from cinderclient import exceptions as cinder_exception from cinderclient.v1 import client as v1_client from keystoneclient import exceptions as keystone_exception from keystoneclient import session -from oslo.config import cfg -from oslo.utils import strutils +from oslo_config import cfg +from oslo_utils import strutils import six.moves.urllib.parse as urlparse from nova import availability_zones as az diff --git a/nova/volume/encryptors/__init__.py b/nova/volume/encryptors/__init__.py index 455bed154d..959439ea6c 100644 --- a/nova/volume/encryptors/__init__.py +++ b/nova/volume/encryptors/__init__.py @@ -14,7 +14,7 @@ # under the License. -from oslo.utils import importutils +from oslo_utils import importutils from nova.i18n import _LE from nova.openstack.common import log as logging diff --git a/nova/wsgi.py b/nova/wsgi.py index 63fe72e032..f284a34130 100644 --- a/nova/wsgi.py +++ b/nova/wsgi.py @@ -27,8 +27,8 @@ import sys import eventlet import eventlet.wsgi import greenlet -from oslo.config import cfg -from oslo.utils import excutils +from oslo_config import cfg +from oslo_utils import excutils from paste import deploy import routes.middleware import webob.dec |