From 1dae493121dc4c19870bc44b25ce93251764d21d Mon Sep 17 00:00:00 2001 From: "Steve L. Nyemba" Date: Sun, 10 Sep 2017 14:02:52 -0500 Subject: [PATCH] CO - Bug fix with api --- src/api/index.py | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/src/api/index.py b/src/api/index.py index fd7c291..c0374fb 100644 --- a/src/api/index.py +++ b/src/api/index.py @@ -62,6 +62,8 @@ def home(): title = 'Dashboard' apps = [] try: + # + # The user must pass a key in heref gReader = factory.instance(type=class_read,args=p) apps = gReader.view('summary/nodes',key=p['uid']) @@ -79,6 +81,7 @@ def get_nodes(): try: gReader = factory.instance(type=class_read,args=p) r = gReader.view('summary/nodes',key=p['uid']) + session['default.node'] = r[0] except Exception,e: print (e) return json.dumps(r) @@ -95,7 +98,7 @@ def get_apps(): gReader = factory.instance(type=class_read,args=p) r = gReader.view('summary/app_names',key=p['uid']) r = r[node_id] - print r + session['default.app'] = r[0] except Exception,e: print (e) return json.dumps(r) @@ -152,10 +155,21 @@ def get_usage_detail(): """ r = {} try: - id = request.args['id'] if 'id' in request.args else request.args.get('node') - app_id = request.args.get('app') + if 'id' not in request.args and 'node' not in request.args : + id = session['default.node'] + else: + id = request.args['id'] if 'id' in request.args else request.args.get('node') + if 'app' not in request.args : + app_id = session['default.app'] + else: + app_id = request.args.get('app') + # + # removing trailing white spaces + id = id.strip() + app_id = app_id.strip() gReader = factory.instance(type=class_read,args=p) r = gReader.view('summary/app_resource_usage_details',key=p['uid']) + print r.keys() r = r[id][app_id] except Exception,e: print (e)