xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-10-31 03:12:30 +00:00
Code Issues Releases Wiki Activity

delete the dependence on xcat-rmc

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@7271 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
xq2005
2010-08-27 01:45:43 +00:00
parent 3bd4d39093
commit 245bf447ab
1 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
xCAT-server/lib/xcat/plugins/web.pm
View File

@@ -18,7 +18,6 @@ use Data::Dumper;
use LWP::Simple;
use xCAT::Table;
use xCAT::NodeRange;
use xCAT_monitoring::rmcmon;
sub handled_commands
{
@@ -498,8 +497,7 @@ sub web_rmcmonShow(){
my $retInfo;
my $retHash = {};
my $output;
my $activeNodes;
my $inactiveNodes;
my @activeNodes;
my @rmcNodes;
my $tempNodes;
my $temp = "";
@@ -541,21 +539,31 @@ sub web_rmcmonShow(){
if ('lpar' eq $nodeRange){
#get nodes detail containt
@nodes = xCAT::NodeRange::noderange($nodeRange);
my %nodesStatus = xCAT_monitoring::rmcmon->pingNodeStatus(@nodes);
$inactiveNodes = $nodesStatus{$::STATUS_INACTIVE};
$activeNodes = $nodesStatus{$::STATUS_ACTIVE};
if ((@nodes)&& (@nodes > 0)) {
#get all the active nodes
$temp= join(' ', @nodes);
$output =`fping -a $temp 2> /dev/null`;
chomp($output);
@activeNodes = split(/\n/, $output);
#non-accessable
foreach (@$inactiveNodes){
push(@{$retHash->{node}},{name=>$_, data=>'NA'});
}
#get all the inactive nodes by substracting the active nodes from all.
my %temp2;
foreach(@activeNodes) {
$temp2{$_}=1;
}
foreach(@nodes) {
if (!$temp2{$_}) {
push(@{$retHash->{node}},{name=>$_, data=>'NA'});
}
}
}
if (@$activeNodes < 1){
if (@activeNodes < 1){
$callback->($retHash);
return;
}
$tempNodes = join(',', @$activeNodes);
$tempNodes = join(',', @activeNodes);
$output = xCAT::Utils->runcmd("xdsh $tempNodes rpm -q rsct.core", -1, 1);
#non-installed
foreach(@$output){