From 5e8ce0bbdebac4d04479403e2db7eb200b4dbce6 Mon Sep 17 00:00:00 2001 From: Davanum Srinivas Date: Wed, 27 Aug 2014 14:58:16 -0400 Subject: [PATCH] Switch to nova's jsonutils in oslo.serialization Very simple import change in each file, just touches a whole lot of files. jsonutils has graduated into a stand alone library and has been removed from the oslo-incubator repository. We should be using the library for all projects. Change-Id: I09d780a47d377871f357654603ee4b0fa0169d66 --- nova/api/auth.py | 2 +- nova/api/ec2/__init__.py | 2 +- nova/api/metadata/base.py | 2 +- nova/api/metadata/vendordata_json.py | 2 +- .../contrib/assisted_volume_snapshots.py | 2 +- .../compute/contrib/security_groups.py | 2 +- nova/api/openstack/compute/limits.py | 2 +- nova/api/openstack/compute/plugins/v3/pci.py | 2 +- .../compute/plugins/v3/security_groups.py | 3 +- nova/api/openstack/wsgi.py | 2 +- nova/baserpc.py | 2 +- nova/cells/messaging.py | 2 +- nova/cells/rpcapi.py | 2 +- nova/cells/state.py | 2 +- nova/cmd/dhcpbridge.py | 2 +- nova/compute/api.py | 2 +- nova/compute/claims.py | 3 +- nova/compute/manager.py | 2 +- nova/compute/resource_tracker.py | 2 +- nova/compute/rpcapi.py | 2 +- nova/compute/stats.py | 3 +- nova/conductor/manager.py | 2 +- nova/conductor/rpcapi.py | 2 +- nova/console/vmrc.py | 2 +- nova/consoleauth/manager.py | 2 +- nova/image/glance.py | 2 +- nova/network/linux_net.py | 2 +- nova/network/model.py | 2 +- nova/network/rpcapi.py | 2 +- nova/objects/compute_node.py | 3 +- nova/objects/instance_pci_requests.py | 3 +- nova/objects/pci_device.py | 3 +- nova/openstack/common/jsonutils.py | 202 ------------------ nova/pci/pci_devspec.py | 3 +- nova/pci/pci_request.py | 2 +- nova/pci/pci_stats.py | 3 +- nova/rpc.py | 2 +- nova/scheduler/base_baremetal_host_manager.py | 3 +- .../filters/compute_capabilities_filter.py | 2 +- nova/scheduler/filters/json_filter.py | 2 +- nova/scheduler/filters/trusted_filter.py | 2 +- nova/scheduler/host_manager.py | 2 +- nova/scheduler/ironic_host_manager.py | 2 +- nova/scheduler/manager.py | 2 +- nova/scheduler/scheduler_options.py | 2 +- nova/scheduler/utils.py | 2 +- nova/tests/api/openstack/common.py | 3 +- .../compute/contrib/test_admin_actions.py | 2 +- .../compute/contrib/test_admin_password.py | 2 +- .../compute/contrib/test_attach_interfaces.py | 2 +- .../compute/contrib/test_availability_zone.py | 2 +- .../contrib/test_block_device_mapping.py | 2 +- .../contrib/test_block_device_mapping_v1.py | 2 +- .../compute/contrib/test_config_drive.py | 2 +- .../contrib/test_console_auth_tokens.py | 2 +- .../compute/contrib/test_console_output.py | 3 +- .../compute/contrib/test_consoles.py | 2 +- .../compute/contrib/test_createserverext.py | 2 +- .../compute/contrib/test_disk_config.py | 3 +- .../compute/contrib/test_evacuate.py | 2 +- .../test_extended_availability_zone.py | 2 +- .../test_extended_evacuate_find_host.py | 2 +- .../compute/contrib/test_extended_ips.py | 2 +- .../compute/contrib/test_extended_ips_mac.py | 2 +- .../test_extended_server_attributes.py | 2 +- .../compute/contrib/test_extended_status.py | 2 +- .../test_extended_virtual_interfaces_net.py | 2 +- .../compute/contrib/test_extended_volumes.py | 2 +- .../compute/contrib/test_flavor_disabled.py | 2 +- .../compute/contrib/test_flavor_manage.py | 2 +- .../compute/contrib/test_flavor_rxtx.py | 2 +- .../compute/contrib/test_flavor_swap.py | 2 +- .../compute/contrib/test_flavorextradata.py | 2 +- .../compute/contrib/test_floating_ips.py | 2 +- .../contrib/test_hide_server_addresses.py | 2 +- .../compute/contrib/test_image_size.py | 2 +- .../compute/contrib/test_keypairs.py | 2 +- .../compute/contrib/test_multinic.py | 2 +- .../contrib/test_neutron_security_groups.py | 2 +- .../openstack/compute/contrib/test_rescue.py | 2 +- .../compute/contrib/test_scheduler_hints.py | 2 +- .../compute/contrib/test_security_groups.py | 2 +- .../contrib/test_server_diagnostics.py | 2 +- .../contrib/test_server_external_events.py | 2 +- .../compute/contrib/test_server_password.py | 2 +- .../compute/contrib/test_server_usage.py | 2 +- .../contrib/test_simple_tenant_usage.py | 2 +- .../compute/contrib/test_snapshots.py | 2 +- .../contrib/test_virtual_interfaces.py | 2 +- .../openstack/compute/contrib/test_volumes.py | 2 +- .../plugins/v3/admin_only_action_common.py | 2 +- .../compute/plugins/v3/test_access_ips.py | 3 +- .../plugins/v3/test_console_auth_tokens.py | 3 +- .../plugins/v3/test_extended_volumes.py | 2 +- .../plugins/v3/test_multiple_create.py | 2 +- .../openstack/compute/plugins/v3/test_pci.py | 2 +- .../compute/plugins/v3/test_server_actions.py | 2 +- .../plugins/v3/test_server_external_events.py | 2 +- .../plugins/v3/test_server_password.py | 2 +- .../compute/plugins/v3/test_servers.py | 2 +- .../compute/plugins/v3/test_user_data.py | 2 +- nova/tests/api/openstack/compute/test_api.py | 2 +- .../api/openstack/compute/test_extensions.py | 2 +- .../openstack/compute/test_image_metadata.py | 2 +- .../api/openstack/compute/test_limits.py | 2 +- .../openstack/compute/test_server_actions.py | 2 +- .../openstack/compute/test_server_metadata.py | 2 +- .../api/openstack/compute/test_servers.py | 2 +- .../api/openstack/compute/test_urlmap.py | 2 +- .../api/openstack/compute/test_versions.py | 2 +- nova/tests/api/openstack/fakes.py | 2 +- nova/tests/api/openstack/test_faults.py | 2 +- nova/tests/api/test_auth.py | 2 +- nova/tests/cells/test_cells_messaging.py | 2 +- nova/tests/compute/test_claims.py | 2 +- nova/tests/compute/test_compute.py | 2 +- nova/tests/compute/test_compute_utils.py | 2 +- nova/tests/compute/test_resource_tracker.py | 2 +- nova/tests/compute/test_rpcapi.py | 2 +- nova/tests/compute/test_shelve.py | 2 +- nova/tests/conductor/test_conductor.py | 2 +- nova/tests/db/test_db_api.py | 2 +- nova/tests/fake_ldap.py | 3 +- nova/tests/fake_network.py | 2 +- nova/tests/integrated/api/client.py | 2 +- .../tests/integrated/api_samples_test_base.py | 2 +- nova/tests/integrated/test_api_samples.py | 2 +- .../integrated/v3/test_console_auth_tokens.py | 3 +- .../integrated/v3/test_extension_info.py | 2 +- nova/tests/integrated/v3/test_pci.py | 2 +- nova/tests/network/test_linux_net.py | 2 +- nova/tests/network/test_neutronv2.py | 2 +- nova/tests/objects/test_compute_node.py | 2 +- .../objects/test_instance_pci_requests.py | 2 +- nova/tests/objects/test_objects.py | 2 +- nova/tests/pci/test_pci_stats.py | 2 +- nova/tests/policy_fixture.py | 2 +- nova/tests/scheduler/fakes.py | 2 +- nova/tests/scheduler/ironic_fakes.py | 2 +- .../scheduler/test_baremetal_host_manager.py | 2 +- nova/tests/scheduler/test_host_filters.py | 2 +- nova/tests/scheduler/test_host_manager.py | 2 +- .../scheduler/test_ironic_host_manager.py | 2 +- .../tests/scheduler/test_scheduler_options.py | 3 +- nova/tests/test_metadata.py | 2 +- nova/tests/virt/ironic/test_driver.py | 2 +- nova/tests/virt/libvirt/test_driver.py | 2 +- nova/tests/virt/libvirt/test_imagecache.py | 2 +- nova/tests/virt/test_block_device.py | 2 +- nova/tests/virt/test_hardware.py | 2 +- nova/tests/virt/test_virt_drivers.py | 2 +- nova/tests/virt/vmwareapi/fake.py | 2 +- nova/tests/virt/vmwareapi/test_driver_api.py | 2 +- nova/tests/virt/xenapi/stubs.py | 3 +- nova/tests/virt/xenapi/test_xenapi.py | 2 +- nova/virt/block_device.py | 2 +- nova/virt/disk/api.py | 2 +- nova/virt/fake.py | 2 +- nova/virt/hardware.py | 2 +- nova/virt/hyperv/hostops.py | 2 +- nova/virt/ironic/driver.py | 2 +- nova/virt/libvirt/driver.py | 2 +- nova/virt/libvirt/imagebackend.py | 2 +- nova/virt/libvirt/imagecache.py | 2 +- nova/virt/libvirt/rbd_utils.py | 2 +- nova/virt/storage_users.py | 2 +- nova/virt/vmwareapi/driver.py | 2 +- nova/virt/xenapi/agent.py | 2 +- nova/virt/xenapi/driver.py | 2 +- nova/virt/xenapi/fake.py | 2 +- nova/virt/xenapi/firewall.py | 3 +- nova/virt/xenapi/host.py | 2 +- nova/virt/xenapi/pool.py | 2 +- nova/virt/xenapi/vmops.py | 2 +- openstack-common.conf | 1 - 175 files changed, 191 insertions(+), 377 deletions(-) delete mode 100644 nova/openstack/common/jsonutils.py diff --git a/nova/api/auth.py b/nova/api/auth.py index 43b4dbef88..d6e6c1430c 100644 --- a/nova/api/auth.py +++ b/nova/api/auth.py @@ -17,13 +17,13 @@ Common Auth Middleware. """ from oslo.config import cfg +from oslo.serialization import jsonutils import webob.dec import webob.exc from nova import context from nova.i18n import _ from nova.i18n import _LW -from nova.openstack.common import jsonutils from nova.openstack.common import log as logging from nova.openstack.common.middleware import request_id from nova import wsgi diff --git a/nova/api/ec2/__init__.py b/nova/api/ec2/__init__.py index f7f254c364..a76cab7c49 100644 --- a/nova/api/ec2/__init__.py +++ b/nova/api/ec2/__init__.py @@ -20,6 +20,7 @@ Starting point for routing EC2 requests. from eventlet.green import httplib from oslo.config import cfg +from oslo.serialization import jsonutils from oslo.utils import importutils from oslo.utils import timeutils import six @@ -38,7 +39,6 @@ from nova.i18n import _ from nova.i18n import _LE from nova.i18n import _LW from nova.openstack.common import context as common_context -from nova.openstack.common import jsonutils from nova.openstack.common import log as logging from nova.openstack.common import memorycache from nova import utils diff --git a/nova/api/metadata/base.py b/nova/api/metadata/base.py index 9a79ab2289..70d3215564 100644 --- a/nova/api/metadata/base.py +++ b/nova/api/metadata/base.py @@ -21,6 +21,7 @@ import os import posixpath from oslo.config import cfg +from oslo.serialization import jsonutils from oslo.utils import importutils from oslo.utils import timeutils @@ -33,7 +34,6 @@ from nova import context from nova import network from nova import objects from nova.objects import base as obj_base -from nova.openstack.common import jsonutils from nova.openstack.common import log as logging from nova import utils from nova.virt import netutils diff --git a/nova/api/metadata/vendordata_json.py b/nova/api/metadata/vendordata_json.py index cebaaf240d..fe581c8cf1 100644 --- a/nova/api/metadata/vendordata_json.py +++ b/nova/api/metadata/vendordata_json.py @@ -18,10 +18,10 @@ import errno from oslo.config import cfg +from oslo.serialization import jsonutils from nova.api.metadata import base from nova.i18n import _LW -from nova.openstack.common import jsonutils from nova.openstack.common import log as logging file_opt = cfg.StrOpt('vendordata_jsonfile_path', diff --git a/nova/api/openstack/compute/contrib/assisted_volume_snapshots.py b/nova/api/openstack/compute/contrib/assisted_volume_snapshots.py index d7a551cc5b..bc6f520a97 100644 --- a/nova/api/openstack/compute/contrib/assisted_volume_snapshots.py +++ b/nova/api/openstack/compute/contrib/assisted_volume_snapshots.py @@ -12,6 +12,7 @@ # License for the specific language governing permissions and limitations # under the License. +from oslo.serialization import jsonutils import six import webob @@ -21,7 +22,6 @@ from nova.api.openstack import xmlutil from nova import compute from nova import exception from nova.i18n import _ -from nova.openstack.common import jsonutils from nova.openstack.common import log as logging diff --git a/nova/api/openstack/compute/contrib/security_groups.py b/nova/api/openstack/compute/contrib/security_groups.py index 32aace19ae..43ba3ca8b1 100644 --- a/nova/api/openstack/compute/contrib/security_groups.py +++ b/nova/api/openstack/compute/contrib/security_groups.py @@ -19,6 +19,7 @@ import contextlib from xml.dom import minidom +from oslo.serialization import jsonutils import webob from webob import exc @@ -32,7 +33,6 @@ from nova import exception from nova.i18n import _ from nova.network.security_group import neutron_driver from nova.network.security_group import openstack_driver -from nova.openstack.common import jsonutils from nova.openstack.common import log as logging from nova.virt import netutils diff --git a/nova/api/openstack/compute/limits.py b/nova/api/openstack/compute/limits.py index 7e40c5726b..ef4f9aa3ca 100644 --- a/nova/api/openstack/compute/limits.py +++ b/nova/api/openstack/compute/limits.py @@ -38,6 +38,7 @@ import math import re import time +from oslo.serialization import jsonutils from oslo.utils import importutils import webob.dec import webob.exc @@ -46,7 +47,6 @@ from nova.api.openstack.compute.views import limits as limits_views from nova.api.openstack import wsgi from nova.api.openstack import xmlutil from nova.i18n import _ -from nova.openstack.common import jsonutils from nova import quota from nova import utils from nova import wsgi as base_wsgi diff --git a/nova/api/openstack/compute/plugins/v3/pci.py b/nova/api/openstack/compute/plugins/v3/pci.py index fe32f29afe..6ca0ed6769 100644 --- a/nova/api/openstack/compute/plugins/v3/pci.py +++ b/nova/api/openstack/compute/plugins/v3/pci.py @@ -14,6 +14,7 @@ # under the License. +from oslo.serialization import jsonutils import webob.exc from nova.api.openstack import extensions @@ -21,7 +22,6 @@ from nova.api.openstack import wsgi from nova import compute from nova import exception from nova import objects -from nova.openstack.common import jsonutils ALIAS = 'os-pci' diff --git a/nova/api/openstack/compute/plugins/v3/security_groups.py b/nova/api/openstack/compute/plugins/v3/security_groups.py index ecfe06e7aa..38020abf9b 100644 --- a/nova/api/openstack/compute/plugins/v3/security_groups.py +++ b/nova/api/openstack/compute/plugins/v3/security_groups.py @@ -16,6 +16,8 @@ """The security groups extension.""" +from oslo.serialization import jsonutils + from nova.api.openstack.compute.schemas.v3 import security_groups as \ schema_security_groups from nova.api.openstack import extensions @@ -25,7 +27,6 @@ from nova.compute import api as compute_api from nova import exception from nova.network.security_group import neutron_driver from nova.network.security_group import openstack_driver -from nova.openstack.common import jsonutils ALIAS = 'os-security-groups' diff --git a/nova/api/openstack/wsgi.py b/nova/api/openstack/wsgi.py index c3c9d9c83d..b830783927 100644 --- a/nova/api/openstack/wsgi.py +++ b/nova/api/openstack/wsgi.py @@ -20,6 +20,7 @@ import time from xml.dom import minidom from lxml import etree +from oslo.serialization import jsonutils from oslo.utils import strutils import six import webob @@ -30,7 +31,6 @@ from nova import i18n from nova.i18n import _ from nova.i18n import _LE from nova.i18n import _LI -from nova.openstack.common import jsonutils from nova.openstack.common import log as logging from nova import utils from nova import wsgi diff --git a/nova/baserpc.py b/nova/baserpc.py index a641c4bc8c..c794141a0d 100644 --- a/nova/baserpc.py +++ b/nova/baserpc.py @@ -20,8 +20,8 @@ Base RPC client and server common to all services. from oslo.config import cfg from oslo import messaging +from oslo.serialization import jsonutils -from nova.openstack.common import jsonutils from nova import rpc diff --git a/nova/cells/messaging.py b/nova/cells/messaging.py index bb52f2242b..671ab2c0d7 100644 --- a/nova/cells/messaging.py +++ b/nova/cells/messaging.py @@ -32,6 +32,7 @@ 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 @@ -51,7 +52,6 @@ from nova.i18n import _ from nova.network import model as network_model from nova import objects from nova.objects import base as objects_base -from nova.openstack.common import jsonutils from nova.openstack.common import log as logging from nova.openstack.common import uuidutils from nova import rpc diff --git a/nova/cells/rpcapi.py b/nova/cells/rpcapi.py index bc061221a1..578bcbfef3 100644 --- a/nova/cells/rpcapi.py +++ b/nova/cells/rpcapi.py @@ -25,11 +25,11 @@ messging module. from oslo.config import cfg from oslo import messaging +from oslo.serialization import jsonutils from nova import exception from nova.i18n import _ from nova.objects import base as objects_base -from nova.openstack.common import jsonutils from nova.openstack.common import log as logging from nova import rpc diff --git a/nova/cells/state.py b/nova/cells/state.py index 7c37eda970..9d93f729aa 100644 --- a/nova/cells/state.py +++ b/nova/cells/state.py @@ -23,6 +23,7 @@ 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 @@ -32,7 +33,6 @@ from nova.db import base from nova import exception from nova.i18n import _ from nova.openstack.common import fileutils -from nova.openstack.common import jsonutils from nova.openstack.common import log as logging from nova import rpc from nova import utils diff --git a/nova/cmd/dhcpbridge.py b/nova/cmd/dhcpbridge.py index 90d2c960af..691adbd7f4 100644 --- a/nova/cmd/dhcpbridge.py +++ b/nova/cmd/dhcpbridge.py @@ -25,6 +25,7 @@ import sys import traceback from oslo.config import cfg +from oslo.serialization import jsonutils from oslo.utils import importutils from nova.conductor import rpcapi as conductor_rpcapi @@ -36,7 +37,6 @@ from nova.i18n import _ from nova.network import rpcapi as network_rpcapi from nova import objects from nova.objects import base as objects_base -from nova.openstack.common import jsonutils from nova.openstack.common import log as logging from nova import rpc diff --git a/nova/compute/api.py b/nova/compute/api.py index 2f096da871..f95eabf48a 100644 --- a/nova/compute/api.py +++ b/nova/compute/api.py @@ -26,6 +26,7 @@ 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 @@ -59,7 +60,6 @@ from nova import objects from nova.objects import base as obj_base from nova.objects import quotas as quotas_obj from nova.objects import security_group as security_group_obj -from nova.openstack.common import jsonutils from nova.openstack.common import log as logging from nova.openstack.common import uuidutils from nova.pci import pci_request diff --git a/nova/compute/claims.py b/nova/compute/claims.py index 1df481d069..4d3f6ea3c2 100644 --- a/nova/compute/claims.py +++ b/nova/compute/claims.py @@ -17,12 +17,13 @@ Claim objects for use with resource tracking. """ +from oslo.serialization import jsonutils + from nova import context from nova import exception from nova.i18n import _ from nova import objects from nova.objects import base as obj_base -from nova.openstack.common import jsonutils from nova.openstack.common import log as logging from nova.virt import hardware diff --git a/nova/compute/manager.py b/nova/compute/manager.py index 72d67f71fc..2714e1988d 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -40,6 +40,7 @@ from eventlet import greenthread import eventlet.timeout 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 @@ -75,7 +76,6 @@ from nova import objects from nova.objects import base as obj_base from nova.objects import instance as instance_obj from nova.objects import quotas as quotas_obj -from nova.openstack.common import jsonutils from nova.openstack.common import log as logging from nova.openstack.common import periodic_task from nova import paths diff --git a/nova/compute/resource_tracker.py b/nova/compute/resource_tracker.py index e70ba7ff8b..e17d6a3c9f 100644 --- a/nova/compute/resource_tracker.py +++ b/nova/compute/resource_tracker.py @@ -21,6 +21,7 @@ model. import copy from oslo.config import cfg +from oslo.serialization import jsonutils from oslo.utils import importutils from nova.compute import claims @@ -34,7 +35,6 @@ from nova import exception from nova.i18n import _ from nova import objects from nova.objects import base as obj_base -from nova.openstack.common import jsonutils from nova.openstack.common import log as logging from nova.pci import pci_manager from nova import rpc diff --git a/nova/compute/rpcapi.py b/nova/compute/rpcapi.py index 34466ac3de..a6c49f861e 100644 --- a/nova/compute/rpcapi.py +++ b/nova/compute/rpcapi.py @@ -18,12 +18,12 @@ Client side of the compute RPC API. from oslo.config import cfg from oslo import messaging +from oslo.serialization import jsonutils from nova import exception from nova.i18n import _ from nova import objects from nova.objects import base as objects_base -from nova.openstack.common import jsonutils from nova import rpc rpcapi_opts = [ diff --git a/nova/compute/stats.py b/nova/compute/stats.py index 550bb5355d..0b83b90844 100644 --- a/nova/compute/stats.py +++ b/nova/compute/stats.py @@ -13,10 +13,11 @@ # License for the specific language governing permissions and limitations # under the License. +from oslo.serialization import jsonutils + from nova.compute import task_states from nova.compute import vm_states from nova.i18n import _ -from nova.openstack.common import jsonutils class Stats(dict): diff --git a/nova/conductor/manager.py b/nova/conductor/manager.py index 047d8bce9f..a85c3a6ffe 100644 --- a/nova/conductor/manager.py +++ b/nova/conductor/manager.py @@ -18,6 +18,7 @@ import copy import itertools from oslo import messaging +from oslo.serialization import jsonutils from oslo.utils import excutils from oslo.utils import timeutils import six @@ -41,7 +42,6 @@ from nova.network.security_group import openstack_driver from nova import notifications from nova import objects from nova.objects import base as nova_object -from nova.openstack.common import jsonutils from nova.openstack.common import log as logging from nova import quota from nova.scheduler import client as scheduler_client diff --git a/nova/conductor/rpcapi.py b/nova/conductor/rpcapi.py index d6c2b75d77..93e6b18a5f 100644 --- a/nova/conductor/rpcapi.py +++ b/nova/conductor/rpcapi.py @@ -17,9 +17,9 @@ from oslo.config import cfg from oslo import messaging +from oslo.serialization import jsonutils from nova.objects import base as objects_base -from nova.openstack.common import jsonutils from nova import rpc CONF = cfg.CONF diff --git a/nova/console/vmrc.py b/nova/console/vmrc.py index e678b10be8..2a4f84d676 100644 --- a/nova/console/vmrc.py +++ b/nova/console/vmrc.py @@ -18,10 +18,10 @@ import base64 from oslo.config import cfg +from oslo.serialization import jsonutils from nova import exception from nova.i18n import _LW -from nova.openstack.common import jsonutils from nova.openstack.common import log as logging from nova.virt.vmwareapi import vim_util diff --git a/nova/consoleauth/manager.py b/nova/consoleauth/manager.py index ff92f1b579..ea55fe070c 100644 --- a/nova/consoleauth/manager.py +++ b/nova/consoleauth/manager.py @@ -20,13 +20,13 @@ import time from oslo.config import cfg from oslo import messaging +from oslo.serialization import jsonutils from nova.cells import rpcapi as cells_rpcapi from nova.compute import rpcapi as compute_rpcapi from nova.i18n import _, _LW from nova import manager from nova import objects -from nova.openstack.common import jsonutils from nova.openstack.common import log as logging from nova.openstack.common import memorycache diff --git a/nova/image/glance.py b/nova/image/glance.py index 4f962f41a2..d40943fd24 100644 --- a/nova/image/glance.py +++ b/nova/image/glance.py @@ -26,6 +26,7 @@ import time import glanceclient import glanceclient.exc from oslo.config import cfg +from oslo.serialization import jsonutils from oslo.utils import timeutils import six import six.moves.urllib.parse as urlparse @@ -33,7 +34,6 @@ import six.moves.urllib.parse as urlparse from nova import exception from nova.i18n import _ import nova.image.download as image_xfers -from nova.openstack.common import jsonutils from nova.openstack.common import log as logging from nova import utils diff --git a/nova/network/linux_net.py b/nova/network/linux_net.py index 02d0c20f93..ef3f8b4471 100644 --- a/nova/network/linux_net.py +++ b/nova/network/linux_net.py @@ -24,6 +24,7 @@ import re 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 @@ -33,7 +34,6 @@ from nova import exception from nova.i18n import _ from nova import objects from nova.openstack.common import fileutils -from nova.openstack.common import jsonutils from nova.openstack.common import log as logging from nova.openstack.common import processutils from nova import paths diff --git a/nova/network/model.py b/nova/network/model.py index f811f8d71b..23888dc888 100644 --- a/nova/network/model.py +++ b/nova/network/model.py @@ -17,11 +17,11 @@ import functools import eventlet import netaddr +from oslo.serialization import jsonutils import six from nova import exception from nova.i18n import _ -from nova.openstack.common import jsonutils def ensure_string_keys(d): diff --git a/nova/network/rpcapi.py b/nova/network/rpcapi.py index 6208d20943..6a69375a5e 100644 --- a/nova/network/rpcapi.py +++ b/nova/network/rpcapi.py @@ -18,9 +18,9 @@ Client side of the network RPC API. from oslo.config import cfg from oslo import messaging +from oslo.serialization import jsonutils from nova.objects import base as objects_base -from nova.openstack.common import jsonutils from nova import rpc rpcapi_opts = [ diff --git a/nova/objects/compute_node.py b/nova/objects/compute_node.py index 89de6b3f8a..b23ced8179 100644 --- a/nova/objects/compute_node.py +++ b/nova/objects/compute_node.py @@ -12,12 +12,13 @@ # License for the specific language governing permissions and limitations # under the License. +from oslo.serialization import jsonutils + from nova import db from nova import exception from nova import objects from nova.objects import base from nova.objects import fields -from nova.openstack.common import jsonutils from nova import utils diff --git a/nova/objects/instance_pci_requests.py b/nova/objects/instance_pci_requests.py index 3f05e74b4c..c1509abc5e 100644 --- a/nova/objects/instance_pci_requests.py +++ b/nova/objects/instance_pci_requests.py @@ -10,10 +10,11 @@ # License for the specific language governing permissions and limitations # under the License. +from oslo.serialization import jsonutils + from nova import db from nova.objects import base from nova.objects import fields -from nova.openstack.common import jsonutils from nova import utils diff --git a/nova/objects/pci_device.py b/nova/objects/pci_device.py index 02f11d3d48..b6406db49f 100644 --- a/nova/objects/pci_device.py +++ b/nova/objects/pci_device.py @@ -13,11 +13,12 @@ # License for the specific language governing permissions and limitations # under the License. +from oslo.serialization import jsonutils + from nova import db from nova import objects from nova.objects import base from nova.objects import fields -from nova.openstack.common import jsonutils from nova.openstack.common import log as logging from nova import utils diff --git a/nova/openstack/common/jsonutils.py b/nova/openstack/common/jsonutils.py deleted file mode 100644 index 19a69fce26..0000000000 --- a/nova/openstack/common/jsonutils.py +++ /dev/null @@ -1,202 +0,0 @@ -# Copyright 2010 United States Government as represented by the -# Administrator of the National Aeronautics and Space Administration. -# Copyright 2011 Justin Santa Barbara -# All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - -''' -JSON related utilities. - -This module provides a few things: - - 1) A handy function for getting an object down to something that can be - JSON serialized. See to_primitive(). - - 2) Wrappers around loads() and dumps(). The dumps() wrapper will - automatically use to_primitive() for you if needed. - - 3) This sets up anyjson to use the loads() and dumps() wrappers if anyjson - is available. -''' - - -import codecs -import datetime -import functools -import inspect -import itertools -import sys - -is_simplejson = False -if sys.version_info < (2, 7): - # On Python <= 2.6, json module is not C boosted, so try to use - # simplejson module if available - try: - import simplejson as json - # NOTE(mriedem): Make sure we have a new enough version of simplejson - # to support the namedobject_as_tuple argument. This can be removed - # in the Kilo release when python 2.6 support is dropped. - if 'namedtuple_as_object' in inspect.getargspec(json.dumps).args: - is_simplejson = True - else: - import json - except ImportError: - import json -else: - import json - -import six -import six.moves.xmlrpc_client as xmlrpclib - -from nova.openstack.common import gettextutils -from nova.openstack.common import importutils -from nova.openstack.common import strutils -from nova.openstack.common import timeutils - -netaddr = importutils.try_import("netaddr") - -_nasty_type_tests = [inspect.ismodule, inspect.isclass, inspect.ismethod, - inspect.isfunction, inspect.isgeneratorfunction, - inspect.isgenerator, inspect.istraceback, inspect.isframe, - inspect.iscode, inspect.isbuiltin, inspect.isroutine, - inspect.isabstract] - -_simple_types = (six.string_types + six.integer_types - + (type(None), bool, float)) - - -def to_primitive(value, convert_instances=False, convert_datetime=True, - level=0, max_depth=3): - """Convert a complex object into primitives. - - Handy for JSON serialization. We can optionally handle instances, - but since this is a recursive function, we could have cyclical - data structures. - - To handle cyclical data structures we could track the actual objects - visited in a set, but not all objects are hashable. Instead we just - track the depth of the object inspections and don't go too deep. - - Therefore, convert_instances=True is lossy ... be aware. - - """ - # handle obvious types first - order of basic types determined by running - # full tests on nova project, resulting in the following counts: - # 572754 - # 460353 - # 379632 - # 274610 - # 199918 - # 114200 - # 51817 - # 26164 - # 6491 - # 283 - # 19 - if isinstance(value, _simple_types): - return value - - if isinstance(value, datetime.datetime): - if convert_datetime: - return timeutils.strtime(value) - else: - return value - - # value of itertools.count doesn't get caught by nasty_type_tests - # and results in infinite loop when list(value) is called. - if type(value) == itertools.count: - return six.text_type(value) - - # FIXME(vish): Workaround for LP bug 852095. Without this workaround, - # tests that raise an exception in a mocked method that - # has a @wrap_exception with a notifier will fail. If - # we up the dependency to 0.5.4 (when it is released) we - # can remove this workaround. - if getattr(value, '__module__', None) == 'mox': - return 'mock' - - if level > max_depth: - return '?' - - # The try block may not be necessary after the class check above, - # but just in case ... - try: - recursive = functools.partial(to_primitive, - convert_instances=convert_instances, - convert_datetime=convert_datetime, - level=level, - max_depth=max_depth) - if isinstance(value, dict): - return dict((k, recursive(v)) for k, v in six.iteritems(value)) - elif isinstance(value, (list, tuple)): - return [recursive(lv) for lv in value] - - # It's not clear why xmlrpclib created their own DateTime type, but - # for our purposes, make it a datetime type which is explicitly - # handled - if isinstance(value, xmlrpclib.DateTime): - value = datetime.datetime(*tuple(value.timetuple())[:6]) - - if convert_datetime and isinstance(value, datetime.datetime): - return timeutils.strtime(value) - elif isinstance(value, gettextutils.Message): - return value.data - elif hasattr(value, 'iteritems'): - return recursive(dict(value.iteritems()), level=level + 1) - elif hasattr(value, '__iter__'): - return recursive(list(value)) - elif convert_instances and hasattr(value, '__dict__'): - # Likely an instance of something. Watch for cycles. - # Ignore class member vars. - return recursive(value.__dict__, level=level + 1) - elif netaddr and isinstance(value, netaddr.IPAddress): - return six.text_type(value) - else: - if any(test(value) for test in _nasty_type_tests): - return six.text_type(value) - return value - except TypeError: - # Class objects are tricky since they may define something like - # __iter__ defined but it isn't callable as list(). - return six.text_type(value) - - -def dumps(value, default=to_primitive, **kwargs): - if is_simplejson: - kwargs['namedtuple_as_object'] = False - return json.dumps(value, default=default, **kwargs) - - -def dump(obj, fp, *args, **kwargs): - if is_simplejson: - kwargs['namedtuple_as_object'] = False - return json.dump(obj, fp, *args, **kwargs) - - -def loads(s, encoding='utf-8', **kwargs): - return json.loads(strutils.safe_decode(s, encoding), **kwargs) - - -def load(fp, encoding='utf-8', **kwargs): - return json.load(codecs.getreader(encoding)(fp), **kwargs) - - -try: - import anyjson -except ImportError: - pass -else: - anyjson._modules.append((__name__, 'dumps', TypeError, - 'loads', ValueError, 'load')) - anyjson.force_implementation(__name__) diff --git a/nova/pci/pci_devspec.py b/nova/pci/pci_devspec.py index a03cd80b9a..e78251bedd 100755 --- a/nova/pci/pci_devspec.py +++ b/nova/pci/pci_devspec.py @@ -14,8 +14,9 @@ import ast import re +from oslo.serialization import jsonutils + from nova import exception -from nova.openstack.common import jsonutils from nova.pci import pci_utils MAX_VENDOR_ID = 0xFFFF diff --git a/nova/pci/pci_request.py b/nova/pci/pci_request.py index 268fc14a95..3aae710738 100644 --- a/nova/pci/pci_request.py +++ b/nova/pci/pci_request.py @@ -40,11 +40,11 @@ import copy import jsonschema from oslo.config import cfg +from oslo.serialization import jsonutils import six from nova import exception from nova import objects -from nova.openstack.common import jsonutils from nova.openstack.common import log as logging from nova.pci import pci_utils diff --git a/nova/pci/pci_stats.py b/nova/pci/pci_stats.py index 8d4b7cb3fb..7dd6c09c0f 100644 --- a/nova/pci/pci_stats.py +++ b/nova/pci/pci_stats.py @@ -16,9 +16,10 @@ import copy +from oslo.serialization import jsonutils + from nova import exception from nova.i18n import _LE -from nova.openstack.common import jsonutils from nova.openstack.common import log as logging from nova.pci import pci_utils from nova.pci import pci_whitelist diff --git a/nova/rpc.py b/nova/rpc.py index 039bf74f3d..84cd592ccc 100644 --- a/nova/rpc.py +++ b/nova/rpc.py @@ -28,10 +28,10 @@ __all__ = [ from oslo.config import cfg from oslo import messaging +from oslo.serialization import jsonutils import nova.context import nova.exception -from nova.openstack.common import jsonutils CONF = cfg.CONF TRANSPORT = None diff --git a/nova/scheduler/base_baremetal_host_manager.py b/nova/scheduler/base_baremetal_host_manager.py index 99baba117b..f6951abfc7 100644 --- a/nova/scheduler/base_baremetal_host_manager.py +++ b/nova/scheduler/base_baremetal_host_manager.py @@ -18,7 +18,8 @@ Manage hosts in the current zone. """ -from nova.openstack.common import jsonutils +from oslo.serialization import jsonutils + from nova.scheduler import host_manager diff --git a/nova/scheduler/filters/compute_capabilities_filter.py b/nova/scheduler/filters/compute_capabilities_filter.py index ac68d509fb..5821fc904d 100644 --- a/nova/scheduler/filters/compute_capabilities_filter.py +++ b/nova/scheduler/filters/compute_capabilities_filter.py @@ -13,9 +13,9 @@ # License for the specific language governing permissions and limitations # under the License. +from oslo.serialization import jsonutils import six -from nova.openstack.common import jsonutils from nova.openstack.common import log as logging from nova.scheduler import filters from nova.scheduler.filters import extra_specs_ops diff --git a/nova/scheduler/filters/json_filter.py b/nova/scheduler/filters/json_filter.py index 6c813579ad..6f3e914af0 100644 --- a/nova/scheduler/filters/json_filter.py +++ b/nova/scheduler/filters/json_filter.py @@ -16,9 +16,9 @@ import operator +from oslo.serialization import jsonutils import six -from nova.openstack.common import jsonutils from nova.scheduler import filters diff --git a/nova/scheduler/filters/trusted_filter.py b/nova/scheduler/filters/trusted_filter.py index 7ac3bfa312..93b5d5187b 100644 --- a/nova/scheduler/filters/trusted_filter.py +++ b/nova/scheduler/filters/trusted_filter.py @@ -44,12 +44,12 @@ the Open Attestation project at: """ from oslo.config import cfg +from oslo.serialization import jsonutils from oslo.utils import timeutils import requests from nova import context from nova import db -from nova.openstack.common import jsonutils from nova.openstack.common import log as logging from nova.scheduler import filters diff --git a/nova/scheduler/host_manager.py b/nova/scheduler/host_manager.py index 758c67c491..e6f2c2e98b 100644 --- a/nova/scheduler/host_manager.py +++ b/nova/scheduler/host_manager.py @@ -21,6 +21,7 @@ import collections import UserDict from oslo.config import cfg +from oslo.serialization import jsonutils from oslo.utils import timeutils from nova.compute import task_states @@ -28,7 +29,6 @@ from nova.compute import vm_states from nova import db from nova import exception from nova.i18n import _, _LW -from nova.openstack.common import jsonutils from nova.openstack.common import log as logging from nova.pci import pci_stats from nova.scheduler import filters diff --git a/nova/scheduler/ironic_host_manager.py b/nova/scheduler/ironic_host_manager.py index 7ece982f86..f71c9b79db 100644 --- a/nova/scheduler/ironic_host_manager.py +++ b/nova/scheduler/ironic_host_manager.py @@ -22,9 +22,9 @@ 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 nova.openstack.common import jsonutils from nova.openstack.common import log as logging import nova.scheduler.base_baremetal_host_manager as bbhm from nova.scheduler import host_manager diff --git a/nova/scheduler/manager.py b/nova/scheduler/manager.py index 9d2383ded5..aae2c81b26 100644 --- a/nova/scheduler/manager.py +++ b/nova/scheduler/manager.py @@ -21,6 +21,7 @@ Scheduler Service from oslo.config import cfg from oslo import messaging +from oslo.serialization import jsonutils from oslo.utils import excutils from oslo.utils import importutils @@ -30,7 +31,6 @@ from nova.compute import vm_states from nova import exception from nova import manager from nova import objects -from nova.openstack.common import jsonutils from nova.openstack.common import log as logging from nova.openstack.common import periodic_task from nova import quota diff --git a/nova/scheduler/scheduler_options.py b/nova/scheduler/scheduler_options.py index b8b4105694..6d52e2ac66 100644 --- a/nova/scheduler/scheduler_options.py +++ b/nova/scheduler/scheduler_options.py @@ -24,11 +24,11 @@ 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 nova.i18n import _ -from nova.openstack.common import jsonutils from nova.openstack.common import log as logging diff --git a/nova/scheduler/utils.py b/nova/scheduler/utils.py index 13c50bfe22..e526e00634 100644 --- a/nova/scheduler/utils.py +++ b/nova/scheduler/utils.py @@ -17,6 +17,7 @@ import sys from oslo.config import cfg +from oslo.serialization import jsonutils from nova.compute import flavors from nova.compute import utils as compute_utils @@ -25,7 +26,6 @@ from nova import exception from nova.i18n import _, _LW from nova import notifications from nova.objects import base as obj_base -from nova.openstack.common import jsonutils from nova.openstack.common import log as logging from nova import rpc diff --git a/nova/tests/api/openstack/common.py b/nova/tests/api/openstack/common.py index a50a65688e..972958a329 100644 --- a/nova/tests/api/openstack/common.py +++ b/nova/tests/api/openstack/common.py @@ -13,10 +13,9 @@ # License for the specific language governing permissions and limitations # under the License. +from oslo.serialization import jsonutils import webob -from nova.openstack.common import jsonutils - def webob_factory(url): """Factory for removing duplicate webob code from tests.""" diff --git a/nova/tests/api/openstack/compute/contrib/test_admin_actions.py b/nova/tests/api/openstack/compute/contrib/test_admin_actions.py index c07fdb87f5..ac015d0c9d 100644 --- a/nova/tests/api/openstack/compute/contrib/test_admin_actions.py +++ b/nova/tests/api/openstack/compute/contrib/test_admin_actions.py @@ -12,6 +12,7 @@ # License for the specific language governing permissions and limitations # under the License. +from oslo.serialization import jsonutils from oslo.utils import timeutils import webob @@ -24,7 +25,6 @@ from nova.compute import vm_states import nova.context from nova import exception from nova import objects -from nova.openstack.common import jsonutils from nova.openstack.common import uuidutils from nova import test from nova.tests.api.openstack import fakes diff --git a/nova/tests/api/openstack/compute/contrib/test_admin_password.py b/nova/tests/api/openstack/compute/contrib/test_admin_password.py index d2714caf9c..26b2d442b5 100644 --- a/nova/tests/api/openstack/compute/contrib/test_admin_password.py +++ b/nova/tests/api/openstack/compute/contrib/test_admin_password.py @@ -13,13 +13,13 @@ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # License for the specific language governing permissions and limitations # under the License. +from oslo.serialization import jsonutils import webob from nova.api.openstack.compute.plugins.v3 import admin_password \ as admin_password_v21 from nova.compute import api as compute_api from nova import exception -from nova.openstack.common import jsonutils from nova import test from nova.tests.api.openstack import fakes diff --git a/nova/tests/api/openstack/compute/contrib/test_attach_interfaces.py b/nova/tests/api/openstack/compute/contrib/test_attach_interfaces.py index 2e57944702..aa98ffb7cb 100644 --- a/nova/tests/api/openstack/compute/contrib/test_attach_interfaces.py +++ b/nova/tests/api/openstack/compute/contrib/test_attach_interfaces.py @@ -15,6 +15,7 @@ import mock from oslo.config import cfg +from oslo.serialization import jsonutils from nova.api.openstack.compute.contrib import attach_interfaces \ as attach_interfaces_v2 @@ -25,7 +26,6 @@ from nova import context from nova import exception from nova.network import api as network_api from nova import objects -from nova.openstack.common import jsonutils from nova import test from nova.tests import fake_network_cache_model diff --git a/nova/tests/api/openstack/compute/contrib/test_availability_zone.py b/nova/tests/api/openstack/compute/contrib/test_availability_zone.py index 5fc718ff32..6a09b03fc5 100644 --- a/nova/tests/api/openstack/compute/contrib/test_availability_zone.py +++ b/nova/tests/api/openstack/compute/contrib/test_availability_zone.py @@ -16,6 +16,7 @@ import datetime from lxml import etree from oslo.config import cfg +from oslo.serialization import jsonutils import webob from nova.api.openstack.compute.contrib import availability_zone as az_v2 @@ -30,7 +31,6 @@ from nova.compute import flavors from nova import context from nova import db from nova import exception -from nova.openstack.common import jsonutils from nova import servicegroup from nova import test from nova.tests.api.openstack import fakes diff --git a/nova/tests/api/openstack/compute/contrib/test_block_device_mapping.py b/nova/tests/api/openstack/compute/contrib/test_block_device_mapping.py index c7edea3ff3..0ce73301d4 100644 --- a/nova/tests/api/openstack/compute/contrib/test_block_device_mapping.py +++ b/nova/tests/api/openstack/compute/contrib/test_block_device_mapping.py @@ -16,6 +16,7 @@ import mock import mox from oslo.config import cfg +from oslo.serialization import jsonutils from webob import exc from nova.api.openstack.compute import extensions @@ -27,7 +28,6 @@ from nova import block_device from nova.compute import api as compute_api from nova import exception from nova import objects -from nova.openstack.common import jsonutils from nova import test from nova.tests.api.openstack import fakes from nova.tests.image import fake diff --git a/nova/tests/api/openstack/compute/contrib/test_block_device_mapping_v1.py b/nova/tests/api/openstack/compute/contrib/test_block_device_mapping_v1.py index ee2b4592cc..1cab2d8b65 100644 --- a/nova/tests/api/openstack/compute/contrib/test_block_device_mapping_v1.py +++ b/nova/tests/api/openstack/compute/contrib/test_block_device_mapping_v1.py @@ -16,6 +16,7 @@ import mock import mox from oslo.config import cfg +from oslo.serialization import jsonutils from webob import exc from nova.api.openstack.compute import extensions @@ -26,7 +27,6 @@ from nova.api.openstack.compute.plugins.v3 import servers as servers_v3 from nova.api.openstack.compute import servers as servers_v2 from nova.compute import api as compute_api from nova import exception -from nova.openstack.common import jsonutils from nova import test from nova.tests.api.openstack import fakes from nova.tests.image import fake diff --git a/nova/tests/api/openstack/compute/contrib/test_config_drive.py b/nova/tests/api/openstack/compute/contrib/test_config_drive.py index 946bdfebaf..a9d624b7bc 100644 --- a/nova/tests/api/openstack/compute/contrib/test_config_drive.py +++ b/nova/tests/api/openstack/compute/contrib/test_config_drive.py @@ -16,6 +16,7 @@ import datetime from oslo.config import cfg +from oslo.serialization import jsonutils import webob from nova.api.openstack.compute.contrib import config_drive as config_drive_v2 @@ -29,7 +30,6 @@ from nova.compute import api as compute_api from nova.compute import flavors from nova import db from nova import exception -from nova.openstack.common import jsonutils from nova import test from nova.tests.api.openstack import fakes from nova.tests import fake_instance diff --git a/nova/tests/api/openstack/compute/contrib/test_console_auth_tokens.py b/nova/tests/api/openstack/compute/contrib/test_console_auth_tokens.py index ce6c8856bf..3c3fee2871 100644 --- a/nova/tests/api/openstack/compute/contrib/test_console_auth_tokens.py +++ b/nova/tests/api/openstack/compute/contrib/test_console_auth_tokens.py @@ -14,11 +14,11 @@ # under the License. from oslo.config import cfg +from oslo.serialization import jsonutils import webob from nova.consoleauth import rpcapi as consoleauth_rpcapi from nova import context -from nova.openstack.common import jsonutils from nova import test from nova.tests.api.openstack import fakes diff --git a/nova/tests/api/openstack/compute/contrib/test_console_output.py b/nova/tests/api/openstack/compute/contrib/test_console_output.py index f22b32e4b5..faf39da0e1 100644 --- a/nova/tests/api/openstack/compute/contrib/test_console_output.py +++ b/nova/tests/api/openstack/compute/contrib/test_console_output.py @@ -15,9 +15,10 @@ import string +from oslo.serialization import jsonutils + from nova.compute import api as compute_api from nova import exception -from nova.openstack.common import jsonutils from nova import test from nova.tests.api.openstack import fakes from nova.tests import fake_instance diff --git a/nova/tests/api/openstack/compute/contrib/test_consoles.py b/nova/tests/api/openstack/compute/contrib/test_consoles.py index e095ef582d..1faff0d78c 100644 --- a/nova/tests/api/openstack/compute/contrib/test_consoles.py +++ b/nova/tests/api/openstack/compute/contrib/test_consoles.py @@ -14,11 +14,11 @@ # under the License. import mock +from oslo.serialization import jsonutils import webob from nova.compute import api as compute_api from nova import exception -from nova.openstack.common import jsonutils from nova import test from nova.tests.api.openstack import fakes diff --git a/nova/tests/api/openstack/compute/contrib/test_createserverext.py b/nova/tests/api/openstack/compute/contrib/test_createserverext.py index 2fbdbba0d0..62b135ac0e 100644 --- a/nova/tests/api/openstack/compute/contrib/test_createserverext.py +++ b/nova/tests/api/openstack/compute/contrib/test_createserverext.py @@ -16,12 +16,12 @@ import base64 from xml.dom import minidom +from oslo.serialization import jsonutils import webob from nova.compute import api as compute_api from nova import db from nova import exception -from nova.openstack.common import jsonutils from nova import test from nova.tests.api.openstack import fakes diff --git a/nova/tests/api/openstack/compute/contrib/test_disk_config.py b/nova/tests/api/openstack/compute/contrib/test_disk_config.py index 0333246e24..2f7de5f86d 100644 --- a/nova/tests/api/openstack/compute/contrib/test_disk_config.py +++ b/nova/tests/api/openstack/compute/contrib/test_disk_config.py @@ -15,11 +15,12 @@ import datetime +from oslo.serialization import jsonutils + from nova.api.openstack import compute from nova.compute import api as compute_api from nova import db from nova import objects -from nova.openstack.common import jsonutils from nova import test from nova.tests.api.openstack import fakes from nova.tests import fake_instance diff --git a/nova/tests/api/openstack/compute/contrib/test_evacuate.py b/nova/tests/api/openstack/compute/contrib/test_evacuate.py index 918d674373..c2094518bf 100644 --- a/nova/tests/api/openstack/compute/contrib/test_evacuate.py +++ b/nova/tests/api/openstack/compute/contrib/test_evacuate.py @@ -15,13 +15,13 @@ import uuid from oslo.config import cfg +from oslo.serialization import jsonutils import webob from nova.compute import api as compute_api from nova.compute import vm_states from nova import context from nova import exception -from nova.openstack.common import jsonutils from nova import test from nova.tests.api.openstack import fakes from nova.tests import fake_instance diff --git a/nova/tests/api/openstack/compute/contrib/test_extended_availability_zone.py b/nova/tests/api/openstack/compute/contrib/test_extended_availability_zone.py index 06ecdbfe5e..cec539f0e1 100644 --- a/nova/tests/api/openstack/compute/contrib/test_extended_availability_zone.py +++ b/nova/tests/api/openstack/compute/contrib/test_extended_availability_zone.py @@ -14,6 +14,7 @@ # under the License. from lxml import etree +from oslo.serialization import jsonutils import webob from nova.api.openstack.compute.contrib import extended_availability_zone @@ -24,7 +25,6 @@ from nova import db from nova import exception from nova import objects from nova.objects import instance as instance_obj -from nova.openstack.common import jsonutils from nova import test from nova.tests.api.openstack import fakes from nova.tests import fake_instance diff --git a/nova/tests/api/openstack/compute/contrib/test_extended_evacuate_find_host.py b/nova/tests/api/openstack/compute/contrib/test_extended_evacuate_find_host.py index 187ff5a056..a011c7dddf 100644 --- a/nova/tests/api/openstack/compute/contrib/test_extended_evacuate_find_host.py +++ b/nova/tests/api/openstack/compute/contrib/test_extended_evacuate_find_host.py @@ -15,12 +15,12 @@ import uuid import mock +from oslo.serialization import jsonutils import webob from nova.compute import vm_states from nova import context from nova.objects import instance as instance_obj -from nova.openstack.common import jsonutils from nova import test from nova.tests.api.openstack import fakes from nova.tests import fake_instance diff --git a/nova/tests/api/openstack/compute/contrib/test_extended_ips.py b/nova/tests/api/openstack/compute/contrib/test_extended_ips.py index 04ad279261..c2df53c2f0 100644 --- a/nova/tests/api/openstack/compute/contrib/test_extended_ips.py +++ b/nova/tests/api/openstack/compute/contrib/test_extended_ips.py @@ -14,6 +14,7 @@ # under the License. from lxml import etree +from oslo.serialization import jsonutils import webob from nova.api.openstack.compute.contrib import extended_ips @@ -21,7 +22,6 @@ from nova.api.openstack import xmlutil from nova import compute from nova import objects from nova.objects import instance as instance_obj -from nova.openstack.common import jsonutils from nova import test from nova.tests.api.openstack import fakes from nova.tests import fake_instance diff --git a/nova/tests/api/openstack/compute/contrib/test_extended_ips_mac.py b/nova/tests/api/openstack/compute/contrib/test_extended_ips_mac.py index c6998c6159..d67b04ea46 100644 --- a/nova/tests/api/openstack/compute/contrib/test_extended_ips_mac.py +++ b/nova/tests/api/openstack/compute/contrib/test_extended_ips_mac.py @@ -14,6 +14,7 @@ # under the License. from lxml import etree +from oslo.serialization import jsonutils import webob from nova.api.openstack.compute.contrib import extended_ips_mac @@ -21,7 +22,6 @@ from nova.api.openstack import xmlutil from nova import compute from nova import objects from nova.objects import instance as instance_obj -from nova.openstack.common import jsonutils from nova import test from nova.tests.api.openstack import fakes from nova.tests import fake_instance diff --git a/nova/tests/api/openstack/compute/contrib/test_extended_server_attributes.py b/nova/tests/api/openstack/compute/contrib/test_extended_server_attributes.py index df2aff67e3..0b82d7a750 100644 --- a/nova/tests/api/openstack/compute/contrib/test_extended_server_attributes.py +++ b/nova/tests/api/openstack/compute/contrib/test_extended_server_attributes.py @@ -14,6 +14,7 @@ # under the License. from lxml import etree +from oslo.serialization import jsonutils import webob from nova.api.openstack.compute.contrib import extended_server_attributes @@ -22,7 +23,6 @@ from nova import db from nova import exception from nova import objects from nova.objects import instance as instance_obj -from nova.openstack.common import jsonutils from nova import test from nova.tests.api.openstack import fakes diff --git a/nova/tests/api/openstack/compute/contrib/test_extended_status.py b/nova/tests/api/openstack/compute/contrib/test_extended_status.py index 952bf55900..218f277501 100644 --- a/nova/tests/api/openstack/compute/contrib/test_extended_status.py +++ b/nova/tests/api/openstack/compute/contrib/test_extended_status.py @@ -14,6 +14,7 @@ # under the License. from lxml import etree +from oslo.serialization import jsonutils import webob from nova.api.openstack.compute.contrib import extended_status @@ -22,7 +23,6 @@ from nova import db from nova import exception from nova import objects from nova.objects import instance as instance_obj -from nova.openstack.common import jsonutils from nova import test from nova.tests.api.openstack import fakes from nova.tests import fake_instance diff --git a/nova/tests/api/openstack/compute/contrib/test_extended_virtual_interfaces_net.py b/nova/tests/api/openstack/compute/contrib/test_extended_virtual_interfaces_net.py index 7edebb5043..abe99643b8 100644 --- a/nova/tests/api/openstack/compute/contrib/test_extended_virtual_interfaces_net.py +++ b/nova/tests/api/openstack/compute/contrib/test_extended_virtual_interfaces_net.py @@ -14,13 +14,13 @@ # under the License. from lxml import etree +from oslo.serialization import jsonutils import webob from nova.api.openstack.compute.contrib import extended_virtual_interfaces_net from nova.api.openstack import wsgi from nova import compute from nova import network -from nova.openstack.common import jsonutils from nova import test from nova.tests.api.openstack import fakes diff --git a/nova/tests/api/openstack/compute/contrib/test_extended_volumes.py b/nova/tests/api/openstack/compute/contrib/test_extended_volumes.py index c39263d62f..9c02792e8b 100644 --- a/nova/tests/api/openstack/compute/contrib/test_extended_volumes.py +++ b/nova/tests/api/openstack/compute/contrib/test_extended_volumes.py @@ -14,6 +14,7 @@ # under the License. from lxml import etree +from oslo.serialization import jsonutils import webob from nova.api.openstack.compute.contrib import extended_volumes @@ -21,7 +22,6 @@ from nova import compute from nova import db from nova import objects from nova.objects import instance as instance_obj -from nova.openstack.common import jsonutils from nova import test from nova.tests.api.openstack import fakes from nova.tests import fake_block_device diff --git a/nova/tests/api/openstack/compute/contrib/test_flavor_disabled.py b/nova/tests/api/openstack/compute/contrib/test_flavor_disabled.py index dc5d173700..32a9db02c1 100644 --- a/nova/tests/api/openstack/compute/contrib/test_flavor_disabled.py +++ b/nova/tests/api/openstack/compute/contrib/test_flavor_disabled.py @@ -13,11 +13,11 @@ # under the License. from lxml import etree +from oslo.serialization import jsonutils import webob from nova.api.openstack.compute.contrib import flavor_disabled from nova.compute import flavors -from nova.openstack.common import jsonutils from nova import test from nova.tests.api.openstack import fakes diff --git a/nova/tests/api/openstack/compute/contrib/test_flavor_manage.py b/nova/tests/api/openstack/compute/contrib/test_flavor_manage.py index 5832e800c8..ee14d6497d 100644 --- a/nova/tests/api/openstack/compute/contrib/test_flavor_manage.py +++ b/nova/tests/api/openstack/compute/contrib/test_flavor_manage.py @@ -16,6 +16,7 @@ import datetime import mock +from oslo.serialization import jsonutils import webob from nova.api.openstack.compute.contrib import flavor_access @@ -26,7 +27,6 @@ from nova.compute import flavors from nova import context from nova import db from nova import exception -from nova.openstack.common import jsonutils from nova import test from nova.tests.api.openstack import fakes diff --git a/nova/tests/api/openstack/compute/contrib/test_flavor_rxtx.py b/nova/tests/api/openstack/compute/contrib/test_flavor_rxtx.py index 8324147cfd..24516dd23b 100644 --- a/nova/tests/api/openstack/compute/contrib/test_flavor_rxtx.py +++ b/nova/tests/api/openstack/compute/contrib/test_flavor_rxtx.py @@ -13,10 +13,10 @@ # under the License. from lxml import etree +from oslo.serialization import jsonutils import webob from nova.compute import flavors -from nova.openstack.common import jsonutils from nova import test from nova.tests.api.openstack import fakes diff --git a/nova/tests/api/openstack/compute/contrib/test_flavor_swap.py b/nova/tests/api/openstack/compute/contrib/test_flavor_swap.py index 59e984ee8d..b7114f6ed3 100644 --- a/nova/tests/api/openstack/compute/contrib/test_flavor_swap.py +++ b/nova/tests/api/openstack/compute/contrib/test_flavor_swap.py @@ -13,10 +13,10 @@ # under the License. from lxml import etree +from oslo.serialization import jsonutils import webob from nova.compute import flavors -from nova.openstack.common import jsonutils from nova import test from nova.tests.api.openstack import fakes diff --git a/nova/tests/api/openstack/compute/contrib/test_flavorextradata.py b/nova/tests/api/openstack/compute/contrib/test_flavorextradata.py index 8058295fdd..af3b662a7f 100644 --- a/nova/tests/api/openstack/compute/contrib/test_flavorextradata.py +++ b/nova/tests/api/openstack/compute/contrib/test_flavorextradata.py @@ -15,10 +15,10 @@ import datetime +from oslo.serialization import jsonutils import webob from nova.compute import flavors -from nova.openstack.common import jsonutils from nova import test from nova.tests.api.openstack import fakes diff --git a/nova/tests/api/openstack/compute/contrib/test_floating_ips.py b/nova/tests/api/openstack/compute/contrib/test_floating_ips.py index dd19858541..34e8ab4af0 100644 --- a/nova/tests/api/openstack/compute/contrib/test_floating_ips.py +++ b/nova/tests/api/openstack/compute/contrib/test_floating_ips.py @@ -19,6 +19,7 @@ import uuid from lxml import etree import mock +from oslo.serialization import jsonutils import webob from nova.api.openstack.compute.contrib import floating_ips @@ -29,7 +30,6 @@ from nova import context from nova import db from nova import exception from nova import network -from nova.openstack.common import jsonutils from nova import test from nova.tests.api.openstack import fakes from nova.tests import fake_network diff --git a/nova/tests/api/openstack/compute/contrib/test_hide_server_addresses.py b/nova/tests/api/openstack/compute/contrib/test_hide_server_addresses.py index d8e6670ed1..a2f5535d81 100644 --- a/nova/tests/api/openstack/compute/contrib/test_hide_server_addresses.py +++ b/nova/tests/api/openstack/compute/contrib/test_hide_server_addresses.py @@ -16,6 +16,7 @@ import itertools from lxml import etree +from oslo.serialization import jsonutils import webob from nova.api.openstack import wsgi @@ -25,7 +26,6 @@ from nova import db from nova import exception from nova import objects from nova.objects import instance as instance_obj -from nova.openstack.common import jsonutils from nova import test from nova.tests.api.openstack import fakes from nova.tests import fake_instance diff --git a/nova/tests/api/openstack/compute/contrib/test_image_size.py b/nova/tests/api/openstack/compute/contrib/test_image_size.py index 64591cd6a7..bfff82b9a8 100644 --- a/nova/tests/api/openstack/compute/contrib/test_image_size.py +++ b/nova/tests/api/openstack/compute/contrib/test_image_size.py @@ -14,11 +14,11 @@ # under the License. from lxml import etree +from oslo.serialization import jsonutils import webob from nova.api.openstack.compute.contrib import image_size from nova.image import glance -from nova.openstack.common import jsonutils from nova import test from nova.tests.api.openstack import fakes diff --git a/nova/tests/api/openstack/compute/contrib/test_keypairs.py b/nova/tests/api/openstack/compute/contrib/test_keypairs.py index f0407b5e2e..84fb699228 100644 --- a/nova/tests/api/openstack/compute/contrib/test_keypairs.py +++ b/nova/tests/api/openstack/compute/contrib/test_keypairs.py @@ -14,6 +14,7 @@ # under the License. from lxml import etree +from oslo.serialization import jsonutils import webob from nova.api.openstack.compute.contrib import keypairs as keypairs_v2 @@ -21,7 +22,6 @@ from nova.api.openstack.compute.plugins.v3 import keypairs as keypairs_v21 from nova.api.openstack import wsgi from nova import db from nova import exception -from nova.openstack.common import jsonutils from nova.openstack.common import policy as common_policy from nova import policy from nova import quota diff --git a/nova/tests/api/openstack/compute/contrib/test_multinic.py b/nova/tests/api/openstack/compute/contrib/test_multinic.py index 2c6f9de4db..055eb4121c 100644 --- a/nova/tests/api/openstack/compute/contrib/test_multinic.py +++ b/nova/tests/api/openstack/compute/contrib/test_multinic.py @@ -14,12 +14,12 @@ # under the License. import mock +from oslo.serialization import jsonutils import webob from nova import compute from nova import exception from nova import objects -from nova.openstack.common import jsonutils from nova import test from nova.tests.api.openstack import fakes diff --git a/nova/tests/api/openstack/compute/contrib/test_neutron_security_groups.py b/nova/tests/api/openstack/compute/contrib/test_neutron_security_groups.py index 654d635e0f..1116f893d1 100644 --- a/nova/tests/api/openstack/compute/contrib/test_neutron_security_groups.py +++ b/nova/tests/api/openstack/compute/contrib/test_neutron_security_groups.py @@ -19,6 +19,7 @@ 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 import webob from nova.api.openstack.compute.contrib import security_groups @@ -32,7 +33,6 @@ from nova.network import neutronv2 from nova.network.neutronv2 import api as neutron_api from nova.network.security_group import neutron_driver from nova.objects import instance as instance_obj -from nova.openstack.common import jsonutils from nova import test from nova.tests.api.openstack.compute.contrib import test_security_groups from nova.tests.api.openstack import fakes diff --git a/nova/tests/api/openstack/compute/contrib/test_rescue.py b/nova/tests/api/openstack/compute/contrib/test_rescue.py index 9319c2f6c7..b3a39e756a 100644 --- a/nova/tests/api/openstack/compute/contrib/test_rescue.py +++ b/nova/tests/api/openstack/compute/contrib/test_rescue.py @@ -14,11 +14,11 @@ import mock from oslo.config import cfg +from oslo.serialization import jsonutils import webob from nova import compute from nova import exception -from nova.openstack.common import jsonutils from nova import test from nova.tests.api.openstack import fakes diff --git a/nova/tests/api/openstack/compute/contrib/test_scheduler_hints.py b/nova/tests/api/openstack/compute/contrib/test_scheduler_hints.py index 8f1fe719bb..9dc9a5a8cd 100644 --- a/nova/tests/api/openstack/compute/contrib/test_scheduler_hints.py +++ b/nova/tests/api/openstack/compute/contrib/test_scheduler_hints.py @@ -16,6 +16,7 @@ import datetime from oslo.config import cfg +from oslo.serialization import jsonutils from nova.api.openstack import compute from nova.api.openstack.compute import plugins @@ -25,7 +26,6 @@ from nova.api.openstack import extensions import nova.compute.api from nova.compute import flavors from nova import db -from nova.openstack.common import jsonutils from nova import test from nova.tests.api.openstack import fakes from nova.tests import fake_instance diff --git a/nova/tests/api/openstack/compute/contrib/test_security_groups.py b/nova/tests/api/openstack/compute/contrib/test_security_groups.py index 1b57a6ea3c..f9f1dd15e5 100644 --- a/nova/tests/api/openstack/compute/contrib/test_security_groups.py +++ b/nova/tests/api/openstack/compute/contrib/test_security_groups.py @@ -17,6 +17,7 @@ from lxml import etree import mock import mox from oslo.config import cfg +from oslo.serialization import jsonutils import webob from nova.api.openstack.compute.contrib import security_groups as secgroups_v2 @@ -29,7 +30,6 @@ import nova.db from nova import exception from nova import objects from nova.objects import instance as instance_obj -from nova.openstack.common import jsonutils from nova import quota from nova import test from nova.tests.api.openstack import fakes diff --git a/nova/tests/api/openstack/compute/contrib/test_server_diagnostics.py b/nova/tests/api/openstack/compute/contrib/test_server_diagnostics.py index e4d725464b..0950783870 100644 --- a/nova/tests/api/openstack/compute/contrib/test_server_diagnostics.py +++ b/nova/tests/api/openstack/compute/contrib/test_server_diagnostics.py @@ -14,13 +14,13 @@ # under the License. from lxml import etree import mock +from oslo.serialization import jsonutils from nova.api.openstack import compute from nova.api.openstack.compute.contrib import server_diagnostics from nova.api.openstack import wsgi from nova.compute import api as compute_api from nova import exception -from nova.openstack.common import jsonutils from nova import test from nova.tests.api.openstack import fakes diff --git a/nova/tests/api/openstack/compute/contrib/test_server_external_events.py b/nova/tests/api/openstack/compute/contrib/test_server_external_events.py index 5439ce79db..61801ba648 100644 --- a/nova/tests/api/openstack/compute/contrib/test_server_external_events.py +++ b/nova/tests/api/openstack/compute/contrib/test_server_external_events.py @@ -13,13 +13,13 @@ # under the License. import mock +from oslo.serialization import jsonutils import webob from nova.api.openstack.compute.contrib import server_external_events from nova import context from nova import exception from nova import objects -from nova.openstack.common import jsonutils from nova import test fake_instances = { diff --git a/nova/tests/api/openstack/compute/contrib/test_server_password.py b/nova/tests/api/openstack/compute/contrib/test_server_password.py index c865bb2378..d7a6d3f070 100644 --- a/nova/tests/api/openstack/compute/contrib/test_server_password.py +++ b/nova/tests/api/openstack/compute/contrib/test_server_password.py @@ -15,11 +15,11 @@ from lxml import etree from oslo.config import cfg +from oslo.serialization import jsonutils import webob from nova.api.metadata import password from nova import compute -from nova.openstack.common import jsonutils from nova import test from nova.tests.api.openstack import fakes from nova.tests import fake_instance diff --git a/nova/tests/api/openstack/compute/contrib/test_server_usage.py b/nova/tests/api/openstack/compute/contrib/test_server_usage.py index 39fd7dce06..a55544e916 100644 --- a/nova/tests/api/openstack/compute/contrib/test_server_usage.py +++ b/nova/tests/api/openstack/compute/contrib/test_server_usage.py @@ -16,6 +16,7 @@ import datetime from lxml import etree +from oslo.serialization import jsonutils from oslo.utils import timeutils from nova.api.openstack.compute.contrib import server_usage @@ -24,7 +25,6 @@ from nova import db from nova import exception from nova import objects from nova.objects import instance as instance_obj -from nova.openstack.common import jsonutils from nova import test from nova.tests.api.openstack import fakes from nova.tests import fake_instance diff --git a/nova/tests/api/openstack/compute/contrib/test_simple_tenant_usage.py b/nova/tests/api/openstack/compute/contrib/test_simple_tenant_usage.py index f790fec8b7..2f96e7109a 100644 --- a/nova/tests/api/openstack/compute/contrib/test_simple_tenant_usage.py +++ b/nova/tests/api/openstack/compute/contrib/test_simple_tenant_usage.py @@ -17,6 +17,7 @@ import datetime from lxml import etree import mock +from oslo.serialization import jsonutils from oslo.utils import timeutils import webob @@ -30,7 +31,6 @@ from nova import context from nova import db from nova import exception from nova import objects -from nova.openstack.common import jsonutils from nova.openstack.common import policy as common_policy from nova import policy from nova import test diff --git a/nova/tests/api/openstack/compute/contrib/test_snapshots.py b/nova/tests/api/openstack/compute/contrib/test_snapshots.py index a20daca788..da3e9262fa 100644 --- a/nova/tests/api/openstack/compute/contrib/test_snapshots.py +++ b/nova/tests/api/openstack/compute/contrib/test_snapshots.py @@ -14,12 +14,12 @@ # under the License. from lxml import etree +from oslo.serialization import jsonutils from oslo.utils import timeutils import webob from nova.api.openstack.compute.contrib import volumes from nova import context -from nova.openstack.common import jsonutils from nova import test from nova.tests.api.openstack import fakes from nova.volume import cinder diff --git a/nova/tests/api/openstack/compute/contrib/test_virtual_interfaces.py b/nova/tests/api/openstack/compute/contrib/test_virtual_interfaces.py index a14e312cc9..f235513897 100644 --- a/nova/tests/api/openstack/compute/contrib/test_virtual_interfaces.py +++ b/nova/tests/api/openstack/compute/contrib/test_virtual_interfaces.py @@ -14,6 +14,7 @@ # under the License. from lxml import etree +from oslo.serialization import jsonutils import webob from nova.api.openstack.compute.contrib import virtual_interfaces @@ -23,7 +24,6 @@ from nova.compute import api as compute_api from nova import context from nova import exception from nova import network -from nova.openstack.common import jsonutils from nova import test from nova.tests.api.openstack import fakes diff --git a/nova/tests/api/openstack/compute/contrib/test_volumes.py b/nova/tests/api/openstack/compute/contrib/test_volumes.py index 19375819b3..71536b6619 100644 --- a/nova/tests/api/openstack/compute/contrib/test_volumes.py +++ b/nova/tests/api/openstack/compute/contrib/test_volumes.py @@ -19,6 +19,7 @@ import datetime from lxml import etree import mock from oslo.config import cfg +from oslo.serialization import jsonutils from oslo.utils import timeutils import webob from webob import exc @@ -34,7 +35,6 @@ from nova import context from nova import db from nova import exception from nova import objects -from nova.openstack.common import jsonutils from nova import test from nova.tests.api.openstack import fakes from nova.tests import fake_block_device diff --git a/nova/tests/api/openstack/compute/plugins/v3/admin_only_action_common.py b/nova/tests/api/openstack/compute/plugins/v3/admin_only_action_common.py index 5d6d73fee5..5a0b8a4507 100644 --- a/nova/tests/api/openstack/compute/plugins/v3/admin_only_action_common.py +++ b/nova/tests/api/openstack/compute/plugins/v3/admin_only_action_common.py @@ -12,13 +12,13 @@ # License for the specific language governing permissions and limitations # under the License. +from oslo.serialization import jsonutils from oslo.utils import timeutils import webob from nova.compute import vm_states import nova.context from nova import exception -from nova.openstack.common import jsonutils from nova.openstack.common import uuidutils from nova import test from nova.tests import fake_instance diff --git a/nova/tests/api/openstack/compute/plugins/v3/test_access_ips.py b/nova/tests/api/openstack/compute/plugins/v3/test_access_ips.py index 0f78f16183..831d708c22 100644 --- a/nova/tests/api/openstack/compute/plugins/v3/test_access_ips.py +++ b/nova/tests/api/openstack/compute/plugins/v3/test_access_ips.py @@ -12,6 +12,8 @@ # License for the specific language governing permissions and limitations # under the License. +from oslo.serialization import jsonutils + from nova.api.openstack.compute import plugins from nova.api.openstack.compute.plugins.v3 import access_ips from nova.api.openstack.compute.plugins.v3 import servers @@ -20,7 +22,6 @@ from nova.compute import api as compute_api from nova import db from nova import exception from nova.objects import instance as instance_obj -from nova.openstack.common import jsonutils from nova import test from nova.tests.api.openstack import fakes from nova.tests.image import fake diff --git a/nova/tests/api/openstack/compute/plugins/v3/test_console_auth_tokens.py b/nova/tests/api/openstack/compute/plugins/v3/test_console_auth_tokens.py index 3a91903d05..85035ee873 100644 --- a/nova/tests/api/openstack/compute/plugins/v3/test_console_auth_tokens.py +++ b/nova/tests/api/openstack/compute/plugins/v3/test_console_auth_tokens.py @@ -13,9 +13,10 @@ # License for the specific language governing permissions and limitations # under the License. +from oslo.serialization import jsonutils + from nova.consoleauth import rpcapi as consoleauth_rpcapi from nova import context -from nova.openstack.common import jsonutils from nova import test from nova.tests.api.openstack import fakes diff --git a/nova/tests/api/openstack/compute/plugins/v3/test_extended_volumes.py b/nova/tests/api/openstack/compute/plugins/v3/test_extended_volumes.py index 5b6cf1334d..1922005ba9 100644 --- a/nova/tests/api/openstack/compute/plugins/v3/test_extended_volumes.py +++ b/nova/tests/api/openstack/compute/plugins/v3/test_extended_volumes.py @@ -14,6 +14,7 @@ # under the License. import mock +from oslo.serialization import jsonutils import webob from nova.api.openstack.compute.plugins.v3 import extended_volumes @@ -23,7 +24,6 @@ from nova import db from nova import exception from nova import objects from nova.objects import instance as instance_obj -from nova.openstack.common import jsonutils from nova import test from nova.tests.api.openstack import fakes from nova.tests import fake_block_device diff --git a/nova/tests/api/openstack/compute/plugins/v3/test_multiple_create.py b/nova/tests/api/openstack/compute/plugins/v3/test_multiple_create.py index f258a697c6..0c8320bccc 100644 --- a/nova/tests/api/openstack/compute/plugins/v3/test_multiple_create.py +++ b/nova/tests/api/openstack/compute/plugins/v3/test_multiple_create.py @@ -17,6 +17,7 @@ import datetime import uuid from oslo.config import cfg +from oslo.serialization import jsonutils import webob from nova.api.openstack.compute import plugins @@ -28,7 +29,6 @@ from nova.compute import flavors from nova import db from nova import exception from nova.network import manager -from nova.openstack.common import jsonutils from nova import test from nova.tests.api.openstack import fakes from nova.tests import fake_instance diff --git a/nova/tests/api/openstack/compute/plugins/v3/test_pci.py b/nova/tests/api/openstack/compute/plugins/v3/test_pci.py index aca1bb2787..a4d508c746 100644 --- a/nova/tests/api/openstack/compute/plugins/v3/test_pci.py +++ b/nova/tests/api/openstack/compute/plugins/v3/test_pci.py @@ -13,6 +13,7 @@ # under the License. +from oslo.serialization import jsonutils from webob import exc from nova.api.openstack.compute.plugins.v3 import pci @@ -21,7 +22,6 @@ from nova import context from nova import db from nova import exception from nova import objects -from nova.openstack.common import jsonutils from nova.pci import pci_device from nova import test from nova.tests.api.openstack import fakes diff --git a/nova/tests/api/openstack/compute/plugins/v3/test_server_actions.py b/nova/tests/api/openstack/compute/plugins/v3/test_server_actions.py index 2e462fe018..f3487d8d80 100644 --- a/nova/tests/api/openstack/compute/plugins/v3/test_server_actions.py +++ b/nova/tests/api/openstack/compute/plugins/v3/test_server_actions.py @@ -18,6 +18,7 @@ import uuid import mock import mox from oslo.config import cfg +from oslo.serialization import jsonutils import webob from nova.api.openstack.compute import plugins @@ -30,7 +31,6 @@ from nova import db from nova import exception from nova.image import glance from nova import objects -from nova.openstack.common import jsonutils from nova.openstack.common import uuidutils from nova import test from nova.tests.api.openstack import fakes diff --git a/nova/tests/api/openstack/compute/plugins/v3/test_server_external_events.py b/nova/tests/api/openstack/compute/plugins/v3/test_server_external_events.py index 52ce2941a0..e9bd4538a0 100644 --- a/nova/tests/api/openstack/compute/plugins/v3/test_server_external_events.py +++ b/nova/tests/api/openstack/compute/plugins/v3/test_server_external_events.py @@ -13,13 +13,13 @@ # under the License. import mock +from oslo.serialization import jsonutils import webob from nova.api.openstack.compute.plugins.v3 import server_external_events from nova import context from nova import exception from nova import objects -from nova.openstack.common import jsonutils from nova import test fake_instances = { diff --git a/nova/tests/api/openstack/compute/plugins/v3/test_server_password.py b/nova/tests/api/openstack/compute/plugins/v3/test_server_password.py index b2eec1e2da..cf7289234b 100644 --- a/nova/tests/api/openstack/compute/plugins/v3/test_server_password.py +++ b/nova/tests/api/openstack/compute/plugins/v3/test_server_password.py @@ -14,11 +14,11 @@ # under the License. from oslo.config import cfg +from oslo.serialization import jsonutils import webob from nova.api.metadata import password from nova import compute -from nova.openstack.common import jsonutils from nova import test from nova.tests.api.openstack import fakes from nova.tests import fake_instance diff --git a/nova/tests/api/openstack/compute/plugins/v3/test_servers.py b/nova/tests/api/openstack/compute/plugins/v3/test_servers.py index af824507e3..1ea4a332fa 100644 --- a/nova/tests/api/openstack/compute/plugins/v3/test_servers.py +++ b/nova/tests/api/openstack/compute/plugins/v3/test_servers.py @@ -24,6 +24,7 @@ import iso8601 import mock import mox from oslo.config import cfg +from oslo.serialization import jsonutils from oslo.utils import timeutils import six.moves.urllib.parse as urlparse import testtools @@ -53,7 +54,6 @@ from nova.network import manager from nova.network.neutronv2 import api as neutron_api from nova import objects from nova.objects import instance as instance_obj -from nova.openstack.common import jsonutils from nova.openstack.common import policy as common_policy from nova import policy from nova import test diff --git a/nova/tests/api/openstack/compute/plugins/v3/test_user_data.py b/nova/tests/api/openstack/compute/plugins/v3/test_user_data.py index 19b1957b03..9ee2c5022a 100644 --- a/nova/tests/api/openstack/compute/plugins/v3/test_user_data.py +++ b/nova/tests/api/openstack/compute/plugins/v3/test_user_data.py @@ -19,6 +19,7 @@ import datetime import uuid 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 @@ -28,7 +29,6 @@ from nova.compute import flavors from nova import db from nova import exception from nova.network import manager -from nova.openstack.common import jsonutils from nova import test from nova.tests.api.openstack import fakes from nova.tests import fake_instance diff --git a/nova/tests/api/openstack/compute/test_api.py b/nova/tests/api/openstack/compute/test_api.py index 15f9fe499a..ecfe3c689a 100644 --- a/nova/tests/api/openstack/compute/test_api.py +++ b/nova/tests/api/openstack/compute/test_api.py @@ -14,6 +14,7 @@ # under the License. from lxml import etree +from oslo.serialization import jsonutils import webob import webob.dec import webob.exc @@ -21,7 +22,6 @@ import webob.exc from nova.api import openstack as openstack_api from nova.api.openstack import wsgi from nova import exception -from nova.openstack.common import jsonutils from nova import test from nova.tests.api.openstack import fakes diff --git a/nova/tests/api/openstack/compute/test_extensions.py b/nova/tests/api/openstack/compute/test_extensions.py index 264566ecbf..49670087c8 100644 --- a/nova/tests/api/openstack/compute/test_extensions.py +++ b/nova/tests/api/openstack/compute/test_extensions.py @@ -17,6 +17,7 @@ import iso8601 from lxml import etree from oslo.config import cfg +from oslo.serialization import jsonutils import webob from nova.api.openstack import compute @@ -25,7 +26,6 @@ from nova.api.openstack import extensions as base_extensions from nova.api.openstack import wsgi from nova.api.openstack import xmlutil from nova import exception -from nova.openstack.common import jsonutils import nova.policy from nova import test from nova.tests.api.openstack import fakes diff --git a/nova/tests/api/openstack/compute/test_image_metadata.py b/nova/tests/api/openstack/compute/test_image_metadata.py index 2fbf6d777a..194dfd3b1c 100644 --- a/nova/tests/api/openstack/compute/test_image_metadata.py +++ b/nova/tests/api/openstack/compute/test_image_metadata.py @@ -16,13 +16,13 @@ import copy import mock +from oslo.serialization import jsonutils import webob from nova.api.openstack.compute import image_metadata from nova.api.openstack.compute.plugins.v3 import image_metadata \ as image_metadata_v21 from nova import exception -from nova.openstack.common import jsonutils from nova import test from nova.tests.api.openstack import fakes from nova.tests import image_fixtures diff --git a/nova/tests/api/openstack/compute/test_limits.py b/nova/tests/api/openstack/compute/test_limits.py index 56bee4483d..73885ad2cc 100644 --- a/nova/tests/api/openstack/compute/test_limits.py +++ b/nova/tests/api/openstack/compute/test_limits.py @@ -23,6 +23,7 @@ from xml.dom import minidom from lxml import etree import mock +from oslo.serialization import jsonutils import six import webob @@ -32,7 +33,6 @@ from nova.api.openstack.compute import views from nova.api.openstack import wsgi from nova.api.openstack import xmlutil import nova.context -from nova.openstack.common import jsonutils from nova import test from nova.tests.api.openstack import fakes from nova.tests import matchers diff --git a/nova/tests/api/openstack/compute/test_server_actions.py b/nova/tests/api/openstack/compute/test_server_actions.py index ea3fb1aaf9..97b33dc99a 100644 --- a/nova/tests/api/openstack/compute/test_server_actions.py +++ b/nova/tests/api/openstack/compute/test_server_actions.py @@ -19,6 +19,7 @@ import uuid import mock import mox from oslo.config import cfg +from oslo.serialization import jsonutils import webob from nova.api.openstack.compute import servers @@ -30,7 +31,6 @@ from nova import db from nova import exception from nova.image import glance from nova import objects -from nova.openstack.common import jsonutils from nova.openstack.common import uuidutils from nova import test from nova.tests.api.openstack import fakes diff --git a/nova/tests/api/openstack/compute/test_server_metadata.py b/nova/tests/api/openstack/compute/test_server_metadata.py index c6511b787f..330786142d 100644 --- a/nova/tests/api/openstack/compute/test_server_metadata.py +++ b/nova/tests/api/openstack/compute/test_server_metadata.py @@ -17,6 +17,7 @@ import uuid import mock from oslo.config import cfg +from oslo.serialization import jsonutils from oslo.utils import timeutils import six import webob @@ -29,7 +30,6 @@ from nova.compute import vm_states import nova.db from nova import exception from nova import objects -from nova.openstack.common import jsonutils from nova import test from nova.tests.api.openstack import fakes from nova.tests import fake_instance diff --git a/nova/tests/api/openstack/compute/test_servers.py b/nova/tests/api/openstack/compute/test_servers.py index 9281ec06b2..e427ccb977 100644 --- a/nova/tests/api/openstack/compute/test_servers.py +++ b/nova/tests/api/openstack/compute/test_servers.py @@ -25,6 +25,7 @@ import iso8601 from lxml import etree import mock from oslo.config import cfg +from oslo.serialization import jsonutils from oslo.utils import timeutils import six import six.moves.urllib.parse as urlparse @@ -51,7 +52,6 @@ from nova.network import manager from nova.network.neutronv2 import api as neutron_api from nova import objects from nova.objects import instance as instance_obj -from nova.openstack.common import jsonutils from nova.openstack.common import policy as common_policy from nova import policy from nova import test diff --git a/nova/tests/api/openstack/compute/test_urlmap.py b/nova/tests/api/openstack/compute/test_urlmap.py index 243f221af7..f1f5f60cfe 100644 --- a/nova/tests/api/openstack/compute/test_urlmap.py +++ b/nova/tests/api/openstack/compute/test_urlmap.py @@ -13,9 +13,9 @@ # License for the specific language governing permissions and limitations # under the License. +from oslo.serialization import jsonutils import webob -from nova.openstack.common import jsonutils from nova import test from nova.tests.api.openstack import fakes import nova.tests.image.fake diff --git a/nova/tests/api/openstack/compute/test_versions.py b/nova/tests/api/openstack/compute/test_versions.py index 029b92e3e6..baec98b9ee 100644 --- a/nova/tests/api/openstack/compute/test_versions.py +++ b/nova/tests/api/openstack/compute/test_versions.py @@ -18,12 +18,12 @@ import uuid as stdlib_uuid import feedparser from lxml import etree +from oslo.serialization import jsonutils import webob from nova.api.openstack.compute import versions from nova.api.openstack.compute import views from nova.api.openstack import xmlutil -from nova.openstack.common import jsonutils from nova import test from nova.tests.api.openstack import common from nova.tests.api.openstack import fakes diff --git a/nova/tests/api/openstack/fakes.py b/nova/tests/api/openstack/fakes.py index 6f64fcb994..cd68c577ce 100644 --- a/nova/tests/api/openstack/fakes.py +++ b/nova/tests/api/openstack/fakes.py @@ -16,6 +16,7 @@ import datetime import uuid +from oslo.serialization import jsonutils from oslo.utils import timeutils import routes import six @@ -39,7 +40,6 @@ from nova.db.sqlalchemy import models from nova import exception as exc import nova.netconf from nova.network import api as network_api -from nova.openstack.common import jsonutils from nova import quota from nova.tests import fake_block_device from nova.tests import fake_network diff --git a/nova/tests/api/openstack/test_faults.py b/nova/tests/api/openstack/test_faults.py index d6bd90d47d..b52a7e5896 100644 --- a/nova/tests/api/openstack/test_faults.py +++ b/nova/tests/api/openstack/test_faults.py @@ -17,6 +17,7 @@ from xml.dom import minidom import mock +from oslo.serialization import jsonutils import webob import webob.dec import webob.exc @@ -27,7 +28,6 @@ from nova.api.openstack import wsgi from nova import exception from nova import i18n from nova.i18n import _ -from nova.openstack.common import jsonutils from nova import test diff --git a/nova/tests/api/test_auth.py b/nova/tests/api/test_auth.py index a7bb247489..73bc240482 100644 --- a/nova/tests/api/test_auth.py +++ b/nova/tests/api/test_auth.py @@ -13,12 +13,12 @@ # under the License. from oslo.config import cfg +from oslo.serialization import jsonutils import webob import webob.exc import nova.api.auth from nova.i18n import _ -from nova.openstack.common import jsonutils from nova.openstack.common.middleware import request_id from nova import test diff --git a/nova/tests/cells/test_cells_messaging.py b/nova/tests/cells/test_cells_messaging.py index e9e71bb13e..0ba8b79cd1 100644 --- a/nova/tests/cells/test_cells_messaging.py +++ b/nova/tests/cells/test_cells_messaging.py @@ -23,6 +23,7 @@ import mock 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 nova.cells import messaging @@ -36,7 +37,6 @@ from nova.network import model as network_model from nova import objects from nova.objects import base as objects_base from nova.objects import fields as objects_fields -from nova.openstack.common import jsonutils from nova.openstack.common import uuidutils from nova import rpc from nova import test diff --git a/nova/tests/compute/test_claims.py b/nova/tests/compute/test_claims.py index a5b7a0e46c..1e29e16a87 100644 --- a/nova/tests/compute/test_claims.py +++ b/nova/tests/compute/test_claims.py @@ -19,13 +19,13 @@ import re import uuid import mock +from oslo.serialization import jsonutils import six from nova.compute import claims from nova import db from nova import exception from nova import objects -from nova.openstack.common import jsonutils from nova.pci import pci_manager from nova import test from nova.tests.pci import pci_fakes diff --git a/nova/tests/compute/test_compute.py b/nova/tests/compute/test_compute.py index a2c45df4ba..a4fbae25d3 100644 --- a/nova/tests/compute/test_compute.py +++ b/nova/tests/compute/test_compute.py @@ -31,6 +31,7 @@ import mock 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 import six @@ -64,7 +65,6 @@ from nova import objects from nova.objects import base as obj_base from nova.objects import block_device as block_device_obj from nova.objects import instance as instance_obj -from nova.openstack.common import jsonutils from nova.openstack.common import log as logging from nova.openstack.common import uuidutils from nova import policy diff --git a/nova/tests/compute/test_compute_utils.py b/nova/tests/compute/test_compute_utils.py index 66d783c940..94e817e071 100644 --- a/nova/tests/compute/test_compute_utils.py +++ b/nova/tests/compute/test_compute_utils.py @@ -21,6 +21,7 @@ import string import mock from oslo.config import cfg +from oslo.serialization import jsonutils from oslo.utils import importutils import six import testtools @@ -37,7 +38,6 @@ from nova.network import api as network_api from nova import objects from nova.objects import block_device as block_device_obj from nova.objects import instance as instance_obj -from nova.openstack.common import jsonutils from nova.openstack.common import periodic_task from nova import rpc from nova import test diff --git a/nova/tests/compute/test_resource_tracker.py b/nova/tests/compute/test_resource_tracker.py index ff2d384957..992f72b6ae 100644 --- a/nova/tests/compute/test_resource_tracker.py +++ b/nova/tests/compute/test_resource_tracker.py @@ -19,6 +19,7 @@ import uuid import mock from oslo.config import cfg +from oslo.serialization import jsonutils from oslo.utils import timeutils from nova.compute import flavors @@ -30,7 +31,6 @@ from nova import context from nova import db from nova import objects from nova.objects import base as obj_base -from nova.openstack.common import jsonutils from nova import rpc from nova import test from nova.tests.compute.monitors import test_monitors diff --git a/nova/tests/compute/test_rpcapi.py b/nova/tests/compute/test_rpcapi.py index 6020a93d9d..df13dbff99 100644 --- a/nova/tests/compute/test_rpcapi.py +++ b/nova/tests/compute/test_rpcapi.py @@ -20,12 +20,12 @@ import contextlib import mock from oslo.config import cfg +from oslo.serialization import jsonutils from nova.compute import rpcapi as compute_rpcapi from nova import context from nova.objects import block_device as objects_block_dev from nova.objects import network_request as objects_network_request -from nova.openstack.common import jsonutils from nova import test from nova.tests import fake_block_device from nova.tests.fake_instance import fake_instance_obj diff --git a/nova/tests/compute/test_shelve.py b/nova/tests/compute/test_shelve.py index b39566c9dd..0d0e5f0f17 100644 --- a/nova/tests/compute/test_shelve.py +++ b/nova/tests/compute/test_shelve.py @@ -14,6 +14,7 @@ import iso8601 import mock import mox from oslo.config import cfg +from oslo.serialization import jsonutils from oslo.utils import timeutils from nova.compute import claims @@ -21,7 +22,6 @@ from nova.compute import task_states from nova.compute import vm_states from nova import db from nova import objects -from nova.openstack.common import jsonutils from nova.tests.compute import test_compute from nova.tests.image import fake as fake_image from nova import utils diff --git a/nova/tests/conductor/test_conductor.py b/nova/tests/conductor/test_conductor.py index 4ca71c863c..a97b709db7 100644 --- a/nova/tests/conductor/test_conductor.py +++ b/nova/tests/conductor/test_conductor.py @@ -20,6 +20,7 @@ import contextlib import mock import mox from oslo import messaging +from oslo.serialization import jsonutils from oslo.utils import timeutils from nova.api.ec2 import ec2utils @@ -43,7 +44,6 @@ from nova.objects import base as obj_base from nova.objects import block_device as block_device_obj from nova.objects import fields from nova.objects import quotas as quotas_obj -from nova.openstack.common import jsonutils from nova import quota from nova import rpc from nova.scheduler import driver as scheduler_driver diff --git a/nova/tests/db/test_db_api.py b/nova/tests/db/test_db_api.py index ec7d7cce22..d77d8fd6ff 100644 --- a/nova/tests/db/test_db_api.py +++ b/nova/tests/db/test_db_api.py @@ -30,6 +30,7 @@ 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 @@ -50,7 +51,6 @@ from nova.db.sqlalchemy import models from nova.db.sqlalchemy import types as col_types from nova.db.sqlalchemy import utils as db_utils from nova import exception -from nova.openstack.common import jsonutils from nova.openstack.common import uuidutils from nova import quota from nova import test diff --git a/nova/tests/fake_ldap.py b/nova/tests/fake_ldap.py index 5e3a1cc7a3..dd69d42961 100644 --- a/nova/tests/fake_ldap.py +++ b/nova/tests/fake_ldap.py @@ -23,8 +23,9 @@ library to work with nova. import fnmatch +from oslo.serialization import jsonutils + from nova.i18n import _ -from nova.openstack.common import jsonutils class Store(object): diff --git a/nova/tests/fake_network.py b/nova/tests/fake_network.py index 873d2cfa95..de42d6d877 100644 --- a/nova/tests/fake_network.py +++ b/nova/tests/fake_network.py @@ -14,6 +14,7 @@ # under the License. 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 @@ -28,7 +29,6 @@ from nova.network import rpcapi as network_rpcapi from nova import objects from nova.objects import base as obj_base from nova.objects import virtual_interface as vif_obj -from nova.openstack.common import jsonutils from nova.pci import pci_device from nova.tests.objects import test_fixed_ip from nova.tests.objects import test_instance_info_cache diff --git a/nova/tests/integrated/api/client.py b/nova/tests/integrated/api/client.py index 51943bbf72..44e2ba2dc4 100644 --- a/nova/tests/integrated/api/client.py +++ b/nova/tests/integrated/api/client.py @@ -14,10 +14,10 @@ import urllib +from oslo.serialization import jsonutils import requests from nova.i18n import _ -from nova.openstack.common import jsonutils from nova.openstack.common import log as logging from nova.tests.image import fake diff --git a/nova/tests/integrated/api_samples_test_base.py b/nova/tests/integrated/api_samples_test_base.py index 6faed0ca4b..ea1884f91d 100644 --- a/nova/tests/integrated/api_samples_test_base.py +++ b/nova/tests/integrated/api_samples_test_base.py @@ -17,11 +17,11 @@ import os import re from lxml import etree +from oslo.serialization import jsonutils from oslo.utils import importutils import six from nova.i18n import _ -from nova.openstack.common import jsonutils from nova import test from nova.tests.integrated import integrated_helpers diff --git a/nova/tests/integrated/test_api_samples.py b/nova/tests/integrated/test_api_samples.py index c064bbc605..fa57f8f85f 100644 --- a/nova/tests/integrated/test_api_samples.py +++ b/nova/tests/integrated/test_api_samples.py @@ -25,6 +25,7 @@ import uuid as uuid_lib from lxml import etree import mock from oslo.config import cfg +from oslo.serialization import jsonutils from oslo.utils import importutils from oslo.utils import timeutils @@ -46,7 +47,6 @@ from nova.db.sqlalchemy import models from nova import exception from nova.network import api as network_api from nova import objects -from nova.openstack.common import jsonutils from nova.openstack.common import log as logging import nova.quota from nova.servicegroup import api as service_group_api diff --git a/nova/tests/integrated/v3/test_console_auth_tokens.py b/nova/tests/integrated/v3/test_console_auth_tokens.py index 64c5ce3c9e..80ebbc67f2 100644 --- a/nova/tests/integrated/v3/test_console_auth_tokens.py +++ b/nova/tests/integrated/v3/test_console_auth_tokens.py @@ -14,7 +14,8 @@ import re -from nova.openstack.common import jsonutils +from oslo.serialization import jsonutils + from nova.tests.integrated.v3 import test_servers diff --git a/nova/tests/integrated/v3/test_extension_info.py b/nova/tests/integrated/v3/test_extension_info.py index 1647eb8031..26dd186193 100644 --- a/nova/tests/integrated/v3/test_extension_info.py +++ b/nova/tests/integrated/v3/test_extension_info.py @@ -16,9 +16,9 @@ import re import mock +from oslo.serialization import jsonutils from nova.api.openstack import extensions as api_extensions -from nova.openstack.common import jsonutils from nova.tests.integrated.v3 import api_sample_base diff --git a/nova/tests/integrated/v3/test_pci.py b/nova/tests/integrated/v3/test_pci.py index 42638e8b40..e20aeb7f5e 100644 --- a/nova/tests/integrated/v3/test_pci.py +++ b/nova/tests/integrated/v3/test_pci.py @@ -13,9 +13,9 @@ # under the License. import mock +from oslo.serialization import jsonutils from nova import db -from nova.openstack.common import jsonutils from nova.tests.integrated.v3 import api_sample_base from nova.tests.integrated.v3 import test_servers diff --git a/nova/tests/network/test_linux_net.py b/nova/tests/network/test_linux_net.py index 4ce88d43e3..15a20eb7d5 100644 --- a/nova/tests/network/test_linux_net.py +++ b/nova/tests/network/test_linux_net.py @@ -21,6 +21,7 @@ import os import mock import mox from oslo.config import cfg +from oslo.serialization import jsonutils from oslo.utils import timeutils from nova import context @@ -30,7 +31,6 @@ from nova.network import driver from nova.network import linux_net from nova import objects from nova.openstack.common import fileutils -from nova.openstack.common import jsonutils from nova.openstack.common import log as logging from nova.openstack.common import processutils from nova import test diff --git a/nova/tests/network/test_neutronv2.py b/nova/tests/network/test_neutronv2.py index 49f1c05641..d91256665c 100644 --- a/nova/tests/network/test_neutronv2.py +++ b/nova/tests/network/test_neutronv2.py @@ -24,6 +24,7 @@ import mox from neutronclient.common import exceptions from neutronclient.v2_0 import client from oslo.config import cfg +from oslo.serialization import jsonutils import six from nova.compute import flavors @@ -34,7 +35,6 @@ from nova.network import neutronv2 from nova.network.neutronv2 import api as neutronapi from nova.network.neutronv2 import constants from nova import objects -from nova.openstack.common import jsonutils from nova.openstack.common import policy as common_policy from nova.pci import pci_manager from nova.pci import pci_whitelist diff --git a/nova/tests/objects/test_compute_node.py b/nova/tests/objects/test_compute_node.py index b919956518..49bb968496 100644 --- a/nova/tests/objects/test_compute_node.py +++ b/nova/tests/objects/test_compute_node.py @@ -13,6 +13,7 @@ # under the License. import mock +from oslo.serialization import jsonutils from oslo.utils import timeutils from nova import db @@ -20,7 +21,6 @@ from nova import exception from nova.objects import compute_node from nova.objects import hv_spec from nova.objects import service -from nova.openstack.common import jsonutils from nova.tests.objects import test_objects from nova.virt import hardware diff --git a/nova/tests/objects/test_instance_pci_requests.py b/nova/tests/objects/test_instance_pci_requests.py index 256174b705..7405a5a22f 100644 --- a/nova/tests/objects/test_instance_pci_requests.py +++ b/nova/tests/objects/test_instance_pci_requests.py @@ -11,9 +11,9 @@ # under the License. import mock +from oslo.serialization import jsonutils from nova import objects -from nova.openstack.common import jsonutils from nova.tests.objects import test_objects diff --git a/nova/tests/objects/test_objects.py b/nova/tests/objects/test_objects.py index 1634b8d3fc..37316b4ceb 100644 --- a/nova/tests/objects/test_objects.py +++ b/nova/tests/objects/test_objects.py @@ -20,6 +20,7 @@ import os import pprint import mock +from oslo.serialization import jsonutils from oslo.utils import timeutils import six from testtools import matchers @@ -30,7 +31,6 @@ from nova import exception from nova import objects from nova.objects import base from nova.objects import fields -from nova.openstack.common import jsonutils from nova.openstack.common import log from nova import rpc from nova import test diff --git a/nova/tests/pci/test_pci_stats.py b/nova/tests/pci/test_pci_stats.py index ffaf9ed638..2f830c6cfa 100644 --- a/nova/tests/pci/test_pci_stats.py +++ b/nova/tests/pci/test_pci_stats.py @@ -14,10 +14,10 @@ # under the License. import mock +from oslo.serialization import jsonutils from nova import exception from nova import objects -from nova.openstack.common import jsonutils from nova.pci import pci_stats as pci from nova.pci import pci_whitelist from nova import test diff --git a/nova/tests/policy_fixture.py b/nova/tests/policy_fixture.py index 3da8cc7d8a..18010d6756 100644 --- a/nova/tests/policy_fixture.py +++ b/nova/tests/policy_fixture.py @@ -16,8 +16,8 @@ import os import fixtures from oslo.config import cfg +from oslo.serialization import jsonutils -from nova.openstack.common import jsonutils from nova.openstack.common import policy as common_policy import nova.policy from nova.tests import fake_policy diff --git a/nova/tests/scheduler/fakes.py b/nova/tests/scheduler/fakes.py index 51584a4a35..d1b2918d33 100644 --- a/nova/tests/scheduler/fakes.py +++ b/nova/tests/scheduler/fakes.py @@ -17,10 +17,10 @@ Fakes For Scheduler tests. """ import mox +from oslo.serialization import jsonutils from nova.compute import vm_states from nova import db -from nova.openstack.common import jsonutils from nova.scheduler import filter_scheduler from nova.scheduler import host_manager from nova.virt import hardware diff --git a/nova/tests/scheduler/ironic_fakes.py b/nova/tests/scheduler/ironic_fakes.py index 266fab08d8..5c63afafe3 100644 --- a/nova/tests/scheduler/ironic_fakes.py +++ b/nova/tests/scheduler/ironic_fakes.py @@ -16,7 +16,7 @@ Fake nodes for Ironic host manager tests. """ -from nova.openstack.common import jsonutils +from oslo.serialization import jsonutils COMPUTE_NODES = [ diff --git a/nova/tests/scheduler/test_baremetal_host_manager.py b/nova/tests/scheduler/test_baremetal_host_manager.py index 5d990f2074..1f6e2d70fa 100644 --- a/nova/tests/scheduler/test_baremetal_host_manager.py +++ b/nova/tests/scheduler/test_baremetal_host_manager.py @@ -14,8 +14,8 @@ Tests For BaremetalHostManager """ import mock +from oslo.serialization import jsonutils -from nova.openstack.common import jsonutils from nova.scheduler import baremetal_host_manager from nova.scheduler import host_manager from nova import test diff --git a/nova/tests/scheduler/test_host_filters.py b/nova/tests/scheduler/test_host_filters.py index 7511ec850c..5bd4d2c1f4 100644 --- a/nova/tests/scheduler/test_host_filters.py +++ b/nova/tests/scheduler/test_host_filters.py @@ -17,6 +17,7 @@ Tests For Scheduler Host Filters. import mock from oslo.config import cfg +from oslo.serialization import jsonutils from oslo.utils import timeutils import requests import six @@ -29,7 +30,6 @@ from nova import context from nova import db from nova import objects from nova.objects import base as obj_base -from nova.openstack.common import jsonutils from nova.pci import pci_stats from nova.scheduler import filters from nova.scheduler.filters import extra_specs_ops diff --git a/nova/tests/scheduler/test_host_manager.py b/nova/tests/scheduler/test_host_manager.py index 007da28978..74ca092f31 100644 --- a/nova/tests/scheduler/test_host_manager.py +++ b/nova/tests/scheduler/test_host_manager.py @@ -17,6 +17,7 @@ Tests For HostManager """ import mock +from oslo.serialization import jsonutils from oslo.utils import timeutils import six @@ -25,7 +26,6 @@ from nova.compute import vm_states from nova import db from nova import exception from nova.i18n import _LW -from nova.openstack.common import jsonutils from nova.scheduler import filters from nova.scheduler import host_manager from nova import test diff --git a/nova/tests/scheduler/test_ironic_host_manager.py b/nova/tests/scheduler/test_ironic_host_manager.py index a419be954a..1a779e76c3 100644 --- a/nova/tests/scheduler/test_ironic_host_manager.py +++ b/nova/tests/scheduler/test_ironic_host_manager.py @@ -18,10 +18,10 @@ Tests For IronicHostManager """ import mock +from oslo.serialization import jsonutils from nova import db from nova import exception -from nova.openstack.common import jsonutils from nova.scheduler import filters from nova.scheduler import host_manager from nova.scheduler import ironic_host_manager diff --git a/nova/tests/scheduler/test_scheduler_options.py b/nova/tests/scheduler/test_scheduler_options.py index 05322b0fa2..29d42ccd2f 100644 --- a/nova/tests/scheduler/test_scheduler_options.py +++ b/nova/tests/scheduler/test_scheduler_options.py @@ -19,7 +19,8 @@ Tests For PickledScheduler. import datetime import StringIO -from nova.openstack.common import jsonutils +from oslo.serialization import jsonutils + from nova.scheduler import scheduler_options from nova import test diff --git a/nova/tests/test_metadata.py b/nova/tests/test_metadata.py index 7bf28e1131..b0ce27b25a 100644 --- a/nova/tests/test_metadata.py +++ b/nova/tests/test_metadata.py @@ -28,6 +28,7 @@ except ImportError: import mock from oslo.config import cfg +from oslo.serialization import jsonutils import webob from nova.api.metadata import base @@ -42,7 +43,6 @@ from nova.db.sqlalchemy import api from nova import exception from nova.network import api as network_api from nova import objects -from nova.openstack.common import jsonutils from nova import test from nova.tests import fake_block_device from nova.tests import fake_instance diff --git a/nova/tests/virt/ironic/test_driver.py b/nova/tests/virt/ironic/test_driver.py index b3e9be11ed..7af43d00cb 100644 --- a/nova/tests/virt/ironic/test_driver.py +++ b/nova/tests/virt/ironic/test_driver.py @@ -18,13 +18,13 @@ from ironicclient import exc as ironic_exception import mock from oslo.config import cfg +from oslo.serialization import jsonutils from nova.compute import power_state as nova_states from nova.compute import task_states from nova import context as nova_context from nova import exception from nova import objects -from nova.openstack.common import jsonutils from nova.openstack.common import loopingcall from nova.openstack.common import uuidutils from nova import test diff --git a/nova/tests/virt/libvirt/test_driver.py b/nova/tests/virt/libvirt/test_driver.py index 0d017a4d4d..5689ffaf0a 100644 --- a/nova/tests/virt/libvirt/test_driver.py +++ b/nova/tests/virt/libvirt/test_driver.py @@ -33,6 +33,7 @@ from lxml import etree import mock import mox from oslo.config import cfg +from oslo.serialization import jsonutils from oslo.utils import importutils from oslo.utils import timeutils from oslo.utils import units @@ -52,7 +53,6 @@ from nova import exception from nova.network import model as network_model from nova import objects from nova.openstack.common import fileutils -from nova.openstack.common import jsonutils from nova.openstack.common import lockutils from nova.openstack.common import loopingcall from nova.openstack.common import processutils diff --git a/nova/tests/virt/libvirt/test_imagecache.py b/nova/tests/virt/libvirt/test_imagecache.py index 2e21d40318..37540d4449 100644 --- a/nova/tests/virt/libvirt/test_imagecache.py +++ b/nova/tests/virt/libvirt/test_imagecache.py @@ -21,11 +21,11 @@ import os import time from oslo.config import cfg +from oslo.serialization import jsonutils from oslo.utils import importutils from nova import conductor from nova import db -from nova.openstack.common import jsonutils from nova.openstack.common import log as logging from nova.openstack.common import processutils from nova import test diff --git a/nova/tests/virt/test_block_device.py b/nova/tests/virt/test_block_device.py index 6ace591f3e..a87bee0818 100644 --- a/nova/tests/virt/test_block_device.py +++ b/nova/tests/virt/test_block_device.py @@ -15,10 +15,10 @@ import contextlib import mock +from oslo.serialization import jsonutils from nova import block_device from nova import context -from nova.openstack.common import jsonutils from nova import test from nova.tests import fake_instance from nova.tests import matchers diff --git a/nova/tests/virt/test_hardware.py b/nova/tests/virt/test_hardware.py index 8767a8b163..e123fcf850 100644 --- a/nova/tests/virt/test_hardware.py +++ b/nova/tests/virt/test_hardware.py @@ -15,13 +15,13 @@ import uuid import mock +from oslo.serialization import jsonutils import six from nova import context from nova import exception from nova import objects from nova.objects import base as base_obj -from nova.openstack.common import jsonutils from nova import test from nova.tests import matchers from nova.virt import hardware as hw diff --git a/nova/tests/virt/test_virt_drivers.py b/nova/tests/virt/test_virt_drivers.py index dfc7d4bf7f..afcf5892de 100644 --- a/nova/tests/virt/test_virt_drivers.py +++ b/nova/tests/virt/test_virt_drivers.py @@ -19,6 +19,7 @@ import traceback import fixtures import mock import netaddr +from oslo.serialization import jsonutils from oslo.utils import importutils from oslo.utils import timeutils import six @@ -27,7 +28,6 @@ from nova.compute import manager from nova.console import type as ctype from nova import exception from nova import objects -from nova.openstack.common import jsonutils from nova.openstack.common import log as logging from nova import test from nova.tests import fake_block_device diff --git a/nova/tests/virt/vmwareapi/fake.py b/nova/tests/virt/vmwareapi/fake.py index cad9e7b5ef..12741941cf 100644 --- a/nova/tests/virt/vmwareapi/fake.py +++ b/nova/tests/virt/vmwareapi/fake.py @@ -22,12 +22,12 @@ A fake VMware VI API implementation. import collections import pprint +from oslo.serialization import jsonutils from oslo.utils import units from oslo.vmware import exceptions as vexc from nova import exception from nova.i18n import _ -from nova.openstack.common import jsonutils from nova.openstack.common import log as logging from nova.openstack.common import uuidutils from nova.virt.vmwareapi import constants diff --git a/nova/tests/virt/vmwareapi/test_driver_api.py b/nova/tests/virt/vmwareapi/test_driver_api.py index 75569b7555..31020d4d9c 100644 --- a/nova/tests/virt/vmwareapi/test_driver_api.py +++ b/nova/tests/virt/vmwareapi/test_driver_api.py @@ -28,6 +28,7 @@ from eventlet import greenthread import mock import mox from oslo.config import cfg +from oslo.serialization import jsonutils from oslo.utils import timeutils from oslo.utils import units from oslo.vmware import exceptions as vexc @@ -44,7 +45,6 @@ from nova import context from nova import exception from nova.image import glance from nova.network import model as network_model -from nova.openstack.common import jsonutils from nova.openstack.common import uuidutils from nova import test from nova.tests import fake_instance diff --git a/nova/tests/virt/xenapi/stubs.py b/nova/tests/virt/xenapi/stubs.py index a2225af388..4ea0301b91 100644 --- a/nova/tests/virt/xenapi/stubs.py +++ b/nova/tests/virt/xenapi/stubs.py @@ -16,7 +16,8 @@ import pickle import random -from nova.openstack.common import jsonutils +from oslo.serialization import jsonutils + from nova import test import nova.tests.image.fake from nova.virt.xenapi.client import session diff --git a/nova/tests/virt/xenapi/test_xenapi.py b/nova/tests/virt/xenapi/test_xenapi.py index c179f69043..fc51b40408 100644 --- a/nova/tests/virt/xenapi/test_xenapi.py +++ b/nova/tests/virt/xenapi/test_xenapi.py @@ -25,6 +25,7 @@ import re import mock import mox from oslo.config import cfg +from oslo.serialization import jsonutils from oslo.utils import importutils from nova.compute import api as compute_api @@ -42,7 +43,6 @@ from nova import db from nova import exception from nova import objects from nova.objects import instance as instance_obj -from nova.openstack.common import jsonutils from nova.openstack.common import log as logging from nova import test from nova.tests.db import fakes as db_fakes diff --git a/nova/virt/block_device.py b/nova/virt/block_device.py index 3b8f9e096c..bb47e975d8 100644 --- a/nova/virt/block_device.py +++ b/nova/virt/block_device.py @@ -15,6 +15,7 @@ import functools import operator +from oslo.serialization import jsonutils from oslo.utils import excutils from nova import block_device @@ -22,7 +23,6 @@ from nova.i18n import _ from nova.i18n import _LI from nova import objects from nova.objects import base as obj_base -from nova.openstack.common import jsonutils from nova.openstack.common import log as logging from nova.volume import encryptors diff --git a/nova/virt/disk/api.py b/nova/virt/disk/api.py index e2f1e1f1cb..b87f2b7d1d 100644 --- a/nova/virt/disk/api.py +++ b/nova/virt/disk/api.py @@ -31,12 +31,12 @@ if os.name != 'nt': import crypt from oslo.config import cfg +from oslo.serialization import jsonutils from nova import exception from nova.i18n import _ from nova.i18n import _LE from nova.i18n import _LW -from nova.openstack.common import jsonutils from nova.openstack.common import log as logging from nova.openstack.common import processutils from nova import utils diff --git a/nova/virt/fake.py b/nova/virt/fake.py index 57df9a73e2..0053946ccc 100644 --- a/nova/virt/fake.py +++ b/nova/virt/fake.py @@ -26,6 +26,7 @@ semantics of real hypervisor connections. import contextlib from oslo.config import cfg +from oslo.serialization import jsonutils from nova.compute import arch from nova.compute import hvtype @@ -36,7 +37,6 @@ from nova.console import type as ctype from nova import db from nova import exception from nova.i18n import _ -from nova.openstack.common import jsonutils from nova.openstack.common import log as logging from nova import utils from nova.virt import diagnostics diff --git a/nova/virt/hardware.py b/nova/virt/hardware.py index 8f2b24f179..5ea223d34b 100644 --- a/nova/virt/hardware.py +++ b/nova/virt/hardware.py @@ -15,13 +15,13 @@ import collections from oslo.config import cfg +from oslo.serialization import jsonutils import six from nova import context from nova import exception from nova.i18n import _ from nova import objects -from nova.openstack.common import jsonutils from nova.openstack.common import log as logging virt_cpu_opts = [ diff --git a/nova/virt/hyperv/hostops.py b/nova/virt/hyperv/hostops.py index 25fea545bd..250685aec3 100644 --- a/nova/virt/hyperv/hostops.py +++ b/nova/virt/hyperv/hostops.py @@ -22,12 +22,12 @@ import platform import time from oslo.config import cfg +from oslo.serialization import jsonutils from oslo.utils import units from nova.compute import arch from nova.compute import hvtype from nova.compute import vm_mode -from nova.openstack.common import jsonutils from nova.openstack.common import log as logging from nova.virt.hyperv import constants from nova.virt.hyperv import utilsfactory diff --git a/nova/virt/ironic/driver.py b/nova/virt/ironic/driver.py index 4016d7bb95..cb50b9ec92 100644 --- a/nova/virt/ironic/driver.py +++ b/nova/virt/ironic/driver.py @@ -24,6 +24,7 @@ import logging as py_logging import time from oslo.config import cfg +from oslo.serialization import jsonutils from oslo.utils import excutils from oslo.utils import importutils import six @@ -39,7 +40,6 @@ from nova.i18n import _ from nova.i18n import _LE from nova.i18n import _LW from nova import objects -from nova.openstack.common import jsonutils from nova.openstack.common import log as logging from nova.openstack.common import loopingcall from nova.virt import driver as virt_driver diff --git a/nova/virt/libvirt/driver.py b/nova/virt/libvirt/driver.py index dfc5a8dcf2..162ee176cd 100644 --- a/nova/virt/libvirt/driver.py +++ b/nova/virt/libvirt/driver.py @@ -49,6 +49,7 @@ from eventlet import tpool from eventlet import util as eventlet_util from lxml import etree from oslo.config import cfg +from oslo.serialization import jsonutils from oslo.utils import excutils from oslo.utils import importutils from oslo.utils import strutils @@ -77,7 +78,6 @@ from nova import image from nova.network import model as network_model from nova import objects from nova.openstack.common import fileutils -from nova.openstack.common import jsonutils from nova.openstack.common import log as logging from nova.openstack.common import loopingcall from nova.openstack.common import processutils diff --git a/nova/virt/libvirt/imagebackend.py b/nova/virt/libvirt/imagebackend.py index 1bba42cfbc..4d3f0da0c9 100644 --- a/nova/virt/libvirt/imagebackend.py +++ b/nova/virt/libvirt/imagebackend.py @@ -18,6 +18,7 @@ import contextlib import os from oslo.config import cfg +from oslo.serialization import jsonutils from oslo.utils import excutils from oslo.utils import units import six @@ -28,7 +29,6 @@ from nova.i18n import _LE, _LI from nova import image from nova import keymgr from nova.openstack.common import fileutils -from nova.openstack.common import jsonutils from nova.openstack.common import log as logging from nova import utils from nova.virt.disk import api as disk diff --git a/nova/virt/libvirt/imagecache.py b/nova/virt/libvirt/imagecache.py index fa8e460ded..5c09b79ce6 100644 --- a/nova/virt/libvirt/imagecache.py +++ b/nova/virt/libvirt/imagecache.py @@ -26,12 +26,12 @@ import re import time from oslo.config import cfg +from oslo.serialization import jsonutils from nova.i18n import _LE from nova.i18n import _LI from nova.i18n import _LW from nova.openstack.common import fileutils -from nova.openstack.common import jsonutils from nova.openstack.common import log as logging from nova.openstack.common import processutils from nova import utils diff --git a/nova/virt/libvirt/rbd_utils.py b/nova/virt/libvirt/rbd_utils.py index e75e06afaa..f7d49a8150 100644 --- a/nova/virt/libvirt/rbd_utils.py +++ b/nova/virt/libvirt/rbd_utils.py @@ -23,6 +23,7 @@ except ImportError: rados = None rbd = None +from oslo.serialization import jsonutils from oslo.utils import excutils from oslo.utils import units @@ -30,7 +31,6 @@ from nova import exception from nova.i18n import _ from nova.i18n import _LE from nova.i18n import _LW -from nova.openstack.common import jsonutils from nova.openstack.common import log as logging from nova import utils diff --git a/nova/virt/storage_users.py b/nova/virt/storage_users.py index edb0215f8d..e75af7d3e0 100644 --- a/nova/virt/storage_users.py +++ b/nova/virt/storage_users.py @@ -17,9 +17,9 @@ import os import time from oslo.config import cfg +from oslo.serialization import jsonutils from nova.i18n import _ -from nova.openstack.common import jsonutils from nova.openstack.common import log as logging from nova import utils diff --git a/nova/virt/vmwareapi/driver.py b/nova/virt/vmwareapi/driver.py index 6ee4bc4de0..f56eb44aa4 100644 --- a/nova/virt/vmwareapi/driver.py +++ b/nova/virt/vmwareapi/driver.py @@ -22,6 +22,7 @@ A connection to the VMware vCenter platform. import re from oslo.config import cfg +from oslo.serialization import jsonutils from oslo.vmware import api from oslo.vmware import pbm from oslo.vmware import vim @@ -30,7 +31,6 @@ import suds from nova import exception from nova.i18n import _, _LW -from nova.openstack.common import jsonutils from nova.openstack.common import log as logging from nova.openstack.common import uuidutils from nova.virt import driver diff --git a/nova/virt/xenapi/agent.py b/nova/virt/xenapi/agent.py index 9b4feb8662..bfd601d056 100644 --- a/nova/virt/xenapi/agent.py +++ b/nova/virt/xenapi/agent.py @@ -22,6 +22,7 @@ import time import uuid from oslo.config import cfg +from oslo.serialization import jsonutils from oslo.utils import strutils from nova.api.metadata import password @@ -31,7 +32,6 @@ from nova import crypto from nova import exception from nova.i18n import _ from nova import objects -from nova.openstack.common import jsonutils from nova.openstack.common import log as logging from nova import utils diff --git a/nova/virt/xenapi/driver.py b/nova/virt/xenapi/driver.py index 657f57019a..48b5b35114 100644 --- a/nova/virt/xenapi/driver.py +++ b/nova/virt/xenapi/driver.py @@ -38,11 +38,11 @@ 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 import six.moves.urllib.parse as urlparse from nova.i18n import _ -from nova.openstack.common import jsonutils from nova.openstack.common import log as logging from nova import utils from nova.virt import driver diff --git a/nova/virt/xenapi/fake.py b/nova/virt/xenapi/fake.py index 72e79d7bae..b6787da757 100644 --- a/nova/virt/xenapi/fake.py +++ b/nova/virt/xenapi/fake.py @@ -56,12 +56,12 @@ 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 nova import exception from nova.i18n import _ -from nova.openstack.common import jsonutils from nova.openstack.common import log as logging from nova.virt.xenapi.client import session as xenapi_session diff --git a/nova/virt/xenapi/firewall.py b/nova/virt/xenapi/firewall.py index 245972fa8e..d3b3756d30 100644 --- a/nova/virt/xenapi/firewall.py +++ b/nova/virt/xenapi/firewall.py @@ -15,8 +15,9 @@ # License for the specific language governing permissions and limitations # under the License. +from oslo.serialization import jsonutils + from nova import context -from nova.openstack.common import jsonutils from nova.openstack.common import log as logging from nova.virt import firewall from nova.virt import netutils diff --git a/nova/virt/xenapi/host.py b/nova/virt/xenapi/host.py index 3204d048d5..a61debbf34 100644 --- a/nova/virt/xenapi/host.py +++ b/nova/virt/xenapi/host.py @@ -20,6 +20,7 @@ Management class for host-related functions (start, reboot, etc). import re from oslo.config import cfg +from oslo.serialization import jsonutils from nova.compute import arch from nova.compute import hvtype @@ -30,7 +31,6 @@ from nova import context from nova import exception from nova.i18n import _ from nova import objects -from nova.openstack.common import jsonutils from nova.openstack.common import log as logging from nova.pci import pci_whitelist from nova.virt.xenapi import pool_states diff --git a/nova/virt/xenapi/pool.py b/nova/virt/xenapi/pool.py index 3c84e09513..3de2354789 100644 --- a/nova/virt/xenapi/pool.py +++ b/nova/virt/xenapi/pool.py @@ -18,13 +18,13 @@ Management class for Pool-related functions (join, eject, etc). """ from oslo.config import cfg +from oslo.serialization import jsonutils import six import six.moves.urllib.parse as urlparse from nova.compute import rpcapi as compute_rpcapi from nova import exception from nova.i18n import _ -from nova.openstack.common import jsonutils from nova.openstack.common import log as logging from nova.virt.xenapi import pool_states from nova.virt.xenapi import vm_utils diff --git a/nova/virt/xenapi/vmops.py b/nova/virt/xenapi/vmops.py index 6ca51d72ae..ca6271ebaa 100644 --- a/nova/virt/xenapi/vmops.py +++ b/nova/virt/xenapi/vmops.py @@ -25,6 +25,7 @@ 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 strutils @@ -43,7 +44,6 @@ from nova import context as nova_context from nova import exception from nova.i18n import _ from nova import objects -from nova.openstack.common import jsonutils from nova.openstack.common import log as logging from nova.pci import pci_manager from nova import utils diff --git a/openstack-common.conf b/openstack-common.conf index b977f7c15a..59ea8f5d01 100644 --- a/openstack-common.conf +++ b/openstack-common.conf @@ -10,7 +10,6 @@ module=fixture module=gettextutils module=imageutils module=install_venv_common -module=jsonutils module=local module=lockutils module=log