Send Netdot-devel mailing list submissions to
[email protected]
To subscribe or unsubscribe via the World Wide Web, visit
https://osl.uoregon.edu/mailman/listinfo/netdot-devel
or, via email, send a message with subject or body 'help' to
[email protected]
You can reach the person managing the list at
[email protected]
When replying, please edit your Subject line so it is more specific
than "Re: Contents of Netdot-devel digest..."
Today's Topics:
1. [SCM] UNNAMED PROJECT branch netdot-1.0 updated.
netdot-1.0.1-31-gc190e04 ([email protected])
2. [SCM] UNNAMED PROJECT branch netdot-1.0 updated.
netdot-1.0.1-32-gc4d749c ([email protected])
----------------------------------------------------------------------
Message: 1
Date: Sat, 8 Sep 2012 12:19:37 -0700
From: [email protected]
Subject: [Netdot-devel] [SCM] UNNAMED PROJECT branch netdot-1.0
updated. netdot-1.0.1-31-gc190e04
To: [email protected]
Message-ID: <[email protected]>
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "UNNAMED PROJECT".
The branch, netdot-1.0 has been updated
via c190e04250455380efa8e705f4b96c56398a6cda (commit)
from e79199784abc9146e992b0dc2ad9bf243b3cf2c1 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit c190e04250455380efa8e705f4b96c56398a6cda
Author: Carlos Vicente <[email protected]>
Date: Sat Sep 8 15:19:03 2012 -0400
Correction to previous change
diff --git a/lib/Netdot/Model/Ipblock.pm b/lib/Netdot/Model/Ipblock.pm
index a0203db..6b7ea0c 100644
--- a/lib/Netdot/Model/Ipblock.pm
+++ b/lib/Netdot/Model/Ipblock.pm
@@ -461,7 +461,7 @@ sub is_loopback{
my $ip;
my $str;
- if ( !($ip = $class->netaddr(address=>$address, address=>$prefix))){
+ if ( !($ip = $class->netaddr(address=>$address, prefix=>$prefix))){
$str = ( $address && $prefix ) ? (join '/', $address, $prefix) :
$address;
$class->throw_user("Invalid IP: $str");
}
-----------------------------------------------------------------------
Summary of changes:
lib/Netdot/Model/Ipblock.pm | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
hooks/post-receive
--
UNNAMED PROJECT
------------------------------
Message: 2
Date: Sat, 8 Sep 2012 13:01:34 -0700
From: [email protected]
Subject: [Netdot-devel] [SCM] UNNAMED PROJECT branch netdot-1.0
updated. netdot-1.0.1-32-gc4d749c
To: [email protected]
Message-ID: <[email protected]>
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "UNNAMED PROJECT".
The branch, netdot-1.0 has been updated
via c4d749c8c09ddbf84c994d58cbc42050398cca8b (commit)
from c190e04250455380efa8e705f4b96c56398a6cda (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit c4d749c8c09ddbf84c994d58cbc42050398cca8b
Author: Carlos Vicente <[email protected]>
Date: Sat Sep 8 16:01:06 2012 -0400
Minor correction in Device query
diff --git a/lib/Netdot/Model/Device.pm b/lib/Netdot/Model/Device.pm
index 48d943c..0cf2933 100644
--- a/lib/Netdot/Model/Device.pm
+++ b/lib/Netdot/Model/Device.pm
@@ -1688,13 +1688,18 @@ sub get_ips_from_all {
$logger->debug(sub{ "Device::get_ips_from_all: Retrieving all Device
IPs..." });
my $dbh = $class->db_Main;
- my $aref = $dbh->selectall_arrayref("SELECT ip.address, d.id
- FROM ipblock ip, device d,
interface i
- WHERE i.device=d.id AND
ip.interface=i.id
+ my $aref1 = $dbh->selectall_arrayref("SELECT ip.address, d.id
+ FROM ipblock ip, device d,
interface i
+ WHERE i.device=d.id AND
ip.interface=i.id
");
+
+ my $aref2 = $dbh->selectall_arrayref("SELECT ip.address, d.id
+ FROM ipblock ip, device d
+ WHERE d.snmp_target=ip.id;");
+
# Build a hash of mac addresses to device ids
my %dev_ips;
- foreach my $row ( @$aref ){
+ foreach my $row ( @$aref1, @$aref2 ){
my ($address, $id) = @$row;
$dev_ips{$address} = $id;
}
-----------------------------------------------------------------------
Summary of changes:
lib/Netdot/Model/Device.pm | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
hooks/post-receive
--
UNNAMED PROJECT
------------------------------
_______________________________________________
Netdot-devel mailing list
[email protected]
https://osl.uoregon.edu/mailman/listinfo/netdot-devel
End of Netdot-devel Digest, Vol 66, Issue 6
*******************************************
