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>
46 lines
1.8 KiB
Python
46 lines
1.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) 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 sdk_platform as sdk
|
|
from dccommon import exceptions
|
|
from dccommon.tests import base
|
|
|
|
|
|
class TestOpenStackDriver(base.DCCommonTestCase):
|
|
|
|
@mock.patch.object(sdk, 'KeystoneClient')
|
|
@mock.patch.object(sdk.OpenStackDriver, '_is_token_valid')
|
|
def test_init(self, mock_keystone_client, mock_is_token_valid):
|
|
region_name = 'subcloud1'
|
|
|
|
os_client = sdk.OpenStackDriver(region_name, region_clients=None)
|
|
self.assertIsNotNone(os_client)
|
|
new_keystone_client = os_client.keystone_client
|
|
self.assertIsNotNone(new_keystone_client)
|
|
mock_is_token_valid(region_name).return_value = True
|
|
cached_keystone_client = sdk.OpenStackDriver(
|
|
region_name, region_clients=None).keystone_client
|
|
self.assertEqual(new_keystone_client, cached_keystone_client)
|
|
|
|
self.assertRaises(exceptions.InvalidInputError,
|
|
sdk.OpenStackDriver,
|
|
region_name, region_clients=['fake_client'])
|