Changeset 9294673 for fedd/federation/experiment_control.py

Timestamp:

Nov 21, 2011 5:33:41 PM (12 years ago)

Author:

Ted Faber <faber@…>

Branches:

compt_changes, info-ops, master

Children:

f769cb3

Parents:

80b1e82

Message:

Turn (most) of another free floating dict into a class.

File:

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

fedd/federation/experiment_control.py

@@ -960 +960 @@
             tb_attrs = copy.copy(attrs)
             tp.wait_for_slot()
-            uri = tbparams[tb].get('uri', tbmap.get(testbed_base(tb), None))
+            uri = tbparams[tb].uri or tbmap.get(testbed_base(tb), None)
             base, suffix = split_testbed(tb)
             if suffix:
@@ -971 +971 @@
                         "Unknown testbed %s !?" % tb)
 
-            if tbparams[tb].has_key('allocID') and \
-                    tbparams[tb]['allocID'].has_key('fedid'):
-                aid = tbparams[tb]['allocID']['fedid']
-            else:
+            aid = tbparams[tb].allocID
+            if not aid:
                 raise service_error(service_error.internal, 
                         "No alloc id for testbed %s !?" % tb)
@@ -1021 +1019 @@
                     # Create and start a thread to stop the segment
                     tp.wait_for_slot()
-                    uri = tbparams[tb]['uri']
+                    uri = tbparams[tb].uri
                     t  = pooled_thread(\
                             target=self.terminate_segment(log=log,
@@ -1029 +1027 @@
                                 trusted_certs=self.trusted_certs,
                                 caller=self.call_TerminateSegment),
-                            args=(uri, tbparams[tb]['federant']['allocID']),
+                            args=(uri, tbparams[tb].allocID),
                             name=tb,
                             pdata=tp, trace_file=self.trace_file)
@@ -1040 +1038 @@
                 for tb in tbparams.keys():
                     try:
-                        self.release_access(tb, tbparams[tb]['allocID'], 
-                                tbmap=tbmap, uri=tbparams[tb].get('uri', None),
+                        self.release_access(tb, tbparams[tb].allocID, 
+                                tbmap=tbmap, uri=tbparams[tb].uri,
                                 cert_file=cert, cert_pwd=pw)
                     except service_error, e:
@@ -1386 +1384 @@
                         "Bad access response (no access proof)")
         
-        tbparam[tb] = { 
-                "allocID" : r['allocID'],
-                "uri": uri,
-                "proof": [ r['proof'] ],
-                }
+        tbparam[tb] = allocation_info(allocID=r['allocID'].get('fedid', None),
+                tb=tb, uri=uri, proof=[r['proof']])
 
         # Collect the responses corresponding to the services this testbed
@@ -1405 +1400 @@
         for a in r.get('fedAttr', []):
             try:
-                if a['attribute'] and \
-                        isinstance(a['attribute'], basestring)\
-                        and not tbparam[tb].has_key(a['attribute'].lower()):
-                    tbparam[tb][a['attribute'].lower()] = a['value']
+                if a['attribute']:
+                    tbparam[tb].set_attribute(a['attribute'], a['value'])
             except KeyError:
                 self.log.error("Bad attribute in response: %s" % a)
@@ -1525 +1518 @@
             # the loop.
             auth_attrs.update([
-                (tbparams[tb]['allocID']['fedid'], "/%s/%s" % ( path, dest)) \
+                (tbparams[tb].allocID, "/%s/%s" % ( path, dest)) \
                         for tb in tbparams.keys()])
 
@@ -1829 +1822 @@
         # allocation principal.  Yeah, that's a long list comprehension.
         self.append_experiment_authorization(expid, set([
-            (tbparams[tb]['allocID']['fedid'], "%s/%s" % (configpath, f)) \
+            (tbparams[tb].allocID, "%s/%s" % (configpath, f)) \
                     for tb in tbparams.keys() \
                         for f in ("hosts", 'ca.pem', 'node.pem', 
@@ -1982 +1975 @@
         # save federant information
         for k in allocated.keys():
-            exp.add_allocation(
-                    allocation_info(
-                        tb=k, 
-                        allocID=tbparams[k]['allocID'].get('fedid', None),
-                        uri=tbparams[k]['uri'],
-                        proof=tbparams[k]['proof'])
-                    )
+            exp.add_allocation(tbparams[k])
 
         # Access proofs for the response message
         proofs = [copy.deepcopy(p) for k in tbparams.keys()\
-                    for p in tbparams[k]['proof']]
+                    for p in tbparams[k].proof]
         if self.state_filename: 
             self.write_state()
@@ -2105 +2092 @@
                 if store_keys:
                     auth_attrs.update(set([
-                        (tbparams[tb]['allocID']['fedid'], sk) \
+                        (tbparams[tb].allocID, sk) \
                                 for sk in store_keys.split(" ")]))