xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-10-28 09:55:44 +00:00
Code Issues Releases Wiki Activity

fix issue switchtype didn't set for cumulus switch after discover #3976

Browse Source
This commit is contained in:
immarvin
2017-09-21 04:30:15 -04:00
parent 72e5e44975
commit e0ec727564
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
xCAT-server/lib/xcat/plugins/nodediscover.pm
View File

@@ -248,8 +248,16 @@ sub process_request {
#for onie switch, lookup and set the switchtype via mac of mgt interface
my $switchestab = xCAT::Table->new('switches');
if ($switchestab) {
my $switchtype=$xCAT::data::switchinfo::global_mac_identity{substr(lc($request->{_xcat_clientmac}->[0]),0,8)};
if(defined $switchtype){
my $switchtype;
my $switchvendor=$xCAT::data::switchinfo::global_mac_identity{substr(lc($request->{_xcat_clientmac}->[0]),0,8)};
if(defined $switchvendor){
my $search_string = join '|', keys(%xCAT::data::switchinfo::global_switch_type);
if ($switchvendor =~ /($search_string)/) {
$switchtype=$xCAT::data::switchinfo::global_switch_type{$1};
}
}
if($switchtype){
$switchestab->setNodeAttribs($node,{ switchtype => $switchtype });
}
$switchestab->close();