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 #1587] (Resolved) Option to leave the
network&broadcast addresses of a subnet unreserved
([email protected])
2. [Netdot] 'WikiStart' wiki page has been updated
([email protected])
3. [Netdot] 'WhoUsesNetdot' wiki page has been updated
([email protected])
4. [Netdot] 'WhoUsesNetdot' wiki page has been updated
([email protected])
5. [Netdot] 'WhoUsesNetdot' wiki page has been updated
([email protected])
6. [Netdot] 'WhoUsesNetdot' wiki page has been updated
([email protected])
7. [Netdot] 'WhoUsesNetdot' wiki page has been updated
([email protected])
8. [Netdot] 'WhoUsesNetdot' wiki page has been updated
([email protected])
9. [SCM] Netdot branch netdot-1.0 updated.
netdot-1.0.3-6-g95d87ce ([email protected])
10. [SCM] Netdot branch master updated. netdot-1.0.3-21-g857acb5
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Mon, 10 Dec 2012 12:13:45 -0800
From: [email protected]
Subject: [Netdot-devel] [Netdot - Feature #1587] (Resolved) Option to
leave the network&broadcast addresses of a subnet unreserved
To: [email protected], [email protected]
Cc: [email protected]
Message-ID: <[email protected]>
Content-Type: text/plain; charset=utf-8
Issue #1587 has been updated by Carlos Vicente.
Tracker changed from Bug to Feature
Category set to IPManagement
Status changed from New to Resolved
Assignee set to Carlos Vicente
Target version set to 1.0.4
Resolution set to fixed
----------------------------------------
Feature #1587: Option to leave the network&broadcast addresses of a subnet
unreserved
https://osl.uoregon.edu/redmine/issues/1587#change-3028
Author: Andrei Benea
Status: Resolved
Priority: Normal
Assignee: Carlos Vicente
Category: IPManagement
Target version: 1.0.4
Resolution: fixed
Some of our servers use the network/broadcast addresses of subnets, so I would
like to implement checkbox to skip the reservation of these addresses when
creating a new subnet.
There are a few options:
1) Adding a boolean column to ipblock to store this setting, and consulting it
each time when code needs to decide if the IP is reserved or not.
I don't like this option because it complicates all the code that needs to
decide the status of an ipblock. Netdot works this way at the moment, and uses
various @if@ statements (IPv4? first/last address of a subnet?) to decide if an
address is reserved or not.
2) Creating Reserved ipblocks (or not) based on the value of the checkbox.
This is better than the previous option, but still has a small problem. If you
delete a subnet (but not the children) to expand it (for example from a /25 to
a /24), the old broadcast address (xxx.127) stays Reserved. You have to
manually delete it, but this is impossible from the web interface afaik.
3) Adding the new column *and* creating Reserved ipblocks.
This fixes the problem from 2), but at the cost of a schema change.
What are your thoughts on this?
Would this feature be accepted in Netdot?
--
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, 10 Dec 2012 19:10:03 -0800
From: [email protected]
Subject: [Netdot-devel] [Netdot] 'WikiStart' wiki page has been
updated
To: [email protected]
Message-ID: <[email protected]>
Content-Type: text/plain; charset=utf-8
The 'WikiStart' wiki page has been updated by Carlos Vicente.
WikiStart:
https://osl.uoregon.edu/redmine/projects/netdot/wiki/WikiStart
View differences:
https://osl.uoregon.edu/redmine/projects/netdot/wiki/WikiStart/diff/73
--
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: 3
Date: Mon, 10 Dec 2012 19:12:34 -0800
From: [email protected]
Subject: [Netdot-devel] [Netdot] 'WhoUsesNetdot' wiki page has been
updated
To: [email protected]
Message-ID: <[email protected]>
Content-Type: text/plain; charset=utf-8
The 'WhoUsesNetdot' wiki page has been updated by Carlos Vicente.
WhoUsesNetdot:
https://osl.uoregon.edu/redmine/projects/netdot/wiki/WhoUsesNetdot
View differences:
https://osl.uoregon.edu/redmine/projects/netdot/wiki/WhoUsesNetdot/diff/3
--
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: 4
Date: Mon, 10 Dec 2012 19:38:18 -0800
From: [email protected]
Subject: [Netdot-devel] [Netdot] 'WhoUsesNetdot' wiki page has been
updated
To: [email protected]
Message-ID: <[email protected]>
Content-Type: text/plain; charset=utf-8
The 'WhoUsesNetdot' wiki page has been updated by Carlos Vicente.
WhoUsesNetdot:
https://osl.uoregon.edu/redmine/projects/netdot/wiki/WhoUsesNetdot
View differences:
https://osl.uoregon.edu/redmine/projects/netdot/wiki/WhoUsesNetdot/diff/4
--
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: 5
Date: Mon, 10 Dec 2012 19:38:55 -0800
From: [email protected]
Subject: [Netdot-devel] [Netdot] 'WhoUsesNetdot' wiki page has been
updated
To: [email protected]
Message-ID: <[email protected]>
Content-Type: text/plain; charset=utf-8
The 'WhoUsesNetdot' wiki page has been updated by Carlos Vicente.
WhoUsesNetdot:
https://osl.uoregon.edu/redmine/projects/netdot/wiki/WhoUsesNetdot
View differences:
https://osl.uoregon.edu/redmine/projects/netdot/wiki/WhoUsesNetdot/diff/5
--
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: 6
Date: Tue, 11 Dec 2012 05:57:10 -0800
From: [email protected]
Subject: [Netdot-devel] [Netdot] 'WhoUsesNetdot' wiki page has been
updated
To: [email protected]
Message-ID: <[email protected]>
Content-Type: text/plain; charset=utf-8
The 'WhoUsesNetdot' wiki page has been updated by Carlos Vicente.
WhoUsesNetdot:
https://osl.uoregon.edu/redmine/projects/netdot/wiki/WhoUsesNetdot
View differences:
https://osl.uoregon.edu/redmine/projects/netdot/wiki/WhoUsesNetdot/diff/6
--
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: 7
Date: Tue, 11 Dec 2012 06:32:39 -0800
From: [email protected]
Subject: [Netdot-devel] [Netdot] 'WhoUsesNetdot' wiki page has been
updated
To: [email protected]
Message-ID: <[email protected]>
Content-Type: text/plain; charset=utf-8
The 'WhoUsesNetdot' wiki page has been updated by Carlos Vicente.
WhoUsesNetdot:
https://osl.uoregon.edu/redmine/projects/netdot/wiki/WhoUsesNetdot
View differences:
https://osl.uoregon.edu/redmine/projects/netdot/wiki/WhoUsesNetdot/diff/7
--
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: 8
Date: Tue, 11 Dec 2012 06:33:37 -0800
From: [email protected]
Subject: [Netdot-devel] [Netdot] 'WhoUsesNetdot' wiki page has been
updated
To: [email protected]
Message-ID: <[email protected]>
Content-Type: text/plain; charset=utf-8
The 'WhoUsesNetdot' wiki page has been updated by Carlos Vicente.
WhoUsesNetdot:
https://osl.uoregon.edu/redmine/projects/netdot/wiki/WhoUsesNetdot
View differences:
https://osl.uoregon.edu/redmine/projects/netdot/wiki/WhoUsesNetdot/diff/8
--
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: 9
Date: Tue, 11 Dec 2012 06:48:06 -0800
From: [email protected]
Subject: [Netdot-devel] [SCM] Netdot branch netdot-1.0 updated.
netdot-1.0.3-6-g95d87ce
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".
The branch, netdot-1.0 has been updated
via 95d87ce72026ac0fa564e25b1cae9a1dc88f8962 (commit)
via 1ba9cf6173397f7487102838cbf2dd23a8c14542 (commit)
via 6916b2de5de6222cd650b0ac63608ab92c22fd57 (commit)
via 23bd0fcdb267f0c30c5add7a552ab52f127ba1e8 (commit)
via f4d70909ffc0e2bc6a119c08732da58777996dae (commit)
via a5e99778d94a48f7b486a5b9d0bd9fd269af5142 (commit)
from 092fb6bceef2588f8512f93d6b64d7943a46eadd (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 95d87ce72026ac0fa564e25b1cae9a1dc88f8962
Author: Carlos Vicente <[email protected]>
Date: Mon Dec 10 15:07:42 2012 -0500
Update upgrade notes
diff --git a/doc/UPGRADE b/doc/UPGRADE
index 33271c2..84aa9cd 100644
--- a/doc/UPGRADE
+++ b/doc/UPGRADE
@@ -1,24 +1,33 @@
- == Instructions for Upgrading Netdot 1.0.2 to 1.0.3 ==
+ == Instructions for Upgrading Netdot ==
+NOTE: Starting with Netdot 1.0.1, the upgrade script is able to perform several
+version upgrades at once.
-1. You will need to update the database schema in addition to the application.
+1. You may need to update the database schema in addition to the application.
- There are no actual schema changes in this upgrade. The only thing we need
- is to match the schema version to the application version.
-
- Please execute the following command:
+IMPORTANT: MAKE SURE YOU MAKE A BACKUP COPY OF YOUR DATABASE BEFORE UPGRADING
- # make upgrade
+After making a backup copy of your database, please execute the following
command:
-2. Check for new requirements:
+ # make upgrade
- # make testdeps
+This will call a script that updates your current database to the schema
required
+by the version you are upgrading to.
+
+Any errors found while applying these schema changes will be written to a file
+called "error.log". You will need to inspect this file and make sure to correct
+any problems before continuing. You may have to restore your database from
backup,
+fix any issues and start over.
+
+2. Check for new required dependencies:
+
+ # make testdeps
3. At this point you can do a
- # make install [PARAMETERS]
+ # make install [PARAMETERS]
4. Restart Apache
commit 1ba9cf6173397f7487102838cbf2dd23a8c14542
Author: Carlos Vicente <[email protected]>
Date: Mon Dec 10 15:00:45 2012 -0500
Fix for #1587 (Option to leave the network&broadcast addresses of a subnet
unreserved)
diff --git a/etc/netdot.meta b/etc/netdot.meta
index 7aaf2cd..45b4fb2 100644
--- a/etc/netdot.meta
+++ b/etc/netdot.meta
@@ -4934,7 +4934,16 @@ $meta = {
tag => 'Vlan',
type => 'bigint'
},
- },
+ use_network_broadcast => {
+ default => '',
+ description => 'Whether the network and broadcast addresses in this
IPv4 block should be marked as reserved or not',
+ length => '',
+ nullable => 0,
+ tag => 'Use Network/Broadcast?',
+ type => 'bool'
+ },
+
+ },
description => 'An IP (v4 or v6) CIDR block, which can represent both
individual addresses and blocks of addresses (subnets, etc).',
has_history => 0,
index => [ ['parent'], ['status'], ['first_seen'], ['last_seen'],
['interface'], ['vlan'], ['version'] ],
@@ -4964,6 +4973,7 @@ $meta = {
'description',
'first_seen',
'last_seen',
+ 'use_network_broadcast',
'info'
],
brief => [
diff --git a/htdocs/management/ip.html b/htdocs/management/ip.html
index b28f7a7..61273f7 100644
--- a/htdocs/management/ip.html
+++ b/htdocs/management/ip.html
@@ -1257,6 +1257,13 @@ push( @cell_data, $status );
# Description
$ui->add_to_fields(o=>$o, edit=>$edit_block, fields=>['description'],
field_headers=>\@field_headers, cell_data=>\@cell_data);
+ ################
+# Use Network Broadcast
+if ( $o->status->name eq 'Subnet' ){
+ $ui->add_to_fields(o=>$o, edit=>$edit_block,
fields=>['use_network_broadcast'], field_headers=>\@field_headers,
cell_data=>\@cell_data);
+}
+
+
################
# Created, Modified
push (@field_headers, "First Created", "Last Modified");
diff --git a/htdocs/management/subnet.mhtml b/htdocs/management/subnet.mhtml
index c24625c..d6b07fe 100644
--- a/htdocs/management/subnet.mhtml
+++ b/htdocs/management/subnet.mhtml
@@ -180,11 +180,11 @@ for( my $i=0; $i<($num/$cols); $i++ ) {
$disp_addr =~ s/^\d+\.(\d+\.\d+\.\d+)$/$1/o;
}
- if( ($net == $net->network) && ($mask != 31) ){
+ if( ( ($net == $net->network) && ($mask != 31)) &&
!$network->use_network_broadcast ){
# don't allow selection of network or broadcast addresses
$disp_addr = '<div class="ipaddr_disabled"
title="Network">'.$disp_addr.'</div>';
- }elsif ( $net == $net->broadcast && $mask != 31 ){
+ }elsif ( ($net == $net->broadcast && $mask != 31) &&
!$network->use_network_broadcast ){
# don't allow selection of network or broadcast addresses
$disp_addr = '<div class="ipaddr_disabled"
title="Broadcast">'.$disp_addr.'</div>';
diff --git a/lib/Netdot.pm b/lib/Netdot.pm
index 49b561c..e7cf78f 100644
--- a/lib/Netdot.pm
+++ b/lib/Netdot.pm
@@ -40,11 +40,11 @@ Netdot - Network Documentation Tool
=head1 VERSION
-Version 1.0.3
+Version 1.0.4
=cut
-our $VERSION = "1.0.3";
+our $VERSION = "1.0.4";
=head1 SYNOPSIS
diff --git a/upgrade/updatedb b/upgrade/updatedb
index 205e576..118bcc7 100644
--- a/upgrade/updatedb
+++ b/upgrade/updatedb
@@ -24,12 +24,37 @@ my ($schema_version) = $dbh->selectrow_array("SELECT version
die "Schema version unknown\n" unless $schema_version;
+print "Upgrading Netdot schema from version $schema_version\n";
+
my @statements;
if ( $schema_version eq '1.0.1' ){
-
- print "Upgrading Netdot schema from version $schema_version\n";
+ &upg_101_102();
+ &upg_102_103();
+ &upg_103_104();
+
+}elsif ( $schema_version eq '1.0.2' ){
+
+ &upg_102_103();
+ &upg_103_104();
+
+}elsif ( $schema_version eq '1.0.3' ){
+
+ &upg_103_104();
+
+}else{
+ die "Unsupported version for this upgrade: $schema_version\n";
+}
+
+
+&processdata(\@statements);
+&dbdisconnect();
+
+
+#########################################################################
+sub upg_101_102 {
+
if ( $dbms eq 'mysql' ) {
# Try to speed up the conversion as much as possible
@@ -70,7 +95,9 @@ if ( $schema_version eq '1.0.1' ){
"DELETE FROM datacache;";
# Restore checks
- push @statements, "SET FOREIGN_KEY_CHECKS = 1;", "COMMIT;";
+ push @statements, "SET FOREIGN_KEY_CHECKS = 1;",
+ "COMMIT;",
+ "SET AUTOCOMMIT=1;";
}elsif ( $dbms eq 'Pg' ){
@@ -107,19 +134,28 @@ if ( $schema_version eq '1.0.1' ){
}else{
die "Unsupported DB type: $dbms\n";
}
-
-}elsif ( $schema_version eq '1.0.2' ){
-
- print "Upgrading Netdot schema from version $schema_version\n";
-
+}
+
+#########################################################################
+sub upg_102_103 {
push @statements, "UPDATE schemainfo SET version='1.0.3' WHERE id=1;",
-
-}else{
- die "Unsupported version for this upgrade: $schema_version\n";
}
-&processdata(\@statements);
+#########################################################################
+sub upg_103_104 {
-&dbdisconnect();
+ if ( $dbms eq 'mysql' ) {
+ push @statements, "ALTER TABLE ipblock ADD COLUMN use_network_broadcast
bool NOT NULL;";
+
+ }elsif ( $dbms eq 'Pg' ){
+
+ push @statements,
+ "ALTER TABLE ipblock ADD COLUMN use_network_broadcast bool NOT NULL
default 'f';";
+
+ }
+
+ push @statements, "UPDATE schemainfo SET version='1.0.4' WHERE id=1;";
+
+}
commit 6916b2de5de6222cd650b0ac63608ab92c22fd57
Author: Carlos Vicente <[email protected]>
Date: Mon Dec 10 14:32:05 2012 -0500
Remove 'make test' option
diff --git a/Makefile b/Makefile
index 325d9fa..9f35f06 100644
--- a/Makefile
+++ b/Makefile
@@ -83,9 +83,6 @@ rpm-install:
@echo "Installing required RPM packages"
$(PERL) bin/perldeps.pl rpm-install
-test:
- prove -r
-
dir:
@echo
@echo "Creating necessary directories..."
commit 23bd0fcdb267f0c30c5add7a552ab52f127ba1e8
Author: Carlos Vicente <[email protected]>
Date: Mon Dec 10 13:45:44 2012 -0500
Set SUBNET_AUTO_RESERVE default to 0
diff --git a/etc/Default.conf b/etc/Default.conf
index 0a96263..8f533dc 100644
--- a/etc/Default.conf
+++ b/etc/Default.conf
@@ -542,7 +542,7 @@ IP_ALLOCATION_STRATEGY => 'first',
# Automatically reserve N addresses when a new subnet is created.
# Depending on the setting of IP_ALLOCATION_STRATEGY, these will
# be the first or last N addresses
-SUBNET_AUTO_RESERVE => 5,
+SUBNET_AUTO_RESERVE => 0,
# Subnet Usage Monitoring
# The minimum threshold of remaining space before a notification is
commit f4d70909ffc0e2bc6a119c08732da58777996dae
Author: Carlos Vicente <[email protected]>
Date: Mon Dec 10 10:36:55 2012 -0500
Fix for #1712 (cannot place host scope within a group scope)
diff --git a/lib/Netdot/Model/DhcpScope.pm b/lib/Netdot/Model/DhcpScope.pm
index 27447a9..37bc173 100644
--- a/lib/Netdot/Model/DhcpScope.pm
+++ b/lib/Netdot/Model/DhcpScope.pm
@@ -581,13 +581,15 @@ sub _validate_args {
unless ( $subnet_scope = ($subnet->dhcp_scopes)[0] ){
$self->throw_user("$name: Subnet ".$subnet->get_label." not
dhcp-enabled.");
}
- # Make sure we assign to the correct global container
- $argv->{container} = $subnet_scope->get_global;
+ # Make sure we assign to the correct global container if none passed
+ $argv->{container} = $subnet_scope->get_global
+ unless defined $argv->{container};
$fields{container} = $argv->{container};
# Check for mismatched versions
- if ( $fields{ipblock}->version != $fields{container}->version ){
- $self->throw_user("$name: IP version in host scope does not
match IP version in container");
+ if ( $fields{container}->type eq 'global' &&
+ $fields{ipblock}->version != $fields{container}->version ){
+ $self->throw_user("$name: IP version in host scope does not
match version in global scope");
}
}
commit a5e99778d94a48f7b486a5b9d0bd9fd269af5142
Author: Carlos Vicente <[email protected]>
Date: Mon Dec 10 10:34:38 2012 -0500
Insert correct schema version
diff --git a/etc/default_data b/etc/default_data
index 58691a7..0e89099 100755
--- a/etc/default_data
+++ b/etc/default_data
@@ -1,4 +1,4 @@
-INSERT INTO schemainfo (version) VALUES('1.0.2');
+INSERT INTO schemainfo (version) VALUES('1.0.4');
INSERT INTO circuittype (name) VALUES ('DS3');
INSERT INTO circuittype (name) VALUES ('xDSL');
-----------------------------------------------------------------------
Summary of changes:
Makefile | 3 --
doc/UPGRADE | 29 ++++++++++++------
etc/Default.conf | 2 +-
etc/default_data | 2 +-
etc/netdot.meta | 12 +++++++-
htdocs/management/ip.html | 7 ++++
htdocs/management/subnet.mhtml | 4 +-
lib/Netdot.pm | 4 +-
lib/Netdot/Model/DhcpScope.pm | 10 ++++--
upgrade/updatedb | 62 +++++++++++++++++++++++++++++++--------
10 files changed, 98 insertions(+), 37 deletions(-)
hooks/post-receive
--
Netdot
------------------------------
Message: 10
Date: Tue, 11 Dec 2012 07:02:20 -0800
From: [email protected]
Subject: [Netdot-devel] [SCM] Netdot branch master updated.
netdot-1.0.3-21-g857acb5
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".
The branch, master has been updated
via 857acb53c1352fa9f7f9c7748e1d0ec3265529ec (commit)
via 95d87ce72026ac0fa564e25b1cae9a1dc88f8962 (commit)
via 1ba9cf6173397f7487102838cbf2dd23a8c14542 (commit)
via 6916b2de5de6222cd650b0ac63608ab92c22fd57 (commit)
via 23bd0fcdb267f0c30c5add7a552ab52f127ba1e8 (commit)
via f4d70909ffc0e2bc6a119c08732da58777996dae (commit)
via a5e99778d94a48f7b486a5b9d0bd9fd269af5142 (commit)
from a006b683452aff42fc4829f5a1bd86dbf2b786c7 (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 857acb53c1352fa9f7f9c7748e1d0ec3265529ec
Merge: a006b68 95d87ce
Author: Carlos Vicente <[email protected]>
Date: Tue Dec 11 10:02:13 2012 -0500
Merge branch 'netdot-1.0'
-----------------------------------------------------------------------
Summary of changes:
Makefile | 3 --
doc/UPGRADE | 29 ++++++++++++------
etc/Default.conf | 2 +-
etc/default_data | 2 +-
etc/netdot.meta | 12 +++++++-
htdocs/management/ip.html | 7 ++++
htdocs/management/subnet.mhtml | 4 +-
lib/Netdot.pm | 4 +-
lib/Netdot/Model/DhcpScope.pm | 10 ++++--
upgrade/updatedb | 62 +++++++++++++++++++++++++++++++--------
10 files changed, 98 insertions(+), 37 deletions(-)
hooks/post-receive
--
Netdot
------------------------------
_______________________________________________
Netdot-devel mailing list
[email protected]
https://osl.uoregon.edu/mailman/listinfo/netdot-devel
End of Netdot-devel Digest, Vol 69, Issue 9
*******************************************
