X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fplc%2Fslices.py;h=cfeed465ed716fbb2dc58625678a3a0f26583593;hb=3d7237fa0b5f2b4a60cb97c7fb3b6aecfd94558a;hp=c001c3c94941b376e078752506584ad27c1891fd;hpb=89b3f9326a2612be2d9bf035f41f83636118d1fa;p=sfa.git diff --git a/sfa/plc/slices.py b/sfa/plc/slices.py index c001c3c9..cfeed465 100644 --- a/sfa/plc/slices.py +++ b/sfa/plc/slices.py @@ -7,12 +7,12 @@ import traceback import sys from types import StringTypes -from sfa.util.misc import * +from sfa.util.namespace import * from sfa.util.rspec import * from sfa.util.specdict import * from sfa.util.faults import * from sfa.util.storage import * -from sfa.util.record import GeniRecord +from sfa.util.record import SfaRecord from sfa.util.policy import Policy from sfa.util.prefixTree import prefixTree from sfa.util.debug import log @@ -36,7 +36,7 @@ class Slices(SimpleStorage): SimpleStorage.__init__(self, self.slices_file) self.policy = Policy(self.api) self.load() - self.origin_hrn=origin_hrn + self.origin_hrn = origin_hrn def get_slivers(self, hrn, node=None): @@ -214,8 +214,7 @@ class Slices(SimpleStorage): success = False # request hash is optional so lets try the call without it try: - request_hash=None - slices = aggregates[aggregate].get_slices(credential, request_hash) + slices = aggregates[aggregate].get_slices(credential) slice_hrns.extend(slices) success = True except: @@ -225,9 +224,8 @@ class Slices(SimpleStorage): # try sending the request hash if the previous call failed if not success: arg_list = [credential] - request_hash = self.api.key.compute_hash(arg_list) try: - slices = aggregates[aggregate].get_slices(credential, request_hash) + slices = aggregates[aggregate].get_slices(credential) slice_hrns.extend(slices) success = True except: @@ -249,80 +247,9 @@ class Slices(SimpleStorage): self.write() - def delete_slice(self, hrn): - if self.api.interface in ['aggregate']: - self.delete_slice_aggregate(hrn) - elif self.api.interface in ['slicemgr']: - self.delete_slice_smgr(hrn) - - def delete_slice_aggregate(self, hrn): - - slicename = hrn_to_pl_slicename(hrn) - slices = self.api.plshell.GetSlices(self.api.plauth, {'name': slicename}) - if not slices: - return 1 - slice = slices[0] - - # determine if this is a peer slice - peer = self.get_peer(hrn) - if peer: - self.api.plshell.UnBindObjectFromPeer(self.api.plauth, 'slice', slice['slice_id'], peer) - self.api.plshell.DeleteSliceFromNodes(self.api.plauth, slicename, slice['node_ids']) - if peer: - self.api.plshell.BindObjectToPeer(self.api.plauth, 'slice', slice['slice_id'], peer, slice['peer_slice_id']) - return 1 - - def delete_slice_smgr(self, hrn): - credential = self.api.getCredential() - 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, origin_hrn) - success = True - except: - print >> log, "%s" % (traceback.format_exc()) - print >> log, "Error calling list nodes at aggregate %s" % aggregate - - # try sending the request hash if the previous call failed - if not success: - try: - arg_list = [credential, hrn] - request_hash = self.api.key.compute_hash(arg_list) - aggregates[aggregate].delete_slice(credential, hrn, request_hash, origin_hrn) - success = True - except: - print >> log, "%s" % (traceback.format_exc()) - print >> log, "Error calling list nodes at aggregate %s" % aggregate - - def create_slice(self, hrn, rspec): - - # check our slice policy before we procede - whitelist = self.policy['slice_whitelist'] - blacklist = self.policy['slice_blacklist'] - - if whitelist and hrn not in whitelist or \ - blacklist and hrn in blacklist: - policy_file = self.policy.policy_file - print >> log, "Slice %(hrn)s not allowed by policy %(policy_file)s" % locals() - return 1 - - if self.api.interface in ['aggregate']: - self.create_slice_aggregate(hrn, rspec) - elif self.api.interface in ['slicemgr']: - self.create_slice_smgr(hrn, rspec) - def verify_site(self, registry, credential, slice_hrn, peer, sfa_peer): authority = get_authority(slice_hrn) - try: - site_records = registry.resolve(credential, authority) - except: - arg_list = [credential, authority] - request_hash = self.api.key.compute_hash(arg_list) - site_records = registry.resolve(credential, authority, request_hash) + site_records = registry.resolve(credential, authority) site = {} for site_record in site_records: @@ -341,12 +268,7 @@ class Slices(SimpleStorage): # mark this site as an sfa peer record if sfa_peer: peer_dict = {'type': 'authority', 'hrn': authority, 'peer_authority': sfa_peer, 'pointer': site_id} - try: - registry.register_peer_object(credential, peer_dict) - except: - arg_list = [credential] - request_hash = self.api.key.compute_hash(arg_list) - registry.register_peer_object(credential, peer_dict, request_hash) + registry.register_peer_object(credential, peer_dict) else: site_id = sites[0]['site_id'] remote_site_id = sites[0]['peer_site_id'] @@ -358,12 +280,7 @@ class Slices(SimpleStorage): slice = {} slice_record = None authority = get_authority(slice_hrn) - try: - slice_records = registry.resolve(credential, slice_hrn) - except: - arg_list = [credential, slice_hrn] - request_hash = self.api.key.compute_hash(arg_list) - slice_records = registry.resolve(credential, slice_hrn, request_hash) + slice_records = registry.resolve(credential, slice_hrn) for record in slice_records: if record['type'] in ['slice']: @@ -373,7 +290,7 @@ class Slices(SimpleStorage): 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'] @@ -389,12 +306,7 @@ class Slices(SimpleStorage): # mark this slice as an sfa peer record if sfa_peer: peer_dict = {'type': 'slice', 'hrn': slice_hrn, 'peer_authority': sfa_peer, 'pointer': slice_id} - try: - registry.register_peer_object(credential, peer_dict) - except: - arg_list = [credential] - request_hash = self.api.key.compute_hash(arg_list) - registry.register_peer_object(credential, peer_dict, request_hash) + registry.register_peer_object(credential, peer_dict) #this belongs to a peer if peer: @@ -404,6 +316,8 @@ class Slices(SimpleStorage): 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) @@ -417,12 +331,7 @@ class Slices(SimpleStorage): researchers = slice_record.get('researcher', []) for researcher in researchers: person_record = {} - try: - person_records = registry.resolve(credential, researcher) - except: - arg_list = [credential, researcher] - request_hash = self.api.key.compute_hash(arg_list) - person_records = registry.resolve(credential, researcher, request_hash) + person_records = registry.resolve(credential, researcher) for record in person_records: if record['type'] in ['user']: person_record = record @@ -448,12 +357,7 @@ class Slices(SimpleStorage): # mark this person as an sfa peer record if sfa_peer: peer_dict = {'type': 'user', 'hrn': researcher, 'peer_authority': sfa_peer, 'pointer': person_id} - try: - registry.register_peer_object(credential, peer_dict) - except: - arg_list = [credential] - request_hash = self.api.key.compute_hash(arg_list) - registry.register_peer_object(credential, peer_dict, request_hash) + registry.register_peer_object(credential, peer_dict) if peer: self.api.plshell.BindObjectToPeer(self.api.plauth, 'person', person_id, peer, person_dict['pointer']) @@ -575,129 +479,11 @@ class Slices(SimpleStorage): return 1 - def create_slice_smgr(self, hrn, 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('start_time'): start_time = specDict['start_time'] - else: start_time = 0 - if specDict.has_key('end_time'): end_time = specDict['end_time'] - else: end_time = 0 - - rspecs = {} - aggregates = Aggregates(self.api) - credential = self.api.getCredential() - - # split the netspecs into individual rspecs - netspecs = spec.getDictsByTagName('NetSpec') - for netspec in netspecs: - net_hrn = netspec['name'] - resources = {'start_time': start_time, 'end_time': end_time, 'networks': netspec} - resourceDict = {'RSpec': resources} - tempspec.parseDict(resourceDict) - rspecs[net_hrn] = tempspec.toxml() - - # send each rspec to the appropriate aggregate/sm - 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 - # 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]: - try: - 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, origin_hrn) - else: - try: - 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, origin_hrn) - else: - # 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: - try: - network_found = aggregates[aggregate].get_aggregates(credential, net_hrn) - except: - network_found = aggregates[aggregate].get_aggregates(credential, net_hrn, request_hash) - if network_networks: - try: - request_hash = None - 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, origin_hrn) - - except: - print >> log, "Error creating slice %(hrn)s at aggregate %(net_hrn)s" % locals() - traceback.print_exc() - return 1 - - - def start_slice(self, hrn): - if self.api.interface in ['aggregate']: - self.start_slice_aggregate(hrn) - elif self.api.interface in ['slicemgr']: - self.start_slice_smgr(hrn) - - def start_slice_aggregate(self, hrn): - slicename = hrn_to_pl_slicename(hrn) - slices = self.api.plshell.GetSlices(self.api.plauth, {'name': slicename}, ['slice_id']) - if not slices: - raise RecordNotFound(hrn) - slice_id = slices[0] - attributes = self.api.plshell.GetSliceAttributes(self.api.plauth, {'slice_id': slice_id, 'name': 'enabled'}, ['slice_attribute_id']) - attribute_id = attreibutes[0]['slice_attribute_id'] - self.api.plshell.UpdateSliceAttribute(self.api.plauth, attribute_id, "1" ) - return 1 - - def start_slice_smgr(self, hrn): - credential = self.api.getCredential() - aggregates = Aggregates(self.api) - for aggregate in aggregates: - aggregates[aggregate].start_slice(credential, hrn) - return 1 - - - def stop_slice(self, hrn): - if self.api.interface in ['aggregate']: - self.stop_slice_aggregate(hrn) - elif self.api.interface in ['slicemgr']: - self.stop_slice_smgr(hrn) - - def stop_slice_aggregate(self, hrn): - slicename = hrn_to_pl_slicename(hrn) - slices = self.api.plshell.GetSlices(self.api.plauth, {'name': slicename}, ['slice_id']) - if not slices: - raise RecordNotFound(hrn) - slice_id = slices[0]['slice_id'] - attributes = self.api.plshell.GetSliceAttributes(self.api.plauth, {'slice_id': slice_id, 'name': 'enabled'}, ['slice_attribute_id']) - attribute_id = attributes[0]['slice_attribute_id'] - self.api.plshell.UpdateSliceAttribute(self.api.plauth, attribute_id, "0") - return 1 - - 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: - try: - aggregates[aggregate].stop_slice(credential, hrn) - 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