Merge branch 'CP-11278'

Signed-off-by: Siddharth Vinothkumar <siddharth.vinothkumar@citrix.com> GitHub: closes #247 on xapi-project/sm
xapi-project · Mar 4, 2015 · 38c9a0e · 38c9a0e
2 parents 22e1fd7 + 03f01bc
commit 38c9a0e
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 8 deletions.
diff --git a/drivers/NFSSR.py b/drivers/NFSSR.py
@@ -59,7 +59,7 @@
 PROBE_MOUNTPOINT = "probe"
 NFSPORT = 2049
 DEFAULT_TRANSPORT = "tcp"
-
+PROBEVERSION = 'probeversion'
 
 class NFSSR(FileSR.FileSR):
     """NFS file-based storage repository"""
@@ -110,17 +110,25 @@ def validate_remotepath(self, scan):
 
     def check_server(self):
         try:
-            nfs.check_server_tcp(self.remoteserver, self.nfsversion)
+            if self.dconf.has_key(PROBEVERSION):
+                nfs.check_server_tcp(self.remoteserver)
+            else:
+                nfs.check_server_tcp(self.remoteserver, self.nfsversion)
         except nfs.NfsException, exc:
             raise xs_errors.XenError('NFSVersion',
                                      opterr=exc.errstr)
 
 
     def mount(self, mountpoint, remotepath, timeout = 0):
         try:
-            nfs.soft_mount(
-                mountpoint, self.remoteserver, remotepath, self.transport,
-                timeout=timeout, nfsversion=self.nfsversion)
+            if self.dconf.has_key(PROBEVERSION):
+                nfs.soft_mount(
+                    mountpoint, self.remoteserver, remotepath, self.transport,
+                    timeout=timeout)
+            else:
+                nfs.soft_mount(
+                    mountpoint, self.remoteserver, remotepath, self.transport,
+                    timeout=timeout, nfsversion=self.nfsversion)
         except nfs.NfsException, exc:
             raise xs_errors.XenError('NFSMount', opterr=exc.errstr)
 
@@ -151,7 +159,7 @@ def probe(self):
 
         self.mount(temppath, self.remotepath)
         try:
-            return nfs.scan_srlist(temppath)
+            return nfs.scan_srlist(temppath, self.dconf)
         finally:
             try:
                 nfs.unmount(temppath, True)

diff --git a/drivers/nfs.py b/drivers/nfs.py
@@ -170,7 +170,7 @@ def scan_exports(target):
     return dom
 
 
-def scan_srlist(path):
+def scan_srlist(path, dconf):
     """Scan and report SR, UUID."""
     dom = xml.dom.minidom.Document()
     element = dom.createElement("SRlist")
@@ -189,4 +189,32 @@ def scan_srlist(path):
         textnode = dom.createTextNode(val)
         subentry.appendChild(textnode)
 
+    from NFSSR import PROBEVERSION
+    if dconf.has_key(PROBEVERSION):
+        util.SMlog("Add supported nfs versions to sr-probe")
+        supported_versions = get_supported_nfs_versions(dconf.get('server'))
+        supp_ver = dom.createElement("SupportedVersions")
+        element.appendChild(supp_ver)
+
+        for ver in supported_versions:
+            version = dom.createElement('Version')
+            supp_ver.appendChild(version)
+            textnode = dom.createTextNode(ver)
+            version.appendChild(textnode)
+
     return dom.toprettyxml()
+
+
+def get_supported_nfs_versions(server):
+    """Return list of supported nfs versions."""
+    valid_versions = ['3', '4']
+    supported_versions = []
+    try:
+        ns = util.pread2([RPCINFO_BIN, "-t", "%s" % server, "nfs"])
+        for l in ns.strip().split("\n"):
+            if l.split()[3] in valid_versions:
+                supported_versions.append(l.split()[3])
+
+        return supported_versions
+    except:
+        util.SMlog("Unable to obtain list of valid nfs versions")
diff --git a/tests/test_NFSSR.py b/tests/test_NFSSR.py
@@ -27,7 +27,8 @@ def create_nfssr(self, server='aServer', serverpath='/aServerpath',
         if nfsversion:
             srcmd.dconf.update({'nfsversion': nfsversion})
         srcmd.params = {
-            'command': 'some_command'
+            'command': 'some_command',
+            'device_config': {}
         }
         nfssr = FakeNFSSR(srcmd, None)
         nfssr.load(sr_uuid)