From 67ee1808b6f969b52bfda0834f755b3b3f410de6 Mon Sep 17 00:00:00 2001 From: Oliver Gorwits Date: Tue, 10 Apr 2018 20:58:06 +0100 Subject: [PATCH] Revert "better way to construct short interface name" This reverts commit 8bcfaf12d0511ed084db5116896de4377f25663b. --- lib/App/Netdisco/Worker/Plugin/Discover/Neighbors.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/App/Netdisco/Worker/Plugin/Discover/Neighbors.pm b/lib/App/Netdisco/Worker/Plugin/Discover/Neighbors.pm index ed5c3818..613e402a 100644 --- a/lib/App/Netdisco/Worker/Plugin/Discover/Neighbors.pm +++ b/lib/App/Netdisco/Worker/Plugin/Discover/Neighbors.pm @@ -312,8 +312,8 @@ sub normalize_port { my $port = shift or return ''; my ($start, $end) = ('', ''); if ($port =~ m/^([a-z]{2})/i) { $start = $1 } - if ($port =~ m/[a-z]([^a-z]+)$/i) { $end = $1 } - return (($start && $end) ? "${start}${end}" : $port); + ($end = $port) =~ s/^\D+//; + return (quotemeta($start) .'%'. quotemeta($end)); } # take data from the topology table and update remote_ip and remote_port