Changeset da5b93c

Timestamp:

May 14, 2010 11:09:20 AM (14 years ago)

Author:

Ted Faber <faber@…>

Branches:

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

Children:

b14b495

Parents:

b0581ac

Message:

checkpoint

File:

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

fedd/compose.py

@@ -220 +220 @@
 
 
+# Main line begins
 
 const_re = re.compile("\s*#\s*COMPOSITION:\s*([^:]+:[^:]+:.*)")
@@ -260 +261 @@
 
     top = remote_ns2topdl(opts.url, contents, cert)
+    if not top:
+        sys.exit("Cannot create topology from: %s" % fn)
     add_interfaces(top, marks)
     localize_names(top, names, marks)
@@ -265 +268 @@
     constraints.extend(marks.values())
     comps.append(top)
+
+# Let the user know if they messed up on specifying constraints.
+if any([ not isinstance(c.name, tuple) for c in constraints]):
+    print >>sys.stderr, "nodes not found for constraints on %s" % \
+            ",".join([ c.name for c in constraints \
+            if isinstance(c.name, basestring)])
+    constraints = [ c for c in constraints if isinstance(c.name, tuple )]
 
 # Now the various components live in the same namespace and are marked with