From e664018cc493b5453874aa6d7e637460f560cc99 Mon Sep 17 00:00:00 2001
From: Mark Gurevich <gurevich@us.ibm.com>
Date: Wed, 17 May 2017 11:25:38 -0400
Subject: [PATCH] Changes after review comments

---
 xCAT-server/lib/xcat/plugins/openbmc.pm | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/xCAT-server/lib/xcat/plugins/openbmc.pm b/xCAT-server/lib/xcat/plugins/openbmc.pm
index 6014eb72b..3ea0c7419 100644
--- a/xCAT-server/lib/xcat/plugins/openbmc.pm
+++ b/xCAT-server/lib/xcat/plugins/openbmc.pm
@@ -893,23 +893,23 @@ sub rinv_response {
             next if ($grep_string eq "serial");
         } 
 
-        if (($grep_string eq "vpd" or $grep_string eq "mprom")) {
-            xCAT::SvrUtils::sendmsg("No information can be obtained for $grep_string", $callback, $node);
-            last;
+        if (($grep_string eq "vpd" or $grep_string eq "mprom") and $key_url =~ /\/motherboard$/) {
+            xCAT::SvrUtils::sendmsg("No mprom information is available", $callback, $node);
+            next if ($grep_string eq "mprom");
         } 
 
-        if (($grep_string eq "vpd" or $grep_string eq "deviceid")) {
-            xCAT::SvrUtils::sendmsg("No information can be obtained for $grep_string", $callback, $node);
-            last;
+        if (($grep_string eq "vpd" or $grep_string eq "deviceid") and $key_url =~ /\/motherboard$/) {
+            xCAT::SvrUtils::sendmsg("No deviceid information is available", $callback, $node);
+            next if ($grep_string eq "deviceid");
         } 
 
         if ($grep_string eq "uuid") {
-            xCAT::SvrUtils::sendmsg("No information can be obtained for $grep_string", $callback, $node);
+            xCAT::SvrUtils::sendmsg("No uuid information is available", $callback, $node);
             last;
         } 
 
         if ($grep_string eq "guid") {
-            xCAT::SvrUtils::sendmsg("No information can be obtained for $grep_string", $callback, $node);
+            xCAT::SvrUtils::sendmsg("No guid information is available", $callback, $node);
             last;
         }