test_commit
Change-Id: I24e004ad4bdbaf53b71bcd7827e0227528b78b0e Signed-off-by: Swapna Gorre <swapna.gorre@windriver.com>
This commit is contained in:
Swapna Gorre
parent
e2ed8a9c42
commit
474f921e05
|
|
@ -101,13 +101,6 @@ class FakePeerGroup(object):
|
|||
self.id = FAKE_SITE1_PEER_GROUP_ID
|
||||
|
||||
|
||||
class FakeKeystoneClient(object):
|
||||
def __init__(self):
|
||||
self.keystone_client = mock.MagicMock()
|
||||
self.session = mock.MagicMock()
|
||||
self.endpoint_cache = mock.MagicMock()
|
||||
|
||||
|
||||
class FakeSysinvClient(object):
|
||||
def __init__(self):
|
||||
self.system = FakeSystem(FAKE_SITE1_SYSTEM_UUID)
|
||||
|
|
@ -143,6 +136,8 @@ class TestSystemPeerManager(base.DCManagerTestCase):
|
|||
self.fake_dcmanager_audit_api
|
||||
self.addCleanup(p.stop)
|
||||
|
||||
self.spm = system_peer_manager.SystemPeerManager(mock.MagicMock())
|
||||
|
||||
@staticmethod
|
||||
def create_subcloud_with_pg_static(ctxt, peer_group_id,
|
||||
rehome_data=None, **kwargs):
|
||||
|
|
@ -195,10 +190,9 @@ class TestSystemPeerManager(base.DCManagerTestCase):
|
|||
return db_api.peer_group_association_create(ctxt, **values)
|
||||
|
||||
def test_init(self):
|
||||
spm = system_peer_manager.SystemPeerManager(mock.MagicMock())
|
||||
self.assertIsNotNone(spm)
|
||||
self.assertEqual('system_peer_manager', spm.service_name)
|
||||
self.assertEqual('localhost', spm.host)
|
||||
self.assertIsNotNone(self.spm)
|
||||
self.assertEqual('system_peer_manager', self.spm.service_name)
|
||||
self.assertEqual('localhost', self.spm.host)
|
||||
|
||||
@mock.patch.object(system_peer_manager, 'PeerSiteDriver')
|
||||
@mock.patch.object(system_peer_manager, 'SysinvClient')
|
||||
|
|
@ -206,9 +200,10 @@ class TestSystemPeerManager(base.DCManagerTestCase):
|
|||
def test_sync_subclouds(self, mock_dc_client,
|
||||
mock_sysinv_client,
|
||||
mock_keystone_client):
|
||||
mock_keystone_client().keystone_client = FakeKeystoneClient()
|
||||
mock_keystone_client().keystone_client = mock.MagicMock()
|
||||
mock_sysinv_client.return_value = FakeSysinvClient()
|
||||
mock_dc_client.return_value = FakeDcmanagerClient()
|
||||
|
||||
mock_dc_client().add_subcloud_with_secondary_status = mock.MagicMock()
|
||||
mock_dc_client().add_subcloud_with_secondary_status.return_value = {
|
||||
"region-name": FAKE_SITE1_SUBCLOUD2_REGION_NAME}
|
||||
|
|
@ -258,9 +253,8 @@ class TestSystemPeerManager(base.DCManagerTestCase):
|
|||
mock_dc_client().update_subcloud.side_effect = [
|
||||
peer_subcloud1, peer_subcloud1, peer_subcloud2]
|
||||
|
||||
spm = system_peer_manager.SystemPeerManager(mock.MagicMock())
|
||||
spm._sync_subclouds(self.ctx, peer, peer_group.id,
|
||||
FAKE_SITE1_PEER_GROUP_ID)
|
||||
self.spm._sync_subclouds(self.ctx, peer, peer_group.id,
|
||||
FAKE_SITE1_PEER_GROUP_ID)
|
||||
|
||||
mock_dc_client().get_subcloud.assert_has_calls([
|
||||
mock.call(peer_subcloud1.get('name')),
|
||||
|
|
@ -293,7 +287,7 @@ class TestSystemPeerManager(base.DCManagerTestCase):
|
|||
mock_utils,
|
||||
mock_sync_subclouds):
|
||||
mock_sync_subclouds.return_value = True
|
||||
mock_keystone_client().keystone_client = FakeKeystoneClient()
|
||||
mock_keystone_client().keystone_client = mock.MagicMock()
|
||||
mock_sysinv_client.return_value = FakeSysinvClient()
|
||||
mock_dc_client.return_value = FakeDcmanagerClient()
|
||||
mock_dc_client().get_subcloud_peer_group = mock.MagicMock()
|
||||
|
|
@ -316,8 +310,7 @@ class TestSystemPeerManager(base.DCManagerTestCase):
|
|||
system_peer_id=peer.id,
|
||||
peer_group_id=peer_group.id)
|
||||
|
||||
spm = system_peer_manager.SystemPeerManager(mock.MagicMock())
|
||||
spm.sync_subcloud_peer_group(self.ctx, association.id, False)
|
||||
self.spm.sync_subcloud_peer_group(self.ctx, association.id, False)
|
||||
|
||||
mock_dc_client().get_subcloud_peer_group.assert_called_once_with(
|
||||
peer_group.peer_group_name)
|
||||
|
|
@ -335,7 +328,7 @@ class TestSystemPeerManager(base.DCManagerTestCase):
|
|||
mock_utils,
|
||||
mock_sync_subclouds):
|
||||
mock_sync_subclouds.return_value = True
|
||||
mock_keystone_client().keystone_client = FakeKeystoneClient()
|
||||
mock_keystone_client().keystone_client = mock.MagicMock()
|
||||
mock_sysinv_client.return_value = FakeSysinvClient()
|
||||
mock_dc_client.return_value = FakeDcmanagerClient()
|
||||
mock_dc_client().get_subcloud_peer_group = mock.MagicMock()
|
||||
|
|
@ -362,8 +355,7 @@ class TestSystemPeerManager(base.DCManagerTestCase):
|
|||
mock_dc_client().get_subcloud_peer_group.side_effect = \
|
||||
dccommon_exceptions.SubcloudPeerGroupNotFound
|
||||
|
||||
spm = system_peer_manager.SystemPeerManager(mock.MagicMock())
|
||||
spm.sync_subcloud_peer_group(self.ctx, association.id, False)
|
||||
self.spm.sync_subcloud_peer_group(self.ctx, association.id, False)
|
||||
|
||||
mock_dc_client().get_subcloud_peer_group.assert_called_once_with(
|
||||
peer_group.peer_group_name)
|
||||
|
|
@ -385,7 +377,7 @@ class TestSystemPeerManager(base.DCManagerTestCase):
|
|||
mock_sysinv_client,
|
||||
mock_keystone_client,
|
||||
mock_utils):
|
||||
mock_keystone_client().keystone_client = FakeKeystoneClient()
|
||||
mock_keystone_client().keystone_client = mock.MagicMock()
|
||||
mock_sysinv_client.return_value = FakeSysinvClient()
|
||||
mock_dc_client.return_value = FakeDcmanagerClient()
|
||||
mock_dc_client().delete_subcloud_peer_group = mock.MagicMock()
|
||||
|
|
@ -425,8 +417,7 @@ class TestSystemPeerManager(base.DCManagerTestCase):
|
|||
mock_dc_client().get_peer_group_association_with_peer_id_and_pg_id.\
|
||||
return_value = {'id': FAKE_SITE1_ASSOCIATION_ID}
|
||||
|
||||
spm = system_peer_manager.SystemPeerManager(mock.MagicMock())
|
||||
spm.delete_peer_group_association(self.ctx, association.id)
|
||||
self.spm.delete_peer_group_association(self.ctx, association.id)
|
||||
|
||||
mock_dc_client().delete_subcloud.assert_has_calls([
|
||||
mock.call(subcloud1.name),
|
||||
|
|
@ -447,7 +438,7 @@ class TestSystemPeerManager(base.DCManagerTestCase):
|
|||
def test_delete_peer_group_association_peer_site_association_not_exsit(
|
||||
self, mock_dc_client, mock_sysinv_client, mock_keystone_client, mock_utils
|
||||
):
|
||||
mock_keystone_client().keystone_client = FakeKeystoneClient()
|
||||
mock_keystone_client().keystone_client = mock.MagicMock()
|
||||
mock_sysinv_client.return_value = FakeSysinvClient()
|
||||
mock_dc_client.return_value = FakeDcmanagerClient()
|
||||
mock_dc_client().delete_subcloud_peer_group = mock.MagicMock()
|
||||
|
|
@ -481,8 +472,7 @@ class TestSystemPeerManager(base.DCManagerTestCase):
|
|||
mock_dc_client().get_peer_group_association_with_peer_id_and_pg_id.\
|
||||
side_effect = [dccommon_exceptions.PeerGroupAssociationNotFound]
|
||||
|
||||
spm = system_peer_manager.SystemPeerManager(mock.MagicMock())
|
||||
spm.delete_peer_group_association(self.ctx, association.id)
|
||||
self.spm.delete_peer_group_association(self.ctx, association.id)
|
||||
|
||||
mock_dc_client().delete_subcloud.assert_has_calls([
|
||||
mock.call(subcloud1.name)])
|
||||
|
|
@ -524,8 +514,7 @@ class TestSystemPeerManager(base.DCManagerTestCase):
|
|||
mock_dc_client().get_peer_group_association_with_peer_id_and_pg_id.\
|
||||
return_value = {'id': FAKE_SITE1_ASSOCIATION_ID}
|
||||
|
||||
spm = system_peer_manager.SystemPeerManager(mock.MagicMock())
|
||||
spm.update_sync_status(
|
||||
self.spm.update_sync_status(
|
||||
self.ctx, peer, consts.ASSOCIATION_SYNC_STATUS_IN_SYNC)
|
||||
|
||||
mock_dc_client().get_subcloud_peer_group.assert_called_once_with(
|
||||
|
|
@ -559,8 +548,7 @@ class TestSystemPeerManager(base.DCManagerTestCase):
|
|||
peer_group_id=peer_group.id,
|
||||
sync_status=consts.ASSOCIATION_SYNC_STATUS_IN_SYNC)
|
||||
|
||||
spm = system_peer_manager.SystemPeerManager(mock.MagicMock())
|
||||
spm.update_association_sync_status(
|
||||
self.spm.update_association_sync_status(
|
||||
self.ctx, peer_group.id,
|
||||
consts.ASSOCIATION_SYNC_STATUS_OUT_OF_SYNC)
|
||||
|
||||
|
|
@ -584,8 +572,7 @@ class TestSystemPeerManager(base.DCManagerTestCase):
|
|||
peer_group_id=peer_group.id,
|
||||
sync_status=consts.ASSOCIATION_SYNC_STATUS_UNKNOWN)
|
||||
|
||||
spm = system_peer_manager.SystemPeerManager(mock.MagicMock())
|
||||
spm.update_association_sync_status(
|
||||
self.spm.update_association_sync_status(
|
||||
self.ctx, peer_group.id,
|
||||
consts.ASSOCIATION_SYNC_STATUS_OUT_OF_SYNC)
|
||||
|
||||
|
|
@ -607,7 +594,7 @@ class TestSystemPeerManager(base.DCManagerTestCase):
|
|||
mock_dc_client,
|
||||
mock_sysinv_client,
|
||||
mock_keystone_client):
|
||||
mock_keystone_client().keystone_client = FakeKeystoneClient()
|
||||
mock_keystone_client().keystone_client = mock.MagicMock()
|
||||
mock_sysinv_client.return_value = FakeSysinvClient()
|
||||
mock_dc_client.return_value = FakeDcmanagerClient()
|
||||
mock_dc_client().get_subcloud_peer_group = mock.MagicMock()
|
||||
|
|
@ -625,8 +612,7 @@ class TestSystemPeerManager(base.DCManagerTestCase):
|
|||
system_peer_id=peer.id,
|
||||
peer_group_id=peer_group.id)
|
||||
|
||||
spm = system_peer_manager.SystemPeerManager(mock.MagicMock())
|
||||
spm.update_subcloud_peer_group(
|
||||
self.spm.update_subcloud_peer_group(
|
||||
self.ctx, peer_group.id,
|
||||
FAKE_SITE1_PEER_GROUP_STATE,
|
||||
FAKE_SITE1_PEER_GROUP_MAX_SUBCLOUDS_REHOMING,
|
||||
|
|
|
|||
Loading…
Reference in New Issue