Remove reservation checks from serve_overview

webservice/serve_overview.py

@@ -12,7 +12,7 @@ from typing import Optional
 import yaml
 from jinja2 import Template
 
-from xfel_calibrate.settings import free_nodes_cmd, preempt_nodes_cmd, reservation # noqa: E501
+from xfel_calibrate.settings import free_nodes_cmd, preempt_nodes_cmd
 
 from .config import serve_overview as config
 
@@ -159,16 +159,6 @@ class RequestHandler(BaseHTTPRequestHandler):
         preempt = int(check_output(
             preempt_nodes_cmd, shell=True).decode('utf8'))
         nodes_avail_general = free + preempt
-        ret = check_output(self.nodes_avail_res_cmd.format(reservation),
-                           shell=True).decode('utf8')
-        ures = ret.split("/")
-        if len(ures) == 2:
-            used, reserved = ures
-        else:
-            used = 0
-            reserved = 0
-        nodes_avail_gr = "{}/{}".format(int(reserved) - int(used),
-                                        reserved)
         total_jobs_running = check_output(self.total_jobs_cmd, shell=True)
         total_jobs_running = total_jobs_running.decode('utf8').split("/")[0]
 
@@ -187,16 +177,11 @@ class RequestHandler(BaseHTTPRequestHandler):
                                              reserved)
             upex_reservations[res] = nodes_avail_res
 
-        recommendation = "DON'T SUBMIT TO RESERVATION"
-        if nodes_avail_general < int(reserved) - int(used):
-            "CONSIDER SUBMITTING TO RESERVATION"
-
         tmpl = Template(self.templates["maxwell-status"])
         maxwell_status_r = tmpl.render(nodes_avail_general=nodes_avail_general,
-                                       nodes_avail_general_res=nodes_avail_gr,
                                        total_jobs_running=total_jobs_running,
                                        upex_reservations=upex_reservations,
-                                       recommendation=recommendation)
+                                      )
 
         last_n_lines = check_output(self.tail_log_cmd,
                                     shell=True).decode('utf8').split("\n")

webservice/templates/maxwell_status.html

@@ -14,16 +14,12 @@
         <dd>{{ total_jobs_running }}</dd>
         <dt>Nodes available on general partition</dt>
         <dd>{{ nodes_avail_general }}</dd>
-        <dt>Nodes available on general reservation</dt>
-        <dd>{{ nodes_avail_general_res }}</dd>
         {% for res, avail in upex_reservations.items() %}
             <dt>Nodes available on {{ res }}</dt>
             <dd>{{ avail }}</dd>
         {% endfor %}
-        <dt>Recommendation</dt>
-        <dd>{{ recommendation }}</dd>
     </dl>
-<p><b>Note:</b> This is only a hint! Maxwell status can change quickly, so the feedback here
+<p><b>Note:</b> Maxwell status can change quickly, so the feedback here
    can rapidly become outdated.
 </p>
 </div>