Hostboot-aware errl tool part 1.

Change-Id: Ibe49dc935206775de032d397b2800a7b83208283
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/630
Tested-by: Jenkins Server
Reviewed-by: Monte K. Copeland <copelanm@us.ibm.com>

2 files changed, 37 insertions, 29 deletions

diff --git a/src/usr/errl/test/errltest.H b/src/usr/errl/test/errltest.H
index 817bcee89..4e186a98e 100644
--- a/src/usr/errl/test/errltest.H
+++ b/src/usr/errl/test/errltest.H
@@ -32,12 +32,13 @@
 #include <cxxtest/TestSuite.H>
 #include <errl/errlmanager.H>
 #include <errl/errlentry.H>
+#include <errl/errlreasoncodes.H>
 #include <trace/trace.H>
 #include <hbotcompid.H>
 
-#define TEST_REASON_CODE    (ERRL_COMP_ID | 0x0F)
+
 #define TEST_SEVERITY       ERRORLOG::ERRL_SEV_INFORMATIONAL
-#define TEST_MOD_ID         0x0022
+
 
 #define TEST_USR_8BIT_1    0x80
 #define TEST_USR_8BIT_2    0x93
@@ -92,12 +93,19 @@ public:
 
         do
         {
+            /*@
+             * @errortype
+             * @reasoncode  HBERRL_TEST_REASON_CODE
+             * @severity    ERRORLOG::ERRL_SEV_INFORMATIONAL
+             * @moduleid    HBERRL_TEST_MOD_ID
+             * @devdesc     Errl test, errl log the first.
+             */
 
             // Create an error log
             errlHndl_t l_err = new ERRORLOG::ErrlEntry(
                                     ERRORLOG::ERRL_SEV_INFORMATIONAL,
-                                    TEST_MOD_ID,
-                                    TEST_REASON_CODE,
+                                    HBERRL_TEST_MOD_ID,
+                                    HBERRL_TEST_REASON_CODE,
                                     l_userData1,
                                     l_userData2);
 
@@ -115,7 +123,7 @@ public:
             // for it.  addFFDC() should return a Boolean indication of success.
 
             const char * pch = "martha washington";
-            pffdc = l_err->addFFDC( ERRL_COMP_ID, pch, strlen( pch ), 1, 2 );
+            pffdc = l_err->addFFDC( HBERRL_COMP_ID, pch, strlen( pch ), 0, HBERRL_SST_FIRSTLADY );
             if ( NULL == pffdc )
             {
                 TS_FAIL("testErrl1: addFFDC() output NULL pointer");
@@ -124,7 +132,7 @@ public:
 
             // really short user data
             pch = "A";
-            pffdc = l_err->addFFDC( DEVFW_COMP_ID, pch, strlen( pch ), 3, 4 );
+            pffdc = l_err->addFFDC( DEVFW_COMP_ID, pch, strlen( pch ));
             if ( NULL == pffdc )
             {
                 TS_FAIL("testErrl1: addFFDC() output NULL pointer");
@@ -132,7 +140,7 @@ public:
             }
 
             pch = "george washington";
-            pffdc = l_err->addFFDC( DEVFW_COMP_ID, pch, strlen( pch ), 3, 4 );
+            pffdc = l_err->addFFDC( DEVFW_COMP_ID, pch, strlen( pch ), 0, HBERRL_SST_PRESIDENT  );
             if ( NULL == pffdc )
             {
                 TS_FAIL("testErrl1: addFFDC() output NULL pointer");
@@ -140,7 +148,7 @@ public:
             }
 
             pch = "dwight eisenhour";
-            pffdc = l_err->addFFDC( SCOM_COMP_ID, pch, strlen( pch ), 5, 6 );
+            pffdc = l_err->addFFDC( SCOM_COMP_ID, pch, strlen( pch ), 1, 12 );
             if ( NULL == pffdc )
             {
                 TS_FAIL("testErrl1: addFFDC() output NULL pointer");
@@ -148,7 +156,7 @@ public:
             }
 
             pch = "ronald ";
-            pffdc = l_err->addFFDC( ERRL_COMP_ID, pch, strlen( pch ), 7, 8 );
+            pffdc = l_err->addFFDC( HBERRL_COMP_ID, pch, strlen( pch ), 0, HBERRL_SST_PRESIDENT );
             if ( NULL == pffdc )
             {
                 TS_FAIL("testErrl1: addFFDC() output NULL pointer");
@@ -209,7 +217,7 @@ public:
             if( !fOK )
             {
                 // cb is big enough for the header only, but no
-                // room for any entries. 
+                // room for any entries.
                 TS_FAIL( "collectTrace(TARG,l_cb) rets false", l_cb );
                 break;
             }
@@ -227,7 +235,7 @@ public:
 
 
             // Add null data.
-            pffdc = l_err->addFFDC( ERRL_COMP_ID, NULL, 0,  9, 10 );
+            pffdc = l_err->addFFDC( HBERRL_COMP_ID, NULL, 0,  9, 10 );
             if ( NULL != pffdc )
             {
                 TS_FAIL("testErrl1: addFFDC() returned non null");
@@ -241,7 +249,7 @@ public:
                 break;
             }
 
-            if (l_err->reasonCode() != TEST_REASON_CODE)
+            if (l_err->reasonCode() != HBERRL_TEST_REASON_CODE)
             {
                 TS_FAIL("testErrl1: createErrlLog() returns incorrect reason code!");
                 break;
@@ -308,8 +316,8 @@ public:
         // Create an error log
         errlHndl_t l_err = new ERRORLOG::ErrlEntry(
                                 ERRORLOG::ERRL_SEV_UNRECOVERABLE,
-                                TEST_MOD_ID,
-                                TEST_REASON_CODE,
+                                HBERRL_TEST_MOD_ID,
+                                HBERRL_TEST_REASON_CODE,
                                 l_userData1,
                                 l_userData2);
 
diff --git a/src/usr/errl/test/errluserdetailtest.H b/src/usr/errl/test/errluserdetailtest.H
index 5d0d94682..b32a655f0 100644
--- a/src/usr/errl/test/errluserdetailtest.H
+++ b/src/usr/errl/test/errluserdetailtest.H
@@ -201,16 +201,16 @@ public:
         /*@
         * @errortype
         * @severity ERRORLOG_SEV_INFORMATIONAL
-        * @moduleid ERRL_USERDETAILS_MODULE_ID
-        * @reasoncode ERRL_FILENAME_TEST
+        * @moduleid HBERRL_USERDETAILS_MODULE_ID
+        * @reasoncode HBERRL_FILENAME_TEST
         * @userdata1 <UNUSED>
         * @userdata2 <UNUSED>
         * @devdesc  User Details unit test - post a filename user data section
         */
         l_errl = new ERRORLOG::ErrlEntry(
                 ERRORLOG::ERRL_SEV_INFORMATIONAL,
-                ERRL_USERDETAILS_MODULE_ID,
-                ERRL_FILENAME_TEST,             //  compid/reasoncode
+                HBERRL_USERDETAILS_MODULE_ID,
+                HBERRL_FILENAME_TEST,             //  compid/reasoncode
                 0x1234567890,                   //  user1
                 0x9876543210 );                 //  user2
         if( l_errl   ==   NULL )
@@ -235,7 +235,7 @@ public:
         l_FN_userdata.addToLog( l_errl, testfnstr2, sizeof(testfnstr2) );
 
         // commit the errorlog
-        errlCommit(l_errl, ERRL_COMP_ID );
+        errlCommit(l_errl, HBERRL_COMP_ID );
 
         //  Maybe do some stuff here to find the committed errorlog back and
         //  see if it is still correct?  Later.
@@ -254,8 +254,8 @@ public:
         /*@
         * @errortype
         * @severity ERRORLOG_SEV_INFORMATIONAL
-        * @moduleid ERRL_USERDETAILS_MODULE_ID
-        * @reasoncode ERRL_ERRORMSG_TEST
+        * @moduleid HBERRL_USERDETAILS_MODULE_ID
+        * @reasoncode HBERRL_ERRORMSG_TEST
         * @userdata1 <UNUSED>
         * @userdata2 <UNUSED>
         * @devdesc  User Details unit test - post an error message in a
@@ -263,8 +263,8 @@ public:
         */
         l_errl = new ERRORLOG::ErrlEntry(
                 ERRORLOG::ERRL_SEV_INFORMATIONAL,
-                ERRL_USERDETAILS_MODULE_ID,
-                ERRL_ERRORMSG_TEST,             //  compid/reasoncode
+                HBERRL_USERDETAILS_MODULE_ID,
+                HBERRL_ERRORMSG_TEST,             //  compid/reasoncode
                 0x1212121212,                   //  user1
                 0x3434343434 );                 //  user2
         if( l_errl   ==   NULL )
@@ -280,7 +280,7 @@ public:
         l_userdata.addToLog( l_errl );
 
         // commit the errorlog
-        errlCommit(l_errl, ERRL_COMP_ID );
+        errlCommit(l_errl, HBERRL_COMP_ID );
 
     }
 
@@ -296,8 +296,8 @@ public:
         /*@
         * @errortype
         * @severity ERRORLOG_SEV_INFORMATIONAL
-        * @moduleid ERRL_USERDETAILS_MODULE_ID
-        * @reasoncode ERRL_XMLTOKEN_TEST
+        * @moduleid HBERRL_USERDETAILS_MODULE_ID
+        * @reasoncode HBERRL_XMLTOKEN_TEST
         * @userdata1 <UNUSED>
         * @userdata2 <UNUSED>
         * @devdesc  User Details unit test - post an XML token in error as
@@ -305,8 +305,8 @@ public:
         */
         l_errl = new ERRORLOG::ErrlEntry(
                 ERRORLOG::ERRL_SEV_INFORMATIONAL,
-                ERRL_USERDETAILS_MODULE_ID,
-                ERRL_XMLTOKEN_TEST,             //  compid/reasoncode
+                HBERRL_USERDETAILS_MODULE_ID,
+                HBERRL_XMLTOKEN_TEST,             //  compid/reasoncode
                 0xa5a5a5a5a5,                   //  user1
                 0xd2d2d2d2d2 );                 //  user2
         if( l_errl   ==   NULL )
@@ -322,7 +322,7 @@ public:
          l_userdata.addToLog( l_errl );
 
         // commit the errorlog
-        errlCommit( l_errl, ERRL_COMP_ID );
+        errlCommit( l_errl, HBERRL_COMP_ID );
 
     }