From b9034410a94932c07c526da3e36a1c29989cc9c6 Mon Sep 17 00:00:00 2001
From: zhaoertao <zhaoertao@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Fri, 22 Feb 2013 06:36:36 +0000
Subject: [PATCH] enhancement for 'rvitals <Flex node> all' to display 'lcds'
 infomaiton in case no 'nodetype' attribute defined in 'mp' table

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

diff --git a/xCAT-server/lib/xcat/plugins/blade.pm b/xCAT-server/lib/xcat/plugins/blade.pm
index 22e7e2b76..c4a01ab16 100644
--- a/xCAT-server/lib/xcat/plugins/blade.pm
+++ b/xCAT-server/lib/xcat/plugins/blade.pm
@@ -4561,11 +4561,11 @@ sub get_blades_for_mpa {
   my %blades_hash = ();
   my $mptab = xCAT::Table->new('mp');
   my $ppctab = xCAT::Table->new('ppc');
-  my @attribs = qw(id pprofile parent hcp);
+  my @attribs = qw(id nodetype parent hcp);
   if (!defined($mptab) or !defined($ppctab)) {
     return undef;
   }
-  my @nodearray = $mptab->getAttribs({mpa=>$mpa,nodetype=>"blade"}, qw(node));
+  my @nodearray = $mptab->getAttribs({mpa=>$mpa}, qw(node));
   my @blades = ();
   my $nodesattrs;
   if (!(@nodearray)) {
@@ -4583,12 +4583,11 @@ sub get_blades_for_mpa {
       my $att = $nodesattrs->{$node}->[0];
       if (!defined($att)) {
           next;
-      } elsif ($att and $att->{parent} and ($att->{parent} ne $mpa)) {
+      } elsif (!defined($att->{parent}) or ($att->{parent} ne $mpa) or !defined($att->{nodetype}) or ($att->{nodetype} ne "blade")) {
           next;
       }
       my $request;
-      my $nodetype = "blade";
-      my $hcp_ip = xCAT::FSPUtils::getIPaddress($request, $nodetype, $att->{hcp});
+      my $hcp_ip = xCAT::FSPUtils::getIPaddress($request, $att->{nodetype}, $att->{hcp});
       if (!defined($hcp_ip) or ($hcp_ip == -3)) {
           next;
       }