from sfa.server.aggregate import Aggregates
from sfa.server.registry import Registries
+MAXINT = 2L**31-1
+
class Slices(SimpleStorage):
rspec_to_slice_tag = {'max_rate':'net_max_rate'}
- def __init__(self, api, ttl = .5, caller_cred=None):
+ def __init__(self, api, ttl = .5, origin_hrn=None):
self.api = api
self.ttl = ttl
self.threshold = None
SimpleStorage.__init__(self, self.slices_file)
self.policy = Policy(self.api)
self.load()
- self.caller_cred=caller_cred
+ self.origin_hrn=origin_hrn
- def get_slivers(self, hrn):
+ def get_slivers(self, hrn, node=None):
slice_name = hrn_to_pl_slicename(hrn)
# XX Should we just call PLCAPI.GetSliceTicket(slice_name) instead
#return self.api.GetSliceTicket(self.auth, slice_name)
# from PLCAPI.GetSlivers.get_slivers()
- slice_fields = ['slice_id', 'name', 'instantiation', 'expires', 'person_ids', 'slice_tag_ids'])
- slices = self.api.GetSlices(self.auth, slice_name, slice_fields)
+ slice_fields = ['slice_id', 'name', 'instantiation', 'expires', 'person_ids', 'slice_tag_ids']
+ slices = self.api.plshell.GetSlices(self.api.plauth, slice_name, slice_fields)
# Build up list of users and slice attributes
person_ids = set()
all_slice_tag_ids = set()
for slice in slices:
person_ids.update(slice['person_ids'])
- slice_tag_ids.update(slice['slice_tag_ids'])
-
+ all_slice_tag_ids.update(slice['slice_tag_ids'])
+ person_ids = list(person_ids)
+ all_slice_tag_ids = list(all_slice_tag_ids)
# Get user information
- all_persons = Persons(api, {'person_id':person_ids,'enabled':True}, ['person_id', 'enabled', 'key_ids']).dict()
+ all_persons_list = self.api.plshell.GetPersons(self.api.plauth, {'person_id':person_ids,'enabled':True}, ['person_id', 'enabled', 'key_ids'])
+ all_persons = {}
+ for person in all_persons_list:
+ all_persons[person['person_id']] = person
# Build up list of keys
key_ids = set()
for person in all_persons.values():
key_ids.update(person['key_ids'])
-
+ key_ids = list(key_ids)
# Get user account keys
- all_keys = Keys(api, key_ids, ['key_id', 'key', 'key_type']).dict()
-
+ all_keys_list = self.api.plshell.GetKeys(self.api.plauth, key_ids, ['key_id', 'key', 'key_type'])
+ all_keys = {}
+ for key in all_keys_list:
+ all_keys[key['key_id']] = key
# Get slice attributes
- all_slice_tags = SliceTags(api, slice_tag_ids).dict()
+ all_slice_tags_list = self.api.plshell.GetSliceTags(self.api.plauth, all_slice_tag_ids)
+ all_slice_tags = {}
+ for slice_tag in all_slice_tags_list:
+ all_slice_tags[slice_tag['slice_tag_id']] = slice_tag
slivers = []
for slice in slices:
# which there is at least one sliver attribute
# already set.
if slice_tag not in slice_tags:
- attributes.append({'tagname': slice_tag['tagname'],
+ attributes.append({'tagname': slice_tag['tagname'],
'value': slice_tag['value']})
for slice_tag in filter(lambda a: a['node_id'] is None, slice_tags):
success = False
# request hash is optional so lets try the call without it
try:
- slices = aggregates[aggregate].get_slices(credential)
+ request_hash=None
+ slices = aggregates[aggregate].get_slices(credential, request_hash)
slice_hrns.extend(slices)
success = True
except:
def delete_slice_smgr(self, hrn):
credential = self.api.getCredential()
- caller_cred = self.caller_cred
+ origin_hrn = self.origin_hrn
aggregates = Aggregates(self.api)
for aggregate in aggregates:
success = False
# request hash is optional so lets try the call without it
try:
request_hash=None
- aggregates[aggregate].delete_slice(credential, hrn, request_hash, caller_cred)
+ aggregates[aggregate].delete_slice(credential, hrn, request_hash, origin_hrn)
success = True
except:
print >> log, "%s" % (traceback.format_exc())
try:
arg_list = [credential, hrn]
request_hash = self.api.key.compute_hash(arg_list)
- aggregates[aggregate].delete_slice(credential, hrn, request_hash, caller_cred)
+ aggregates[aggregate].delete_slice(credential, hrn, request_hash, origin_hrn)
success = True
except:
print >> log, "%s" % (traceback.format_exc())
slicename = hrn_to_pl_slicename(slice_hrn)
parts = slicename.split("_")
login_base = parts[0]
- slices = self.api.plshell.GetSlices(self.api.plauth, [slicename], ['slice_id', 'node_ids', 'site_id'])
+ slices = self.api.plshell.GetSlices(self.api.plauth, [slicename])
if not slices:
slice_fields = {}
slice_keys = ['name', 'url', 'description']
slice = slices[0]
slice_id = slice['slice_id']
site_id = slice['site_id']
+ #the slice is alredy on the remote agg. Let us update(e.g. expires field) it with the latest info.
+ self.sync_slice(slice, slice_record, peer)
slice['peer_slice_id'] = slice_record['pointer']
self.verify_persons(registry, credential, slice_record, site_id, remote_site_id, peer, sfa_peer)
rspecs[net_hrn] = tempspec.toxml()
# send each rspec to the appropriate aggregate/sm
- caller_cred = self.caller_cred
+ origin_hrn = self.origin_hrn
for net_hrn in rspecs:
try:
# if we are directly connected to the aggregate then we can just send them the rspec
# send the whloe rspec to the local aggregate
if net_hrn in [self.api.hrn]:
try:
- request_hash = None
- aggregates[net_hrn].create_slice(credential, hrn, rspec, request_hash, caller_cred)
+ request_hash = None
+ aggregates[net_hrn].create_slice(credential, hrn, rspec, request_hash, origin_hrn)
except:
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)
+ aggregates[net_hrn].create_slice(credential, hrn, rspec, request_hash, origin_hrn)
else:
try:
- request_hash = None
- aggregates[net_hrn].create_slice(credential, hrn, rspecs[net_hrn], request_hash, caller_cred)
+ request_hash = None
+ aggregates[net_hrn].create_slice(credential, hrn, rspecs[net_hrn], request_hash, origin_hrn)
except:
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)
+ aggregates[net_hrn].create_slice(credential, hrn, rspecs[net_hrn], request_hash, origin_hrn)
else:
# lets forward this rspec to a sm that knows about the network
arg_list = [credential, net_hrn]
if network_networks:
try:
request_hash = None
- aggregates[aggregate].create_slice(credential, hrn, rspecs[net_hrn], request_hash, caller_cred)
+ aggregates[aggregate].create_slice(credential, hrn, rspecs[net_hrn], request_hash, origin_hrn)
except:
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)
+ aggregates[aggregate].create_slice(credential, hrn, rspecs[net_hrn], request_hash, origin_hrn)
except:
print >> log, "Error creating slice %(hrn)s at aggregate %(net_hrn)s" % locals()
except:
aggregates[aggregate].stop_slice(credential, hrn, request_hash)
+ def sync_slice(self, old_record, new_record, peer):
+ if old_record['expires'] != new_record['expires']:
+ if peer:
+ self.api.plshell.UnBindObjectFromPeer(self.api.plauth, 'slice', old_record['slice_id'], peer)
+ self.api.plshell.UpdateSlice(self.api.plauth, old_record['slice_id'], {'expires' : new_record['expires']})
+ if peer:
+ self.api.plshell.BindObjectToPeer(self.api.plauth, 'slice', old_record['slice_id'], peer, old_record['peer_slice_id'])
+ return 1
git://git.onelab.eu / sfa.git / blobdiff