Pass only metadata not all **kwargs

saltstack · Feb 22, 2019 · 0935932 · 0935932
1 parent ed49234
commit 0935932
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 23 deletions.
diff --git a/salt/cli/batch_async.py b/salt/cli/batch_async.py
@@ -62,9 +62,8 @@ def __init__(self, parent_opts, jid_gen, clear_load):
             clear_load['kwargs'].pop('batch'),
             self.local.opts,
             **clear_load)
-        self.kwargs = clear_load['kwargs']
         self.eauth = batch_get_eauth(clear_load['kwargs'])
-        self.kwargs.update(self.eauth)
+        self.metadata = clear_load['kwargs'].get('metadata', {})
         self.minions = set()
         self.down_minions = set()
         self.timedout_minions = set()
@@ -179,6 +178,7 @@ def start(self):
             ),
             gather_job_timeout=self.opts['gather_job_timeout'],
             jid=self.ping_jid,
+            metadata=self.metadata,
             **self.eauth)
         self.down_minions = set(ping_return['minions'])
 
@@ -187,28 +187,22 @@ def start_batch(self):
         if not self.initialized:
             self.batch_size = get_bnum(self.opts, self.minions, True)
             self.initialized = True
-            data = {}
-            data.update(self.kwargs)
-            data.update(
-                {
-                    "available_minions": self.minions,
-                    "down_minions": self.down_minions
-                }
-            )
+            data = {
+                "available_minions": self.minions,
+                "down_minions": self.down_minions,
+                "metadata": self.metadata
+            }
             self.event.fire_event(data, "salt/batch/{0}/start".format(self.batch_jid))
             yield self.schedule_next()
 
     def end_batch(self):
-        data = {}
-        data.update(self.kwargs)
-        data.update(
-            {
-                "available_minions": self.minions,
-                "down_minions": self.down_minions,
-                "done_minions": self.done_minions,
-                "timedout_minions": self.timedout_minions
-            }
-        )
+        data = {
+            "available_minions": self.minions,
+            "down_minions": self.down_minions,
+            "done_minions": self.done_minions,
+            "timedout_minions": self.timedout_minions,
+            "metadata": self.metadata
+        }
         self.event.fire_event(data, "salt/batch/{0}/done".format(self.batch_jid))
         self.event.remove_event_handler(self.__event_handler)
 
@@ -225,6 +219,6 @@ def schedule_next(self):
                 ret=self.opts.get('return', ''),
                 gather_job_timeout=self.opts['gather_job_timeout'],
                 jid=self.batch_jid,
-                **self.kwargs)
+                metadata=self.metadata)
             self.event.io_loop.call_later(self.opts['timeout'], self.find_job, set(next_batch))
             self.active = self.active.union(next_batch)
diff --git a/tests/unit/cli/test_batch_async.py b/tests/unit/cli/test_batch_async.py
@@ -71,13 +71,15 @@ def test_batch_fire_start_event(self):
         self.batch.minions = set(['foo', 'bar'])
         self.batch.opts = {'batch': '2', 'timeout': 5}
         self.batch.event = MagicMock()
+        self.batch.metadata = {'mykey': 'myvalue'}
         self.batch.start_batch()
         self.assertEqual(
             self.batch.event.fire_event.call_args[0],
             (
                 {
                     'available_minions': set(['foo', 'bar']),
-                    'down_minions': set()
+                    'down_minions': set(),
+                    'metadata': self.batch.metadata
                 },
                 "salt/batch/1235/start"
             )
@@ -97,6 +99,7 @@ def test_start_batch_calls_next(self):
     def test_batch_fire_done_event(self):
         self.batch.minions = set(['foo', 'bar'])
         self.batch.event = MagicMock()
+        self.batch.metadata = {'mykey': 'myvalue'}
         self.batch.end_batch()
         self.assertEqual(
             self.batch.event.fire_event.call_args[0],
@@ -105,7 +108,8 @@ def test_batch_fire_done_event(self):
                     'available_minions': set(['foo', 'bar']),
                     'done_minions': set(),
                     'down_minions': set(),
-                    'timedout_minions': set()
+                    'timedout_minions': set(),
+                    'metadata': self.batch.metadata
                 },
                 "salt/batch/1235/done"
             )