openstack
/
neutron
Code Issues Proposed changes

Merge "Remove ignored do_request timeout argument"

This commit is contained in:
Jenkins 2014-08-14 03:50:17 +00:00 committed by Gerrit Code Review
parent e10ebc260c db053e705b
commit 7d94a40d9d
2 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
neutron/plugins/oneconvergence/lib/plugin_helper.py
View File

@ -53,8 +53,7 @@ class NVSDController(object):
self.auth_token = None
def do_request(self, method, url=None, headers=None, data=None,
timeout=10):
def do_request(self, method, url=None, headers=None, data=None):
response = self.pool.request(method, url=url,
headers=headers, data=data,
timeout=self._request_timeout)
@ -84,8 +83,7 @@ class NVSDController(object):
raise exception.ServerException(reason=msg)
try:
response = self.do_request("POST", url=login_url,
headers=headers, data=data,
timeout=self._request_timeout)
headers=headers, data=data)
break
except Exception as e:
LOG.error(_("Login Failed: %s"), e)
@ -123,8 +121,7 @@ class NVSDController(object):
try:
response = self.do_request(method, url=url,
headers=headers, data=body,
timeout=self._request_timeout)
headers=headers, data=body)
LOG.debug(_("request: %(method)s %(uri)s successful"),
{'method': method, 'uri': self.api_url + uri})

18
neutron/tests/unit/oneconvergence/test_plugin_helper.py
View File

@ -40,20 +40,20 @@ class TestPluginHelper(base.BaseTestCase):
data = json.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='',