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

[#13] Support IP address ranges in *_only/*_no configuration

Browse Source
This commit is contained in:
Oliver Gorwits
2014-01-11 13:02:45 +00:00
parent 693e0bd6db
commit 52f0eed6fb
3 changed files with 62 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Netdisco/Changes
View File

@@ -3,6 +3,7 @@
[NEW FEATURES] [NEW FEATURES]
* [#81] Identify wireless nodes and provide information when available * [#81] Identify wireless nodes and provide information when available
* [#13] Support IP address ranges in *_only/*_no configuration
[ENHANCEMENTS] [ENHANCEMENTS]

22
Netdisco/lib/App/Netdisco/Manual/Configuration.pod
View File

@@ -381,7 +381,8 @@ devices. For more fine-grained control see the C<bulkwalk_no> setting.
Value: List of Network Identifiers or Device Properties. Default: Empty List. Value: List of Network Identifiers or Device Properties. Default: Empty List.
IP addresses in the list will use C<GETNEXT> (and not C<BULKWALK>). You can IP addresses in the list will use C<GETNEXT> (and not C<BULKWALK>). You can
include hostnames, IP addresses and subnets (IPv4 or IPv6) in the list. include hostnames, IP addresses, subnets (IPv4 or IPv6), and address ranges
(using a hyphen and no whitespace) in the list.
Alternatively include a "C<property:regex>" entry to match the named property Alternatively include a "C<property:regex>" entry to match the named property
of the device. The regex must match the complete value. of the device. The regex must match the complete value.
@@ -445,7 +446,8 @@ Number of times to retry connecting to a device before giving up.
Value: List of Network Identifiers or Device Properties. Default: Empty List. Value: List of Network Identifiers or Device Properties. Default: Empty List.
IP addresses in the list will not be visited during device discovery. You can IP addresses in the list will not be visited during device discovery. You can
include hostnames, IP addresses and subnets (IPv4 or IPv6) in the list. include hostnames, IP addresses, subnets (IPv4 or IPv6), and address ranges
(using a hyphen and no whitespace) in the list.
Alternatively include a "C<property:regex>" entry to match the named property Alternatively include a "C<property:regex>" entry to match the named property
of the device. The regex must match the complete value. of the device. The regex must match the complete value.
@@ -455,8 +457,8 @@ of the device. The regex must match the complete value.
Value: List of Network Identifiers or Device Properties. Default: Empty List. Value: List of Network Identifiers or Device Properties. Default: Empty List.
If present, device discovery will be limited to IP addresses matching entries If present, device discovery will be limited to IP addresses matching entries
in this list. You can include hostnames, IP addresses and subnets (IPv4 and in this list. You can include hostnames, IP addresses, subnets (IPv4 and
IPv6). IPv6), and address ranges (using a hyphen and no whitespace).
Alternatively include a "C<property:regex>" entry to match the named property Alternatively include a "C<property:regex>" entry to match the named property
of the device. The regex must match the complete value. of the device. The regex must match the complete value.
@@ -486,7 +488,8 @@ discover jobs for a device.
Value: List of Network Identifiers or Device Properties. Default: Empty List. Value: List of Network Identifiers or Device Properties. Default: Empty List.
IP addresses in the list will not be visited for macsuck. You can include IP addresses in the list will not be visited for macsuck. You can include
hostnames, IP addresses and subnets (IPv4 or IPv6) in the list. hostnames, IP addresses, subnets (IPv4 or IPv6), and address ranges (using a
hyphen and no whitespace) in the list.
Alternatively include a "C<property:regex>" entry to match the named property Alternatively include a "C<property:regex>" entry to match the named property
of the device. The regex must match the complete value. of the device. The regex must match the complete value.
@@ -496,7 +499,8 @@ of the device. The regex must match the complete value.
Value: List of Network Identifiers or Device Properties. Default: Empty List. Value: List of Network Identifiers or Device Properties. Default: Empty List.
If present, macsuck will be limited to IP addresses matching entries in this If present, macsuck will be limited to IP addresses matching entries in this
list. You can include hostnames, IP addresses and subnets (IPv4 and IPv6). list. You can include hostnames, IP addresses, subnets (IPv4 and IPv6), and
address ranges (using a hyphen and no whitespace).
Alternatively include a "C<property:regex>" entry to match the named property Alternatively include a "C<property:regex>" entry to match the named property
of the device. The regex must match the complete value. of the device. The regex must match the complete value.
@@ -552,7 +556,8 @@ macsuck jobs for a device.
Value: List of Network Identifiers or Device Properties. Default: Empty List. Value: List of Network Identifiers or Device Properties. Default: Empty List.
IP addresses in the list will not be visited for arpnip. You can include IP addresses in the list will not be visited for arpnip. You can include
hostnames, IP addresses and subnets (IPv4 or IPv6) in the list. hostnames, IP addresses, subnets (IPv4 or IPv6), and address ranges (using a
hyphen and no whitespace) in the list.
Alternatively include a "C<property:regex>" entry to match the named property Alternatively include a "C<property:regex>" entry to match the named property
of the device. The regex must match the complete value. of the device. The regex must match the complete value.
@@ -562,7 +567,8 @@ of the device. The regex must match the complete value.
Value: List of Network Identifiers or Device Properties. Default: Empty List. Value: List of Network Identifiers or Device Properties. Default: Empty List.
If present, arpnip will be limited to IP addresses matching entries in this If present, arpnip will be limited to IP addresses matching entries in this
list. You can include hostnames, IP addresses and subnets (IPv4 and IPv6). list. You can include hostnames, IP addresses, subnets (IPv4 and IPv6), and
address ranges (using a hyphen and no whitespace).
Alternatively include a "C<property:regex>" entry to match the named property Alternatively include a "C<property:regex>" entry to match the named property
of the device. The regex must match the complete value. of the device. The regex must match the complete value.

51
Netdisco/lib/App/Netdisco/Util/Device.pm
View File

@@ -59,10 +59,10 @@ sub get_device {
->find_or_new({ip => $ip}); ->find_or_new({ip => $ip});
} }
=head2 check_acl( $ip, \@prefixes ) =head2 check_acl( $ip, \@config )
Given the IP address of a device, returns true if any of the IP prefixes in Given the IP address of a device, returns true if any of the items in C<<
C<< \@prefixes >> contains that device, otherwise returns false. \@config >> matches that device, otherwise returns false.
Normally you use C<check_no> and C<check_only>, passing the name of the Normally you use C<check_no> and C<check_only>, passing the name of the
configuration setting to load. This helper instead requires not the name of configuration setting to load. This helper instead requires not the name of
@@ -88,10 +88,45 @@ sub check_acl {
and $device->prop =~ m/^$match$/) { and $device->prop =~ m/^$match$/) {
return 1; return 1;
} }
next; next;
} }
my $ip = NetAddr::IP::Lite->new($item) or next; if ($item =~ m/([a-f0-9]+)-([a-f0-9]+)$/i) {
my $first = $1;
my $last = $2;
if ($item =~ m/:/) {
next unless $addr->bits == 128;
$first = hex $first;
$last = hex $last;
(my $header = $item) =~ s/:[^:]+$/:/;
foreach my $part ($first .. $last) {
my $ip = NetAddr::IP::Lite->new($header . sprintf('%x',$part) . '/128')
or next;
return 1 if $ip == $addr;
}
}
else {
next unless $addr->bits == 32;
(my $header = $item) =~ s/\.[^.]+$/./;
foreach my $part ($first .. $last) {
my $ip = NetAddr::IP::Lite->new($header . $part . '/32')
or next;
return 1 if $ip == $addr;
}
}
next;
}
my $ip = NetAddr::IP::Lite->new($item)
or next;
next unless $ip->bits == $addr->bits;
return 1 if $ip->contains($addr); return 1 if $ip->contains($addr);
} }
@@ -116,6 +151,10 @@ Hostname, IP address, IP prefix
=item * =item *
IP address range, using a hyphen and no whitespace
=item *
C<"model:regex"> - matched against the device model C<"model:regex"> - matched against the device model
=item * =item *
@@ -157,6 +196,10 @@ Hostname, IP address, IP prefix
=item * =item *
IP address range, using a hyphen and no whitespace
=item *
C<"model:regex"> - matched against the device model C<"model:regex"> - matched against the device model
=item * =item *