From 62192c361ceb71eb190fae945e60ee339912b12f Mon Sep 17 00:00:00 2001 From: zhanx Date: Wed, 21 Oct 2009 11:45:26 +0000 Subject: [PATCH] Fix bug 2872935 lsslp/mkhwconn is not setting up ppc table with P6 He git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@4431 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- xCAT-server/lib/xcat/plugins/lsslp.pm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/xCAT-server/lib/xcat/plugins/lsslp.pm b/xCAT-server/lib/xcat/plugins/lsslp.pm index 00d8ee2c9..723326997 100644 --- a/xCAT-server/lib/xcat/plugins/lsslp.pm +++ b/xCAT-server/lib/xcat/plugins/lsslp.pm @@ -1600,6 +1600,28 @@ sub xCATdB { my $bpc_serial = @$data[7]; my $cageid = @$data[8]; + ############################################################ + # For HE machine, there are 2 FSPs, but only one FSP have the + # BPA information. We need to go through the outhash and + # find its BPA + ############################################################ + if (($bpc_model eq "0" ) and ( $bpc_serial eq "0" )) + { + for my $he_node ( keys %$outhash ) + { + if ( $model eq $outhash->{$he_node}->[1] and + $serial eq $outhash->{$he_node}->[2] and + $outhash->{$he_node}->[6] and + $outhash->{$he_node}->[7] + ) + { + $bpc_model = $outhash->{$he_node}->[6]; + $bpc_serial = $outhash->{$he_node}->[7]; + $cageid = $outhash->{$he_node}->[8]; + } + } + } + ######################################## # May be no Frame with this FSP ######################################## @@ -1613,6 +1635,7 @@ sub xCATdB { $frame = "Server-$bpc_model-SN$bpc_serial"; } } + ######################################## # "Factory-default" FSP name format: # Server---