Merge pull request #23 from jameshcorbett/update-sched-changes

DWS: update JGF writer for fluxion changes
flux-framework · Aug 18, 2022 · 1cb49da · 1cb49da
2 parents 76f5c9a + bfdcd26
commit 1cb49da
Show file tree

Hide file tree

Showing 2 changed files with 1,208 additions and 1 deletion.
diff --git a/src/cmd/flux-dws2jgf.py b/src/cmd/flux-dws2jgf.py
@@ -65,13 +65,14 @@ def _encode_rank(self, parent, rank, children, hName):
             True,
             "",
             1,
+            [],
             hPath,
         )
         edg = ElCapResourceRelationshipV1(parent.get_id(), vtx.get_id())
         self._add_and_tick_uniq_id(vtx, edg)
         for key, val in children.items():
             for i in IDset(val):
-                self._encode_child(vtx.get_id(), hPath, rank, str(key), i)
+                self._encode_child(vtx.get_id(), hPath, rank, str(key), i, {})
 
     def _encode_nnf(self, parent, global_nnf, nnf):
         res_type = "nnf"
@@ -87,6 +88,7 @@ def _encode_nnf(self, parent, global_nnf, nnf):
             True,
             "",
             1,
+            [],
             f"{parent.path}/{res_name}",
         )
         edg = ElCapResourceRelationshipV1(parent.get_id(), vtx.get_id())
@@ -111,6 +113,7 @@ def _encode_rack(self, parent, global_nnf, nnf):
             True,
             "",
             1,
+            [],
             f"{parent.path}/{res_name}",
         )
         edg = ElCapResourceRelationshipV1(parent.get_id(), vtx.get_id())
@@ -133,6 +136,7 @@ def _encode(self):
             True,
             "",
             1,
+            [],
             "/ElCapitan0",
         )
         self._add_and_tick_uniq_id(vtx)
@@ -147,6 +151,7 @@ def _encode(self):
             True,
             "",
             1,
+            [],
             "/ElCapitan0/globalnnf0",
         )
         edg = ElCapResourceRelationshipV1(vtx.get_id(), global_nnf.get_id())