Changeset 2e0a952

Timestamp:

May 17, 2010 6:12:04 AM (15 years ago)

Author:

Ted Faber <faber@…>

Branches:

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

Children:

4a53c72

Parents:

f00fb7d

Message:

Take topdl input

File:

• fedd/compose.py (modified) (2 diffs)

fedd/compose.py

@@ -255 +255 @@
     return (top, marks)
 
+def import_topdl_component(fn):
+    top = topdl.topology_from_xml(filename=fn, top='experiment')
+    marks = { }
+    for e in [ e for e in top.elements if isinstance(e, topdl.Computer)]:
+        if e.get_attribute('composition_point'):
+            r = e.get_attribute('required') or 'false'
+            a = e.get_attribute('accepts') 
+            p = e.get_attribute('provides')
+            if a and p:
+                c = constraint(name=e.name, required=(r == 'required'),
+                    provides=p.split(','), accepts=a.split(','))
+                marks[e.name] = c
+    return (top, marks)
+
 def index_constraints(constraints, provides, accepts):
     """
@@ -319 +333 @@
 provides = { }
 accepts = { }
+imp = ( (('.tcl', '.ns'), import_ns2_component), 
+        (('.xml', '.topdl'), import_topdl_component),
+        )
 for fn, cnt in files:
     try:
-        top, marks = import_ns2_component(fn)
+        for suffix, importer in imp:
+            if fn.endswith(suffix):
+                top, marks = importer(fn)
+                break
+        else:
+            print >>sys.stderr, "Unknown suffix on file %s.  Ignored" % fn
+            continue
     except service_error, e:
         print >>sys.stderr, "Remote error on %s: %s" % (fn, e)