From db053e705b9f125b5acc772922fabdf79314bce7 Mon Sep 17 00:00:00 2001 From: Angus Lees Date: Fri, 1 Aug 2014 19:45:41 +1000 Subject: [PATCH] Remove ignored do_request timeout argument The timeout to the underlying request was always self._request_timeout, regardless of the value of the do_request(timeout) arg provided. Both callers always pass timeout=self._request_timeout anyway, so just remove this unused/misleading argument. Change-Id: I911ee986caef8fcf9b97ef622a03856d4351bee0 --- .../oneconvergence/lib/plugin_helper.py | 9 +++------ .../unit/oneconvergence/test_plugin_helper.py | 18 +++++++++--------- 2 files changed, 12 insertions(+), 15 deletions(-) diff --git a/neutron/plugins/oneconvergence/lib/plugin_helper.py b/neutron/plugins/oneconvergence/lib/plugin_helper.py index 4158257fd..e12a3bdee 100644 --- a/neutron/plugins/oneconvergence/lib/plugin_helper.py +++ b/neutron/plugins/oneconvergence/lib/plugin_helper.py @@ -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}) diff --git a/neutron/tests/unit/oneconvergence/test_plugin_helper.py b/neutron/tests/unit/oneconvergence/test_plugin_helper.py index 21031a79c..ffff9fc0c 100644 --- a/neutron/tests/unit/oneconvergence/test_plugin_helper.py +++ b/neutron/tests/unit/oneconvergence/test_plugin_helper.py @@ -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='', -- 2.45.2