Changing FFDC package structure

Change-Id: I150b6e094660e8b639296ee313994c0bd41cf6ee
RTC: 160155
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/29236
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Sachin Gupta <sgupta2m@in.ibm.com>
Reviewed-by: AMIT J. TENDOLKAR <amit.tendolkar@in.ibm.com>

2 files changed, 16 insertions, 3 deletions

diff --git a/src/test/testcases/testSbeDump.py b/src/test/testcases/testSbeDump.py
index 184a70e8..3b273cdf 100644
--- a/src/test/testcases/testSbeDump.py
+++ b/src/test/testcases/testSbeDump.py
@@ -50,6 +50,12 @@ def main():
         raise Exception('data mistmach')
     packLen = ((data[2] << 8) | data[3])
     print ("\nFFDC package length = " + str(packLen))
+    # extract Sequence ID, Command class and command
+    data = testUtil.readDsEntryReturnVal()
+    seqId = ((data[0] << 24) | (data[1] << 16))
+    cmdClass = data[2]
+    cmd = data[3]
+    print ("\n SeqId ["+str(seqId)+"] CmdClass ["+str(cmdClass)+"] Cmd ["+str(cmd)+"]")
 
     data = testUtil.readDsEntryReturnVal()
     fapiRc = ((data[0] << 24) | (data[1] << 16) | (data[2] << 8) | data[3])
diff --git a/src/test/testcases/testUtil.py b/src/test/testcases/testUtil.py
index b92fda60..133efcc5 100644
--- a/src/test/testcases/testUtil.py
+++ b/src/test/testcases/testUtil.py
@@ -6,6 +6,7 @@
 # OpenPOWER sbe Project
 #
 # Contributors Listed Below - COPYRIGHT 2015,2016
+# [+] International Business Machines Corp.
 #
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -157,15 +158,21 @@ def extractHWPFFDC(dumpToFile = False):
         raise Exception('data mistmach')
     packLen = ((data[2] << 8) | data[3])
     print ("\nFFDC package length = " + str(packLen))
+    # extract Sequence ID, Command class and command
+    data = readDsEntryReturnVal()
+    seqId = ((data[0] << 24) | (data[1] << 16))
+    cmdClass = data[2]
+    cmd = data[3]
+    print ("\n SeqId ["+str(seqId)+"] CmdClass ["+str(cmdClass)+"] Cmd ["+str(cmd)+"]")
 
     data = readDsEntryReturnVal()
     fapiRc = ((data[0] << 24) | (data[1] << 16) | (data[2] << 8) | data[3])
     print ("\nFAPI rc = " + str(hex(fapiRc)))
 
     if(dumpToFile):
-        myBin = open('trace.bin', 'wb')
-        print ("\nwriting "+'trace.bin')
-    for i in range(0, packLen-2):
+        myBin = open('hwp_ffdc.bin', 'wb')
+        print ("\nwriting "+'hwp_ffdc.bin')
+    for i in range(0, packLen-3):
         data = readDsEntryReturnVal()
         if(dumpToFile):
             myBin.write(bytearray(data))