From da8c4e4cafe24a8d3e1a8f2d1e6c7868f22fa1f3 Mon Sep 17 00:00:00 2001 From: YAMAMOTO Takashi Date: Wed, 2 Aug 2017 17:49:54 +0900 Subject: [PATCH] Use the new way to reference views See https://docs.djangoproject.com/en/1.9/releases/1.8/#django-conf-urls-patterns Closes-Bug: #1708118 ---------------------------------------- This commit includes the following unrelated change to pass the gate. docs: Fix an import error version.py was copied from neutron-vpnaas-dashboard and modified a bit. Closes-Bug: #1708145 Change-Id: I475a808cd4c7e940aee5306d7c33a1c9c16746c3 ---------------------------------------- Change-Id: I0077105a13c7b6dd2c49fae17784dffb54e55cd9 --- .../project/tapservices/tapflows/urls.py | 7 ++----- .../dashboards/project/tapservices/urls.py | 6 ++---- neutron_taas_dashboard/version.py | 15 +++++++++++++++ 3 files changed, 19 insertions(+), 9 deletions(-) create mode 100644 neutron_taas_dashboard/version.py diff --git a/neutron_taas_dashboard/dashboards/project/tapservices/tapflows/urls.py b/neutron_taas_dashboard/dashboards/project/tapservices/tapflows/urls.py index 3eafb00..55cde59 100644 --- a/neutron_taas_dashboard/dashboards/project/tapservices/tapflows/urls.py +++ b/neutron_taas_dashboard/dashboards/project/tapservices/tapflows/urls.py @@ -12,7 +12,6 @@ # License for the specific language governing permissions and limitations # under the License. -from django.conf.urls import patterns from django.conf.urls import url from neutron_taas_dashboard.dashboards.project.tapservices.tapflows \ @@ -20,9 +19,7 @@ from neutron_taas_dashboard.dashboards.project.tapservices.tapflows \ TAP_FLOWS = r'^(?P[^/]+)/%s$' -VIEW_MOD = 'openstack_dashboard.dashboards.project.tapservices.tapflows.views' -urlpatterns = patterns( - VIEW_MOD, +urlpatterns = [ url(TAP_FLOWS % 'detail', views.DetailView.as_view(), name='detail'), -) +] diff --git a/neutron_taas_dashboard/dashboards/project/tapservices/urls.py b/neutron_taas_dashboard/dashboards/project/tapservices/urls.py index 82b50c5..1bc116c 100644 --- a/neutron_taas_dashboard/dashboards/project/tapservices/urls.py +++ b/neutron_taas_dashboard/dashboards/project/tapservices/urls.py @@ -13,7 +13,6 @@ # under the License. from django.conf.urls import include -from django.conf.urls import patterns from django.conf.urls import url from neutron_taas_dashboard.dashboards.project.tapservices.tapflows \ @@ -25,12 +24,11 @@ from neutron_taas_dashboard.dashboards.project.tapservices \ TAP_SERVICES = r'^(?P[^/]+)/%s$' -urlpatterns = patterns( - '', +urlpatterns = [ url(r'^$', views.IndexView.as_view(), name='index'), url(r'^create/$', views.CreateView.as_view(), name='create'), url(TAP_SERVICES % 'detail', views.DetailView.as_view(), name='detail'), url(TAP_SERVICES % 'tapflows/create', tf_views.CreateView.as_view(), name='createtapflow'), url(r'^tapflows/', include(tapflow_urls, namespace='tapflows')), -) +] diff --git a/neutron_taas_dashboard/version.py b/neutron_taas_dashboard/version.py new file mode 100644 index 0000000..caf839d --- /dev/null +++ b/neutron_taas_dashboard/version.py @@ -0,0 +1,15 @@ +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. You may obtain +# a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, 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. + +import pbr.version + +version_info = pbr.version.VersionInfo('neutron_taas_dashboard')