Changeset 617592b for fedd/federation/experiment_control.py

Timestamp:

Feb 20, 2010 5:27:56 PM (14 years ago)

Author:

Ted Faber <faber@…>

Branches:

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

Children:

6af3226

Parents:

0f06528

Message:

More dragon cleanup. Config files look right, but need to be tested.

File:

• fedd/federation/experiment_control.py (modified) (15 diffs)

fedd/federation/experiment_control.py

@@ -831 +831 @@
         # Add attributes to parameter space.  We don't allow attributes to
         # overlay any parameters already installed.
-        for a in r['fedAttr']:
+        for a in r.get('fedAttr', []):
             try:
                 if a['attribute'] and \
@@ -923 +923 @@
             try:
                 self.log.debug("Calling StartSegment at %s " % uri)
-                print req
                 r = self.caller(uri, req, self.cert_file, self.cert_pwd,
                         self.trusted_certs)
@@ -1039 +1038 @@
                 vlan = get_vlan(ss.response)
                 if vlan is not None:
-                    for k, t in topo.items():
-                        for e in t.elements:
-                            for i in e.interface:
-                                vl = i.get_attribute('dragon_vlan')
-                                if vl is not None and vl == to_repl:
-                                    i.set_attribute('dragon_vlan', vlan)
+                    for v in connInfo.values():
+                        for i in v:
+                            for a in i.get('fedAttr', []):
+                                if a.get('attribute', "") == 'vlan_id' and \
+                                        a.get('value', "") == to_repl:
+                                    a['value'] = vlan
             else:
                 break
@@ -1355 +1354 @@
                     )
             ifaces.append(inf)
-        info = {
-                "type" : conn_type, 
-                "portal": myname,
-                'peer': desthost,
-                'fedAttr': [ 
-                        { 'attribute': 'masterdomain', 'value': mdomain},
-                        { 'attribute': 'masterexperiment', 'value': 
-                            "%s/%s" % (mproject, eid)},
-                        { 'attribute': 'active', 'value': active},
-                        # Move to SMB service description
-                        { 'attribute': 'masteruser', 'value': muser},
-                        { 'attribute': 'smbshare', 'value': smbshare},
-                    ],
-                }
-
-        if conn_type == 'transit':
-            info['member'] = [ { 'element': myname, 'interface': 'inf000'} ]
-        if conn_attrs:
-            info['fedAttr'].extend(con_attrs)
+        if conn_type == "ssh":
+            info = {
+                    "type" : conn_type, 
+                    "portal": myname,
+                    'peer': desthost,
+                    'fedAttr': [ 
+                            { 'attribute': 'masterdomain', 'value': mdomain},
+                            { 'attribute': 'masterexperiment', 'value': 
+                                "%s/%s" % (mproject, eid)},
+                            { 'attribute': 'active', 'value': active},
+                            # Move to SMB service description
+                            { 'attribute': 'masteruser', 'value': muser},
+                            { 'attribute': 'smbshare', 'value': smbshare},
+                        ],
+                    }
+        else:
+            info = None
 
         return (topdl.Computer(
@@ -1455 +1452 @@
 
     def create_dragon_substrate(self, sub, topo, tbs, tbparams, master, eid,
-            connInfo):
+            connInfo, peer={ }):
         """
         Add attribiutes to the various elements indicating that they are to be
@@ -1467 +1464 @@
             else: return None
 
+        mdomain = tbparams[master].get('domain', '.example.com')
+        mproject = tbparams[master].get('project', 'project')
         # dn is the number of previously created dragon nets.  This routine
         # creates a net numbered by dn
@@ -1473 +1472 @@
         # the global topology
         count = { }
+        node = { }
         for e in [ i.element for i in sub.interfaces ]:
             tb = e.get_attribute('testbed')
             count[tb] = count.get(tb, 0) + 1
+            node[tb] = i.get_attribute('ip4_address')
+
 
         # Set the attributes in the copies that will allow setup of dragon
@@ -1484 +1486 @@
                 if not connInfo.has_key(tb):
                     connInfo[tb] = [ ]
+
+                # This may need another look, but only a service gateway will
+                # look at the active parameter, and these are only inserted to
+                # connect to the master.
+                active = "%s" % ( tb == 'master')
                 info = {
                         'type': 'transit',
@@ -1489 +1496 @@
                             'element': i.element.name[0], 
                             'interface': i.name 
-                            } for i in s.interfaces ],
-                        'fedAttr': [ { 
-                            'attribute': 'vlan_id',
-                            'value': 'unassigned%d' % dn
-                            } ]
+                            } for i in s.interfaces \
+                                    if isinstance(i.element, topdl.Computer) ],
+                        'fedAttr': [ 
+                            { 'attribute': 'vlan_id', 
+                                'value': 'unassigned%d' % dn },
+                            { 'attribute': 'masterdomain', 'value': mdomain},
+                            { 'attribute': 'masterexperiment', 'value': 
+                                "%s/%s" % (mproject, eid)},
+                            { 'attribute': 'active', 'value': active},
+                            ],
                         }
+                if peer.has_key(tb):
+                    info['peer'] = peer[tb]
                 connInfo[tb].append(info)
             else:
@@ -1631 +1645 @@
                     ('portal','true'),
                     ('ip4_address', "%s" % ip_addr(myip)),)),),
-                conn_type="transit",
-                conn_attrs = [ {
-                    'attribute': 'vlan_id', 'value': 'unassigned%d' % idx
-                    }])
+                conn_type="transit")
         if self.fedkit:
             self.add_kit(portal, self.fedkit)
@@ -1640 +1651 @@
             self.add_kit(portal, self.gatewaykit)
 
-        return portal, info
+        return portal
 
     def add_portals(self, top, topo, eid, master, tbparams, ip_allocator, 
@@ -1721 +1732 @@
                                 ],
                             )
-                    portal, info = self.new_dragon_portal(tb, master,
+                    portal = self.new_dragon_portal(tb, master,
                             master, eid, dip, mip, idx, csub, tbparams)
                     topo[tb].substrates.append(csub)
                     topo[tb].elements.append(portal)
                     topo[tb].elements.append(seg)
-                    if not connInfo.has_key(tb):
-                        connInfo[tb] = [info]
-                    else:
-                        connInfo[tb].append(info)
 
                     mcsub = csub.clone()
@@ -1752 +1759 @@
                                 ],
                             )
-                    portal, info = self.new_dragon_portal(master, tb, master,
+                    portal = self.new_dragon_portal(master, tb, master,
                             eid, mip, dip, idx, mcsub, tbparams)
                     topo[master].substrates.append(mcsub)
                     topo[master].elements.append(portal)
                     topo[master].elements.append(seg)
-                    if not connInfo.has_key(master):
-                        connInfo[master] = [info]
-                    else:
-                        connInfo[master].append(info)
+                    for t in (master, tb):
+                        topo[t].incorporate_elements()
 
                     self.create_dragon_substrate(csub, topo, 
-                            {tb: 1, master:1}, tbparams, master, eid)
+                            {tb: 1, master:1}, tbparams, master, eid, connInfo,
+                            {tb: ip_addr(mip), master: ip_addr(dip)})
                 else:
                     self.add_control_portal(master, tb, master, eid, topo, 
@@ -2104 +2110 @@
                 tb = t.get_attribute('testbed')
                 if tb: 
-                    self.get_access(tb, None, user, tbparams, master, 
+                    self.get_access(tb, None, tbparams, master, 
                             export_project, access_user, services)
                     tbparams[k] = tbparams[tb]
@@ -2196 +2202 @@
             ]
 
+        # transit and disconnected testbeds may not have a connInfo entry.
+        # Fill in the blanks.
+        for t in allocated.keys():
+            if not connInfo.has_key(t):
+                connInfo[t] = { }
+
         # Start a thread to do the resource allocation
         t  = Thread(target=self.allocate_resources,