From a586b1b28d362a2d0d009c558417fcf6ea324038 Mon Sep 17 00:00:00 2001 From: Gary Kotton Date: Mon, 4 May 2015 10:07:35 -0700 Subject: [PATCH] VMware: add support for NFS 4.1 ESX 6.0 supports NFS 4.1. This patch enables NFS 4.1 support. Closes-bug: #1451834 DocImpact: The driver will now support NFS version 4.1 Change-Id: I31cd846e5c87dc3de46cc2ec17ce062bf0285221 --- .../unit/virt/vmwareapi/test_ds_util_datastore_selection.py | 1 + nova/virt/vmwareapi/constants.py | 1 + nova/virt/vmwareapi/ds_util.py | 1 + 3 files changed, 3 insertions(+) diff --git a/nova/tests/unit/virt/vmwareapi/test_ds_util_datastore_selection.py b/nova/tests/unit/virt/vmwareapi/test_ds_util_datastore_selection.py index dcaf023155ba..6c85014a0a4a 100644 --- a/nova/tests/unit/virt/vmwareapi/test_ds_util_datastore_selection.py +++ b/nova/tests/unit/virt/vmwareapi/test_ds_util_datastore_selection.py @@ -147,6 +147,7 @@ class VMwareDSUtilDatastoreSelectionTestCase(test.NoDBTestCase): data = [ ['VMFS', 'spam-good', True, 20 * units.Gi, 10 * units.Gi], ['NFS', 'eggs-good', True, 40 * units.Gi, 15 * units.Gi], + ['NFS41', 'nfs41-is-good', True, 35 * units.Gi, 12 * units.Gi], ['BAD', 'some-name-bad', True, 30 * units.Gi, 20 * units.Gi], ['VMFS', 'some-name-good', True, 50 * units.Gi, 5 * units.Gi], ['VMFS', 'some-other-good', True, 10 * units.Gi, 10 * units.Gi], diff --git a/nova/virt/vmwareapi/constants.py b/nova/virt/vmwareapi/constants.py index 1febc81b62c0..f3ee48be582d 100644 --- a/nova/virt/vmwareapi/constants.py +++ b/nova/virt/vmwareapi/constants.py @@ -34,6 +34,7 @@ DISK_TYPE_EAGER_ZEROED_THICK = 'eagerZeroedThick' DATASTORE_TYPE_VMFS = 'VMFS' DATASTORE_TYPE_NFS = 'NFS' +DATASTORE_TYPE_NFS41 = 'NFS41' DATASTORE_TYPE_VSAN = 'vsan' DEFAULT_VIF_MODEL = network_model.VIF_MODEL_E1000 diff --git a/nova/virt/vmwareapi/ds_util.py b/nova/virt/vmwareapi/ds_util.py index b37597e89f94..5b35a7616237 100644 --- a/nova/virt/vmwareapi/ds_util.py +++ b/nova/virt/vmwareapi/ds_util.py @@ -31,6 +31,7 @@ from nova.virt.vmwareapi import vm_util LOG = logging.getLogger(__name__) ALL_SUPPORTED_DS_TYPES = frozenset([constants.DATASTORE_TYPE_VMFS, constants.DATASTORE_TYPE_NFS, + constants.DATASTORE_TYPE_NFS41, constants.DATASTORE_TYPE_VSAN])