X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=utils%2Ftest%2Ftestapi%2Fopnfv_testapi%2Ftornado_swagger%2Fviews.py;h=ca4f01cfc6b7e9ceb2e539862e8f501bed22f513;hb=a16b903c9765049bd28102c812b8307090a97e16;hp=25083195bcf87f7052f5c76612b5107c987786e6;hpb=50e9b87f746bf4be89617c3ead6e0117b1e52be8;p=releng.git

diff --git a/utils/test/testapi/opnfv_testapi/tornado_swagger/views.py b/utils/test/testapi/opnfv_testapi/tornado_swagger/views.py
index 25083195b..ca4f01cfc 100644
--- a/utils/test/testapi/opnfv_testapi/tornado_swagger/views.py
+++ b/utils/test/testapi/opnfv_testapi/tornado_swagger/views.py
@@ -8,47 +8,52 @@
 ##############################################################################
 import inspect
 import json
+import os.path
 
 import tornado.template
 import tornado.web
 
-from settings import SWAGGER_VERSION, SWAGGER_API_LIST, SWAGGER_API_SPEC
-from settings import models, basePath
+from opnfv_testapi.tornado_swagger import settings
 
 
 def json_dumps(obj, pretty=False):
-    return json.dumps(obj, sort_keys=True, indent=4, separators=(',', ': ')) \
-        if pretty else json.dumps(obj)
+    return json.dumps(obj,
+                      sort_keys=True,
+                      indent=4,
+                      separators=(',', ': ')) if pretty else json.dumps(obj)
 
 
 class SwaggerUIHandler(tornado.web.RequestHandler):
-    def initialize(self, static_path, **kwds):
-        self.static_path = static_path
+    def initialize(self, **kwargs):
+        self.static_path = kwargs.get('static_path')
+        self.base_url = kwargs.get('base_url')
 
     def get_template_path(self):
         return self.static_path
 
     def get(self):
-        discovery_url = basePath() + self.reverse_url(SWAGGER_API_LIST)
+        discovery_url = os.path.join(
+            self.base_url,
+            self.reverse_url(settings.RESOURCE_LISTING_NAME))
         self.render('index.html', discovery_url=discovery_url)
 
 
 class SwaggerResourcesHandler(tornado.web.RequestHandler):
-    def initialize(self, api_version, exclude_namespaces, **kwds):
-        self.api_version = api_version
-        self.exclude_namespaces = exclude_namespaces
+    def initialize(self, **kwargs):
+        self.api_version = kwargs.get('api_version')
+        self.swagger_version = kwargs.get('swagger_version')
+        self.base_url = kwargs.get('base_url')
+        self.exclude_namespaces = kwargs.get('exclude_namespaces')
 
     def get(self):
         self.set_header('content-type', 'application/json')
         resources = {
             'apiVersion': self.api_version,
-            'swaggerVersion': SWAGGER_VERSION,
-            'basePath': basePath(),
-            'produces': ["application/json"],
-            'description': 'Test Api Spec',
+            'swaggerVersion': self.swagger_version,
+            'basePath': self.base_url,
             'apis': [{
-                'path': self.reverse_url(SWAGGER_API_SPEC),
-                'description': 'Test Api Spec'
+                'path': self.reverse_url(settings.API_DECLARATION_NAME),
+                'description': 'Restful APIs Specification'
             }]
         }
 
@@ -56,9 +61,10 @@ class SwaggerResourcesHandler(tornado.web.RequestHandler):
 
 
 class SwaggerApiHandler(tornado.web.RequestHandler):
-    def initialize(self, api_version, base_url, **kwds):
-        self.api_version = api_version
-        self.base_url = base_url
+    def initialize(self, **kwargs):
+        self.api_version = kwargs.get('api_version')
+        self.swagger_version = kwargs.get('swagger_version')
+        self.base_url = kwargs.get('base_url')
 
     def get(self):
         self.set_header('content-type', 'application/json')
@@ -68,11 +74,13 @@ class SwaggerApiHandler(tornado.web.RequestHandler):
 
         specs = {
             'apiVersion': self.api_version,
-            'swaggerVersion': SWAGGER_VERSION,
-            'basePath': basePath(),
+            'swaggerVersion': self.swagger_version,
+            'basePath': self.base_url,
+            'resourcePath': '/',
+            'produces': ["application/json"],
             'apis': [self.__get_api_spec__(path, spec, operations)
                      for path, spec, operations in apis],
-            'models': self.__get_models_spec(models)
+            'models': self.__get_models_spec(settings.models)
         }
         self.finish(json_dumps(specs, self.get_arguments('pretty')))