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 branch netdot-1.0 updated.
netdot-1.0.2-2-g37a98bb ([email protected])
2. [SCM] Netdot branch netdot-1.0 updated.
netdot-1.0.2-3-g452d650 ([email protected])
3. [SCM] Netdot branch netdot-1.0 updated.
netdot-1.0.2-5-g605b499 ([email protected])
4. [SCM] Netdot branch master updated. netdot-1.0.2-17-g8b53159
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Fri, 26 Oct 2012 07:36:19 -0700
From: [email protected]
Subject: [Netdot-devel] [SCM] Netdot branch netdot-1.0 updated.
netdot-1.0.2-2-g37a98bb
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 37a98bb3b4dc1fab1817045ce34864fb53acb964 (commit)
from 73619cbd0e51935b60568b01a47374d265de98f4 (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 37a98bb3b4dc1fab1817045ce34864fb53acb964
Author: Carlos Vicente <[email protected]>
Date: Fri Oct 26 10:36:13 2012 -0400
Fix for #1704 (incorrect check for DB connection)
diff --git a/export/cacti/netdot_to_cacti.php b/export/cacti/netdot_to_cacti.php
index b3ff905..686df02 100644
--- a/export/cacti/netdot_to_cacti.php
+++ b/export/cacti/netdot_to_cacti.php
@@ -82,8 +82,8 @@ foreach ($hq as $row){
/* Query Netdot and build multi-dimensional array */
$netdot_db = NewADOConnection($netdot_db_type);
-$netdot_db->Connect($netdot_db_server, $netdot_db_user, $netdot_db_pass,
$netdot_db_database);
-if (!$netdot_db) {
+$result = $netdot_db->Connect($netdot_db_server, $netdot_db_user,
$netdot_db_pass, $netdot_db_database);
+if (!$result) {
echo "Connect failed\n";
exit(1);
}
-----------------------------------------------------------------------
Summary of changes:
export/cacti/netdot_to_cacti.php | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
hooks/post-receive
--
Netdot
------------------------------
Message: 2
Date: Fri, 26 Oct 2012 08:30:27 -0700
From: [email protected]
Subject: [Netdot-devel] [SCM] Netdot branch netdot-1.0 updated.
netdot-1.0.2-3-g452d650
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 452d65066b8819f8d0f98b9117a95bcd8f5b18ba (commit)
from 37a98bb3b4dc1fab1817045ce34864fb53acb964 (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 452d65066b8819f8d0f98b9117a95bcd8f5b18ba
Author: Carlos Vicente <[email protected]>
Date: Fri Oct 26 11:30:24 2012 -0400
Removed bogus variable from cacti script
diff --git a/export/cacti/netdot_to_cacti.php b/export/cacti/netdot_to_cacti.php
index 686df02..ac1742e 100644
--- a/export/cacti/netdot_to_cacti.php
+++ b/export/cacti/netdot_to_cacti.php
@@ -311,8 +311,7 @@ foreach ($groups as $group => $hosts){
$snmp_port, $snmp_timeout, $disable, $avail,
$ping_method,
$ping_port, $ping_timeout, $ping_retries, $notes,
$snmp_auth_protocol, $snmp_priv_passphrase,
- $snmp_priv_protocol, $snmp_context, $max_oids,
- $device_threads);
+ $snmp_priv_protocol, $snmp_context, $max_oids, 1);
if (is_error_message()) {
echo "ERROR: $description: Failed device save\n";
-----------------------------------------------------------------------
Summary of changes:
export/cacti/netdot_to_cacti.php | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
hooks/post-receive
--
Netdot
------------------------------
Message: 3
Date: Fri, 26 Oct 2012 08:49:26 -0700
From: [email protected]
Subject: [Netdot-devel] [SCM] Netdot branch netdot-1.0 updated.
netdot-1.0.2-5-g605b499
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 605b499941dbcd83a95a3a5590fd3bb70835cfbc (commit)
via 6afb057ade859521374cf958ba26f1975c29d03e (commit)
from 452d65066b8819f8d0f98b9117a95bcd8f5b18ba (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 605b499941dbcd83a95a3a5590fd3bb70835cfbc
Author: Carlos Vicente <[email protected]>
Date: Fri Oct 26 11:49:21 2012 -0400
Fixed incorrect order of parameters in debug statement
diff --git a/lib/Netdot/Model/VlanGroup.pm b/lib/Netdot/Model/VlanGroup.pm
index bcd9910..e36eff6 100644
--- a/lib/Netdot/Model/VlanGroup.pm
+++ b/lib/Netdot/Model/VlanGroup.pm
@@ -8,7 +8,7 @@ my $logger = Netdot->log->get_logger('Netdot::Model::Device');
=head1 NAME
-Netdot::Model::Vlan::Group
+Netdot::Model::VlanGroup
=head1 SYNOPSIS
@@ -120,7 +120,7 @@ sub assign_vlans{
# Remove from my members if necessary
if ( exists $myvlans{$vlan->id} ){
$logger->debug(sprintf("VlanGroup %s: Vlan %s no longer within
my range. Updating.",
- $vlan->vid, $self->name));
+ $self->name, $vlan->vid));
$vlan->update({vlangroup=>undef});
}
}
commit 6afb057ade859521374cf958ba26f1975c29d03e
Author: Carlos Vicente <[email protected]>
Date: Fri Oct 26 11:46:28 2012 -0400
Fixed incorrect logic in vlan update
diff --git a/lib/Netdot/Model/Vlan.pm b/lib/Netdot/Model/Vlan.pm
index 4aeff21..a70e467 100644
--- a/lib/Netdot/Model/Vlan.pm
+++ b/lib/Netdot/Model/Vlan.pm
@@ -89,6 +89,7 @@ sub search {
=head2 update - update VLAN objects
We override the base method to:
+ - Validate VID
- Automatically assign Vlan to a VLAN group if needed
Arguments:
@@ -105,15 +106,11 @@ sub update{
$self->_validate_vid($argv->{vid}) if exists $argv->{vid};
- return $self->SUPER::update($argv);
-
- # We'll reassign only if vid changed and if vlangroup is not the same
if ( exists $argv->{vid} && $argv->{vid} != $self->vid ){
-
- my $group = $self->_find_group($self->vid);
- $self->SUPER::update({vlangroup=>$group}) unless ( $self->vlangroup ==
$group->id );
+ # reassign group
+ $argv->{vlangroup} = $self->_find_group($argv->{vid});
}
-
+ return $self->SUPER::update($argv);
}
#########################################################################################
#
-----------------------------------------------------------------------
Summary of changes:
lib/Netdot/Model/Vlan.pm | 11 ++++-------
lib/Netdot/Model/VlanGroup.pm | 4 ++--
2 files changed, 6 insertions(+), 9 deletions(-)
hooks/post-receive
--
Netdot
------------------------------
Message: 4
Date: Fri, 26 Oct 2012 08:50:42 -0700
From: [email protected]
Subject: [Netdot-devel] [SCM] Netdot branch master updated.
netdot-1.0.2-17-g8b53159
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 8b53159aa7072cc5902eaea8c5ebe3e266b578df (commit)
via 605b499941dbcd83a95a3a5590fd3bb70835cfbc (commit)
via 6afb057ade859521374cf958ba26f1975c29d03e (commit)
via 452d65066b8819f8d0f98b9117a95bcd8f5b18ba (commit)
via 37a98bb3b4dc1fab1817045ce34864fb53acb964 (commit)
via 73619cbd0e51935b60568b01a47374d265de98f4 (commit)
from ee1580e75e1dfe70d39449c721ac9e3c3ad99bfe (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 8b53159aa7072cc5902eaea8c5ebe3e266b578df
Merge: ee1580e 605b499
Author: Carlos Vicente <[email protected]>
Date: Fri Oct 26 11:50:36 2012 -0400
Merge branch 'netdot-1.0'
-----------------------------------------------------------------------
Summary of changes:
export/cacti/netdot_to_cacti.php | 7 +++----
lib/Netdot/Model/Vlan.pm | 11 ++++-------
lib/Netdot/Model/VlanGroup.pm | 4 ++--
lib/Netdot/UI.pm | 2 +-
4 files changed, 10 insertions(+), 14 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 67, Issue 20
********************************************
