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

call NetworkUtils.pm subroutines instead of Utils.pm subroutines

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@6009 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
ligc
2010-05-07 02:44:50 +00:00
parent d97f02aa20
commit dfb30a46a9
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
perl-xCAT/xCAT/DBobjUtils.pm
View File

@@ -15,6 +15,7 @@ use xCAT::Schema;
use xCAT::Table;
use xCAT::Utils;
use xCAT::MsgUtils;
use xCAT::NetworkUtils;
use strict;
# IPv6 not yet implemented - need Socket6
@@ -1844,7 +1845,7 @@ sub getNetwkInfo
{
# get, check, split the node IP
my $IP = xCAT::Utils->getipaddr($node);
my $IP = xCAT::NetworkUtils->getipaddr($node);
chomp $IP;
unless (($IP =~ /\d+\.\d+\.\d+\.\d+/) || ($IP =~ /:/))
{

3
perl-xCAT/xCAT/InstUtils.pm
View File

@@ -24,6 +24,7 @@ use Socket;
use Sys::Hostname;
use strict;
require xCAT::Schema;
use xCAT::NetworkUtils;
#require Data::Dumper;
use Data::Dumper;
@@ -185,7 +186,7 @@ sub is_me
my ($class, $name) = @_;
# convert to IP
my $nameIP = xCAT::Utils->getipaddr($name);
my $nameIP = xCAT::NetworkUtils->getipaddr($name);
chomp $nameIP;
# split into octets

5
perl-xCAT/xCAT/PPCmac.pm
View File

@@ -5,6 +5,7 @@ use Socket;
use strict;
use Getopt::Long;
use xCAT::PPCcli qw(SUCCESS EXPECT_ERROR RC_ERROR NR_ERROR);
use xCAT::NetworkUtils;
##########################################################################
@@ -96,7 +97,7 @@ sub parse_args {
push @network, $_;
} else {
# get, check the node IP
$client_ip = xCAT::Utils->getipaddr(@$node[0]);
$client_ip = xCAT::NetworkUtils->getipaddr(@$node[0]);
chomp $client_ip;
if ( $client_ip ) {
$opt{C} = $client_ip;
@@ -118,7 +119,7 @@ sub parse_args {
# Service node is returned as hostname, Convert
# hostname to IP
####################################
$server_ip = xCAT::Utils->getipaddr($key);
$server_ip = xCAT::NetworkUtils->getipaddr($key);
chomp $server_ip;
} else {
####################################