X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=rest%2Fsfa_api.py;h=cc9f9a1ea7d79e5fc05a4cd1ffdcd2b3ae97d2c3;hb=d035a1f93e4acbeee79b7c8200264687d940ccc2;hp=72f2f9249ba396b8dbcbae9be034aaeba1e0aefe;hpb=832a69800ec6ef9463cd0d937d635fa59da6d803;p=myslice.git diff --git a/rest/sfa_api.py b/rest/sfa_api.py index 72f2f924..cc9f9a1e 100644 --- a/rest/sfa_api.py +++ b/rest/sfa_api.py @@ -14,9 +14,8 @@ 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.models import db -from manifold.models.platform import Platform -from manifold.models.user import User + +from manifoldapi.manifoldapi import execute_admin_query from unfold.loginrequired import LoginRequiredView @@ -46,7 +45,7 @@ def dispatch(request, method): if el[0].startswith('rspec'): rspec += el[1] elif el[0].startswith('platform'): - platforms += req_items.getlist('platform[]') + platforms = req_items.getlist('platform[]') #elif el[0].startswith('options'): # options += req_items.getlist('options[]') elif el[0].startswith('hrn'): @@ -63,34 +62,39 @@ def dispatch(request, method): elif el[0].startswith('display'): display = el[1] - results = sfa_client(request, method, hrn, urn, object_type, recursive, options, platforms) - + results = sfa_client(request, method, hrn=hrn, urn=urn, object_type=object_type, 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: return HttpResponse(json.dumps(results, cls=MyEncoder), content_type="application/json") -def get_user_account(user_email, platform_name): +def get_user_account(request, user_email, platform_name): """ Returns the user configuration for a given platform. This function does not resolve references. """ - user = db.query(User).filter(User.email == user_email).one() - platform = db.query(Platform).filter(Platform.platform == platform_name).one() - accounts = [a for a in user.accounts if a.platform == platform] + user_query = Query().get('local:user').filter_by('email', '==', user_email).select('user_id') + user_details = execute_admin_query(request, user_query) + platform_query = Query().get('local:platform').filter_by('platform', '==', platform_name).select('platform_id') + platform_details = execute_admin_query(request, platform_query) + + account_query = Query().get('local:account').filter_by('platform_id','==',platform_details[0]['platform_id']).filter_by('user_id', '==', user_details[0]['user_id']).select('user_id','platform_id','auth_type','config') + accounts = execute_admin_query(request, account_query) + if not accounts: raise Exception, "this account does not exist" - if accounts[0].auth_type == 'reference': - pf = json.loads(accounts[0].config)['reference_platform'] - return get_user_account(user_email, pf) + if accounts[0]['auth_type'] == 'reference': + pf = json.loads(accounts[0]['config'])['reference_platform'] + return get_user_account(request, user_email, pf) 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): Config = ConfigParser.ConfigParser() - Config.read(os.getcwd() + "/myslice/monitor.ini") + monitor_file = os.path.abspath(os.path.dirname(__file__) + '/../myslice/monitor.ini') + Config.read(monitor_file) if admin: user_email, admin_password = config.manifold_admin_user_password() @@ -126,7 +130,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} @@ -138,9 +142,8 @@ def sfa_client(request, method, hrn=None, urn=None, object_type=None, rspec=None api_options['geni_rspec_version'] = {'type': 'GENI', 'version': '3'} api_options['list_leases'] = 'all' server_am = False - from manifoldapi.manifoldapi import execute_admin_query for pf in platforms: - platform = get_platform_config(pf) + platform = get_platform_config(request, pf) logger.debug("platform={}".format(platform)) if 'sm' in platform and len(platform['sm']) > 0: logger.debug('sm') @@ -156,29 +159,34 @@ def sfa_client(request, method, hrn=None, urn=None, object_type=None, rspec=None server_url = platform['registry'] if not Config.has_option('monitor', 'cert') : - return HttpResponse(json.dumps({'error' : '-1'}), content_type="application/json") + #return HttpResponse(json.dumps({'error' : '-1'}), content_type="application/json") + return {'error' : '-1', 'msg': 'monitor.ini has no cert configured'} cert = os.path.abspath(Config.get('monitor', 'cert')) if not os.path.isfile(cert) : - return HttpResponse(json.dumps({'error' : '-1'}), content_type="application/json") + #return HttpResponse(json.dumps({'error' : '-1'}), content_type="application/json") + return {'error' : '-1', 'msg': 'check cert file at %s'%cert} if not Config.has_option('monitor', 'pkey') : - return HttpResponse(json.dumps({'error' : '-2'}), content_type="application/json") + #return HttpResponse(json.dumps({'error' : '-2'}), content_type="application/json") + return {'error' : '-2'} pkey = os.path.abspath(Config.get('monitor', 'pkey')) if not os.path.isfile(pkey) : - return HttpResponse(json.dumps({'error' : '-2'}), content_type="application/json") + #return HttpResponse(json.dumps({'error' : '-2'}), content_type="application/json") + return {'error' : '-2'} server = SfaServerProxy(server_url, pkey, cert) try: # Get user config from Manifold - user_config = get_user_config(user_email, pf) + user_config = get_user_config(request, user_email, pf) if 'delegated_user_credential' in user_config: user_cred = user_config['delegated_user_credential'] 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: @@ -190,6 +198,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": @@ -199,8 +212,9 @@ def sfa_client(request, method, hrn=None, urn=None, object_type=None, rspec=None if server_am: if method == "ListResources": result = server.ListResources([user_cred], api_options) + logger.debug(result) dict_result = xmltodict.parse(result['value']) - result['json'] = json.dumps(dict_result) + result['parsed'] = dict_result if isinstance(dict_result['rspec']['node'], list): columns.extend(dict_result['rspec']['node'][0].keys()) else: @@ -218,13 +232,16 @@ 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['json'] = json.dumps(dict_result) - if isinstance(dict_result['rspec']['node'], list): - columns.extend(dict_result['rspec']['node'][0].keys()) - else: - columns.extend(dict_result['rspec']['node'].keys()) + result['parsed'] = dict_result + if 'rspec' in dict_result and 'node' in dict_result['rspec']: + if isinstance(dict_result['rspec']['node'], list): + columns.extend(dict_result['rspec']['node'][0].keys()) + else: + columns.extend(dict_result['rspec']['node'].keys()) elif method == 'Renew': # Renew till 1 month from now @@ -234,28 +251,35 @@ 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) + # 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() - # 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) + version = server.GetVersion() + 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) 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: @@ -300,10 +324,11 @@ def sfa_client(request, method, hrn=None, urn=None, object_type=None, rspec=None results[pf] = result if dict_result: - if isinstance(dict_result['rspec']['node'], list): - data = data + dict_result['rspec']['node'] - else: - data.append(dict_result['rspec']['node']) + if 'rspec' in dict_result and 'node' in dict_result['rspec']: + if isinstance(dict_result['rspec']['node'], list): + data = data + dict_result['rspec']['node'] + else: + data.append(dict_result['rspec']['node']) except Exception,e: import traceback logger.error(traceback.format_exc()) @@ -313,21 +338,24 @@ def sfa_client(request, method, hrn=None, urn=None, object_type=None, rspec=None results['columns'] = columns return results -def get_user_config(user_email, platform_name): - account = get_user_account(user_email, platform_name) - return json.loads(account.config) if account.config else {} +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() - platforms = db.query(Platform).filter(Platform.gateway_type == 'sfa', Platform.disabled == 0).all() + platform_query = Query().get('local:platform').filter_by('gateway_type', '==', 'sfa').filter_by('disabled','==',0).select('platform') + platforms = execute_admin_query(request, platform_query) + for p in platforms: - ret.append(p.platform) + ret.append(p['platform']) return ret +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) -def get_platform_config(platform_name): - platform = db.query(Platform).filter(Platform.platform == platform_name).one() - return json.loads(platform.config) if platform.config else {} + return json.loads(platforms[0]['config']) if platforms[0]['config'] else {} def filter_records(type, records): filtered_records = []