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 - Bug #1825] (New) Create a new cable strand UI
interface ([email protected])
2. [Netdot - Bug #1790] FATAL - Could not get a valid iptree4
from cache ([email protected])
3. [Netdot - Bug #1817] (In Progress) Missing dependencies -
ubuntu 14.04 ([email protected])
4. [Netdot - Bug #1820] Could not get a valid iptree4 from cache
([email protected])
5. [SCM] Netdot branch master updated. netdot-1.0.6-22-gda8ce06
([email protected])
6. [SCM] Netdot branch netdot-1.0 updated.
netdot-1.0.6-22-gda8ce06 ([email protected])
7. [Netdot - Feature #1824] (Resolved) Improve Depth Up / Depth
Down display ([email protected])
----------------------------------------------------------------------
Message: 1
Date: Fri, 27 Jun 2014 05:54:30 -0700
From: [email protected]
Subject: [Netdot-devel] [Netdot - Bug #1825] (New) Create a new cable
strand UI interface
To: [email protected], [email protected]
Message-ID: <[email protected]>
Content-Type: text/plain; charset=utf-8
Issue #1825 has been reported by Marc CYPRIEN.
----------------------------------------
Bug #1825: Create a new cable strand UI interface
https://osl.uoregon.edu/redmine/issues/1825
Author: Marc CYPRIEN
Status: New
Priority: Normal
Assignee:
Category:
Target version:
Resolution:
This bug is similar to #1809 but when I try to create a new CableStrand in the
UI I get this message :
You need to pass a valid object or a table name Trace begun at
/usr/local/netdot/lib/Netdot.pm line 105
Netdot::throw_fatal('Netdot::UI=HASH(0x7fa3d86c64a0)', 'You need to pass a
valid object or a table name') called at /usr/local/netdot/lib/Netdot/UI.pm
line 330 Netdot::UI::form_field('Netdot::UI=HASH(0x7fa3d86c64a0)', 'object',
undef, 'column', 'circuit_id', 'lookup', 'Circuit', 'edit', 1, 'returnValOnly',
1, 'linkPage', 'circuit.html') called at
/usr/local/netdot/htdocs/cable_plant/cable_strand.html line 217
HTML::Mason::Commands::__ANON__('backbone_id', 5, 'id', 'NEW', 'showheader', 1)
called at /usr/share/perl5/HTML/Mason/Component.pm line 135
HTML::Mason::Component::run('HTML::Mason::Component::FileBased=HASH(0x7fa3da57c198)',
'backbone_id', 5, 'id', 'NEW', 'showheader', 1) called at
/usr/share/perl5/HTML/Mason/Request.pm line 1284 eval {...} at
/usr/share/perl5/HTML/Mason/Request.pm line 1274
HTML::Mason::Request::comp(undef, undef, undef, 'backbone_id', 5, 'id', 'NEW!
', 'showheader', 1) called at /usr/share/perl5/HTML/Mason/Request.pm line 943
HTML::Mason::Request::call_next('HTML::Mason::Request::ApacheHandler=HASH(0x7fa3db1dce70)')
called at /usr/local/netdot/htdocs/cable_plant/autohandler line 353
HTML::Mason::Commands::__ANON__('backbone_id', 5, 'id', 'NEW', 'showheader', 1)
called at /usr/share/perl5/HTML/Mason/Component.pm line 157
HTML::Mason::Component::run_dynamic_sub('HTML::Mason::Component::FileBased=HASH(0x7fa3d9b09f10)',
'main', 'backbone_id', 5, 'id', 'NEW', 'showheader', 1) called at
/usr/share/perl5/HTML/Mason/Request.pm line 936
HTML::Mason::Request::call_dynamic('HTML::Mason::Request::ApacheHandler=HASH(0x7fa3db1dce70)',
'main', 'backbone_id', 5, 'id', 'NEW', 'showheader', 1) called at
/usr/local/netdot/htdocs/masondata/obj/991023240/cable_plant/autohandler.obj
line 21 HTML::Mason::Commands::__ANON__('backbone_id', 5, 'id', 'NEW',
'showheader', 1) called at /usr/share/perl5/HTML/Mason/Component.pm line 135
HTML::Mason:!
:Component::run('HTML::Mason::Component::FileBased=HASH(0x7fa3d9b09f10
)', 'backbone_id', 5, 'id', 'NEW', 'showheader', 1) called at
/usr/share/perl5/HTML/Mason/Request.pm line 1284 eval {...} at
/usr/share/perl5/HTML/Mason/Request.pm line 1274
HTML::Mason::Request::comp(undef, undef, undef, 'backbone_id', 5, 'id', 'NEW',
'showheader', 1) called at /usr/share/perl5/HTML/Mason/Request.pm line 943
HTML::Mason::Request::call_next('HTML::Mason::Request::ApacheHandler=HASH(0x7fa3db1dce70)',
'showheader', 1) called at /usr/local/netdot/htdocs/autohandler line 76
HTML::Mason::Commands::__ANON__('backbone_id', 5, 'id', 'NEW') called at
/usr/share/perl5/HTML/Mason/Component.pm line 135
HTML::Mason::Component::run('HTML::Mason::Component::FileBased=HASH(0x7fa3d9a42bb8)',
'backbone_id', 5, 'id', 'NEW') called at
/usr/share/perl5/HTML/Mason/Request.pm line 1279 eval {...} at
/usr/share/perl5/HTML/Mason/Request.pm line 1274
HTML::Mason::Request::comp(undef, undef, undef, 'backbone_id', 5, 'id', 'NEW')
called at /usr/share/perl5/HTML/Mason/Request.pm line 47!
3 eval {...} at /usr/share/perl5/HTML/Mason/Request.pm line 473 eval {...} at
/usr/share/perl5/HTML/Mason/Request.pm line 425
HTML::Mason::Request::exec('HTML::Mason::Request::ApacheHandler=HASH(0x7fa3db1dce70)')
called at /usr/share/perl5/HTML/Mason/ApacheHandler.pm line 168
HTML::Mason::Request::ApacheHandler::exec('HTML::Mason::Request::ApacheHandler=HASH(0x7fa3db1dce70)')
called at /usr/share/perl5/HTML/Mason/ApacheHandler.pm line 825
HTML::Mason::ApacheHandler::handle_request('HTML::Mason::ApacheHandler=HASH(0x7fa3d8ed97c8)',
'Apache2::RequestRec=SCALAR(0x7fa3daa46a90)') called at
/usr/local/netdot/lib/Netdot/Mason.pm line 59
Netdot::Mason::handler('Apache2::RequestRec=SCALAR(0x7fa3daa46a90)') called at
-e line 0 eval {...} at -e line 0
--
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: Fri, 27 Jun 2014 07:07:38 -0700
From: [email protected]
Subject: [Netdot-devel] [Netdot - Bug #1790] FATAL - Could not get a
valid iptree4 from cache
To: [email protected], [email protected]
Cc: [email protected]
Message-ID: <[email protected]>
Content-Type: text/plain; charset=utf-8
Issue #1790 has been updated by Wim Vandersmissen.
Carlos, got bitten by the bug today, tried your no_cdbi patch, didn't work.
base64 encoding the data did work however, I created a pull request on github
for it
https://github.com/cvicente/Netdot/pull/18
----------------------------------------
Bug #1790: FATAL - Could not get a valid iptree4 from cache
https://osl.uoregon.edu/redmine/issues/1790#change-3197
Author: Alen F
Status: New
Priority: Urgent
Assignee: Alen F
Category: Netdot
Target version: 1.0.5
Resolution:
Hello,
since Upgrade to 1.5 this error is on add/delete etc.
IP Tree Update not solve the problem.
kind regards
--
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: Fri, 27 Jun 2014 07:24:39 -0700
From: [email protected]
Subject: [Netdot-devel] [Netdot - Bug #1817] (In Progress) Missing
dependencies - ubuntu 14.04
To: [email protected], [email protected],
[email protected]
Message-ID: <[email protected]>
Content-Type: text/plain; charset=utf-8
Issue #1817 has been updated by Brian Candler.
Status changed from Resolved to In Progress
Ah, Ubuntu 12.04 *does* need <code>LoadModule apreq_module
/usr/lib/apache2/modules/mod_apreq2.so</code>, otherwise you get:
<pre>
/usr/sbin/apache2: symbol lookup error:
/usr/lib/perl5/auto/APR/Request/Apache2/Apache2.so: undefined symbol:
apreq_handle_apache2
</pre>
It was commented out in commit 3408e2a
It should be uncommented in etc/netdot_apache2_local.conf but left commented
out in etc/netdot_apache24_local.conf
Sorry about this - my fault.
----------------------------------------
Bug #1817: Missing dependencies - ubuntu 14.04
https://osl.uoregon.edu/redmine/issues/1817#change-3198
Author: Brian Candler
Status: In Progress
Priority: Normal
Assignee: Carlos Vicente
Category: Netdot
Target version: 1.0.7
Resolution: fixed
Miscellaneous errors during install of Netdot on ubuntu 14.04; the fixes are
pretty simple.
Problem 1:
<pre>
...
A new /etc/snmp/snmp.conf needs to be installed to point to the newly installed
MIB files.
The current file will be backed up. Continue? [y/n] y
mv: cannot stat ?/etc/snmp/snmp.conf?: No such file or directory
There was a problem running mv -f /etc/snmp/snmp.conf
/etc/snmp/snmp.conf.netdot_install
make: *** [apt-install] Error 2
</pre>
Workaround: <code>sudo apt-get install snmp</code> then re-run <code>make
apt-install</code>
Fix:
<pre>
--- a/bin/perldeps.pl
+++ b/bin/perldeps.pl
@@ -64,7 +64,8 @@ my @DEPS = (
{apt=> 'libssl-dev', rpm=>'openssl-devel'}, # needed by Net::DNS::ZoneFile:
{cpan=>'Net::DNS::ZoneFile::Fast', apt=> 'dnssec-tools', rpm=>''},
{cpan=>'Socket6', apt=> 'libsocket6-perl', rpm=>'perl-Socket6'},
- {cpan=>'XML::Simple', apt=>'libxml-simple-perl', rpm=>'perl-XML-Simple'}
+ {cpan=>'XML::Simple', apt=>'libxml-simple-perl', rpm=>'perl-XML-Simple'},
+ {apt=>'snmp'}, # we expect snmp.conf
) ;
</pre>
Problem 2:
<pre>
...
SNMP::Info 2.06...................................MISSING
...
</pre>
What has happened is that libsnmp-info-perl has been installed, but not
libsnmp-perl (which should be its dependency).
<pre>
$ dpkg-query -l | grep snmp
ii libsnmp-base 5.7.2~dfsg-8.1ubuntu3 all
SNMP configuration script, MIBs and documentation
ii libsnmp-info-perl 3.13-1 all
OO Interface to Network devices and MIBs through SNMP
ii libsnmp30:amd64 5.7.2~dfsg-8.1ubuntu3 amd64
SNMP (Simple Network Management Protocol) library
ii snmp 5.7.2~dfsg-8.1ubuntu3 amd64
SNMP (Simple Network Management Protocol) applications
</pre>
The problem is that the libsnmp-info-perl 3.13 package is missing a dependency
on libsnmp-perl:
<pre>
Version: 3.13-1
Depends: perl
Filename: unstable/libsnmp-info-perl_3.13-1_all.deb
cf.
Version: 3.11-1
Depends: perl, libsnmp-perl
Suggests: netdisco-mibs-installer
Filename: pool/universe/libs/libsnmp-info-perl/libsnmp-info-perl_3.11-1_all.deb
</pre>
Workaround: <code>sudo apt-get install libsnmp-perl</code> - although the
proper fix is to update the dependency.
Problem 3:
<pre>
sudo service apache2 restart
[Fri Jun 20 14:03:51.039859 2014] [so:warn] [pid 20696:tid 140375836866432]
AH01574: module apreq_module is already loaded, skipping
</pre>
Fix: comment out this line
<pre>
#LoadModule apreq_module /usr/lib/apache2/modules/mod_apreq2.so
</pre>
(it's already commented out in netdot_apache24_local.conf)
--
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: Fri, 27 Jun 2014 07:29:55 -0700
From: [email protected]
Subject: [Netdot-devel] [Netdot - Bug #1820] Could not get a valid
iptree4 from cache
To: [email protected], [email protected]
Message-ID: <[email protected]>
Content-Type: text/plain; charset=utf-8
Issue #1820 has been updated by Brian Candler.
Most likely duplicate of #1790, sorry
----------------------------------------
Bug #1820: Could not get a valid iptree4 from cache
https://osl.uoregon.edu/redmine/issues/1820#change-3199
Author: Brian Candler
Status: New
Priority: Normal
Assignee:
Category:
Target version:
Resolution:
I only saw this once, but it had a long traceback so I thought I'd report it.
<pre>
INFO - admin-core.example.net [Vl60]: Created Subnet 10.6.0.0/24
WARN - admin-core.example.net [Vl60]: Could not insert IP 10.6.0.1: Could not
get a valid iptree4 from cache
Trace begun at /usr/local/netdot/lib/Netdot.pm line 105
Netdot::throw_fatal('Ipblock=HASH(0x5aa6598)', 'Could not get a valid iptree4
from cache') called at /usr/local/netdot/lib/Netdot/Model/Ipblock.pm line 3561
Netdot::Model::Ipblock::_tree_get('Ipblock=HASH(0x5aa6598)') called at
/usr/local/netdot/lib/Netdot/Model/Ipblock.pm line 3361
Netdot::Model::Ipblock::_tree_delete('Ipblock=HASH(0x5aa6598)') called at
/usr/local/netdot/lib/Netdot/Model/Ipblock.pm line 1752
Netdot::Model::Ipblock::delete('Ipblock=HASH(0x5aa6598)') called at
/usr/local/netdot/lib/Netdot/Model/Ipblock.pm line 679
Netdot::Model::Ipblock::insert('Ipblock', 'HASH(0x5ab1cd8)') called at
/usr/local/netdot/lib/Netdot/Model/Interface.pm line 749
eval {...} at /usr/local/netdot/lib/Netdot/Model/Interface.pm line 748
Netdot::Model::Interface::update_ip('Interface=HASH(0x5aa6af0)', 'subnet',
'10.6.0.0/24', 'version', 4, 'subs_inherit', 1, 'address', 10.6.0.1,
'add_subnets', 1) called at /usr/local/netdot/lib/Netdot/Model/Interface.pm
line 600
Netdot::Model::Interface::snmp_update('Interface', 'doc_status', 'snmp',
'device', 'Device=HASH(0x59c0098)', 'monitored', 0, 'number', 60,
'overwrite_descr', 1, 'name', 'Vl60', 'auto_dns', 1, 'snmp_info',
'HASH(0x598b740)', 'add_subnets', 1, 'subs_inherit', 1, 'stp_instances',
'HASH(0x5969fb0)') called at /usr/local/netdot/lib/Netdot/Model/Device.pm line
6219
Netdot::Model::Device::_update_interfaces('Device=HASH(0x59c0098)', 'info',
'HASH(0x4e009b0)', 'add_subnets', undef, 'subs_inherit', undef,
'overwrite_descr', 1) called at /usr/local/netdot/lib/Netdot/Model/Device.pm
line 3068
Netdot::Model::Device::info_update('Device=HASH(0x59c0098)', 'add_subnets',
undef, 'subs_inherit', undef, 'bgp_peers', undef, 'pretend', undef, 'session',
'SNMP::Info::Layer3::C6500=HASH(0x55566e8)', 'info', 'HASH(0x4e009b0)',
'device_is_new', 1) called at /usr/local/netdot/lib/Netdot/Model/Device.pm line
2821
Netdot::Model::Device::snmp_update('Device=HASH(0x59c0098)', 'session',
'SNMP::Info::Layer3::C6500=HASH(0x55566e8)', 'info', 'HASH(0x4e009b0)',
'device_is_new', 1) called at /usr/local/netdot/lib/Netdot/Model/Device.pm line
1606
Netdot::Model::Device::discover('Device', 'name', 10.0.1.2, 'auth_proto',
undef, 'sec_name', undef, 'communities', undef, 'priv_pass', undef,
'sec_level', undef, 'auth_pass', undef, 'priv_proto', undef, 'version', undef,
'timeoutretries', undef) called at /usr/local/netdot/lib/Netdot/Topology.pm
line 595
eval {...} at /usr/local/netdot/lib/Netdot/Topology.pm line 594
Netdot::Topology::get_dp_links('Netdot::Topology', 'version', undef, 'retries',
1, 'sec_level', undef, 'priv_proto', undef, 'auth_pass', undef, 'auth_proto',
undef, 'priv_pass', undef, 'sec_name', undef, 'timeout', 1000000) called at
/usr/local/netdot/lib/Netdot/Topology.pm line 74
Netdot::Topology::discover('Netdot::Topology', 'auth_pass', undef,
'priv_proto', undef, 'retries', 1, 'sec_level', undef, 'version', undef,
'timeout', 1000000, 'priv_pass', undef, 'sec_name', undef, 'auth_proto', undef)
called at /usr/local/netdot/bin/updatedevices.pl line 231
INFO - admin-core.example.net: Interface 64 (Vl64) updated
</pre>
--
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: Fri, 27 Jun 2014 07:43:21 -0700
From: [email protected]
Subject: [Netdot-devel] [SCM] Netdot branch master updated.
netdot-1.0.6-22-gda8ce06
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 da8ce06005b2958a7feadeb0c6640ebc084f7ba0 (commit)
via 5ef51b091ab2205a134c34f1790abd2360b111f0 (commit)
via aab177b9e792f8156adb3c3022a71a9863736eef (commit)
via 14474dd1262bb8ae1cf559676fde53c824bbdc35 (commit)
via dede575557f100ab9d76b631b4bf13be05948f88 (commit)
via de9882c0338fdfaf82c8528b656415dc87750157 (commit)
from 3408e2abc159483380c38c4654a71c6c26c64e61 (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 da8ce06005b2958a7feadeb0c6640ebc084f7ba0
Merge: 5ef51b0 14474dd
Author: Carlos Vicente <[email protected]>
Date: Fri Jun 27 10:41:27 2014 -0400
Merge pull request #17 from candlerb/candlerb/1822
Topo fixes #1822 #1824
commit 5ef51b091ab2205a134c34f1790abd2360b111f0
Merge: 3408e2a aab177b
Author: Carlos Vicente <[email protected]>
Date: Fri Jun 27 10:38:02 2014 -0400
Merge pull request #19 from candlerb/candlerb/1817
Uncomment LoadModule for apache 2.2
commit aab177b9e792f8156adb3c3022a71a9863736eef
Author: Brian Candler <[email protected]>
Date: Fri Jun 27 15:25:12 2014 +0100
Uncomment LoadModule for apache 2.2
Reverts part of 3408e2a and fixes redmine #1817
diff --git a/etc/netdot_apache2_local.conf b/etc/netdot_apache2_local.conf
index e5b3542..1205d51 100644
--- a/etc/netdot_apache2_local.conf
+++ b/etc/netdot_apache2_local.conf
@@ -22,7 +22,7 @@ PerlModule HTML::Mason::ApacheHandler
# Uncomment this next line if you get errors from libapreq2
# about an 'undefined symbol'
-#LoadModule apreq_module /usr/lib/apache2/modules/mod_apreq2.so
+LoadModule apreq_module /usr/lib/apache2/modules/mod_apreq2.so
# Add Netdot's libraries to @INC
PerlSwitches -I<<Make:PREFIX>>/lib
commit 14474dd1262bb8ae1cf559676fde53c824bbdc35
Author: Brian Candler <[email protected]>
Date: Fri Jun 27 09:33:47 2014 +0100
Update graph edge directions for device topo
Adjust the graph edges so that "Up" devices appear to the left and
"Down" devices appear to the right.
Fixes redmine #1824
diff --git a/lib/Netdot/UI.pm b/lib/Netdot/UI.pm
index c7dcf52..760b607 100644
--- a/lib/Netdot/UI.pm
+++ b/lib/Netdot/UI.pm
@@ -1854,15 +1854,18 @@ sub build_device_topology_graph {
my $neighbor_name = ($show_names ? $neighbor->name :
$neighbor->number) || $neighbor->number;
my $nd = $neighbor->device || next;
+ my ($n1, $n2, $constraint) = ($device->id, $nd->id, 1);
if ( exists($spp->{$device->id}->{$nd->id}) ){
# Neighbor is closer to root
$dir = "up";
+ ($n1, $n2) = ($n2, $n1);
}elsif ( exists($spp->{$nd->id}->{$device->id}) ){
# The opposite
$dir = "down";
}else{
$dir = "level";
+ $constraint = 0;
}
my $add_node = 0;
@@ -1892,7 +1895,8 @@ sub build_device_topology_graph {
$style='dashed';
}
- $g->add_edge($device->id => $nd->id,
+ $g->add_edge($n1 => $n2,
+ constraint => $constraint,
tailURL =>
"view.html?table=Interface&id=".$iface->id,
taillabel =>
((defined($specific_vlan) && $specific_vlan != 0)?$name:$vname),
headURL =>
"view.html?table=Interface&id=".$neighbor->id,
@@ -1906,7 +1910,8 @@ sub build_device_topology_graph {
}
} else {
if ( !defined($specific_vlan) || defined($specific_vlan) &&
$specific_vlan == 0 ) {
- $g->add_edge($device->id => $nd->id,
+ $g->add_edge($n1 => $n2,
+ constraint => $constraint,
tailURL =>
"view.html?table=Interface&id=".$iface->id,
taillabel => $name,
headURL =>
"view.html?table=Interface&id=".$neighbor->id,
commit dede575557f100ab9d76b631b4bf13be05948f88
Author: Brian Candler <[email protected]>
Date: Fri Jun 27 09:09:54 2014 +0100
Add as_canon Graphviz format
This is useful for debugging graph building
diff --git a/lib/Netdot/UI.pm b/lib/Netdot/UI.pm
index aa906b1..c7dcf52 100644
--- a/lib/Netdot/UI.pm
+++ b/lib/Netdot/UI.pm
@@ -1780,7 +1780,7 @@ sub build_ip_tree_graph_html {
vlans
show_names Boolean. Whether to show interface names
filename File name for the graph
- format (text|ps|hpgl|gd|gd2|gif|jpeg|png|svg)
+ format (canon|text|ps|hpgl|gd|gd2|gif|jpeg|png|svg)
direction (up_down|left_right)
Returns:
GraphViz object
@@ -1985,7 +1985,7 @@ sub build_device_topology_graph {
$argv{format} ||= 'png';
- if ( $argv{format} =~ /^(text|ps|hpgl|gd|gd2|gif|jpeg|png|svg)$/){
+ if ( $argv{format} =~ /^(canon|text|ps|hpgl|gd|gd2|gif|jpeg|png|svg)$/){
my $method = 'as_'.$argv{format};
$g->$method($filename);
}else{
@@ -2182,7 +2182,7 @@ sub build_device_stp_graph {
#output the graph to file
$argv{format} ||= 'png';
- if ( $argv{format} =~ /^(text|ps|hpgl|gd|gd2|gif|jpeg|png|svg)$/){
+ if ( $argv{format} =~ /^(canon|text|ps|hpgl|gd|gd2|gif|jpeg|png|svg)$/){
my $method = 'as_'.$argv{format};
$g->$method($filename);
}else{
commit de9882c0338fdfaf82c8528b656415dc87750157
Author: Brian Candler <[email protected]>
Date: Fri Jun 27 08:55:01 2014 +0100
Fix topo devices with same short_name
Display devices in the topology map with the same short_name as
distinct nodes.
Fixes redmine #1822
diff --git a/lib/Netdot/UI.pm b/lib/Netdot/UI.pm
index 4eab361..aa906b1 100644
--- a/lib/Netdot/UI.pm
+++ b/lib/Netdot/UI.pm
@@ -1822,7 +1822,8 @@ sub build_device_topology_graph {
@argv{'graph', 'device', 'view', 'show_names', 'show_vlans',
'nodeoptions'};
$view ||= "view";
- $g->add_node(name => $device->short_name,
+ $g->add_node($device->id,
+ label => $device->short_name,
shape => "record",
URL =>
"device.html?id=".$device->id."&view=$view&toponames=$show_names&topovlans=$show_vlans",
%$nodeoptions
@@ -1891,7 +1892,7 @@ sub build_device_topology_graph {
$style='dashed';
}
- $g->add_edge($device->short_name => $nd->short_name,
+ $g->add_edge($device->id => $nd->id,
tailURL =>
"view.html?table=Interface&id=".$iface->id,
taillabel =>
((defined($specific_vlan) && $specific_vlan != 0)?$name:$vname),
headURL =>
"view.html?table=Interface&id=".$neighbor->id,
@@ -1905,7 +1906,7 @@ sub build_device_topology_graph {
}
} else {
if ( !defined($specific_vlan) || defined($specific_vlan) &&
$specific_vlan == 0 ) {
- $g->add_edge($device->short_name => $nd->short_name,
+ $g->add_edge($device->id => $nd->id,
tailURL =>
"view.html?table=Interface&id=".$iface->id,
taillabel => $name,
headURL =>
"view.html?table=Interface&id=".$neighbor->id,
-----------------------------------------------------------------------
Summary of changes:
etc/netdot_apache2_local.conf | 2 +-
lib/Netdot/UI.pm | 18 ++++++++++++------
2 files changed, 13 insertions(+), 7 deletions(-)
hooks/post-receive
--
Netdot
------------------------------
Message: 6
Date: Fri, 27 Jun 2014 07:43:36 -0700
From: [email protected]
Subject: [Netdot-devel] [SCM] Netdot branch netdot-1.0 updated.
netdot-1.0.6-22-gda8ce06
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 da8ce06005b2958a7feadeb0c6640ebc084f7ba0 (commit)
via 5ef51b091ab2205a134c34f1790abd2360b111f0 (commit)
via aab177b9e792f8156adb3c3022a71a9863736eef (commit)
via 14474dd1262bb8ae1cf559676fde53c824bbdc35 (commit)
via dede575557f100ab9d76b631b4bf13be05948f88 (commit)
via de9882c0338fdfaf82c8528b656415dc87750157 (commit)
from 3408e2abc159483380c38c4654a71c6c26c64e61 (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 -----------------------------------------------------------------
-----------------------------------------------------------------------
Summary of changes:
etc/netdot_apache2_local.conf | 2 +-
lib/Netdot/UI.pm | 18 ++++++++++++------
2 files changed, 13 insertions(+), 7 deletions(-)
hooks/post-receive
--
Netdot
------------------------------
Message: 7
Date: Fri, 27 Jun 2014 07:44:44 -0700
From: [email protected]
Subject: [Netdot-devel] [Netdot - Feature #1824] (Resolved) Improve
Depth Up / Depth Down display
To: [email protected], [email protected]
Message-ID: <[email protected]>
Content-Type: text/plain; charset=utf-8
Issue #1824 has been updated by Carlos Vicente.
Category set to UserInterface
Status changed from New to Resolved
Assignee set to Brian Candler
Target version set to 1.0.7
Resolution set to fixed
Merged. Thank you!
----------------------------------------
Feature #1824: Improve Depth Up / Depth Down display
https://osl.uoregon.edu/redmine/issues/1824#change-3200
Author: Brian Candler
Status: Resolved
Priority: Normal
Assignee: Brian Candler
Category: UserInterface
Target version: 1.0.7
Resolution: fixed
When viewing the topology from the view of at a particular device, you can
select "Depth Up" (towards the NMS_DEVICE) and "Depth Down" (away from the
NMS_DEVICE)
This works, but it displays a tree rooted at the chosen device on the left and
both "Up" and "Down" devices mixed together to the right.
What I was expecting was a chain of "Up" devices to be on the left, and the
"Down" devices to the right.
In the attached example diagram, "lib-core" is actually the parent (closer to
NMS_DEVICE) and the other devices are children, but you can't tell this from
the diagram.
--
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
------------------------------
_______________________________________________
Netdot-devel mailing list
[email protected]
https://osl.uoregon.edu/mailman/listinfo/netdot-devel
End of Netdot-devel Digest, Vol 87, Issue 11
********************************************
