Skip to content

Commit de70ae6

Browse files
authored
Merge pull request #838 from sourabhjains/fadump-new-sysfs
testcases/PowerNVDump: use updated fadump sysfs files
2 parents 9695468 + 00929dd commit de70ae6

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

testcases/PowerNVDump.py

+10-10
Original file line numberDiff line numberDiff line change
@@ -192,20 +192,20 @@ def is_fadump_enabled(self):
192192
Method to verify fadump is enabled
193193
returns True if fadump is configured
194194
'''
195-
res = self.c.run_command("cat /sys/kernel/fadump_enabled")[-1]
195+
res = self.c.run_command("cat /sys/kernel/fadump/enabled")[-1]
196196
if int(res) == 1:
197197
return True
198198
elif int(res) == 0:
199199
return False
200200
else:
201-
raise Exception("Unknown fadump_enabled value")
201+
raise Exception("Unknown /sys/kernel/fadump/enabled value")
202202

203203
def is_fadump_supported(self):
204204
'''
205205
Methods checks if fadump is supported
206206
'''
207207
try:
208-
self.c.run_command("ls /sys/kernel/fadump_enabled")
208+
self.c.run_command("ls /sys/kernel/fadump/enabled")
209209
return True
210210
except CommandFailed:
211211
return False
@@ -293,12 +293,12 @@ def verify_fadump_reg(self):
293293
'''
294294
Enable and verify fadump registered by checking opal/dmesg logs
295295
'''
296-
res = self.c.run_command("cat /sys/kernel/fadump_registered")[-1]
296+
res = self.c.run_command("cat /sys/kernel/fadump/registered")[-1]
297297
if int(res) == 1:
298298
return True
299299
else:
300-
self.c.run_command("echo 1 > /sys/kernel/fadump_registered; sleep 10")
301-
self.c.run_command("cat /sys/kernel/fadump_registered")
300+
self.c.run_command("echo 1 > /sys/kernel/fadump/registered; sleep 10")
301+
self.c.run_command("cat /sys/kernel/fadump/registered")
302302

303303
if not self.is_lpar:
304304
self.c.run_command("dmesg > /tmp/dmesg_log")
@@ -328,16 +328,16 @@ def verify_fadump_unreg(self):
328328
'''
329329
Disable and verify fadump unregistered by checking opal/dmesg logs
330330
'''
331-
res = self.c.run_command("cat /sys/kernel/fadump_registered")[-1]
331+
res = self.c.run_command("cat /sys/kernel/fadump/registered")[-1]
332332
if int(res) == 0:
333333
return True
334334
else:
335-
self.c.run_command("echo 0 > /sys/kernel/fadump_registered; sleep 10")
335+
self.c.run_command("echo 0 > /sys/kernel/fadump/registered; sleep 10")
336336

337337
if not self.is_lpar:
338338
self.c.run_command("%s > /tmp/opal_log" % BMC_CONST.OPAL_MSG_LOG)
339339
self.c.run_command("dmesg > /tmp/dmesg_log")
340-
self.c.run_command("echo 0 > /sys/kernel/fadump_registered; sleep 10")
340+
self.c.run_command("echo 0 > /sys/kernel/fadump/registered; sleep 10")
341341

342342
opal_data = " ".join(self.c.run_command(
343343
"%s | diff -a /tmp/opal_log -" % BMC_CONST.OPAL_MSG_LOG))
@@ -667,7 +667,7 @@ def runTest(self):
667667
raise self.skipTest(
668668
"fadump not enabled in the kernel, does system has right firmware!!!")
669669
if not self.is_fadump_enabled():
670-
raise self.skipTest("fadump_enabled is off")
670+
raise self.skipTest("fadump is disabled")
671671
if self.distro == "ubuntu":
672672
self.cv_HOST.host_check_command("kdump")
673673
elif self.distro == "rhel":

0 commit comments

Comments
 (0)