Merge "Replace 'import json' with oslo_serialization"

bin/neutron-rootwrap-xen-dom0

@@ -24,7 +24,8 @@ responsible determining whether a command is safe to execute.
 from __future__ import print_function
 
 from six.moves import configparser as ConfigParser
-import json
+from oslo_serialization import jsonutils as json
+
 import os
 import select
 import sys

neutron/tests/tempest/common/glance_http.py

@@ -17,7 +17,6 @@
 
 import copy
 import hashlib
-import json
 import posixpath
 import re
 import socket
@@ -28,6 +27,7 @@ import urlparse
 
 import OpenSSL
 from oslo_log import log as logging
+from oslo_serialization import jsonutils as json
 from six import moves
 from six.moves import http_client as httplib
 from tempest_lib import exceptions as lib_exc

neutron/tests/tempest/services/identity/v2/json/identity_client.py

@@ -10,7 +10,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import json
+from oslo_serialization import jsonutils as json
 from tempest_lib import exceptions as lib_exc
 
 from neutron.tests.tempest.common import service_client

neutron/tests/tempest/services/identity/v2/json/token_client.py

@@ -12,7 +12,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import json
+from oslo_serialization import jsonutils as json
 from tempest_lib.common import rest_client
 from tempest_lib import exceptions as lib_exc
 

neutron/tests/tempest/services/identity/v3/json/credentials_client.py

@@ -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 neutron.tests.tempest.common import service_client
 

neutron/tests/tempest/services/identity/v3/json/endpoints_client.py

@@ -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 neutron.tests.tempest.common import service_client
 

neutron/tests/tempest/services/identity/v3/json/identity_client.py

@@ -13,8 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import json
-
+from oslo_serialization import jsonutils as json
 from six.moves.urllib import parse
 
 from neutron.tests.tempest.common import service_client

neutron/tests/tempest/services/identity/v3/json/policy_client.py

@@ -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 neutron.tests.tempest.common import service_client
 

neutron/tests/tempest/services/identity/v3/json/region_client.py

@@ -13,8 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import json
-
+from oslo_serialization import jsonutils as json
 from six.moves.urllib import parse
 
 from neutron.tests.tempest.common import service_client

neutron/tests/tempest/services/identity/v3/json/service_client.py

@@ -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 neutron.tests.tempest.common import service_client
 

neutron/tests/tempest/services/identity/v3/json/token_client.py

@@ -12,7 +12,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import json
+from oslo_serialization import jsonutils as json
 from tempest_lib.common import rest_client
 from tempest_lib import exceptions as lib_exc
 

neutron/tests/tempest/services/network/json/network_client.py

@@ -10,9 +10,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import json
 import time
 
+from oslo_serialization import jsonutils as json
 from six.moves.urllib import parse
 from tempest_lib.common.utils import misc
 from tempest_lib import exceptions as lib_exc

neutron/tests/tempest/test.py

@@ -15,7 +15,6 @@
 
 import atexit
 import functools
-import json
 import os
 import re
 import sys
@@ -24,6 +23,7 @@ import uuid
 
 import fixtures
 from oslo_log import log as logging
+from oslo_serialization import jsonutils as json
 from oslo_utils import importutils
 import six
 from six.moves.urllib import parse