65883ba4eb
This patch adds a new option (-r | --retries) to specify how many times the client should attempt to connect to the Neutron server when using idempotent methods (GET, PUT and DELETE). The patch also provides more user-friendly message when it's impossible to connect to Neutron server from CLI and ensures that connection-related exceptions are raised to the caller by default when neutronclient is used as a library. DocImpact Closes-Bug: #1312225 Change-Id: Id74d7cf9a0e8c5d2cd3ee4851c883d5286bea19d
151 lines
5.2 KiB
Python
151 lines
5.2 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.
|
|
|
|
import fixtures
|
|
from mox3 import mox
|
|
import requests
|
|
import testtools
|
|
|
|
from neutronclient.client import HTTPClient
|
|
from neutronclient.common.clientmanager import ClientManager
|
|
from neutronclient.common import exceptions
|
|
from neutronclient import shell as openstack_shell
|
|
|
|
|
|
AUTH_TOKEN = 'test_token'
|
|
END_URL = 'test_url'
|
|
METHOD = 'GET'
|
|
URL = 'http://test.test:1234/v2.0/'
|
|
CA_CERT = '/tmp/test/path'
|
|
|
|
|
|
class TestSSL(testtools.TestCase):
|
|
def setUp(self):
|
|
super(TestSSL, self).setUp()
|
|
|
|
self.useFixture(fixtures.EnvironmentVariable('OS_TOKEN', AUTH_TOKEN))
|
|
self.useFixture(fixtures.EnvironmentVariable('OS_URL', END_URL))
|
|
|
|
self.mox = mox.Mox()
|
|
self.addCleanup(self.mox.UnsetStubs)
|
|
|
|
def test_ca_cert_passed(self):
|
|
self.mox.StubOutWithMock(ClientManager, '__init__')
|
|
self.mox.StubOutWithMock(openstack_shell.NeutronShell, 'interact')
|
|
|
|
ClientManager.__init__(
|
|
ca_cert=CA_CERT,
|
|
# we are not really interested in other args
|
|
api_version=mox.IgnoreArg(),
|
|
auth_strategy=mox.IgnoreArg(),
|
|
auth_url=mox.IgnoreArg(),
|
|
service_type=mox.IgnoreArg(),
|
|
endpoint_type=mox.IgnoreArg(),
|
|
insecure=mox.IgnoreArg(),
|
|
password=mox.IgnoreArg(),
|
|
region_name=mox.IgnoreArg(),
|
|
tenant_id=mox.IgnoreArg(),
|
|
tenant_name=mox.IgnoreArg(),
|
|
token=mox.IgnoreArg(),
|
|
url=mox.IgnoreArg(),
|
|
username=mox.IgnoreArg(),
|
|
user_id=mox.IgnoreArg(),
|
|
retries=mox.IgnoreArg(),
|
|
raise_errors=mox.IgnoreArg(),
|
|
log_credentials=mox.IgnoreArg(),
|
|
timeout=mox.IgnoreArg(),
|
|
)
|
|
openstack_shell.NeutronShell.interact().AndReturn(0)
|
|
self.mox.ReplayAll()
|
|
|
|
openstack_shell.NeutronShell('2.0').run(['--os-cacert', CA_CERT])
|
|
self.mox.VerifyAll()
|
|
|
|
def test_ca_cert_passed_as_env_var(self):
|
|
self.useFixture(fixtures.EnvironmentVariable('OS_CACERT', CA_CERT))
|
|
|
|
self.mox.StubOutWithMock(ClientManager, '__init__')
|
|
self.mox.StubOutWithMock(openstack_shell.NeutronShell, 'interact')
|
|
|
|
ClientManager.__init__(
|
|
ca_cert=CA_CERT,
|
|
# we are not really interested in other args
|
|
api_version=mox.IgnoreArg(),
|
|
auth_strategy=mox.IgnoreArg(),
|
|
auth_url=mox.IgnoreArg(),
|
|
service_type=mox.IgnoreArg(),
|
|
endpoint_type=mox.IgnoreArg(),
|
|
insecure=mox.IgnoreArg(),
|
|
password=mox.IgnoreArg(),
|
|
region_name=mox.IgnoreArg(),
|
|
tenant_id=mox.IgnoreArg(),
|
|
tenant_name=mox.IgnoreArg(),
|
|
token=mox.IgnoreArg(),
|
|
url=mox.IgnoreArg(),
|
|
username=mox.IgnoreArg(),
|
|
user_id=mox.IgnoreArg(),
|
|
retries=mox.IgnoreArg(),
|
|
raise_errors=mox.IgnoreArg(),
|
|
log_credentials=mox.IgnoreArg(),
|
|
timeout=mox.IgnoreArg(),
|
|
)
|
|
openstack_shell.NeutronShell.interact().AndReturn(0)
|
|
self.mox.ReplayAll()
|
|
|
|
openstack_shell.NeutronShell('2.0').run([])
|
|
self.mox.VerifyAll()
|
|
|
|
def test_client_manager_properly_creates_httpclient_instance(self):
|
|
self.mox.StubOutWithMock(HTTPClient, '__init__')
|
|
HTTPClient.__init__(
|
|
ca_cert=CA_CERT,
|
|
# we are not really interested in other args
|
|
auth_strategy=mox.IgnoreArg(),
|
|
auth_url=mox.IgnoreArg(),
|
|
endpoint_url=mox.IgnoreArg(),
|
|
insecure=mox.IgnoreArg(),
|
|
password=mox.IgnoreArg(),
|
|
region_name=mox.IgnoreArg(),
|
|
tenant_name=mox.IgnoreArg(),
|
|
token=mox.IgnoreArg(),
|
|
username=mox.IgnoreArg(),
|
|
retries=mox.IgnoreArg(),
|
|
raise_errors=mox.IgnoreArg(),
|
|
)
|
|
self.mox.ReplayAll()
|
|
|
|
version = {'network': '2.0'}
|
|
ClientManager(ca_cert=CA_CERT,
|
|
api_version=version,
|
|
url=END_URL,
|
|
token=AUTH_TOKEN).neutron
|
|
self.mox.VerifyAll()
|
|
|
|
def test_proper_exception_is_raised_when_cert_validation_fails(self):
|
|
http = HTTPClient(token=AUTH_TOKEN, endpoint_url=END_URL)
|
|
|
|
self.mox.StubOutWithMock(HTTPClient, 'request')
|
|
HTTPClient.request(
|
|
URL, METHOD, headers=mox.IgnoreArg()
|
|
).AndRaise(requests.exceptions.SSLError)
|
|
self.mox.ReplayAll()
|
|
|
|
self.assertRaises(
|
|
exceptions.SslCertificateValidationError,
|
|
http._cs_request,
|
|
URL, METHOD
|
|
)
|
|
self.mox.VerifyAll()
|