apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-02 11:52:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

LOUDSTACK-6861: Fixing nfs mount path

Browse Source
This commit is contained in:
Girish Shilamkar 2014-06-17 15:37:25 +05:30
parent 7e355de365
commit e054154ca0
1 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
tools/marvin/marvin/lib/utils.py
View File

@ -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]