X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FNBI.git;a=blobdiff_plain;f=osm_nbi%2Fhtml_out.py;h=a5b1bca1b466376f38887393508c8a91c4020049;hp=23ee97bfea4dbcceb35490ef784fea3cf35167b1;hb=refs%2Fchanges%2F59%2F6159%2F5;hpb=0f98af53b320c8244b58d0d8751e28e157949e8e diff --git a/osm_nbi/html_out.py b/osm_nbi/html_out.py index 23ee97b..a5b1bca 100644 --- a/osm_nbi/html_out.py +++ b/osm_nbi/html_out.py @@ -17,7 +17,8 @@ html_start = """

( {} ) VNFDs NSDs @@ -25,6 +26,7 @@ html_start = """ USERs PROJECTs TOKENs + VIMs logout

@@ -36,13 +38,12 @@ html_body = """ html_end = """ - + """ html_body_error = "

Error

{}

" - html_auth2 = """ @@ -88,6 +89,16 @@ html_upload_body = """ """ +html_nslcmop_body = """ +nslcm operations +VNFRS + +""" + def format(data, request, response, session): """ @@ -122,7 +133,12 @@ def format(data, request, response, session): if "Location" in response.headers: body += ' show '.format(response.headers["Location"]) else: - body += '

'.format(request.path_info) + body += '

'\ + .format(request.path_info) + if request.path_info.startswith("/nslcm/v1/ns_instances_content/") or \ + request.path_info.startswith("/nslcm/v1/ns_instances/"): + _id = request.path_info[request.path_info.rfind("/")+1:] + body += html_nslcmop_body.format(id=_id) body += "

" + yaml.safe_dump(data, explicit_start=True, indent=4, default_flow_style=False) + "

" elif data is None: if request.method == "DELETE" or "METHOD=DELETE" in request.query_string: @@ -136,8 +152,6 @@ def format(data, request, response, session): if session.get("project_id"): user_text += ", project: {}".format(session.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) + # yaml.safe_dump(data, explicit_start=True, indent=4, default_flow_style=False) # tags=False, # encoding='utf-8', allow_unicode=True) - -