Merge ~pwlars/testflinger-cli:cli-cancel-job into testflinger-cli:master

[Paul Larson]

Once the recent changes proposed for testflinger-server land, we can safely set the job state to something else. This is one example of that, but it doesn't do much until the agent actually looks for it to happen and does something like stopping execution.

[Maciej Kisielewski (kissiel)]

One question inline

review: Needs Information

[Paul Larson (pwlars)]

400 is bad request, and it was the closest match I could find. If you have a better one then I'm happy to change it, but it would also require a server-side change. The difference here is that the 204 would be sent if it doesn't find the job ID you specified. The 400 would be if you told it to look for something that doesn't even look like a valid job ID (ie. Not resembling a UUID)

[Maciej Kisielewski (kissiel)]

Right. I interpreted "Invalid job" in your message as of invalid value (similar to what you handle in 204) instead of 'type'. Makes more sense to me now, thanks.

review: Approve

diff --git a/testflinger-cli b/testflinger-cli
index 0f8b92c..7142e04 100755
--- a/testflinger-cli
+++ b/testflinger-cli
@@ -67,6 +67,34 @@ def status(ctx, job_id):
 
 
 @cli.command()
[e-mail]('job_id', nargs=1)
[e-mail]_context
+def cancel(ctx, job_id):
+    conn = ctx.obj['conn']
+    try:
+        job_state = conn.get_status(job_id)
+    except testflinger_cli.HTTPError as e:
+        if e.status == 204:
+            print('Job {} not found. Check the job id to be sure it is '
+                  'correct.'.format(job_id))
+        elif e.status == 400:
+            print('Invalid job id specified. Check the job id to be sure it '
+                  'is correct.')
+        if e.status == 404:
+            print('Received 404 error from server. Are you sure this '
+                  'is a testflinger server?')
+        sys.exit(1)
+    except Exception:
+        print('Error communicating with server, check connection and retry')
+        sys.exit(1)
+    if job_state in ('complete', 'cancelled'):
+        print('Job {} is already in {} state and cannot be cancelled.'.format(
+              job_id, job_state))
+        sys.exit(1)
+    conn.post_job_state(job_id, 'cancelled')
+
+
[e-mail]()
 @click.argument('filename', nargs=1)
 @click.option('--quiet', '-q', is_flag=True)
 @click.pass_context
diff --git a/testflinger_cli/__init__.py b/testflinger_cli/__init__.py
index 96ff880..1866b63 100644
--- a/testflinger_cli/__init__.py
+++ b/testflinger_cli/__init__.py
@@ -78,12 +78,25 @@ class Client():
             ID for the test job
         :return:
             String containing the job_state for the specified ID
-            (waiting, setup, provision, test, complete)
+            (waiting, setup, provision, test, reserved, released,
+             cancelled, complete)
         """
         endpoint = '/v1/result/{}'.format(job_id)
         data = json.loads(self.get(endpoint))
         return data.get('job_state')
 
+    def post_job_state(self, job_id, state):
+        """Post the status of a test job
+
+        :param job_id:
+            ID for the test job
+        :param state:
+            Job state to set for the specified job
+        """
+        endpoint = '/v1/result/{}'.format(job_id)
+        data = dict(job_state=state)
+        self.put(endpoint, data)
+
     def submit_job(self, job_data):
         """Submit a test job to the testflinger server