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] Netdot Git repository branch master updated.
netdot-1.0.1-RC3-26-g863dc91 (Apache)
2. [SCM] Netdot Git repository branch netdot-1.0 updated.
netdot-1.0.1-RC3-25-g7044bcf (Apache)
3. [SCM] Netdot Git repository branch netdot-1.0 updated.
netdot-1.0.1-RC3-26-g4d0746b (Apache)
----------------------------------------------------------------------
Message: 1
Date: Sat, 21 Jul 2012 18:49:44 -0700
From: Apache <[email protected]>
Subject: [Netdot-devel] [SCM] Netdot Git repository branch master
updated. netdot-1.0.1-RC3-26-g863dc91
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 "Netdot Git repository".
The branch, master has been updated
via 863dc91b8cdb254783b916309d89a4d29cd5541b (commit)
via f11f8dc0ab44b01f324e8bcf017983689d4012b5 (commit)
via 3cc9bf52e839543ffd178618acf45be37102fa6e (commit)
via a4ed7c216b1bf5a07bf22708a04c6c189d613590 (commit)
via 9f5fa4df247fc18f56a17dc071061f0b7089d9b9 (commit)
via 6636952a00affaaca48ea566d64e6e38481c5792 (commit)
via 095e62f86d4faa156032d64ab231d1840fc3ab39 (commit)
via 6d3b2637f0cbf4bf17224373bc2bba0041a21e52 (commit)
via 076858e6d643213587d7f39409ac00e71e6929eb (commit)
via 78f29224640a29cb8685ff7ebf450d85024c0997 (commit)
via 4fcd04499cbaec552b49e46c37406237c6d91c39 (commit)
via f3e68da7eb173be5f96521df8d0c40e31ccbf697 (commit)
via dc9703ab6de48c40d125a412a24e24ca05612921 (commit)
via 0c5e9c08cf089bc7a4d19baad6a3c7a741848a16 (commit)
via 90f0d1528cb66945ccbaf6c6f37ab8f903337973 (commit)
via f5a14527b893d877e76b34f4247e895dd19ef60d (commit)
from 6b9e885722aea2f3f6368d2ba36e24089dca05ce (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 863dc91b8cdb254783b916309d89a4d29cd5541b
Merge: 6b9e885 f11f8dc
Author: Carlos Vicente <[email protected]>
Date: Sat Jul 21 21:49:12 2012 -0400
Merge branch 'netdot-1.0'
-----------------------------------------------------------------------
Summary of changes:
bin/updatedevices.pl | 2 +-
etc/netdot.meta | 8 +++---
htdocs/generic/edit.html | 6 ++++-
htdocs/management/updatedevice.html | 3 ++
lib/Netdot/Exporter/Rancid.pm | 37 +++++++++++++++++++---------------
lib/Netdot/Model.pm | 11 ----------
lib/Netdot/Model/ArpCacheEntry.pm | 17 +++++++++------
lib/Netdot/Model/Device.pm | 16 ++++++++++----
lib/Netdot/Model/Interface.pm | 14 ++++++++----
lib/Netdot/Model/Ipblock.pm | 29 ++++++++++++++++++--------
lib/Netdot/REST.pm | 2 +-
lib/Netdot/UI.pm | 30 ++++++++++++++++++++++++++++
upgrade/updatedb | 2 +
13 files changed, 117 insertions(+), 60 deletions(-)
hooks/post-receive
--
Netdot Git repository
------------------------------
Message: 2
Date: Sat, 21 Jul 2012 19:28:57 -0700
From: Apache <[email protected]>
Subject: [Netdot-devel] [SCM] Netdot Git repository branch netdot-1.0
updated. netdot-1.0.1-RC3-25-g7044bcf
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 "Netdot Git repository".
The branch, netdot-1.0 has been updated
via 7044bcf944be3c4a93717f1ca9b96c3dee41e3dd (commit)
from f11f8dc0ab44b01f324e8bcf017983689d4012b5 (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 7044bcf944be3c4a93717f1ca9b96c3dee41e3dd
Author: Carlos Vicente <[email protected]>
Date: Sat Jul 21 22:28:24 2012 -0400
Remove incorrect index addition in upgrade script
diff --git a/upgrade/updatedb b/upgrade/updatedb
index 9c0c6a4..900052f 100644
--- a/upgrade/updatedb
+++ b/upgrade/updatedb
@@ -359,7 +359,6 @@ push @statements, (
"ALTER TABLE site ADD COLUMN gsf integer;",
"ALTER TABLE site ADD UNIQUE KEY Site5 (number);",
"ALTER TABLE site_history ADD COLUMN gsf integer;",
- "ALTER TABLE site_history ADD UNIQUE KEY Site5 (number);",
# FK Indexes
"ALTER TABLE backbonecable_history ADD KEY (owner);",
-----------------------------------------------------------------------
Summary of changes:
upgrade/updatedb | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
hooks/post-receive
--
Netdot Git repository
------------------------------
Message: 3
Date: Sun, 22 Jul 2012 05:53:23 -0700
From: Apache <[email protected]>
Subject: [Netdot-devel] [SCM] Netdot Git repository branch netdot-1.0
updated. netdot-1.0.1-RC3-26-g4d0746b
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 "Netdot Git repository".
The branch, netdot-1.0 has been updated
via 4d0746b7df150f137b6c2af26b199adf6c73bdaf (commit)
from 7044bcf944be3c4a93717f1ca9b96c3dee41e3dd (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 4d0746b7df150f137b6c2af26b199adf6c73bdaf
Author: Carlos Vicente <[email protected]>
Date: Sun Jul 22 05:53:03 2012 -0700
Corrections
diff --git a/lib/Netdot/Model/Ipblock.pm b/lib/Netdot/Model/Ipblock.pm
index 4d452db..1048c0e 100644
--- a/lib/Netdot/Model/Ipblock.pm
+++ b/lib/Netdot/Model/Ipblock.pm
@@ -1398,8 +1398,8 @@ sub cidr {
##################################################################
=head2 full_address
- Returns the address part in FULL notation for ipV4 and ipV6 respectively.
- See NetAddr::IP::full()
+ Returns the address part in FULL notation for IPv6.
+ For IPv4, it returns the standard dotted-quad string.
Arguments:
None
@@ -1412,7 +1412,11 @@ sub cidr {
sub full_address {
my $self = shift;
$self->isa_object_method('full_address');
- return $self->netaddr->full()
+ if ( $self->version == 6 ){
+ return $self->netaddr->full();
+ }else{
+ return $self->address;
+ }
}
##################################################################
diff --git a/lib/Netdot/UI.pm b/lib/Netdot/UI.pm
index 3a1c1da..797ea49 100644
--- a/lib/Netdot/UI.pm
+++ b/lib/Netdot/UI.pm
@@ -2451,14 +2451,14 @@ sub localize_newlines {
}
############################################################################
-=head check_value_lengths
+=head2 check_value_lengths
Arguments: table, args hashref
Returns: True
- Examples: $ui->_check_value_lenghts(\%args);
+ Examples: $ui->check_value_lenghts(\%args);
=cut
-sub check_value_lenghts {
+sub check_value_lengths {
my($self, $table, $args) = @_;
foreach my $c ( keys %$args ){
my $mcol;
-----------------------------------------------------------------------
Summary of changes:
lib/Netdot/Model/Ipblock.pm | 10 +++++++---
lib/Netdot/UI.pm | 6 +++---
2 files changed, 10 insertions(+), 6 deletions(-)
hooks/post-receive
--
Netdot Git repository
------------------------------
_______________________________________________
Netdot-devel mailing list
[email protected]
https://osl.uoregon.edu/mailman/listinfo/netdot-devel
End of Netdot-devel Digest, Vol 64, Issue 20
********************************************
