xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-05-30 01:26:38 +00:00
Code Issues Releases Wiki Activity

polished

Browse Source
This commit is contained in:
bybai 2016-09-14 05:36:18 -04:00
parent 64eea85fee
commit da0040be72
1 changed files with 42 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
xCAT-server/lib/xcat/plugins/localrest.pm
View File

@ -143,49 +143,59 @@ sub handle_rest_request {
#-------------------------------------------------------
sub list_adapters {
my ($rsp, $result, $ifaces, $cmd, $i, $tmpres, @cmdres, $mac, $ip);
my (@cmdres, @iparr, @macarr);
if (!opendir DIR, "/sys/class/net") {
$rsp->{data}->[0] = "Unable open /sys/class/net dir.";
xCAT::MsgUtils->message("E", $rsp, $::callback);
return 1;
}
my @dir = readdir(DIR);
closedir(DIR);
$i = 0;
foreach my $item (@dir) {
if ($item eq '.' || $item eq '..' || $item eq 'lo') {
next;
}
$cmd = "ip addr show dev $item";
my ($rsp, $result, $cmd, $tmpres, $vline);
my ($mac, $ip, $adapter, $preadapter, $samenic);
my (@cmdres, @origin, @eachline, @line);
$cmd = "ip -o addr";
@cmdres = xCAT::Utils->runcmd("$cmd", -1);
if (!@cmdres) {
if ($::RUNCMD_RC != 0) {
$rsp->{data}->[0] = "Executing ip command failed.";
xCAT::MsgUtils->message("E", $rsp, $::callback);
return 1;
}
# get net ip and mac
foreach my $in (@cmdres){
if ( $in =~ "inet" ) {
@iparr = split(' ',$in);
if ( $iparr[0] =~ /^inet$/ ) {
$ip = $iparr[1];
$tmpres->{'ip'} = $ip;
}
# sort ip -o addr result
for (my $i=0; $i<@cmdres; $i++) {
@eachline = split(' ',$cmdres[$i]);
if ( $eachline[1] =~ "lo" ) {
next;
}
if ( $in =~ 'ether' ) {
@macarr = split(' ',$in);
$mac = $macarr[1];
$tmpres->{'mac'} = $mac;
$adapter = $eachline[1];
$adapter =~ s/://;
if ( !$preadapter ) {
$preadapter = $adapter;
} elsif ( $preadapter ne $adapter ) {
$samenic->{$preadapter} = "@origin";
@origin = "";
$preadapter = $adapter;
}
push (@origin, @eachline);
if ( @cmdres == $i+1 ) {
$samenic->{$adapter} = "@origin";
}
}
$result->{$item} = $tmpres;
}
# get net ip and mac
foreach my $key (keys %{$samenic}){
$vline=${$samenic}{$key};
@line = split(' ',$vline);
my @tmpattr;
for (my $i=0; $i<@line; $i++) {
if ( $line[$i] =~ /^inet$/ ) {
$ip = $line[$i+1];
$tmpres->{'ip'} = $ip;
}
if ( $line[$i] =~ 'ether' ) {
$mac = $line[$i+1];
$tmpres->{'mac'} = $mac;
}
}
push (@tmpattr, $tmpres);
$result->{$key}=\@tmpattr;
}
return $result
}
#-------------------------------------------------------
=head3 handler to download credential files