X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fmanagers%2Faggregate_manager_pl.py;h=9f407ee06312c6997e33f5ac2f78d5d8a45438f9;hb=c4e54513074736c39e0dc090a373d707a830dcb2;hp=e71fc6748dd2b1ad6e30398c95d5d83ac067a1c1;hpb=d459c7527226959e962bc4442c612d1b8c60bb03;p=sfa.git diff --git a/sfa/managers/aggregate_manager_pl.py b/sfa/managers/aggregate_manager_pl.py index e71fc674..9f407ee0 100644 --- a/sfa/managers/aggregate_manager_pl.py +++ b/sfa/managers/aggregate_manager_pl.py @@ -19,8 +19,10 @@ from sfa.trust.credential import Credential import sfa.plc.peers as peers from sfa.plc.network import * from sfa.plc.api import SfaAPI +from sfa.plc.aggregate import Aggregate from sfa.plc.slices import * from sfa.util.version import version_core +from sfa.rspecs.rspec_version import RSpecVersion from sfa.util.sfatime import utcparse from sfa.util.callids import Callids @@ -29,6 +31,9 @@ def GetVersion(api): return version_core({'interface':'aggregate', 'testbed':'myplc', 'hrn':xrn.get_hrn(), + 'input_rspec' : ['PG 2', 'SFA 1'], + 'output_rspec' : ["SFA 1"], + 'ad_rspec' : ["PG 2", "SFA 1"], }) def __get_registry_objects(slice_xrn, creds, users): @@ -95,8 +100,10 @@ def __get_hostnames(nodes): hostnames.append(node.hostname) return hostnames -def slice_status(api, slice_xrn, creds): - hrn, type = urn_to_hrn(slice_xrn) +def SliverStatus(api, slice_xrn, creds, call_id): + if Callids().already_handled(call_id): return {} + + (hrn, type) = urn_to_hrn(slice_xrn) # find out where this slice is currently running api.logger.info(hrn) slicename = hrn_to_pl_slicename(hrn) @@ -106,19 +113,12 @@ def slice_status(api, slice_xrn, creds): raise Exception("Slice %s not found (used %s as slicename internally)" % slice_xrn, slicename) slice = slices[0] - nodes = api.plshell.GetNodes(api.plauth, slice['node_ids'], - ['hostname', 'site_id', 'boot_state', 'last_contact']) + # report about the local nodes only + nodes = api.plshell.GetNodes(api.plauth, {'node_id':slice['node_ids'],'peer_id':None}, + ['hostname', 'site_id', 'boot_state', 'last_contact']) site_ids = [node['site_id'] for node in nodes] sites = api.plshell.GetSites(api.plauth, site_ids, ['site_id', 'login_base']) - sites_dict = {} - for site in sites: - sites_dict[site['site_id']] = site['login_base'] - - # XX remove me - #api.logger.info(slice_xrn) - #api.logger.info(slice) - #api.logger.info(nodes) - # XX remove me + sites_dict = dict ( [ (site['site_id'],site['login_base'] ) for site in sites ] ) result = {} top_level_status = 'unknown' @@ -134,7 +134,7 @@ def slice_status(api, slice_xrn, creds): res['pl_hostname'] = node['hostname'] res['pl_boot_state'] = node['boot_state'] res['pl_last_contact'] = node['last_contact'] - if not node['last_contact'] is None: + if node['last_contact'] is not None: res['pl_last_contact'] = datetime.datetime.fromtimestamp(node['last_contact']).ctime() res['geni_urn'] = hostname_to_urn(api.hrn, sites_dict[node['site_id']], node['hostname']) if node['boot_state'] == 'boot': @@ -154,7 +154,7 @@ def slice_status(api, slice_xrn, creds): # XX remove me return result -def CreateSliver(api, slice_xrn, creds, rspec, users, call_id): +def CreateSliver(api, slice_xrn, creds, rspec_string, users, call_id): """ Create the sliver[s] (slice) at this aggregate. Verify HRN and initialize the slice record in PLC if necessary. @@ -165,6 +165,7 @@ def CreateSliver(api, slice_xrn, creds, rspec, users, call_id): (hrn, type) = urn_to_hrn(slice_xrn) peer = None + aggregate = Aggregate(api) slices = Slices(api) peer = slices.get_peer(hrn) sfa_peer = slices.get_sfa_peer(hrn) @@ -173,44 +174,41 @@ def CreateSliver(api, slice_xrn, creds, rspec, users, call_id): (site_id, remote_site_id) = slices.verify_site(registry, credential, hrn, peer, sfa_peer, reg_objects) - slice_record = slices.verify_slice(registry, credential, hrn, site_id, + slice = slices.verify_slice(registry, credential, hrn, site_id, remote_site_id, peer, sfa_peer, reg_objects) - network = Network(api) - - slice = network.get_slice(api, hrn) - slice.peer_id = slice_record['peer_slice_id'] - current = __get_hostnames(slice.get_nodes()) - - network.addRSpec(rspec, api.config.SFA_AGGREGATE_RSPEC_SCHEMA) - request = __get_hostnames(network.nodesWithSlivers()) - + nodes = api.plshell.GetNodes(api.plauth, slice['node_ids'], ['hostname']) + current_slivers = [node['hostname'] for node in nodes] + rspec = parse_rspec(rspec_string) + requested_slivers = rspec.get_nodes_with_slivers() + # remove nodes not in rspec - deleted_nodes = list(set(current).difference(request)) + deleted_nodes = list(set(current_slivers).difference(requested_slivers)) # add nodes from rspec - added_nodes = list(set(request).difference(current)) + added_nodes = list(set(requested_slivers).difference(current_slivers)) try: if peer: - api.plshell.UnBindObjectFromPeer(api.plauth, 'slice', slice.id, peer) + api.plshell.UnBindObjectFromPeer(api.plauth, 'slice', slice['slice_id'], peer) - api.plshell.AddSliceToNodes(api.plauth, slice.name, added_nodes) - api.plshell.DeleteSliceFromNodes(api.plauth, slice.name, deleted_nodes) + api.plshell.AddSliceToNodes(api.plauth, slice['name'], added_nodes) + api.plshell.DeleteSliceFromNodes(api.plauth, slice['slice'], deleted_nodes) - network.updateSliceTags() + # TODO: update slice tags + #network.updateSliceTags() finally: if peer: api.plshell.BindObjectToPeer(api.plauth, 'slice', slice.id, peer, slice.peer_id) - # xxx - check this holds enough data for the client to understand what's happened - return network.toxml() + return aggregate.get_rspec(slice_xrn=slice_xrn) -def renew_slice(api, xrn, creds, expiration_time): - hrn, type = urn_to_hrn(xrn) +def RenewSliver(api, xrn, creds, expiration_time, call_id): + if Callids().already_handled(call_id): return True + (hrn, type) = urn_to_hrn(xrn) slicename = hrn_to_pl_slicename(hrn) slices = api.plshell.GetSlices(api.plauth, {'name': slicename}, ['slice_id']) if not slices: @@ -218,8 +216,11 @@ def renew_slice(api, xrn, creds, expiration_time): slice = slices[0] requested_time = utcparse(expiration_time) record = {'expires': int(time.mktime(requested_time.timetuple()))} - api.plshell.UpdateSlice(api.plauth, slice['slice_id'], record) - return 1 + try: + api.plshell.UpdateSlice(api.plauth, slice['slice_id'], record) + return True + except: + return False def start_slice(api, xrn, creds): hrn, type = urn_to_hrn(xrn) @@ -254,8 +255,9 @@ def reset_slice(api, xrn): # XX not implemented at this interface return 1 -def delete_slice(api, xrn, creds): - hrn, type = urn_to_hrn(xrn) +def DeleteSliver(api, xrn, creds, call_id): + if Callids().already_handled(call_id): return "" + (hrn, type) = urn_to_hrn(xrn) slicename = hrn_to_pl_slicename(hrn) slices = api.plshell.GetSlices(api.plauth, {'name': slicename}) if not slices: @@ -273,9 +275,13 @@ def delete_slice(api, xrn, creds): api.plshell.BindObjectToPeer(api.plauth, 'slice', slice['slice_id'], peer, slice['peer_slice_id']) return 1 -def get_slices(api, creds): +# xxx Thierry : caching at the aggregate level sounds wrong... +caching=True +#caching=False +def ListSlices(api, creds, call_id): + if Callids().already_handled(call_id): return [] # look in cache first - if api.cache: + if caching and api.cache: slices = api.cache.get('slices') if slices: return slices @@ -286,37 +292,39 @@ def get_slices(api, creds): slice_urns = [hrn_to_urn(slice_hrn, 'slice') for slice_hrn in slice_hrns] # cache the result - if api.cache: + if caching and api.cache: api.cache.add('slices', slice_urns) return slice_urns -# xxx Thierry : caching at the aggregate level sounds wrong... -caching=True -#caching=False def ListResources(api, creds, options,call_id): if Callids().already_handled(call_id): return "" # get slice's hrn from options xrn = options.get('geni_slice_urn', '') (hrn, type) = urn_to_hrn(xrn) + # get the rspec's return format from options + rspec_version = RSpecVersion(options.get('rspec_version', 'SFA 1')) + version_string = "rspec_%s_%s" % (rspec_version.format, rspec_version.version) + # look in cache first if caching and api.cache and not xrn: - rspec = api.cache.get('nodes') + rspec = api.cache.get(version_string) if rspec: api.logger.info("aggregate.ListResources: returning cached value for hrn %s"%hrn) return rspec - network = Network(api) - if (hrn): - if network.get_slice(api, hrn): - network.addSlice() - - rspec = network.toxml() + aggregate = Aggregate(api) + if xrn: + # get this rspec for the specified slice + rspec = aggregate.get_rspec(slice_xrn=hrn, version=rspec_version) + else: + # generate rspec in both pg and sfa formats + rspec = aggregate.get_rspec(version=rspec_version) # cache the result - if caching and api.cache and not xrn: - api.cache.add('nodes', rspec) + if caching and api.cache: + api.cache.add(version_string, rspec) return rspec