Upgrade vfc-vnflcm django version

Change-Id: I059376085b551e4adfaddc809b530a409a4b41fe
Issue-ID: VFC-682
Signed-off-by: ying.yunlong <ying.yunlong@zte.com.cn>

diff --git a/lcm/lcm/jobs/urls.py b/lcm/lcm/jobs/urls.py
index 33eec20..b36550e 100644 (file)
--- a/lcm/lcm/jobs/urls.py
+++ b/lcm/lcm/jobs/urls.py
@@ -12,13 +12,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from django.conf.urls import patterns, url
-from rest_framework.urlpatterns import format_suffix_patterns
+from django.conf.urls import url
 
 from lcm.jobs.views import JobView
 
-urlpatterns = patterns('',
-                       url(r'^api/vnflcm/v1/vnf_lc_ops/(?P<job_id>[0-9a-zA-Z_-]+)$', JobView.as_view()),
-                       )
-
-urlpatterns = format_suffix_patterns(urlpatterns)
+urlpatterns = [
+    url(r'^api/vnflcm/v1/vnf_lc_ops/(?P<job_id>[0-9a-zA-Z_-]+)$', JobView.as_view()),
+]

diff --git a/lcm/lcm/nf/vnfs/urls.py b/lcm/lcm/nf/vnfs/urls.py
index 7e88f30..a8de42b 100644 (file)
--- a/lcm/lcm/nf/vnfs/urls.py
+++ b/lcm/lcm/nf/vnfs/urls.py
@@ -12,19 +12,16 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from django.conf.urls import patterns, url
-from rest_framework.urlpatterns import format_suffix_patterns
+from django.conf.urls import url
 
 from lcm.nf.vnfs.views import InstantiateVnf, TerminateVnf, DeleteVnfAndQueryVnf, CreateVnfAndQueryVnfs
 
-urlpatterns = patterns('',
-                       url(r'^api/vnflcm/v1/vnf_instances$', CreateVnfAndQueryVnfs.as_view()),
-                       url(r'^api/vnflcm/v1/vnf_instances/(?P<instanceid>[0-9a-zA-Z_-]+)/instantiate$',
-                           InstantiateVnf.as_view()),
-                       url(r'^api/vnflcm/v1/vnf_instances/(?P<instanceid>[0-9a-zA-Z_-]+)$',
-                           DeleteVnfAndQueryVnf.as_view()),
-                       url(r'^api/vnflcm/v1/vnf_instances/(?P<instanceid>[0-9a-zA-Z_-]+)/terminate$',
-                           TerminateVnf.as_view()),
-                       )
-
-urlpatterns = format_suffix_patterns(urlpatterns)
+urlpatterns = [
+    url(r'^api/vnflcm/v1/vnf_instances$', CreateVnfAndQueryVnfs.as_view()),
+    url(r'^api/vnflcm/v1/vnf_instances/(?P<instanceid>[0-9a-zA-Z_-]+)/instantiate$',
+        InstantiateVnf.as_view()),
+    url(r'^api/vnflcm/v1/vnf_instances/(?P<instanceid>[0-9a-zA-Z_-]+)$',
+        DeleteVnfAndQueryVnf.as_view()),
+    url(r'^api/vnflcm/v1/vnf_instances/(?P<instanceid>[0-9a-zA-Z_-]+)/terminate$',
+        TerminateVnf.as_view()),
+]

diff --git a/lcm/lcm/samples/urls.py b/lcm/lcm/samples/urls.py
index 0756d13..b468e27 100644 (file)
--- a/lcm/lcm/samples/urls.py
+++ b/lcm/lcm/samples/urls.py
@@ -17,4 +17,5 @@ from lcm.samples import views
 
 urlpatterns = [
     url(r'^api/vnflcm/v1/resources/(?P<action_type>(inst|term)+)$', views.ResourceList.as_view()),
-    url(r'^samples/$', views.SampleList.as_view()), ]
+    url(r'^samples/$', views.SampleList.as_view()),
+]

diff --git a/lcm/lcm/swagger/urls.py b/lcm/lcm/swagger/urls.py
index 6764a1d..1b290a0 100644 (file)
--- a/lcm/lcm/swagger/urls.py
+++ b/lcm/lcm/swagger/urls.py
@@ -16,5 +16,5 @@ from django.conf.urls import url
 from lcm.swagger import views
 
 urlpatterns = [
-    url(r'^api/vnflcm/v1/swagger.json$', views.SwaggerView.as_view())
+    url(r'^api/vnflcm/v1/swagger.json$', views.SwaggerView.as_view()),
 ]

diff --git a/lcm/requirements.txt b/lcm/requirements.txt
index c98aff7..740d0fe 100644 (file)
--- a/lcm/requirements.txt
+++ b/lcm/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