Merge "Update json module to jsonutils"
This commit is contained in:
commit
31db1f6f39
|
@ -12,9 +12,8 @@
|
|||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
import json
|
||||
|
||||
from oslo_log import log as logging
|
||||
from oslo_serialization import jsonutils as json
|
||||
|
||||
from tempest.api.compute import base
|
||||
from tempest.common import utils
|
||||
|
|
|
@ -78,11 +78,11 @@ Output file JSON structure
|
|||
import argparse
|
||||
import collections
|
||||
import io
|
||||
import json
|
||||
import os
|
||||
import re
|
||||
import sys
|
||||
|
||||
from oslo_serialization import jsonutils as json
|
||||
import subunit
|
||||
import testtools
|
||||
|
||||
|
|
|
@ -13,7 +13,7 @@
|
|||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
import json
|
||||
from oslo_serialization import jsonutils as json
|
||||
|
||||
from tempest.common import utils
|
||||
from tempest.common import waiters
|
||||
|
|
|
@ -11,7 +11,7 @@
|
|||
# under the License.
|
||||
|
||||
from oslo_log import log as logging
|
||||
from oslo_serialization import jsonutils
|
||||
from oslo_serialization import jsonutils as json
|
||||
import testtools
|
||||
|
||||
from tempest.common import utils
|
||||
|
@ -265,7 +265,7 @@ class TestVolumeBootPattern(manager.EncryptionScenarioTest):
|
|||
bdms = image.get('block_device_mapping')
|
||||
if not bdms:
|
||||
bdms = image['properties']['block_device_mapping']
|
||||
bdms = jsonutils.loads(bdms)
|
||||
bdms = json.loads(bdms)
|
||||
snapshot_id = bdms[0]['snapshot_id']
|
||||
self._delete_snapshot(snapshot_id)
|
||||
|
||||
|
|
|
@ -13,10 +13,10 @@
|
|||
# under the License.
|
||||
|
||||
import copy
|
||||
import json
|
||||
|
||||
import fixtures
|
||||
import jsonschema
|
||||
from oslo_serialization import jsonutils as json
|
||||
import six
|
||||
|
||||
from tempest.lib.common import http
|
||||
|
|
|
@ -12,9 +12,8 @@
|
|||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
import json
|
||||
|
||||
import mock
|
||||
from oslo_serialization import jsonutils as json
|
||||
|
||||
from tempest.lib.common import rest_client
|
||||
from tempest.lib import exceptions
|
||||
|
|
|
@ -12,9 +12,8 @@
|
|||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
import json
|
||||
|
||||
import mock
|
||||
from oslo_serialization import jsonutils as json
|
||||
|
||||
from tempest.lib.common import rest_client
|
||||
from tempest.lib import exceptions
|
||||
|
|
Loading…
Reference in New Issue