comment changes only to dhcp.pm to help document the code
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@16436 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
jwsimpson
parent
130d2b2494
commit
3165c35860
@ -122,6 +122,9 @@ sub handled_commands
|
||||
return {makedhcp => "dhcp",};
|
||||
}
|
||||
|
||||
######################################################
|
||||
# List nodes in DHCP for both IPv4 and IPv6
|
||||
######################################################
|
||||
sub listnode
|
||||
{
|
||||
my $node = shift;
|
||||
@ -140,7 +143,9 @@ sub listnode
|
||||
my $pwtab = xCAT::Table->new("passwd");
|
||||
my @pws = $pwtab->getAllAttribs('key','username','password','cryptmethod','authdomain','comments','disable');
|
||||
foreach (@pws) {
|
||||
# Look for the opapi entry in the passwd table
|
||||
if ($_->{key} =~ "omapi") { #omapi key
|
||||
# save username and password for omapi connection
|
||||
$omapiuser = $_->{username};
|
||||
$omapikey = $_->{password};
|
||||
}
|
||||
@ -154,49 +159,62 @@ sub listnode
|
||||
}
|
||||
}
|
||||
|
||||
# open ipv4 omshell file handles
|
||||
# open ipv4 omshell file handles - $OMOUT will contain the response
|
||||
open2($OMOUT,$OMIN,"/usr/bin/omshell ");
|
||||
|
||||
# setup omapi for the connection and check for the node requested
|
||||
print $OMIN "key "
|
||||
. $omapiuser . " \""
|
||||
. $omapikey . "\"\n";
|
||||
print $OMIN "connect\n";
|
||||
print $OMIN "new host\n";
|
||||
# specify which node we are looking up
|
||||
print $OMIN "set name = \"$node\"\n";
|
||||
print $OMIN "open\n";
|
||||
# the close will put the data into $OMOUT
|
||||
print $OMIN "close\n";
|
||||
close ($OMIN);
|
||||
my $name = 0;
|
||||
|
||||
# Process the output
|
||||
while (<$OMOUT>) { # now read the output of sort(1)
|
||||
chomp $_;
|
||||
chomp $_;
|
||||
# if this line contains the node name
|
||||
if ($_ =~ $node) {
|
||||
if ($name) {
|
||||
$nname = $_;
|
||||
$nname =~ s/name = //;
|
||||
$nname =~ s/"//g;
|
||||
}
|
||||
$name =1;
|
||||
}
|
||||
if ($_ =~ 'hardware-address') {
|
||||
$hwaddr = $_;
|
||||
# save the name returned
|
||||
if ($name) {
|
||||
$nname = $_;
|
||||
$nname =~ s/name = //;
|
||||
$nname =~ s/"//g;
|
||||
}
|
||||
$name =1;
|
||||
}
|
||||
# if this line is the hardware-address line
|
||||
if ($_ =~ 'hardware-address') {
|
||||
# save the hardware address as it is with the hardware-address label
|
||||
$hwaddr = $_;
|
||||
}
|
||||
# if this line is the ip-address line
|
||||
elsif ($_ =~ 'ip-address') {
|
||||
my ($ipname,$ip) = split /= /,$_;
|
||||
chomp($ip);
|
||||
my ($p1, $p2, $p3, $p4) = split(/\:/, $ip);
|
||||
my $dp1 = hex($p1);
|
||||
my $dp2 = hex($p2);
|
||||
my $dp3 = hex($p3);
|
||||
my $dp4 = hex($p4);
|
||||
$ipaddr = "ip-address = $dp1.$dp2.$dp3.$dp4";
|
||||
# convert the hex IP address to a dotted decimal address for readability
|
||||
my ($ipname,$ip) = split /= /,$_;
|
||||
chomp($ip);
|
||||
my ($p1, $p2, $p3, $p4) = split(/\:/, $ip);
|
||||
my $dp1 = hex($p1);
|
||||
my $dp2 = hex($p2);
|
||||
my $dp3 = hex($p3);
|
||||
my $dp4 = hex($p4);
|
||||
$ipaddr = "ip-address = $dp1.$dp2.$dp3.$dp4";
|
||||
}
|
||||
}
|
||||
# if we collected the ip address then print out the information for this node
|
||||
if ($ipaddr) {
|
||||
push @{$rsp->{data}}, "$nname: $ipaddr, $hwaddr";
|
||||
xCAT::MsgUtils->message("I", $rsp, $callback);
|
||||
}
|
||||
close ($OMOUT);
|
||||
|
||||
# if using IPv6 addresses check using omshell IPv6 port
|
||||
if ($usingipv6) {
|
||||
open2($OMOUT6,$OMIN6,"/usr/bin/omshell ");
|
||||
print $OMOUT6 "port 7912\n";
|
||||
@ -206,15 +224,17 @@ sub listnode
|
||||
. $omapikey . "\"\n";
|
||||
print $OMIN6 "connect\n";
|
||||
print $OMIN6 "new host\n";
|
||||
# check for the node specified
|
||||
print $OMIN6 "set name = \"$node\"\n";
|
||||
print $OMIN6 "open\n";
|
||||
print $OMIN6 "close\n";
|
||||
close ($OMIN6);
|
||||
$name = 0;
|
||||
$ipaddr = "";
|
||||
while (<$OMOUT6>) { # now read the output of sort(1)
|
||||
while (<$OMOUT6>) { # now read the output
|
||||
chomp $_;
|
||||
if ($_ =~ $node) {
|
||||
# save the name
|
||||
if ($name) {
|
||||
$nname = $_;
|
||||
$nname =~ s/name = //;
|
||||
@ -223,17 +243,21 @@ sub listnode
|
||||
$name =1;
|
||||
}
|
||||
if ($_ =~ 'hardware-address') {
|
||||
# save the hardware-address
|
||||
$hwaddr = $_;
|
||||
}
|
||||
elsif ($_ =~ 'ip-address') {
|
||||
#save the ip address
|
||||
my ($ipname,$ipaddr) = split /= /,$_;
|
||||
chomp($ipaddr);
|
||||
}
|
||||
}
|
||||
# print the information if the ip address is found
|
||||
if ($ipaddr) {
|
||||
push @{$rsp->{data}}, "$nname: $ipaddr, $hwaddr";
|
||||
xCAT::MsgUtils->message("I", $rsp, $callback);
|
||||
}
|
||||
# close the IPv6 output file handle
|
||||
close ($OMOUT6);
|
||||
}
|
||||
}
|
||||
@ -746,7 +770,7 @@ sub addnode_aix
|
||||
my $netmask;
|
||||
for ($i = 0; $i < scalar(@dhcpconf); $i++)
|
||||
{
|
||||
if ( $dhcpconf[$i] =~ / ([\d\.]+)\/(\d+) ip configuration end/)
|
||||
if ( $dhcpconf[$i] ~= / ([\d\.]+)\/(\d+) ip configuration end/)
|
||||
{
|
||||
if (xCAT::NetworkUtils::isInSameSubnet( $ip, $1, $2, 1))
|
||||
{
|
||||
@ -870,6 +894,15 @@ sub check_options
|
||||
return 1;
|
||||
}
|
||||
|
||||
# check to see if -n is listed with any other options which is not allowed
|
||||
if ($::opt_n and ($::opt_a || $::opt_d || $::opt_n || $::opt_r || $::opt_l || $statements)) {
|
||||
my $rsp = {};
|
||||
$rsp->{data}->[0] = "The -n option cannot be used with other options.";
|
||||
xCAT::MsgUtils->message("E", $rsp, $callback, 1);
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
||||
unless (($req->{arg} and (@{$req->{arg}}>0)) or $req->{node})
|
||||
{
|
||||
my $rsp = {};
|
||||
@ -879,12 +912,16 @@ sub check_options
|
||||
}
|
||||
}
|
||||
|
||||
############################################################
|
||||
# preprocess_request will perform syntax checking and do basic precess checking
|
||||
############################################################
|
||||
sub preprocess_request
|
||||
{
|
||||
my $req = shift;
|
||||
my $callback = shift;
|
||||
my $rc = 0;
|
||||
|
||||
|
||||
# check the syntax
|
||||
check_options($req,$callback);
|
||||
|
||||
my $snonly=0;
|
||||
@ -897,12 +934,13 @@ sub preprocess_request
|
||||
my $hasHierarchy=0;
|
||||
|
||||
my @nodes=();
|
||||
# if the network option is specified
|
||||
# if the new option is not specified
|
||||
if (!$::opt_n) {
|
||||
# save the node names specified
|
||||
if ($req->{node}) {
|
||||
@nodes=@{$req->{node}};
|
||||
}
|
||||
# if option all
|
||||
# if option all
|
||||
elsif($::opt_a) {
|
||||
# if option delete - Delete all node entries, that were added by xCAT, from the DHCP server configuration.
|
||||
if ($::opt_d)
|
||||
@ -930,8 +968,8 @@ sub preprocess_request
|
||||
} # end - if -a
|
||||
|
||||
# don't put compute node entries in for AIX nodes
|
||||
# this is handled by NIM - duplicate entires will cause
|
||||
# an error
|
||||
# this is handled by NIM - duplicate entires will cause
|
||||
# an error
|
||||
if ($^O eq 'aix') {
|
||||
my @tmplist;
|
||||
my $Imsg;
|
||||
@ -944,29 +982,38 @@ sub preprocess_request
|
||||
if ($mytype->{nodetype} =~ /osi/) {
|
||||
$Imsg++;
|
||||
}
|
||||
# if its aix and not "osi" then add it to the list of nodes
|
||||
unless ($mytype->{nodetype} =~ /osi/) {
|
||||
push @tmplist, $n;
|
||||
}
|
||||
}
|
||||
}
|
||||
# replace nodes with the tmplist of nodes that are not osi nodetype
|
||||
@nodes = @tmplist;
|
||||
|
||||
# if any nodes were found with a ndoetype of osi - issue message that they are handled by NIM
|
||||
if ($Imsg) {
|
||||
my $rsp;
|
||||
push @{$rsp->{data}}, "AIX nodes with a nodetype of \'osi\' will not be added to the dhcp configuration file. This is handled by NIM.\n";
|
||||
xCAT::MsgUtils->message("I", $rsp, $callback);
|
||||
}
|
||||
}
|
||||
}
|
||||
} # OS is AIX processing
|
||||
} # !$::opt_n processing
|
||||
|
||||
# If service node and not -n option
|
||||
if (($snonly == 1) && (!$::opt_n)) {
|
||||
# if a list of nodes are specified
|
||||
if (@nodes > 0) {
|
||||
# get the hash of service nodes
|
||||
my $sn_hash =xCAT::ServiceNodeUtils->getSNformattedhash(\@nodes,"xcat","MN");
|
||||
# if processing only on the local host
|
||||
if ($localonly) {
|
||||
#check if this node is the service node for any input node
|
||||
my @hostinfo=xCAT::NetworkUtils->determinehostname();
|
||||
my %iphash=();
|
||||
# flag the hostnames in iphash
|
||||
foreach(@hostinfo) {$iphash{$_}=1;}
|
||||
# compare the service node hash with the iphash - a match adds this service node
|
||||
foreach(keys %$sn_hash) {
|
||||
if (exists($iphash{$_})) {
|
||||
my $reqcopy = {%$req};
|
||||
@ -977,9 +1024,10 @@ sub preprocess_request
|
||||
}
|
||||
}
|
||||
} else {
|
||||
# check to see if dhcp is running on service nodes
|
||||
my @sn = xCAT::ServiceNodeUtils->getSNList('dhcpserver');
|
||||
if (@sn > 0) { $hasHierarchy=1;}
|
||||
|
||||
# create a request for each service node
|
||||
foreach(keys %$sn_hash) {
|
||||
my $reqcopy = {%$req};
|
||||
$reqcopy->{'node'}=$sn_hash->{$_};
|
||||
@ -988,10 +1036,14 @@ sub preprocess_request
|
||||
push @requests, $reqcopy;
|
||||
}
|
||||
}
|
||||
}
|
||||
} elsif (@nodes > 0 or $::opt_n) { #send the request to every dhservers
|
||||
} # list of nodes specified
|
||||
# if new specified or there are nodes
|
||||
} # end if service node only and NOT -n option
|
||||
# if -n option or nodes were sepcified
|
||||
elsif (@nodes > 0 or $::opt_n) { #send the request to every dhservers
|
||||
$req->{'node'}=\@nodes;
|
||||
@requests = ({%$req}); #Start with a straight copy to reflect local instance
|
||||
# if not localonly - get list of service nodes and create requests
|
||||
unless ($localonly) {
|
||||
my @sn = xCAT::ServiceNodeUtils->getSNList('dhcpserver');
|
||||
if (@sn > 0) { $hasHierarchy=1; }
|
||||
@ -1015,6 +1067,7 @@ sub preprocess_request
|
||||
{
|
||||
foreach (@{$ntab->getAllEntries()})
|
||||
{
|
||||
# if dynamicrange specified but dhcpserver was not - issue error message
|
||||
if ($_->{dynamicrange} and not $_->{dhcpserver})
|
||||
{
|
||||
$callback->({error=>["Hierarchy requested, therefore networks.dhcpserver must be set for net=".$_->{net}.""],errorcode=>[1]});
|
||||
@ -1027,41 +1080,47 @@ sub preprocess_request
|
||||
return \@requests;
|
||||
|
||||
}
|
||||
|
||||
|
||||
#############################################################################
|
||||
# process_request will perform syntax checking and do basic process checkingi
|
||||
# and call other functions to complete the request to add or delete entries
|
||||
#############################################################################
|
||||
sub process_request
|
||||
{
|
||||
my $oldmask = umask 0077;
|
||||
$restartdhcp=0;
|
||||
my $req = shift;
|
||||
$callback = shift;
|
||||
my $rsp;
|
||||
my $oldmask = umask 0077;
|
||||
$restartdhcp=0;
|
||||
my $rsp;
|
||||
#print Dumper($req);
|
||||
|
||||
# Check options again in case we are called from plugin and options have not been processed
|
||||
check_options($req,$callback);
|
||||
|
||||
# if option is query then call listnode for each node and return
|
||||
if ($::opt_q)
|
||||
{
|
||||
# call listnode for each node requested
|
||||
foreach my $node ( @{$req->{node}} ) {
|
||||
listnode($node,$callback);
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
#if current node is a servicenode, make sure that it is also a dhcpserver
|
||||
# if current node is a servicenode, make sure that it is also a dhcpserver
|
||||
my $isok=1;
|
||||
if (xCAT::Utils->isServiceNode()) {
|
||||
$isok=0;
|
||||
my @hostinfo=xCAT::NetworkUtils->determinehostname();
|
||||
my %iphash=();
|
||||
foreach(@hostinfo) {$iphash{$_}=1;}
|
||||
my @sn = xCAT::ServiceNodeUtils->getSNList('dhcpserver');
|
||||
foreach my $s (@sn)
|
||||
{
|
||||
if (exists($iphash{$s})) {
|
||||
$isok=1;
|
||||
}
|
||||
}
|
||||
$isok=0;
|
||||
my @hostinfo=xCAT::NetworkUtils->determinehostname();
|
||||
my %iphash=();
|
||||
foreach(@hostinfo) {$iphash{$_}=1;}
|
||||
my @sn = xCAT::ServiceNodeUtils->getSNList('dhcpserver');
|
||||
foreach my $s (@sn)
|
||||
{
|
||||
if (exists($iphash{$s})) {
|
||||
$isok=1;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if($isok == 0) { #do nothing if it is a service node, but not dhcpserver
|
||||
@ -1970,7 +2029,9 @@ sub addnet
|
||||
my $mask_formated = $mask;
|
||||
if ( $^O eq 'aix')
|
||||
{
|
||||
$mask_formated = inet_ntoa(pack("N", 2**$mask - 1 << (32 - $mask)));
|
||||
my $mask_shift = 32 - $mask;
|
||||
$mask_formated = inet_ntoa(pack("N", 2**$mask - 1 << $mask_shift));
|
||||
# $mask_formated = inet_ntoa(pack("N", 2**$mask - 1 << (32 - $mask)));
|
||||
}
|
||||
|
||||
my ($ent) =
|
||||
|
||||
Loading…
Reference in New Issue
Block a user