X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osm_nbi%2Fhtml_out.py;h=a8823bd0355980d15bdb3b7595770236472431e4;hb=refs%2Fchanges%2F72%2F7872%2F5;hp=e9237e92528ace0680315184fbcab49c8ff43400;hpb=b57758d4a3fd88baa348cfa0812e9f4a742761d1;p=osm%2FNBI.git
diff --git a/osm_nbi/html_out.py b/osm_nbi/html_out.py
index e9237e9..a8823bd 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,14 +34,17 @@ html_start = """
( {} )
+ PDUs
VNFDs
NSDs
NSs
NSTDs
+ NSIs
USERs
PROJECTs
TOKENs
VIMs
+ WIMs
SDNs
logout
@@ -102,8 +118,17 @@ html_nslcmop_body = """
"""
+html_nsilcmop_body = """
+nsilcm operations
+
" + html_escape(yaml.safe_dump(data, explicit_start=True, indent=4, default_flow_style=False)) + \ "" elif data is None: @@ -153,11 +182,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,