diff options
Diffstat (limited to 'src/usr/ipmiext')
-rw-r--r-- | src/usr/ipmiext/ipmifruinv.C | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/usr/ipmiext/ipmifruinv.C b/src/usr/ipmiext/ipmifruinv.C index e70d5afa0..a41d67394 100644 --- a/src/usr/ipmiext/ipmifruinv.C +++ b/src/usr/ipmiext/ipmifruinv.C @@ -7,8 +7,8 @@ /* */ /* Contributors Listed Below - COPYRIGHT 2014,2019 */ /* [+] International Business Machines Corp. */ -/* [+] Jim Yuan */ -/* [+] Maxim Polyakov */ +/* [+] Super Micro Computer, Inc. */ +/* [+] YADRO */ /* */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); */ @@ -2406,6 +2406,8 @@ void IPMIFRUINV::gatherSetData(const TARGETING::Target* i_pSys, TARGETING::PredicateCTM predChip(TARGETING::CLASS_CHIP); TARGETING::PredicateCTM predDimm(TARGETING::CLASS_LOGICAL_CARD, TARGETING::TYPE_DIMM); + TARGETING::PredicateCTM predOcmb(TARGETING::CLASS_CHIP, + TARGETING::TYPE_OCMB_CHIP); TARGETING::PredicatePostfixExpr checkExpr; TARGETING::PredicateHwas l_present; // @todo-RTC:124553 - Additional logic for deconfigured Frus @@ -2427,6 +2429,9 @@ void IPMIFRUINV::gatherSetData(const TARGETING::Target* i_pSys, checkExpr.push(&predDimm).Or().push(&l_present).And(); } + // We do NOT want to process fruInv for OCMB_CHIP targets + checkExpr.push(&predOcmb).Not().And(); + TARGETING::TargetHandleList pCheckPres; TARGETING::targetService().getAssociated( pCheckPres, i_pSys, TARGETING::TargetService::CHILD, TARGETING::TargetService::ALL, |