Changeset f038da1 for fedd/federation/deter_internal_access.py

Timestamp:

May 25, 2010 11:24:46 AM (14 years ago)

Author:

Ted Faber <faber@…>

Branches:

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

Children:

50ef6e4

Parents:

d3c8759

Message:

These were workarounds for the problems pickling topologies. That problem's allieviated, so these can go back.

File:

• fedd/federation/deter_internal_access.py (modified) (2 diffs)

fedd/federation/deter_internal_access.py

@@ -552 +552 @@
                     value = "%s" % vlan
                     req = { 'name': k, 'value': value }
-                    print "calling SetValue %s %s" % (surl, req)
                     self.call_SetValue(surl, req, cf)
                 else:
@@ -672 +671 @@
                 'allocID': req['allocID'],
                 'allocationLog': logv,
+                'segmentdescription': { 'topdldescription': topo.to_dict() }
                 }
         retval = copy.deepcopy(self.state[aid]['started'])
-        retval['allocID'] = req['allocID']
-        # XXX: this doesn't pickle!!
-        retval['segmentdescription'] = { 'topdldescription': topo.to_dict() }
         self.write_state()
         self.state_lock.release()