Merge branch 'master' into og-multiple-domain-suffix

lib/App/Netdisco/DB/Result/DevicePort.pm

@@ -242,6 +242,23 @@ __PACKAGE__->belongs_to( neighbor_alias => 'App::Netdisco::DB::Result::DeviceIp'
   { join_type => 'LEFT' },
 );
 
+=head2 last_node
+
+This relationship will return the last node that was seen on the port.
+
+The JOIN is of type "LEFT" in case there isn't any such node.
+
+=cut
+
+__PACKAGE__->belongs_to(
+    last_node => 'App::Netdisco::DB::Result::Virtual::LastNode', {
+      'foreign.switch' => 'self.ip',
+      'foreign.port'   => 'self.port',
+    }, {
+      join_type => 'LEFT',
+    }
+);
+
 =head2 vlans
 
 As compared to C<port_vlans>, this relationship returns a set of Device VLAN

lib/App/Netdisco/DB/Result/User.pm

@@ -29,6 +29,8 @@ __PACKAGE__->add_columns(
   { data_type => "boolean", default_value => \"false", is_nullable => 1 },
   "ldap",
   { data_type => "boolean", default_value => \"false", is_nullable => 1 },
+  "radius",
+  { data_type => "boolean", default_value => \"false", is_nullable => 1 },
   "admin",
   { data_type => "boolean", default_value => \"false", is_nullable => 1 },
   "fullname",

lib/App/Netdisco/DB/Result/Virtual/LastNode.pm

@@ -0,0 +1,54 @@
+package App::Netdisco::DB::Result::Virtual::LastNode;
+
+use strict;
+use warnings;
+
+use base 'DBIx::Class::Core';
+
+__PACKAGE__->table_class('DBIx::Class::ResultSource::View');
+
+__PACKAGE__->table('last_node');
+__PACKAGE__->result_source_instance->is_virtual(1);
+__PACKAGE__->result_source_instance->view_definition(<<ENDSQL
+  SELECT DISTINCT ON (switch, port) * FROM node
+    ORDER BY switch, port, time_last desc
+ENDSQL
+);
+
+__PACKAGE__->add_columns(
+  "mac",
+  { data_type => "macaddr", is_nullable => 0 },
+  "switch",
+  { data_type => "inet", is_nullable => 0 },
+  "port",
+  { data_type => "text", is_nullable => 0 },
+  "active",
+  { data_type => "boolean", is_nullable => 1 },
+  "oui",
+  { data_type => "varchar", is_nullable => 1, size => 8 },
+  "time_first",
+  {
+    data_type     => "timestamp",
+    default_value => \"current_timestamp",
+    is_nullable   => 1,
+    original      => { default_value => \"now()" },
+  },
+  "time_recent",
+  {
+    data_type     => "timestamp",
+    default_value => \"current_timestamp",
+    is_nullable   => 1,
+    original      => { default_value => \"now()" },
+  },
+  "time_last",
+  {
+    data_type     => "timestamp",
+    default_value => \"current_timestamp",
+    is_nullable   => 1,
+    original      => { default_value => \"now()" },
+  },
+  "vlan",
+  { data_type => "text", is_nullable => 0, default_value => '0' },
+);
+
+1;

lib/App/Netdisco/DB/Result/Virtual/PortUtilization.pm

@@ -7,6 +7,7 @@ use base 'DBIx::Class::Core';
 
 __PACKAGE__->table_class('DBIx::Class::ResultSource::View');
 
+# NOTE this query is in `git grep 'THREE PLACES'`
 __PACKAGE__->table('port_utilization');
 __PACKAGE__->result_source_instance->is_virtual(1);
 __PACKAGE__->result_source_instance->view_definition(<<ENDSQL
@@ -17,11 +18,23 @@ __PACKAGE__->result_source_instance->view_definition(<<ENDSQL
               ELSE 0 END) as ports_in_use,
      sum(CASE WHEN (dp.type != 'propVirtual' AND dp.up_admin != 'up') THEN 1
               ELSE 0 END) as ports_shutdown,
-     sum(CASE WHEN (dp.type != 'propVirtual' AND dp.up_admin = 'up' AND dp.up != 'up'
-                    AND ( age(now(), to_timestamp(extract(epoch from d.last_discover) - (d.uptime - dp.lastchange)/100)) > ?::interval  )) THEN 1
-              ELSE 0 END) as ports_free
-   FROM device d LEFT JOIN device_port dp
+     sum(CASE
+      WHEN ( dp.type != 'propVirtual' AND dp.up_admin = 'up' AND dp.up != 'up'
+             AND (age(now(), to_timestamp(extract(epoch from d.last_discover) - (d.uptime/100))) < ?::interval)
+             AND (last_node.time_last IS NULL OR (age(now(), last_node.time_last)) > ?::interval) )
+        THEN 1
+      WHEN ( dp.type != 'propVirtual' AND dp.up_admin = 'up' AND dp.up != 'up'
+             AND (age(now(), to_timestamp(extract(epoch from d.last_discover) - (d.uptime - dp.lastchange)/100)) > ?::interval) )
+        THEN 1
+      ELSE 0
+     END) as ports_free
+   FROM device d
+   LEFT JOIN device_port dp
      ON d.ip = dp.ip
+   LEFT JOIN
+     ( SELECT DISTINCT ON (switch, port) * FROM node
+         ORDER BY switch, port, time_last desc ) AS last_node
+     ON dp.port = last_node.port AND dp.ip = last_node.switch
    GROUP BY d.dns, d.ip
    ORDER BY d.dns, d.ip
 ENDSQL

lib/App/Netdisco/DB/Result/Virtual/UserRole.pm

@@ -20,6 +20,9 @@ __PACKAGE__->result_source_instance->view_definition(<<ENDSQL
   SELECT username, 'ldap' AS role FROM users
     WHERE ldap
   UNION
+  SELECT username, 'radius' AS role FROM users
+    WHERE radius
+  UNION
   SELECT username, 'api' AS role FROM users
     WHERE token IS NOT NULL AND token_from IS NOT NULL
 ENDSQL