Moved resources_to_operations to internal nbi.py valid_url_methods to avoid inconsistences
refactored session variable into token_info, engine_session, cherrypy.session to bring more clarity
commented unnecesary exception logs
inserted admin query string into roles permissions
Change-Id: Ib3d9d3210e4eb894a3f120c26f6d0ce032ebc797
Signed-off-by: tierno <alfonso.tiernosepulveda@telefonica.com>
diff --git a/osm_nbi/html_out.py b/osm_nbi/html_out.py
index 9adf6f5..1883a96 100644
--- a/osm_nbi/html_out.py
+++ b/osm_nbi/html_out.py
@@ -128,7 +128,7 @@
"""
-def format(data, request, response, session):
+def format(data, request, response, toke_info):
"""
Format a nice html response, depending on the data
:param data:
@@ -182,11 +182,11 @@
else:
body = html_escape(str(data))
user_text = " "
- if session:
- if session.get("username"):
- user_text += "user: {}".format(session.get("username"))
- if session.get("project_id"):
- user_text += ", project: {}".format(session.get("project_id"))
+ if toke_info:
+ if toke_info.get("username"):
+ user_text += "user: {}".format(toke_info.get("username"))
+ if toke_info.get("project_id"):
+ user_text += ", project: {}".format(toke_info.get("project_id"))
return html_start.format(user_text) + body + html_end
# yaml.safe_dump(data, explicit_start=True, indent=4, default_flow_style=False)
# tags=False,