X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Fsliceresourceview.py;h=8289f9e905bcdd93e0dc03a6f0631ac1f333491d;hb=3194543aef03f2e765ec6fa5fc40265475c53560;hp=49230dff5920d157bee7782325e2966d2e95060f;hpb=f74a2e086a4c8fd787d1879d17a24fe6cef9d5ac;p=myslice.git diff --git a/portal/sliceresourceview.py b/portal/sliceresourceview.py index 49230dff..8289f9e9 100644 --- a/portal/sliceresourceview.py +++ b/portal/sliceresourceview.py @@ -1,8 +1,9 @@ from django.template import RequestContext from django.shortcuts import render_to_response -from manifold.core.query import Query, AnalyzedQuery -from manifoldapi.manifoldapi import execute_query +from manifold.core.query import Query, AnalyzedQuery +from manifoldapi.manifoldapi import execute_query +import json from django.views.generic.base import TemplateView @@ -17,7 +18,7 @@ from myslice.configengine import ConfigEngine from plugins.apply import ApplyPlugin from plugins.querytable import QueryTable from plugins.googlemap import GoogleMap -#from plugins.queryupdater import QueryUpdater +# from plugins.queryupdater import QueryUpdaterPlugin from plugins.filter_status import FilterStatusPlugin from plugins.testbeds import TestbedsPlugin from plugins.scheduler2 import Scheduler2 @@ -184,17 +185,17 @@ class SliceResourceView (LoginRequiredView, ThemeView): # -------------------------------------------------------------------------- # QueryUpdater (Pending Operations) -#DEPRECATED| pending_resources = QueryUpdater( -#DEPRECATED| page = page, -#DEPRECATED| title = 'Pending operations', -#DEPRECATED| query = main_query, -#DEPRECATED| togglable = False, -#DEPRECATED| # start turned off, it will open up itself when stuff comes in -#DEPRECATED| toggled = False, -#DEPRECATED| domid = 'pending', -#DEPRECATED| outline_complete = True, -#DEPRECATED| username = request.user, -#DEPRECATED| ) +# pending_resources = QueryUpdaterPlugin( +# page = page, +# title = 'Pending operations', +# query = main_query, +# togglable = False, +# # start turned off, it will open up itself when stuff comes in +# toggled = False, +# domid = 'pending', +# outline_complete = True, +# username = request.user, +# ) # -------------------------------------------------------------------------- # NETWORKS @@ -229,7 +230,8 @@ class SliceResourceView (LoginRequiredView, ThemeView): apply = ApplyPlugin( page = page, domid = "apply", - query = sq_resource, + query = main_query, + username = request.user, ) @@ -247,7 +249,25 @@ class SliceResourceView (LoginRequiredView, ThemeView): outline_complete = True, username = request.user, ) - + + ## check user is pi or not + platform_query = Query().get('local:platform').select('platform_id','platform','gateway_type','disabled') + account_query = Query().get('local:account').select('user_id','platform_id','auth_type','config') + platform_details = execute_query(self.request, platform_query) + account_details = execute_query(self.request, account_query) + for platform_detail in platform_details: + for account_detail in account_details: + if platform_detail['platform_id'] == account_detail['platform_id']: + if 'config' in account_detail and account_detail['config'] is not '': + account_config = json.loads(account_detail['config']) + if 'myslice' in platform_detail['platform']: + acc_auth_cred = account_config.get('delegated_authority_credentials','N/A') + # assigning values + if acc_auth_cred == {} or acc_auth_cred == 'N/A': + pi = "is_not_pi" + else: + pi = "is_pi" + template_env = {} template_env['list_resources'] = list_resources.render(self.request) template_env['list_reserved_resources'] = list_reserved_resources.render(self.request) @@ -265,6 +285,7 @@ class SliceResourceView (LoginRequiredView, ThemeView): template_env['sla_dialog'] = '' # sla_dialog.render(self.request) template_env["theme"] = self.theme template_env["username"] = request.user + template_env["pi"] = pi template_env["slice"] = slicename template_env["section"] = "resources" template_env["msg"] = msg