CP-38283: allow any NFS 4.x version

Allow to explicitly set any 4.x versions with nfsversion= for testing purposes. Note that we do not yet support NFS version >4.1 for production use. Signed-off-by: Edwin Török <edvin.torok@citrix.com>
xapi-project · Oct 4, 2021 · 6fbff68 · 6fbff68
1 parent e121864
commit 6fbff68
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/drivers/nfs.py b/drivers/nfs.py
@@ -112,7 +112,7 @@ def validate_nfsversion(nfsversion):
     if not nfsversion:
         nfsversion = DEFAULT_NFSVERSION
     else:
-        if nfsversion not in ['3', '4', '4.0', '4.1']:
+        if not (nfsversion == '3' or nfsversion.startswith('4')):
             raise NfsException("Invalid nfsversion.")
     return nfsversion
 

diff --git a/tests/test_nfs.py b/tests/test_nfs.py
@@ -151,7 +151,7 @@ def test_validate_nfsversion_default(self):
             self.assertEquals(nfs.validate_nfsversion(thenfsversion), '3')
 
     def test_validate_nfsversion_valid(self):
-        for thenfsversion in ['3', '4', '4.0', '4.1']:
+        for thenfsversion in ['3', '4', '4.0', '4.1', '4.2']:
             self.assertEquals(nfs.validate_nfsversion(thenfsversion),
                               thenfsversion)