X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osm_nbi%2Fhtml_out.py;h=82362ecfb7cb323a7ed0b11f23d97e71e708c0c6;hb=210d5669f6083befc3b494b36f50dbfdfed55b19;hp=871d502a2a56f7fcb992a01c15b8b7be28f7bc31;hpb=5792d7d7e1ff32ef0edfc432bd86a8fb348622c3;p=osm%2FNBI.git
diff --git a/osm_nbi/html_out.py b/osm_nbi/html_out.py
index 871d502..82362ec 100644
--- a/osm_nbi/html_out.py
+++ b/osm_nbi/html_out.py
@@ -46,6 +46,8 @@ html_start = """
VIMs
WIMs
SDNs
+ K8s_clusters
+ K8s_repos
logout
@@ -127,6 +129,9 @@ html_nsilcmop_body = """
"""
+html_vnfpackage_body = """Artifacts """
+html_nspackage_body = """Artifacts """
+
def format(data, request, response, toke_info):
"""
@@ -150,7 +155,7 @@ def format(data, request, response, toke_info):
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(request.path_info, "VNFD")
+ body += html_upload_body.format(request.path_info + "_content", "VNFD")
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":
@@ -166,16 +171,21 @@ def format(data, request, response, toke_info):
if "Location" in response.headers:
body += ' show '.format(response.headers["Location"])
else:
+ _id = request.path_info[request.path_info.rfind("/")+1:]
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)
+ elif request.path_info.startswith("/vnfpkgm/v1/vnf_packages/") or \
+ request.path_info.startswith("/vnfpkgm/v1/vnf_packages_content/"):
+ body += html_vnfpackage_body.format(id=_id)
+ elif request.path_info.startswith("/nsd/v1/ns_descriptors/") or \
+ request.path_info.startswith("/nsd/v1/ns_descriptors_content/"):
+ body += html_nspackage_body.format(id=_id)
body += "
" + html_escape(yaml.safe_dump(data, explicit_start=True, indent=4, default_flow_style=False)) + \ "" elif data is None: