arif/xcat-core
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add support for Conserver plugin checks.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@586 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
lissav
2008-02-26 19:57:10 +00:00
parent 74451b401b
commit 5abeb1f0a2
1 changed files with 66 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

96
perl-xCAT-2.0/xCAT/Utils.pm
View File

@@ -998,7 +998,7 @@ sub isServiceNode
sub my_hexnets
{
my $rethash;
my $rethash;
my @nets = split /\n/, `/sbin/ip addr`;
foreach (@nets)
{
@@ -1008,22 +1008,26 @@ sub my_hexnets
next;
}
(my $curnet, my $maskbits) = split /\//, $elems[2];
my $bitstoeven = (4-($maskbits%4));
my $bitstoeven = (4 - ($maskbits % 4));
if ($bitstoeven eq 4) { $bitstoeven = 0; }
my $padbits = (32-($bitstoeven+$maskbits));
my $numchars = int(($maskbits + $bitstoeven)/4);
my $curmask = 2**$maskbits - 1 << (32 - $maskbits);
my $nown = unpack("N", inet_aton($curnet));
my $padbits = (32 - ($bitstoeven + $maskbits));
my $numchars = int(($maskbits + $bitstoeven) / 4);
my $curmask = 2**$maskbits - 1 << (32 - $maskbits);
my $nown = unpack("N", inet_aton($curnet));
$nown = $nown & $curmask;
my $highn = $nown+((2**$bitstoeven-1)<<(32-$maskbits-$bitstoeven));
while ($nown <= $highn) {
my $nowhex = sprintf("%08x",$nown);
$rethash->{substr($nowhex,0,$numchars)} = $curnet;
$nown += 1<<(32-$maskbits-$bitstoeven);
my $highn =
$nown + ((2**$bitstoeven - 1) << (32 - $maskbits - $bitstoeven));
while ($nown <= $highn)
{
my $nowhex = sprintf("%08x", $nown);
$rethash->{substr($nowhex, 0, $numchars)} = $curnet;
$nown += 1 << (32 - $maskbits - $bitstoeven);
}
}
return $rethash;
}
#-------------------------------------------------------------------------------
=head3 my_ip_facing
@@ -1416,30 +1420,62 @@ sub isServiceReq
}
else
{
if ($service eq "cons")
{
# get handle to noderes table
my $noderestab = xCAT::Table->new('noderes');
unless ($noderestab)
{
xCAT::MsgUtils->message('S', "Unable to open noderes table.\n");
return -1;
}
my $whereclause =
"servicenode like '$servicenodename' or servicenode like '$serviceip'";
my @nodelist =
$noderestab->getAllAttribsWhere($whereclause, 'node', $service);
foreach my $node (@nodelist)
{
if ( ($node->{$service} eq $servicenodename)
|| ($node->{$service} eq $serviceip)
|| ($node->{$service} eq ""))
# get handle to nodehm table
my $nodehmtab = xCAT::Table->new('nodehm');
unless ($nodehmtab)
{
return 1; # found a node using this server for the service
xCAT::MsgUtils->message('S',
"Unable to open nodehm table.\n");
return -1;
}
my $whereclause =
"node like '$servicenodename' or node like '$serviceip'";
my @nodelist =
$nodehmtab->getAllAttribsWhere($whereclause, 'node',
$service);
foreach my $node (@nodelist)
{
if ($node->{$service} ne "") # cons defined
{
return 1; # found cons defined for this server
}
}
}
else # other service TFTP,etc
{
# get handle to noderes table
my $noderestab = xCAT::Table->new('noderes');
unless ($noderestab)
{
xCAT::MsgUtils->message('S',
"Unable to open noderes table.\n");
return -1;
}
my $whereclause =
"servicenode like '$servicenodename' or servicenode like '$serviceip'";
my @nodelist =
$noderestab->getAllAttribsWhere($whereclause, 'node',
$service);
foreach my $node (@nodelist)
{
if ( ($node->{$service} eq $servicenodename)
|| ($node->{$service} eq $serviceip)
|| ($node->{$service} eq ""))
{
return
1; # found a node using this server for the service
}
}
}
}
return 0; # did not find a node using this service for this servicenode
return
0; # did not find a node using this service for this servicenode
}
}
}