X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FNBI.git;a=blobdiff_plain;f=osm_nbi%2Fhtml_out.py;h=6f07d714ac0fa0cdc31149e5b79479573deab8b7;hp=f6f92d98f5e82a724645aca67b8cc3266b0ee3e6;hb=e86317875d395c37b3ded147b554ced8a8115358;hpb=c94c3df90aa64298a7935a80b221f80f3c043260 diff --git a/osm_nbi/html_out.py b/osm_nbi/html_out.py index f6f92d9..6f07d71 100644 --- a/osm_nbi/html_out.py +++ b/osm_nbi/html_out.py @@ -1,9 +1,23 @@ +# 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 """ import yaml from http import HTTPStatus +from html import escape as html_escape __author__ = "Alfonso Tierno " @@ -17,15 +31,22 @@ html_start = """
- + ( {} ) + PDUs VNFDs NSDs NSs - USERs - PROJECTs - TOKENs - logout + NSTDs + NSIs + USERs + PROJECTs + TOKENs + VIMs + WIMs + SDNs + logout
""" @@ -36,13 +57,12 @@ html_body = """ html_end = """ - + """ html_body_error = "

Error 
{}

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

Sign in to OSM

-
+ @@ -88,6 +108,25 @@ html_upload_body = """ """ +html_nslcmop_body = """ +nslcm operations +VNFRS + +

Username
Password
+ +
+ +""" + +html_nsilcmop_body = """ +nsilcm operations +
+

+ +

+
+""" + def format(data, request, response, session): """ @@ -109,20 +148,39 @@ 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") + elif request.path_info == "/nst/v1/nst_templates": + body += html_upload_body.format(request.path_info + "_content", "NSTD") for k in data: - data_id = k.pop("_id", None) - body += '

{id}: {t}

'.format(url=request.path_info, id=data_id, t=k) + 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=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"): @@ -130,8 +188,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) - -