Merge "Use jsonutils instead of stdlib json"

diff --cc neutron/plugins/oneconvergence/lib/plugin_helper.py
Simple merge

diff --cc neutron/tests/unit/oneconvergence/test_plugin_helper.py
index ffff9fc0cdcff027dc1439f28287b4425352bcbe,d35b79896c94ce5ced0a63a9463d62fdcaf8b2c4..d513591d15aa37c04c063f78a9b1bc2948d5edc7
--- 1/neutron/tests/unit/oneconvergence/test_plugin_helper.py
--- 2/neutron/tests/unit/oneconvergence/test_plugin_helper.py
+++ b/neutron/tests/unit/oneconvergence/test_plugin_helper.py
@@@ -37,23 -37,23 +37,23 @@@ class TestPluginHelper(base.BaseTestCas
          login_url = ('http://127.0.0.1:8082/pluginhandler/ocplugin/'
                       'authmgmt/login')
          headers = {'Content-Type': 'application/json'}
-         data = json.dumps({"user_name": "ocplugin", "passwd": "oc123"})
+         data = jsonutils.dumps({"user_name": "ocplugin", "passwd": "oc123"})
          timeout = 30.0
  
 -        with mock.patch.object(self.nvsdcontroller, 'do_request',
 -                               side_effect=self.get_response) as do_request:
 +        with mock.patch.object(self.nvsdcontroller.pool, 'request',
 +                               side_effect=self.get_response) as request:
              self.nvsdcontroller.login()
 -            do_request.assert_called_once_with('POST', url=login_url,
 -                                               headers=headers, data=data,
 -                                               timeout=timeout)
 +            request.assert_called_once_with('POST', url=login_url,
 +                                            headers=headers, data=data,
 +                                            timeout=timeout)
  
      def test_request(self):
 -        with mock.patch.object(self.nvsdcontroller, 'do_request',
 -                               side_effect=self.get_response) as do_request:
 +        with mock.patch.object(self.nvsdcontroller.pool, 'request',
 +                               side_effect=self.get_response) as request:
              self.nvsdcontroller.login()
              self.nvsdcontroller.request("POST", "/some_url")
 -            self.assertEqual(do_request.call_count, 2)
 -            do_request.assert_called_with(
 +            self.assertEqual(request.call_count, 2)
 +            request.assert_called_with(
                  'POST',
                  url='http://127.0.0.1:8082/some_url?authToken=new_auth_token',
                  headers={'Content-Type': 'application/json'}, data='',