From 13db6d7692a91805967ce47d824164556ef288e2 Mon Sep 17 00:00:00 2001
From: daniceexi <daniceexi@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Thu, 3 May 2012 08:03:26 +0000
Subject: [PATCH] Change the keyword to identify the flex power node. handle
 the failure case that setting network without output

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@12503 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 xCAT-server/lib/xcat/plugins/blade.pm | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/xCAT-server/lib/xcat/plugins/blade.pm b/xCAT-server/lib/xcat/plugins/blade.pm
index 9340e6e61..e72202c62 100644
--- a/xCAT-server/lib/xcat/plugins/blade.pm
+++ b/xCAT-server/lib/xcat/plugins/blade.pm
@@ -4151,7 +4151,7 @@ sub rscanfsp {
     my $id = $1;
     # get the hardware type, only get the fsp for PPC blade
     @data = $t->cmd("info -T system:$_");
-    if (! grep /(Mach type\/model:.*PPC)|(Mach type\/model: pITE)|(Mach type\/model: IBM Flex System p)|(Firebird)/, @data) {
+    if (! grep /(Product Name: IBM Flex System p)|(Mach type\/model:.*PPC)|(Mach type\/model: pITE)|(Mach type\/model: IBM Flex System p)|(Firebird)/, @data) {
       next;
     }
     @data = $t->cmd("ifconfig -T system:$_");
@@ -4433,6 +4433,10 @@ sub network {
 
   ## TRACE_LINE print "The cmd to set for the network = $cmd\n";
   my @data = $t->cmd($cmd);
+  if (!@data) {
+    return ([1,"Failed"]);
+  }
+
   my @result = grep(/These configuration changes will become active/,@data);
   ## TRACE_LINE print "  rc = @data\n"; 
   if (!@result) {