Changeset 43197eb for fedd/federation/experiment_partition.py

Timestamp:

Apr 16, 2010 8:16:22 AM (14 years ago)

Author:

Ted Faber <faber@…>

Branches:

axis_example, compt_changes, info-ops, master, version-3.01, version-3.02

Children:

4f2f41f

Parents:

0c4b12c

Message:

better service handling including project_export psuedo service done more or less right- tested on dry runs

File:

• fedd/federation/experiment_partition.py (modified) (5 diffs)

fedd/federation/experiment_partition.py

@@ -64 +64 @@
         """
         seer_master = None
-        for k, s in masters.items():
-            if 'SEER' in s:
-                seer_master = k
-                break
+        for m in masters.values():
+            for s in m:
+                if s.name == 'SEER':
+                    seer_master = m
+                    break
+            if seer_master: break
 
         if seer_master:
@@ -84 +86 @@
 
         if (st in masters and dt not in masters) or \
-                ( st in masters and dt not in masters ):
+                ( st not in masters and dt in masters ):
             active = ("%s" % (st in masters))
         else:
             active = ("%s" % (st > dt))
+
+        print "%s %s" % (st, active)
 
         ifaces = [ ]
@@ -279 +283 @@
 
         seer_master = None
-        for k, s in masters.items():
-            if 'SEER' in s:
-                seer_master = k
-                break
+        for m in masters.values():
+            for s in m:
+                if s.name == 'SEER':
+                    seer_master = m
+                    break
+            if seer_master: break
 
         if seer_master:
@@ -378 +384 @@
 
                 seer_master = None
-                for k, s in masters.items():
-                    if 'SEER' in s:
-                        seer_master = k
-                        break
+
+                for m in masters.values():
+                    for s in m:
+                        if s.name == 'SEER':
+                            seer_master = m
+                            break
+                    if seer_master: break
 
                 if seer_master:
@@ -534 +543 @@
         # to the master for each service.
         for mtb in [ t for t in tbparams if t in masters ]:
-            for tb in [ t for tb in tbparams if t != mtb]:
+            importers = set([])
+            for m in masters[mtb]:
+                importers |= set(m.importers)
+            for tb in importers:
                 if len([e for e in topo[tb].elements \
                         if isinstance(e, topdl.Computer) and \