Merge "Change vfc-nslcm swagger url directory"

4 files changed, 21 insertions, 25 deletions

diff --git a/lcm/settings.py b/lcm/settings.py
index e5f680bb..a3175d9d 100644
--- a/lcm/settings.py
+++ b/lcm/settings.py
@@ -70,7 +70,7 @@ TEMPLATES = [
 SWAGGER_SETTINGS = {
     'LOGIN_URL': '/admin/login',
     'LOGOUT_URL': '/admin/logout',
-    'DEFAULT_INFO': 'lcm.urls.swagger_info'
+    'DEFAULT_INFO': 'lcm.swagger.urls.swagger_info'
 }
 
 MIDDLEWARE_CLASSES = [
diff --git a/lcm/swagger/urls.py b/lcm/swagger/urls.py
index cb10cad6..7536eda1 100644
--- a/lcm/swagger/urls.py
+++ b/lcm/swagger/urls.py
@@ -12,16 +12,31 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 from django.conf.urls import url
+from drf_yasg import openapi
+from drf_yasg.views import get_schema_view
+from rest_framework import permissions
 
-from lcm.swagger.views import SchemaView
 from lcm.swagger.views import SwaggerJsonView
 
+swagger_info = openapi.Info(
+    title="vfc-nfvo-lcm API",
+    default_version='v1',
+    description="""
+
+The `swagger-ui` view can be found [here](/cached/swagger).
+The `ReDoc` view can be found [here](/cached/redoc).
+The swagger YAML document can be found [here](/cached/swagger.yaml)."""
+)
+
+SchemaView = get_schema_view(
+    validators=['ssv', 'flex'],
+    public=True,
+    permission_classes=(permissions.AllowAny,),
+)
+
 urlpatterns = [
     url(r'^api/nslcm/v1/swagger.json$', SwaggerJsonView.as_view()),
     url(r'^swagger(?P<format>.json|.yaml)$', SchemaView.without_ui(cache_timeout=0), name='schema-json'),
     url(r'^swagger/$', SchemaView.with_ui('swagger', cache_timeout=0), name='schema-swagger-ui'),
     url(r'^redoc/$', SchemaView.with_ui('redoc', cache_timeout=0), name='schema-redoc'),
-    url(r'^cached/swagger(?P<format>.json|.yaml)$', SchemaView.without_ui(cache_timeout=None), name='cschema-json'),
-    url(r'^cached/swagger/$', SchemaView.with_ui('swagger', cache_timeout=None), name='cschema-swagger-ui'),
-    url(r'^cached/redoc/$', SchemaView.with_ui('redoc', cache_timeout=None), name='cschema-redoc'),
 ]
diff --git a/lcm/swagger/views.py b/lcm/swagger/views.py
index 5f087f8c..e78ecead 100644
--- a/lcm/swagger/views.py
+++ b/lcm/swagger/views.py
@@ -17,19 +17,10 @@ import os
 
 from rest_framework.response import Response
 from rest_framework.views import APIView
-from rest_framework import permissions
-from drf_yasg.views import get_schema_view
 
 logger = logging.getLogger(__name__)
 
 
-SchemaView = get_schema_view(
-    validators=['ssv', 'flex'],
-    public=True,
-    permission_classes=(permissions.AllowAny,),
-)
-
-
 class SwaggerJsonView(APIView):
 
     def get(self, request):
diff --git a/lcm/urls.py b/lcm/urls.py
index eb82f083..af5e7f69 100644
--- a/lcm/urls.py
+++ b/lcm/urls.py
@@ -13,20 +13,10 @@
 # limitations under the License.
 
 from django.conf.urls import include, url
-from drf_yasg import openapi
 
-from lcm.pub.config.config import REG_TO_MSB_WHEN_START, REG_TO_MSB_REG_URL, REG_TO_MSB_REG_PARAM
 from lcm.pub.config.config import DEPLOY_WORKFLOW_WHEN_START
+from lcm.pub.config.config import REG_TO_MSB_WHEN_START, REG_TO_MSB_REG_URL, REG_TO_MSB_REG_PARAM
 
-swagger_info = openapi.Info(
-    title="vfc-nfvo-lcm API",
-    default_version='v1',
-    description="""
-
-The `swagger-ui` view can be found [here](/cached/swagger).
-The `ReDoc` view can be found [here](/cached/redoc).
-The swagger YAML document can be found [here](/cached/swagger.yaml)."""
-)
 
 urlpatterns = [
     url(r'^', include('lcm.samples.urls')),