nms.folder.create_with_opts not supported on Nexenta 3.1.4.2

nms.folder.create_with_opts method not supported on early NexentaStor
version (3.1.4.2). replace if with create_with_props.

Closes-Bug: #1225094
Change-Id: I0c861ae8d966d53c6484e7ded8cab71f395fa059

diff --git a/cinder/tests/test_nexenta.py b/cinder/tests/test_nexenta.py
index b301395fe5746d28d9ff83021eeaafe3faaf1341..0965cdcd075005a61ae54e68f32d0857da04de85 100644 (file)
--- a/cinder/tests/test_nexenta.py
+++ b/cinder/tests/test_nexenta.py
@@ -451,7 +451,7 @@ class TestNexentaNfsDriver(test.TestCase):
 
         compression = self.configuration.nexenta_volume_compression
         self.nms_mock.server.get_prop('volroot').AndReturn('/volumes')
-        self.nms_mock.folder.create_with_opts(
+        self.nms_mock.folder.create_with_props(
             'stack', 'share/volume-1', {'compression': compression})
         self.nms_mock.netstorsvc.share_folder(self.TEST_SHARE_SVC,
                                               'stack/share/volume-1',
@@ -470,7 +470,7 @@ class TestNexentaNfsDriver(test.TestCase):
         self.mox.ResetAll()
 
         self.nms_mock.server.get_prop('volroot').AndReturn('/volumes')
-        self.nms_mock.folder.create_with_opts(
+        self.nms_mock.folder.create_with_props(
             'stack', 'share/volume-1', {'compression': compression})
         self.nms_mock.netstorsvc.share_folder(
             self.TEST_SHARE_SVC, 'stack/share/volume-1',

diff --git a/cinder/volume/drivers/nexenta/nfs.py b/cinder/volume/drivers/nexenta/nfs.py
index 2aa7f938d16141f3d675992003126760ab260f52..e3b29815939bf5144bd0e61e2b4cdb527dde05aa 100644 (file)
--- a/cinder/volume/drivers/nexenta/nfs.py
+++ b/cinder/volume/drivers/nexenta/nfs.py
@@ -102,7 +102,7 @@ class NexentaNfsDriver(nfs.NfsDriver):  # pylint: disable=R0921
         vol, dataset = self._get_share_datasets(nfs_share)
         folder = '%s/%s' % (dataset, volume['name'])
         LOG.debug(_('Creating folder on Nexenta Store %s'), folder)
-        nms.folder.create_with_opts(
+        nms.folder.create_with_props(
             vol, folder,
             {'compression': self.configuration.nexenta_volume_compression}
         )