diff --git a/cinder/tests/unit/volume/drivers/vmware/test_fcd.py b/cinder/tests/unit/volume/drivers/vmware/test_fcd.py index 80c640317a1..eb67e051497 100644 --- a/cinder/tests/unit/volume/drivers/vmware/test_fcd.py +++ b/cinder/tests/unit/volume/drivers/vmware/test_fcd.py @@ -144,7 +144,9 @@ class VMwareVStorageObjectDriverTestCase(test.TestCase): exp_req = {hub.DatastoreSelector.SIZE_BYTES: size_bytes} if preallocated: exp_req[hub.DatastoreSelector.HARD_AFFINITY_DS_TYPE] = ( - {hub.DatastoreType.NFS, hub.DatastoreType.VMFS}) + {hub.DatastoreType.NFS, + hub.DatastoreType.VMFS, + hub.DatastoreType.NFS41}) select_datastore.assert_called_once_with(exp_req) vops.get_dc.assert_called_once_with(host) vops.create_datastore_folder.assert_called_once_with( diff --git a/cinder/tests/unit/volume/drivers/vmware/test_vmware_vmdk.py b/cinder/tests/unit/volume/drivers/vmware/test_vmware_vmdk.py index 9969d8d6364..37867adf3f5 100644 --- a/cinder/tests/unit/volume/drivers/vmware/test_vmware_vmdk.py +++ b/cinder/tests/unit/volume/drivers/vmware/test_vmware_vmdk.py @@ -1042,7 +1042,9 @@ class VMwareVcVmdkDriverTestCase(test.TestCase): exp_req = { hub.DatastoreSelector.SIZE_BYTES: image_size, hub.DatastoreSelector.HARD_AFFINITY_DS_TYPE: - {hub.DatastoreType.VMFS, hub.DatastoreType.NFS}} + {hub.DatastoreType.VMFS, + hub.DatastoreType.NFS, + hub.DatastoreType.NFS41}} select_datastore.assert_called_once_with(exp_req) vops.create_datastore_folder.assert_called_once_with( ds_name, vmdk.TMP_IMAGES_DATASTORE_FOLDER_PATH, dc) diff --git a/cinder/volume/drivers/vmware/datastore.py b/cinder/volume/drivers/vmware/datastore.py index 5de7fb20d8c..9d0bf24d416 100644 --- a/cinder/volume/drivers/vmware/datastore.py +++ b/cinder/volume/drivers/vmware/datastore.py @@ -37,8 +37,9 @@ class DatastoreType(object): VMFS = "vmfs" VSAN = "vsan" VVOL = "vvol" + NFS41 = "nfs41" - _ALL_TYPES = {NFS, VMFS, VSAN, VVOL} + _ALL_TYPES = {NFS, VMFS, VSAN, VVOL, NFS41} @staticmethod def get_all_types(): diff --git a/cinder/volume/drivers/vmware/vmdk.py b/cinder/volume/drivers/vmware/vmdk.py index 02df68b1ca5..948ed406655 100644 --- a/cinder/volume/drivers/vmware/vmdk.py +++ b/cinder/volume/drivers/vmware/vmdk.py @@ -263,7 +263,8 @@ class VMwareVcVmdkDriver(driver.VolumeDriver): # 3.1.0 - support adapter type change using retype # 3.2.0 - config option to disable lazy creation of backend volume # 3.3.0 - config option to specify datastore name regex - VERSION = '3.3.0' + # 3.4.0 - added NFS41 as a supported datastore type + VERSION = '3.4.0' # ThirdPartySystems wiki page CI_WIKI_NAME = "VMware_CI" diff --git a/releasenotes/notes/vmware_vmdk_nfs41-450908bbbc9eea6d.yaml b/releasenotes/notes/vmware_vmdk_nfs41-450908bbbc9eea6d.yaml new file mode 100644 index 00000000000..d2de9602251 --- /dev/null +++ b/releasenotes/notes/vmware_vmdk_nfs41-450908bbbc9eea6d.yaml @@ -0,0 +1,5 @@ +--- +features: + - | + VMware VMDK driver and FCD driver now support NFS 4.1 + datastores in vCenter server.