From: Loic Baron Date: Wed, 8 Oct 2014 17:33:54 +0000 (+0200) Subject: OpenFlow disabled for OneLab X-Git-Tag: myslice-1.2~1^2~13^2 X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=commitdiff_plain;h=480fe522041cf8072f02780450a4804434b9f13d OpenFlow disabled for OneLab --- diff --git a/portal/sliceresourceview.py b/portal/sliceresourceview.py index 94c0fb41..75ede2a7 100644 --- a/portal/sliceresourceview.py +++ b/portal/sliceresourceview.py @@ -69,6 +69,8 @@ class SliceResourceView (LoginRequiredView, ThemeView): # bugs ! 'slice_urn', # RESOURCES + 'resource', + 'lease', 'resource.urn', 'resource.hostname', 'resource.type', # - The facility_name and testbed_name are required for the @@ -79,14 +81,16 @@ class SliceResourceView (LoginRequiredView, ThemeView): 'lease.resource', 'lease.start_time', 'lease.end_time', - # FLOWSPACE - 'flowspace', - # VMS - 'vms', # - The lease_id is important for NITOS identify already existing # leases 'lease.lease_id', + # FLOWSPACE + #'flowspace', + # VMS + #'vms', + + #'user.user_hrn', #'application.measurement_point.counter' ) @@ -97,8 +101,8 @@ class SliceResourceView (LoginRequiredView, ThemeView): page.enqueue_query(main_query, analyzed_query=aq) sq_resource = aq.subquery('resource') sq_lease = aq.subquery('lease') - sq_flowspace = aq.subquery('flowspace') - sq_vms = aq.subquery('vms') + #sq_flowspace = aq.subquery('flowspace') + #sq_vms = aq.subquery('vms') query_resource_all = Query.get('resource').select(resource_fields) page.enqueue_query(query_resource_all) @@ -270,121 +274,121 @@ class SliceResourceView (LoginRequiredView, ThemeView): # plugin which display a "gathering resources" message # waiting for all resources to be returned by manifold - univbriswelcome = Univbris( - page = page, - title = 'univbris_welcome', - domid = 'univbris_welcome', - query = query_resource_all, - ) - - univbrisfoamlist = UnivbrisFoam( - page = page, - title = 'univbris_foam_ports_selection', - domid = 'univbris_foam_ports_selection', - query = query_resource_all, - query_all = query_resource_all, - checkboxes = False, - datatables_options = { - 'iDisplayLength': 10, - 'bLengthChange' : True, - 'bAutoWidth' : True, - }, - ) - - #plugin which manages the different flowspaces that the user creates, and also sends flowspaces to manifold - univbrisfvlist = UnivbrisFv( - page = page, - title = 'univbris_flowspace_selection', - domid = 'univbris_flowspace_selection', - query = sq_flowspace, - query_all = query_resource_all, - datatables_options = { - 'iDisplayLength': 5, - 'bLengthChange' : True, - 'bAutoWidth' : True, - }, - ) - - #plugin which allows the definition of a single flowspace - univbrisfvform = UnivbrisFvf( - page = page, - title = 'univbris_flowspace_form', - domid = 'univbris_flowspace_form', - query = query_resource_all, - query_all = None, - datatables_options = { - 'iDisplayLength': 3, - 'bLengthChange' : True, - 'bAutoWidth' : True, - }, - ) - - #plugin which allows the definition the match criteria on a single OPTICAL flowspace - univbrisofvform = UnivbrisFvfo( - page = page, - title = 'univbris_oflowspace_form', - domid = 'univbris_oflowspace_form', - query = None, - query_all = None, - datatables_options = { - 'iDisplayLength': 3, - 'bLengthChange' : True, - 'bAutoWidth' : True, - }, - ) - - #plugin which display the gathered topology - univbristopology = UnivbrisTopo( - page = page, - title = 'univbris_topology', - domid = 'univbris_topology', - query = query_resource_all, - ) - - # -------------------------------------------------------------------------- - # Ofelia VTAM Plugin - # Bristol Plugin - - #plugin which display a table where an experimenter will add VMs to according to his needs - # responsible to send the data to Manifold - univbrisvtamplugin = UnivbrisVtamPlugin( - page = page, - title = 'univbris_vtam', - domid = 'univbris_vtam', - query = sq_vms, - #query = sq_resource, - ) - - #plugin which display a form where an experimenter will specify - # in which testbed and which physical server to setup the VM - univbrisvtamform = UnivbrisVtamForm( - page = page, - title = 'univbris_vtam_form', - domid = 'univbris_vtam_form', - query = query_resource_all, - query_all = None, - datatables_options = { - 'iDisplayLength': 3, - 'bLengthChange' : True, - 'bAutoWidth' : True, - }, - ) - - # -------------------------------------------------------------------------- - # SLA View and accept dialog - - sla_dialog = SlaDialog( - page = page, - title = 'sla dialog', - query = main_query, - togglable = False, - # start turned off, it will open up itself when stuff comes in - toggled = True, - domid = 'sla_dialog', - outline_complete = True, - username = request.user, - ) - + # univbriswelcome = Univbris( + # page = page, + # title = 'univbris_welcome', + # domid = 'univbris_welcome', + # query = query_resource_all, + # ) + + # univbrisfoamlist = UnivbrisFoam( + # page = page, + # title = 'univbris_foam_ports_selection', + # domid = 'univbris_foam_ports_selection', + # query = query_resource_all, + # query_all = query_resource_all, + # checkboxes = False, + # datatables_options = { + # 'iDisplayLength': 10, + # 'bLengthChange' : True, + # 'bAutoWidth' : True, + # }, + # ) + + # #plugin which manages the different flowspaces that the user creates, and also sends flowspaces to manifold + # univbrisfvlist = UnivbrisFv( + # page = page, + # title = 'univbris_flowspace_selection', + # domid = 'univbris_flowspace_selection', + # query = sq_flowspace, + # query_all = query_resource_all, + # datatables_options = { + # 'iDisplayLength': 5, + # 'bLengthChange' : True, + # 'bAutoWidth' : True, + # }, + # ) + + # #plugin which allows the definition of a single flowspace + # univbrisfvform = UnivbrisFvf( + # page = page, + # title = 'univbris_flowspace_form', + # domid = 'univbris_flowspace_form', + # query = query_resource_all, + # query_all = None, + # datatables_options = { + # 'iDisplayLength': 3, + # 'bLengthChange' : True, + # 'bAutoWidth' : True, + # }, + # ) + + # #plugin which allows the definition the match criteria on a single OPTICAL flowspace + # univbrisofvform = UnivbrisFvfo( + # page = page, + # title = 'univbris_oflowspace_form', + # domid = 'univbris_oflowspace_form', + # query = None, + # query_all = None, + # datatables_options = { + # 'iDisplayLength': 3, + # 'bLengthChange' : True, + # 'bAutoWidth' : True, + # }, + # ) + + # #plugin which display the gathered topology + # univbristopology = UnivbrisTopo( + # page = page, + # title = 'univbris_topology', + # domid = 'univbris_topology', + # query = query_resource_all, + # ) + + # # -------------------------------------------------------------------------- + # # Ofelia VTAM Plugin + # # Bristol Plugin + + # #plugin which display a table where an experimenter will add VMs to according to his needs + # # responsible to send the data to Manifold + # univbrisvtamplugin = UnivbrisVtamPlugin( + # page = page, + # title = 'univbris_vtam', + # domid = 'univbris_vtam', + # query = sq_vms, + # #query = sq_resource, + # ) + + # #plugin which display a form where an experimenter will specify + # # in which testbed and which physical server to setup the VM + # univbrisvtamform = UnivbrisVtamForm( + # page = page, + # title = 'univbris_vtam_form', + # domid = 'univbris_vtam_form', + # query = query_resource_all, + # query_all = None, + # datatables_options = { + # 'iDisplayLength': 3, + # 'bLengthChange' : True, + # 'bAutoWidth' : True, + # }, + # ) + + # # -------------------------------------------------------------------------- + # # SLA View and accept dialog + # + # sla_dialog = SlaDialog( + # page = page, + # title = 'sla dialog', + # query = main_query, + # togglable = False, + # # start turned off, it will open up itself when stuff comes in + # toggled = True, + # domid = 'sla_dialog', + # 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') @@ -420,17 +424,17 @@ class SliceResourceView (LoginRequiredView, ThemeView): template_env['scheduler'] = resources_as_scheduler2.render(self.request) # Bristol plugin - template_env['welcome'] = univbriswelcome.render(self.request) - template_env['resources'] = univbrisfoamlist.render(self.request) - template_env['flowspaces'] = univbrisfvlist.render(self.request) - template_env['oflowspaces_form'] = univbrisofvform.render(self.request) - template_env['flowspaces_form'] = univbrisfvform.render(self.request) - template_env['topology'] = univbristopology.render(self.request) - template_env['vms_list'] = univbrisvtamplugin.render(self.request) - template_env['vm_form'] = univbrisvtamform.render(self.request) + # template_env['welcome'] = univbriswelcome.render(self.request) + # template_env['resources'] = univbrisfoamlist.render(self.request) + # template_env['flowspaces'] = univbrisfvlist.render(self.request) + # template_env['oflowspaces_form'] = univbrisofvform.render(self.request) + # template_env['flowspaces_form'] = univbrisfvform.render(self.request) + # template_env['topology'] = univbristopology.render(self.request) + # 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['sla_dialog'] = '' # sla_dialog.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 diff --git a/portal/templates/onelab/onelab_slice-resource-view.html b/portal/templates/onelab/onelab_slice-resource-view.html new file mode 100644 index 00000000..3fefedf7 --- /dev/null +++ b/portal/templates/onelab/onelab_slice-resource-view.html @@ -0,0 +1,121 @@ +{% extends "layout_wide.html" %} +{% load portal_filters %} + +{% block head %} + + + +{% endblock %} + +{% block content %} +{% widget '_widget-slice-sections.html' %} +
+
+
+ + {{filter_testbeds}} +
+
+
+ {% if msg %} +

{{ msg }}

+ {% endif %} +
+ +
+
+ {{ filter_status }} +
+
+ {{ apply }} +
+
+ + +
+
+ +
+
+ + + + + +
+
+
+
+ + + {{list_resources}} + +
+
+ {{map_resources}} +
+
+ {{scheduler}} +
+ + + +
+
+
+
+
+
+{% endblock %}