Change test layout in template and code

Add xrootd support
DHTC-Tools · May 14, 2014 · 3ed8e40 · 3ed8e40
1 parent 06fc174
commit 3ed8e40
Show file tree

Hide file tree

Showing 3 changed files with 104 additions and 121 deletions.
diff --git a/check.py b/check.py
@@ -4,82 +4,127 @@
 import sys
 import os
 import time
+import subprocess
 
 import jinja2
 import requests
 import paramiko
 
 ADMIN_MESG_LOCATION = "/tmp/admin_message"
 
-def test_login(test_name, host, user ):
-  response = [test_name, "OK", ""]
+def test_login(service, host, user ):
+  result = { 'service' : service,
+             'status' : "OK", 
+             'message' : '' }
   client = paramiko.client.SSHClient()
   try:
     client.set_missing_host_key_policy(paramiko.AutoAddPolicy())
     client.connect(hostname=host, port=22, username=user)
   except paramiko.AuthenticationException:
-    response = (test_name, "FAILED", "Can't authenticate to %s" % host)
+    result['status'] = 'FAILED'
+    result['message'] = "Can't authenticate to %s" % host
   except paramiko.SSHException:
-    response = (test_name, "FAILED", "Can't establish ssh connection to %s" % host)
+    result['status'] = 'FAILED'
+    result['message'] = "Can't establish ssh connection to %s" % host
   except socket.error:
-    response = (test_name, "FAILED", "Socket error connecting to %s" % host) 
-  return response
+    result['status'] = 'FAILED'
+    result['message'] = "Socket error connecting to %s" % host
+  return result
 
-def test_download(test_name, url, sha1):
-  response = [test_name, "OK", '']
+def test_download(service, url, sha1):
+  result = { 'service' : service,
+             'status' : "OK", 
+             'message' : '' }
   try:
     r = requests.get(url, timeout=60)
     if r.status_code != requests.codes.ok:
-      response[1] = "FAILED"
-      response[2] = "HTTP Status code: %s" % r.status_code
-      return response
+      result['status'] = "FAILED"
+      result['message'] = "HTTP Status code: %s" % r.status_code
+      return result
     if hashlib.sha1(r.text).hexdigest() != sha1:
-      response = (test_name, "FAILED", "File content doesn't match")
+      result['status'] = "FAILED"
+      result['message'] = "File content doesn't match"
   except requests.exceptions.Timeout:
-    response[1] = "FAILED"
-    response[2] = "Connection to server timed out"
+    result['status'] = "FAILED"
+    result['message'] = "Connection to server timed out"
   except requests.exceptions.ConnectionError:
-    response[1] = "FAILED"
-    response[2] = "Connection error"
+    result['status'] = "FAILED"
+    result['message'] = "Connection error"
   except requests.exceptions.HTTPError:
-    response[1] = "FAILED"
-    response[2] = "Invalid HTTP Response"
+    result['status'] = "FAILED"
+    result['message'] = "Invalid HTTP Response"
   except requests.exceptions:
-    response[1] = "FAILED"
-    response[2] = "Invalid HTTP Response"
+    result['status'] = "FAILED"
+    result['message'] = "Invalid HTTP Response"
 
-  return response
+  return result
+
+def test_xrootd(service, uri, sha1):
+  result = { 'service' : service,
+             'status' : "OK", 
+             'message' : '' } 
+  try:
+    print "run_xrdcp.sh %s /tmp/xrdcp.test" % uri
+    status = subprocess.call("./run_xrdcp.sh %s /tmp/xrdcp.test" % uri, shell=True)
+  except OSError:
+    result['status'] = "FAILED"
+    result['message'] = "xrdcp did not succeed"
+    return result
+  if status != 0 :
+    result['status'] = "FAILED"
+    result['message'] = "xrdcp did not succeed"
+    return result 
+  if hashlib.sha1(open("/tmp/xrdcp.test").read()).hexdigest() != sha1:
+    result['status'] = "FAILED"
+    result['message'] = "SHA1 hash does not match"
+  os.unlink("/tmp/xrdcp.test")
+
+  return result
 
-def test_xroot(test_name, uri, sha1):
-  response = (test_name, "OK", error)
 
-  return response
+def run_tests(output_file):
+  test_sites = []
+  osg_tests = { 'anchor' : 'OSG',
+                'set_name' : 'OSG Connect',
+                'tests' : { 'http' : ['Stash',
+                                      'http://stash.osgconnect.net/keys/cern.ch.pub',
+                                      '5b83bedef4c7ba38520d7e1b764f0cbc28527fb9'],
+                            'login' : ['SSH Login', 
+                                       'login.osgconnect.net',
+                                       'sthapa']
+                            }}
+  test_sites.append(osg_tests)
+  atlas_tests = { 'anchor' : 'ATLAS',
+                  'set_name' : 'ATLAS Connect',
+                  'tests' : { 'http' : ['Faxbox',
+                                        'http://faxbox.usatlas.org/keys/cern.ch.pub',
+                                        '5b83bedef4c7ba38520d7e1b764f0cbc28527fb9'],
+                              'login' : ['SSH Login', 
+                                         'login.usatlas.org',
+                                         'sthapa'],
+                              'xrootd' : ['Xrootd',
+                                          'root://faxbox.usatlas.org//user/sthapa/filelist',
+                                          'f5127d99e4c75967e1bb992cd7d275554b111d75']}}
+  test_sites.append(atlas_tests)
 
+  for site in test_sites:
+    site['results'] = []
+    for test in site['tests']:
+      if test == 'http':
+        site['results'].append(test_download(*site['tests'][test]))
+      elif test == 'login':
+        site['results'].append(test_login(*site['tests'][test]))
+      elif test == 'xrootd':
+        site['results'].append(test_xrootd(*site['tests'][test]))
 
-def run_tests():
-  http_results = []
-  http_hosts = [['Stash HTTP test', 
-                 'http://stash.osgconnect.net/keys/cern.ch.pub', 
-                 '5b83bedef4c7ba38520d7e1b764f0cbc28527fb9']]
-  ssh_results = []
-  ssh_hosts = [['OSG Connect login', 'login.osgconnect.net', 'sthapa'],
-               ['ATLAS Connect login', 'login.usatlas.org', 'sthapa']]
-
-  #xrdcp_hosts = [['FAXBOX', 'xrootd://faxbox.atlasconnect.net', 'sha1']]
-  for host in http_hosts:
-    http_results.append(test_download(*host))
-  for host in ssh_hosts:
-    ssh_results.append(test_login(*host))
   env = jinja2.Environment(loader=jinja2.FileSystemLoader( searchpath="." ))
   template = env.get_template('templates/status.html')
   admin_mesg = None
   if os.path.isfile(ADMIN_MESG_LOCATION):
     admin_mesg = open(ADMIN_MESG_LOCATION).read()
-  print template.render(http_results = http_results,
-                        ssh_results = ssh_results,
-                        xrootd_results = [],
-                        admin_mesg = admin_mesg,
-                        time = time.asctime())
+  open(output_file, 'w').write(template.render(test_sets = test_sites,
+                               admin_mesg = admin_mesg,
+                               time = time.asctime()))
 if __name__ == "__main__":
-   run_tests()
+   run_tests(sys.argv[1])
    sys.exit(0)
diff --git a/run_xrdcp.sh b/run_xrdcp.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+source ~/setupRoot.sh
+xrdcp $1 $2
diff --git a/templates/status.html b/templates/status.html
@@ -13,23 +13,25 @@
 
   <h2>System Status as of {{ time }}</h2>
 
-  {% if http_results %}
-  <h2> HTTP Status </h2>
+  {% for test_set in test_sets %}
+    {% if test_set %}
+  <a id="{{ test_set.anchor }}">&nbsp;</a>
+  <h2> {{ test_set.set_name }} </h2>
   <table>
     <thead>
       <tr>
-        <td>Test Name</td>
+        <td>Service</td>
         <td>Status</td>
         <td>Messages</td>
       </tr>
     </thead>
     <tbody>
-    {% for result in http_results %}
+    {% for result in test_set.results %}
       <tr>
         <td>
-          {{ result[0] }}
+          <a > {{ result.service }} </a>
         </td>
-        {% if result[1] == 'OK' %}
+        {% if result.status == 'OK' %}
         <td style="color:green">
           OK
         </td>
@@ -38,83 +40,16 @@ <h2> HTTP Status </h2>
           DOWN
         </td>
         {% endif %}
-        {% if result[2] %}
-        <td> {{ result[2] }} </td>
+        {% if result.message %}
+        <td> {{ result.message }} </td>
         {% else %}
         <td> &nbsp; </td>
         {% endif %} 
     {% endfor %}
     </tbody>
   </table>
-  {% endif %}
-  {% if ssh_results %}
-  <h2> SSH Status </h2>
-  <table>
-    <thead>
-      <tr>
-        <td>Test Name</td>
-        <td>Status</td>
-        <td>Messages</td>
-      </tr>
-    </thead>
-    <tbody>
-    {% for result in ssh_results %}
-      <tr>
-        <td>
-          {{ result[0] }}
-        </td>
-        {% if result[1] == 'OK' %}
-        <td style="color:green">
-          OK
-        </td>
-        {% else %}
-        <td style="color:red">
-          DOWN
-        </td>
-        {% endif %}
-        {% if result[2] %}
-        <td> {{ result[2] }} </td>
-        {% else %}
-        <td> &nbsp; </td>
-        {% endif %} 
-    {% endfor %}
-    </tbody>
-  </table>
-  {% endif %}
-  {% if xrootd_results %}
-  <h2> XRootd Status </h2>
-  <table>
-    <thead>
-      <tr>
-        <td>Test Name</td>
-        <td>Status</td>
-        <td>Messages</td>
-      </tr>
-    </thead>
-    <tbody>
-    {% for result in xrootd_results %}
-      <tr>
-        <td>
-          {{ result[0] }}
-        </td>
-        {% if result[1] == 'OK' %}
-        <td style="color:green">
-          OK
-        </td>
-        {% else %}
-        <td style="color:red">
-          DOWN
-        </td>
-        {% endif %}
-        {% if result[2] %}
-        <td> {{ result[2] }} </td>
-        {% else %}
-        <td> &nbsp; </td>
-        {% endif %} 
-    {% endfor %}
-    </tbody>
-  </table>
-  {% endif %}
+    {% endif %}
+  {% endfor %}
   {% if admin_mesg %}
   <h2> Administrative Messages</h2>
   <p>{{ admin_mesg }}</p>