Separate attr override section of PNOR into 2 parts

New Sections: ATTR_TMP, ATTR_PERM

Change-Id: Id66495509076f9637e8720f3d2631e8db7456fb2
RTC:113615
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/14168
Tested-by: Jenkins Server
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

1 files changed, 32 insertions, 4 deletions

diff --git a/src/usr/initservice/istepdispatcher/istepdispatcher.C b/src/usr/initservice/istepdispatcher/istepdispatcher.C
index 3ab4e0b8a..6d0df0c3f 100644
--- a/src/usr/initservice/istepdispatcher/istepdispatcher.C
+++ b/src/usr/initservice/istepdispatcher/istepdispatcher.C
@@ -64,6 +64,7 @@
 #include <targeting/attrPlatOverride.H>
 #include <console/consoleif.H>
 #include <hwpisteperror.H>
+#include <pnor/pnorif.H>
 
 namespace ISTEPS_TRACE
 {
@@ -246,15 +247,42 @@ void IStepDispatcher::init(errlHndl_t &io_rtaskRetErrl)
             // Get Attribute overrides from PNOR
             else
             {
-                err = TARGETING::getAttrOverrides();
+                PNOR::SectionInfo_t l_sectionInfo;
+                // Get temporary attribute overrides from pnor
+                err = PNOR::getSectionInfo(PNOR::ATTR_TMP, l_sectionInfo);
+                // Attr override sections are optional so just delete error
                 if (err)
                 {
-                    TRACFCOMP(g_trac_initsvc,"Failed getAttrOverrides");
-                    break;
+                    delete err;
+                    err = NULL;
                 }
                 else
                 {
-                    TRACFCOMP(g_trac_initsvc,"Success getAttrOverrides");
+                    TRACFCOMP(g_trac_initsvc,"init: processing temporary overrides");
+                    err = TARGETING::getAttrOverrides(l_sectionInfo);
+                    if (err)
+                    {
+                        TRACFCOMP(g_trac_initsvc,"Failed getAttrOverrides: getting temporary overrides");
+                        break;
+                    }
+                }
+                // Get permanent attribute overrides from pnor
+                err = PNOR::getSectionInfo(PNOR::ATTR_PERM, l_sectionInfo);
+                // Attr override sections are optional so just delete error
+                if (err)
+                {
+                    delete err;
+                    err = NULL;
+                }
+                else
+                {
+                    TRACFCOMP(g_trac_initsvc,"init: processing permanent overrides");
+                    err = TARGETING::getAttrOverrides(l_sectionInfo);
+                    if (err)
+                    {
+                        TRACFCOMP(g_trac_initsvc,"Failed getAttrOverrides: getting permanent overrides");
+                        break;
+                    }
                 }
             }