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

sync from the trunk for hardware discovery on debian/ubuntu

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/branches/2.8@16251 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
xq2005 2013-05-13 08:11:11 +00:00
parent 88e689b996
commit e2055a8251
5 changed files with 36 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
xCAT-server/lib/xcat/plugins/blade.pm
View File

@ -4296,7 +4296,13 @@ sub process_request {
$invreq{command} = ['rinv'];
my $mac;
my $ip = $request->{'_xcat_clientip'};
my $arptable = `/sbin/arp -n`;
my $arptable;
if ( -x "/usr/sbin/arp" ) {
$arptable = `/usr/sbin/arp -n`;
}
else{
$arptable = `/sbin/arp -n`;
}
my @arpents = split /\n/,$arptable;
foreach (@arpents) {
if (m/^($ip)\s+\S+\s+(\S+)\s/) {

8
xCAT-server/lib/xcat/plugins/hpblade.pm
View File

@ -689,7 +689,13 @@ sub process_request {
$invreq{command} = ['rinv'];
my $mac;
my $ip = $request->{'_xcat_clientip'};
my $arptable = `/sbin/arp -n`;
my $arptable;
if ( -x "/usr/sbin/arp") {
$arptable = `/usr/sbin/arp -n`;
}
else{
$arptable = `/sbin/arp -n`;
}
my @arpents = split /\n/,$arptable;
foreach (@arpents) {
if (m/^($ip)\s+\S+\s+(\S+)\s/) {

9
xCAT-server/lib/xcat/plugins/profilednodes.pm
View File

@ -37,6 +37,7 @@ my %allnicips;
my %allracks;
my %allchassis;
my %allswitches;
# The array of all chassis which is special CMM
my %allcmmchassis;
my %allothernics;
@ -1436,7 +1437,13 @@ sub findme{
my $ip = $request->{'_xcat_clientip'};
xCAT::MsgUtils->message('S', "Profield nodes discover: _xcat_clientip is $ip.\n");
my $mac = '';
my $arptable = `/sbin/arp -n`;
my $arptable;
if ( -x "/usr/sbin/arp" ){
$arptable = `/usr/sbin/arp -n`;
}
else {
$arptable = `/sbin/arp -n`;
}
my @arpents = split /\n/,$arptable;
foreach (@arpents) {
if (m/^($ip)\s+\S+\s+(\S+)\s/) {

8
xCAT-server/lib/xcat/plugins/seqdiscovery.pm
View File

@ -71,7 +71,13 @@ sub findme {
if (defined $request->{nodetype} and $request->{nodetype}->[0] eq 'virtual') {
return;
}
my $arptable = `/sbin/arp -n`;
my $arptable;
if ( -x "/usr/sbin/arp") {
$arptable = `/usr/sbin/arp -n`;
}
else{
$arptable = `/sbin/arp -n`;
}
my @arpents = split /\n/,$arptable;
foreach (@arpents) {
if (m/^($ip)\s+\S+\s+(\S+)\s/) {

8
xCAT-server/lib/xcat/plugins/switch.pm
View File

@ -130,7 +130,13 @@ sub process_request {
#discovery working. Food for thought.
return;
}
my $arptable = `/sbin/arp -n`;
my $arptable;
if ( -x "/usr/sbin/arp") {
$arptable = `/usr/sbin/arp -n`;
}
else{
$arptable = `/sbin/arp -n`;
}
my @arpents = split /\n/,$arptable;
foreach (@arpents) {
if (m/^($ip)\s+\S+\s+(\S+)\s/) {