Author: gnichols
Date: 2011-07-15 16:33:31 +0000 (Fri, 15 Jul 2011)
New Revision: 1014
Modified:
trunk/tests/kdump/kdump.py
Log:
521609 - v7 plan --server says server has error: /var/v7/export
Modified: trunk/tests/kdump/kdump.py
===================================================================
--- trunk/tests/kdump/kdump.py 2011-07-15 16:32:48 UTC (rev 1013)
+++ trunk/tests/kdump/kdump.py 2011-07-15 16:33:31 UTC (rev 1014)
@@ -74,9 +74,9 @@
def startServer(self):
os.system("service nfs start")
- dataDirectory = self.environment.getDataDirectory()
- exportDirectory = dataDirectory + '/export'
- for directory in (dataDirectory, exportDirectory):
+ serverDirectory = self.environment.getServerDirectory()
+ exportDirectory = os.path.join(serverDirectory,
self.environment.getServerExport())
+ for directory in (serverDirectory, exportDirectory):
try:
os.mkdir(directory)
print "Created %s" % directory
@@ -97,7 +97,7 @@
# changed from using "exportfs" since this is called via httpd/cgi,
and exportfs uses a
# lock file not readable by non-root users.F
exportfs = Command("cat /var/lib/nfs/etab")
- exportfs.getString(regex=".*%s/export" %
self.environment.getDataDirectory(), singleLine=False)
+ exportfs.getString(regex=".*%s/%s" %
(self.environment.getServerDirectory(), self.environment.getServerExport()),
singleLine=False)
print "%s/export is exported" %
self.environment.getDataDirectory()
except V7CommandException, exception:
print "Error: %s/export is not available" %
self.environment.getDataDirectory()
@@ -125,6 +125,9 @@
print "Checking kdump configuration"
# check crashkernel on kernel command line
+ # typical settings:
+ # ppc64: 512M@64M
+ # x86_64: 128M
kernelBootParams = Command("cat /proc/cmdline")
kdump = None
try:
@@ -180,8 +183,8 @@
elif self.getLogicalDeviceName() == Constants.nfs:
if self.getTestServer() and self.getTestServer() != "unknown":
# Note: the assumption is that the environment for the SUT is the same as
the environment
- # for the server being used - both have the same data directory setting.
- net = "%s:%s/export" % (self.getTestServer(),
self.environment.getDataDirectory())
+ # for the server being used - both have the same server directory
setting.
+ net = "%s:%s/export" % (self.getTestServer(),
self.environment.getServerDirectory(), self.environment.getServerExport())
print "Adding net %s to %s" % (net, self.kdumpConfigPath)
configFile.addParameter("net", net)
restart = True
Show replies by date