starlingx
/
distcloud
Code Issues Proposed changes

test_commit 

Change-Id: I24e004ad4bdbaf53b71bcd7827e0227528b78b0e
Signed-off-by: Swapna Gorre <swapna.gorre@windriver.com>
This commit is contained in:
Swapna Gorre 2024-04-30 09:55:27 -04:00
parent e2ed8a9c42
commit 938f054260
3 changed files with 32 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
distributedcloud/dcmanager/tests/base.py
View File

@ -278,6 +278,13 @@ class DCManagerTestCase(base.BaseTestCase):
self.mock_load_yaml_file = mock_patch_object.start()
self.addCleanup(mock_patch_object.stop)
def _mock_get_local_system(self):
"""Mock dcmanager util's get_local_system"""
mock_patch_object = mock.patch.object(dutils, 'get_local_system')
self.mock_get_local_system = mock_patch_object.start()
self.addCleanup(mock_patch_object.stop)
def _mock_os_remove(self):
"""Mock os' remove"""

11
distributedcloud/dcmanager/tests/unit/manager/test_subcloud_manager.py
View File

@ -350,6 +350,7 @@ class BaseTestSubcloudManager(base.DCManagerTestCase):
self._mock_os_path_isdir()
self._mock_os_path_exists()
self._mock_os_remove()
self._mock_get_local_system()
self.sm = subcloud_manager.SubcloudManager()
self.subcloud = self.create_subcloud_static(self.ctx)
@ -1297,8 +1298,7 @@ class TestSubcloudUpdate(BaseTestSubcloudManager):
mock_peer_dc_client):
system_peer_test = test_system_peer_manager.TestSystemPeerManager
system_peer = system_peer_test.create_system_peer_static(self.ctx)
mock_peer_dc_client.return_value = test_system_peer_manager.\
FakeDcmanagerClient()
mock_peer_dc_client.return_value = mock.MagicMock()
ret = self.sm._unmanage_system_peer_subcloud([system_peer], self.subcloud)
self.assertEqual(ret, False)
@ -3491,14 +3491,12 @@ class TestSubcloudMigrate(BaseTestSubcloudManager):
updated_subcloud.rehome_data)
@mock.patch.object(db_api, 'subcloud_peer_group_update')
@mock.patch.object(cutils, 'get_local_system')
@mock.patch.object(subcloud_manager.SubcloudManager,
'_run_parallel_group_operation')
def test_run_batch_migrate(self, mock_run_parallel_group_operation,
mock_get_local_system,
mock_subcloud_peer_group_update):
self._mock_builtins_open()
mock_get_local_system.return_value = FakeSysinvClient.get_system(self)
self.mock_get_local_system.return_value = FakeSysinvClient.get_system(self)
self.mock_openstack_driver.keystone_client = FakeKeystoneClient()
subcloud_pg = self.create_subcloud_peer_group_static(self.ctx)
db_api.subcloud_peer_group_update(
@ -3528,9 +3526,8 @@ class TestSubcloudMigrate(BaseTestSubcloudManager):
self.mock_log.info.assert_has_calls(Calls)
@mock.patch.object(db_api, 'subcloud_peer_group_update')
@mock.patch.object(cutils, 'get_local_system')
def test_run_batch_migrate_no_secondary_subclouds(
self, mock_get_local_system, mock_subcloud_peer_group_update
self, mock_subcloud_peer_group_update
):
self.mock_sysinv_client().return_value = FakeSysinvClient()
subcloud_pg = self.create_subcloud_peer_group_static(self.ctx)

22
distributedcloud/dcmanager/tests/unit/manager/test_system_peer_manager.py
View File

@ -133,7 +133,7 @@ class FakeException(Exception):
class TestSystemPeerManager(base.DCManagerTestCase):
def setUp(self):
super(TestSystemPeerManager, self).setUp()
super().setUp()
# Mock the DCManager Audit API
self.fake_dcmanager_audit_api = FakeDCManagerAuditAPI()
@ -200,6 +200,13 @@ class TestSystemPeerManager(base.DCManagerTestCase):
self.assertEqual('system_peer_manager', spm.service_name)
self.assertEqual('localhost', spm.host)
class TestSyncSubclouds(TestSystemPeerManager):
"""Test class for testing sync subclouds"""
def setUp(self):
super().setUp()
@mock.patch.object(system_peer_manager, 'PeerSiteDriver')
@mock.patch.object(system_peer_manager, 'SysinvClient')
@mock.patch.object(system_peer_manager, 'DcmanagerClient')
@ -376,6 +383,12 @@ class TestSystemPeerManager(base.DCManagerTestCase):
'max-subcloud-rehoming': peer_group.max_subcloud_rehoming
})
class TestDeletePeerGroup(TestSystemPeerManager):
"""Test class for testing delete peer group"""
def setUp(self):
super().setUp()
@mock.patch.object(system_peer_manager, 'utils')
@mock.patch.object(system_peer_manager, 'PeerSiteDriver')
@mock.patch.object(system_peer_manager, 'SysinvClient')
@ -493,6 +506,13 @@ class TestSystemPeerManager(base.DCManagerTestCase):
associations = db_api.peer_group_association_get_all(self.ctx)
self.assertEqual(0, len(associations))
class TestUpdatePeerGroup(TestSystemPeerManager):
"""Test class for testing update peer group"""
def setUp(self):
super().setUp()
@mock.patch('dcmanager.manager.system_peer_manager.'
'utils.get_local_system')
@mock.patch('dcmanager.manager.system_peer_manager.'