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-67-g43839fd ([email protected])
----------------------------------------------------------------------
Message: 1
Date: Tue, 2 Oct 2012 12:23:48 -0700
From: [email protected]
Subject: [Netdot-devel] [SCM] UNNAMED PROJECT branch netdot-1.0
updated. netdot-1.0.1-67-g43839fd
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 43839fd4e95774bf0a1d97ae5f6fa4119116a2db (commit)
via d04b9867592bb50127e847106fbe00a3b9715871 (commit)
from f3272a1392707f96d70e5a243dc07770ab45bb38 (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 43839fd4e95774bf0a1d97ae5f6fa4119116a2db
Author: Carlos Vicente <[email protected]>
Date: Tue Oct 2 15:23:28 2012 -0400
New DHCP subnet scopes were created with incorrect set of attributes due to
wrong version check
diff --git a/lib/Netdot/Model/DhcpScope.pm b/lib/Netdot/Model/DhcpScope.pm
index 4f44f9d..2ee1b2b 100644
--- a/lib/Netdot/Model/DhcpScope.pm
+++ b/lib/Netdot/Model/DhcpScope.pm
@@ -98,12 +98,12 @@ sub insert {
}
if ( $scope->type->name eq 'subnet' ){
- if ( $scope->version == 4 ){
+ if ( $scope->container->version == 4 ){
# Add standard attributes
$attributes->{'option broadcast-address'} =
$argv->{ipblock}->netaddr->broadcast->addr();
$attributes->{'option subnet-mask'} =
$argv->{ipblock}->netaddr->mask;
- if ( $scope->container && $scope->container->enable_failover ){
+ if ( $scope->container->enable_failover ){
my $failover_peer = $scope->container->failover_peer ||
'dhcp-peer';
$scope->SUPER::update({enable_failover=>1, failover_peer=>
$failover_peer});
}
@@ -610,6 +610,9 @@ sub _validate_args {
$self->throw_user("$name: Subnet IP block not defined")
unless $fields{ipblock};
+ $self->throw_user("$name: Subnet scopes require a container")
+ unless $fields{container};
+
if ( $fields{container}->type->name eq 'global' &&
$fields{ipblock}->version != $fields{container}->version ){
$self->throw_user("$name: IP version in subnet scope does not match
IP version in container");
commit d04b9867592bb50127e847106fbe00a3b9715871
Author: Carlos Vicente <[email protected]>
Date: Tue Oct 2 13:02:37 2012 -0400
Fix POD
diff --git a/lib/Netdot/Model/Ipblock.pm b/lib/Netdot/Model/Ipblock.pm
index c0c3a43..17489b2 100644
--- a/lib/Netdot/Model/Ipblock.pm
+++ b/lib/Netdot/Model/Ipblock.pm
@@ -61,7 +61,7 @@ my $range_dns_plugin = __PACKAGE__->load_range_dns_plugin();
=cut
##################################################################
-=head int2ip - Convert a decimal IP into a string address
+=head2 int2ip - Convert a decimal IP into a string address
Arguments:
address (decimal)
-----------------------------------------------------------------------
Summary of changes:
lib/Netdot/Model/DhcpScope.pm | 7 +++++--
lib/Netdot/Model/Ipblock.pm | 2 +-
2 files changed, 6 insertions(+), 3 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 67, Issue 2
*******************************************
