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

make consistent the imports for NetAddr when hostenum required

Browse Source
This commit is contained in:
Oliver Gorwits
2015-05-05 19:48:43 +01:00
parent 6fe75a39e0
commit dc93a89e48
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Netdisco/bin/netdisco-do
View File

@@ -40,7 +40,7 @@ use Dancer qw/:moose :script/;
info "App::Netdisco version $App::Netdisco::VERSION loaded."; info "App::Netdisco version $App::Netdisco::VERSION loaded.";
use NetAddr::IP ':rfc3021'; use NetAddr::IP qw/:rfc3021 :lower/;
use App::Netdisco::Util::Device 'get_device'; use App::Netdisco::Util::Device 'get_device';
use Try::Tiny; use Try::Tiny;
@@ -97,7 +97,7 @@ unless ($action) {
use Module::Load (); use Module::Load ();
use Data::Printer (); use Data::Printer ();
use Scalar::Util 'blessed'; use Scalar::Util 'blessed';
use NetAddr::IP::Lite ':lower'; use NetAddr::IP qw/:rfc3021 :lower/;
use Dancer ':script'; use Dancer ':script';
use App::Netdisco::Util::SNMP (); use App::Netdisco::Util::SNMP ();
@@ -159,7 +159,7 @@ unless ($action) {
return ('error', 'Missing device (-d).') if !defined $device; return ('error', 'Missing device (-d).') if !defined $device;
my $old_ip = $device->ip; my $old_ip = $device->ip;
my $new_ip = NetAddr::IP::Lite->new($extra); my $new_ip = NetAddr::IP->new($extra);
unless ($new_ip and $new_ip->addr ne '0.0.0.0') { unless ($new_ip and $new_ip->addr ne '0.0.0.0') {
return ('error', "Bad host or IP: ".($extra || '0.0.0.0')); return ('error', "Bad host or IP: ".($extra || '0.0.0.0'));
} }