From 0749556a7d25009532df29d336a5667da361fd35 Mon Sep 17 00:00:00 2001 From: zhaoertao Date: Thu, 15 Dec 2011 07:28:02 +0000 Subject: [PATCH] service vlan redundancy related updates git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@11250 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- perl-xCAT/xCAT/FSPUtils.pm | 8 +- perl-xCAT/xCAT/FSPcfg.pm | 7 +- perl-xCAT/xCAT/PPCconn.pm | 7 +- perl-xCAT/xCAT/PPCenergy.pm | 6 +- perl-xCAT/xCAT/Utils.pm | 234 ++++++++++++++++++------------------ 5 files changed, 135 insertions(+), 127 deletions(-) diff --git a/perl-xCAT/xCAT/FSPUtils.pm b/perl-xCAT/xCAT/FSPUtils.pm index 02be7210f..13ab0807d 100644 --- a/perl-xCAT/xCAT/FSPUtils.pm +++ b/perl-xCAT/xCAT/FSPUtils.pm @@ -107,7 +107,7 @@ sub fsp_api_action { } if(!defined($fsp_ip)) { - $res = "Failed to get the $fsp_name\'s or the related FSPs/BPAs' ip"; + $res = "Failed to get IP address for $fsp_name or the related FSPs/BPAs."; return ([$node_name, $res, -1]); } @@ -242,8 +242,8 @@ sub fsp_state_action { #$fsp_ip = xCAT::Utils::getNodeIPaddress( $fsp_name ); $fsp_ip = xCAT::Utils::getIPaddress( $fsp_name ); if(!defined($fsp_ip) or ($fsp_ip == -3)) { - $res[0] = ["Failed to get the $fsp_name\'s ip"]; - return ([-1, @res]); + $res[0] = ["Failed to get IP address for $fsp_name."]; + return ([$node_name, @res, -1]); } #print "fsp name: $fsp_name\n"; @@ -360,7 +360,7 @@ sub fsp_api_create_parttion { #$fsp_ip = xCAT::Utils::getNodeIPaddress( $fsp_name ); $fsp_ip = xCAT::Utils::getIPaddress( $fsp_name ); if(!defined($fsp_ip) or ($fsp_ip == -3)) { - $res = "Failed to get the $fsp_name\'s ip"; + $res = "Failed to get IP address for $fsp_name."; return ([$fsp_name, $res, -1]); } diff --git a/perl-xCAT/xCAT/FSPcfg.pm b/perl-xCAT/xCAT/FSPcfg.pm index 3423865a5..8d963fe27 100644 --- a/perl-xCAT/xCAT/FSPcfg.pm +++ b/perl-xCAT/xCAT/FSPcfg.pm @@ -847,9 +847,10 @@ sub fsp_api_passwd { # Get IP address ############################ #$fsp_ip = xCAT::Utils::get_hdwr_ip($fsp_name); - $fsp_ip = xCAT::Utils::getNodeIPaddress($fsp_name); - if($fsp_ip == -1) { - $res = "Failed to get the $fsp_name\'s ip"; + #$fsp_ip = xCAT::Utils::getNodeIPaddress($fsp_name); + $fsp_ip = xCAT::Utils::getIPaddress($fsp_name); + if(!defined($fsp_ip) or ($fsp_ip == -3)) { + $res = "Failed to get IP address for $fsp_name."; return ([$node_name, $res, -1]); } diff --git a/perl-xCAT/xCAT/PPCconn.pm b/perl-xCAT/xCAT/PPCconn.pm index dc4a9e97e..20a5cbfe5 100644 --- a/perl-xCAT/xCAT/PPCconn.pm +++ b/perl-xCAT/xCAT/PPCconn.pm @@ -619,11 +619,12 @@ sub lshwconn { #my $node_ip_hash = $hosttab->getNodeAttribs( $node_name,[qw(ip)]); #$node_ip = $node_ip_hash->{ip}; - $node_ip = xCAT::Utils::getNodeIPaddress( $node_name ); + #$node_ip = xCAT::Utils::getNodeIPaddress( $node_name ); + $node_ip = xCAT::Utils::getIPaddress( $node_name ); } - if (!$node_ip) + if (!$node_ip || ($node_ip == -3)) { - push @value, [$node_name, $node_ip, $Rc]; + push @value, [$node_name, "Failed to get IP address.", $Rc]; next; } diff --git a/perl-xCAT/xCAT/PPCenergy.pm b/perl-xCAT/xCAT/PPCenergy.pm index f357083d1..77b56d97a 100644 --- a/perl-xCAT/xCAT/PPCenergy.pm +++ b/perl-xCAT/xCAT/PPCenergy.pm @@ -250,7 +250,11 @@ sub renergy { if( !defined($fsps) ) { return ([[$node, "Failed to get the FSPs for the cec $hcphost.", -1]]); } - my $hcp_ip = xCAT::Utils::getNodeIPaddress($hcphost); + #my $hcp_ip = xCAT::Utils::getNodeIPaddress($hcphost); + my $hcp_ip = xCAT::Utils::getIPaddress($hcphost); + if (!defined($hcp_ip) or ($hcp_ip == -3)) { + return ([[$node, "Failed to get IP address for $hcphost.", -1]]); + } push @hcps_ip, split(',', $hcp_ip); my $fsp_node = $$fsps[0]; ($user, $password) = xCAT::PPCdb::credentials( $fsp_node, "fsp",'HMC'); diff --git a/perl-xCAT/xCAT/Utils.pm b/perl-xCAT/xCAT/Utils.pm index 854fef765..8221d42ac 100644 --- a/perl-xCAT/xCAT/Utils.pm +++ b/perl-xCAT/xCAT/Utils.pm @@ -2871,121 +2871,6 @@ sub getNodeIPaddress $nodeip = $ent->{'ip'}; } } - - #if still find ip, check if the object is cec or frame - #if so, find their children's IPs as theirself IPs. - my @children; - my $c1; - my $ips; - unless ( $nodeip ) { - my $type = xCAT::DBobjUtils->getnodetype($nodetocheck); - if ($type) { - if ($type eq "frame" or $type eq "cec") { - # Read the ppc table for any entry that - # has parent=nodename and nodetype fsp or bpa - my $ppctab = xCAT::Table->new( 'ppc' ); - my @ps = $ppctab->getAllNodeAttribs(['node','parent','nodetype']); - my $parent; - my $node; - my $type; - #search for addresses - for my $entry ( @ps ) { - $parent = $entry->{parent}; - $node = $entry->{node}; - $type = $entry->{nodetype}; - if (defined($parent) and $parent eq $nodetocheck ) { - if ( defined($type) and $type eq 'fsp' or $type eq 'bpa'){ - push @$c1,$node; - } - } - } - #if $port exists, only for mkhwconn ... CEC/Frame - if ( defined($port) ) { - my @fsp_bpa = @$c1; - undef ($c1); - # mkhwconn only creates the connections for the FSPs/BPAs whoes port is $port. - my $vpd_tab = xCAT::Table->new('vpd'); - unless($vpd_tab) { - return "-1"; # Cannot open vpd table - } - foreach ( @fsp_bpa ) { - my $vpd_hash = $vpd_tab->getNodeAttribs( $_, [qw(side)]); - my $side = $vpd_hash->{side}; - if (!defined($side)) { - #return -2; # $_: No side in vpd table for $_ - next; - } - #print $side; - if ( $side =~ /[A|a|B|b]-$port/) { - push (@$c1, $_); - } - } - $vpd_tab->close(); - - if(!defined($c1) || @$c1 == 0) { - return "-3"; # the FSP/BPA's side is not $port. - } - } - - #my $hstab = xCAT::Table->new('hosts'); - #if ( $hstab ) { - # my @myip = (); - # foreach ( @$c1 ) - # { - # my $point= $hstab->getNodeAttribs($_, ['ip']); - # my $value = $point->{ip}; - # push (@myip, $value); - # } - # $ips = join ",", @myip; - # return $ips; - #} - - #modify the way of finding IP address. - my @myip = (); - my @nonip =(); - foreach ( @$c1 ) - { - my $ifip = isIpaddr($_); - if ($ifip) { - push (@myip, $_); - } else { - push (@nonip, $_); - } - } - #if (scalar(@nonip)){ - # my $hstab = xCAT::Table->new('hosts'); - # if ( $hstab ) { - # my $ent = $hstab->getNodesAttribs(\@nonip,['ip']); - # if ($ent){ - # foreach (@nonip) { - # my $i = $ent->{$_}->[0]->{ip}; - # push (@myip, $i); - # } - # } - # } - #} - foreach my $t (@nonip) { - $nodeip = xCAT::NetworkUtils->getipaddr($t); - if (!$nodeip) { - my $hoststab = xCAT::Table->new( 'hosts'); - my $ent = $hoststab->getNodeAttribs( $t, ['ip'] ); - if ( $ent->{'ip'} ) { - $nodeip = $ent->{'ip'}; - } - } - if($nodeip) { - push (@myip, $nodeip); - } - } - - - $ips = join ",", @myip; - return $ips; - } - } - } - - if ( $nodeip ) { return $nodeip; @@ -2994,7 +2879,124 @@ sub getNodeIPaddress } } - + #------------------------------------------------------------------------------- + +=head3 getIPaddress - Used by DFM related functions to support service vlan redundancy. + + Arguments: + Node name only one at a time + Returns: ip address(s) + Globals: + none + Error: + none + Example: my $c1 = xCAT::Utils::getIPaddress($nodetocheck); + +=cut + +#------------------------------------------------------------------------------- + +sub getIPaddress +{ + require xCAT::Table; + my $nodetocheck = shift; + my $port = shift; + my $side = "[A|B]"; + if (!defined($port)) { + $port = "[0|1]"; + } + +# only need to parse IP addresses for Frame/CEC/BPA/FSP + + my $type = xCAT::DBobjUtils->getnodetype($nodetocheck); + if ($type) { + my @children; + my %node_side_pairs = (); + my $children_num = 0; + my $parent; + my $ppctab = xCAT::Table->new( 'ppc' ); + my $vpdtab = xCAT::Table->new( 'vpd' ); + if ($type eq "bpa" or $type eq "fsp") { + my $tmp_p = $ppctab->getNodeAttribs($nodetocheck, ['parent']); + if ($tmp_p and $tmp_p->{parent}) { + $parent = $tmp_p->{parent}; + } else { + return undef; + } + my $tmp_s = $vpdtab->getNodeAttribs($nodetocheck, ['side']); + if ($tmp_s->{side} and ($tmp_s->{side} =~ /(A|B)-\d/i)) { + $side = $1; # get side for the fsp, in order to get its brothers + } else { + return -3; + } + } elsif ($type eq "frame" or $type eq "cec") { + $parent = $nodetocheck; + } else { + return undef; + } + my @ps = $ppctab->getAllNodeAttribs(['node','parent','nodetype']); + my $tmp_parent; + my $tmp_node; + my $tmp_type; +#search for $nodetocheck's children or brothers + for my $entry ( @ps ) { + $tmp_parent = $entry->{parent}; + $tmp_node = $entry->{node}; + $tmp_type = $entry->{nodetype}; + if ($tmp_parent and ($tmp_parent eq $parent) ) { + if (!defined($tmp_type)) { + $tmp_type = xCAT::DBobjUtils->getnodetype($tmp_node); + } + if ($tmp_type and ($tmp_type eq 'fsp' or $tmp_type eq 'bpa')) { + push @children, $tmp_node; + } + } + } + foreach my $tmp_n( @children) { + my $ent = $vpdtab->getNodeAttribs($tmp_n, ['side']); + if ($ent->{side} and $ent->{side} =~ /^$side-$port$/i) { + my $tmp_s = $ent->{side}; + $tmp_s =~ s/a/A/; + $tmp_s =~ s/b/B/; + if (isIpaddr($tmp_n)) { + $node_side_pairs{$tmp_s} = $tmp_n; + $children_num++; + } else { + my $tmpip = xCAT::NetworkUtils->getipaddr($tmp_n); + if (!$tmpip) { + my $hoststab = xCAT::Table->new( 'hosts' ); + my $tmp = $hoststab->getNodeAttribs($tmp_n, ['ip']); + if ($tmp->{ip}) { + $tmpip = $tmp->{ip}; + } + } + if ($tmpip) { + $node_side_pairs{$tmp_s} = $tmpip; + $children_num++; + } + } # end of parse IP address for a fsp/bpa + } # end of parse a child's side + } #end of loop for children + if ($children_num == 0) { + return undef; #no children or brothers for this node. + } + my @keys = qw(A-0 A-1 B-0 B-1); + my $out_strings = undef; + foreach my $tmp (@keys) { + if (!$node_side_pairs{$tmp}) { + $node_side_pairs{$tmp} = ''; + } + } + + $out_strings = $node_side_pairs{"A-0"}.','.$node_side_pairs{"A-1"}.','.$node_side_pairs{"B-0"}.','.$node_side_pairs{"B-1"}; + + return $out_strings; + } else { + return undef; + } +} + + #-------------------------------------------------------------------------------