From 44b5013d09623c4b6dca2ab8167b0567f340dc29 Mon Sep 17 00:00:00 2001
From: yinle <yinle@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Mon, 14 Feb 2011 02:12:49 +0000
Subject: [PATCH] FSP/BPA redundancy: change CEC/Frame nodes into FSP/BPA nodes

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@8841 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 perl-xCAT/xCAT/PPCcfg.pm | 39 +++++++++++++++++++++++++++++----------
 1 file changed, 29 insertions(+), 10 deletions(-)

diff --git a/perl-xCAT/xCAT/PPCcfg.pm b/perl-xCAT/xCAT/PPCcfg.pm
index 1b2e54f23..53986f017 100644
--- a/perl-xCAT/xCAT/PPCcfg.pm
+++ b/perl-xCAT/xCAT/PPCcfg.pm
@@ -67,20 +67,39 @@ sub parse_args {
     #############################################
     # Get support command list
     #############################################
-    my $sitetab  = xCAT::Table->new( 'nodetype' );
+    #my $sitetab  = xCAT::Table->new( 'nodetype' );
+    #my $nodes = $request->{node};
+    #foreach (@$nodes) {
+    #    if ( defined( $sitetab )) {      
+    #        my ($ent) = $sitetab->getAttribs({ node=>$_},'nodetype');
+    #        if ( defined($ent) ) {
+    #               $request->{hwtype} = $ent->{nodetype};
+    #               last;
+    #        }
+    #
+    #    }
+    #
+    #}    
+    my @newnodes = ();
     my $nodes = $request->{node};
-    foreach (@$nodes) {
-        if ( defined( $sitetab )) {      
-            my ($ent) = $sitetab->getAttribs({ node=>$_},'nodetype');
-            if ( defined($ent) ) {
-                   $request->{hwtype} = $ent->{nodetype};
-                   last;
+    foreach my $snode(@$nodes) {
+        my $ntype = xCAT::DBobjUtils->getnodetype($snode);
+        if ( $ntype =~ /^(cec|frame)$/) {
+            my $children = xCAT::DBobjUtils->getchildren($snode);
+            unless( $children )  {
+                next;
             }
-
+            foreach (@$children)  {
+                push @newnodes, $_;
+            }
+            $request->{hwtype} = ($ntype =~ /^cec$/) ? "fsp" : "bpa";
+        } else   {
+            push @newnodes, $_;
+            $request->{hwtype} = $ntype;
         }
-
     }
- 
+    $request->{node} = \@newnodes;
+    #$request->{noderange} = \@newnodes;
     my $supported = $rsp{$request->{hwtype}};
   
     #############################################