from sfa.util.specdict import *
from sfa.util.faults import *
from sfa.util.storage import *
+from sfa.util.record import GeniRecord
from sfa.util.policy import Policy
from sfa.util.prefixTree import prefixTree
from sfa.util.debug import log
slice_hrns = []
aggregates = Aggregates(self.api)
credential = self.api.getCredential()
+ arg_list = [credential]
+ request_hash = self.api.key.compute_hash(arg_list)
for aggregate in aggregates:
try:
- slices = aggregates[aggregate].get_slices(credential)
+ slices = aggregates[aggregate].get_slices(credential, request_hash)
slice_hrns.extend(slices)
except:
print >> log, "Error calling slices at aggregate %(aggregate)s" % locals()
def delete_slice_smgr(self, hrn):
credential = self.api.getCredential()
+ caller_cred = self.caller_cred
aggregates = Aggregates(self.api)
+ arg_list = [credential, hrn]
+ request_hash = self.api.key.compute_hash(arg_list)
for aggregate in aggregates:
try:
- aggregates[aggregate].delete_slice(credential, hrn, caller_cred=self.caller_cred)
+ aggregates[aggregate].delete_slice(credential, hrn, request_hash, caller_cred)
except:
print >> log, "Error calling list nodes at aggregate %s" % aggregate
traceback.print_exc(log)
def verify_site(self, registry, credential, slice_hrn, peer, sfa_peer):
authority = get_authority(slice_hrn)
- site_records = registry.resolve(credential, authority)
+ arg_list = [credential, authority]
+ request_hash = self.api.key.compute_hash(arg_list)
+ site_records = registry.resolve(credential, authority, request_hash)
site = {}
for site_record in site_records:
if site_record['type'] == 'authority':
- site = site_record.as_dict()
+ site = site_record
if not site:
raise RecordNotFound(authority)
remote_site_id = site.pop('site_id')
self.api.plshell.BindObjectToPeer(self.api.plauth, 'site', site_id, peer, remote_site_id)
# mark this site as an sfa peer record
if sfa_peer:
- #regsitry.register_peer(credential, authority, 'authority', sfa_peer)
+ peer_dict = {'type': 'authority', 'hrn': authority, 'peer_authority': sfa_peer, 'pointer': site_id}
+ arg_list = [credential]
+ request_hash = self.api.key.compute_hash(arg_list)
+ registry.register_peer_object(credential, peer_dict, request_hash)
pass
else:
site_id = sites[0]['site_id']
slice = {}
slice_record = None
authority = get_authority(slice_hrn)
- slice_records = registry.resolve(credential, slice_hrn)
+ arg_list = [credential, slice_hrn]
+ request_hash = self.api.key.compute_hash(arg_list)
+ slice_records = registry.resolve(credential, slice_hrn, request_hash)
for record in slice_records:
if record['type'] in ['slice']:
slice_record = record
# mark this slice as an sfa peer record
if sfa_peer:
- #registry.register_peer(credential, slice_hrn, 'slice', authority)
+ peer_dict = {'type': 'slice', 'hrn': slice_hrn, 'peer_authority': sfa_peer, 'pointer': slice_id}
+ arg_list = [credential]
+ request_hash = self.api.key.compute_hash(arg_list)
+ registry.register_peer_object(credential, peer_dict, request_hash)
pass
#this belongs to a peer
slicename = hrn_to_pl_slicename(slice_record['hrn'])
researchers = slice_record.get('researcher', [])
for researcher in researchers:
+ arg_list = [credential, researcher]
+ request_hash = self.api.key.compute_hash(arg_list)
person_record = {}
- person_records = registry.resolve(credential, researcher)
+ person_records = registry.resolve(credential, researcher, request_hash)
for record in person_records:
if record['type'] in ['user']:
person_record = record
if not person_record:
pass
- person_dict = person_record.as_dict()
+ person_dict = person_record
+ local_person=False
if peer:
peer_id = self.api.plshell.GetPeers(self.api.plauth, {'shortname': peer}, ['peer_id'])[0]['peer_id']
persons = self.api.plshell.GetPersons(self.api.plauth, {'email': [person_dict['email']], 'peer_id': peer_id}, ['person_id', 'key_ids'])
+ if not persons:
+ persons = self.api.plshell.GetPersons(self.api.plauth, [person_dict['email']], ['person_id', 'key_ids'])
+ if persons:
+ local_person=True
else:
persons = self.api.plshell.GetPersons(self.api.plauth, [person_dict['email']], ['person_id', 'key_ids'])
# mark this person as an sfa peer record
if sfa_peer:
- #registry.register_peer(credential, researcher, 'user', authority)
+ peer_dict = {'type': 'user', 'hrn': researcher, 'peer_authority': sfa_peer, 'pointer': person_id}
+ arg_list = [credential]
+ request_hash = self.api.key.compute_hash(arg_list)
+ registry.register_peer_object(credential, peer_dict, request_hash)
pass
if peer:
self.api.plshell.AddPersonToSlice(self.api.plauth, person_dict['email'], slicename)
self.api.plshell.AddPersonToSite(self.api.plauth, person_dict['email'], site_id)
- if peer:
+ if peer and not local_person:
self.api.plshell.BindObjectToPeer(self.api.plauth, 'person', person_id, peer, person_dict['pointer'])
+ if peer:
self.api.plshell.BindObjectToPeer(self.api.plauth, 'site', site_id, peer, remote_site_id)
- self.verify_keys(registry, credential, person_dict, key_ids, person_id, peer)
+ self.verify_keys(registry, credential, person_dict, key_ids, person_id, peer, local_person)
- def verify_keys(self, registry, credential, person_dict, key_ids, person_id, peer):
+ def verify_keys(self, registry, credential, person_dict, key_ids, person_id, peer, local_person):
keylist = self.api.plshell.GetKeys(self.api.plauth, key_ids, ['key'])
keys = [key['key'] for key in keylist]
if peer:
self.api.plshell.UnBindObjectFromPeer(self.api.plauth, 'person', person_id, peer)
key_id = self.api.plshell.AddPersonKey(self.api.plauth, person_dict['email'], key)
- if peer:
+ if peer and not local_person:
self.api.plshell.BindObjectToPeer(self.api.plauth, 'person', person_id, peer, person_dict['pointer'])
+ if peer:
try: self.api.plshell.BindObjectToPeer(self.api.plauth, 'key', key_id, peer, key_ids.pop(0))
except: pass
peer = self.get_peer(hrn)
sfa_peer = self.get_sfa_peer(hrn)
- spec = Rspec(rspec)
+ spec = RSpec(rspec)
# Get the slice record from sfa
slicename = hrn_to_pl_slicename(hrn)
slice = {}
return 1
def create_slice_smgr(self, hrn, rspec):
- spec = Rspec()
- tempspec = Rspec()
+ spec = RSpec()
+ tempspec = RSpec()
spec.parseString(rspec)
slicename = hrn_to_pl_slicename(hrn)
specDict = spec.toDict()
- if specDict.has_key('Rspec'): specDict = specDict['Rspec']
+ if specDict.has_key('RSpec'): specDict = specDict['RSpec']
if specDict.has_key('start_time'): start_time = specDict['start_time']
else: start_time = 0
if specDict.has_key('end_time'): end_time = specDict['end_time']
for netspec in netspecs:
net_hrn = netspec['name']
resources = {'start_time': start_time, 'end_time': end_time, 'networks': netspec}
- resourceDict = {'Rspec': resources}
+ resourceDict = {'RSpec': resources}
tempspec.parseDict(resourceDict)
rspecs[net_hrn] = tempspec.toxml()
- # send each rspec to the appropriate aggregate/sm
+ # send each rspec to the appropriate aggregate/sm
+ caller_cred = self.caller_cred
for net_hrn in rspecs:
try:
# if we are directly connected to the aggregate then we can just send them the rspec
- # if not, then we may be connected to an sm thats connected to the aggregate
+ # if not, then we may be connected to an sm thats connected to the aggregate
if net_hrn in aggregates:
# send the whloe rspec to the local aggregate
if net_hrn in [self.api.hrn]:
- aggregates[net_hrn].create_slice(credential, hrn, rspec, caller_cred=self.caller_cred)
+ arg_list = [credential,hrn,rspec]
+ request_hash = self.api.key.compute_hash(arg_list)
+ aggregates[net_hrn].create_slice(credential, hrn, rspec, request_hash, caller_cred)
else:
- aggregates[net_hrn].create_slice(credential, hrn, rspecs[net_hrn], caller_cred=self.caller_cred)
+ arg_list = [credential,hrn,rspecs[net_hrn]]
+ request_hash = self.api.key.compute_hash(arg_list)
+ aggregates[net_hrn].create_slice(credential, hrn, rspecs[net_hrn], request_hash, caller_cred)
else:
- # lets forward this rspec to a sm that knows about the network
+ # lets forward this rspec to a sm that knows about the network
+ arg_list = [credential, net_hrn]
+ request_hash = self.api.compute_hash(arg_list)
for aggregate in aggregates:
- network_found = aggregates[aggregate].get_aggregates(credential, net_hrn)
+ network_found = aggregates[aggregate].get_aggregates(credential, net_hrn, request_hash)
if network_networks:
- aggregates[aggregate].create_slice(credential, hrn, rspecs[net_hrn], caller_cred=self.caller_cred)
+ arg_list = [credential, hrn, rspecs[net_hrn]]
+ request_hash = self.api.key.compute_hash(arg_list)
+ aggregates[aggregate].create_slice(credential, hrn, rspecs[net_hrn], request_hash, caller_cred)
except:
print >> log, "Error creating slice %(hrn)s at aggregate %(net_hrn)s" % locals()
def stop_slice_smgr(self, hrn):
credential = self.api.getCredential()
aggregates = Aggregates(self.api)
+ arg_list = [credential, hrn]
+ request_hash = self.api.key.compute_hash(arg_list)
for aggregate in aggregates:
- aggregates[aggregate].stop_slice(credential, hrn)
+ aggregates[aggregate].stop_slice(credential, hrn, request_hash)
git://git.onelab.eu / sfa.git / blobdiff