135/netdisco
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

save and load netmap positions for same device groups

Browse Source
This commit is contained in:
Oliver Gorwits
2017-12-20 22:05:51 +00:00
parent b7cd0251ff
commit aba359d2a9
6 changed files with 89 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
lib/App/Netdisco/Web/Plugin/Device/Neighbors.pm
View File

@@ -5,6 +5,7 @@ use Dancer::Plugin::Ajax;
use Dancer::Plugin::DBIC;
use Dancer::Plugin::Auth::Extensible;
use List::MoreUtils ();
use App::Netdisco::Web::Plugin;
register_device_tab({ tag => 'netmap', label => 'Neighbors' });
@@ -14,10 +15,33 @@ ajax '/ajax/content/device/netmap' => require_login sub {
template 'ajax/device/netmap.tt', {}, { layout => undef };
};
# TODO
ajax '/ajax/data/device/netmappositions' => require_login sub {
my $x = from_json param('positions');
use DDP; p $x;
my $p = param('positions') or send_error('Missing positions', 400);
my $positions = from_json($p) or send_error('Bad positions', 400);
send_error('Bad positions', 400) unless ref [] eq ref $positions;
my %clean = ();
POSITION: foreach my $pos (@$positions) {
next unless ref {} eq ref $pos;
foreach my $k (qw/ID x y/) {
next POSITION unless exists $pos->{$k};
next POSITION unless $pos->{$k} =~ m/^[[:word:]\.-]+$/;
}
$clean{$pos->{ID}} = { x => $pos->{x}, y => $pos->{y} };
}
return unless scalar keys %clean;
my $posrow = schema('netdisco')->resultset('NetmapPositions')->find({
device_groups => \[ '= ?', [device_groups => [sort (List::MoreUtils::uniq( '__ANY__' )) ]] ]});
if ($posrow) {
$posrow->update({ positions => to_json(\%clean) });
}
else {
schema('netdisco')->resultset('NetmapPositions')->create({
device_groups => [sort (List::MoreUtils::uniq( '__ANY__' )) ],
positions => to_json(\%clean),
});
}
};
ajax '/ajax/data/device/netmap' => require_login sub {
@@ -28,6 +52,10 @@ ajax '/ajax/data/device/netmap' => require_login sub {
my $vlan = param('vlan');
undef $vlan if (defined $vlan and $vlan !~ m/^\d+$/);
my $posrow = schema('netdisco')->resultset('NetmapPositions')->find({
device_groups => \[ '= ?', [device_groups => [sort (List::MoreUtils::uniq( '__ANY__' )) ]] ]});
my $pos_for = from_json( $posrow ? $posrow->positions : '{}' );
my @devices = schema('netdisco')->resultset('Device')->search({}, {
result_class => 'DBIx::Class::ResultClass::HashRefInflator',
columns => ['ip', 'dns', 'name'],
@@ -44,15 +72,26 @@ ajax '/ajax/data/device/netmap' => require_login sub {
(my $name = ($device->{dns} || lc($device->{name}) || $device->{ip})) =~ s/$domain$//;
$v3data{nodes}->{ ($device->{row_number} - 1) } = {
ID => $device->{row_number},
ID => $device->{ip},
SIZEVALUE => 3000,
COLORVALUE => 10,
LABEL => $name,
};
push @{$v4data{'nodes'}}, { index => ($device->{row_number} - 1) };
$v3data{'centernode'} = $device->{row_number}
if (exists $pos_for->{$device->{ip}}) {
my $node = $v3data{nodes}->{ ($device->{row_number} - 1) };
$node->{'fixed'} = 1;
$node->{'x'} = $pos_for->{$device->{ip}}->{'x'};
$node->{'y'} = $pos_for->{$device->{ip}}->{'y'};
}
else {
++$v3data{'newnodes'};
}
$v3data{'centernode'} = $device->{ip}
if $qdev and $qdev->in_storage and $device->{ip} eq $qdev->ip;
push @{$v4data{'nodes'}}, { index => ($device->{row_number} - 1) };
}
my $rs = schema('netdisco')->resultset('Virtual::DeviceLinks')->search({}, {
@@ -71,8 +110,8 @@ ajax '/ajax/data/device/netmap' => require_login sub {
while (my $l = $rs->next) {
push @{$v3data{'links'}}, {
FROMID => $id_for{$l->{left_ip}},
TOID => $id_for{$l->{right_ip}},
FROMID => $l->{left_ip},
TOID => $l->{right_ip},
};
push @{$v4data{'links'}}, {
source => ($id_for{$l->{left_ip}} - 1),