diff --git a/xCAT-server/lib/xcat/plugins/localrest.pm b/xCAT-server/lib/xcat/plugins/localrest.pm index 0414d9a54..24e5a6b4f 100644 --- a/xCAT-server/lib/xcat/plugins/localrest.pm +++ b/xCAT-server/lib/xcat/plugins/localrest.pm @@ -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