X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;ds=inline;f=osm_nbi%2Fhtml_out.py;h=871d502a2a56f7fcb992a01c15b8b7be28f7bc31;hb=5792d7d7e1ff32ef0edfc432bd86a8fb348622c3;hp=2fe4b8f7cfb6eea61161df86d1216af9ce73d3dc;hpb=ef4e224eb67d7b6711206591b8e1b5f8790c694e;p=osm%2FNBI.git
diff --git a/osm_nbi/html_out.py b/osm_nbi/html_out.py
index 2fe4b8f..871d502 100644
--- a/osm_nbi/html_out.py
+++ b/osm_nbi/html_out.py
@@ -1,3 +1,16 @@
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
"""
Contains html text in variables to make and html response
"""
@@ -21,13 +34,17 @@ html_start = """
( {} )
+ PDUs
VNFDs
NSDs
NSs
+ NSTDs
+ NSIs
USERs
PROJECTs
TOKENs
VIMs
+ WIMs
SDNs
logout
@@ -101,8 +118,17 @@ html_nslcmop_body = """
"""
+html_nsilcmop_body = """
+nsilcm operations
+
" + yaml.safe_dump(data, explicit_start=False, indent=4, default_flow_style=False) + "" body = html_body.format(item=request.path_info) 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)) @@ -125,6 +153,8 @@ def format(data, request, response, session): body += html_upload_body.format(request.path_info, "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": + body += html_upload_body.format(request.path_info + "_content", "NSTD") for k in data: if isinstance(k, dict): data_id = k.pop("_id", None) @@ -142,6 +172,10 @@ def format(data, request, response, session): 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: @@ -150,11 +184,11 @@ def format(data, request, response, session): else: body = html_escape(str(data)) user_text = " " - if session: - if session.get("username"): - user_text += "user: {}".format(session.get("username")) - if session.get("project_id"): - user_text += ", project: {}".format(session.get("project_id")) + if toke_info: + if toke_info.get("username"): + user_text += "user: {}".format(toke_info.get("username")) + if toke_info.get("project_id"): + user_text += ", project: {}".format(toke_info.get("project_name")) return html_start.format(user_text) + body + html_end # yaml.safe_dump(data, explicit_start=True, indent=4, default_flow_style=False) # tags=False,