7f3827f24d
Add the following misc. changes to dcorch and dcmanager components:
- Cache the master resource in dcorch audit
- Consolidate the openstack drivers to common module, combine the
dcmanager and dcorch sysinv client. (Note: the sdk driver that
used by nova, neutron and cinder will be cleaned as part of
story 2006588).
- Update the common sdk driver:
. in order to avoid creating new keystone client multiple times
. to add a option for caching region clients, in addition to the
keystone client
. finally, to randomize the token early renewal duration
- Change subcloud audit manager, patch audit manager,
and sw update manager to:
utilize the sdk driver which caches the keystone client and token
Test cases:
1. Manage/unmanage subclouds
2. Platform resources sync and audit
3. Verify the keystone token is cached until the token is
expired
4. Add/delete subclouds
5. Managed subcloud goes offline/online (power off/on)
6. Managed subcloud goes offline/online (delete/add a static route)
7. Apply a patch to all subclouds via patch Orchestration
Story: 2007267
Task: 38865
Change-Id: I75e0cf66a797a65faf75e7c64dafb07f54c2df06
Signed-off-by: Tao Liu <tao.liu@windriver.com>
126 lines
4.8 KiB
Python
126 lines
4.8 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.
|
|
#
|
|
# Copyright (c) 2017-2020 Wind River Systems, Inc.
|
|
#
|
|
# The right to copy, distribute, modify, or otherwise make use
|
|
# of this software may be licensed only pursuant to the terms
|
|
# of an applicable Wind River license agreement.
|
|
#
|
|
|
|
import mock
|
|
|
|
from dccommon.drivers.openstack import keystone_v3
|
|
from dccommon.tests import base
|
|
from dccommon.tests import utils
|
|
|
|
FAKE_SERVICE = [
|
|
'endpoint_volume',
|
|
'endpoint_network'
|
|
]
|
|
|
|
|
|
class Project(object):
|
|
def __init__(self, proj_name, id, enabled=True):
|
|
self.proj_name = proj_name
|
|
self.id = id
|
|
self.enabled = enabled
|
|
|
|
|
|
class User(object):
|
|
def __init__(self, user_name, id, enabled=True):
|
|
self.user_name = user_name
|
|
self.id = id
|
|
self.enabled = enabled
|
|
|
|
|
|
class FakeEndpoint(object):
|
|
def __init__(self, endpoint_name, region):
|
|
self.endpoint_name = endpoint_name
|
|
self.region = region
|
|
|
|
|
|
class TestKeystoneClient(base.DCCommonTestCase):
|
|
def setUp(self):
|
|
super(TestKeystoneClient, self).setUp()
|
|
self.ctx = utils.dummy_context()
|
|
|
|
@mock.patch.object(keystone_v3, 'KeystoneClient')
|
|
@mock.patch.object(keystone_v3, 'EndpointCache')
|
|
def test_init(self, mock_endpoint_cache, mock_keystone):
|
|
mock_keystone().services_list = FAKE_SERVICE
|
|
mock_endpoint_cache().admin_session = 'fake_session'
|
|
mock_endpoint_cache().keystone_client = 'fake_key_client'
|
|
key_client = keystone_v3.KeystoneClient()
|
|
self.assertIsNotNone(key_client.keystone_client)
|
|
self.assertEqual(key_client.services_list,
|
|
FAKE_SERVICE)
|
|
|
|
@mock.patch.object(keystone_v3, 'KeystoneClient')
|
|
def test_is_service_enabled(self, mock_keystone):
|
|
key_client = keystone_v3.KeystoneClient()
|
|
mock_keystone().is_service_enabled.return_value = True
|
|
network_enabled = key_client.is_service_enabled('network')
|
|
self.assertEqual(network_enabled, True)
|
|
|
|
@mock.patch.object(keystone_v3, 'EndpointCache')
|
|
def test_get_enabled_projects(self, mock_endpoint_cache):
|
|
p1 = Project('proj1', '123')
|
|
p2 = Project('proj2', '456', False)
|
|
key_client = keystone_v3.KeystoneClient()
|
|
mock_endpoint_cache().keystone_client.projects.list.return_value =\
|
|
[p1, p2]
|
|
project_list = key_client.get_enabled_projects()
|
|
self.assertIn(p1.id, project_list)
|
|
self.assertNotIn(p2.id, project_list)
|
|
|
|
@mock.patch.object(keystone_v3, 'EndpointCache')
|
|
def test_get_enabled_users(self, mock_endpoint_cache):
|
|
u1 = User('user1', '123')
|
|
u2 = User('user2', '456', False)
|
|
key_client = keystone_v3.KeystoneClient()
|
|
mock_endpoint_cache().keystone_client.users.list.return_value =\
|
|
[u1, u2]
|
|
users_list = key_client.get_enabled_users()
|
|
self.assertIn(u1.id, users_list)
|
|
self.assertNotIn(u2.id, users_list)
|
|
|
|
@mock.patch.object(keystone_v3.endpoint_filter, 'EndpointFilterManager')
|
|
@mock.patch.object(keystone_v3, 'EndpointCache')
|
|
def test_get_filtered_region(self, mock_endpoint_cache,
|
|
mock_endpoint_filter_manager):
|
|
endpoint_1 = FakeEndpoint('endpoint1', 'regionOne')
|
|
endpoint_2 = FakeEndpoint('endpoint2', 'regionTwo')
|
|
key_client = keystone_v3.KeystoneClient()
|
|
mock_endpoint_filter_manager(). \
|
|
list_endpoints_for_project.return_value = [endpoint_1, endpoint_2]
|
|
region_list = key_client.get_filtered_region('fake_project')
|
|
self.assertIn('regionOne', region_list)
|
|
self.assertIn('regionTwo', region_list)
|
|
|
|
@mock.patch.object(keystone_v3, 'EndpointCache')
|
|
def test_delete_endpoints(self, mock_endpoint_cache):
|
|
endpoint_1 = FakeEndpoint('endpoint1', 'regionOne')
|
|
mock_endpoint_cache().keystone_client.endpoints.list.return_value = \
|
|
[endpoint_1]
|
|
key_client = keystone_v3.KeystoneClient()
|
|
key_client.delete_endpoints('regionOne')
|
|
mock_endpoint_cache().keystone_client.endpoints.delete.\
|
|
assert_called_with(endpoint_1)
|
|
|
|
@mock.patch.object(keystone_v3, 'EndpointCache')
|
|
def test_delete_region(self, mock_endpoint_cache):
|
|
key_client = keystone_v3.KeystoneClient()
|
|
key_client.delete_region('regionOne')
|
|
mock_endpoint_cache().keystone_client.regions.delete.\
|
|
assert_called_with('regionOne')
|