summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--cinder/tests/unit/volume/drivers/netapp/dataontap/utils/test_data_motion.py4
-rw-r--r--cinder/volume/drivers/netapp/dataontap/utils/data_motion.py2
-rw-r--r--releasenotes/notes/netapp-fix-issue-while-ensuring-snapmirror-creation-bea36a69d443e86f.yaml9
3 files changed, 12 insertions, 3 deletions
diff --git a/cinder/tests/unit/volume/drivers/netapp/dataontap/utils/test_data_motion.py b/cinder/tests/unit/volume/drivers/netapp/dataontap/utils/test_data_motion.py
index 19a0bd14e..910005b90 100644
--- a/cinder/tests/unit/volume/drivers/netapp/dataontap/utils/test_data_motion.py
+++ b/cinder/tests/unit/volume/drivers/netapp/dataontap/utils/test_data_motion.py
@@ -748,7 +748,7 @@ class NetAppCDOTDataMotionMixinTestCase(test.TestCase):
fakes.PROVISIONING_OPTS['size'],
volume_type='dp', **expected_prov_opts)
mock_volume_state.assert_called_with(
- flexvol_name=self.dest_flexvol_name)
+ name=self.dest_flexvol_name)
mock_dedupe_enabled.assert_not_called()
mock_compression_enabled.assert_not_called()
@@ -812,7 +812,7 @@ class NetAppCDOTDataMotionMixinTestCase(test.TestCase):
fakes.PROVISIONING_OPTS['size'],
volume_type='dp', **expected_prov_opts)
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(
self.dest_flexvol_name)
mock_compression_enabled.assert_called_once_with(
diff --git a/cinder/volume/drivers/netapp/dataontap/utils/data_motion.py b/cinder/volume/drivers/netapp/dataontap/utils/data_motion.py
index 8ffcaffaa..5148ef362 100644
--- a/cinder/volume/drivers/netapp/dataontap/utils/data_motion.py
+++ b/cinder/volume/drivers/netapp/dataontap/utils/data_motion.py
@@ -508,7 +508,7 @@ class DataMotionMixin(object):
def _wait_volume_is_online():
volume_state = dest_client.get_volume_state(
- flexvol_name=dest_flexvol_name)
+ name=dest_flexvol_name)
if volume_state and volume_state == 'online':
raise loopingcall.LoopingCallDone()
diff --git a/releasenotes/notes/netapp-fix-issue-while-ensuring-snapmirror-creation-bea36a69d443e86f.yaml b/releasenotes/notes/netapp-fix-issue-while-ensuring-snapmirror-creation-bea36a69d443e86f.yaml
new file mode 100644
index 000000000..e799f56d6
--- /dev/null
+++ b/releasenotes/notes/netapp-fix-issue-while-ensuring-snapmirror-creation-bea36a69d443e86f.yaml
@@ -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.