Changeset 2396f591

Timestamp:

Jun 15, 2011 6:18:41 PM (14 years ago)

Author:

Ted Faber <faber@…>

Branches:

axis_example, compt_changes, info-ops, master

Children:

9b76f1a, cedf721

Parents:

b56eb7e

Message:

Correctly place lans in multi-grouping images

File:

• fedd/fedd_image.py (modified) (1 diff)

fedd/fedd_image.py

@@ -71 +71 @@
             add_to_map(sg, e.get_attribute(attr) or 'default', e)
         elif isinstance(e, topdl.Substrate):
-            # A little hairy.  Make a set of the values of the given attribute
+            # A little hairy.  If the substrate itself has the attribute, use
+            # that.  Otherwise, make a set of the values of the given attribute
             # for all the elements in the substrate's interfaces.  If that set
             # has one element, put the substrate in that subgraph.  Otherwise
             # put it in default.
-            atts = set([i.element.get_attribute(attr) or 'default' \
-                    for i in e.interfaces])
-
-            if len(atts) == 1: add_to_map(sg, atts.pop(), e)
-            else: add_to_map(sg, 'default', e)
+
+            sa = e.get_attribute(attr)
+            if sa is not None:
+                add_to_map(sg, sa, e)
+            else:
+                atts = set([i.element.get_attribute(attr) or 'default' \
+                        for i in e.interfaces])
+
+                if len(atts) == 1: add_to_map(sg, atts.pop(), e)
+                else: add_to_map(sg, 'default', e)
 
     if rest: