X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Fsliceresourceview.py;h=7c0d5c0a08e6609717e306d47a931db74abddba0;hb=ca18b72eaf2f8f06a41136cb95fdc4f04cf67c0b;hp=0968b5db6e6b192a80a32db7c23b5859c83260dd;hpb=6ff6f343105cd2ef19a99126b07e8dabf57d65f4;p=myslice.git diff --git a/portal/sliceresourceview.py b/portal/sliceresourceview.py index 0968b5db..7c0d5c0a 100644 --- a/portal/sliceresourceview.py +++ b/portal/sliceresourceview.py @@ -22,6 +22,7 @@ from plugins.googlemap import GoogleMap from plugins.filter_status import FilterStatusPlugin from plugins.testbeds import TestbedsPlugin from plugins.scheduler2 import Scheduler2 +from plugins.asap import AsapPlugin # Bristol plugin from plugins.univbris import Univbris @@ -239,6 +240,20 @@ class SliceResourceView (LoginRequiredView, ThemeView): query_lease = sq_lease, ) + # -------------------------------------------------------------------------- + # LEASES Asap Scheduler + # Select an end_time for all unconfigured resources + # start_time is as soon as possible + + #resources_as_asap = AsapPlugin( + # page = page, + # domid = 'asap', + # title = 'Asap', + # # this is the query at the core of the slice list + # query = sq_resource, + # query_lease = sq_lease, + #) + # -------------------------------------------------------------------------- # QueryUpdater (Pending Operations) @@ -412,28 +427,11 @@ 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) - - # XXX When session has expired, this is None and thus not iterable - 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['request'] = self.request + template_env['list_resources'] = list_resources.render(self.request) template_env['list_reserved_resources'] = list_reserved_resources.render(self.request) template_env['list_reserved_leases'] = list_reserved_leases.render(self.request) @@ -446,6 +444,7 @@ class SliceResourceView (LoginRequiredView, ThemeView): template_env['map_resources'] = map_resources.render(self.request) template_env['scheduler'] = resources_as_scheduler2.render(self.request) + #template_env['asap'] = resources_as_asap.render(self.request) # Bristol plugin # template_env['welcome'] = univbriswelcome.render(self.request) @@ -457,11 +456,10 @@ class SliceResourceView (LoginRequiredView, ThemeView): # template_env['vms_list'] = univbrisvtamplugin.render(self.request) # template_env['vm_form'] = univbrisvtamform.render(self.request) -# template_env['pending_resources'] = pending_resources.render(self.request) + # template_env['pending_resources'] = pending_resources.render(self.request) 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