revised worker flags

1 files changed, 43 insertions, 33 deletions

diff --git a/src/flufigut.py b/src/flufigut.py
index 784c4ab..aa5d2ce 100755
--- a/src/flufigut.py
+++ b/src/flufigut.py
@@ -172,14 +172,14 @@ class Planet:
                 'name': worker.name,
                 'subs': {},
                 'password': rand_string(size=20),
-                'flags': []
+                'flags': {}
             }
             if not worker.subname:
                 return
 
             self.workers[worker.name]['subs'][worker.subname] = {
                 'fullname': str(worker),
-                'flags': []
+                'flags': {}
             }
             return
 
@@ -189,14 +189,24 @@ class Planet:
         if worker.subname not in self.workers[worker.name]['subs']:
             self.workers[worker.name]['subs'][worker.subname] = {
                 'fullname': str(worker),
-                'flags': []
+                'flags': {}
             }
 
-    def __set_worker_flags(self, worker, flag):
-        if flag not in self.workers[worker.name]['flags']:
-            self.workers[worker.name]['flags'].append(flag)
-        if worker.subname and flag not in self.workers[worker.name]['subs'][worker.subname]['flags']:
-            self.workers[worker.name]['subs'][worker.subname]['flags'].append(flag)
+    def __add_worker_flag(self, worker, flag_name, flag):
+        if flag_name not in self.workers[worker.name]['flags']:
+            self.workers[worker.name]['flags'][flag_name] = [flag]
+        else:
+            if flag not in self.workers[worker.name]['flags'][flag_name]:
+                self.workers[worker.name]['flags'][flag_name].append(flag)
+
+        if not worker.subname:
+            return
+
+        if flag_name not in self.workers[worker.name]['subs'][worker.subname]['flags']:
+            self.workers[worker.name]['subs'][worker.subname]['flags'][flag_name] = [flag]
+        else:
+            if flag not in self.workers[worker.name]['subs'][worker.subname]['flags'][flag_name]:
+                self.workers[worker.name]['subs'][worker.subname]['flags'][flag_name].append(flag)
 
     def __get_worker(self, comp_name):
         match_prefix_len = 0
@@ -251,7 +261,7 @@ class Planet:
             if input['master']:
                 master_cnt += 1
 
-            self.__set_worker_flags(worker, "input-%s" % input['type'])
+            self.__add_worker_flag(worker, "input", source)
             self.__set_input_properties(comp_name, input['properties'])
 
         if master_cnt == 0:
@@ -553,7 +563,7 @@ class Planet:
                 if prop not in ['mux', 'format', 'profile']:
                     self.flow['recorders'][comp_name]['properties'][prop] = record[prop]
 
-            self.__set_worker_flags(worker, "record-%s" % record_name)
+            self.__add_worker_flag(worker, "record", record_name)
     #
     # all
 
@@ -697,29 +707,29 @@ if __name__ == '__main__':
                 print("- " + c)
             sys.exit(1)
 
-        # print("****************************************************")
-        # print("** atmosphere **")
-        # print("**")
-        # __pp.pprint(p.atmosphere)
-        # print("**")
-        # print("**************************")
-        # print("** planet **")
-        # print("**")
-        # __pp.pprint(p.flow)
-        # print("**")
-        # print("**************************")
-        # print("** _workers_ **")
-        # print("**")
-        # __pp.pprint(p.workers)
-        # print("**")
-        # print("****************************************************")
-
-        k8s = K8sDeployment(d, p)
-        print("wiping exisiting namespace ...")
-        k8s.wipe()
-        print("deploying new planet ...")
-        k8s.deploy('../templates')
-        print("done.")
+        print("****************************************************")
+        print("** atmosphere **")
+        print("**")
+        __pp.pprint(p.atmosphere)
+        print("**")
+        print("**************************")
+        print("** planet **")
+        print("**")
+        __pp.pprint(p.flow)
+        print("**")
+        print("**************************")
+        print("** _workers_ **")
+        print("**")
+        __pp.pprint(p.workers)
+        print("**")
+        print("****************************************************")
+
+        # k8s = K8sDeployment(d, p)
+        # print("wiping exisiting namespace ...")
+        # k8s.wipe()
+        # print("deploying new planet ...")
+        # k8s.deploy('../templates')
+        # print("done.")
 
     except Exception as e:
         print("ERROR: while running app: %s" % e)