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

Resolve -C,-S, and -G to IPs in resolve_netwk()

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@962 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
sakolish 2008-04-02 12:43:12 +00:00
parent a188362ffa
commit ea9aa6a862
1 changed files with 51 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
perl-xCAT-2.0/xCAT/PPC.pm
View File

@ -29,7 +29,7 @@ my %modules = (
rnetboot => "xCAT::PPCboot",
getmacs => "xCAT::PPCmac",
reventlog => "xCAT::PPClog",
rfsp => "xCAT::PPCfsp"
rspconfig => "xCAT::PPCfsp"
);
##########################################
@ -385,11 +385,17 @@ sub resolve_netwk {
send_msg( $request, 1, $msg );
next;
}
if ( !exists( $nethash{$_}{gateway} )) {
my $gateway = $nethash{$_}{gateway};
if ( !defined( $gateway )) {
my $msg = sprintf("$_: $errmsg{NO_ATTR}","gateway","networks");
send_msg( $request, 1, $msg );
next;
}
my $gateway_ip = toIP( $gateway );
if ( !defined( $gateway_ip ) ) {
send_msg( $request, 1, "$_: Cannot resolve '$gateway'" );
next;
}
#################################
# Get server (-S)
#################################
@ -398,6 +404,19 @@ sub resolve_netwk {
send_msg( $request, 1, "$_: Unable to identify master" );
next;
}
my $server_ip = toIP( $server );
if ( !defined( $server_ip ) ) {
send_msg( $request, 1, "$_: Cannot resolve '$server'" );
next;
}
#################################
# Get client (-C)
#################################
my $client_ip = toIP( $_ );
if ( !defined( $client_ip ) ) {
send_msg( $request, 1, "$_: Cannot resolve '$_'" );
next;
}
#################################
# Get mac-address (-m)
#################################
@ -408,26 +427,44 @@ sub resolve_netwk {
next;
}
#################################
# Get client (-C)
#################################
my $packed_ip = gethostbyname( $_ );
if ( !defined( $packed_ip ) or $! ) {
send_msg( $request, 1, "$_: Cannot resolve '$_' $!" );
next;
}
#################################
# Save results
#################################
$result{$_}{gateway} = $nethash{$_}{gateway};
$result{$_}{server} = $server;
$result{$_}{gateway} = $gateway_ip;
$result{$_}{server} = $server_ip;
$result{$_}{client} = $client_ip;
$result{$_}{mac} = $ent->{mac};
$result{$_}{client} = inet_ntoa( $packed_ip );
}
return( \%result );
}
##########################################################################
# Converts the specified hostname to an IP address
##########################################################################
sub toIP {
################################
# Already in IP format
################################
if ( $_[0] !~ /[a-zA-Z]/g ) {
return( $_[0] );
}
################################
# Convert to IP format
################################
my $raw_addr = (gethostbyname($_[0]))[4];
if ( !$raw_addr or $! ) {
return undef;
}
my @octets = unpack( "C4", $raw_addr );
my $ip = join( ".", @octets );
return( $ip );
}
##########################################################################
# Finds attributes for given node is various databases
##########################################################################
@ -848,3 +885,4 @@ sub process_request {