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>

2 files changed, 4 insertions, 14 deletions

diff --git a/src/usr/i2c/test/eepromddtest.H b/src/usr/i2c/test/eepromddtest.H
index 5f31a128b..1be82c462 100755
--- a/src/usr/i2c/test/eepromddtest.H
+++ b/src/usr/i2c/test/eepromddtest.H
@@ -37,6 +37,7 @@
 #include <i2c/eepromddreasoncodes.H>
 #include <targeting/predicates/predicatectm.H>
 #include <targeting/predicates/predicatepostfixexpr.H>
+#include <targeting/util.H>
 
 extern trace_desc_t* g_trac_eeprom;
 
@@ -83,13 +84,7 @@ class EEPROMTest: public CxxTest::TestSuite
             //@VBU workaround - Disable I2C test case on fake target
             //Test case use fake targets, which will fail when running
             //on VBU.  Need to fix this.
-            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/i2c/test/i2ctest.H b/src/usr/i2c/test/i2ctest.H
index 865d62248..f2ff71f5d 100755
--- a/src/usr/i2c/test/i2ctest.H
+++ b/src/usr/i2c/test/i2ctest.H
@@ -36,6 +36,7 @@
 #include <devicefw/driverif.H>
 #include <i2c/i2creasoncodes.H>
 #include <targeting/predicates/predicatectm.H>
+#include <targeting/util.H>
 
 extern trace_desc_t* g_trac_i2c;
 
@@ -114,13 +115,7 @@ class I2CTest: public CxxTest::TestSuite
             //@VBU workaround - Disable I2C test case on fake target
             //Test case use fake targets, which will fail when running
             //on VBU.  Need to fix this.
-            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;
             }