cylc#1872: comms layer migration to HTTPS

bin/cylc-broadcast

@@ -202,7 +202,7 @@ def main():
                 name, point_string = TaskID.split(options.showtask)
             except ValueError:
                 parser.error("TASKID must be " + TaskID.SYNTAX)
-        settings = pclient.broadcast('get', options.showtask)
+        settings = pclient.broadcast('get', task_id=options.showtask)
         padding = get_padding(settings) * ' '
         if options.raw:
             print str(settings)
@@ -212,15 +212,17 @@ def main():
 
     if options.clear:
         modified_settings, bad_options = pclient.broadcast(
-            'clear', options.point_strings, options.namespaces)
+            'clear', point_strings=options.point_strings,
+            namespaces=options.namespaces
+        )
         if modified_settings:
             print get_broadcast_change_report(
                 modified_settings, is_cancel=True)
         sys.exit(get_broadcast_bad_options_report(bad_options))
 
     if options.expire:
         modified_settings, bad_options = pclient.broadcast(
-            'expire', options.expire)
+            'expire', cutoff=options.expire)
         if modified_settings:
             print get_broadcast_change_report(
                 modified_settings, is_cancel=True)
@@ -249,7 +251,9 @@ def main():
             validate(setting, SPEC['runtime']['__MANY__'])
             settings.append(setting)
         modified_settings, bad_options = pclient.broadcast(
-            'clear', point_strings, namespaces, settings)
+            'clear', point_strings=point_strings,
+            namespaces=namespaces, cancel_settings=settings
+        )
         if modified_settings:
             print get_broadcast_change_report(
                 modified_settings, is_cancel=True)
@@ -270,7 +274,9 @@ def main():
             validate(setting, SPEC['runtime']['__MANY__'])
             settings.append(setting)
         modified_settings, bad_options = pclient.broadcast(
-            'put', point_strings, namespaces, settings)
+            'put', point_strings=point_strings,
+            namespaces=namespaces, settings=settings
+        )
         print get_broadcast_change_report(modified_settings)
         sys.exit(get_broadcast_bad_options_report(bad_options, is_set=True))
 

bin/cylc-hold

@@ -66,11 +66,13 @@ def main():
         options.port, options.db, my_uuid=options.set_uuid,
         print_uuid=options.print_uuid)
     if args:
-        items, compat = parser.parse_multitask_compat(options, args)
-        pclient.put_command('hold_task', items, compat)
+        items = parser.parse_multitask_compat(options, args)
+        pclient.put_command('hold_tasks', items=items)
     elif options.hold_point_string:
         pclient.put_command(
-            'hold_after_point_string', options.hold_point_string)
+            'hold_after_point_string',
+            point_string=options.hold_point_string
+        )
     else:
         pclient.put_command('hold_suite')
 

bin/cylc-insert

@@ -68,14 +68,13 @@ def main():
     if (options.multitask_compat and len(args) in [2, 3] and
             all(["/" not in arg for arg in args]) and
             all(["." not in arg for arg in args[1:]])):
-        items, compat = (args[0], args[1])
+        items = [(args[0] + "." + args[1])]
         if len(args) == 3:
             options.stop_point_string = args[2]
         prompt(
-            'Insert %s at %s in %s' % (items, compat, suite),
-            options.force)
+            'Insert %s in %s' % (items, suite), options.force)
     else:
-        items, compat = (args, None)
+        items = args
         for i, item in enumerate(items):
             if not TaskID.is_valid_id_for_insert(item):
                 sys.exit('ERROR: "%s": invalid task ID (argument %d)' % (
@@ -88,7 +87,9 @@ def main():
         print_uuid=options.print_uuid)
 
     pclient.put_command(
-        'insert_task', items, compat, None, options.stop_point_string)
+        'insert_tasks', items=items,
+        stop_point_string=options.stop_point_string
+    )
 
 
 if __name__ == "__main__":

bin/cylc-kill

@@ -55,8 +55,8 @@ def main():
         suite, options.owner, options.host, options.pyro_timeout,
         options.port, options.db, my_uuid=options.set_uuid,
         print_uuid=options.print_uuid)
-    items, compat = parser.parse_multitask_compat(options, args)
-    pclient.put_command('kill_tasks', items, compat)
+    items = parser.parse_multitask_compat(options, args)
+    pclient.put_command('kill_tasks', items=items)
 
 
 if __name__ == "__main__":

bin/cylc-ping

@@ -31,7 +31,7 @@ if '--use-ssh' in sys.argv[1:]:
 import cylc.flags
 from cylc.CylcOptionParsers import cop
 from cylc.task_id import TaskID
-from cylc.network.suite_info import SuiteInfoClient
+from cylc.network.suite_info import SuiteInfoClientAnon
 from cylc.cfgspec.globalcfg import GLOBAL_CFG
 
 
@@ -55,11 +55,10 @@ def main():
 
     suite = args[0]
 
-    pclient = SuiteInfoClient(
+    pclient = SuiteInfoClientAnon(
         suite, options.owner, options.host, options.pyro_timeout,
         options.port, options.db, my_uuid=options.set_uuid,
         print_uuid=options.print_uuid)
-    pclient.set_use_scan_hash()
 
     # cylc ping SUITE
     pclient.get_info('ping_suite')  # (no need to check the result)
@@ -72,7 +71,7 @@ def main():
     task_id = args[1]
     if not TaskID.is_valid_id(task_id):
         sys.exit("Invalid task ID: " + task_id)
-    success, msg = pclient.get_info('ping_task', task_id)
+    success, msg = pclient.get_info('ping_task', task_id=task_id)
     if not success:
         sys.exit('ERROR: ' + msg)
 

bin/cylc-poll

@@ -62,8 +62,8 @@ def main():
         suite, options.owner, options.host, options.pyro_timeout,
         options.port, options.db, my_uuid=options.set_uuid,
         print_uuid=options.print_uuid)
-    items, compat = parser.parse_multitask_compat(options, args)
-    pclient.put_command('poll_tasks', items, compat)
+    items = parser.parse_multitask_compat(options, args)
+    pclient.put_command('poll_tasks', items=items)
 
 
 if __name__ == "__main__":

bin/cylc-release

@@ -57,8 +57,8 @@ def main():
         options.port, options.db, my_uuid=options.set_uuid,
         print_uuid=options.print_uuid)
     if args:
-        items, compat = parser.parse_multitask_compat(options, args)
-        pclient.put_command('release_task', items, compat)
+        items = parser.parse_multitask_compat(options, args)
+        pclient.put_command('release_tasks', items=items)
     else:
         pclient.put_command('release_suite')
 

bin/cylc-remove

@@ -57,8 +57,8 @@ def main():
         suite, options.owner, options.host, options.pyro_timeout,
         options.port, options.db, my_uuid=options.set_uuid,
         print_uuid=options.print_uuid)
-    items, compat = parser.parse_multitask_compat(options, args)
-    pclient.put_command('remove_task', items, compat, options.spawn)
+    items = parser.parse_multitask_compat(options, args)
+    pclient.put_command('remove_tasks', items=items, spawn=options.spawn)
 
 
 if __name__ == "__main__":

bin/cylc-reset

@@ -80,8 +80,9 @@ def main():
         suite, options.owner, options.host, options.pyro_timeout,
         options.port, options.db, my_uuid=options.set_uuid,
         print_uuid=options.print_uuid)
-    items, compat = parser.parse_multitask_compat(options, args)
-    pclient.put_command('reset_task_state', items, compat, options.state)
+    items = parser.parse_multitask_compat(options, args)
+    pclient.put_command(
+        'reset_task_states', items=items, state=options.state)
 
 
 if __name__ == "__main__":

bin/cylc-set-runahead

@@ -59,7 +59,7 @@ def main():
     if runahead:
         prompt('Change runahead limit in %s to %s' % (suite, runahead),
                options.force)
-        pclient.put_command('set_runahead', runahead)
+        pclient.put_command('set_runahead', interval=runahead)
     else:
         # no limit!
         prompt('Change runahead limit in %s to NO LIMIT' % suite,

bin/cylc-set-verbosity

@@ -70,7 +70,7 @@ def main():
         options.port, options.db, my_uuid=options.set_uuid,
         print_uuid=options.print_uuid)
 
-    pclient.put_command('set_verbosity', priority)
+    pclient.put_command('set_verbosity', level=priority)
 
 
 if __name__ == "__main__":

bin/cylc-show

@@ -30,7 +30,7 @@ if '--use-ssh' in sys.argv[1:]:
         sys.exit(0)
 
 import cylc.flags
-from cylc.network.suite_info import SuiteInfoClient
+from cylc.network.suite_info import SuiteInfoClient, SuiteInfoClientAnon
 from cylc.CylcOptionParsers import cop
 from cylc.task_id import TaskID
 
@@ -47,7 +47,8 @@ def main():
     pclient = SuiteInfoClient(
         suite, options.owner, options.host, options.pyro_timeout,
         options.port, options.db, my_uuid=options.set_uuid,
-        print_uuid=options.print_uuid)
+        print_uuid=options.print_uuid
+    )
 
     if len(args) == 1:
         # Print suite info.
@@ -67,14 +68,16 @@ def main():
         # Print task instance info.
         task_id = arg
 
-    info = pclient.get_info('get_task_info', name)
+    info = pclient.get_info('get_task_info', name=name)
     if not info:
         sys.exit("ERROR: task not found: %s" % name)
     for key, value in sorted(info.items(), reverse=True):
         print "%s: %s" % (key, value or "(not given)")
 
     if point_string is not None:
-        result = pclient.get_info('get_task_requisites', name, point_string)
+        result = pclient.get_info('get_task_requisites',
+                                  name=name,
+                                  point_string=point_string)
         if not result:
             sys.exit("ERROR: task instance not found: %s" % task_id)
 

bin/cylc-spawn

@@ -52,8 +52,8 @@ def main():
         suite, options.owner, options.host, options.pyro_timeout,
         options.port, options.db, my_uuid=options.set_uuid,
         print_uuid=options.print_uuid)
-    items, compat = parser.parse_multitask_compat(options, args)
-    pclient.put_command('spawn_tasks', items, compat)
+    items = parser.parse_multitask_compat(options, args)
+    pclient.put_command('spawn_tasks', items=items)
 
 
 if __name__ == "__main__":

bin/cylc-stop

@@ -59,8 +59,9 @@ class stop_poller(poller):
 
     def load(self):
         self.pclient = SuiteInfoClient(
-            self.args['suite'], self.args['owner'], self.args['host'],
-            self.args['pyro_timeout'], self.args['port'], self.args['db'])
+            self.args['suite'], owner=self.args['owner'],
+            host=self.args['host'], timeout=self.args['pyro_timeout'],
+            port=self.args['port'], db=self.args['db'])
 
     def check(self):
         # return True if suite has stopped (success) else False
@@ -148,13 +149,19 @@ def main():
 
     if method:
         prompt(prompt_text + ' for ' + suite, options.force)
-        pclient.put_command(method, shutdown_arg)
+        if method == 'set_stop_after_clock_time':
+            pclient.put_command(method, datetime_string=shutdown_arg)
+        if method == 'set_stop_after_task':
+            pclient.put_command(method, task_id=shutdown_arg)
+        if method == 'set_stop_after_point':
+            pclient.put_command(method, point_string=shutdown_arg)
     elif options.now:
         prompt('Shut down %s now' % suite, options.force)
         pclient.put_command('stop_now')
     else:
         prompt('Shut down %s' % suite, options.force)
-        pclient.put_command('set_stop_cleanly', options.kill)
+        pclient.put_command('set_stop_cleanly',
+                            kill_active_tasks=options.kill)
 
     if int(options.max_polls) > 0:
         # (test to avoid the "nothing to do" warning for # --max-polls=0)

bin/cylc-trigger

@@ -89,23 +89,21 @@ def main():
         print_uuid=options.print_uuid)
 
     if options.edit_run:
-        items, compat = parser.parse_multitask_compat(options, args)
-        if compat:
-            task_id = TaskID.get(items, compat)
-        else:
-            task_id = args[0]
+        items = parser.parse_multitask_compat(options, args)
+        task_id = items[0]
         # Check that TASK is a unique task.
         info_client = SuiteInfoClient(
             suite, options.owner, options.host, options.pyro_timeout,
             options.port, options.db, my_uuid=cmd_client.my_uuid)
-        success, msg = info_client.get_info('ping_task', task_id, True)
+        success, msg = info_client.get_info(
+            'ping_task', task_id=task_id, exists_only=True)
         if not success:
             sys.exit('ERROR: %s' % msg)
 
         # Get the job filename from the suite daemon - the task cycle point may
         # need standardising to the suite cycle point format.
         jobfile_path, compat = info_client.get_info(
-            'get_task_jobfile_path', task_id)
+            'get_task_jobfile_path', task_id=task_id)
         if not jobfile_path:
             sys.exit('ERROR: task not found')
 
@@ -124,7 +122,7 @@ def main():
             old_mtime = None
 
         # Tell the suite daemon to generate the job file.
-        cmd_client.put_command('dry_run_task', [task_id])
+        cmd_client.put_command('dry_run_tasks', items=[task_id])
 
         # Wait for the new job file to be written. Use mtime because the same
         # file could potentially exist already, left from a previous run.
@@ -194,8 +192,8 @@ def main():
                     sys.exit(0)
 
     # Trigger the task proxy(s).
-    items, compat = parser.parse_multitask_compat(options, args)
-    cmd_client.put_command('trigger_task', items, compat)
+    items = parser.parse_multitask_compat(options, args)
+    cmd_client.put_command('trigger_tasks', items=items)
 
 
 if __name__ == "__main__":