openstack
/
neutron
Code Issues Proposed changes

Merge "Consistently use jsonutils instead of specific implementation"

This commit is contained in:
Jenkins 2014-06-21 00:20:07 +00:00 committed by Gerrit Code Review
parent d19df7eb0a de1ebcdf40
commit 7e6a53eaf8
15 changed files with 16 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
neutron/plugins/bigswitch/servermanager.py
View File

@ -33,7 +33,6 @@ The following functionality is handled by this module:
"""
import base64
import httplib
import json
import os
import socket
import ssl
@ -44,6 +43,7 @@ from oslo.config import cfg
from neutron.common import exceptions
from neutron.common import utils
from neutron.openstack.common import excutils
from neutron.openstack.common import jsonutils as json
from neutron.openstack.common import log as logging
from neutron.plugins.bigswitch.db import consistency_db as cdb

3
neutron/plugins/bigswitch/tests/test_server.py
View File

@ -24,12 +24,13 @@ Used for NeutronRestProxy tests
"""
from __future__ import print_function
import json
import re
from six import moves
from wsgiref import simple_server
from neutron.openstack.common import jsonutils as json
class TestNetworkCtrl(object):

2
neutron/plugins/nec/common/ofc_client.py
View File

@ -15,12 +15,12 @@
# under the License.
# @author: Ryota MIBU
import json
import time
import requests
from neutron.openstack.common import excutils
from neutron.openstack.common import jsonutils as json
from neutron.openstack.common import log as logging
from neutron.plugins.nec.common import config
from neutron.plugins.nec.common import exceptions as nexc

2
neutron/plugins/vmware/api_client/eventlet_request.py
View File

@ -16,9 +16,9 @@
import eventlet
import httplib
import json
import urllib
from neutron.openstack.common import jsonutils as json
from neutron.openstack.common import log as logging
from neutron.plugins.vmware.api_client import request

3
neutron/plugins/vmware/nsxlib/__init__.py
View File

@ -13,9 +13,8 @@
# License for the specific language governing permissions and limitations
# under the License.
import json
from neutron.common import exceptions as exception
from neutron.openstack.common import jsonutils as json
from neutron.openstack.common import log
from neutron.plugins.vmware.api_client import exception as api_exc
from neutron.plugins.vmware.common import exceptions as nsx_exc

3
neutron/plugins/vmware/nsxlib/l2gateway.py
View File

@ -14,8 +14,7 @@
# under the License.
#
import json
from neutron.openstack.common import jsonutils as json
from neutron.openstack.common import log
from neutron.plugins.vmware.api_client import exception as api_exc
from neutron.plugins.vmware.common import exceptions as nsx_exc

3
neutron/plugins/vmware/nsxlib/lsn.py
View File

@ -15,9 +15,8 @@
# License for the specific language governing permissions and limitations
# under the License.
import json
from neutron.common import exceptions as exception
from neutron.openstack.common import jsonutils as json
from neutron.openstack.common import log
from neutron.plugins.vmware.api_client import exception as api_exc
from neutron.plugins.vmware.common import exceptions as nsx_exc

3
neutron/plugins/vmware/nsxlib/secgroup.py
View File

@ -13,11 +13,10 @@
# License for the specific language governing permissions and limitations
# under the License.
import json
from neutron.common import constants
from neutron.common import exceptions
from neutron.openstack.common import excutils
from neutron.openstack.common import jsonutils as json
from neutron.openstack.common import log
from neutron.plugins.vmware.common import utils
from neutron.plugins.vmware import nsxlib

3
neutron/plugins/vmware/nsxlib/switch.py
View File

@ -14,12 +14,11 @@
# under the License.
#
import json
from oslo.config import cfg
from neutron.common import constants
from neutron.common import exceptions as exception
from neutron.openstack.common import jsonutils as json
from neutron.openstack.common import log
from neutron.plugins.vmware.api_client import exception as api_exc
from neutron.plugins.vmware.common import exceptions as nsx_exc

3
neutron/tests/unit/bigswitch/fake_server.py
View File

@ -17,8 +17,7 @@
# @author: Kevin Benton, <kevin.benton@bigswitch.com>
#
import json
from neutron.openstack.common import jsonutils as json
from neutron.openstack.common import log as logging
from neutron.plugins.bigswitch import servermanager

3
neutron/tests/unit/nec/test_ofc_client.py
View File

@ -16,12 +16,11 @@
#
# @author: Akihiro Motoki
import json
import mock
from oslo.config import cfg
import requests
from neutron.openstack.common import jsonutils as json
from neutron.plugins.nec.common import config
from neutron.plugins.nec.common import exceptions as nexc
from neutron.plugins.nec.common import ofc_client

2
neutron/tests/unit/test_policy.py
View File

@ -15,7 +15,6 @@
"""Test of Policy Engine For Neutron"""
import json
import urllib2
import fixtures
@ -28,6 +27,7 @@ from neutron.common import exceptions
from neutron import context
from neutron import manager
from neutron.openstack.common import importutils
from neutron.openstack.common import jsonutils as json
from neutron.openstack.common import policy as common_policy
from neutron import policy
from neutron.tests import base

3
neutron/tests/unit/vmware/apiclient/fake.py
View File

@ -12,10 +12,9 @@
# License for the specific language governing permissions and limitations
# under the License.
import json
import six.moves.urllib.parse as urlparse
from neutron.openstack.common import jsonutils as json
from neutron.openstack.common import log as logging
from neutron.openstack.common import uuidutils
from neutron.plugins.vmware.api_client import exception as api_exc

2
neutron/tests/unit/vmware/nsxlib/test_lsn.py
View File

@ -13,10 +13,10 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import json
import mock
from neutron.common import exceptions
from neutron.openstack.common import jsonutils as json
from neutron.plugins.vmware.api_client import exception as api_exc
from neutron.plugins.vmware.common import exceptions as nsx_exc
from neutron.plugins.vmware.common import utils

2
neutron/tests/unit/vmware/vshield/fake_vcns.py
View File

@ -13,8 +13,8 @@
# under the License.
import copy
import json
from neutron.openstack.common import jsonutils as json
from neutron.openstack.common import uuidutils
from neutron.plugins.vmware.vshield.common import exceptions