summaryrefslogtreecommitdiffstats
path: root/lcm
diff options
context:
space:
mode:
authorying.yunlong <ying.yunlong@zte.com.cn>2018-01-25 09:32:01 +0800
committerying.yunlong <ying.yunlong@zte.com.cn>2018-01-25 09:32:01 +0800
commit1b8806ad85016e93a6d049730a54e56a518656a0 (patch)
tree83e9382d2b7fa649a13ed9bab3253f531d8ae2e7 /lcm
parent358310fd8c7c0863800de3b22a5a9d8ce2fb3b7e (diff)
Upgrade vfc-vnflcm django version
Change-Id: I059376085b551e4adfaddc809b530a409a4b41fe Issue-ID: VFC-682 Signed-off-by: ying.yunlong <ying.yunlong@zte.com.cn>
Diffstat (limited to 'lcm')
-rw-r--r--lcm/lcm/jobs/urls.py11
-rw-r--r--lcm/lcm/nf/vnfs/urls.py23
-rw-r--r--lcm/lcm/samples/urls.py3
-rw-r--r--lcm/lcm/swagger/urls.py2
-rw-r--r--lcm/requirements.txt4
5 files changed, 19 insertions, 24 deletions
diff --git a/lcm/lcm/jobs/urls.py b/lcm/lcm/jobs/urls.py
index 33eec201..b36550e2 100644
--- 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 7e88f30a..a8de42b1 100644
--- 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 0756d137..b468e27f 100644
--- 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 6764a1d4..1b290a01 100644
--- 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 c98aff71..740d0fe6 100644
--- 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