Changeset 966c620 for fedd

Timestamp:

May 19, 2010 6:56:37 AM (15 years ago)

Author:

Ted Faber <faber@…>

Branches:

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

Children:

df3179c

Parents:

7ee16b3

Message:

Allow more control over how constraints are matched

File:

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

fedd/compose.py

@@ -167 +167 @@
                 action='store_true',
                 help='allow solutions where unrequired constraints fail')
+        self.add_option('--same_node', dest='same_node', action='store_true',
+                default=False, 
+                help='Allow loops to the same node to be created.')
+        self.add_option('--same_topology', dest='same_topo',
+                action='store_true', default=False, 
+                help='Allow links within the same topology to be created.')
+        self.add_option('--same_pair', dest='multi_pair',
+                action='store_true', default=False, 
+                help='Allow multiple links between the same nodes " + \
+                        "to be created.')
 
     @staticmethod
@@ -243 +253 @@
             i.substrate = [ sub_map.get(ii, ii) for ii in i.substrate ]
 
-def meet_constraints(candidates, provides, accepts):
+def meet_constraints(candidates, provides, accepts, 
+        same_node=False, same_topo=False, multi_pair=False):
     """
     Try to meet all the constraints in candidates using the information in the
@@ -261 +272 @@
             for a in c.accepts:
                 for can in provides.get(a,[]):
-                    # A constraint cannot satisfy itself, nor do we allow loops
-                    # within the same topology.  This also excludes matched
-                    # constraints.
-                    if can.name != c.name and can.topology != c.topology and \
-                            not can.match:
+                    # A constraint cannot satisfy itself nor can it match
+                    # multiple times.
+                    if can != c and not can.match:
+                        # Unless same_node is true disallow nodes satisfying
+                        # their own constraints.
+                        if not same_node and can.name == c.name:
+                            continue
+                        # Unless same_topo is true, exclude nodes in the same
+                        # topology.
+                        if not same_topo and can.topology == c.topology:
+                            continue
                         # Don't allow multiple matches between the same nodes
-                        # (the "if" above is already pretty crowded).
-                        if c.name in node_match and \
+                        if not multi_pair and c.name in node_match and \
                                 can.name in node_match[c.name]:
                             continue
@@ -615 +631 @@
 
     if not meet_constraints([c for c in constraints if c.required], 
-            provides, accepts):
+            provides, accepts, opts.same_node, opts.same_topo, opts.multi_pair):
         if opts.lax:
             warn("warning: could not meet all required constraints")
@@ -622 +638 @@
 
     meet_constraints([ c for c in constraints if not c.match ], 
-            provides, accepts)
+            provides, accepts, opts.same_node, opts.same_topo, opts.multi_pair)
 
     # Add testbed attributes if requested