X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FNBI.git;a=blobdiff_plain;f=osm_nbi%2Fhtml_out.py;h=bfa13d49dae939c8c4e5f3697ed20ffe61b70d41;hp=f6f92d98f5e82a724645aca67b8cc3266b0ee3e6;hb=fc5089ce2dee313929810482f9a4b01747f1df44;hpb=c94c3df90aa64298a7935a80b221f80f3c043260 diff --git a/osm_nbi/html_out.py b/osm_nbi/html_out.py index f6f92d9..bfa13d4 100644 --- a/osm_nbi/html_out.py +++ b/osm_nbi/html_out.py @@ -17,15 +17,18 @@ html_start = """
- + ( {} ) VNFDs NSDs NSs - USERs - PROJECTs - TOKENs - logout + USERs + PROJECTs + TOKENs + VIMs + SDNs + logout
""" @@ -36,13 +39,12 @@ html_body = """ html_end = """ - + """ html_body_error = "

Error 
{}

" - html_auth2 = """ @@ -61,7 +63,7 @@ html_auth2 = """

Sign in to OSM

-
+ @@ -88,6 +90,16 @@ html_upload_body = """ """ +html_nslcmop_body = """ +nslcm operations +VNFRS + +

Username
Password
+ +
+ +""" + def format(data, request, response, session): """ @@ -109,18 +121,29 @@ def format(data, request, response, session): 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": - body += html_upload_body.format("VNFD", request.path_info) + body += html_upload_body.format(request.path_info, "VNFD") elif request.path_info == "/nsd/v1/ns_descriptors": - body += html_upload_body.format("NSD", request.path_info) + body += html_upload_body.format(request.path_info + "_content", "NSD") for k in data: - data_id = k.pop("_id", None) + 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) elif isinstance(data, dict): 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: + body += "
 deleted
" else: body = str(data) user_text = " " @@ -130,8 +153,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) - -