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.7-19-gce4afdd ([email protected])
2. [SCM] Netdot branch netdot-1.0 updated.
netdot-1.0.7-20-gb4ede24 ([email protected])
----------------------------------------------------------------------
Message: 1
Date: Fri, 22 May 2015 12:46:15 -0700
From: [email protected]
Subject: [Netdot-devel] [SCM] Netdot branch netdot-1.0 updated.
netdot-1.0.7-19-gce4afdd
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 ce4afdd8ab03bd86386fda38b32cc7af933165a2 (commit)
from c6827622422d45c026701ebd9e78ce8da260d1e2 (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 ce4afdd8ab03bd86386fda38b32cc7af933165a2
Author: Carlos Vicente <[email protected]>
Date: Fri May 22 15:45:51 2015 -0400
Move Rancid type mapping to config file
diff --git a/etc/Default.conf b/etc/Default.conf
index 0719435..0f987d2 100644
--- a/etc/Default.conf
+++ b/etc/Default.conf
@@ -934,6 +934,20 @@ RANCID_EXCLUDE => {
'1.3.6.1.4.1.11.2.3.7.11.7' => 'HP J4110A ProCurve Switch 8000M',
},
+# Convert these Netdot Manufacturer names into RANCID's known types
+# See RANCID documentation for list of available device types
+RANCID_TYPE_MAP => {
+ 'A10' => 'cisco',
+ 'cisco' => 'cisco',
+ 'enterasys' => 'enterasys',
+ 'extreme' => 'extreme',
+ 'force10' => 'force10',
+ 'foundry' => 'foundry',
+ 'Hewlett|HP' => 'hp',
+ 'juniper' => 'juniper',
+ 'netscreen' => 'netscreen',
+},
+
#####################################################################
# - BIND - www.isc.org
#
diff --git a/lib/Netdot/Exporter/Rancid.pm b/lib/Netdot/Exporter/Rancid.pm
index 21c17c8..f50e2e8 100644
--- a/lib/Netdot/Exporter/Rancid.pm
+++ b/lib/Netdot/Exporter/Rancid.pm
@@ -40,18 +40,7 @@ sub new{
$self->{$key} = Netdot->config->get($key);
}
- # Convert these Netdot Manufacturer names into RANCID's known types
- # See RANCID documentation for list of available device types
- $self->{MFG_MAP} = {
- 'cisco' => 'cisco',
- 'enterasys' => 'enterasys',
- 'extreme' => 'extreme',
- 'force10' => 'force10',
- 'foundry' => 'foundry',
- 'Hewlett|HP' => 'hp',
- 'juniper' => 'juniper',
- 'netscreen' => 'netscreen',
- };
+ $self->{MFG_MAP} = Netdot->config->get('RANCID_TYPE_MAP');
$self->{EXCLUDE} = Netdot->config->get('RANCID_EXCLUDE') || {};
-----------------------------------------------------------------------
Summary of changes:
etc/Default.conf | 14 ++++++++++++++
lib/Netdot/Exporter/Rancid.pm | 13 +------------
2 files changed, 15 insertions(+), 12 deletions(-)
hooks/post-receive
--
Netdot
------------------------------
Message: 2
Date: Fri, 22 May 2015 12:50:33 -0700
From: [email protected]
Subject: [Netdot-devel] [SCM] Netdot branch netdot-1.0 updated.
netdot-1.0.7-20-gb4ede24
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 b4ede249b9855ba8350de19b456847bf7ee2b7eb (commit)
from ce4afdd8ab03bd86386fda38b32cc7af933165a2 (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 b4ede249b9855ba8350de19b456847bf7ee2b7eb
Author: Carlos Vicente <[email protected]>
Date: Fri May 22 15:50:26 2015 -0400
Fix broken display when clicking 'edit' for IP attributes
diff --git a/htdocs/management/ip.html b/htdocs/management/ip.html
index 9c947ea..b4db5f3 100644
--- a/htdocs/management/ip.html
+++ b/htdocs/management/ip.html
@@ -926,7 +926,7 @@ if ( $edit ){
<div class="containerheadleft"><strong>Custom Attributes</strong></div>
<div class="containerheadright">
% if ( @attributes ) {
- <a href="ip.html?id=<% $o %>&editattr=1">[edit]</a>
+ <a href="ip.html?id=<% $o %>&view=Attributes&editattr=1">[edit]</a>
% }
% if ( $manager && $manager->can($user, 'edit', $o) ){
<a href="edit.html?table=IpblockAttr&ipblock=<% $o %>">[add]</a>
@@ -1743,7 +1743,7 @@ if ( $_action eq 'VIEW_ADD_RIGHTS' ){
<div class="containerheadleft"><strong>Custom Attributes</strong></div>
<div class="containerheadright">
% if ( @attributes ) {
- <a href="ip.html?id=<% $o %>&editattr=1">[edit]</a>
+ <a href="ip.html?id=<% $o %>&view=Attributes&editattr=1">[edit]</a>
% }
% if ( $manager && $manager->can($user, 'edit', $o) ){
<a href="edit.html?table=IpblockAttr&ipblock=<% $o %>">[add]</a>
-----------------------------------------------------------------------
Summary of changes:
htdocs/management/ip.html | 4 ++--
1 file changed, 2 insertions(+), 2 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 98, Issue 11
********************************************
