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

#897 port free should only apply to physical interfaces

Browse Source
This commit is contained in:
Oliver Gorwits
2022-07-25 17:42:38 +01:00
parent 796aa1c6f0
commit a9b0d58b79
3 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/App/Netdisco/DB/ResultSet/DevicePort.pm
View File

@@ -68,7 +68,8 @@ sub with_is_free {
{
'+columns' => { is_free =>
# NOTE this query is in `git grep 'THREE PLACES'`
\["me.up_admin = 'up' AND me.up != 'up' AND me.type != 'propVirtual' AND "
\["me.up_admin = 'up' AND me.up != 'up' AND "
."(me.type IS NULL OR me.type !~* '^(53|ieee8023adLag|propVirtual|l2vlan|l3ipvlan|135|136|137)\$') AND "
."((age(now(), to_timestamp(extract(epoch from device.last_discover) - (device.uptime/100))) < ?::interval "
."AND (last_node.time_last IS NULL OR age(now(), last_node.time_last) > ?::interval)) "
."OR age(now(), to_timestamp(extract(epoch from device.last_discover) - (device.uptime - me.lastchange)/100)) > ?::interval)",
@@ -100,7 +101,10 @@ sub only_free_ports {
# NOTE this query is in `git grep 'THREE PLACES'`
'me.up_admin' => 'up',
'me.up' => { '!=' => 'up' },
'me.type' => { '!=' => 'propVirtual' },
'me.type' => [ '-or' =>
{ '=' => undef },
{ '!~*' => '^(53|ieee8023adLag|propVirtual|l2vlan|l3ipvlan|135|136|137)$' },
],
-or => [
-and => [
\["age(now(), to_timestamp(extract(epoch from device.last_discover) - (device.uptime/100))) < ?::interval",