X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FNBI.git;a=blobdiff_plain;f=osm_nbi%2Fhtml_out.py;h=6b596d772519519d3fe3c1299a4e62380e9f78da;hp=23ee97bfea4dbcceb35490ef784fea3cf35167b1;hb=4c57e2e64537d6263c618da58bcd8f8767b8076e;hpb=0f98af53b320c8244b58d0d8751e28e157949e8e;ds=sidebyside diff --git a/osm_nbi/html_out.py b/osm_nbi/html_out.py index 23ee97b..6b596d7 100644 --- a/osm_nbi/html_out.py +++ b/osm_nbi/html_out.py @@ -4,6 +4,7 @@ Contains html text in variables to make and html response import yaml from http import HTTPStatus +from html import escape as html_escape __author__ = "Alfonso Tierno " @@ -17,14 +18,20 @@ html_start = """

( {} ) - VNFDs - NSDs - NSs + PDUs + VNFDs + NSDs + NSs + NSTDs + NSIs USERs PROJECTs TOKENs + VIMs + SDNs logout

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

Error

{}

" - html_auth2 = """ @@ -88,6 +94,25 @@ html_upload_body = """ """ +html_nslcmop_body = """ +nslcm operations +VNFRS + +""" + +html_nsilcmop_body = """ +nsilcm operations + +""" + def format(data, request, response, session): """ @@ -108,27 +133,40 @@ def format(data, request, response, session): if response.status and response.status > 202: body += html_body_error.format(yaml.safe_dump(data, explicit_start=True, indent=4, default_flow_style=False)) elif isinstance(data, (list, tuple)): - if request.path_info == "/vnfpkgm/v1/vnf_packages_content": + if request.path_info == "/vnfpkgm/v1/vnf_packages": body += html_upload_body.format(request.path_info, "VNFD") - elif request.path_info == "/nsd/v1/ns_descriptors_content": - body += html_upload_body.format(request.path_info, "NSD") + elif request.path_info == "/nsd/v1/ns_descriptors": + body += html_upload_body.format(request.path_info + "_content", "NSD") + elif request.path_info == "/nst/v1/nst_templates": + body += html_upload_body.format(request.path_info + "_content", "NSTD") for k in data: if isinstance(k, dict): data_id = k.pop("_id", None) elif isinstance(k, str): data_id = k - body += '

{id}: {t}

'.format(url=request.path_info, id=data_id, t=k) + body += '

{id}: {t}

'.format(url=request.path_info, id=data_id, + t=html_escape(str(k))) elif isinstance(data, dict): if "Location" in response.headers: body += ' show '.format(response.headers["Location"]) else: - body += '

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

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

" + 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) + elif request.path_info.startswith("/nsilcm/v1/netslice_instances_content/") or \ + request.path_info.startswith("/nsilcm/v1/netslice_instances/"): + _id = request.path_info[request.path_info.rfind("/")+1:] + body += html_nsilcmop_body.format(id=_id) + body += "

" + html_escape(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: body += "

 deleted

" else: - body = str(data) + body = html_escape(str(data)) user_text = " " if session: if session.get("username"): @@ -136,8 +174,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) - -