86a56d3cfd
Currently HTTPClient class sets the 'force_exception_to_status_code'
instance variable to True. This actually leads to the next problem:
there is no way to distinguish between errors which have the same
status code. E. g. both SSL handshake error and a general Bad Request
error have status code 400, and the only way to distinguish between them
is to analyze the error message content, that is both error-prone and ugly.
The proposed solution:
- leaves the 'force_exception_to_status_code' set to False
- adds a try/except wrapper for the request() call to handle
httplib2 exceptions (e. g. host not found, socket timeout, etc)
Blueprint: quantum-client-ssl
Change-Id: Ib168fadc67568d5d6247f7addbe731e8832a39de
65 lines
1.9 KiB
Python
65 lines
1.9 KiB
Python
# Copyright (C) 2013 OpenStack Foundation.
|
|
# All Rights Reserved.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
# vim: tabstop=4 shiftwidth=4 softtabstop=4
|
|
|
|
import httplib2
|
|
import mox
|
|
import testtools
|
|
|
|
from neutronclient.client import HTTPClient
|
|
from neutronclient.common import exceptions
|
|
from tests.unit.test_cli20 import MyResp
|
|
|
|
|
|
AUTH_TOKEN = 'test_token'
|
|
END_URL = 'test_url'
|
|
METHOD = 'GET'
|
|
URL = 'http://test.test:1234/v2.0/test'
|
|
|
|
|
|
class TestHTTPClient(testtools.TestCase):
|
|
def setUp(self):
|
|
super(TestHTTPClient, self).setUp()
|
|
|
|
self.mox = mox.Mox()
|
|
self.mox.StubOutWithMock(httplib2.Http, 'request')
|
|
self.addCleanup(self.mox.UnsetStubs)
|
|
|
|
self.http = HTTPClient(token=AUTH_TOKEN, endpoint_url=END_URL)
|
|
|
|
def test_request_error(self):
|
|
httplib2.Http.request(
|
|
URL, METHOD, headers=mox.IgnoreArg()
|
|
).AndRaise(Exception('error msg'))
|
|
self.mox.ReplayAll()
|
|
|
|
self.assertRaises(
|
|
exceptions.ConnectionFailed,
|
|
self.http._cs_request,
|
|
URL, METHOD
|
|
)
|
|
self.mox.VerifyAll()
|
|
|
|
def test_request_success(self):
|
|
rv_should_be = MyResp(200), 'test content'
|
|
|
|
httplib2.Http.request(
|
|
URL, METHOD, headers=mox.IgnoreArg()
|
|
).AndReturn(rv_should_be)
|
|
self.mox.ReplayAll()
|
|
|
|
self.assertEqual(rv_should_be, self.http._cs_request(URL, METHOD))
|
|
self.mox.VerifyAll()
|