openstack/cinder
Code Issues Proposed changes

Merge "NetApp ONTAP: Fix type error exception in get_volume_state"

Browse Source
This commit is contained in:
Zuul 2022-09-16 18:53:22 +00:00 committed by Gerrit Code Review
commit 7809711a22
3 changed files with 12 additions and 3 deletions
cinder
tests/unit/volume/drivers/netapp/dataontap/utils
test_data_motion.py
volume/drivers/netapp/dataontap/utils
data_motion.py
releasenotes/notes
netapp-fix-issue-while-ensuring-snapmirror-creation-bea36a69d443e86f.yaml

4
cinder/tests/unit/volume/drivers/netapp/dataontap/utils/test_data_motion.py

@ -748,7 +748,7 @@ class NetAppCDOTDataMotionMixinTestCase(test.TestCase):
fakes.PROVISIONING_OPTS['size'], fakes.PROVISIONING_OPTS['size'],
volume_type='dp', **expected_prov_opts) volume_type='dp', **expected_prov_opts)
mock_volume_state.assert_called_with( mock_volume_state.assert_called_with(
flexvol_name=self.dest_flexvol_name) name=self.dest_flexvol_name)
mock_dedupe_enabled.assert_not_called() mock_dedupe_enabled.assert_not_called()
mock_compression_enabled.assert_not_called() mock_compression_enabled.assert_not_called()
@ -812,7 +812,7 @@ class NetAppCDOTDataMotionMixinTestCase(test.TestCase):
fakes.PROVISIONING_OPTS['size'], fakes.PROVISIONING_OPTS['size'],
volume_type='dp', **expected_prov_opts) volume_type='dp', **expected_prov_opts)
mock_volume_state.assert_called_once_with( mock_volume_state.assert_called_once_with(
flexvol_name=self.dest_flexvol_name) name=self.dest_flexvol_name)
mock_dedupe_enabled.assert_called_once_with( mock_dedupe_enabled.assert_called_once_with(
self.dest_flexvol_name) self.dest_flexvol_name)
mock_compression_enabled.assert_called_once_with( mock_compression_enabled.assert_called_once_with(

2
cinder/volume/drivers/netapp/dataontap/utils/data_motion.py

@ -508,7 +508,7 @@ class DataMotionMixin(object):
def _wait_volume_is_online(): def _wait_volume_is_online():
volume_state = dest_client.get_volume_state( volume_state = dest_client.get_volume_state(
flexvol_name=dest_flexvol_name) name=dest_flexvol_name)
if volume_state and volume_state == 'online': if volume_state and volume_state == 'online':
raise loopingcall.LoopingCallDone() raise loopingcall.LoopingCallDone()

9
releasenotes/notes/netapp-fix-issue-while-ensuring-snapmirror-creation-bea36a69d443e86f.yaml Normal file

@ -0,0 +1,9 @@
---
fixes:
- |
NetApp ONTAP `bug #1958245
<https://bugs.launchpad.net/cinder/+bug/1958245>`_: In an ONTAP
flexgroup replication environment, snapmirror creation would
succeed but a driver bug caused an error message to be logged
for the cinder-volume service. The issue has been corrected in
this release.