From: Loic Baron Date: Mon, 9 Nov 2015 17:49:28 +0000 (+0100) Subject: Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=commitdiff_plain;h=ddcdaf8d61df7f4a2a0da11c23190b56ed914464;hp=-c Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab Conflicts: rest/sfa_api.py --- ddcdaf8d61df7f4a2a0da11c23190b56ed914464 diff --combined rest/sfa_api.py index 42b26f5b,39ede6a8..b35fa35c --- a/rest/sfa_api.py +++ b/rest/sfa_api.py @@@ -2,41 -2,40 +2,44 @@@ import o import json import ConfigParser import datetime -from time import mktime +from time import mktime +import time import xmltodict -from django.shortcuts import render_to_response -from django.http import HttpResponse +from django.shortcuts import render_to_response +from django.http import HttpResponse,QueryDict -from sfa.trust.certificate import Keypair, Certificate -from sfa.client.sfaserverproxy import SfaServerProxy -from sfa.client.return_value import ReturnValue -from sfa.util.xrn import Xrn, get_leaf, get_authority, hrn_to_urn, urn_to_hrn +from sfa.trust.certificate import Keypair, Certificate +from sfa.client.sfaserverproxy import SfaServerProxy +from manifold.gateways.sfa.proxy import SFAProxy +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 manifold.core.query import Query -from manifoldapi.manifoldapi import execute_admin_query +from manifoldapi.manifoldapi import execute_admin_query -from unfold.loginrequired import LoginRequiredView +from unfold.loginrequired import LoginRequiredView -from myslice.settings import logger, config +from myslice.settings import logger, config -from rest.json_encoder import MyEncoder +from repoze.lru import lru_cache +from rest.json_encoder import MyEncoder + import uuid + def unique_call_id(): return uuid.uuid4().urn + def dispatch(request, method): - hrn = '' - urn = '' - object_type = '' + hrn = None + urn = None + object_type = None rspec = None + output_format = None recursive = False - options = dict() - platforms = list() + # Have to be hashable for lru_cache + options = frozenset() # dict() + platforms = frozenset() # list() results = dict() display = None @@@ -46,35 -45,39 +49,45 @@@ elif request.method == 'GET': req_items = request.GET - logger.debug("URL = %s" % request.build_absolute_uri()) - - for el in req_items.items(): - if el[0].startswith('rspec'): - rspec += el[1] - elif el[0].startswith('platform'): - platforms = frozenset(req_items.getlist('platform[]')) - elif el[0].startswith('options'): - options_url = el[1] #req_items.getlist('options') - options = QueryDict(options_url) - elif el[0].startswith('output_format'): - output_format = el[1] #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) ++ logger.debug("key = %s - value = %s" % (k,req_items.get(k))) + if k == 'rspec': + rspec = req_items.get(k) ++ if k == 'options': ++ options = req_items.get(k) ++ if k == 'output_format': ++ output_format = 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) + + 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) + + start_time = time.time() - results = sfa_client(request, method, hrn, urn, object_type, rspec, recursive, options, platforms, output_format, False) ++ results = sfa_client(request, method, hrn=hrn, urn=urn, object_type=object_type, rspec=rspec, recursive=recursive, options=options, platforms=platforms, output_format=output_format, admin=False) + logger.debug("EXEC TIME - sfa_client() - %s sec." % (time.time() - start_time)) if display == 'table': return render_to_response('table-default.html', {'data' : data, 'fields' : columns, 'id' : '@component_id', 'options' : None}) else: @@@ -102,8 -105,7 +115,8 @@@ def get_user_account(request, user_emai return accounts[0] -def sfa_client(request, method, hrn=None, urn=None, object_type=None, rspec=None, recursive=None, options=None, platforms=None, admin=False): +#@lru_cache(100) +def sfa_client(request, method, hrn=None, urn=None, object_type=None, rspec=None, recursive=False, options=None, platforms=None, output_format=None, admin=False): Config = ConfigParser.ConfigParser() monitor_file = os.path.abspath(os.path.dirname(__file__) + '/../myslice/monitor.ini') @@@ -125,6 -127,8 +138,8 @@@ object_type = '' if rspec is None: rspec = '' + else: + logger.debug("RSPEC = %s" % rspec) if recursive is None: recursive = False if options is None: @@@ -156,17 -160,17 +171,17 @@@ server_am = False for pf in platforms: platform = get_platform_config(request, pf) - logger.debug("platform={}".format(platform)) + 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'] @@@ -189,33 -193,13 +204,31 @@@ return {'error' : '-2'} server = SfaServerProxy(server_url, pkey, cert) + #server = SFAProxy(server_url, pkey, cert) + if 'geni_rspec_version' in options: + # GetVersion to know if the AM supports the requested version + # if not ask for the default GENI v3 + start_time = time.time() + result = server.GetVersion() + logger.debug("EXEC TIME - GetVersion() - %s sec." % (time.time() - start_time)) - logger.debug(result) - logger.debug(result['value']) + if 'geni_ad_rspec_versions' in result['value']: + for v in result['value']['geni_ad_rspec_versions']: + if v['type'] == options['geni_rspec_version']: + api_options['geni_rspec_version'] = {'type': options['geni_rspec_version']} + break + else: + api_options['geni_rspec_version'] = {'type': 'GENI', 'version': '3'} + else: + api_options['geni_rspec_version'] = {'type': 'GENI', 'version': '3'} try: # Get user config from Manifold user_config = get_user_config(request, user_email, pf) if 'delegated_user_credential' in user_config: + logger.debug('delegated_user_credential') user_cred = user_config['delegated_user_credential'] elif 'user_credential' in user_config: + logger.debug('user_credential') user_cred = user_config['user_credential'] else: logger.error("no user credentials for user = ", user_email) @@@ -223,12 -207,10 +236,12 @@@ if object_type: if 'delegated_%s_credentials'%object_type in user_config: + logger.debug('delegated_%s_credentials'%object_type) for obj_name, cred in user_config['delegated_%s_credentials'%object_type].items(): if obj_name == hrn: object_cred = cred elif '%s_credentials'%object_type in user_config: + logger.debug('%s_credentials'%object_type) for obj_name, cred in user_config['%s_credentials'%object_type].items(): if obj_name == hrn: object_cred = cred @@@ -240,19 -222,12 +253,19 @@@ # Both AM & Registry if method == "GetVersion": + start_time = time.time() result = server.GetVersion() + logger.debug("EXEC TIME - GetVersion() - %s sec." % (time.time() - start_time)) else: # AM API Calls if server_am: if method == "ListResources": + logger.debug(api_options) + #logger.debug(user_cred) + start_time = time.time() result = server.ListResources([user_cred], api_options) + logger.debug("EXEC TIME - ListResources() - %s sec." % (time.time() - start_time)) + #logger.debug(result) dict_result = xmltodict.parse(result['value']) result['parsed'] = dict_result if isinstance(dict_result['rspec']['node'], list): @@@ -261,10 -236,7 +274,10 @@@ columns.extend(dict_result['rspec']['node'].keys()) elif method == "Describe": + start_time = time.time() version = server.GetVersion() + logger.debug("EXEC TIME - GetVersion() - %s sec." % (time.time() - start_time)) + logger.debug(version['geni_api']) # if GetVersion = v2 if version['geni_api'] == 2: # ListResources(slice_hrn) @@@ -295,24 -267,26 +308,26 @@@ elif method == 'Allocate': 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 + 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) + result = server.Allocate(urn ,[object_cred], rspec, api_options) elif method == 'Provision': # if GetVersion = v2 # Nothing it is not supported by v2 AMs version = server.GetVersion() + # List of users comes from the Registry + 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() - # 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) elif method == 'Status': result = server.Status([urn] ,[object_cred], api_options) @@@ -363,13 -337,6 +378,14 @@@ #return HttpResponse(json.dumps({'error' : '-3','msg':'method not supported by Registry'}), content_type="application/json") logger.debug('method %s not handled by Registry' % method) result = [] + if output_format is not None: ++ logger.debug("result = " % result) + if 'value' in result: + # TODO Python Caching + # to avoid translating the same RSpec in the same format several times + start_time = time.time() + result = translate(result['value'],output_format) + logger.debug("EXEC TIME - translate() - %s sec." % (time.time() - start_time)) results[pf] = result if dict_result: @@@ -382,23 -349,35 +398,47 @@@ import traceback logger.error(traceback.format_exc()) logger.error(e) - results[pf] = {'error':'-3', 'error_msg': str(e)} + results[pf] = {'error':'-3', 'result':result,'error_msg': str(e)} results['columns'] = columns return results +@lru_cache(100) +def translate(rspec, output_format): + import urllib + import urllib2 + + values = {'content' : rspec} + url = 'https://demo.fiteagle.org/omnweb/convert/to/' + output_format + data = urllib.urlencode(values) + req = urllib2.Request(url, data) + response = urllib2.urlopen(req) + return response.read() + + 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 {}