X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=trash%2Fsliceview.py;h=0036221c8f8ce3937cdd4090e0ccbf89cb364b62;hb=f89424cffcb881206feeb0506705c470d4a73092;hp=b17148761bdd0813dccd46e6cfff46818065b875;hpb=c0c7175e6883ad9bc746692e7c71202e64ec2351;p=myslice.git diff --git a/trash/sliceview.py b/trash/sliceview.py index b1714876..0036221c 100644 --- a/trash/sliceview.py +++ b/trash/sliceview.py @@ -54,7 +54,7 @@ def _slice_view (request, slicename): # TODO The query to run is embedded in the URL main_query = Query.get('slice').filter_by('slice_hrn', '=', slicename) - query_resource_all = Query.get('resource').select('resource_hrn', 'hostname', 'type', 'authority') + query_resource_all = Query.get('resource').select('resource_hrn', 'hostname', 'type', 'network_hrn', 'latitude', 'longitude') # Get default fields from metadata unless specified if not main_query.fields: @@ -65,7 +65,7 @@ def _slice_view (request, slicename): # TODO Get default fields main_query.select( 'slice_hrn', - 'resource.resource_hrn', 'resource.hostname', 'resource.type', 'resource.authority', + 'resource.resource_hrn', 'resource.hostname', 'resource.type', 'resource.network_hrn', #'lease.urn', 'user.user_hrn', # 'application.measurement_point.counter' @@ -159,6 +159,8 @@ def _slice_view (request, slicename): # tab's sons preferably turn this off togglable = False, query = sq_resource, + query_all_uuid = query_resource_all.query_uuid, + checkboxes = True, # center on Paris latitude = 49., longitude = 2.2,