openstack/cinder
Code Issues Proposed changes

Merge "[NetApp] Fix latent issues in unit tests"

Browse Source
This commit is contained in:
Zuul 2025-03-06 23:30:29 +00:00 committed by Gerrit Code Review
commit bded1ba83f
2 changed files with 45 additions and 11 deletions
cinder/tests/unit/volume/drivers/netapp/dataontap/client
test_client_cmode.pytest_client_cmode_rest.py

6
cinder/tests/unit/volume/drivers/netapp/dataontap/client/test_client_cmode.py

@ -3574,12 +3574,12 @@ class NetAppCmodeClientTestCase(test.TestCase):
@ddt.unpack @ddt.unpack
def test_create_snapmirror(self, schedule, policy): def test_create_snapmirror(self, schedule, policy):
self.mock_object(self.client.connection, 'send_request') self.mock_object(self.client.connection, 'send_request')
fake_client.SM_SOURCE_CG = None sm_source_cg = None
fake_client.SM_DESTINATION_CG = None sm_destination_cg = None
self.client.create_snapmirror( self.client.create_snapmirror(
fake_client.SM_SOURCE_VSERVER, fake_client.SM_SOURCE_VOLUME, fake_client.SM_SOURCE_VSERVER, fake_client.SM_SOURCE_VOLUME,
fake_client.SM_DEST_VSERVER, fake_client.SM_DEST_VOLUME, fake_client.SM_DEST_VSERVER, fake_client.SM_DEST_VOLUME,
fake_client.SM_SOURCE_CG, fake_client.SM_DESTINATION_CG, sm_source_cg, sm_destination_cg,
schedule=schedule, policy=policy) schedule=schedule, policy=policy)
snapmirror_create_args = { snapmirror_create_args = {

50
cinder/tests/unit/volume/drivers/netapp/dataontap/client/test_client_cmode_rest.py

@ -2839,9 +2839,31 @@ class NetAppRestCmodeClientTestCase(test.TestCase):
self.client.send_request.assert_has_calls([ self.client.send_request.assert_has_calls([
mock.call('/snapmirror/relationships/', 'post', body=body)]) mock.call('/snapmirror/relationships/', 'post', body=body)])
@ddt.data({'policy': 'AutomatedFailOver'}) @ddt.data(
{
'policy': None,
'sm_source_cg': fake_client.SM_SOURCE_CG,
'sm_destination_cg': fake_client.SM_DESTINATION_CG,
},
{
'policy': None,
'sm_source_cg': None,
'sm_destination_cg': None,
},
{
'policy': 'AutomatedFailOver',
'sm_source_cg': fake_client.SM_SOURCE_CG,
'sm_destination_cg': fake_client.SM_DESTINATION_CG,
},
{
'policy': 'AutomatedFailOver',
'sm_source_cg': None,
'sm_destination_cg': None,
},
)
@ddt.unpack @ddt.unpack
def test_create_snapmirror_active_sync(self, policy): def test_create_snapmirror_active_sync(self, policy,
sm_source_cg, sm_destination_cg):
"""Tests creation of snapmirror with active sync""" """Tests creation of snapmirror with active sync"""
api_responses = [ api_responses = [
{ {
@ -2850,34 +2872,46 @@ class NetAppRestCmodeClientTestCase(test.TestCase):
}, },
}, },
] ]
body = {}
self.mock_object(self.client, 'send_request', self.mock_object(self.client, 'send_request',
side_effect = copy.deepcopy(api_responses)) side_effect = copy.deepcopy(api_responses))
self.client.create_snapmirror( self.client.create_snapmirror(
fake_client.SM_SOURCE_VSERVER, fake_client.SM_SOURCE_VOLUME, fake_client.SM_SOURCE_VSERVER, fake_client.SM_SOURCE_VOLUME,
fake_client.SM_DEST_VSERVER, fake_client.SM_DEST_VOLUME, fake_client.SM_DEST_VSERVER, fake_client.SM_DEST_VOLUME,
fake_client.SM_SOURCE_CG, fake_client.SM_DESTINATION_CG, sm_source_cg, sm_destination_cg,
policy=policy) policy=policy)
if fake_client.SM_SOURCE_VSERVER is not None and \ if sm_source_cg is not None and sm_destination_cg is not None:
fake_client.SM_SOURCE_CG is not None:
body = { body = {
'source': { 'source': {
'path': 'path':
fake_client.SM_SOURCE_VSERVER + ':/cg/' + fake_client.SM_SOURCE_VSERVER + ':/cg/' +
fake_client.SM_SOURCE_CG, sm_source_cg,
'consistency_group_volumes': [ 'consistency_group_volumes': [
{'name': fake_client.SM_SOURCE_VOLUME}] {'name': fake_client.SM_SOURCE_VOLUME}]
}, },
'destination': { 'destination': {
'path': fake_client.SM_DEST_VSERVER + ':/cg/' + 'path': fake_client.SM_DEST_VSERVER + ':/cg/' +
fake_client.SM_DESTINATION_CG, sm_destination_cg,
'consistency_group_volumes': [ 'consistency_group_volumes': [
{'name': fake_client.SM_DEST_VOLUME}] {'name': fake_client.SM_DEST_VOLUME}]
} }
} }
else:
body = {
'source': {
'path': fake_client.SM_SOURCE_VSERVER + ':' +
fake_client.SM_SOURCE_VOLUME
},
'destination': {
'path': fake_client.SM_DEST_VSERVER + ':' +
fake_client.SM_DEST_VOLUME
},
}
if policy: if policy:
body['policy'] = {'name': policy} body['policy'] = {'name': policy}
if body is not None: if bool(body):
self.client.send_request.assert_has_calls([ self.client.send_request.assert_has_calls([
mock.call('/snapmirror/relationships/', 'post', body=body)]) mock.call('/snapmirror/relationships/', 'post', body=body)])