Merge pull request #99 from shtripat/node-ids-in-job-1

Made node_id an optional argument to Manager
Tendrl · Jan 11, 2017 · ea34779 · ea34779
2 parents 8b8d98b + 64576be
commit ea34779
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/tendrl/commons/manager/manager.py b/tendrl/commons/manager/manager.py
@@ -34,11 +34,11 @@ def __init__(
             self,
             name,
             integration_id,
-            node_id,
             config,
             events,
             persister_thread,
-            defs_dir
+            defs_dir,
+            node_id=None
     ):
         self.name = name
         self._config = config

diff --git a/tendrl/commons/tests/test_manager.py b/tendrl/commons/tests/test_manager.py
@@ -13,20 +13,20 @@ def __init__(
             self,
             name,
             integration_id,
-            node_id,
             config,
             events,
             persister_thread,
-            defs_dir
+            defs_dir,
+            node_id=None,
     ):
         super(MyManager, self).__init__(
             name,
             integration_id,
-            node_id,
             config,
             events,
             persister_thread,
-            defs_dir
+            defs_dir,
+            node_id=node_id,
         )
 
     def on_pull(self, raw_data, cluster_id):
@@ -38,11 +38,11 @@ def setup_method(self, method):
         self.manager = MyManager(
             "dummymodule",
             'aa22a6fe-87f0-45cf-8b70-2d0ff4c02af6',
-            'aa22a6fe-87f0-45cf-8b70-2d0ff4c02bf7',
             MagicMock(),
             MagicMock(),
             MagicMock(),
-            "dummypath"
+            "dummypath",
+            node_id='aa22a6fe-87f0-45cf-8b70-2d0ff4c02bf7'
         )
 
     def test_manager_constructor(self):