From 55945e7f57333fac8d39e4aa158c033c6f99e00f Mon Sep 17 00:00:00 2001 From: tierno Date: Fri, 6 Apr 2018 16:40:27 +0200 Subject: [PATCH] URL /test/message for sending to kafka URL /version to get server version Change-Id: Ib4af7efc72a06a752826d2e640acf06787734970 Signed-off-by: tierno --- osm_nbi/nbi.py | 50 ++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 36 insertions(+), 14 deletions(-) diff --git a/osm_nbi/nbi.py b/osm_nbi/nbi.py index 1cd61d5..0a344fb 100644 --- a/osm_nbi/nbi.py +++ b/osm_nbi/nbi.py @@ -20,7 +20,7 @@ from os import environ __author__ = "Alfonso Tierno " __version__ = "0.3" -version_date = "Mar 2018" +version_date = "Apr 2018" """ North Bound Interface (O: OSM specific; 5,X: SOL005 not implemented yet; O5: SOL005 implemented) @@ -40,6 +40,8 @@ URL: /osm GET POST / 5 X /vnfpkgm/v1 + /vnf_packages_content O O + / O O /vnf_packages O5 O5 / O5 O5 5 /package_content O5 O5 @@ -379,6 +381,24 @@ class Server(object): cherrypy.response.status = e.http_code.value return self._format_out("Welcome to OSM!", session) + @cherrypy.expose + def version(self, *args, **kwargs): + global __version__, version_date + try: + if cherrypy.request.method != "GET": + raise NbiException("Only method GET is allowed", HTTPStatus.METHOD_NOT_ALLOWED) + elif args or kwargs: + raise NbiException("Invalid URL or query string for version", HTTPStatus.METHOD_NOT_ALLOWED) + return __version__ + " " + version_date + except NbiException as e: + cherrypy.response.status = e.http_code.value + problem_details = { + "code": e.http_code.name, + "status": e.http_code.value, + "detail": str(e), + } + return self._format_out(problem_details, None) + @cherrypy.expose def token(self, method, token_id=None, kwargs=None): session = None @@ -431,19 +451,12 @@ class Server(object): } return self._format_out(problem_details, session) - @cherrypy.expose - def test2(self, args0=None, args1=None, args2=None, args3=None, *args, **kwargs): - return_text = ( - "
\n{} {} {} {} {} {} \n".format(args0, args1, args2, args3, args, kwargs))
-        return_text += "
" - return return_text - @cherrypy.expose def test(self, *args, **kwargs): thread_info = None if args and args[0] == "help": return "
\ninit\nfile/  download file\ndb-clear/table\nprune\nlogin\nlogin2\n"\
-                    "sleep/
" + "sleep/