Add swagger auto generate logic for vfc

Change-Id: Icacacde639c856008b95ba4f85f4187198ed80b6
Issue-ID: VFC-671
Signed-off-by: fujinhua <fu.jinhua@zte.com.cn>

diff --git a/lcm/jobs/urls.py b/lcm/jobs/urls.py
index 6919d05..3ddfc8a 100644 (file)
--- a/lcm/jobs/urls.py
+++ b/lcm/jobs/urls.py
@@ -11,13 +11,13 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-from django.conf.urls import patterns, url
+from django.conf.urls import url
 from rest_framework.urlpatterns import format_suffix_patterns
 
 from lcm.jobs.views import JobView
 
-urlpatterns = patterns('',
-                       url(r'^api/nslcm/v1/jobs/(?P<job_id>[0-9a-zA-Z_-]+)$', JobView.as_view()),
-                       )
+urlpatterns = [
+    url(r'^api/nslcm/v1/jobs/(?P<job_id>[0-9a-zA-Z_-]+)$', JobView.as_view()),
+]
 
 urlpatterns = format_suffix_patterns(urlpatterns)

diff --git a/lcm/ns/sfcs/urls.py b/lcm/ns/sfcs/urls.py
index 6b85256..cfca2c3 100644 (file)
--- a/lcm/ns/sfcs/urls.py
+++ b/lcm/ns/sfcs/urls.py
@@ -11,19 +11,19 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-from django.conf.urls import patterns, url
+from django.conf.urls import url
 from rest_framework.urlpatterns import format_suffix_patterns
 
 from lcm.ns.sfcs.detail_views import SfcDetailView
 from lcm.ns.sfcs.views import SfcView, SfcInstanceView, PortPairGpView, FlowClaView, PortChainView
 
-urlpatterns = patterns('',
-                       url(r'^api/nslcm/v1/ns/sfcs$', SfcView.as_view()),
-                       url(r'^api/nslcm/v1/ns/sfcs/(?P<sfc_inst_id>[0-9a-zA-Z_-]+)$', SfcDetailView.as_view()),
-                       url(r'^api/nslcm/v1/ns/sfc_instance$', SfcInstanceView.as_view()),
-                       url(r'^api/nslcm/v1/ns/create_port_pair_group$', PortPairGpView.as_view()),
-                       url(r'^api/nslcm/v1/ns/create_flow_classifier$', FlowClaView.as_view()),
-                       url(r'^api/nslcm/v1/ns/create_port_chain$', PortChainView.as_view()),
-                       )
+urlpatterns = [
+    url(r'^api/nslcm/v1/ns/sfcs$', SfcView.as_view()),
+    url(r'^api/nslcm/v1/ns/sfcs/(?P<sfc_inst_id>[0-9a-zA-Z_-]+)$', SfcDetailView.as_view()),
+    url(r'^api/nslcm/v1/ns/sfc_instance$', SfcInstanceView.as_view()),
+    url(r'^api/nslcm/v1/ns/create_port_pair_group$', PortPairGpView.as_view()),
+    url(r'^api/nslcm/v1/ns/create_flow_classifier$', FlowClaView.as_view()),
+    url(r'^api/nslcm/v1/ns/create_port_chain$', PortChainView.as_view()),
+]
 
 urlpatterns = format_suffix_patterns(urlpatterns)

diff --git a/lcm/ns/urls.py b/lcm/ns/urls.py
index f61b444..6fa0658 100644 (file)
--- a/lcm/ns/urls.py
+++ b/lcm/ns/urls.py
@@ -11,25 +11,20 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-from django.conf.urls import patterns, url
+from django.conf.urls import url
 from rest_framework.urlpatterns import format_suffix_patterns
 
 from lcm.ns.views import CreateNSView, NSInstView, TerminateNSView, NSDetailView, NSInstPostDealView, \
     NSManualScaleView, NSHealView
 
-urlpatterns = patterns('',
-                       url(r'^api/nslcm/v1/ns$', CreateNSView.as_view()),
-                       url(r'^api/nslcm/v1/ns/(?P<ns_instance_id>[0-9a-zA-Z_-]+)/instantiate$',
-                           NSInstView.as_view()),
-                       url(r'^api/nslcm/v1/ns/(?P<ns_instance_id>[0-9a-zA-Z_-]+)/terminate$',
-                           TerminateNSView.as_view()),
-                       url(r'^api/nslcm/v1/ns/(?P<ns_instance_id>[0-9a-zA-Z_-]+)$', NSDetailView.as_view()),
-                       url(r'^api/nslcm/v1/ns/(?P<ns_instance_id>[0-9a-zA-Z_-]+)/postdeal$',
-                           NSInstPostDealView.as_view()),
-                       url(r'^api/nslcm/v1/ns/(?P<ns_instance_id>[0-9a-zA-Z_-]+)/scale$',
-                           NSManualScaleView.as_view()),
-                       url(r'^api/nslcm/v1/ns/(?P<ns_instance_id>[0-9a-zA-Z_-]+)/heal$',
-                           NSHealView.as_view())
-                       )
+urlpatterns = [
+    url(r'^api/nslcm/v1/ns$', CreateNSView.as_view()),
+    url(r'^api/nslcm/v1/ns/(?P<ns_instance_id>[0-9a-zA-Z_-]+)/instantiate$', NSInstView.as_view()),
+    url(r'^api/nslcm/v1/ns/(?P<ns_instance_id>[0-9a-zA-Z_-]+)/terminate$', TerminateNSView.as_view()),
+    url(r'^api/nslcm/v1/ns/(?P<ns_instance_id>[0-9a-zA-Z_-]+)$', NSDetailView.as_view()),
+    url(r'^api/nslcm/v1/ns/(?P<ns_instance_id>[0-9a-zA-Z_-]+)/postdeal$', NSInstPostDealView.as_view()),
+    url(r'^api/nslcm/v1/ns/(?P<ns_instance_id>[0-9a-zA-Z_-]+)/scale$', NSManualScaleView.as_view()),
+    url(r'^api/nslcm/v1/ns/(?P<ns_instance_id>[0-9a-zA-Z_-]+)/heal$', NSHealView.as_view())
+]
 
 urlpatterns = format_suffix_patterns(urlpatterns)

diff --git a/lcm/ns/vls/urls.py b/lcm/ns/vls/urls.py
index a6f6adc..597404d 100644 (file)
--- a/lcm/ns/vls/urls.py
+++ b/lcm/ns/vls/urls.py
@@ -12,14 +12,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from django.conf.urls import patterns, url
+from django.conf.urls import url
 from rest_framework.urlpatterns import format_suffix_patterns
 
 from lcm.ns.vls.views import VlView, VlDetailView
 
-urlpatterns = patterns('',
-                       url(r'^api/nslcm/v1/ns/vls$', VlView.as_view()),
-                       url(r'^api/nslcm/v1/ns/vls/(?P<vl_inst_id>[0-9a-zA-Z_-]+)$', VlDetailView.as_view()),
-                       )
+urlpatterns = [
+    url(r'^api/nslcm/v1/ns/vls$', VlView.as_view()),
+    url(r'^api/nslcm/v1/ns/vls/(?P<vl_inst_id>[0-9a-zA-Z_-]+)$', VlDetailView.as_view()),
+]
 
 urlpatterns = format_suffix_patterns(urlpatterns)

diff --git a/lcm/ns/vnfs/urls.py b/lcm/ns/vnfs/urls.py
index 6e79c4d..ca0e8df 100644 (file)
--- a/lcm/ns/vnfs/urls.py
+++ b/lcm/ns/vnfs/urls.py
@@ -11,23 +11,21 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-from django.conf.urls import patterns, url
+from django.conf.urls import url
 from rest_framework.urlpatterns import format_suffix_patterns
 
 from lcm.ns.vnfs.views import NfView, NfDetailView, NfGrant, LcmNotify, NfScaleView, NfVerifyView, NfVnfmInfoView, \
     NfVimInfoView
 
-urlpatterns = patterns('',
-                       url(r'^api/nslcm/v1/ns/vnfs$', NfView.as_view()),
-                       url(r'^api/nslcm/v1/ns/vnfs/(?P<vnfinstid>[0-9a-zA-Z_-]+)$', NfDetailView.as_view()),
-                       url(r'^api/nslcm/v1/ns/grantvnf$', NfGrant.as_view()),
-                       url(r'^api/nslcm/v1/ns/(?P<vnfmid>[0-9a-zA-Z_-]+)'
-                           r'/vnfs/(?P<vnfInstanceId>[0-9a-zA-Z_-]+)/Notify$',
-                           LcmNotify.as_view()),
-                       url(r'^api/nslcm/v1/ns/vnfs/(?P<vnfinstid>[0-9a-zA-Z_-]+)/scaling$', NfScaleView.as_view()),
-                       url(r'^api/nslcm/v1/vnfonboarding$', NfVerifyView.as_view()),
-                       url(r'^api/nslcm/v1/vnfms/(?P<vnfmid>[0-9a-zA-Z_-]+)', NfVnfmInfoView.as_view()),
-                       url(r'^api/nslcm/v1/vims/(?P<vimid>[0-9a-zA-Z_-]+)', NfVimInfoView.as_view()),
-                       )
+urlpatterns = [
+    url(r'^api/nslcm/v1/ns/vnfs$', NfView.as_view()),
+    url(r'^api/nslcm/v1/ns/vnfs/(?P<vnfinstid>[0-9a-zA-Z_-]+)$', NfDetailView.as_view()),
+    url(r'^api/nslcm/v1/ns/grantvnf$', NfGrant.as_view()),
+    url(r'^api/nslcm/v1/ns/(?P<vnfmid>[0-9a-zA-Z_-]+)/vnfs/(?P<vnfInstanceId>[0-9a-zA-Z_-]+)/Notify$', LcmNotify.as_view()),
+    url(r'^api/nslcm/v1/ns/vnfs/(?P<vnfinstid>[0-9a-zA-Z_-]+)/scaling$', NfScaleView.as_view()),
+    url(r'^api/nslcm/v1/vnfonboarding$', NfVerifyView.as_view()),
+    url(r'^api/nslcm/v1/vnfms/(?P<vnfmid>[0-9a-zA-Z_-]+)', NfVnfmInfoView.as_view()),
+    url(r'^api/nslcm/v1/vims/(?P<vimid>[0-9a-zA-Z_-]+)', NfVimInfoView.as_view()),
+]
 
 urlpatterns = format_suffix_patterns(urlpatterns)

diff --git a/lcm/swagger/urls.py b/lcm/swagger/urls.py
index c3b8ad6..0fe8269 100644 (file)
--- a/lcm/swagger/urls.py
+++ b/lcm/swagger/urls.py
@@ -11,13 +11,13 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-from django.conf.urls import patterns, url
+from django.conf.urls import url
 from rest_framework.urlpatterns import format_suffix_patterns
 
 from lcm.swagger.views import SwaggerJsonView
 
-urlpatterns = patterns('',
-                       url(r'^api/nslcm/v1/swagger.json$', SwaggerJsonView.as_view())
-                       )
+urlpatterns = [
+    url(r'^api/nslcm/v1/swagger.json$', SwaggerJsonView.as_view())
+]
 
 urlpatterns = format_suffix_patterns(urlpatterns)

diff --git a/requirements.txt b/requirements.txt
index 8c34a07..17dad6a 100644 (file)
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,6 +1,6 @@
 # rest framework
-Django==1.9.6
-djangorestframework==3.3.3
+Django==1.11.9
+djangorestframework==3.7.7
 
 # for access MySQL
 MySQL-python==1.2.5
@@ -29,3 +29,17 @@ unittest_xml_reporting==1.12.0
 cryptography==2.0.3
 paramiko==2.0.2
 nfv-toscaparser>=0.5.0
+
+# for swagger
+Pillow>=4.3.0
+pygments>=2.2.0
+django-cors-headers>=2.1.0
+django-filter>=1.1.0,<2.0
+djangorestframework-camel-case>=0.2.0
+dj-database-url>=0.4.2
+user_agents>=1.1.0
+
+# for the validation feature
+flex>=6.11.1
+swagger-spec-validator>=2.1.0
+