projects
/
osm
/
NBI.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix 1102 At nsi terminate, fix ns terminate operations needed
[osm/NBI.git]
/
osm_nbi
/
nbi.py
diff --git
a/osm_nbi/nbi.py
b/osm_nbi/nbi.py
index
fd2b3e8
..
ecd6a5a
100644
(file)
--- a/
osm_nbi/nbi.py
+++ b/
osm_nbi/nbi.py
@@
-619,7
+619,7
@@
class Server(object):
if accept:
if "text/html" in accept:
return html.format(data, cherrypy.request, cherrypy.response, token_info)
if accept:
if "text/html" in accept:
return html.format(data, cherrypy.request, cherrypy.response, token_info)
- elif "application/yaml" in accept or "*/*" in accept
or "text/plain" in accept
:
+ elif "application/yaml" in accept or "*/*" in accept:
pass
elif "application/json" in accept or (cherrypy.response.status and cherrypy.response.status >= 300):
cherrypy.response.headers["Content-Type"] = 'application/json; charset=utf-8'
pass
elif "application/json" in accept or (cherrypy.response.status and cherrypy.response.status >= 300):
cherrypy.response.headers["Content-Type"] = 'application/json; charset=utf-8'
@@
-1054,12
+1054,12
@@
class Server(object):
cherrypy.request.headers.get("Accept"))
outdata = file
elif not _id:
cherrypy.request.headers.get("Accept"))
outdata = file
elif not _id:
- outdata = self.engine.get_item_list(engine_session, engine_topic, kwargs)
+ outdata = self.engine.get_item_list(engine_session, engine_topic, kwargs
, api_req=True
)
else:
if item == "reports":
# TODO check that project_id (_id in this context) has permissions
_id = args[0]
else:
if item == "reports":
# TODO check that project_id (_id in this context) has permissions
_id = args[0]
- outdata = self.engine.get_item(engine_session, engine_topic, _id)
+ outdata = self.engine.get_item(engine_session, engine_topic, _id
, True
)
elif method == "POST":
cherrypy.response.status = HTTPStatus.CREATED.value
elif method == "POST":
cherrypy.response.status = HTTPStatus.CREATED.value