135/netdisco
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Handle whitespace ahead of OUI data

Browse Source
This commit is contained in:
Oliver Gorwits
2013-05-05 16:20:39 +01:00
parent 5c8a5754f6
commit f468b48049
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Netdisco/Changes
View File

@@ -4,8 +4,8 @@
* Finally we have a discover/refresh daemon job :) * Finally we have a discover/refresh daemon job :)
* Also... a Scheduler which removes need for crontab installation * Also... a Scheduler which removes need for crontab installation
* The netdisco-do script can run a one-off discover for a device * The netdisco-do script can run any one-off job
* Can select MAC Address display format on Node and Device Port search * Select MAC Address display format on Node and Device Port search
[ENHANCEMENTS] [ENHANCEMENTS]
@@ -22,6 +22,7 @@
* Update to latest Bootstrap and JQuery, and temp. fix #7326 in Bootstrap * Update to latest Bootstrap and JQuery, and temp. fix #7326 in Bootstrap
* Partial Name in Port search now working * Partial Name in Port search now working
* Add unique constraints to topology table * Add unique constraints to topology table
* Handle whitespace ahead of OUI data
2.007000_001 - 2013-03-17 2.007000_001 - 2013-03-17

2
Netdisco/bin/netdisco-deploy
View File

@@ -134,7 +134,7 @@ sub deploy_oui {
if ($resp->{success}) { if ($resp->{success}) {
foreach my $line (split /\n/, $resp->{content}) { foreach my $line (split /\n/, $resp->{content}) {
if ($line =~ m/^(.{2}-.{2}-.{2})\s+\(hex\)\s+(.*)\s*$/i) { if ($line =~ m/^\s*(.{2}-.{2}-.{2})\s+\(hex\)\s+(.*)\s*$/i) {
my ($oui, $company) = ($1, $2); my ($oui, $company) = ($1, $2);
$oui =~ s/-/:/g; $oui =~ s/-/:/g;
$data{lc($oui)} = $company; $data{lc($oui)} = $company;