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 71dfeff7219..887539f4d53 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
@@ -739,7 +739,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()
 
@@ -803,7 +803,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 c696767b4f7..231aa6f659d 100644
--- a/cinder/volume/drivers/netapp/dataontap/utils/data_motion.py
+++ b/cinder/volume/drivers/netapp/dataontap/utils/data_motion.py
@@ -507,7 +507,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 00000000000..e799f56d6b9
--- /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.