Improve UT coverage for dcmanager's manager/service.py
Improves UT coverage for dcmanager's manager/service.py
from 72% to 92%
Test plan:
1) PASS: Run tox py39, pylint and pep8 envs and
verify that they are all passing.
2) PASS: 'tox -e cover' command output is 92%
Story: 2007082
Task: 49605
Change-Id: I72a361bf89d3df32f71e78e16e107b183974c53e
Signed-off-by: Swapna Gorre <swapna.gorre@windriver.com>
This commit is contained in:
Swapna Gorre
parent
fc0a5f0e53
commit
818dde90c3
|
|
@ -262,3 +262,17 @@ class DCManagerTestCase(base.BaseTestCase):
|
|||
"""Create a password with based on the specified keyword"""
|
||||
|
||||
return base64.b64encode(keyword.encode("utf-8")).decode("utf-8")
|
||||
|
||||
def _mock_SubcloudManager(self, target):
|
||||
"""Mock the target's SubcloudManager"""
|
||||
|
||||
mock_patch = mock.patch.object(target, 'SubcloudManager')
|
||||
self.mock_subcloud_manager = mock_patch.start()
|
||||
self.addCleanup(mock_patch.stop)
|
||||
|
||||
def _mock_PeerMonitorManager(self, target):
|
||||
"""Mock the target's PeerMonitorManager"""
|
||||
|
||||
mock_patch = mock.patch.object(target, 'PeerMonitorManager')
|
||||
self.mock_PeerMonitor_Manager = mock_patch.start()
|
||||
self.addCleanup(mock_patch.stop)
|
||||
|
|
|
|||
|
|
@ -18,106 +18,293 @@ import os.path
|
|||
import sys
|
||||
|
||||
import mock
|
||||
|
||||
from oslo_config import cfg
|
||||
from oslo_utils import uuidutils
|
||||
|
||||
from dcmanager.common import scheduler
|
||||
from dccommon import consts as dccommon_consts
|
||||
from dcmanager.common import consts
|
||||
from dcmanager.manager import service
|
||||
from dcmanager.tests import base
|
||||
from dcmanager.tests import utils
|
||||
from dcmanager.tests.base import DCManagerTestCase
|
||||
|
||||
sys.modules['fm_core'] = mock.Mock()
|
||||
CONF = cfg.CONF
|
||||
FAKE_USER = utils.UUID1
|
||||
FAKE_JOB = utils.UUID2
|
||||
|
||||
|
||||
class FakeDCManagerAuditAPI(object):
|
||||
class BaseTestDCManagerService(DCManagerTestCase):
|
||||
"""Base class for testing DCManagerService"""
|
||||
|
||||
def __init__(self):
|
||||
self.trigger_patch_audit = mock.MagicMock()
|
||||
|
||||
|
||||
class TestDCManagerService(base.DCManagerTestCase):
|
||||
def setUp(self):
|
||||
super(TestDCManagerService, self).setUp()
|
||||
self.tenant_id = 'fake_admin'
|
||||
self.thm = scheduler.ThreadGroupManager()
|
||||
self.context = utils.dummy_context(user='test_user',
|
||||
tenant=self.tenant_id)
|
||||
super().setUp()
|
||||
self.service_obj = service.DCManagerService('dcmanager',
|
||||
'dcmanager')
|
||||
self.payload = {}
|
||||
self.user_id = FAKE_USER
|
||||
self.job_id = FAKE_JOB
|
||||
self._mock_audit_rpc_client()
|
||||
self._mock_SubcloudManager(service)
|
||||
self._mock_PeerMonitorManager(service)
|
||||
|
||||
os.path.isdir = mock.Mock(return_value=True)
|
||||
|
||||
# Mock the DCManager Audit API
|
||||
self.fake_dcmanager_audit_api = FakeDCManagerAuditAPI()
|
||||
p = mock.patch('dcmanager.audit.rpcapi.ManagerAuditClient')
|
||||
self.mock_dcmanager_audit_api = p.start()
|
||||
self.mock_dcmanager_audit_api.return_value = \
|
||||
self.fake_dcmanager_audit_api
|
||||
self.addCleanup(p.stop)
|
||||
class TestDCManagerServiceInit(BaseTestDCManagerService):
|
||||
"""Test class for testing init managers in DCManagerService """
|
||||
|
||||
def setUp(self):
|
||||
super().setUp()
|
||||
|
||||
def test_init(self):
|
||||
self.assertEqual(self.service_obj.host, 'localhost')
|
||||
self.assertEqual(self.service_obj.topic, 'dcmanager')
|
||||
|
||||
@mock.patch.object(service, 'SubcloudManager')
|
||||
def test_init_managers(self, mock_subcloud_manager):
|
||||
def test_init_managers(self):
|
||||
self.service_obj.init_managers()
|
||||
self.assertIsNotNone(self.service_obj.subcloud_manager)
|
||||
self.assertIsNotNone(self.service_obj.system_peer_manager)
|
||||
self.assertIsNotNone(self.service_obj.peer_monitor_manager)
|
||||
|
||||
@mock.patch.object(service, 'SubcloudManager')
|
||||
@mock.patch.object(service, 'rpc_messaging')
|
||||
def test_start(self, mock_rpc, mock_subcloud_manager):
|
||||
|
||||
@mock.patch.object(service, 'rpc_messaging')
|
||||
class TestDCManagerService(BaseTestDCManagerService):
|
||||
"""Test class for testing DCManagerService"""
|
||||
|
||||
def setUp(self):
|
||||
super().setUp()
|
||||
|
||||
def test_start(self, mock_rpc):
|
||||
os.path.isdir = mock.Mock(return_value=True)
|
||||
self.service_obj.start()
|
||||
mock_rpc.get_rpc_server.assert_called_once_with(
|
||||
self.service_obj.target, self.service_obj)
|
||||
mock_rpc.get_rpc_server().start.assert_called_once_with()
|
||||
mock_rpc.get_rpc_server().start.assert_called_once()
|
||||
|
||||
@mock.patch.object(service, 'SubcloudManager')
|
||||
def test_add_subcloud(self, mock_subcloud_manager):
|
||||
|
||||
class TestSubcloudManager(BaseTestDCManagerService):
|
||||
"""Test class for testing SubcloudManager"""
|
||||
|
||||
def setUp(self):
|
||||
super().setUp()
|
||||
|
||||
def test_add_subcloud(self):
|
||||
payload = {'name': 'testname',
|
||||
'region_name': uuidutils.generate_uuid().replace("-", "")}
|
||||
self.service_obj.init_managers()
|
||||
self.service_obj.add_subcloud(
|
||||
self.context, subcloud_id=1, payload=payload)
|
||||
mock_subcloud_manager().add_subcloud.\
|
||||
assert_called_once_with(self.context, 1, mock.ANY)
|
||||
self.ctx, subcloud_id=1, payload=payload)
|
||||
self.mock_subcloud_manager().add_subcloud.\
|
||||
assert_called_once_with(self.ctx, 1, payload)
|
||||
|
||||
@mock.patch.object(service, 'SubcloudManager')
|
||||
def test_delete_subcloud(self, mock_subcloud_manager):
|
||||
def test_add_secondary_subcloud(self):
|
||||
payload = {'name': 'testname',
|
||||
'region_name': uuidutils.generate_uuid().replace("-", "")}
|
||||
self.service_obj.init_managers()
|
||||
self.service_obj.add_secondary_subcloud(
|
||||
self.ctx, subcloud_id=2, payload=payload)
|
||||
self.mock_subcloud_manager().add_subcloud.\
|
||||
assert_called_once_with(self.ctx, 2, payload)
|
||||
|
||||
def test_delete_subcloud(self):
|
||||
self.service_obj.init_managers()
|
||||
self.service_obj.delete_subcloud(
|
||||
self.context, subcloud_id=1)
|
||||
mock_subcloud_manager().delete_subcloud.\
|
||||
assert_called_once_with(self.context, mock.ANY)
|
||||
self.ctx, subcloud_id=1)
|
||||
self.mock_subcloud_manager().delete_subcloud.\
|
||||
assert_called_once_with(self.ctx, 1)
|
||||
|
||||
@mock.patch.object(service, 'SubcloudManager')
|
||||
def test_update_subcloud(self, mock_subcloud_manager):
|
||||
def test_rename_subcloud(self):
|
||||
self.service_obj.init_managers()
|
||||
self.service_obj.rename_subcloud(
|
||||
self.ctx, subcloud_id=1, curr_subcloud_name='fake_subcloud',
|
||||
new_subcloud_name='subcloud1')
|
||||
self.mock_subcloud_manager().rename_subcloud.\
|
||||
assert_called_once_with(self.ctx, 1, 'fake_subcloud', 'subcloud1')
|
||||
|
||||
def test_get_subcloud_name_by_region_name(self):
|
||||
self.service_obj.init_managers()
|
||||
self.service_obj.get_subcloud_name_by_region_name(
|
||||
self.ctx, subcloud_region='test_region')
|
||||
self.mock_subcloud_manager().get_subcloud_name_by_region_name.\
|
||||
assert_called_once_with(self.ctx, 'test_region')
|
||||
|
||||
def test_update_subcloud(self):
|
||||
self.service_obj.init_managers()
|
||||
self.service_obj.update_subcloud(
|
||||
self.context, subcloud_id=1,
|
||||
self.ctx, subcloud_id=1,
|
||||
management_state='testmgmtstatus')
|
||||
mock_subcloud_manager().update_subcloud.assert_called_once_with(
|
||||
self.context, 1, 'testmgmtstatus', None, None, None, None, None, None,
|
||||
self.mock_subcloud_manager().update_subcloud.assert_called_once_with(
|
||||
self.ctx, 1, 'testmgmtstatus', None, None, None, None, None, None,
|
||||
None, None, None
|
||||
)
|
||||
|
||||
@mock.patch.object(service, 'SubcloudManager')
|
||||
@mock.patch.object(service, 'rpc_messaging')
|
||||
def test_stop_rpc_server(self, mock_rpc, mock_subcloud_manager):
|
||||
self.service_obj.start()
|
||||
self.service_obj._stop_rpc_server()
|
||||
mock_rpc.get_rpc_server().stop.assert_called_once_with()
|
||||
def test_update_subcloud_with_network_reconfig(self):
|
||||
payload = {'name': 'testname',
|
||||
'bootstrap-address': "10.10.10.12"}
|
||||
self.service_obj.init_managers()
|
||||
self.service_obj.update_subcloud_with_network_reconfig(
|
||||
self.ctx, subcloud_id=1, payload=payload)
|
||||
self.mock_subcloud_manager().update_subcloud_with_network_reconfig.\
|
||||
assert_called_once_with(self.ctx, 1, payload)
|
||||
|
||||
@mock.patch.object(service, 'SubcloudManager')
|
||||
@mock.patch.object(service, 'rpc_messaging')
|
||||
def test_stop(self, mock_rpc, mock_subcloud_manager):
|
||||
self.service_obj.start()
|
||||
self.service_obj.stop()
|
||||
mock_rpc.get_rpc_server().stop.assert_called_once_with()
|
||||
def test_redeploy_subcloud(self):
|
||||
payload = {'DEPLOY_PHASE_CONFIG': 'configure'}
|
||||
self.service_obj.init_managers()
|
||||
self.service_obj.redeploy_subcloud(
|
||||
self.ctx, subcloud_id=1, payload=payload)
|
||||
self.mock_subcloud_manager().redeploy_subcloud.assert_called_once_with(
|
||||
self.ctx, 1, payload)
|
||||
|
||||
def test_backup_subclouds(self):
|
||||
payload = {'subcloud': 'subcloud1'}
|
||||
self.service_obj.init_managers()
|
||||
self.service_obj.backup_subclouds(
|
||||
self.ctx, payload=payload)
|
||||
self.mock_subcloud_manager().create_subcloud_backups.assert_called_once_with(
|
||||
self.ctx, payload)
|
||||
|
||||
def test_delete_subcloud_backups(self):
|
||||
payload = {'subcloud': 'subcloud2'}
|
||||
self.service_obj.init_managers()
|
||||
self.service_obj.delete_subcloud_backups(
|
||||
self.ctx, release_version=23.09, payload=payload)
|
||||
self.mock_subcloud_manager().delete_subcloud_backups.assert_called_once_with(
|
||||
self.ctx, 23.09, payload)
|
||||
|
||||
def test_restore_subcloud_backups(self):
|
||||
payload = {'subcloud': 'subcloud2'}
|
||||
self.service_obj.init_managers()
|
||||
self.service_obj.restore_subcloud_backups(
|
||||
self.ctx, payload=payload)
|
||||
self.mock_subcloud_manager().restore_subcloud_backups.\
|
||||
assert_called_once_with(self.ctx, payload)
|
||||
|
||||
def test_update_subcloud_sync_endpoint_type(self):
|
||||
self.service_obj.init_managers()
|
||||
self.service_obj.update_subcloud_sync_endpoint_type(
|
||||
self.ctx, subcloud_name='testname',
|
||||
endpoint_type_list=dccommon_consts.ENDPOINT_TYPES_LIST_OS,
|
||||
openstack_installed=True)
|
||||
self.mock_subcloud_manager().update_subcloud_sync_endpoint_type.\
|
||||
assert_called_once_with(self.ctx,
|
||||
'testname',
|
||||
dccommon_consts.ENDPOINT_TYPES_LIST_OS,
|
||||
True)
|
||||
|
||||
def test_prestage_subcloud(self):
|
||||
payload = {'subcloud_name': 'subcloud1'}
|
||||
self.service_obj.init_managers()
|
||||
self.service_obj.prestage_subcloud(
|
||||
self.ctx, payload=payload)
|
||||
self.mock_subcloud_manager().prestage_subcloud.assert_called_once_with(
|
||||
self.ctx, payload)
|
||||
|
||||
def test_subcloud_deploy_create(self):
|
||||
payload = {'name': 'subcloud1'}
|
||||
self.service_obj.init_managers()
|
||||
self.service_obj.subcloud_deploy_create(
|
||||
self.ctx, subcloud_id=1, payload=payload)
|
||||
self.mock_subcloud_manager().subcloud_deploy_create.assert_called_once_with(
|
||||
self.ctx, 1, payload)
|
||||
|
||||
def test_subcloud_deploy_bootstrap(self):
|
||||
payload = {'name': 'subcloud1'}
|
||||
self.service_obj.init_managers()
|
||||
self.service_obj.subcloud_deploy_bootstrap(
|
||||
self.ctx, subcloud_id=1, payload=payload, initial_deployment=True)
|
||||
self.mock_subcloud_manager().subcloud_deploy_bootstrap.\
|
||||
assert_called_once_with(self.ctx, 1, payload, True)
|
||||
|
||||
def test_subcloud_deploy_config(self):
|
||||
payload = {'name': 'testname'}
|
||||
self.service_obj.init_managers()
|
||||
self.service_obj.subcloud_deploy_config(
|
||||
self.ctx, subcloud_id=1, payload=payload, initial_deployment=True)
|
||||
self.mock_subcloud_manager().subcloud_deploy_config.assert_called_once_with(
|
||||
self.ctx, 1, payload, True)
|
||||
|
||||
def test_subcloud_deploy_install(self):
|
||||
payload = {'name': 'testname'}
|
||||
self.service_obj.init_managers()
|
||||
self.service_obj.subcloud_deploy_install(
|
||||
self.ctx, subcloud_id=1, payload=payload, initial_deployment=True)
|
||||
self.mock_subcloud_manager().subcloud_deploy_install.assert_called_once_with(
|
||||
self.ctx, 1, payload, True)
|
||||
|
||||
def test_subcloud_deploy_complete(self):
|
||||
self.service_obj.init_managers()
|
||||
self.service_obj.subcloud_deploy_complete(
|
||||
self.ctx, subcloud_id=1)
|
||||
self.mock_subcloud_manager().subcloud_deploy_complete.\
|
||||
assert_called_once_with(self.ctx, 1)
|
||||
|
||||
def test_subcloud_deploy_abort(self):
|
||||
self.service_obj.init_managers()
|
||||
self.service_obj.subcloud_deploy_abort(
|
||||
self.ctx, subcloud_id=1,
|
||||
deploy_status=consts.DEPLOY_STATE_ABORTING_CONFIG)
|
||||
self.mock_subcloud_manager().subcloud_deploy_abort.assert_called_once_with(
|
||||
self.ctx, 1, consts.DEPLOY_STATE_ABORTING_CONFIG)
|
||||
|
||||
def test_subcloud_deploy_resume(self):
|
||||
|
||||
deploy_states_to_run = [consts.DEPLOY_PHASE_INSTALL,
|
||||
consts.DEPLOY_PHASE_BOOTSTRAP,
|
||||
consts.DEPLOY_PHASE_CONFIG]
|
||||
|
||||
fake_payload = {'fake_payload_install': 'fake_install_values',
|
||||
'fake_payload_bootstrap': 'fake_bootstrap_values',
|
||||
'fake_payload_config': 'fake_config'}
|
||||
|
||||
self.service_obj.init_managers()
|
||||
self.service_obj.subcloud_deploy_resume(
|
||||
self.ctx, subcloud_id=1, subcloud_name='testname',
|
||||
payload=fake_payload,
|
||||
deploy_states_to_run=deploy_states_to_run)
|
||||
self.mock_subcloud_manager().subcloud_deploy_resume.assert_called_once_with(
|
||||
self.ctx, 1, 'testname', fake_payload, deploy_states_to_run)
|
||||
|
||||
def test_batch_migrate_subcloud(self):
|
||||
payload = {'peer_group': 'fake_peer_group'}
|
||||
self.service_obj.init_managers()
|
||||
self.service_obj.batch_migrate_subcloud(
|
||||
self.ctx, payload=payload)
|
||||
self.mock_subcloud_manager().batch_migrate_subcloud.assert_called_once_with(
|
||||
self.ctx, payload)
|
||||
|
||||
|
||||
class TestPeerMonitorManager(BaseTestDCManagerService):
|
||||
"""Test class for testing PeerMonitorManager"""
|
||||
|
||||
def setUp(self):
|
||||
super().setUp()
|
||||
|
||||
def test_peer_monitor_notify(self):
|
||||
self.service_obj.init_managers()
|
||||
self.service_obj.peer_monitor_notify(self.ctx)
|
||||
self.mock_PeerMonitor_Manager().peer_monitor_notify.assert_called_once_with(
|
||||
self.ctx)
|
||||
|
||||
def test_peer_group_audit_notify(self):
|
||||
payload = {'peer_uuid': 2}
|
||||
self.service_obj.init_managers()
|
||||
self.service_obj.peer_group_audit_notify(
|
||||
self.ctx, peer_group_name='fake_peer_group', payload=payload)
|
||||
self.mock_PeerMonitor_Manager().peer_group_audit_notify.\
|
||||
assert_called_once_with(self.ctx,
|
||||
'fake_peer_group', payload)
|
||||
|
||||
|
||||
@mock.patch.object(service, 'SystemPeerManager')
|
||||
class TestSystemPeerManager(BaseTestDCManagerService):
|
||||
"""Test class for testing SystemPeerManager"""
|
||||
|
||||
def setUp(self):
|
||||
super().setUp()
|
||||
|
||||
def test_sync_subcloud_peer_group(self, mock_system_peer_manager):
|
||||
self.service_obj.init_managers()
|
||||
self.service_obj.sync_subcloud_peer_group(
|
||||
self.ctx, association_id=2, sync_subclouds=True)
|
||||
mock_system_peer_manager().sync_subcloud_peer_group.\
|
||||
assert_called_once_with(self.ctx, 2, True)
|
||||
|
||||
def test_delete_peer_group_association(self, mock_system_peer_manager):
|
||||
self.service_obj.init_managers()
|
||||
self.service_obj.delete_peer_group_association(
|
||||
self.ctx, association_id=2)
|
||||
mock_system_peer_manager().delete_peer_group_association.\
|
||||
assert_called_once_with(self.ctx, 2)
|
||||
|
|
|
|||
Loading…
Reference in New Issue