Runner STM32 is working

Author: rleh

data/openocd_stm32f4_discovery.cfg

@@ -16,13 +16,14 @@
 class HwutRunnerStm32:
     def run_test(self):
         # Get test from server
-        r = requests.get(self.runner_base_url + '/get', auth=self.auth)
+        r = requests.get(self.runner_base_url + 'get', auth=self.auth)
         if r.status_code == 404:
-            # Currently no job available -> try again in 10 seconds
+            print('Currently no job available -> try again in 10 seconds')
             time.sleep(10)
             return True
         if r.status_code != 200:
             print('Error: unable to get job')
+            print('Error: ', r.text, ', ', r.content)
             return False
         json = r.json()
         if not ('id' in json and
@@ -44,6 +45,7 @@ def run_test(self):
         r = requests.get(executable_location, auth=self.auth)
         if r.status_code != 200:
             print('Error: unable to get executable')
+            print('Error: ', r.text, ', ', r.content)
             return False
         executable_filename = secrets.token_urlsafe(32)
         with open(os.path.join(FILE_STORAGE, executable_filename), 'wb') as f:
@@ -52,18 +54,23 @@ def run_test(self):
         print('starting job {}'.format(job_id))
 
         # confirm start
-        r = requests.post(self.runner_base_url + '/start', auth=self.auth)
+        r = requests.post(self.runner_base_url + 'start', auth=self.auth)
         if r.status_code != 204:
             # Report error
             print('Error: ', r.text, ', ', r.content)
             return False
 
         start_time = datetime.datetime.now()
 
+        # Avoid error if this script crashed previously
+        if not self.serial_port.is_open:
+            self.serial_port.close()
+
         # Start serial output log capture
         self.serial_port.baudrate = baudrate
         self.serial_port.open()
-        if not self.serial_port.is_open():
+        print(self.serial_port)
+        if not self.serial_port.is_open:
             # FIXME: abort test, report error to server
             print('Error: unable to open serial device')
             return False
@@ -72,37 +79,42 @@ def run_test(self):
         # Flash microcontroller
         # e.g. `openocd -f interface/stlink-v2-1.cfg -c "hla_serial 066BFF323637414257071840" -f target/stm32f4x.cfg \
         # -c "program nucleo-f411re.elf verify" -c "reset run" -c "shutdown"`
+
         openocd_stdout = subprocess.check_output([
             'openocd',
             '-f',
             'interface/{}.cfg'.format(self.programmer_type),
             '-c',
-            '"hla_serial {}'.format(self.programmer_id),
+            'hla_serial {}'.format(self.programmer_id),
             '-f',
             'target/{}.cfg'.format(self.openocd_target),
             '-c',
-            'program {} verify'.format(executable_filename),
+            'program {} verify'.format(os.path.join(FILE_STORAGE, executable_filename)),
             '-c',
             'reset run',
             '-c',
             'shutdown',
         ])
+        print(openocd_stdout)
         # FIXME: Output? Check return value? ...
 
         # Wait for timer to finish while reading serial data
-        serial_data = ''
+        serial_data = list()
         while (datetime.datetime.now() - start_time) < time_limit:
-            serial_data += self.serial_port.read_all()  # FIXME: There must be a better way...
+            serial_data.append(self.serial_port.read_all())
+
+        # Debug
+        print(b''.join(serial_data))
 
         # Upload logfile
-        r = requests.put(log_location, data=serial_data, auth=self.auth)
+        r = requests.put(log_location, data=b''.join(serial_data), auth=self.auth)
         if r.status_code != 204:
             # Report error
             print('Error: ', r.text, ', ', r.content)
             return False
 
         # mark job as finished
-        r = requests.post(self.runner_base_url + '/stop', auth=self.auth)
+        r = requests.post(self.runner_base_url + 'stop', auth=self.auth)
         if r.status_code != 204:
             # Report error
             print('Error: ', r.text, ', ', r.content)
@@ -111,6 +123,9 @@ def run_test(self):
         # remove executable file
         os.remove(os.path.join(FILE_STORAGE, executable_filename))
 
+        # close serial device
+        self.serial_port.close()
+
         return True
 
     def __init__(self):
@@ -145,9 +160,13 @@ def main(self):
         while True:
             try:
                 self.run_test()
+            except KeyboardInterrupt:
+                break
             except:
                 print('Error running test')
                 print("Unexpected error:", sys.exc_info()[0])
+            # For debugging
+            #time.sleep(5)
 
 
 if __name__ == "__main__":

hwut_runner/hwut_runner_stm32.py

@@ -18,7 +18,7 @@ def submit():
 
     duration_limit_seconds = 60
     if request.args.get('duration_limit_seconds'):
-        duration_limit_seconds = request.args.get('duration_limit_seconds')
+        duration_limit_seconds = int(request.args.get('duration_limit_seconds'))
     if duration_limit_seconds > 300:
         return abort(413, 'maximum execution time is 300 seconds')
 
@@ -79,13 +79,15 @@ def get(id):
 @mod.route('/<int:id>', methods=['DELETE'])
 @requires_authentication
 def cancel(id):
-    job = Jobs.query.filter(Jobs.id == id).one()
+    job = Jobs.query.filter(Jobs.id == id).first()
+    if job is None:
+        return abort(404)
     auth = request.authorization
     if not auth:
         return abort(401)
     if (check_authentication(auth.username, auth.password, superuser=True)) or (
             check_authentication(auth.username, auth.password) and auth.username == job.owner):
-        if job.status == JobStatus.WAITING:
+        if job.status == JobStatus.WAITING or job.status == JobStatus.RUNNING:
             job.status = JobStatus.CANCELED
             db.session.commit()
             return jsonify(job.to_dict(True)), 204

hwut_server/api/jobs.py

@@ -15,7 +15,7 @@ def check_authentication(username, password, superuser=False):
     :param superuser: additionally check if user is superuser
     """
     try:
-        user = Users.query.filter_by(name=username).one()
+        user = Users.query.filter(Users.name == username).one()
         if superuser:
             return user.verify_password(password) and user.is_superuser()
         else:
@@ -54,7 +54,7 @@ def decorated_function(*args, **kwargs):
 
 def check_runner_authentication(username, password):
     try:
-        runner = Runners.query.filter_by(id=username).one()
+        runner = Runners.query.filter(Runners.id == username).one()
         if runner.token == password and runner.enabled:
             return True
         else:

hwut_server/decorators.py

@@ -46,6 +46,8 @@ def to_dict(self, extended=False):
                 'ping_counter': self.ping_counter,
                 'job_counter': self.job_counter,
                 'busy': self.busy,
+                'board': self.target_board,
+                'microcontroller': self.target_microcontroller,
             }
         else:
             return {

hwut_server/models/runners.py

@@ -1,7 +1,7 @@
 import os
 from secrets import token_urlsafe
 
-from flask import Blueprint, jsonify, request, abort
+from flask import Blueprint, jsonify, request, abort, send_file, url_for
 from sqlalchemy import and_, or_
 from sqlalchemy.orm.exc import NoResultFound
 
@@ -10,7 +10,7 @@
 from hwut_server.models import Jobs, JobStatus, Runners
 from hwut_server.utils import FILE_STORAGE
 
-mod = Blueprint('runner_jobs', __name__)
+mod = Blueprint('runner_jobs', __name__, url_prefix='/runner_api')
 
 
 @mod.route('/get', methods=['GET'])
@@ -19,26 +19,23 @@ def job_get():
     """
     Get a new job
     """
-    runner = Runners.query.filter(id=request.authorization.username).one()
+    runner = Runners.query.filter(Runners.id == request.authorization.username).one()
 
     # check if a job is already queued for the runner
-    try:
-        job = Jobs.query.filter(and_(Jobs.runner == runner.id, Jobs.status == JobStatus.QUEUED)).one()
+    job = Jobs.query.filter(and_(Jobs.runner == runner.id, Jobs.status == JobStatus.QUEUED)).first()
     # Else queue a new job
-    except NoResultFound:
-        try:
-            filters = list()
-            filters.append(Jobs.status == JobStatus.WAITING)
-            filters.append(Jobs.microcontroller == runner.microcontroller)
-            filters.append(or_(Jobs.board == runner.board, Jobs.board == ''))
-            job = Jobs.query.filter(and_(*filters)).order_by(Jobs.created.desc()).first()
-        except NoResultFound:
+    if job is None:
+        #try:
+        filters = list()
+        filters.append(Jobs.status == JobStatus.WAITING)
+        filters.append(Jobs.microcontroller == runner.target_microcontroller)
+        filters.append(or_(Jobs.board == runner.target_board, Jobs.board == ''))
+        job = Jobs.query.filter(and_(*filters)).order_by(Jobs.created.desc()).first()
+        #except:
+        #    return abort(500)
+        if job is None:
             return '', 404
-        except:
-            return abort(500)
-
         runner.acquire()
-
         job.status = JobStatus.QUEUED
         job.runner = runner.id
 
@@ -47,9 +44,9 @@ def job_get():
 
     return jsonify({
         'id': job.id,
-        'executable_location': request.url_root + 'executable',
-        'log_location': request.url_root + 'log',
-        'other_location': request.url_root + 'other',
+        'executable_location': request.url_root[:-1] + url_for('runner_jobs.job_get_executable'),
+        'log_location': request.url_root[:-1] + url_for('runner_jobs.job_upload_log'),
+        'other_location': request.url_root[:-1] + url_for('runner_jobs.job_upload_other'),
         'time_limit': job.duration_limit_seconds,
         'baudrate': 115200,  # FIXME
     })
@@ -60,13 +57,15 @@ def job_get():
 def job_get_executable():
     runner_id = request.authorization.username
     try:
-        job = Jobs.query.filter(and_(Jobs.runner == runner_id, Jobs.status == JobStatus.RUNNING)).one()
+        job = Jobs.query.filter(and_(Jobs.runner == runner_id, Jobs.status == JobStatus.QUEUED)).one()
     except NoResultFound:
         return abort(400)
 
     if not job.filename_executable:
         return abort(409, 'executable file already exists')
 
+    return send_file(os.path.join('..', FILE_STORAGE, job.filename_executable))
+
 
 @mod.route('/start', methods=['POST'])
 @requires_runner_authentication
@@ -75,8 +74,15 @@ def job_start():
     Runner confirms job has stopped
     """
     runner_id = request.authorization.username
+
+    # mark any other job as finished
+    jobs = Jobs.query.filter(and_(Jobs.runner == runner_id, Jobs.status == JobStatus.RUNNING)).all()
+    for job in jobs:
+        job.status = JobStatus.ERROR
+    db.session.commit()
+
     try:
-        job = Jobs.query.filter(and_(Jobs.runner == runner_id, Jobs.status == JobStatus.RUNNING)).one()
+        job = Jobs.query.filter(and_(Jobs.runner == runner_id, Jobs.status == JobStatus.QUEUED)).one()
         job.status = JobStatus.RUNNING
         db.session.commit()
         return '', 204
@@ -90,9 +96,9 @@ def job_stop():
     """
     Runner confirms job is about to start
     """
-    runner = Runners.query.filter(id=request.authorization.username).one()
+    runner = Runners.query.filter(Runners.id == request.authorization.username).one()
     try:
-        job = Jobs.query.filter(and_(Jobs.runner == runner.id, Jobs.status == JobStatus.QUEUED)).one()
+        job = Jobs.query.filter(and_(Jobs.runner == runner.id, Jobs.status == JobStatus.RUNNING)).one()
         if request.args.get('error') and request.args.get('error') == '1':
             job.status = JobStatus.ERROR
         else: