contest: hw: count and display reservation time

Signed-off-by: Jakub Kicinski <kuba@kernel.org>

Author: kuba-moo

contest/hw/hwksft.py

@@ -77,6 +77,8 @@ def test(binfo, rinfo, cbarg):  # pylint: disable=unused-argument
 
     tree_path = config.get('local', 'tree_path')
     mc_url = config.get('hw', 'machine_control_url')
+    executor_name = config.get('executor', 'name')
+    mc = MCClient(mc_url, caller=executor_name)
     nic_vendor = config.get('hw', 'nic_vendor')
     nic_model = config.get('hw', 'nic_model')
     mc = MCClient(mc_url)

contest/hw/lib/reservations.py

@@ -92,6 +92,7 @@ def reserve(self, caller, machine_ids, timeout=None):
             self.active[reservation_id] = {
                 'caller': caller,
                 'machine_ids': machine_ids,
+                'reserved_at': now,
                 'last_refresh': now,
                 'timeout': timeout,
             }

contest/hw/machine_control.py

@@ -114,6 +114,7 @@ def _recover_reservations(pool, mgr):
         mgr.active[rid] = {
             'caller': info['caller'],
             'machine_ids': info['machine_ids'],
+            'reserved_at': now,
             'last_refresh': now,
             'timeout': mgr.default_timeout,
         }
@@ -165,6 +166,9 @@ def get_machine_info():
             if mid in rinfo['machine_ids']:
                 info['reservation_id'] = rid
                 info['reserved_by'] = rinfo['caller']
+                elapsed = (datetime.datetime.now(datetime.UTC) -
+                           rinfo['reserved_at']).total_seconds()
+                info['reserved_secs'] = int(elapsed)
                 break
         result.append(info)
     return jsonify(result)

ui/status.js

@@ -1081,8 +1081,10 @@ function hw_machines_loaded(data)
     $.each(data, function(i, m) {
         var cell = row.insertCell();
         var state = m.state;
-        if (m.reserved_by)
-            state += " (" + m.reserved_by + ")";
+        if (m.reserved_by) {
+            var mins = Math.round(m.reserved_secs / 60);
+            state += " (" + m.reserved_by + ", " + mins + "m)";
+        }
         cell.innerText = state;
     });
 }