From 6c60245c2961f2a2b67adabfd9fef3806c7304e7 Mon Sep 17 00:00:00 2001 From: Jacky Hu Date: Thu, 13 Jul 2017 08:40:01 +0800 Subject: [PATCH] Fix URL patterns The URL patterns was deprecated in ~1.8, and this style has been removed from the Horizon codebase. Change-Id: I2ee7ff310a6b9d5c339fd5b2e9143d0ac72278ca --- .../project/loadbalancersv2/urls.py | 20 +++++++++---------- .../project/ngloadbalancersv2/urls.py | 6 ++---- 2 files changed, 11 insertions(+), 15 deletions(-) diff --git a/octavia_dashboard/dashboards/project/loadbalancersv2/urls.py b/octavia_dashboard/dashboards/project/loadbalancersv2/urls.py index f7641fdc..30402020 100644 --- a/octavia_dashboard/dashboards/project/loadbalancersv2/urls.py +++ b/octavia_dashboard/dashboards/project/loadbalancersv2/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 .views import DetailView # noqa @@ -22,15 +21,14 @@ from .views import UpdateView # noqa INSTANCES = r'^(?P[^/]+)/%s$' -VIEW_MOD = 'openstack_dashboard.dashboards.project.loadbalancersv2.views' -urlpatterns = patterns(VIEW_MOD, - url(r'^$', IndexView.as_view(), name='index'), - url(r'^launch$', - LaunchLoadBalancerView.as_view(), name='launch'), - url(r'^(?P[^/]+)/$', - DetailView.as_view(), name='detail'), - url(INSTANCES % - 'update', UpdateView.as_view(), name='update'), - ) +urlpatterns = [ + url(r'^$', IndexView.as_view(), name='index'), + url(r'^launch$', + LaunchLoadBalancerView.as_view(), name='launch'), + url(r'^(?P[^/]+)/$', + DetailView.as_view(), name='detail'), + url(INSTANCES % + 'update', UpdateView.as_view(), name='update'), +] diff --git a/octavia_dashboard/dashboards/project/ngloadbalancersv2/urls.py b/octavia_dashboard/dashboards/project/ngloadbalancersv2/urls.py index a8d0a3dd..b531f7ac 100644 --- a/octavia_dashboard/dashboards/project/ngloadbalancersv2/urls.py +++ b/octavia_dashboard/dashboards/project/ngloadbalancersv2/urls.py @@ -12,13 +12,11 @@ # 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 octavia_dashboard.dashboards.project.ngloadbalancersv2 import views -urlpatterns = patterns( - 'octavia_dashboard.dashboards.project.ngloadbalancersv2.views', +urlpatterns = [ url('', views.IndexView.as_view(), name='index'), -) +]