From e054154ca03533ba01e4191003fd5c281ba3089b Mon Sep 17 00:00:00 2001
From: Girish Shilamkar <girish@clogeny.com>
Date: Tue, 17 Jun 2014 15:37:25 +0530
Subject: [PATCH] LOUDSTACK-6861: Fixing nfs mount path

---
 tools/marvin/marvin/lib/utils.py | 31 +++++++++++++++++++------------
 1 file changed, 19 insertions(+), 12 deletions(-)

diff --git a/tools/marvin/marvin/lib/utils.py b/tools/marvin/marvin/lib/utils.py
index b095911c2bb..c52e2774466 100644
--- a/tools/marvin/marvin/lib/utils.py
+++ b/tools/marvin/marvin/lib/utils.py
@@ -315,7 +315,7 @@ def is_snapshot_on_nfs(apiclient, dbconn, config, zoneid, snapshotid):
     nfsurl = secondaryStore.url
     from urllib2 import urlparse
     parse_url = urlparse.urlsplit(nfsurl, scheme='nfs')
-    host, path = parse_url.netloc, parse_url.path
+    host, path = str(parse_url.netloc), str(parse_url.path)
 
     if not config.mgtSvr:
         raise Exception("Your marvin configuration does not contain mgmt server credentials")
@@ -328,17 +328,24 @@ def is_snapshot_on_nfs(apiclient, dbconn, config, zoneid, snapshotid):
             user,
             passwd
         )
+
+        pathSeparator = "" #used to form host:dir format
+        if not host.endswith(':'):
+            pathSeparator= ":"
+
         cmds = [
-                "mkdir -p %s /mnt/tmp",
-                "mount -t %s %s%s /mnt/tmp" % (
-                    'nfs',
-                    host,
-                    path,
-                    ),
-                "test -f %s && echo 'snapshot exists'" % (
-                    os.path.join("/mnt/tmp", snapshotPath)
-                    ),
-            ]
+
+            "mkdir -p %s /mnt/tmp",
+            "mount -t %s %s%s%s /mnt/tmp" % (
+                'nfs',
+                host,
+                pathSeparator,
+                path,
+            ),
+            "test -f %s && echo 'snapshot exists'" % (
+                os.path.join("/mnt/tmp", snapshotPath)
+            ),
+        ]
 
         for c in cmds:
             result = ssh_client.execute(c)
@@ -494,4 +501,4 @@ def verifyRouterState(apiclient, routerid, allowedstates):
         return [FAIL, "Redundant state of the router should be in %s but is %s" %
             (allowedstates, routers[0].redundantstate)]
     return [PASS, None]
-        
\ No newline at end of file
+