X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fmanagers%2Faggregate_manager_openflow.py;h=1edc90b3461157601e34bdadd1a34803e78cceed;hb=6cdd190c96ab1f1d46741cd3559e3ea9e44aa7a1;hp=7a965dc08b51b9d35b31a169ad04fe5ab4ad0829;hpb=4ff67c801ceeb1d0c7ca2863c2b7bf8152182b8f;p=sfa.git diff --git a/sfa/managers/aggregate_manager_openflow.py b/sfa/managers/aggregate_manager_openflow.py index 7a965dc0..1edc90b3 100755 --- a/sfa/managers/aggregate_manager_openflow.py +++ b/sfa/managers/aggregate_manager_openflow.py @@ -101,9 +101,10 @@ def stop_slice(cred, xrn): if DEBUG: print "Received stop_slice call" return msg_aggrMgr(SFA_STOP_SLICE) -def delete_slice(cred, xrn): +def DeleteSliver(cred, xrn, call_id): + if Callids().already_handled(call_id): return "" hrn = urn_to_hrn(xrn)[0] - if DEBUG: print "Received delete_slice call" + if DEBUG: print "Received DeleteSliver call" return msg_aggrMgr(SFA_DELETE_SLICE) def reset_slices(cred, xrn): @@ -111,8 +112,9 @@ def reset_slices(cred, xrn): if DEBUG: print "Received reset_slices call" return msg_aggrMgr(SFA_RESET_SLICES) +### Thierry: xxx this should ahve api as a first arg - probably outdated def CreateSliver(cred, xrn, rspec, call_id): - if Callids().already_handled(call_id): return False + if Callids().already_handled(call_id): return "" hrn = urn_to_hrn(xrn)[0] if DEBUG: print "Received CreateSliver call" @@ -128,14 +130,14 @@ def CreateSliver(cred, xrn, rspec, call_id): aggrMgr_sock.close() if DEBUG: print "----------------" - return 1 + return rspec except socket.error, message: print "Socket error" except IOerror, message: print "IO error" - return 0 + return "" -# Thierry : this would need to handle call_id like the other AMs but is outdated... +# Thierry : xxx this would need to handle call_id like the other AMs but is outdated... def ListResources(cred, xrn=None): hrn = urn_to_hrn(xrn)[0] if DEBUG: print "Received ListResources call"