X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=rest%2Fsfa_api.py;h=39ede6a80bb8273d239a5f7822955e2150bd6b0e;hb=d231d3a56baf8d321ab4e37eb309507e28788b2e;hp=f4eafd22c587504350dc1e52f624bf2b940a1fa7;hpb=13f060d0ef33b6a6069fe47fc9b1d2ac16eab051;p=myslice.git diff --git a/rest/sfa_api.py b/rest/sfa_api.py index f4eafd22..39ede6a8 100644 --- a/rest/sfa_api.py +++ b/rest/sfa_api.py @@ -14,6 +14,7 @@ from sfa.client.return_value import ReturnValue from sfa.util.xrn import Xrn, get_leaf, get_authority, hrn_to_urn, urn_to_hrn from manifold.core.query import Query +from manifold.operators.rename import do_rename from manifoldapi.manifoldapi import execute_admin_query @@ -23,12 +24,15 @@ from myslice.settings import logger, config from rest.json_encoder import MyEncoder +import uuid +def unique_call_id(): return uuid.uuid4().urn + def dispatch(request, method): hrn = '' urn = '' object_type = '' - rspec = '' + rspec = None recursive = False options = dict() platforms = list() @@ -41,28 +45,39 @@ def dispatch(request, method): elif request.method == 'GET': req_items = request.GET - for el in req_items.items(): - if el[0].startswith('rspec'): - rspec += el[1] - elif el[0].startswith('platform'): - platforms = req_items.getlist('platform[]') - #elif el[0].startswith('options'): - # options += req_items.getlist('options[]') - elif el[0].startswith('hrn'): - hrn = el[1] - elif el[0].startswith('urn'): - urn = el[1] - elif el[0].startswith('type'): - object_type = el[1] - elif el[0].startswith('recursive'): - if el[1] == '1': + logger.debug("dispatch got = %s" % req_items.dict()) + #t = dict(req_items.iterlists()) + #rspec = req_items.getlist('rspec') + #logger.debug("dispatch got = %s" % t) + + platforms = req_items.getlist('platform[]') + logger.debug("req_items type = %s" % type(req_items.dict())) + for k in req_items.dict(): + logger.debug(k) + if k == 'rspec': + rspec = req_items.get(k) + if k == 'hrn': + hrn = req_items.get(k) + if k == 'urn': + urn = req_items.get(k) + if k == 'type': + object_type = req_items.get(k) + if k == 'recursive': + if v == '1': recursive = True else: recursive = False - elif el[0].startswith('display'): - display = el[1] + if k == 'display': + display = req_items.get(k) - results = sfa_client(request, method, hrn=hrn, urn=urn, object_type=object_type, recursive=recursive, options=options, platforms=platforms) + if rspec is not None: + try: + rspec = json.loads(rspec) + except Exception,e: + logger.debug("rspec type = %s" % type(rspec)) + if type(rspec) is dict: + rspec = xmltodict.unparse(rspec) + results = sfa_client(request, method, hrn=hrn, urn=urn, object_type=object_type, rspec=rspec, recursive=recursive, options=options, platforms=platforms) if display == 'table': return render_to_response('table-default.html', {'data' : data, 'fields' : columns, 'id' : '@component_id', 'options' : None}) else: @@ -112,6 +127,8 @@ def sfa_client(request, method, hrn=None, urn=None, object_type=None, rspec=None object_type = '' if rspec is None: rspec = '' + else: + logger.debug("RSPEC = %s" % rspec) if recursive is None: recursive = False if options is None: @@ -130,7 +147,7 @@ def sfa_client(request, method, hrn=None, urn=None, object_type=None, rspec=None raise Exception, "Provide urn OR hrn + type as parameters of method %s" % method if len(platforms)==0: - platforms = get_platforms() + platforms = get_platforms(request) #platforms.append('myslice') #results = {'method':method,'platforms':platforms,'rspec':rspec,'options':options} @@ -139,22 +156,21 @@ def sfa_client(request, method, hrn=None, urn=None, object_type=None, rspec=None data = [] columns = [] api_options = {} - api_options['geni_rspec_version'] = {'type': 'GENI', 'version': '3'} api_options['list_leases'] = 'all' server_am = False for pf in platforms: - platform = get_platform_config(pf) - logger.debug("platform={}".format(platform)) + platform = get_platform_config(request, pf) + if 'rspec_type' in platform and 'rspec_version' in platform: + api_options['geni_rspec_version'] = {'type': platform['rspec_type'],'version': platform['rspec_version']} + else: + api_options['geni_rspec_version'] = {'type': 'GENI', 'version': '3'} if 'sm' in platform and len(platform['sm']) > 0: - logger.debug('sm') server_am = True server_url = platform['sm'] if 'rm' in platform and len(platform['rm']) > 0: - logger.debug('rm') server_am = False server_url = platform['rm'] if 'registry' in platform and len(platform['registry']) > 0: - logger.debug('registry') server_am = False server_url = platform['registry'] @@ -186,6 +202,7 @@ def sfa_client(request, method, hrn=None, urn=None, object_type=None, rspec=None elif 'user_credential' in user_config: user_cred = user_config['user_credential'] else: + logger.error("no user credentials for user = ", user_email) user_cred = {} if object_type: @@ -197,6 +214,11 @@ def sfa_client(request, method, hrn=None, urn=None, object_type=None, rspec=None for obj_name, cred in user_config['%s_credentials'%object_type].items(): if obj_name == hrn: object_cred = cred + else: + logger.error("no credentials for object") + logger.error(object_type) + logger.error(object_name) + object_cred = {} # Both AM & Registry if method == "GetVersion": @@ -215,7 +237,6 @@ def sfa_client(request, method, hrn=None, urn=None, object_type=None, rspec=None elif method == "Describe": version = server.GetVersion() - logger.debug(version['geni_api']) # if GetVersion = v2 if version['geni_api'] == 2: # ListResources(slice_hrn) @@ -225,7 +246,9 @@ def sfa_client(request, method, hrn=None, urn=None, object_type=None, rspec=None # else GetVersion = v3 else: result = server.Describe([urn] ,[object_cred], api_options) - dict_result = xmltodict.parse(result['value']['geni_rspec']) + if isinstance(result, dict): + if result['value'] != 0: + dict_result = xmltodict.parse(result['value']['geni_rspec']) result['parsed'] = dict_result if 'rspec' in dict_result and 'node' in dict_result['rspec']: @@ -242,28 +265,37 @@ def sfa_client(request, method, hrn=None, urn=None, object_type=None, rspec=None elif method == 'Delete': result = server.Delete([urn] ,[object_cred], api_options) elif method == 'Allocate': - # if GetVersion = v2 - # CreateSliver(slice_hrn) - # else GetVersion = v3 api_options['call_id'] = unique_call_id() # List of users comes from the Registry - api_options['sfa_users'] = sfa_users - api_options['geni_users'] = geni_users - result = server.Allocate([urn] ,[object_cred], rspec, api_options) + users = get_users_in_slice(request, hrn) + api_options['sfa_users'] = users + api_options['geni_users'] = users + # if GetVersion = v2 + version = server.GetVersion() + if version['geni_api'] == 2: + result = server.CreateSliver([urn] ,[object_cred], rspec, api_options) + # else GetVersion = v3 + else: + result = server.Allocate(urn ,[object_cred], rspec, api_options) elif method == 'Provision': # if GetVersion = v2 # Nothing it is not supported by v2 AMs - api_options['call_id'] = unique_call_id() + version = server.GetVersion() # List of users comes from the Registry - api_options['sfa_users'] = sfa_users - api_options['geni_users'] = geni_users - result = server.Provision([urn] ,[object_cred], api_options) + users = get_users_in_slice(request, hrn) + api_options['sfa_users'] = users + api_options['geni_users'] = users + if version['geni_api'] == 3: + api_options['call_id'] = unique_call_id() + result = server.Provision([urn] ,[object_cred], api_options) elif method == 'Status': result = server.Status([urn] ,[object_cred], api_options) elif method == 'PerformOperationalAction': # if GetVersion = v2 # Nothing it is not supported by v2 AMs - result = server.PerformOperationalAction([urn] ,[object_cred], action, api_options) + version = server.GetVersion() + if version['geni_api'] == 3: + result = server.PerformOperationalAction([urn] ,[object_cred], action, api_options) elif method == 'Shutdown': result = server.Shutdown(urn ,[object_cred], api_options) else: @@ -322,11 +354,35 @@ def sfa_client(request, method, hrn=None, urn=None, object_type=None, rspec=None results['columns'] = columns return results +def rename(self,key,new_key): + ind = self._keys.index(key) #get the index of old key, O(N) operation + self._keys[ind] = new_key #replace old key with new key in self._keys + self[new_key] = self[key] #add the new key, this is added at the end of self._keys + self._keys.pop(-1) #pop the last item in self._keys + +def get_users_in_slice(request, slice_hrn): + # select users.user_hrn, users.user_email, users.keys + # from myslice:slice + # where slice_hrn=='onelab.upmc.r2d2.slice1' + users_query = Query().get('myslice:slice').filter_by('slice_hrn', '==', slice_hrn).select('users.user_hrn', 'users.user_urn', 'users.user_email','users.keys') + users = execute_admin_query(request, users_query) + rmap = {'user_urn':'urn','user_email':'email','user_hrn':'hrn'} + res = list() + for u in users[0]['users']: + r_user = dict() + for k,v in u.items(): + if k in rmap.keys(): + r_user[rmap[k]] = v + else: + r_user[k]=v + res.append(r_user) + return res + def get_user_config(request, user_email, platform_name): account = get_user_account(request, user_email, platform_name) return json.loads(account['config']) if account['config'] else {} -def get_platforms(): +def get_platforms(request): ret = list() platform_query = Query().get('local:platform').filter_by('gateway_type', '==', 'sfa').filter_by('disabled','==',0).select('platform') platforms = execute_admin_query(request, platform_query) @@ -335,8 +391,7 @@ def get_platforms(): ret.append(p['platform']) return ret - -def get_platform_config(platform_name): +def get_platform_config(request, platform_name): platform_query = Query().get('local:platform').filter_by('platform', '==', platform_name).select('platform', 'config') platforms = execute_admin_query(request, platform_query)