openstack/cinder
Code Issues Proposed changes

VMware: Adding NFS41 datastore as supported

Browse Source 
vSphere 6.0 supports datastores backed by NFS 4.1.
Adding NFS 4.1 based datastores as supported.

Closes-bug: #1751950
Change-Id: Id0f04f1055b0d94447916963da071efc4bd92c82
This commit is contained in:
Vipin Balachandran 2018-03-12 16:14:46 -07:00
parent 4cf0ca24d0
commit 68e3b4a1d5
5 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cinder/tests/unit/volume/drivers/vmware/test_fcd.py
View File

@ -144,7 +144,9 @@ class VMwareVStorageObjectDriverTestCase(test.TestCase):
exp_req = {hub.DatastoreSelector.SIZE_BYTES: size_bytes} exp_req = {hub.DatastoreSelector.SIZE_BYTES: size_bytes}
if preallocated: if preallocated:
exp_req[hub.DatastoreSelector.HARD_AFFINITY_DS_TYPE] = ( 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) select_datastore.assert_called_once_with(exp_req)
vops.get_dc.assert_called_once_with(host) vops.get_dc.assert_called_once_with(host)
vops.create_datastore_folder.assert_called_once_with( vops.create_datastore_folder.assert_called_once_with(

4
cinder/tests/unit/volume/drivers/vmware/test_vmware_vmdk.py
View File

@ -1042,7 +1042,9 @@ class VMwareVcVmdkDriverTestCase(test.TestCase):
exp_req = { exp_req = {
hub.DatastoreSelector.SIZE_BYTES: image_size, hub.DatastoreSelector.SIZE_BYTES: image_size,
hub.DatastoreSelector.HARD_AFFINITY_DS_TYPE: 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) select_datastore.assert_called_once_with(exp_req)
vops.create_datastore_folder.assert_called_once_with( vops.create_datastore_folder.assert_called_once_with(
ds_name, vmdk.TMP_IMAGES_DATASTORE_FOLDER_PATH, dc) ds_name, vmdk.TMP_IMAGES_DATASTORE_FOLDER_PATH, dc)

3
cinder/volume/drivers/vmware/datastore.py
View File

@ -37,8 +37,9 @@ class DatastoreType(object):
VMFS = "vmfs" VMFS = "vmfs"
VSAN = "vsan" VSAN = "vsan"
VVOL = "vvol" VVOL = "vvol"
NFS41 = "nfs41"
_ALL_TYPES = {NFS, VMFS, VSAN, VVOL} _ALL_TYPES = {NFS, VMFS, VSAN, VVOL, NFS41}
@staticmethod @staticmethod
def get_all_types(): def get_all_types():

3
cinder/volume/drivers/vmware/vmdk.py
View File

@ -263,7 +263,8 @@ class VMwareVcVmdkDriver(driver.VolumeDriver):
# 3.1.0 - support adapter type change using retype # 3.1.0 - support adapter type change using retype
# 3.2.0 - config option to disable lazy creation of backend volume # 3.2.0 - config option to disable lazy creation of backend volume
# 3.3.0 - config option to specify datastore name regex # 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 # ThirdPartySystems wiki page
CI_WIKI_NAME = "VMware_CI" CI_WIKI_NAME = "VMware_CI"

5
releasenotes/notes/vmware_vmdk_nfs41-450908bbbc9eea6d.yaml Normal file
View File

@ -0,0 +1,5 @@
---
features:
- |
VMware VMDK driver and FCD driver now support NFS 4.1
datastores in vCenter server.