From b043ab72055690269bf956d44a3e50e1d2ca97e5 Mon Sep 17 00:00:00 2001 From: yinle Date: Mon, 11 Apr 2011 02:41:18 +0000 Subject: [PATCH] Fix bug 3261047: ExtTab loads user tables for every perl process, add processing of multiple hcp. git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@9265 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- xCAT-server/lib/xcat/plugins/fsp.pm | 134 +++++++++++++++++++++++++++- 1 file changed, 130 insertions(+), 4 deletions(-) diff --git a/xCAT-server/lib/xcat/plugins/fsp.pm b/xCAT-server/lib/xcat/plugins/fsp.pm index 7c2457fb4..146013a5a 100644 --- a/xCAT-server/lib/xcat/plugins/fsp.pm +++ b/xCAT-server/lib/xcat/plugins/fsp.pm @@ -4,6 +4,7 @@ package xCAT_plugin::fsp; use strict; use xCAT::PPC; use xCAT::DBobjUtils; +use xCAT_plugin::hmc; ########################################################################## # Command handler method from tables @@ -28,6 +29,7 @@ sub handled_commands { chvm => 'nodehm:mgt', rscan => 'nodehm:mgt', getfspcon => 'nodehm:cons', + getmulcon => 'fsp', }; } @@ -64,7 +66,14 @@ sub preprocess_request { my $callback = $arg2; getfspcon($node,$callback); return []; - } + } + if ($arg1->{command}->[0] eq "getmulcon") { #Can handle it here and now + my $node = $arg1->{noderange}->[0]; + my $callback = $arg2; + getmulcon($node,$callback); + return []; + } + xCAT::PPC::preprocess_request(__PACKAGE__,@_); } @@ -96,6 +105,8 @@ sub getfspcon { #return( sprintf( $errmsg{DB_UNDEF}, $_ )); $rsp->{node}->[0]->{error}=["open table $_ error"]; $rsp->{node}->[0]->{errorcode}=[1]; + $callback->($rsp); + return $rsp; } } ################################# @@ -104,10 +115,12 @@ sub getfspcon { my $type = xCAT::DBobjUtils->getnodetype($node); #my ($type) = grep( /^(lpar|osi)$/, @types ); - if ( !defined( $type ) or !($type =~/^(lpar|osi)$/) ) { + if ( !defined( $type ) or !($type =~ /lpar/) ) { #return( "Invalid node type: $ent->{nodetype}" ); $rsp->{node}->[0]->{error}=["Invalid node type: $type"]; $rsp->{node}->[0]->{errorcode}=[1]; + $callback->($rsp); + return $rsp; } ################################# # Get attributes @@ -118,6 +131,8 @@ sub getfspcon { #return( sprintf( $errmsg{NODE_UNDEF}, "ppc" )); $rsp->{node}->[0]->{error}=["node is not defined in ppc table"]; $rsp->{node}->[0]->{errorcode}=[1]; + $callback->($rsp); + return $rsp; } ################################# # Verify required attributes @@ -127,6 +142,8 @@ sub getfspcon { #return( sprintf( $errmsg{NO_ATTR}, $at, "ppc" )); $rsp->{node}->[0]->{error}=["Can't find node tarribute $at in ppc table"]; $rsp->{node}->[0]->{errorcode}=[1]; + $callback->($rsp); + return $rsp; } } @@ -138,15 +155,124 @@ sub getfspcon { #return "Failed to get the $fsp_name\'s ip"; $rsp->{node}->[0]->{error}=["Can't get node address"]; $rsp->{node}->[0]->{errorcode}=[1]; + $callback->($rsp); + return $rsp; } $rsp = {node=>[{name=>[$node]}]}; $rsp->{node}->[0]->{fsp_ip}->[0]=$fsp_ip; $rsp->{node}->[0]->{id}->[0]=$id; $callback->($rsp); + return $rsp +} +########################################################################## +# get information for require of multiple sending +########################################################################## +sub getmulcon { + + my $node = shift; + my $callback = shift; + my @attribs = qw(id parent hcp); + my %tabs = (); + my %hcphash; + my $rsp; + my $rsp2; + + ################################## + # Open databases needed + ################################## + foreach ( qw(ppc nodetype) ) { + $tabs{$_} = xCAT::Table->new($_); + + if ( !exists( $tabs{$_} )) { + $rsp->{node}->[0]->{error}=["open table $_ error"]; + $rsp->{node}->[0]->{errorcode}=[1]; + } + } + + ################################# + # Get node type + ################################# + my ($ent) = $tabs{nodetype}->getNodeAttribs($node, ["nodetype"] ); + if ( !defined( $ent )) { + $rsp->{node}->[0]->{error}=["Not define nodetype"]; + $rsp->{node}->[0]->{errorcode}=[1]; + } + ################################# + # Check for type + ################################# + if ( !exists( $ent->{nodetype} )) { + $rsp->{node}->[0]->{error}=["Can't find nodetype"]; + $rsp->{node}->[0]->{errorcode}=[1]; + } + ################################# + # Check for valid "type" + ################################# + my @types = split /,/, $ent->{nodetype}; + my ($type) = grep( /^(lpar|osi)$/, @types ); + + if ( !defined( $type )) { + $rsp->{node}->[0]->{error}=["nodetype is invalid"]; + $rsp->{node}->[0]->{errorcode}=[1]; + } + + ################################# + # Get attributes + ################################# + my ($att) = $tabs{ppc}->getAttribs({'node'=>$node}, @attribs ); + + if ( !defined( $att )) { + $rsp->{node}->[0]->{error}=["Node is not defined in ppc table"]; + $rsp->{node}->[0]->{errorcode}=[1]; + } + ################################# + # Verify required attributes + ################################# + foreach my $at ( @attribs ) { + if ( !exists( $att->{$at} )) { + $rsp->{node}->[0]->{error}=["Can't find node attribute in ppc table"]; + $rsp->{node}->[0]->{errorcode}=[1]; + } + } + my $id = $att->{id}; + my $parent = $att->{parent}; + my $hcps = $att->{hcp}; + my @hcp_list = split(",", $hcps); + my $cmd = (); + my $res; + my $Rc; + my $c = @hcp_list; + + + foreach my $thishcp ( @hcp_list ) { + my $thishcp_type = xCAT::FSPUtils->getTypeOfNode($thishcp); + if(!defined($thishcp_type)) { + $rsp->{node}->[0]->{error}=["Can't get nodetype of $thishcp"]; + $rsp->{node}->[0]->{errorcode}=[1]; + next; + } + $hcphash{$thishcp}{nodetype} = $thishcp_type; + if($thishcp_type =~ /^(fsp)$/) { + $rsp = getfspcon($node,$callback); + if ( $rsp->{node}->[0]->{errorcode} ) { + return; + } + $hcphash{$thishcp}{fsp_ip} = $rsp->{node}->[0]->{fsp_ip}->[0]; + $hcphash{$thishcp}{id} = $rsp->{node}->[0]->{id}->[0]; + } elsif ($thishcp_type =~ /^(hmc)$/) { + $rsp = xCAT_plugin::hmc::gethmccon($node,$callback,$thishcp); + if ( $rsp->{node}->[0]->{errorcode} ) { + return; + } + $hcphash{$thishcp}{host} = $thishcp; + $hcphash{$thishcp}{lparid} = $rsp->{node}->[0]->{lparid}->[0]; + $hcphash{$thishcp}{mtms} = $rsp->{node}->[0]->{mtms}->[0]; + $hcphash{$thishcp}{credencial} = $rsp->{node}->[0]->{cred}->[0]; + } + } + $rsp2->{node}->[0]->{hcp}->[0] = \%hcphash; + $callback->($rsp2); } - - 1;