diff --git a/perl-xCAT/xCAT/data/switchinfo.pm b/perl-xCAT/xCAT/data/switchinfo.pm index 7cf372ac9..7ef864390 100644 --- a/perl-xCAT/xCAT/data/switchinfo.pm +++ b/perl-xCAT/xCAT/data/switchinfo.pm @@ -47,6 +47,8 @@ our %global_switch_type = ( sLEN => "irpdu", sIBM => "irpdu", coral => "crpdu" + Dell => "Dell" + dell => "Dell" ); diff --git a/xCAT-server/lib/xcat/plugins/switchdiscover.pm b/xCAT-server/lib/xcat/plugins/switchdiscover.pm index 04aee5670..342c55ff0 100644 --- a/xCAT-server/lib/xcat/plugins/switchdiscover.pm +++ b/xCAT-server/lib/xcat/plugins/switchdiscover.pm @@ -981,14 +981,9 @@ sub get_snmpvendorinfo { push @comm_list, 'public'; foreach $comms(@comm_list) { - #for pdu: get vendor info from sysDescr - #for switches: get vendor info from entPhysicalDescr + # get vendor info from sysDescr my $ccmd; - if (exists($globalopt{pdu})) { - $ccmd = "snmpwalk -Os -v1 -c $comms $ip 1.3.6.1.2.1.1.1"; - } else { - $ccmd = "snmpwalk -Os -v1 -c $comms $ip 1.3.6.1.2.1.47.1.1.1.1.2.1"; - } + $ccmd = "snmpwalk -Os -v1 -c $comms $ip 1.3.6.1.2.1.1.1"; if (exists($globalopt{verbose})) { send_msg($request, 0, "Process command: $ccmd\n"); }