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

make sure device_port is updated when manual_topo is set

Browse Source
This commit is contained in:
Oliver Gorwits
2013-05-27 14:47:59 +01:00
parent 33bf9a6599
commit 3f6a7b5aa2
2 changed files with 45 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Netdisco/lib/App/Netdisco/Core/Discover.pm
View File

@@ -714,6 +714,8 @@ sub store_neighbors {
remote_port => $remote_port,
remote_type => $remote_type,
remote_id => $remote_id,
is_uplink => \"true",
manual_topo => \"false",
});
}
@@ -748,7 +750,10 @@ sub _set_manual_topology {
->update({
remote_ip => $right->ip,
remote_port => $link->port2,
manual_topo => \'true',
remote_type => undef,
remote_id => undef,
is_uplink => \"true",
manual_topo => \"true",
});
$right->ports
@@ -756,7 +761,10 @@ sub _set_manual_topology {
->update({
remote_ip => $left->ip,
remote_port => $link->port1,
manual_topo => \'true',
remote_type => undef,
remote_id => undef,
is_uplink => \"true",
manual_topo => \"true",
});
});
};

35
Netdisco/lib/App/Netdisco/Web/Plugin/AdminTask/Topology.pm
View File

@@ -37,6 +37,41 @@ ajax '/ajax/control/admin/topology/add' => sub {
dev2 => param('dev2'),
port2 => param('port2'),
});
# re-set remote device details in affected ports
# could fail for bad device or port names
try {
schema('netdisco')->txn_do(sub {
# only work on root_ips
my $left = get_device(param('dev1'));
my $right = get_device(param('dev2'));
# skip bad entries
return unless ($left->in_storage and $right->in_storage);
$left->ports
->single({port => param('port1')}, {for => 'update'})
->update({
remote_ip => param('dev2'),
remote_port => param('port2'),
remote_type => undef,
remote_id => undef,
is_uplink => \"true",
manual_topo => \"true",
});
$right->ports
->single({port => param('port2')}, {for => 'update'})
->update({
remote_ip => param('dev1'),
remote_port => param('port1'),
remote_type => undef,
remote_id => undef,
is_uplink => \"true",
manual_topo => \"true",
});
});
};
};
ajax '/ajax/control/admin/topology/del' => sub {