Changeset 814b5e5

Timestamp:

Nov 10, 2010 4:40:54 PM (14 years ago)

Author:

Ted Faber <faber@…>

Branches:

axis_example, compt_changes, info-ops, master

Children:

549830d

Parents:

b4778de

Message:

Merge fixes from stable branch

Location:

fedd/federation

Files:

• emulab_access.py (modified) (1 diff)
• experiment_control.py (modified) (1 diff)
• experiment_partition.py (modified) (2 diffs)
• protogeni_access.py (modified) (9 diffs)
• remote_service.py (modified) (1 diff)

fedd/federation/emulab_access.py

@@ -73 +73 @@
         self.ssh_port = config.get("access","ssh_port") or "22"
         self.boss = config.get("access", "boss")
+        self.ops = config.get("access", "ops")
         self.xmlrpc_cert = config.get("access", "xmlrpc_cert")
         self.xmlrpc_certpw = config.get("access", "xmlrpc_certpw")

fedd/federation/experiment_control.py

@@ -1834 +1834 @@
             # Now get access to the dynamic testbeds (those added above)
             for tb in [ t for t in topo if t not in allocated]:
-                self.get_access(tb, None, tbparams, access_user, masters)
+                self.get_access(tb, None, tbparams, access_user, masters, tbmap)
                 allocated[tb] = 1
                 store_keys = topo[tb].get_attribute('store_keys')

fedd/federation/experiment_partition.py

@@ -66 +66 @@
         """
         seer_master = None
-        for m in masters.values():
+        for k, m in masters.items():
             for s in m:
-                if s.name == 'SEER':
-                    seer_master = m
+                if s.name == 'seer':
+                    seer_master = k
                     break
             if seer_master: break
@@ -284 +284 @@
 
         seer_master = None
-        for m in masters.values():
+        for k, m in masters.items():
             for s in m:
-                if s.name == 'SEER':
-                    seer_master = m
+                if s.name == 'seer':
+                    seer_master = k
                     break
             if seer_master: break

fedd/federation/protogeni_access.py

@@ -344 +344 @@
                         self.d[self.current_key] = {
                                 'hostname': attrs.get('hostname', None),
-                                'interfaces': { }
+                                'interfaces': { },
+                                'mac': { }
                                 }
                 elif name == 'interface' and self.current_key:
@@ -350 +351 @@
                             [attrs.get('virtual_id','')] = \
                             attrs.get('component_id', None)
+                elif name == 'interface_ref':
+                    # Collect mac address information from an interface_ref.
+                    # These appear after the node info has been parsed.
+                    nid = attrs.get('virtual_node_id', None)
+                    ifid = attrs.get('virtual_interface_id', None)
+                    mac = attrs.get('MAC', None)
+                    self.d[nid]['mac'][ifid] = mac
             #  When a node is finished, clear current_key
             def end_element(self, name):
@@ -652 +660 @@
 
         ifconfig = "/sbin/ifconfig"
+        findif = '/usr/local/etc/emulab/findif'
         stage_file = stage_file_type(user, self.staging_host, stagingdir)
         pname = node.get('hostname', None)
@@ -666 +675 @@
                     if not i.get_attribute('portal')]:
                 pinf = node['interfaces'].get(i.name, None)
+                pmac = node['mac'].get(i.name, None)
                 addr = i.get_attribute('ip4_address') 
                 netmask = i.get_attribute('ip4_netmask') or '255.255.255.0'
-                if pinf and addr:
+                # The interface names in manifests are not to be trusted, so we
+                # find the interface to configure using the local node's script
+                # to match mac address to interface name.
+                if pinf and addr and pmac:
+                    print >>script, '# %s' % pinf
                     print >>script, \
-                            "%s %s %s netmask %s"  % \
-                            (ifconfig, pinf, addr, netmask)
+                            "%s `%s %s` %s netmask %s"  % \
+                            (ifconfig, findif, pmac, addr, netmask)
                 else:
                     self.log.error("Missing interface or address for %s" \
@@ -997 +1011 @@
                 certfile, certpw)
 
-        if not ctxt: return False
+        if not ctxt: return False, {}
 
         self.set_up_staging_filespace(segment_commands, user, host, stagingdir)
@@ -1023 +1037 @@
                                 user, host, "%s/%s" % (stagingdir, f)):
                             self.log.error("Scp failed")
-                            return False
+                            return False, {}
 
 
@@ -1032 +1046 @@
             self.log.error('Sliver failed to start on ProtoGENI')
             self.delete_slice(segment_commands, slice_cred, slice_urn, ctxt)
-            return False
+            return False, {}
         elif status == 'timeout':
             self.log.error('Sliver failed to start on ProtoGENI (timeout)')
             self.delete_slice(segment_commands, slice_cred, slice_urn, ctxt)
-            return False
+            return False, {}
         else:
             # All good: save ProtoGENI info in shared state
@@ -1397 +1411 @@
             param = {
                     'credential': cred,
-                    'hrn': name,
-                    'type': 'Slice',
-                    }
-            slice = segment_commands.slice_authority_call('Resolve', 
-                    param, ctxt)
-            uuid = slice.get('uuid', None)
-            if uuid == None:
-                sys.exit('No uuid for %s' % slicename)
-
-            print 'Calling GetCredential (uuid)'
-            param = {
-                    'credential': cred,
-                    'uuid': uuid,
+                    'urn': slice_urn,
                     'type': 'Slice',
                     }
@@ -1419 +1421 @@
             return None
         try:
-            print 'Calling RenewSlice (CM)'
             param = {
                     'credentials': [new_scred,],

fedd/federation/remote_service.py

@@ -502 +502 @@
                             'desc': e.fault.string or "Something Weird" }
                 if ee:
-                    raise service_error(ee['code'], ee['desc'])
+                    raise service_error(ee.get('code', 'no code'), 
+                            ee.get('desc','no desc'))
                 else:
                     raise service_error(service_error.internal,