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
This commit is contained in:
parent
f58397e151
commit
da8c4e4caf
@ -12,7 +12,6 @@
|
|||||||
# License for the specific language governing permissions and limitations
|
# License for the specific language governing permissions and limitations
|
||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
from django.conf.urls import patterns
|
|
||||||
from django.conf.urls import url
|
from django.conf.urls import url
|
||||||
|
|
||||||
from neutron_taas_dashboard.dashboards.project.tapservices.tapflows \
|
from neutron_taas_dashboard.dashboards.project.tapservices.tapflows \
|
||||||
@ -20,9 +19,7 @@ from neutron_taas_dashboard.dashboards.project.tapservices.tapflows \
|
|||||||
|
|
||||||
|
|
||||||
TAP_FLOWS = r'^(?P<tap_flow_id>[^/]+)/%s$'
|
TAP_FLOWS = r'^(?P<tap_flow_id>[^/]+)/%s$'
|
||||||
VIEW_MOD = 'openstack_dashboard.dashboards.project.tapservices.tapflows.views'
|
|
||||||
|
|
||||||
urlpatterns = patterns(
|
urlpatterns = [
|
||||||
VIEW_MOD,
|
|
||||||
url(TAP_FLOWS % 'detail', views.DetailView.as_view(), name='detail'),
|
url(TAP_FLOWS % 'detail', views.DetailView.as_view(), name='detail'),
|
||||||
)
|
]
|
||||||
|
@ -13,7 +13,6 @@
|
|||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
from django.conf.urls import include
|
from django.conf.urls import include
|
||||||
from django.conf.urls import patterns
|
|
||||||
from django.conf.urls import url
|
from django.conf.urls import url
|
||||||
|
|
||||||
from neutron_taas_dashboard.dashboards.project.tapservices.tapflows \
|
from neutron_taas_dashboard.dashboards.project.tapservices.tapflows \
|
||||||
@ -25,12 +24,11 @@ from neutron_taas_dashboard.dashboards.project.tapservices \
|
|||||||
|
|
||||||
TAP_SERVICES = r'^(?P<tap_service_id>[^/]+)/%s$'
|
TAP_SERVICES = r'^(?P<tap_service_id>[^/]+)/%s$'
|
||||||
|
|
||||||
urlpatterns = patterns(
|
urlpatterns = [
|
||||||
'',
|
|
||||||
url(r'^$', views.IndexView.as_view(), name='index'),
|
url(r'^$', views.IndexView.as_view(), name='index'),
|
||||||
url(r'^create/$', views.CreateView.as_view(), name='create'),
|
url(r'^create/$', views.CreateView.as_view(), name='create'),
|
||||||
url(TAP_SERVICES % 'detail', views.DetailView.as_view(), name='detail'),
|
url(TAP_SERVICES % 'detail', views.DetailView.as_view(), name='detail'),
|
||||||
url(TAP_SERVICES % 'tapflows/create', tf_views.CreateView.as_view(),
|
url(TAP_SERVICES % 'tapflows/create', tf_views.CreateView.as_view(),
|
||||||
name='createtapflow'),
|
name='createtapflow'),
|
||||||
url(r'^tapflows/', include(tapflow_urls, namespace='tapflows')),
|
url(r'^tapflows/', include(tapflow_urls, namespace='tapflows')),
|
||||||
)
|
]
|
||||||
|
15
neutron_taas_dashboard/version.py
Normal file
15
neutron_taas_dashboard/version.py
Normal file
@ -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')
|
Loading…
Reference in New Issue
Block a user