From 2dbcc258437b71ebb2d2d37001cd872369dc86d8 Mon Sep 17 00:00:00 2001
From: Oliver Gorwits <oliver@cpan.org>
Date: Thu, 31 Jul 2014 19:59:00 +0100
Subject: [PATCH] +  * Sort CDP/LLDP data to be more consistent when multiple
 neighbors on a port +  * Add "AP" as a hint for WAP support

---
 Netdisco/Changes                           | 2 ++
 Netdisco/lib/App/Netdisco/Core/Discover.pm | 6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Netdisco/Changes b/Netdisco/Changes
index ee309134..1ff39208 100644
--- a/Netdisco/Changes
+++ b/Netdisco/Changes
@@ -3,6 +3,8 @@
   [BUG FIXES]
 
   * Missing action to netdisco-do should not throw Perl error
+  * Sort CDP/LLDP data to be more consistent when multiple neighbors on a port
+  * Add "AP" as a hint for WAP support
 
 2.028013 - 2014-07-31
 
diff --git a/Netdisco/lib/App/Netdisco/Core/Discover.pm b/Netdisco/lib/App/Netdisco/Core/Discover.pm
index 48ead720..779b92a2 100644
--- a/Netdisco/lib/App/Netdisco/Core/Discover.pm
+++ b/Netdisco/lib/App/Netdisco/Core/Discover.pm
@@ -666,7 +666,7 @@ sub store_neighbors {
   my $c_platform = $snmp->c_platform;
   my $c_cap      = $snmp->c_cap;
 
-  foreach my $entry (List::MoreUtils::uniq( (keys %$c_ip), (keys %$c_cap) )) {
+  foreach my $entry (sort (List::MoreUtils::uniq( (keys %$c_ip), (keys %$c_cap) ))) {
       if (!defined $c_if->{$entry} or !defined $interfaces->{ $c_if->{$entry} }) {
           debug sprintf ' [%s] neigh - port for IID:%s not resolved, skipping',
             $device->ip, $entry;
@@ -695,11 +695,11 @@ sub store_neighbors {
           my $phone_flag = grep {/phone/i} @$remote_cap;
           my $ap_flag    = grep {/wlanAccessPoint/} @$remote_cap;
 
-          if ($phone_flag or $remote_type =~ m/(mitel.5\d{3})/i) {
+          if ($phone_flag or $remote_type =~ m/mitel.5\d{3}/i) {
               $remote_type = 'IP Phone: '. $remote_type
                 if $remote_type !~ /ip phone/i;
           }
-          elsif ($ap_flag) {
+          elsif ($ap_flag or $remote_type =~ m/\bw?ap\b/i) {
               $remote_type = 'AP: '. $remote_type;
           }