Add '--submit=<url>' param to run workflow via HTTP

Author: balis

bin/hflow.js

@@ -6,10 +6,9 @@ var docopt = require('docopt').docopt;
 
 var doc = "\
 Usage:\n\
-    hflow run <workflow_dir_or_file> [-s] [--persist] [--with-server] [--log-provenance] [--provenance-output=<provenance_file>] [-p <plugin_module_name> ...] [--var=<name=value> ...]\n\
+    hflow run <workflow_dir_or_file> [-s] [--submit=<hyperflow_server_url] [--persist] [--with-server] [--log-provenance] [--provenance-output=<provenance_file>] [-p <plugin_module_name> ...] [--var=<name=value> ...]\n\
     hflow recover <persistence-log> [-p <plugin_module_name> ...] [--var=<name=value> ...]\n\
     hflow start-server [-p <plugin_module_name> ...]\n\
-    hflow submit <workflow_dir_or_file> --url=<hyperflow_server_url> [-s] [--persist] [--log-provenance] [--provenance-output=<provenance_file>] [-p <plugin_module_name> ...] [--var=<name=value> ...]\n\
     hflow send <wf_id> ( <signal_file> | -d <signal_data> ) [-p <plugin_module_name> ...]\n\
     hflow -h | --help | --version";
 
@@ -21,7 +20,7 @@ if (opts['--version']) {
     process.exit(0);
 }
 
-if (opts.submit) {
+if (opts['--submit']) {
     hflowSubmit(opts);
     return;
 }
@@ -46,19 +45,22 @@ var hfroot = pathtool.join(require('path').dirname(require.main.filename), "..")
 // Workflow variables TODO: add support for config files
 
 if (opts.run) {
+    if (opts['--with-server']) {
+        hflowStartServer();
+    }
     hflowRun(opts, function(err, engine) { });
 } else if (opts.send) {
-    hflow_send();
+    hflowSend(opts);
 } else if (opts['start-server']) {
-    hflow_start();
+    hflowStartServer();
 } else if (opts.recover) {
     hflowRun(opts, function(err, engine) { });
 } /*else if (opts.submit) {
     hflowSubmit(opts);
 }*/
 
 function hflowSubmit(opts) {
-    let hfserver = opts['--url'],
+    let hfserver = opts['--submit'],
         url = hfserver + '/apps';
 
     axios({
@@ -71,14 +73,14 @@ function hflowSubmit(opts) {
     });
 }
 
-function hflow_start() {
+function hflowStartServer() {
     var server = require('../server/hyperflow-server.js')(rcl, wflib, plugins);
     let hostname = '127.0.0.1', port = process.env.PORT;
     server.listen(port,  () => { 
         console.log("HyperFlow server started, app factory URI: http://%s:%d/apps", server.address().address, server.address().port);
     });
 }
 
-function hflow_send() {
+function hflowSend(opts) {
     console.log("send signal to a workflow: not implemented");
 }