Add parsing of params in bulk file

src/fts3/cli/jobsubmitter.py

@@ -172,7 +172,8 @@ class JobSubmitter(Base):
 
     def _build_transfers(self):
         if self.options.bulk_file:
-            filecontent = open(self.options.bulk_file).read()
+            with open(self.options.bulk_file, 'r') as file:
+                filecontent = file.read()
                 bulk = json.loads(filecontent)
             if "files" in bulk:
                 return bulk["files"]
@@ -184,6 +185,15 @@ class JobSubmitter(Base):
         else:
             return [{"sources": [self.source], "destinations": [self.destination]}]
 
+    def _build_params(self):
+        with open(self.options.bulk_file, 'r') as file:
+            filecontent = file.read()
+            bulk = json.loads(filecontent)
+        params = None
+        if 'params' in bulk:
+            params = bulk['params']
+        return params
+
     def _do_submit(self, context):
         #Backwards compatibility: compare_checksum parameter
         if self.options.compare_checksum:
@@ -213,7 +223,8 @@ class JobSubmitter(Base):
         submitter = Submitter(context)
 
         job_id = submitter.submit(
-            self._build_transfers(),
+            transfers=self._build_transfers(),
+            params=self._build_params(),
             checksum=self.checksum,
             bring_online=self.options.bring_online,
             archive_timeout=self.options.archive_timeout,

src/fts3/rest/client/submitter.py

@@ -27,9 +27,11 @@ class Submitter(object):
         self.context = context
 
     @staticmethod
-    def build_submission(transfers=None, delete=None, staging=None, **kwargs):
+    def build_submission(transfers=None, delete=None, staging=None, params=None, **kwargs):
         job = dict()
-
+        if params:
+            job['params'] = params
+        else:
             job['params'] = dict()
         job['params'].update(kwargs)
 
@@ -55,8 +57,11 @@ class Submitter(object):
 
         return json.dumps(job, indent=2)
 
-    def submit(self, transfers=None, delete=None, **kwargs):
-        job = Submitter.build_submission(transfers, delete, **kwargs)
+    def submit(self, transfers=None, delete=None, params=None, **kwargs):
+        job = Submitter.build_submission(transfers=transfers,
+                                         delete=delete,
+                                         params=params,
+                                         **kwargs)
         r = json.loads(self.context.post_json('/jobs', job))
         return r['job_id']