diff options
| -rw-r--r-- | lcm/lcm/jobs/urls.py | 11 | ||||
| -rw-r--r-- | lcm/lcm/nf/vnfs/urls.py | 23 | ||||
| -rw-r--r-- | lcm/lcm/samples/urls.py | 3 | ||||
| -rw-r--r-- | lcm/lcm/swagger/urls.py | 2 | ||||
| -rw-r--r-- | lcm/requirements.txt | 4 |
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 |