Merge "fix VDU parsing during granting"

[vfc/nfvo/lcm.git] / lcm / swagger / views.py

diff --git a/lcm/swagger/views.py b/lcm/swagger/views.py
index fdef8ae..5f087f8 100644 (file)
--- a/lcm/swagger/views.py
+++ b/lcm/swagger/views.py
@@ -14,20 +14,25 @@
 import json
 import logging
 import os
-import traceback
 
-from rest_framework import status
 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):
-
         json_file = os.path.join(os.path.dirname(__file__), 'vfc.nslcm.swagger.json')
         f = open(json_file)
         json_data = json.JSONDecoder().decode(f.read())
@@ -49,7 +54,6 @@ class SwaggerJsonView(APIView):
         json_data["paths"].update(json_data_temp["paths"])
         json_data["definitions"].update(json_data_temp["definitions"])
 
-
         json_file = os.path.join(os.path.dirname(__file__), 'vfc.sfclcm.swagger.json')
         f = open(json_file)
         json_data_temp = json.JSONDecoder().decode(f.read())
@@ -58,18 +62,21 @@ class SwaggerJsonView(APIView):
         json_data["paths"].update(json_data_temp["paths"])
         json_data["definitions"].update(json_data_temp["definitions"])
 
+        json_file = os.path.join(os.path.dirname(__file__), 'vfc.db.swagger.json')
+        f = open(json_file)
+        json_data_temp = json.JSONDecoder().decode(f.read())
+        f.close()
+
+        json_data["paths"].update(json_data_temp["paths"])
+        json_data["definitions"].update(json_data_temp["definitions"])
 
         json_file = os.path.join(os.path.dirname(__file__), 'vfc.others.swagger.json')
         f = open(json_file)
         json_data_temp = json.JSONDecoder().decode(f.read())
         f.close()
 
-        json_data_jobtemp=json_data["paths"]["/jobs/{jobId}"]
+        json_data_jobtemp = json_data["paths"]["/jobs/{jobId}"]
         json_data["paths"].update(json_data_temp["paths"])
         json_data["paths"]["/jobs/{jobId}"].update(json_data_jobtemp)
         json_data["definitions"].update(json_data_temp["definitions"])
-
         return Response(json_data)
-
-    
-