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. [Netdot - Feature #1669] (New) Display circuit ID on the
backbone cable strand page ([email protected])
2. [SCM] Netdot Git repository branch netdot-1.0 updated.
netdot-1.0.1-RC3-74-g499f78d (Apache)
3. [SCM] Netdot Git repository branch netdot-1.0 updated.
netdot-1.0.1-RC3-75-g6d6bcba (Apache)
----------------------------------------------------------------------
Message: 1
Date: Sun, 29 Jul 2012 16:12:59 -0700
From: [email protected]
Subject: [Netdot-devel] [Netdot - Feature #1669] (New) Display circuit
ID on the backbone cable strand page
To: [email protected], [email protected]
Message-ID: <[email protected]>
Content-Type: text/plain; charset=utf-8
Issue #1669 has been reported by Alastair Sheppard.
----------------------------------------
Feature #1669: Display circuit ID on the backbone cable strand page
https://osl.uoregon.edu/redmine/issues/1669
Author: Alastair Sheppard
Status: New
Priority: Normal
Assignee:
Category: CablePlant
Target version: 1.0.1
Resolution:
On the backbone cable page, in the cable strands section would it be possible
to show the Circuit name as one of the columns? It would give a quick view of
what each strand is connected to at each end (provided one named their circuit
properly in such a way).
Cheers Alastair
--
You have received this notification because you have either subscribed to it,
or are involved in it.
To change your notification preferences, please click here:
http://osl.uoregon.edu/redmine/my/account
------------------------------
Message: 2
Date: Mon, 30 Jul 2012 09:21:40 -0700
From: Apache <[email protected]>
Subject: [Netdot-devel] [SCM] Netdot Git repository branch netdot-1.0
updated. netdot-1.0.1-RC3-74-g499f78d
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 499f78d48733748d33e37416130920d5459a8c57 (commit)
via 573fd34644250552f77ba4587d7679cb398278f5 (commit)
from febb3d5e7f2104d255041ea7833f97c19176041f (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 499f78d48733748d33e37416130920d5459a8c57
Author: Carlos Vicente <[email protected]>
Date: Mon Jul 30 12:21:31 2012 -0400
Do not fail any delete operation because of a constraint in a history
table. Just delete the history records that refer to the deleted object
diff --git a/lib/Netdot/Meta.pm b/lib/Netdot/Meta.pm
index 4d48be1..3a8b9a1 100644
--- a/lib/Netdot/Meta.pm
+++ b/lib/Netdot/Meta.pm
@@ -234,11 +234,20 @@ sub cdbi_class{
my $l = $c->links_to_attrs();
my $casc = $l->{cascade};
croak "cdbi_classes: Missing 'cascade' entry for $tab:$col" unless
$casc;
- my %args;
+ my %args;
if ( $casc eq 'Nullify' ){
$args{cascade} = 'Class::DBI::Cascade::Nullify';
- }elsif ( $casc =~ /^Delete|Fail$/i ){
+ }elsif ( $casc eq 'Delete' ){
$args{cascade} = $casc;
+ }elsif ( $casc eq 'Fail' ){
+ if ( $t->is_history ){
+ # We don't want any delete operation to fail
+ # because of a history table. Just nullify the
+ # foreign key in the history record
+ $args{cascade} = 'Delete';
+ }else{
+ $args{cascade} = 'Fail';
+ }
}else{
croak "cdbi_classes: Unknown cascade behavior $casc";
}
diff --git a/lib/Netdot/Model.pm b/lib/Netdot/Model.pm
index 06a9814..4d13dbb 100644
--- a/lib/Netdot/Model.pm
+++ b/lib/Netdot/Model.pm
@@ -876,10 +876,11 @@ sub delete {
$self->SUPER::delete();
};
if ( my $e = $@ ){
+ my $msg;
if ( $e =~ /objects still refer to/i ){
- $e = "Other objects refer to this object. Delete failed.";
+ $msg = "Other objects refer to this object ($class id $id). Delete
failed.";
}
- $self->throw_user($e);
+ $self->throw_user($msg);
}
$logger->debug( sub { sprintf("Model::delete: Deleted %s id %i",
$class, $id) } );
commit 573fd34644250552f77ba4587d7679cb398278f5
Author: Carlos Vicente <[email protected]>
Date: Mon Jul 30 11:23:58 2012 -0400
Clarify debug message
diff --git a/lib/Netdot/Model/Ipblock.pm b/lib/Netdot/Model/Ipblock.pm
index 8891f13..89d9d31 100644
--- a/lib/Netdot/Model/Ipblock.pm
+++ b/lib/Netdot/Model/Ipblock.pm
@@ -2016,7 +2016,7 @@ sub update_a_records {
# Only generate names for IP blocks that are mapped to a zone
my $zone;
unless ( $zone = $self->forward_zone ){
- $logger->debug(sprintf("%s: Cannot determine DNS zone for IP: %s",
+ $logger->debug(sprintf("%s: Cannot determine forward DNS zone for IP:
%s",
$host, $self->get_label));
return;
-----------------------------------------------------------------------
Summary of changes:
lib/Netdot/Meta.pm | 13 +++++++++++--
lib/Netdot/Model.pm | 5 +++--
lib/Netdot/Model/Ipblock.pm | 2 +-
3 files changed, 15 insertions(+), 5 deletions(-)
hooks/post-receive
--
Netdot Git repository
------------------------------
Message: 3
Date: Mon, 30 Jul 2012 11:21:36 -0700
From: Apache <[email protected]>
Subject: [Netdot-devel] [SCM] Netdot Git repository branch netdot-1.0
updated. netdot-1.0.1-RC3-75-g6d6bcba
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 6d6bcbabc666e1596db44c6a3123d93cdeabaf25 (commit)
from 499f78d48733748d33e37416130920d5459a8c57 (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 6d6bcbabc666e1596db44c6a3123d93cdeabaf25
Author: Carlos Vicente <[email protected]>
Date: Mon Jul 30 14:21:27 2012 -0400
Add configuration item to limit number of root blocks to be shown in
Management -> Address Space section
diff --git a/etc/Default.conf b/etc/Default.conf
index 07dbf62..e6ca2b6 100644
--- a/etc/Default.conf
+++ b/etc/Default.conf
@@ -47,6 +47,9 @@ DEFAULT_REMOTE_AUTHED_USER_TYPE => 'User',
# Max number of IP records returned by search functions
IPMAXSEARCH => 200,
+# Max number of root blocks to display in Address Space management section
+ROOT_BLOCK_SHOW_MAX => 50,
+
# At what point do we no longer display the number of
# hosts available, and switch to percentages?
# Used in ip.html underneath the "Utilization" field
diff --git a/htdocs/management/ip.html b/htdocs/management/ip.html
index 8089cf8..d8fc596 100644
--- a/htdocs/management/ip.html
+++ b/htdocs/management/ip.html
@@ -159,6 +159,7 @@ if( $_action eq "SHOW_ROOTS" && !$id && $rootversion ){
}
@list = Ipblock->get_roots($rootversion);
+ my $max = $ui->config->get('ROOT_BLOCK_SHOW_MAX');
</%perl>
<div class="container">
<div class="containerheadleft">Root Blocks: (<% scalar(@list)
%>)</div>
@@ -179,8 +180,10 @@ if( $_action eq "SHOW_ROOTS" && !$id && $rootversion ){
</form>
</div>
<div class="containerbody">
-% if ( @list ){
+% if ( @list && scalar(@list) < $max ){
<& ipblock_list.mhtml, parent=>0, objects=>\@list,
type=>"block", show_utilization=>$show_ch_util &>
+% }else{
+ The number of root blocks exceeds the configured threshold
(<% $max %>). Please use the search boxes.
% }
</div>
</div>
-----------------------------------------------------------------------
Summary of changes:
etc/Default.conf | 3 +++
htdocs/management/ip.html | 5 ++++-
2 files changed, 7 insertions(+), 1 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 30
********************************************
