From 983701c21f79eb27f75c89018bcf7a4e2aa4a041 Mon Sep 17 00:00:00 2001
From: yinle <yinle@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Tue, 21 Dec 2010 07:30:41 +0000
Subject: [PATCH] FSP/BPA redundancy: add supporting cec and frame

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@8493 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 perl-xCAT/xCAT/FSPconn.pm | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/perl-xCAT/xCAT/FSPconn.pm b/perl-xCAT/xCAT/FSPconn.pm
index 242fb2ab1..a613eb128 100644
--- a/perl-xCAT/xCAT/FSPconn.pm
+++ b/perl-xCAT/xCAT/FSPconn.pm
@@ -140,7 +140,7 @@ sub mkhwconn_parse_args
                 next;
             }
             
-            if ( $nodetype eq 'fsp' and 
+            if (( $nodetype eq 'fsp' or $nodetype eq 'cec') and
                 $node_parent and 
                 $node_parent ne $node)
             {
@@ -152,6 +152,12 @@ sub mkhwconn_parse_args
                 my $my_frame_bpa_cec = getFrameMembers( $node, $vpdtab, $ppctab);
                 push @frame_members, @$my_frame_bpa_cec;
             }
+            if ( $nodetype eq 'frame')
+            {
+                my $my_frame_bpa_cec =  xCAT::DBobjUtils::getcecchildren( $node)                                                                             ;
+                push @frame_members, @$my_frame_bpa_cec;
+                push @frame_members, $node;
+            }
 
         }
     }
@@ -420,11 +426,16 @@ sub rmhwconn_parse_args
             push @bpa_ctrled_nodes, $node;
         }
 
+        if ( $nodetype eq 'bpa')
+        {
+             my $my_frame_bpa_cec = getFrameMembers( $node, $vpdtab, $ppctab);
+            push @frame_members, @$my_frame_bpa_cec;
+        }
         if ( $nodetype eq 'frame')
         {
-           # my $my_frame_bpa_cec = getFrameMembers( $node, $vpdtab, $ppctab);
-            my $my_frame_bpa_cec = xCAT::DBobjUtils::getchildren($node);
+            my $my_frame_bpa_cec = xCAT::DBobjUtils::getcecchildren($node);
             push @frame_members, @$my_frame_bpa_cec;
+            push @frame_members, $node;
         }
     }