X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fmanagers%2Faggregate_manager_pl.py;h=c0e9d9ebcb6929f4d4d2e7c6e58f607b5a904f05;hb=0cf0d31c313a366e3f272f830bdb4f2a7308e11f;hp=4e31045ff4f3a60f04600dee693ce8f39995938f;hpb=662ea2bdd8886f7ed791205341422caff8b4cbe8;p=sfa.git diff --git a/sfa/managers/aggregate_manager_pl.py b/sfa/managers/aggregate_manager_pl.py index 4e31045f..c0e9d9eb 100644 --- a/sfa/managers/aggregate_manager_pl.py +++ b/sfa/managers/aggregate_manager_pl.py @@ -5,7 +5,7 @@ import datetime import time import traceback import sys - +import re from types import StringTypes from sfa.util.namespace import * from sfa.util.rspec import * @@ -15,7 +15,6 @@ from sfa.util.record import SfaRecord from sfa.util.policy import Policy from sfa.util.record import * from sfa.util.sfaticket import SfaTicket -from sfa.util.debug import log from sfa.plc.slices import Slices from sfa.trust.credential import Credential import sfa.plc.peers as peers @@ -37,24 +36,28 @@ def __get_registry_objects(slice_xrn, creds, users): reg_objects = None if users: + # dont allow special characters in the site login base + only_alphanumeric = re.compile('[^a-zA-Z0-9]+') + login_base = only_alphanumeric.sub('', hrn_auth[:20]).lower() + reg_objects = {} site = {} site['site_id'] = 0 - site['name'] = 'geni.%s' % hrn_auth + site['name'] = 'geni.%s' % login_base site['enabled'] = True site['max_slices'] = 100 # Note: # Is it okay if this login base is the same as one already at this myplc site? # Do we need uniqueness? Should use hrn_auth instead of just the leaf perhaps? - site['login_base'] = get_leaf(hrn_auth) - site['abbreviated_name'] = hrn + site['login_base'] = login_base + site['abbreviated_name'] = login_base site['max_slivers'] = 1000 reg_objects['site'] = site slice = {} - slice['expires'] = int(mktime(Credential(string=creds[0]).get_lifetime().timetuple())) + slice['expires'] = int(time.mktime(Credential(string=creds[0]).get_lifetime().timetuple())) slice['hrn'] = hrn slice['name'] = site['login_base'] + "_" + get_leaf(hrn) slice['url'] = hrn @@ -79,11 +82,10 @@ def __get_hostnames(nodes): hostnames.append(node.hostname) return hostnames - - def get_version(): version = {} version['geni_api'] = 1 + version['sfa'] = 1 return version def slice_status(api, slice_xrn, creds): @@ -111,12 +113,13 @@ def create_slice(api, slice_xrn, creds, rspec, users): site_id, remote_site_id = slices.verify_site(registry, credential, hrn, peer, sfa_peer, reg_objects) - slice = slices.verify_slice(registry, credential, hrn, site_id, + slice_record = 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) @@ -127,18 +130,20 @@ def create_slice(api, slice_xrn, creds, rspec, users): # add nodes from rspec added_nodes = list(set(request).difference(current)) - - if peer: - api.plshell.UnBindObjectFromPeer(api.plauth, 'slice', slice.id, peer) - api.plshell.AddSliceToNodes(api.plauth, slice.name, added_nodes) - api.plshell.DeleteSliceFromNodes(api.plauth, slice.name, deleted_nodes) + try: + if peer: + api.plshell.UnBindObjectFromPeer(api.plauth, 'slice', slice.id, peer) + + api.plshell.AddSliceToNodes(api.plauth, slice.name, added_nodes) + api.plshell.DeleteSliceFromNodes(api.plauth, slice.name, deleted_nodes) - network.updateSliceTags() + network.updateSliceTags() - if peer: - api.plshell.BindObjectToPeer(api.plauth, 'slice', slice.id, peer, - slice.peer_id) + finally: + if peer: + api.plshell.BindObjectToPeer(api.plauth, 'slice', slice.id, peer, + slice.peer_id) # print network.toxml() @@ -199,14 +204,16 @@ def delete_slice(api, xrn, creds): # determine if this is a peer slice peer = peers.get_peer(api, hrn) - if peer: - api.plshell.UnBindObjectFromPeer(api.plauth, 'slice', slice['slice_id'], peer) - api.plshell.DeleteSliceFromNodes(api.plauth, slicename, slice['node_ids']) - if peer: - api.plshell.BindObjectToPeer(api.plauth, 'slice', slice['slice_id'], peer, slice['peer_slice_id']) + try: + if peer: + api.plshell.UnBindObjectFromPeer(api.plauth, 'slice', slice['slice_id'], peer) + api.plshell.DeleteSliceFromNodes(api.plauth, slicename, slice['node_ids']) + finally: + if peer: + api.plshell.BindObjectToPeer(api.plauth, 'slice', slice['slice_id'], peer, slice['peer_slice_id']) return 1 -def get_slices(api): +def get_slices(api, creds): # look in cache first if api.cache: slices = api.cache.get('slices') @@ -229,11 +236,6 @@ def get_rspec(api, creds, options): xrn = options.get('geni_slice_urn', None) hrn, type = urn_to_hrn(xrn) - # get hrn of the original caller - origin_hrn = options.get('origin_hrn', None) - if not origin_hrn: - origin_hrn = Credential(string=creds[0]).get_gid_caller().get_hrn() - # look in cache first if api.cache and not xrn: rspec = api.cache.get('nodes') @@ -254,7 +256,9 @@ def get_rspec(api, creds, options): return rspec -def get_ticket(api, xrn, rspec, origin_hrn=None, reg_objects=None): +def get_ticket(api, xrn, creds, rspec, users): + + reg_objects = __get_registry_objects(xrn, creds, users) slice_hrn, type = urn_to_hrn(xrn) slices = Slices(api) @@ -264,7 +268,7 @@ def get_ticket(api, xrn, rspec, origin_hrn=None, reg_objects=None): # get the slice record registry = api.registries[api.hrn] credential = api.getCredential() - records = registry.resolve(credential, xrn) + records = registry.Resolve(xrn, credential) # similar to create_slice, we must verify that the required records exist # at this aggregate before we can issue a ticket