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-2-g8fe5a3e ([email protected])
----------------------------------------------------------------------
Message: 1
Date: Fri, 10 Aug 2012 06:45:17 -0700
From: [email protected]
Subject: [Netdot-devel] [SCM] UNNAMED PROJECT branch netdot-1.0
updated. netdot-1.0.1-2-g8fe5a3e
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 8fe5a3e0928cf7ed63e0d4f1b19acc51f2c0bf9a (commit)
from 8344306be753d818734fe8db948075df49563aec (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 8fe5a3e0928cf7ed63e0d4f1b19acc51f2c0bf9a
Author: Carlos Vicente <[email protected]>
Date: Fri Aug 10 09:44:55 2012 -0400
Fixed bug in DhcpScope. Moving a subnet within a shared-network complained
about invalid IP version
diff --git a/lib/Netdot/Model/DhcpScope.pm b/lib/Netdot/Model/DhcpScope.pm
index 3ab9c90..4f44f9d 100644
--- a/lib/Netdot/Model/DhcpScope.pm
+++ b/lib/Netdot/Model/DhcpScope.pm
@@ -552,7 +552,7 @@ sub _validate_args {
if ( $type eq 'host' ){
if ( $fields{ipblock} ){
if ( $fields{ipblock}->version == 4 && !$fields{physaddr} ){
- $self->throw_user("$name: an IPv4 host scope requires an
ethernet addres");
+ $self->throw_user("$name: an IPv4 host scope requires an
ethernet address");
}
if ( $fields{ipblock}->version == 6 && !$fields{duid} &&
!$fields{physaddr} ){
$self->throw_user("$name: an IPv6 host scope requires a DUID or
ethernet address");
@@ -610,9 +610,10 @@ sub _validate_args {
$self->throw_user("$name: Subnet IP block not defined")
unless $fields{ipblock};
- if ( $fields{ipblock}->version != $fields{container}->version ){
+ 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");
- }
+ }
}elsif ( $type eq 'global' ){
$argv->{version} = $fields{version} || 4;
if ( $argv->{version} != 4 && $argv->{version} != 6 ){
-----------------------------------------------------------------------
Summary of changes:
lib/Netdot/Model/DhcpScope.pm | 7 ++++---
1 files changed, 4 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 65, Issue 13
********************************************
