projects
/
osm
/
NBI.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add Juju PaaS as a VIM
[osm/NBI.git]
/
osm_nbi
/
nbi.py
diff --git
a/osm_nbi/nbi.py
b/osm_nbi/nbi.py
index
80548ce
..
fa414f0
100644
(file)
--- a/
osm_nbi/nbi.py
+++ b/
osm_nbi/nbi.py
@@
-115,8
+115,6
@@
URL: /osm GET POST
/<id> O O O
/k8sclusters O O
/<id> O O O
/<id> O O O
/k8sclusters O O
/<id> O O O
- /paas O5 O5
- /<id> O5 O5 O5
/k8srepos O O
/<id> O O
/osmrepos O O
/k8srepos O O
/<id> O O
/osmrepos O O
@@
-290,14
+288,6
@@
valid_url_methods = {
"ROLE_PERMISSION": "vca:id:",
},
},
"ROLE_PERMISSION": "vca:id:",
},
},
- "paas": {
- "METHODS": ("GET", "POST"),
- "ROLE_PERMISSION": "paas:",
- "<ID>": {
- "METHODS": ("GET", "DELETE", "PATCH"),
- "ROLE_PERMISSION": "paas:id:",
- },
- },
"k8srepos": {
"METHODS": ("GET", "POST"),
"ROLE_PERMISSION": "k8srepos:",
"k8srepos": {
"METHODS": ("GET", "POST"),
"ROLE_PERMISSION": "k8srepos:",
@@
-669,6
+659,7
@@
class Server(object):
self.engine = Engine(self.authenticator)
def _format_in(self, kwargs):
self.engine = Engine(self.authenticator)
def _format_in(self, kwargs):
+ error_text = "" # error_text must be initialized outside try
try:
indata = None
if cherrypy.request.body.length:
try:
indata = None
if cherrypy.request.body.length:
@@
-1010,7
+1001,6
@@
class Server(object):
)
return self._format_out("Alarm updated")
except Exception as e:
)
return self._format_out("Alarm updated")
except Exception as e:
- cherrypy.response.status = e.http_code.value
if isinstance(
e,
(
if isinstance(
e,
(
@@
-1071,7
+1061,7
@@
class Server(object):
outdata = token_info = self.authenticator.new_token(
token_info, indata, cherrypy.request.remote
)
outdata = token_info = self.authenticator.new_token(
token_info, indata, cherrypy.request.remote
)
- cherrypy.session["Authorization"] = outdata["_id"]
+ cherrypy.session["Authorization"] = outdata["_id"]
# pylint: disable=E1101
self._set_location_header("admin", "v1", "tokens", outdata["_id"])
# for logging
self._format_login(token_info)
self._set_location_header("admin", "v1", "tokens", outdata["_id"])
# for logging
self._format_login(token_info)
@@
-1094,7
+1084,7
@@
class Server(object):
token_id = token_info["_id"]
outdata = self.authenticator.del_token(token_id)
token_info = None
token_id = token_info["_id"]
outdata = self.authenticator.del_token(token_id)
token_info = None
- cherrypy.session["Authorization"] = "logout"
+ cherrypy.session["Authorization"] = "logout"
# pylint: disable=E1101
# cherrypy.response.cookie["Authorization"] = token_id
# cherrypy.response.cookie["Authorization"]['expires'] = 0
else:
# cherrypy.response.cookie["Authorization"] = token_id
# cherrypy.response.cookie["Authorization"]['expires'] = 0
else:
@@
-1122,7
+1112,8
@@
class Server(object):
elif args and args[0] == "init":
try:
# self.engine.load_dbase(cherrypy.request.app.config)
elif args and args[0] == "init":
try:
# self.engine.load_dbase(cherrypy.request.app.config)
- self.engine.create_admin()
+ pid = self.authenticator.create_admin_project()
+ self.authenticator.create_admin_user(pid)
return "Done. User 'admin', password 'admin' created"
except Exception:
cherrypy.response.status = HTTPStatus.FORBIDDEN.value
return "Done. User 'admin', password 'admin' created"
except Exception:
cherrypy.response.status = HTTPStatus.FORBIDDEN.value
@@
-1200,10
+1191,12
@@
class Server(object):
+ " headers: {}\n".format(cherrypy.request.headers)
+ " path_info: {}\n".format(cherrypy.request.path_info)
+ " query_string: {}\n".format(cherrypy.request.query_string)
+ " headers: {}\n".format(cherrypy.request.headers)
+ " path_info: {}\n".format(cherrypy.request.path_info)
+ " query_string: {}\n".format(cherrypy.request.query_string)
- + " session: {}\n".format(cherrypy.session)
+ + " session: {}\n".format(cherrypy.session)
# pylint: disable=E1101
+ " cookie: {}\n".format(cherrypy.request.cookie)
+ " method: {}\n".format(cherrypy.request.method)
+ " cookie: {}\n".format(cherrypy.request.cookie)
+ " method: {}\n".format(cherrypy.request.method)
- + " session: {}\n".format(cherrypy.session.get("fieldname"))
+ + " session: {}\n".format(
+ cherrypy.session.get("fieldname") # pylint: disable=E1101
+ )
+ " body:\n"
)
return_text += " length: {}\n".format(cherrypy.request.body.length)
+ " body:\n"
)
return_text += " length: {}\n".format(cherrypy.request.body.length)
@@
-1796,7
+1789,6
@@
class Server(object):
self.engine.db.del_list(
rollback_item["topic"],
rollback_item["filter"],
self.engine.db.del_list(
rollback_item["topic"],
rollback_item["filter"],
- fail_on_empty=False,
)
else:
self.engine.db.del_one(
)
else:
self.engine.db.del_one(
@@
-1872,7
+1864,9
@@
def _start_service():
except ValueError as e:
cherrypy.log.error("Ignoring environ '{}': " + str(e))
except Exception as e:
except ValueError as e:
cherrypy.log.error("Ignoring environ '{}': " + str(e))
except Exception as e:
- cherrypy.log.warn("skipping environ '{}' on exception '{}'".format(k, e))
+ cherrypy.log(
+ "WARNING: skipping environ '{}' on exception '{}'".format(k, e)
+ )
if update_dict:
cherrypy.config.update(update_dict)
if update_dict:
cherrypy.config.update(update_dict)