diff options
| author | Zuul <zuul@review.opendev.org> | 2022-09-16 18:53:22 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2022-09-16 18:53:22 +0000 |
| commit | 7809711a22ac5fc001c7c68a84a03799484ef4d2 (patch) | |
| tree | bde42bc073524703a734dc974458ad94f6b17a2f | |
| parent | 9344c19fd44be944396436e22b0e1f2b98bcc0b5 (diff) | |
| parent | a4ea2db290f5671d8f64cec3972080ab37a32794 (diff) | |
| download | cinder-7809711a22ac5fc001c7c68a84a03799484ef4d2.tar.gz | |
Merge "NetApp ONTAP: Fix type error exception in get_volume_state"21.0.0.0rc1
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. |