Changeset ab847bc for fedd/federation/experiment_partition.py

Timestamp:

Apr 28, 2010 4:09:53 AM (14 years ago)

Author:

Ted Faber <faber@…>

Branches:

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

Children:

12658df

Parents:

05fceef

Message:

New syntax for testbeds that includes a /instance rider. This allows users to
request multiple segments from a single testbed.

File:

• fedd/federation/experiment_partition.py (modified) (4 diffs)

fedd/federation/experiment_partition.py

@@ -212 +212 @@
                     "Cannot DRAGON split substrate w/o capacity")
         segs = [ ]
-        substr = topdl.Substrate(name="dragon%d" % idx, 
+        name = join_testbed("dragon", "%d" % idx)
+        substr = topdl.Substrate(name=name, 
                 capacity=sub.capacity.clone(),
                 attribute=[ topdl.Attribute(attribute=n, value=v)
                     for n, v, in (\
                             ('vlan', 'unassigned%d' % idx),)])
-        name = "dragon%d" % idx
         store_key = 'fedid:%s/vlan%d' % (expid, idx)
         for tb in tbs.keys():
@@ -574 +574 @@
                                 id= tbparams[mtb]['allocID'],
                                 type='emulab',
-                                uri = self.tbmap.get(master, None),
+                                uri = self.tbmap.get(testbed_base(mtb), None),
                                 interface=[ 
                                     topdl.Interface(
@@ -603 +603 @@
                                 id= tbparams[tb]['allocID'],
                                 type='emulab',
-                                uri = self.tbmap.get(tb, None),
+                                uri = self.tbmap.get(testbed_base(tb), None),
                                 interface=[ 
                                     topdl.Interface(
@@ -625 +625 @@
                         topo[mtb].elements.append(portal)
                         topo[mtb].elements.append(seg)
-                        for t in (master, tb):
+                        for t in (mtb, tb):
                             topo[t].incorporate_elements()