diff --git a/manila/share/drivers/netapp/dataontap/protocols/nfs_cmode.py b/manila/share/drivers/netapp/dataontap/protocols/nfs_cmode.py index 2f02ff961a..55464ae04b 100644 --- a/manila/share/drivers/netapp/dataontap/protocols/nfs_cmode.py +++ b/manila/share/drivers/netapp/dataontap/protocols/nfs_cmode.py @@ -33,6 +33,7 @@ class NetAppCmodeNFSHelper(base.NetAppBaseHelper): @na_utils.trace def create_share(self, share, share_name, export_addresses): """Creates NFS share.""" + self._client.clear_nfs_export_policy_for_volume(share_name) self._ensure_export_policy(share, share_name) export_path = self._client.get_volume_junction_path(share_name) return [':'.join([export_address, export_path]) diff --git a/manila/tests/share/drivers/netapp/dataontap/protocols/test_nfs_cmode.py b/manila/tests/share/drivers/netapp/dataontap/protocols/test_nfs_cmode.py index 94b28ea4d1..66459776de 100644 --- a/manila/tests/share/drivers/netapp/dataontap/protocols/test_nfs_cmode.py +++ b/manila/tests/share/drivers/netapp/dataontap/protocols/test_nfs_cmode.py @@ -50,6 +50,8 @@ class NetAppClusteredNFSHelperTestCase(test.TestCase): expected = [':'.join([fake.SHARE_ADDRESS_1, fake.NFS_SHARE_PATH])] self.assertEqual(expected, result) + self.mock_client.clear_nfs_export_policy_for_volume.\ + assert_called_once_with(fake.SHARE_NAME) self.assertTrue(mock_ensure_export_policy.called) def test_create_share_multiple(self): @@ -67,6 +69,8 @@ class NetAppClusteredNFSHelperTestCase(test.TestCase): expected = [':'.join([fake.SHARE_ADDRESS_1, fake.NFS_SHARE_PATH]), ':'.join([fake.SHARE_ADDRESS_2, fake.NFS_SHARE_PATH])] self.assertEqual(expected, result) + self.mock_client.clear_nfs_export_policy_for_volume.\ + assert_called_once_with(fake.SHARE_NAME) self.assertTrue(mock_ensure_export_policy.called) def test_delete_share(self): @@ -226,4 +230,4 @@ class NetAppClusteredNFSHelperTestCase(test.TestCase): self.assertFalse(self.mock_client.create_nfs_export_policy.called) self.mock_client.rename_nfs_export_policy.assert_called_once_with( - 'fake', fake.EXPORT_POLICY_NAME) \ No newline at end of file + 'fake', fake.EXPORT_POLICY_NAME)