RTC 35711 - Wrapper for VPO-mode attribute check

The same code was in a dozen places so I added a wrapper function.

Change-Id: I5b1d34e0f94b91289960c73670199ff22f4c6860
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/643
Tested-by: Jenkins Server
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

3 files changed, 17 insertions, 37 deletions

diff --git a/src/usr/fsi/fsidd.C b/src/usr/fsi/fsidd.C
index 7fe5cf8f5..4f829df5f 100644
--- a/src/usr/fsi/fsidd.C
+++ b/src/usr/fsi/fsidd.C
@@ -42,6 +42,7 @@
 #include <sys/time.h>
 #include <string.h>
 #include <algorithm>
+#include <targeting/util.H>
 
 // FSI : General driver traces
 trace_desc_t* g_trac_fsi = NULL;
@@ -1203,13 +1204,8 @@ errlHndl_t FsiDD::initPort(FsiChipInfo_t i_fsiInfo,
 
         // Do not initialize slave in VBU because they are already done
         // before we run
-        TARGETING::EntityPath syspath(TARGETING::EntityPath::PATH_PHYSICAL);
-        syspath.addLast(TARGETING::TYPE_SYS,0);
-        TARGETING::Target* sys = TARGETING::targetService().toTarget(syspath);
-        uint8_t vpo_mode = 0;
-        if( sys
-            && sys->tryGetAttr<TARGETING::ATTR_IS_SIMULATION>(vpo_mode)
-            && (vpo_mode == 1) )
+        //@todo - switch to SP-Capabilities Attribute (See Issue 35817)
+        if( TARGETING::is_vpo() )
         {
             TRACFCOMP( g_trac_fsi, "FsiDD::initPort> Skipping Init for VPO" );
             o_enabled = true;
diff --git a/src/usr/fsi/test/fsiddtest.H b/src/usr/fsi/test/fsiddtest.H
index 74befc8aa..66a7ba6c5 100644
--- a/src/usr/fsi/test/fsiddtest.H
+++ b/src/usr/fsi/test/fsiddtest.H
@@ -37,6 +37,7 @@
 #include <fsi/fsiif.H>
 #include <fsi/fsi_reasoncodes.H>
 #include <sys/time.h>
+#include <targeting/util.H>
 
 extern trace_desc_t* g_trac_fsi;
 
@@ -114,17 +115,11 @@ class FsiDDTest : public CxxTest::TestSuite
      */
     void test_readWrite(void)
     {
-        //@todo
+        //@todo - Issue 35803 
         //@VBU workaround - Disable test case
         //Temporarily disable this test case in VBU because of
         //an MFSI/CFSI XSCOM hardware bug.
-        TARGETING::EntityPath syspath(TARGETING::EntityPath::PATH_PHYSICAL);
-        syspath.addLast(TARGETING::TYPE_SYS,0);
-        TARGETING::Target* sys = TARGETING::targetService().toTarget(syspath);
-        uint8_t vpo_mode = 0;
-        if( sys
-            && sys->tryGetAttr<TARGETING::ATTR_IS_SIMULATION>(vpo_mode)
-            && (vpo_mode == 1) )
+        if( TARGETING::is_vpo() )
         {
             return;
         }
@@ -414,17 +409,11 @@ class FsiDDTest : public CxxTest::TestSuite
     void test_badTargets(void)
     {
 
-        //@todo
+        //@todo - Issue 35803 
         //@VBU workaround - Disable test case
         //Temporarily disable this test case in VBU because of
         //an MFSI/CFSI XSCOM hardware bug.
-        TARGETING::EntityPath syspath(TARGETING::EntityPath::PATH_PHYSICAL);
-        syspath.addLast(TARGETING::TYPE_SYS,0);
-        TARGETING::Target* sys = TARGETING::targetService().toTarget(syspath);
-        uint8_t vpo_mode = 0;
-        if( sys
-            && sys->tryGetAttr<TARGETING::ATTR_IS_SIMULATION>(vpo_mode)
-            && (vpo_mode == 1) )
+        if( TARGETING::is_vpo() )
         {
             return;
         }
diff --git a/src/usr/fsi/test/fsiprestest.H b/src/usr/fsi/test/fsiprestest.H
index b50d7b8bc..7b08a21d0 100644
--- a/src/usr/fsi/test/fsiprestest.H
+++ b/src/usr/fsi/test/fsiprestest.H
@@ -35,6 +35,7 @@
 #include <targeting/predicates/predicatectm.H>
 #include <targeting/predicates/predicatepostfixexpr.H>
 #include <targeting/iterators/rangefilter.H>
+#include <targeting/util.H>
 
 using namespace TARGETING;
 using namespace DeviceFW;
@@ -56,20 +57,14 @@ class FSIPresTest : public CxxTest::TestSuite
          */
         void testPresence()
         {
-          //@todo
-          //@VBU workaround - Disable test case
-          //Temporarily disable this test case in VBU because of
-          //an MFSI/CFSI XSCOM hardware bug.
-          TARGETING::EntityPath syspath(TARGETING::EntityPath::PATH_PHYSICAL);
-          syspath.addLast(TARGETING::TYPE_SYS,0);
-          TARGETING::Target* sys = TARGETING::targetService().toTarget(syspath);
-          uint8_t vpo_mode = 0;
-          if( sys
-              && sys->tryGetAttr<TARGETING::ATTR_IS_SIMULATION>(vpo_mode)
-              && (vpo_mode == 1) )
-          {
-              return;
-          }
+            //@todo - Issue 35803 
+            //@VBU workaround - Disable test case
+            //Temporarily disable this test case in VBU because of
+            //an MFSI/CFSI XSCOM hardware bug.
+            if( TARGETING::is_vpo() )
+            {
+               return;
+            }
 
             Target* l_masterChip = NULL;
             targetService().masterProcChipTargetHandle(l_masterChip);