Changeset 6e44258

Timestamp:

Oct 29, 2009 8:08:34 PM (15 years ago)

Author:

Ted Faber <faber@…>

Branches:

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

Children:

5c8fbb9

Parents:

2bc7b76

Message:

that shouldn't be hard coded

Location:

fedd/federation

Files:

• emulab_access.py (modified) (1 diff)
• experiment_control.py (modified) (8 diffs)
• local_emulab_segment.py (modified) (1 diff)

fedd/federation/emulab_access.py

@@ -1070 +1070 @@
                 os.mkdir(softdir)
             for s in sw:
+                print "%s %s %s" % ( s, certfile, softdir)
                 get_url(s, certfile, softdir)
 

fedd/federation/experiment_control.py

@@ -1574 +1574 @@
                     else:
                         new_i = topdl.Interface(
-                                substrate=s.name,
+                                substrate=sub.name,
                                 attribute=[ 
                                     topdl.Attribute(
@@ -1630 +1630 @@
         topo[st].elements.append(portal)
 
-    def new_dragon_portal(self, st, dt, master, eid, dip, idx, 
+    def new_dragon_portal(self, st, dt, master, eid, myip, dip, idx, 
             substrate, tbparams):
         # Add to the master testbed
@@ -1640 +1640 @@
                 ((substrate.name,(
                     ('portal','true'),
-                    ('ip4_address', "%s" % ip_addr(dip)),
+                    ('ip4_address', "%s" % ip_addr(myip)),
                     ('dragon_vlan', 'unassigned%d' % idx),
                     ('dragon_type', 'link'),)),))
@@ -1696 +1696 @@
                     dip, leng = ip_allocator.allocate(4)
                     dip += 1
+                    mip = dip+1
                     csub = topdl.Substrate(
                             name="dragon-control-%s" % tb,
@@ -1730 +1731 @@
                     topo[tb].elements.append(
                             self.new_dragon_portal(tb, master, master, eid, 
-                                dip, idx, csub, tbparams))
+                                dip, mip, idx, csub, tbparams))
                     topo[tb].elements.append(seg)
 
-                    dip+=1
                     mcsub = csub.clone()
                     seg = topdl.Segment(
@@ -1758 +1758 @@
                     topo[master].elements.append(
                             self.new_dragon_portal(master, tb, master, eid, 
-                                dip, idx, mcsub, tbparams))
+                                mip, dip, idx, mcsub, tbparams))
                     topo[master].elements.append(seg)
 
@@ -1831 +1831 @@
             # XXX
             softmap[pkg] = \
-                    "https://users.isi.deterlab.net:23232/%s/%s" %\
+                    "https://users.isi.deterlab.net:23235/%s/%s" %\
                     ( path, dest)
 
@@ -2084 +2084 @@
         
         # XXX
-        url_base = 'https://users.isi.deterlab.net:23232'
+        url_base = 'https://users.isi.deterlab.net:23235'
         attrs = [ 
                 {

fedd/federation/local_emulab_segment.py

@@ -240 +240 @@
                 self.log.debug("[start_segment]: swapin timed out " +\
                         "checking state")
-                state = self.get_state(user, host, pid, eid)
+                state = self.get_state(pid, eid)
                 self.log.debug("[start_segment]: state is %s" % state)
                 return state == 'active'