X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FNBI.git;a=blobdiff_plain;f=osm_nbi%2Fhtml_out.py;h=1d733bca8f121fcebb0525a184d66e144b7397d5;hp=f37b5ddbebeb600c68a437937ff133223639cf3c;hb=2102560198959215f59e9f0ab1d11b0f69b8bb75;hpb=f27c79b67671934005fa1691158c363e2b686e77

diff --git a/osm_nbi/html_out.py b/osm_nbi/html_out.py
index f37b5dd..1d733bc 100644
--- a/osm_nbi/html_out.py
+++ b/osm_nbi/html_out.py
@@ -25,6 +25,7 @@ html_start = """
       <a href="/osm/admin/v1/users">USERs </a>
       <a href="/osm/admin/v1/projects">PROJECTs </a>
       <a href="/osm/admin/v1/tokens">TOKENs </a>
+      <a href="/osm/admin/v1/vims">VIMs </a>
       <a href="/osm/admin/v1/tokens?METHOD=DELETE">logout </a>
     </div>
   </div>
@@ -88,6 +89,15 @@ html_upload_body = """
 </form>
 """
 
+html_nslcmop_body = """
+<a href="/osm/nslcm/v1/ns_lcm_op_occs?nsInstanceId={id}">nslcm operations </a>
+<form action="/osm/nslcm/v1/ns_instances/{id}/terminate" method="post" enctype="multipart/form-data">
+    <h3> <table style="border: 0;"> <tr>
+        <td> <input type="submit" value="Terminate"/> </td>
+    </tr> </table> </h3>
+</form>
+"""
+
 
 def format(data, request, response, session):
     """
@@ -109,9 +119,9 @@ 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_content":
-            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_content":
-            body += html_upload_body.format("NSD", request.path_info)
+            body += html_upload_body.format(request.path_info, "NSD")
         for k in data:
             if isinstance(k, dict):
                 data_id = k.pop("_id", None)
@@ -123,7 +133,14 @@ def format(data, request, response, session):
             body += '<a href="{}"> show </a>'.format(response.headers["Location"])
         else:
             body += '<a href="/osm/{}?METHOD=DELETE"> <img src="/osm/static/delete.png" height="25" width="25"> </a>'.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 += "<pre>" + yaml.safe_dump(data, explicit_start=True, indent=4, default_flow_style=False) + "</pre>"
+    elif data is None:
+        if request.method == "DELETE" or "METHOD=DELETE" in request.query_string:
+            body += "<pre> deleted </pre>"
     else:
         body = str(data)
     user_text = "    "