ae957b176e
This replaces the restapi requests wrapper with the one from Keystone client so we can take advantage of the auth plugins. As a first step only the v2 and v3 token and password plugins are supported. This maintainis no changes to the command options or environment variables. The next steps will include reworking the other API client interfaces to fully utilize the single auth session. Blueprint: ksc-session-auth Change-Id: I47ec63291e4c3cf36c8061299a4764f60b36ab89
135 lines
3.5 KiB
Python
135 lines
3.5 KiB
Python
# Copyright 2012-2013 OpenStack Foundation
|
|
#
|
|
# 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 mock
|
|
|
|
from keystoneclient.auth.identity import v2 as auth_v2
|
|
from openstackclient.common import clientmanager
|
|
from openstackclient.tests import utils
|
|
|
|
|
|
AUTH_REF = {'a': 1}
|
|
AUTH_TOKEN = "foobar"
|
|
AUTH_URL = "http://0.0.0.0"
|
|
USERNAME = "itchy"
|
|
PASSWORD = "scratchy"
|
|
SERVICE_CATALOG = {'sc': '123'}
|
|
|
|
API_VERSION = {
|
|
'identity': '2.0',
|
|
}
|
|
|
|
|
|
def FakeMakeClient(instance):
|
|
return FakeClient()
|
|
|
|
|
|
class FakeClient(object):
|
|
auth_ref = AUTH_REF
|
|
auth_token = AUTH_TOKEN
|
|
service_catalog = SERVICE_CATALOG
|
|
|
|
|
|
class Container(object):
|
|
attr = clientmanager.ClientCache(lambda x: object())
|
|
|
|
def __init__(self):
|
|
pass
|
|
|
|
|
|
class TestClientCache(utils.TestCase):
|
|
|
|
def test_singleton(self):
|
|
# NOTE(dtroyer): Verify that the ClientCache descriptor only invokes
|
|
# the factory one time and always returns the same value after that.
|
|
c = Container()
|
|
self.assertEqual(c.attr, c.attr)
|
|
|
|
|
|
@mock.patch('keystoneclient.session.Session')
|
|
class TestClientManager(utils.TestCase):
|
|
def setUp(self):
|
|
super(TestClientManager, self).setUp()
|
|
|
|
clientmanager.ClientManager.identity = \
|
|
clientmanager.ClientCache(FakeMakeClient)
|
|
|
|
def test_client_manager_token(self, mock):
|
|
|
|
client_manager = clientmanager.ClientManager(
|
|
token=AUTH_TOKEN,
|
|
url=AUTH_URL,
|
|
verify=True,
|
|
api_version=API_VERSION,
|
|
)
|
|
|
|
self.assertEqual(
|
|
AUTH_TOKEN,
|
|
client_manager._token,
|
|
)
|
|
self.assertEqual(
|
|
AUTH_URL,
|
|
client_manager._url,
|
|
)
|
|
self.assertIsInstance(
|
|
client_manager.auth,
|
|
auth_v2.Token,
|
|
)
|
|
self.assertFalse(client_manager._insecure)
|
|
self.assertTrue(client_manager._verify)
|
|
|
|
def test_client_manager_password(self, mock):
|
|
|
|
client_manager = clientmanager.ClientManager(
|
|
auth_url=AUTH_URL,
|
|
username=USERNAME,
|
|
password=PASSWORD,
|
|
verify=False,
|
|
api_version=API_VERSION,
|
|
)
|
|
|
|
self.assertEqual(
|
|
AUTH_URL,
|
|
client_manager._auth_url,
|
|
)
|
|
self.assertEqual(
|
|
USERNAME,
|
|
client_manager._username,
|
|
)
|
|
self.assertEqual(
|
|
PASSWORD,
|
|
client_manager._password,
|
|
)
|
|
self.assertIsInstance(
|
|
client_manager.auth,
|
|
auth_v2.Password,
|
|
)
|
|
self.assertTrue(client_manager._insecure)
|
|
self.assertFalse(client_manager._verify)
|
|
|
|
def test_client_manager_password_verify_ca(self, mock):
|
|
|
|
client_manager = clientmanager.ClientManager(
|
|
auth_url=AUTH_URL,
|
|
username=USERNAME,
|
|
password=PASSWORD,
|
|
verify='cafile',
|
|
api_version=API_VERSION,
|
|
)
|
|
|
|
self.assertFalse(client_manager._insecure)
|
|
self.assertTrue(client_manager._verify)
|
|
self.assertEqual('cafile', client_manager._cacert)
|