projects
/
osm
/
NBI.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Allow user and project edition
[osm/NBI.git]
/
osm_nbi
/
nbi.py
diff --git
a/osm_nbi/nbi.py
b/osm_nbi/nbi.py
index
e34cfad
..
f8c564d
100644
(file)
--- a/
osm_nbi/nbi.py
+++ b/
osm_nbi/nbi.py
@@
-68,15
+68,15
@@
URL: /osm GET POST
/ns_lcm_op_occs 5 5
/<nsLcmOpOccId> 5 5 5
TO BE COMPLETED 5 5
/ns_lcm_op_occs 5 5
/<nsLcmOpOccId> 5 5 5
TO BE COMPLETED 5 5
- /vnf
rs
O
- /<vnf
rId>
O
+ /vnf
_instances (also vnfrs for compatibility)
O
+ /<vnf
InstanceId>
O
/subscriptions 5 5
/<subscriptionId> 5 X
/admin/v1
/tokens O O
/<id> O O
/users O O
/subscriptions 5 5
/<subscriptionId> 5 X
/admin/v1
/tokens O O
/<id> O O
/users O O
- /<id> O
O
+ /<id> O
O O
O
/projects O O
/<id> O O
/vims_accounts (also vims for compatibility) O O
/projects O O
/<id> O O
/vims_accounts (also vims for compatibility) O O
@@
-152,7
+152,7
@@
class Server(object):
"<ID>": {"METHODS": ("GET", "DELETE")}
},
"users": {"METHODS": ("GET", "POST"),
"<ID>": {"METHODS": ("GET", "DELETE")}
},
"users": {"METHODS": ("GET", "POST"),
- "<ID>": {"METHODS": ("GET", "POST", "DELETE")}
+ "<ID>": {"METHODS": ("GET", "POST", "DELETE"
, "PATCH", "PUT"
)}
},
"projects": {"METHODS": ("GET", "POST"),
"<ID>": {"METHODS": ("GET", "DELETE")}
},
"projects": {"METHODS": ("GET", "POST"),
"<ID>": {"METHODS": ("GET", "DELETE")}
@@
-196,7
+196,7
@@
class Server(object):
"<ID>": {"METHODS": ("GET", "PUT", "DELETE")}
},
"vnf_packages": {"METHODS": ("GET", "POST"),
"<ID>": {"METHODS": ("GET", "PUT", "DELETE")}
},
"vnf_packages": {"METHODS": ("GET", "POST"),
- "<ID>": {"METHODS": ("GET", "DELETE"
), "TODO": "PATCH"
, # GET: vnfPkgInfo
+ "<ID>": {"METHODS": ("GET", "DELETE"
, "PATCH")
, # GET: vnfPkgInfo
"package_content": {"METHODS": ("GET", "PUT"), # package
"upload_from_uri": {"TODO": "POST"}
},
"package_content": {"METHODS": ("GET", "PUT"), # package
"upload_from_uri": {"TODO": "POST"}
},
@@
-216,7
+216,7
@@
class Server(object):
},
"ns_instances": {"METHODS": ("GET", "POST"),
"<ID>": {"METHODS": ("GET", "DELETE"),
},
"ns_instances": {"METHODS": ("GET", "POST"),
"<ID>": {"METHODS": ("GET", "DELETE"),
- "scale": {"
TODO
": "POST"},
+ "scale": {"
METHODS
": "POST"},
"terminate": {"METHODS": "POST"},
"instantiate": {"METHODS": "POST"},
"action": {"METHODS": "POST"},
"terminate": {"METHODS": "POST"},
"instantiate": {"METHODS": "POST"},
"action": {"METHODS": "POST"},
@@
-228,6
+228,9
@@
class Server(object):
"vnfrs": {"METHODS": ("GET"),
"<ID>": {"METHODS": ("GET")}
},
"vnfrs": {"METHODS": ("GET"),
"<ID>": {"METHODS": ("GET")}
},
+ "vnf_instances": {"METHODS": ("GET"),
+ "<ID>": {"METHODS": ("GET")}
+ },
}
},
}
}
},
}
@@
-508,7
+511,7
@@
class Server(object):
return f
elif len(args) == 2 and args[0] == "db-clear":
return f
elif len(args) == 2 and args[0] == "db-clear":
- return self.engine.del_item_list({"project_id": "admin"
}, args[1], {}
)
+ return self.engine.del_item_list({"project_id": "admin"
, "admin": True}, args[1], kwargs
)
elif args and args[0] == "prune":
return self.engine.prune()
elif args and args[0] == "login":
elif args and args[0] == "prune":
return self.engine.prune()
elif args and args[0] == "login":
@@
-657,7
+660,7
@@
class Server(object):
engine_item = "nsrs"
if item == "ns_lcm_op_occs":
engine_item = "nslcmops"
engine_item = "nsrs"
if item == "ns_lcm_op_occs":
engine_item = "nslcmops"
- if item == "vnfrs":
+ if item == "vnfrs"
or item == "vnf_instances"
:
engine_item = "vnfrs"
if engine_item == "vims": # TODO this is for backward compatibility, it will remove in the future
engine_item = "vim_accounts"
engine_item = "vnfrs"
if engine_item == "vims": # TODO this is for backward compatibility, it will remove in the future
engine_item = "vim_accounts"
@@
-727,6
+730,7
@@
class Server(object):
cherrypy.response.status = HTTPStatus.ACCEPTED.value
elif method in ("PUT", "PATCH"):
cherrypy.response.status = HTTPStatus.ACCEPTED.value
elif method in ("PUT", "PATCH"):
+ outdata = None
if not indata and not kwargs:
raise NbiException("Nothing to update. Provide payload and/or query string",
HTTPStatus.BAD_REQUEST)
if not indata and not kwargs:
raise NbiException("Nothing to update. Provide payload and/or query string",
HTTPStatus.BAD_REQUEST)
@@
-735,10
+739,9
@@
class Server(object):
cherrypy.request.headers)
if not completed:
cherrypy.response.headers["Transaction-Id"] = id
cherrypy.request.headers)
if not completed:
cherrypy.response.headers["Transaction-Id"] = id
- cherrypy.response.status = HTTPStatus.NO_CONTENT.value
- outdata = None
else:
else:
- outdata = {"id": self.engine.edit_item(session, engine_item, _id, indata, kwargs, force=force)}
+ self.engine.edit_item(session, engine_item, _id, indata, kwargs, force=force)
+ cherrypy.response.status = HTTPStatus.NO_CONTENT.value
else:
raise NbiException("Method {} not allowed".format(method), HTTPStatus.METHOD_NOT_ALLOWED)
return self._format_out(outdata, session, _format)
else:
raise NbiException("Method {} not allowed".format(method), HTTPStatus.METHOD_NOT_ALLOWED)
return self._format_out(outdata, session, _format)