X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fplc%2Fslices.py;h=3c535048405c8d3b4fa7d64d803c742f0c99cd03;hb=82f6b46e70dff8f7defd92177562c7d387b2f1fd;hp=2918dc3b1e3e5cfcd73386b908992385dc532b86;hpb=70a14e4f7178655da40764657415d6ff8df2d8d1;p=sfa.git diff --git a/sfa/plc/slices.py b/sfa/plc/slices.py index 2918dc3b..3c535048 100644 --- a/sfa/plc/slices.py +++ b/sfa/plc/slices.py @@ -11,31 +11,21 @@ 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 SfaRecord from sfa.util.policy import Policy from sfa.util.prefixTree import prefixTree from sfa.util.debug import log -from sfa.server.aggregate import Aggregates -from sfa.server.registry import Registries MAXINT = 2L**31-1 -class Slices(SimpleStorage): +class Slices: rspec_to_slice_tag = {'max_rate':'net_max_rate'} def __init__(self, api, ttl = .5, origin_hrn=None): self.api = api - self.ttl = ttl - self.threshold = None - path = self.api.config.SFA_DATA_DIR - filename = ".".join([self.api.interface, self.api.hrn, "slices"]) - filepath = path + os.sep + filename - self.slices_file = filepath - SimpleStorage.__init__(self, self.slices_file) + #filepath = path + os.sep + filename self.policy = Policy(self.api) - self.load() self.origin_hrn = origin_hrn def get_slivers(self, xrn, node=None): @@ -178,82 +168,7 @@ class Slices(SimpleStorage): return sfa_peer - def refresh(self): - """ - Update the cached list of slices - """ - # Reload components list - now = datetime.datetime.now() - if not self.has_key('threshold') or not self.has_key('timestamp') or \ - now > datetime.datetime.fromtimestamp(time.mktime(time.strptime(self['threshold'], self.api.time_format))): - if self.api.interface in ['aggregate']: - self.refresh_slices_aggregate() - elif self.api.interface in ['slicemgr']: - self.refresh_slices_smgr() - - def refresh_slices_aggregate(self): - slices = self.api.plshell.GetSlices(self.api.plauth, {'peer_id': None}, ['name']) - slice_hrns = [slicename_to_hrn(self.api.hrn, slice['name']) for slice in slices] - - # update timestamp and threshold - timestamp = datetime.datetime.now() - hr_timestamp = timestamp.strftime(self.api.time_format) - delta = datetime.timedelta(hours=self.ttl) - threshold = timestamp + delta - hr_threshold = threshold.strftime(self.api.time_format) - - slice_details = {'hrn': slice_hrns, - 'timestamp': hr_timestamp, - 'threshold': hr_threshold - } - self.update(slice_details) - self.write() - - - def refresh_slices_smgr(self): - slice_hrns = [] - aggregates = Aggregates(self.api) - credential = self.api.getCredential() - for aggregate in aggregates: - success = False - # request hash is optional so lets try the call without it - try: - slices = aggregates[aggregate].get_slices(credential) - slice_hrns.extend(slices) - success = True - except: - print >> log, "%s" % (traceback.format_exc()) - print >> log, "Error calling slices at aggregate %(aggregate)s" % locals() - - # try sending the request hash if the previous call failed - if not success: - arg_list = [credential] - try: - slices = aggregates[aggregate].get_slices(credential) - slice_hrns.extend(slices) - success = True - except: - print >> log, "%s" % (traceback.format_exc()) - print >> log, "Error calling slices at aggregate %(aggregate)s" % locals() - - # update timestamp and threshold - timestamp = datetime.datetime.now() - hr_timestamp = timestamp.strftime(self.api.time_format) - delta = datetime.timedelta(hours=self.ttl) - threshold = timestamp + delta - hr_threshold = threshold.strftime(self.api.time_format) - - slice_details = {'hrn': slice_hrns, - 'timestamp': hr_timestamp, - 'threshold': hr_threshold - } - self.update(slice_details) - self.write() - - def verify_site(self, registry, credential, slice_hrn, peer, sfa_peer): - import pdb - pdb.set_trace() authority = get_authority(slice_hrn) authority_urn = hrn_to_urn(authority, 'authority') site_records = registry.resolve(credential, authority_urn) @@ -343,10 +258,10 @@ class Slices(SimpleStorage): person_record = {} person_records = registry.resolve(credential, researcher) for record in person_records: - if record['type'] in ['user']: + if record['type'] in ['user'] and record['enabled']: person_record = record if not person_record: - pass + return 1 person_dict = person_record local_person=False if peer: @@ -422,8 +337,7 @@ class Slices(SimpleStorage): slicename = hrn_to_pl_slicename(hrn) slice = {} slice_record = None - registries = Registries(self.api) - registry = registries[self.api.hrn] + registry = self.api.registries[self.api.hrn] credential = self.api.getCredential() site_id, remote_site_id = self.verify_site(registry, credential, hrn, peer, sfa_peer) @@ -490,10 +404,13 @@ class Slices(SimpleStorage): return 1 def sync_site(self, old_record, new_record, peer): - if old_record['max_slices'] != new_record['max_slices']: + if old_record['max_slices'] != new_record['max_slices'] or old_record['max_slivers'] != new_record['max_slivers']: if peer: self.api.plshell.UnBindObjectFromPeer(self.api.plauth, 'site', old_record['site_id'], peer) + if old_record['max_slices'] != new_record['max_slices']: self.api.plshell.UpdateSite(self.api.plauth, old_record['site_id'], {'max_slices' : new_record['max_slices']}) + if old_record['max_slivers'] != new_record['max_slivers']: + self.api.plshell.UpdateSite(self.api.plauth, old_record['site_id'], {'max_slivers' : new_record['max_slivers']}) if peer: self.api.plshell.BindObjectToPeer(self.api.plauth, 'site', old_record['site_id'], peer, old_record['peer_site_id']) return 1 @@ -502,7 +419,7 @@ class Slices(SimpleStorage): 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']}) + 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