2eed8ea24a
keystoneauth1 is the new auth-only library for getting keystone Sessions, which is lighter-weight and does not require the entire keystoneclient library. It also handles all of the keystone version discover and plugin selection so that code doesn't have to live in neutronclient. Additionally, use os-client-config to process options and get the Session from keystoneauth1. This adds support for reading clouds.yaml files and supporting the OS_CLOUD env var for selecting named clouds from a list of them. This is a step towards bug#1503428 but is not the whole picture. Remove the auth tests - since they are covered inside of ksa. Closes-Bug: #1507384 Change-Id: Ic4f9fd8f231c33513fd74da58ab1b4a3fb00d9f4
101 lines
3.4 KiB
Python
101 lines
3.4 KiB
Python
# 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 uuid
|
|
|
|
from keystoneauth1 import plugin as ksa_plugin
|
|
from keystoneauth1 import session
|
|
from tempest_lib import base
|
|
import testtools
|
|
|
|
from neutronclient.common import exceptions
|
|
from neutronclient.tests.functional import base as func_base
|
|
from neutronclient.v2_0 import client as v2_client
|
|
|
|
# This module tests client library functionalities with
|
|
# Keystone client. Neutron client supports two types of
|
|
# HTTP clients (HTTPClient and SessionClient),
|
|
# so it is better to test both clients.
|
|
|
|
|
|
class LibraryTestBase(base.BaseTestCase):
|
|
|
|
def setUp(self):
|
|
super(LibraryTestBase, self).setUp()
|
|
self.client = self._get_client()
|
|
|
|
|
|
class Libv2HTTPClientTestBase(LibraryTestBase):
|
|
|
|
def _get_client(self):
|
|
|
|
creds = func_base.credentials()
|
|
cloud_config = func_base.get_cloud_config()
|
|
|
|
# We're getting a session so we can find the v2 url via KSA
|
|
keystone_auth = cloud_config.get_auth()
|
|
(verify, cert) = cloud_config.get_requests_verify_args()
|
|
|
|
ks_session = session.Session(
|
|
auth=keystone_auth, verify=verify, cert=cert)
|
|
|
|
# for the old HTTPClient, we use keystone v2 API, regardless of
|
|
# whether v3 also exists or is configured
|
|
v2_auth_url = keystone_auth.get_endpoint(
|
|
ks_session, interface=ksa_plugin.AUTH_INTERFACE, version=(2, 0))
|
|
|
|
return v2_client.Client(username=creds['username'],
|
|
password=creds['password'],
|
|
tenant_name=creds['project_name'],
|
|
auth_url=v2_auth_url)
|
|
|
|
|
|
class Libv2SessionClientTestBase(LibraryTestBase):
|
|
|
|
def _get_client(self):
|
|
cloud_config = func_base.get_cloud_config()
|
|
keystone_auth = cloud_config.get_auth()
|
|
(verify, cert) = cloud_config.get_requests_verify_args()
|
|
|
|
ks_session = session.Session(
|
|
auth=keystone_auth,
|
|
verify=verify,
|
|
cert=cert)
|
|
return v2_client.Client(session=ks_session)
|
|
|
|
|
|
class LibraryTestCase(object):
|
|
|
|
def test_list_network(self):
|
|
nets = self.client.list_networks()
|
|
self.assertIsInstance(nets['networks'], list)
|
|
|
|
def test_post_put_delele_network(self):
|
|
name = str(uuid.uuid4())
|
|
net = self.client.create_network({'network': {'name': name}})
|
|
net_id = net['network']['id']
|
|
self.assertEqual(name, net['network']['name'])
|
|
name2 = str(uuid.uuid4())
|
|
net = self.client.update_network(net_id, {'network': {'name': name2}})
|
|
self.assertEqual(name2, net['network']['name'])
|
|
self.client.delete_network(net_id)
|
|
with testtools.ExpectedException(exceptions.NetworkNotFoundClient):
|
|
self.client.show_network(net_id)
|
|
|
|
|
|
class LibraryHTTPClientTest(LibraryTestCase, Libv2HTTPClientTestBase):
|
|
pass
|
|
|
|
|
|
class LibrarySessionClientTest(LibraryTestCase, Libv2SessionClientTestBase):
|
|
pass
|