#897 port free should only apply to physical interfaces

2022-07-25 17:42:38 +01:00
parent 796aa1c6f0
commit a9b0d58b79
3 changed files with 19 additions and 8 deletions
--- a/lib/App/Netdisco/DB/ResultSet/Device.pm
+++ b/lib/App/Netdisco/DB/ResultSet/Device.pm
@@ -670,7 +670,10 @@ sub with_port_count {
              ->search(
                {
                  'dp.ip' => { -ident => 'me.ip' },
-                  'dp.type' => { '!=' => 'propVirtual' },
+                  'dp.type' => [ '-or' =>
+                    { '=' => undef },
+                    { '!~*' => '^(53|ieee8023adLag|propVirtual|l2vlan|l3ipvlan|135|136|137)$' },
+                  ],
                },
                { alias => 'dp' }
              )->count_rs->as_query,