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

Search by device port MAC no longer fatal

Browse Source
This commit is contained in:
Oliver Gorwits
2013-03-02 15:56:13 +00:00
parent 26c5014479
commit 5d33591903
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Netdisco/Changes
View File

@@ -12,6 +12,10 @@
* Use Path::Class for path and file name construction consistently * Use Path::Class for path and file name construction consistently
* Avoid use of DNS when looking up devices in DB by IP * Avoid use of DNS when looking up devices in DB by IP
[BIG FIXES]
* Search by device port MAC no longer fatal
2.005000_002 - 2013-02-10 2.005000_002 - 2013-02-10
[ENHANCEMENTS] [ENHANCEMENTS]

3
Netdisco/lib/App/Netdisco/DB/ResultSet/Device.pm
View File

@@ -70,7 +70,8 @@ sub search_aliases {
my $clause; my $clause;
if ($by_ip) { if ($by_ip) {
my $ip = NetAddr::IP::Lite->new($q); my $ip = NetAddr::IP::Lite->new($q)
or return undef; # could be a MAC address!
$clause = [ $clause = [
'me.ip' => { '<<=' => $ip->cidr }, 'me.ip' => { '<<=' => $ip->cidr },
'device_ips.alias' => { '<<=' => $ip->cidr }, 'device_ips.alias' => { '<<=' => $ip->cidr },