From 2262019bc6950fbe75a952456f279d7110c34f13 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jordan=20Aug=C3=A9?= Date: Wed, 7 Aug 2013 19:03:23 +0200 Subject: [PATCH] full selection of columns now implemented --- trash/sliceview.py | 29 +++++++++++++---------------- 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/trash/sliceview.py b/trash/sliceview.py index bed99df8..9d08cee8 100644 --- a/trash/sliceview.py +++ b/trash/sliceview.py @@ -53,24 +53,21 @@ def _slice_view (request, slicename): page = Page(request) page.expose_js_metadata() + metadata = page.get_metadata() + resource_md = metadata.details_by_object('resource') + resource_fields = [column['name'] for column in resource_md['column']] + # 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', 'network_hrn', 'latitude', 'longitude') - - # Get default fields from metadata unless specified - if not main_query.fields: - metadata = page.get_metadata() - md_fields = metadata.details_by_object('slice') - if debug: - print "METADATA", md_fields - # TODO Get default fields - main_query.select( - 'slice_hrn', - 'resource.resource_hrn', 'resource.hostname', 'resource.type', 'resource.network_hrn', - #'lease.urn', - 'user.user_hrn', -# 'application.measurement_point.counter' - ) + main_query.select( + 'slice_hrn', + 'resource.resource_hrn', 'resource.hostname', 'resource.type', 'resource.network_hrn', + #'lease.urn', + 'user.user_hrn', + #'application.measurement_point.counter' + ) + + query_resource_all = Query.get('resource').select(resource_fields) aq = AnalyzedQuery(main_query, metadata=metadata) page.enqueue_query(main_query, analyzed_query=aq) -- 2.43.0