Changeset f038da1


Ignore:
Timestamp:
May 25, 2010 11:24:46 AM (15 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.

Location:
fedd/federation
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • fedd/federation/deter_internal_access.py

    rd3c8759 rf038da1  
    552552                    value = "%s" % vlan
    553553                    req = { 'name': k, 'value': value }
    554                     print "calling SetValue %s %s" % (surl, req)
    555554                    self.call_SetValue(surl, req, cf)
    556555                else:
    … …  
    672671                'allocID': req['allocID'],
    673672                'allocationLog': logv,
     673                'segmentdescription': { 'topdldescription': topo.to_dict() }
    674674                }
    675675        retval = copy.deepcopy(self.state[aid]['started'])
    676         retval['allocID'] = req['allocID']
    677         # XXX: this doesn't pickle!!
    678         retval['segmentdescription'] = { 'topdldescription': topo.to_dict() }
    679676        self.write_state()
    680677        self.state_lock.release()

  • fedd/federation/emulab_access.py

    rd3c8759 rf038da1  
    17491749                    'allocID': req['allocID'],
    17501750                    'allocationLog': logv,
     1751                    'segmentdescription': {
     1752                        'topdldescription': rvtopo.to_dict()
     1753                        }
    17511754                    }
    17521755            retval = copy.copy(self.allocation[aid]['started'])
    17531756            self.write_state()
    17541757            self.state_lock.release()
    1755             retval['segmentdescription'] =  \
    1756                     { 'topdldescription': rvtopo.to_dict() }
    17571758            return retval
    17581759        elif err:

  • fedd/federation/protogeni_access.py

    rd3c8759 rf038da1  
    11321132                    'allocID': req['allocID'],
    11331133                    'allocationLog': logv,
     1134                    'segmentdescription': {
     1135                        'topdldescription': rvtopo.to_dict() }
    11341136                    }
    1135             retval = copy.copy(self.allocation[aid]['started'])
    11361137            self.write_state()
    1137             retval['segmentdescription'] =  \
    1138                     { 'topdldescription': rvtopo.to_dict() }
    11391138            self.state_lock.release()
    11401139
Note: See TracChangeset for help on using the changeset viewer.