Merge "Add a jsonutils file in order to manager imports"

src/api-lib/vnc_api.py

@@ -7,7 +7,7 @@
 
 import ConfigParser
 import pprint
-import json
+from cfgm_common import jsonutils as json
 import sys
 import time
 import platform

src/config/api-server/db_manage.py

@@ -4,7 +4,7 @@
 import socket
 import re
 import logging
-import json
+from cfgm_common import jsonutils as json
 from netaddr import IPAddress, IPNetwork
 import argparse
 from cStringIO import StringIO

src/config/api-server/vnc_addr_mgmt.py

@@ -6,7 +6,7 @@
 from netaddr import *
 from vnc_quota import *
 from pprint import pformat
-import json
+from cfgm_common import jsonutils as json
 import cfgm_common.exceptions
 try:
     #python2.7

src/config/api-server/vnc_cfg_api_server.py

@@ -23,7 +23,7 @@
 import signal
 import os
 import socket
-import json
+from cfgm_common import jsonutils as json
 import uuid
 import copy
 import argparse

src/config/api-server/vnc_cfg_ifmap.py

@@ -37,7 +37,7 @@
 from cfgm_common.vnc_kombu import VncKombuClient
 
 import copy
-import json
+from cfgm_common import jsonutils as json
 import uuid
 import datetime
 import pycassa

src/config/api-server/vnc_cfg_types.py

@@ -7,7 +7,7 @@
 # to type of resource. For eg. allocation of mac/ip-addr for a port during its
 # creation.
 
-import json
+from cfgm_common import jsonutils as json
 import re
 
 import cfgm_common

src/config/api-server/vnc_perms.py

@@ -2,7 +2,7 @@
 # Copyright (c) 2013 Juniper Networks, Inc. All rights reserved.
 #
 import sys
-import json
+from cfgm_common import jsonutils as json
 import string
 from provision_defaults import *
 from cfgm_common.exceptions import *

src/config/common/SConscript

@@ -24,6 +24,7 @@ local_sources = [
                   'zkclient.py',
                   'exceptions.py',
                   'utils.py',
+                  'jsonutils.py',
                   'imid.py',
                   'svc_info.py',
                   'vnc_cpu_info.py',

src/config/common/jsonutils.py

@@ -0,0 +1,22 @@
+# always try to load simplejson first 
+# as we get better performance
+try:
+    import simplejson as json
+except ImportError:
+    import json
+
+
+def load(fp, **kwargs):
+    return json.load(fp, *args, **kwargs)
+
+
+def loads(s, *args, **kwargs):
+    return json.loads(s, *args, **kwargs)
+
+
+def dump(obj, fp, *args, **kwargs):
+    return json.dump(obj, fp, *args, **kwargs)
+
+
+def dumps(obj, *args, **kwargs):
+    return json.dumps(obj, *args, **kwargs)

src/config/common/vnc_cassandra.py

@@ -15,7 +15,7 @@
     ConnectionType
 from pysandesh.gen_py.sandesh.ttypes import SandeshLevel
 import time
-import json
+from cfgm_common import jsonutils as json
 import utils
 
 class VncCassandraClient(VncCassandraClientGen):

src/config/svc-monitor/svc_monitor/db.py

@@ -11,7 +11,7 @@
 from pysandesh.gen_py.process_info.ttypes import ConnectionStatus
 
 import inspect
-import json
+from cfgm_common import jsonutils as json
 import time
 
 

src/config/vnc_openstack/vnc_openstack/__init__.py

@@ -3,7 +3,7 @@
 #
 
 import sys
-import json
+from cfgm_common import jsonutils as json
 import uuid
 import gevent
 import gevent.monkey

src/config/vnc_openstack/vnc_openstack/neutron_plugin_db.py

@@ -8,7 +8,7 @@
 import requests
 import re
 import uuid
-import json
+from cfgm_common import jsonutils as json
 import time
 import socket
 import netaddr

src/config/vnc_openstack/vnc_openstack/neutron_plugin_interface.py

@@ -5,7 +5,7 @@
 import bottle
 import cgitb
 import gevent
-import json
+from cfgm_common import jsonutils as json
 import logging
 from pprint import pformat
 import requests

src/discovery/client.py

@@ -13,7 +13,7 @@
 
 import requests
 import uuid
-import json
+from cfgm_common import jsonutils as json
 import hashlib
 import socket
 from disc_utils import *

src/discovery/disc_cassdb.py

@@ -3,7 +3,7 @@
 #
 
 import re
-import json
+from cfgm_common import jsonutils as json
 import time
 import gevent
 import disc_consts

src/discovery/disc_server.py

@@ -19,7 +19,7 @@
 import signal
 import os
 import socket
-import json
+from cfgm_common import jsonutils as json
 import xmltodict
 import uuid
 import copy

src/discovery/disc_server_zk.py

@@ -19,7 +19,7 @@
 import signal
 import os
 import socket
-import json
+from cfgm_common import jsonutils as json
 import xmltodict
 import uuid
 import copy

src/discovery/disc_zk.py

@@ -11,7 +11,7 @@
 import kazoo.recipe.election
 
 import logging
-import json
+from cfgm_common import jsonutils as json
 import time
 import disc_consts