xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-06-12 17:30:19 +00:00
Code Issues Releases Wiki Activity

modify output format

Browse Source
This commit is contained in:
bybai
2016-09-22 04:53:08 -04:00
parent da0040be72
commit e4bc58c961
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -143,9 +143,9 @@ sub handle_rest_request {
#-------------------------------------------------------
sub list_adapters {
my ($rsp, $result, $cmd, $tmpres, $vline);
my ($rsp, $cmd, $tmpres, $vline);
my ($mac, $ip, $adapter, $preadapter, $samenic);
my (@cmdres, @origin, @eachline, @line);
my (@cmdres, @origin, @eachline, @line, @result);
$cmd = "ip -o addr";
@cmdres = xCAT::Utils->runcmd("$cmd", -1);
if ($::RUNCMD_RC != 0) {
@ -177,7 +177,7 @@ sub list_adapters {
foreach my $key (keys %{$samenic}){
$vline=${$samenic}{$key};
@line = split(' ',$vline);
my @tmpattr;
$tmpres->{'name'} = $key;
for (my $i=0; $i<@line; $i++) {
if ( $line[$i] =~ /^inet$/ ) {
@ -190,12 +190,13 @@ sub list_adapters {
$tmpres->{'mac'} = $mac;
}
}
push (@tmpattr, $tmpres);
$result->{$key}=\@tmpattr;
push (@result, $tmpres);
}
return $result
return \@result;
}
#-------------------------------------------------------
=head3 handler to download credential files