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 Git repository branch master updated.
netdot-1.0.1-RC3-84-ge14bda5 (Apache)
2. [SCM] Netdot Git repository branch netdot-1.0 updated.
netdot-1.0.1-RC3-81-g7fe4d28 (Apache)
3. [SCM] Netdot Git repository branch netdot-1.0 updated.
netdot-1.0.1-RC3-82-gdd214ac (Apache)
4. [SCM] Netdot Git repository branch netdot-1.0 updated.
netdot-1.0.1-RC3-83-g37887dd (Apache)
5. [SCM] Netdot Git repository branch netdot-1.0 updated.
netdot-1.0.1-RC3-84-g0dcfec4 (Apache)
----------------------------------------------------------------------
Message: 1
Date: Wed, 1 Aug 2012 09:49:30 -0700
From: Apache <[email protected]>
Subject: [Netdot-devel] [SCM] Netdot Git repository branch master
updated. netdot-1.0.1-RC3-84-ge14bda5
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 Git repository".
The branch, master has been updated
via e14bda5102754ecacd978b99a9b8c3e8ea9c73cb (commit)
via 7fe4d28978246101781e266f932d4b3fb48cec17 (commit)
via b5d979c5cbb2b8a3977a4ec1bc04067abce61dfc (commit)
via 8ffe9ca84ba0e5a3aab981b22ad847cb409606e1 (commit)
via 7507d28d2e04b21e2fc363a58697f109705a499e (commit)
via cfab8afc47723aaa997b6833f0b570c4012610d6 (commit)
via 6dc17e3308d5963494b212eaabd12d751206424f (commit)
via 6d6bcbabc666e1596db44c6a3123d93cdeabaf25 (commit)
via 499f78d48733748d33e37416130920d5459a8c57 (commit)
via 573fd34644250552f77ba4587d7679cb398278f5 (commit)
via febb3d5e7f2104d255041ea7833f97c19176041f (commit)
via e219cd2fff036bba9baa2355109521baebeaa953 (commit)
via 7a8997e2c301915d414fcf51f0a22f193e8c78a0 (commit)
via 0bdb01b0f2a672e136488cfc82ba6337b81c960a (commit)
via fea4587d5f0958318007bf46d703b98c135b6748 (commit)
via 0fe559dc9e1ed44f6bbd469e81518f0b2c7c513f (commit)
via 4ae8c6d68f070324a96011999bda2687b8c4c82a (commit)
via d0c5b1c652679002ecfa26beab1c47502b4db4b2 (commit)
via d7419ea6c261179b06f5947ab071922c159b35f2 (commit)
via 12494cd13bd12125ac2efd2294d0ed3542e7f4c4 (commit)
via b08bff910f7cedd3b1a141bb33c4cf0dfec00d4d (commit)
via 51e6476808a772be91c427a05b461a9a8f9beede (commit)
via c57c7e9766c50fccd74e56a249a50fb8e9e1af26 (commit)
via 49414860d8d5c24d6847a49647446b20d7131d5c (commit)
via 9e4e0cd7e8619a32811267fb893f58dba38c52b8 (commit)
via 40f8d5473506c7ddc4a5dbb4a1a564d92b7b611f (commit)
via 23432a5695e1e4fb18283979a71b43d816938898 (commit)
via fe02d28d7cda42223f2faf7d3e2f3f37ba6ba921 (commit)
via f55deea649ed5115f02024debae70f535e7198d3 (commit)
via f73c9f72340d8ed9c1051be5be028ddb5d8601a6 (commit)
via 0850dfda1b7fdf3396cc381d98a13e5b7df2c2eb (commit)
via e26f8c4ae975697b5cfb94ab4ee68988eba6d65f (commit)
via f63973b338656ff9c0f83a73e74e4a991392ff31 (commit)
via 465954ad59d53fb75f21e11690d33c3d4d7675a7 (commit)
via 4aae6888f49cbfe391a00084567b20e310b81d32 (commit)
via 4c218539eaf13a707e6085bd45ea9e6026ed9035 (commit)
via 40c56b90b7c7b336ecd377122737bef74c3dbc72 (commit)
via e3192b87e054360cce2f1177e592178989436210 (commit)
via 3ab586b7af95345362dffe6516b6fa3550cd6e02 (commit)
via 19be86294307870674b9a5c93ec981010e9816ba (commit)
via 43ceacb4cfcc22b633c54480e8fa55e6abd6c2b3 (commit)
via 481b0c53eb24ac12d705d4b3ebdbf437c80b02db (commit)
via 4432b6b224567a0cb4972b8564646b7cf594d66a (commit)
via 29819393c52be598536dabdca509dd2395a758bb (commit)
via 7e9fd90c2d015cdd056194121f82f9c26e323253 (commit)
via 396ff47c87be71fa16e867b35f56dc3ee0fe4655 (commit)
via 6209831765524d1c665578b761fa013586a4868b (commit)
via dddcc66af85c5af9d850c1d284cefc707694edbd (commit)
via 00cd3bb5aab1561ab3ab0319499893b3374010e0 (commit)
via 91c37baf09bf15509c150be409f2919a20706abf (commit)
via 0277037e8f3790f224f4fccca7d94b86c70e20e5 (commit)
via c9d892e1d36ae29d9642e2fb68efc5c40a6d8e2c (commit)
via 12cdebd260b5434e2075e468fd010824a06e32ec (commit)
via 8e78f0e8038e44a2f08b28774d8b7ea5e53e6c65 (commit)
via c99b1b74d6abbd8cee378f5fef65d3ca9c1869ac (commit)
via cfb18434df24ec0bcad6eaa03d430a28354f85c4 (commit)
via 4d0746b7df150f137b6c2af26b199adf6c73bdaf (commit)
via 7044bcf944be3c4a93717f1ca9b96c3dee41e3dd (commit)
from 863dc91b8cdb254783b916309d89a4d29cd5541b (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 e14bda5102754ecacd978b99a9b8c3e8ea9c73cb
Merge: 863dc91 7fe4d28
Author: Carlos Vicente <[email protected]>
Date: Wed Aug 1 12:48:59 2012 -0400
Merge branch 'netdot-1.0'
-----------------------------------------------------------------------
Summary of changes:
bin/prune_db.pl | 76 ++++--
etc/Default.conf | 13 +-
htdocs/cable_plant/backbone_list_query.html | 62 +----
htdocs/cable_plant/cable_backbone.html | 25 +-
htdocs/cable_plant/circuit.html | 14 +-
htdocs/cable_plant/circuit_interfaces.mhtml | 12 +-
htdocs/cable_plant/display_sequence.mhtml | 10 +-
htdocs/cable_plant/get_strand_sequence_list.html | 16 +-
htdocs/generic/access_right_form.html | 4 +-
htdocs/generic/edit.html | 4 +-
htdocs/management/host.html | 82 ++++---
htdocs/management/ip.html | 34 ++-
htdocs/management/ipblock_list.mhtml | 35 ++-
htdocs/management/list_rights.mhtml | 13 +-
htdocs/reports/device_inventory.html | 8 +-
htdocs/reports/{downtime.html => snmp_down.html} | 8 +-
htdocs/rest/dhandler | 1 +
htdocs/user_management/add_host.html | 3 +-
htdocs/user_management/hostinfo_tasks.html | 4 +-
lib/Netdot/Exporter/BIND.pm | 34 ++-
lib/Netdot/Meta.pm | 13 +-
lib/Netdot/Model.pm | 67 +++--
lib/Netdot/Model/BackboneCable.pm | 45 +++
lib/Netdot/Model/CableStrand.pm | 320 ++++++++++++----------
lib/Netdot/Model/Device.pm | 258 ++++++++++--------
lib/Netdot/Model/Device/CLI.pm | 95 +++++++-
lib/Netdot/Model/Device/CLI/CiscoCat.pm | 93 -------
lib/Netdot/Model/Device/CLI/CiscoFW.pm | 59 +----
lib/Netdot/Model/Device/CLI/CiscoIOS.pm | 94 -------
lib/Netdot/Model/Device/CLI/FoundryIW.pm | 94 -------
lib/Netdot/Model/DhcpScope.pm | 4 +
lib/Netdot/Model/Ipblock.pm | 16 +-
lib/Netdot/Model/RRPTR.pm | 75 ++++--
lib/Netdot/Model/Zone.pm | 2 +-
lib/Netdot/REST.pm | 26 +-
lib/Netdot/Topology.pm | 5 +-
lib/Netdot/UI.pm | 26 +-
upgrade/updatedb | 1 -
38 files changed, 880 insertions(+), 871 deletions(-)
copy htdocs/reports/{downtime.html => snmp_down.html} (70%)
hooks/post-receive
--
Netdot Git repository
------------------------------
Message: 2
Date: Wed, 1 Aug 2012 09:49:33 -0700
From: Apache <[email protected]>
Subject: [Netdot-devel] [SCM] Netdot Git repository branch netdot-1.0
updated. netdot-1.0.1-RC3-81-g7fe4d28
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 Git repository".
The branch, netdot-1.0 has been updated
via 7fe4d28978246101781e266f932d4b3fb48cec17 (commit)
via b5d979c5cbb2b8a3977a4ec1bc04067abce61dfc (commit)
via 8ffe9ca84ba0e5a3aab981b22ad847cb409606e1 (commit)
via 7507d28d2e04b21e2fc363a58697f109705a499e (commit)
from cfab8afc47723aaa997b6833f0b570c4012610d6 (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/Default.conf | 8 +
htdocs/cable_plant/backbone_list_query.html | 62 +----
htdocs/cable_plant/circuit.html | 6 +-
htdocs/cable_plant/circuit_interfaces.mhtml | 2 +-
htdocs/management/ip.html | 7 +-
lib/Netdot/Model/BackboneCable.pm | 45 ++++
lib/Netdot/Model/CableStrand.pm | 334 ++++++++++++++-------------
7 files changed, 242 insertions(+), 222 deletions(-)
hooks/post-receive
--
Netdot Git repository
------------------------------
Message: 3
Date: Wed, 1 Aug 2012 10:40:45 -0700
From: Apache <[email protected]>
Subject: [Netdot-devel] [SCM] Netdot Git repository branch netdot-1.0
updated. netdot-1.0.1-RC3-82-gdd214ac
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 Git repository".
The branch, netdot-1.0 has been updated
via dd214ac51210a52fe0285a7805bde39c35b62452 (commit)
from 7fe4d28978246101781e266f932d4b3fb48cec17 (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 dd214ac51210a52fe0285a7805bde39c35b62452
Author: Carlos Vicente <[email protected]>
Date: Wed Aug 1 13:40:32 2012 -0400
Fix for Feature #1669 (Display circuit ID on the backbone cable strand page)
diff --git a/htdocs/cable_plant/cable_backbone.html
b/htdocs/cable_plant/cable_backbone.html
index f953550..658b1b4 100644
--- a/htdocs/cable_plant/cable_backbone.html
+++ b/htdocs/cable_plant/cable_backbone.html
@@ -456,6 +456,7 @@ function editSelected(id)
if (!$editStrand) {
push( @headers, 'Part of Sequence' );
+ push(@headers, '<a href="cable_backbone.html?id=' . $id .
'&strand_sort=circuit#cable_strand">Circuit</a>');
if ( $manager && $manager->can($user, 'edit', $o) ){
push( @headers, '<B>Edit?</B>' );
}
@@ -473,9 +474,13 @@ function editSelected(id)
# -----------------------------------------------------------
@sorted_strands = sort { uc($a->status->name) cmp
uc($b->status->name) } @strands;
} elsif ($strand_sort eq "type") {
- # sort by status
+ # sort by type
# -----------------------------------------------------------
@sorted_strands = sort { uc($a->fiber_type->name) cmp
uc($b->fiber_type->name) } @strands;
+ } elsif ($strand_sort eq "circuit") {
+ # sort by circuit
+ # -----------------------------------------------------------
+ @sorted_strands = sort { uc($a->circuit_id->cid) cmp
uc($b->circuit_id->cid) } @strands;
}
</%perl>
@@ -592,16 +597,15 @@ HERE
}} );
if (!$editStrand) {
- push( @row, $m->scomp('display_sequence.mhtml', strands=>[$st]) );
- if ( $manager && $manager->can($user, 'edit', $o) ){
- push( @row, '<input type="checkbox" name="edit_' . $st->id .
'" onChange="editCheck(this);">' );
- }
-
- # This scomp method is *very* helpful. It returns as a
- # string what the component would have printed. Like
- # sprintf vs printf.
+ push( @row, $m->scomp('display_sequence.mhtml', strands=>[$st])
);
+
+ %tmp = $ui->form_field(object=>$st, column=>"circuit_id",
edit=>0, linkPage=>"circuit.html");
+ push( @row, $tmp{value} );
+
+ if ( $manager && $manager->can($user, 'edit', $o) ){
+ push( @row, '<input type="checkbox" name="edit_' . $st->id
. '" onChange="editCheck(this);">' );
+ }
}
-
push( @rows, \@row );
} # foreach
</%perl>
-----------------------------------------------------------------------
Summary of changes:
htdocs/cable_plant/cable_backbone.html | 24 ++++++++++++++----------
1 files changed, 14 insertions(+), 10 deletions(-)
hooks/post-receive
--
Netdot Git repository
------------------------------
Message: 4
Date: Wed, 1 Aug 2012 11:37:03 -0700
From: Apache <[email protected]>
Subject: [Netdot-devel] [SCM] Netdot Git repository branch netdot-1.0
updated. netdot-1.0.1-RC3-83-g37887dd
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 Git repository".
The branch, netdot-1.0 has been updated
via 37887dd329d399aac6a2e480e3a7bb0f2bbcedfe (commit)
from dd214ac51210a52fe0285a7805bde39c35b62452 (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 37887dd329d399aac6a2e480e3a7bb0f2bbcedfe
Author: Carlos Vicente <[email protected]>
Date: Wed Aug 1 14:36:52 2012 -0400
Fixed bug in backbone cable search. Simplified code in the process
diff --git a/htdocs/cable_plant/cable_plant_backbone.mhtml
b/htdocs/cable_plant/cable_plant_backbone.mhtml
index 38bbb11..ef90fcf 100644
--- a/htdocs/cable_plant/cable_plant_backbone.mhtml
+++ b/htdocs/cable_plant/cable_plant_backbone.mhtml
@@ -20,7 +20,7 @@ my $manager = $ui->get_permission_manager($r);
</%init>
<%perl>
-
+
my @cables = ();
my $header_descr = "";
@@ -43,42 +43,21 @@ my $manager = $ui->get_permission_manager($r);
# user selected a start and end point
elsif ($start_id && $end_id) {
- # need to get all closets for both start and end and find all
- # BackboneCable's that have a match for either start_closet or
end_closet.
- my ($s1, $s2, @closets, %found);
- $s1 = Site->retrieve($start_id);
- $s2 = Site->retrieve($end_id);
- @closets = grep(!$found{$_}++, ($s1->closets, $s2->closets));
- %found = ();
-
- # and finally all BackboneCables that either start or end
- # at one of these closets..
- foreach my $closet (@closets) {
- foreach my $c1 (@closets) {
- my $c_id = $closet->id;
- my $c1_id = $c1->id;
- next if ($c_id == $c1_id);
- map { push (@cables, $_) } grep(!$found{$_}++,
-
(BackboneCable->search(start_closet=>$c_id, end_closet=>$c1_id),
-
BackboneCable->search(start_closet=>$c1_id, end_closet=>$c_id)));
- }
- }
-
- $header_descr = sprintf("between <a
href=\"view.html?table=Site&id=%d\">%s</a>, <a
href=\"view.html?table=Site&id=%d\">%s</a>",
- $s1->id, $s1->name, $s2->id, $s2->name);
- }
+ my $s1 = Site->retrieve($start_id);
+ my $s2 = Site->retrieve($end_id);
+ @cables = BackboneCable->search_by_site(site1=>$start_id,
site2=>$end_id);
+
+ $header_descr = sprintf("between <a
href=\"view.html?table=Site&id=%d\">%s</a>".
+ " and <a
href=\"view.html?table=Site&id=%d\">%s</a>",
+ $s1->id, $s1->get_label, $s2->id,
$s2->get_label);
+ }
elsif ($start_id) {
- my (@start_closets, $start_site);
- $start_site = Site->retrieve($start_id) if ($start_id);
- @start_closets = $start_site->closets if ($start_site);
-
- foreach my $start_c (@start_closets) {
- my @cab = BackboneCable->search(start_closet=>$start_c->id);
- push (@cables, @cab);
- }
+ my $start_site = Site->retrieve($start_id);
+ @cables = BackboneCable->search_by_site(site1=>$start_id);
- $header_descr = sprintf("connected to <a
href=\"view.html?table=Site&id=%d\">%s</a>", $start_site->id,
$start_site->name);
+ $header_descr = sprintf("connected to <a
href=\"view.html?table=Site&id=%d\">%s</a>",
+ $start_site->id, $start_site->name);
}
</%perl>
@@ -95,7 +74,7 @@ my $manager = $ui->get_permission_manager($r);
% } else {
<div class="containerheadleft">
- Backbone Cable <% $header_descr ? $header_descr : "" %>
+ Backbone Cable(s) <% $header_descr ? $header_descr : "" %>
</div>
<div class="containerheadright">
% if ($edit eq "cableinfo"){
diff --git a/lib/Netdot/Model/BackboneCable.pm
b/lib/Netdot/Model/BackboneCable.pm
index ffa4976..bfa20b0 100644
--- a/lib/Netdot/Model/BackboneCable.pm
+++ b/lib/Netdot/Model/BackboneCable.pm
@@ -6,9 +6,10 @@ use strict;
my $logger = Netdot->log->get_logger('Netdot::Model');
-# Store the graph as class data to avoid recalculating
+# Store the graphs as class data to avoid recalculating
# within the same process
my $site_graph;
+my $bb_graph;
=head1 NAME
@@ -21,6 +22,83 @@ Netdot::Model::BackboneCable
=cut
##################################################################
+=head2 get_graph - Backbone cable to site graph
+
+ Arguments:
+ None
+ Returns:
+ Hash of hashes
+ Examples:
+ BackboneCable->get_graph();
+=cut
+sub get_graph {
+ my ($class) = @_;
+
+ # Don't compute again if we already did in this process
+ return $bb_graph if $bb_graph;
+
+ my $dbh = $class->db_Main;
+ my %g;
+ my $q = "SELECT DISTINCT bc.id, s.id
+ FROM backbonecable bc, closet cl,
+ room rm, floor fl, site s
+ WHERE (bc.start_closet=cl.id OR bc.end_closet=cl.id)
+ AND cl.room=rm.id AND rm.floor=fl.id AND fl.site=s.id";
+
+ my $rows = $dbh->selectall_arrayref($q);
+ foreach my $row ( @$rows ){
+ my ($bcid, $sid) = @$row;
+ $g{SITE}{$sid}{$bcid} = 1;
+ $g{BB}{$bcid}{$sid} = 1;
+ }
+
+ $bb_graph = \%g;
+ return $bb_graph;
+}
+
+##################################################################
+=head2 search_by_site - Search backbone cables by start and/or end sites
+
+ Arguments:
+ Hash with the following keys:
+ site1 - Site id
+ site2 - Site id
+ (at least 1 site required)
+ Returns:
+ Array of BackboneCable objects
+ Examples:
+ BackboneCable->search_by_site(site1=>$a,site2=>$b);
+=cut
+sub search_by_site {
+ my ($class, %argv) = @_;
+
+ my $s1 = $argv{site1};
+ my $s2 = $argv{site2};
+
+ $class->throw_user("At least one site is required for this search")
+ unless $s1 or $s2;
+
+ my $graph = $class->get_graph();
+ my (@set1,@set2);
+ @set1 = keys %{$graph->{SITE}->{$s1}} if defined $s1;
+ @set2 = keys %{$graph->{SITE}->{$s2}} if defined $s2;
+
+ my @res;
+ if ( $s1 && $s2 ){
+ my %tmp;
+ map { $tmp{$_} = 1 } @set1;
+ @res = grep { $tmp{$_} } @set2;
+ }elsif ( $s1 ){
+ @res = @set1;
+ }elsif ( $s2 ){
+ @res = @set2;
+ }
+
+ @res = map { BackboneCable->retrieve($_) } @res;
+ return @res;
+}
+
+##################################################################
=head2 get_site_graph - Graph of sites connected by backbone cables
Arguments:
-----------------------------------------------------------------------
Summary of changes:
htdocs/cable_plant/cable_plant_backbone.mhtml | 49 ++++-----------
lib/Netdot/Model/BackboneCable.pm | 80 ++++++++++++++++++++++++-
2 files changed, 93 insertions(+), 36 deletions(-)
hooks/post-receive
--
Netdot Git repository
------------------------------
Message: 5
Date: Wed, 1 Aug 2012 11:59:26 -0700
From: Apache <[email protected]>
Subject: [Netdot-devel] [SCM] Netdot Git repository branch netdot-1.0
updated. netdot-1.0.1-RC3-84-g0dcfec4
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 Git repository".
The branch, netdot-1.0 has been updated
via 0dcfec40b232855715088f9d2d3503c7e9dcffb7 (commit)
from 37887dd329d399aac6a2e480e3a7bb0f2bbcedfe (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 0dcfec40b232855715088f9d2d3503c7e9dcffb7
Author: Carlos Vicente <[email protected]>
Date: Wed Aug 1 14:59:13 2012 -0400
Corrections
diff --git a/lib/Netdot/Model/BackboneCable.pm
b/lib/Netdot/Model/BackboneCable.pm
index bfa20b0..39126bb 100644
--- a/lib/Netdot/Model/BackboneCable.pm
+++ b/lib/Netdot/Model/BackboneCable.pm
@@ -85,9 +85,23 @@ sub search_by_site {
my @res;
if ( $s1 && $s2 ){
- my %tmp;
- map { $tmp{$_} = 1 } @set1;
- @res = grep { $tmp{$_} } @set2;
+ if ( $s1 != $s2 ){
+ # Get intersection of sets 1 and 2
+ my %tmp;
+ map { $tmp{$_} = 1 } @set1;
+ @res = grep { $tmp{$_} } @set2;
+ }else{
+ # backbone starts and ends in same site
+ # Get the backbone connected to this site
+ # which has only one site
+ foreach my $bb ( keys %{$graph->{SITE}->{$s1}} ){
+ my @n = keys %{$graph->{BB}->{$bb}};
+ if ( scalar(@n) == 1 ){
+ push @res, $bb;
+ last;
+ }
+ }
+ }
}elsif ( $s1 ){
@res = @set1;
}elsif ( $s2 ){
@@ -121,7 +135,7 @@ sub get_site_graph {
closet cl1, closet cl2,
room rm1, room rm2, floor fl1, floor fl2,
site s1, site s2
- WHERE s1.id < s2.id
+ WHERE s1.id <= s2.id
AND cl1.room=rm1.id AND rm1.floor=fl1.id AND fl1.site=s1.id
AND cl2.room=rm2.id AND rm2.floor=fl2.id AND fl2.site=s2.id
AND ((bc.start_closet=cl1.id AND bc.end_closet=cl2.id)
-----------------------------------------------------------------------
Summary of changes:
lib/Netdot/Model/BackboneCable.pm | 22 ++++++++++++++++++----
1 files changed, 18 insertions(+), 4 deletions(-)
hooks/post-receive
--
Netdot Git repository
------------------------------
_______________________________________________
Netdot-devel mailing list
[email protected]
https://osl.uoregon.edu/mailman/listinfo/netdot-devel
End of Netdot-devel Digest, Vol 65, Issue 1
*******************************************
