From: Loic Baron Date: Fri, 29 May 2015 08:30:15 +0000 (+0200) Subject: Tools page using REST SFA API X-Git-Tag: myslice-1.5~21 X-Git-Url: http://git.onelab.eu/?p=unfold.git;a=commitdiff_plain;h=d861dbcfe1188ec46ff2006f812eaf0055b74ea2 Tools page using REST SFA API --- diff --git a/portal/slicetabexperiment.py b/portal/slicetabexperiment.py index cc20df2a..7ed6d31a 100644 --- a/portal/slicetabexperiment.py +++ b/portal/slicetabexperiment.py @@ -31,85 +31,89 @@ class ExperimentView (FreeAccessView, ThemeView): username = self.request.user - query_current_resources = Query.get('slice').select('resource','parent_authority').filter_by('slice_hrn','==',slicename) - current_resources = execute_query(request, query_current_resources) + pf_query = Query().get('local:platform').filter_by('disabled', '==', '0').filter_by('gateway_type', '==', 'sfa').select('platform') + res_platforms = execute_query(request, pf_query) + platforms = [p['platform'] for p in res_platforms] + #query_current_resources = Query.get('slice').select('resource','parent_authority').filter_by('slice_hrn','==',slicename) + #current_resources = execute_query(request, query_current_resources) - parent_authority = current_resources[0]['parent_authority'] - - split_slicename = slicename.split('.') - ple_slicename = hash_loginbase(parent_authority) + '_' + split_slicename[-1] + #parent_authority = current_resources[0]['parent_authority'] + # + #split_slicename = slicename.split('.') + #ple_slicename = hash_loginbase(parent_authority) + '_' + split_slicename[-1] - ple_resource_list=[] - nitos_resource_list=[] - nitos_paris_resource_list=[] - iotlab_resource_list=[] - try: - for resources in current_resources: - list_res = resources['resource'] - for res in list_res: - split_list = res.split('+') # split the resource urn - if [s for s in split_list if 'ple' in s]: # find ple resources - res_hrn = split_list[-1] # last element is resource hrn - ple_resource_list.append(res_hrn) - if [s for s in split_list if 'omf:paris.fit-nitos.fr' in s]: # find nitos_paris resources - res_hrn = split_list[-1] # last element is resource hrn - nitos_paris_resource_list.append(res_hrn) - if [s for s in split_list if 'iotlab' in s]: # find iotlab resources - res_hrn = split_list[-1] # last element is resource hrn - iotlab_resource_list.append(res_hrn) - if [s for s in split_list if 'omf:nitos.indoor' in s]: # find nitos_indoor resources - res_hrn = split_list[-1] # last element is resource hrn - nitos_resource_list.append(res_hrn) - if [s for s in split_list if 'omf:nitos.outdoor' in s]: # find nitos_outdoor resources - res_hrn = split_list[-1] # last element is resource hrn - nitos_resource_list.append(res_hrn) + #ple_resource_list=[] + #nitos_resource_list=[] + #nitos_paris_resource_list=[] + #iotlab_resource_list=[] + #try: + # for resources in current_resources: + # list_res = resources['resource'] + # for res in list_res: + # split_list = res.split('+') # split the resource urn + # if [s for s in split_list if 'ple' in s]: # find ple resources + # res_hrn = split_list[-1] # last element is resource hrn + # ple_resource_list.append(res_hrn) + # if [s for s in split_list if 'omf:paris.fit-nitos.fr' in s]: # find nitos_paris resources + # res_hrn = split_list[-1] # last element is resource hrn + # nitos_paris_resource_list.append(res_hrn) + # if [s for s in split_list if 'iotlab' in s]: # find iotlab resources + # res_hrn = split_list[-1] # last element is resource hrn + # iotlab_resource_list.append(res_hrn) + # if [s for s in split_list if 'omf:nitos.indoor' in s]: # find nitos_indoor resources + # res_hrn = split_list[-1] # last element is resource hrn + # nitos_resource_list.append(res_hrn) + # if [s for s in split_list if 'omf:nitos.outdoor' in s]: # find nitos_outdoor resources + # res_hrn = split_list[-1] # last element is resource hrn + # nitos_resource_list.append(res_hrn) - except Exception as e: - logger.error("Exception in slicetabexperiment.py in OneLab resource search {}".format(e)) - - #logger.debug("list of ple res hrns") - #logger.debug(ple_resource_list) - #logger.debug("list of nit_paris res hrns") - #logger.debug(nitos_paris_resource_list) - #logger.debug("list of iotLab res hrns") - #logger.debug(iotlab_resource_list) - #logger.debug("list of nitos res hrns") - #logger.debug(nitos_resource_list) + #except Exception as e: + # logger.error("Exception in slicetabexperiment.py in OneLab resource search {}".format(e)) + # + ##logger.debug("list of ple res hrns") + ##logger.debug(ple_resource_list) + ##logger.debug("list of nit_paris res hrns") + ##logger.debug(nitos_paris_resource_list) + ##logger.debug("list of iotLab res hrns") + ##logger.debug(iotlab_resource_list) + ##logger.debug("list of nitos res hrns") + ##logger.debug(nitos_resource_list) - all_users = list() - #get all iotlab users - all_users = list() - try: - engine = ConfigEngine() - userData = "Basic " + (engine.iotlab_admin_user() + ":" + engine.iotlab_admin_password()).encode("base64").rstrip() - req = urllib2.Request(engine.iotlab_url()) - req.add_header('Accept', 'application/json') - req.add_header("Content-type", "application/x-www-form-urlencoded") - req.add_header('Authorization', userData) - # make the request and print the results - res = urllib2.urlopen(req) - all_users = json.load(res) - except urllib2.URLError as e: - logger.error("There is a problem in getting iotlab users {}".format(e.reason)) + #all_users = list() + ##get all iotlab users + #all_users = list() + #try: + # engine = ConfigEngine() + # userData = "Basic " + (engine.iotlab_admin_user() + ":" + engine.iotlab_admin_password()).encode("base64").rstrip() + # req = urllib2.Request(engine.iotlab_url()) + # req.add_header('Accept', 'application/json') + # req.add_header("Content-type", "application/x-www-form-urlencoded") + # req.add_header('Authorization', userData) + # # make the request and print the results + # res = urllib2.urlopen(req) + # all_users = json.load(res) + #except urllib2.URLError as e: + # logger.error("There is a problem in getting iotlab users {}".format(e.reason)) - #getting the login from email - #initial value no-account == contact_admin - iot_login = 'contact_admin' - username = str(username) - for user in all_users: - if user['email'] == username: - iot_login = user['login'] + ##getting the login from email + ##initial value no-account == contact_admin + #iot_login = 'contact_admin' + #username = str(username) + #for user in all_users: + # if user['email'] == username: + # iot_login = user['login'] env = { 'theme' : self.theme, 'slicename':slicename, - 'ple_slicename':ple_slicename, - 'username':username, - 'ple_resources':ple_resource_list, - 'nitos_resources': nitos_resource_list, - 'nitos_paris_resources':nitos_paris_resource_list, - 'iotlab_resources':iotlab_resource_list, - 'iot_login':iot_login, + 'platforms':platforms, + #'ple_slicename':ple_slicename, + #'username':username, + #'ple_resources':ple_resource_list, + #'nitos_resources': nitos_resource_list, + #'nitos_paris_resources':nitos_paris_resource_list, + #'iotlab_resources':iotlab_resource_list, + #'iot_login':iot_login, 'request':self.request, } return render_to_response(self.template, env, context_instance=RequestContext(request)) diff --git a/portal/templates/slice-tab-experiment.html b/portal/templates/slice-tab-experiment.html index 96c7734b..bfa9cee9 100644 --- a/portal/templates/slice-tab-experiment.html +++ b/portal/templates/slice-tab-experiment.html @@ -1,20 +1,76 @@
- {% if ple_resources or iotlab_resources or nitos_resources or nitos_paris_resources%} -

How to access your reserved resources

- {% endif %} - {% if ple_resources %} + + +
+
+ + +
+

- {% endif %} - - {% if iotlab_resources %} + + + + + + {% if nitos_paris_resources %}

FIT NITOS-Lab Paris

@@ -119,7 +179,6 @@ $ ssh root@{{resource}} #ssh to the node

{%endfor%}

- {%endif%}

On the node itself you will have to modify the file /etc/omf-resctl-5.3/omf-resctl.yaml (OMF5.4 only) according to your slice settings and then diff --git a/rest/sfa_api.py b/rest/sfa_api.py index e7711644..b75611bb 100644 --- a/rest/sfa_api.py +++ b/rest/sfa_api.py @@ -204,7 +204,7 @@ def sfa_client(request, method, hrn=None, urn=None, object_type=None, rspec=None if method == "ListResources": result = server.ListResources([user_cred], api_options) 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: @@ -224,7 +224,7 @@ def sfa_client(request, method, hrn=None, urn=None, object_type=None, rspec=None result = server.Describe([urn] ,[object_cred], api_options) dict_result = xmltodict.parse(result['value']['geni_rspec']) - result['json'] = json.dumps(dict_result) + 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())