From ad4f6941e34c6a0ed91954af999ce230582b69b8 Mon Sep 17 00:00:00 2001
From: manchandavishal <manchandavishal143@gmail.com>
Date: Fri, 29 Apr 2022 22:27:57 +0530
Subject: [PATCH] Address RemovedInDjango40Warning

In Django 3.1, django.conf.urls.url() is deprecated
in favor of django.urls.re_path(). For more info see [1]
These were already replaced in Horizon repo by [2].

[1] https://docs.djangoproject.com/en/4.0/releases/3.1/#id2
[2] https://review.opendev.org/c/openstack/horizon/+/827093

Change-Id: I67a54ce20d71165414553518d81a81764b375dc0
---
 .../dashboards/project/firewalls_v2/urls.py   | 66 ++++++++++---------
 1 file changed, 34 insertions(+), 32 deletions(-)

diff --git a/neutron_fwaas_dashboard/dashboards/project/firewalls_v2/urls.py b/neutron_fwaas_dashboard/dashboards/project/firewalls_v2/urls.py
index e4363b0..b0abe4a 100644
--- a/neutron_fwaas_dashboard/dashboards/project/firewalls_v2/urls.py
+++ b/neutron_fwaas_dashboard/dashboards/project/firewalls_v2/urls.py
@@ -12,42 +12,44 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from django.conf.urls import url
+from django.urls import re_path
 
 from neutron_fwaas_dashboard.dashboards.project.firewalls_v2 import views
 
 # TODO(Sarath Mekala) : Fix 'firewall' --> 'firewallgroup' in URLs as
 # well as in other places.
 urlpatterns = [
-    url(r'^$', views.IndexView.as_view(), name='index'),
-    url(r'^\?tab=fwtabs__firewalls$',
-        views.IndexView.as_view(), name='firewalls'),
-    url(r'^\?tab=fwtabs__rules$', views.IndexView.as_view(), name='rules'),
-    url(r'^\?tab=fwtabs__policies$',
-        views.IndexView.as_view(), name='policies'),
-    url(r'^addrule$', views.AddRuleView.as_view(), name='addrule'),
-    url(r'^addpolicy$', views.AddPolicyView.as_view(), name='addpolicy'),
-    url(r'^addfirewallgroup$',
-        views.AddFirewallGroupView.as_view(),
-        name='addfirewallgroup'),
-    url(r'^insertrule/(?P<policy_id>[^/]+)/$',
-        views.InsertRuleToPolicyView.as_view(), name='insertrule'),
-    url(r'^removerule/(?P<policy_id>[^/]+)/$',
-        views.RemoveRuleFromPolicyView.as_view(), name='removerule'),
-    url(r'^updaterule/(?P<rule_id>[^/]+)/$',
-        views.UpdateRuleView.as_view(), name='updaterule'),
-    url(r'^updatepolicy/(?P<policy_id>[^/]+)/$',
-        views.UpdatePolicyView.as_view(), name='updatepolicy'),
-    url(r'^updatefirewall/(?P<firewall_id>[^/]+)/$',
-        views.UpdateFirewallView.as_view(), name='updatefirewall'),
-    url(r'^addport/(?P<firewallgroup_id>[^/]+)/$',
-        views.AddPortView.as_view(), name='addport'),
-    url(r'^removeport/(?P<firewallgroup_id>[^/]+)/$',
-        views.RemovePortView.as_view(), name='removeport'),
-    url(r'^rule/(?P<rule_id>[^/]+)/$',
-        views.RuleDetailsView.as_view(), name='ruledetails'),
-    url(r'^policy/(?P<policy_id>[^/]+)/$',
-        views.PolicyDetailsView.as_view(), name='policydetails'),
-    url(r'^firewallgroup/(?P<firewallgroup_id>[^/]+)/$',
-        views.FirewallGroupDetailsView.as_view(), name='firewallgroupdetails'),
+    re_path(r'^$', views.IndexView.as_view(), name='index'),
+    re_path(r'^\?tab=fwtabs__firewalls$',
+            views.IndexView.as_view(), name='firewalls'),
+    re_path(r'^\?tab=fwtabs__rules$', views.IndexView.as_view(),
+            name='rules'),
+    re_path(r'^\?tab=fwtabs__policies$',
+            views.IndexView.as_view(), name='policies'),
+    re_path(r'^addrule$', views.AddRuleView.as_view(), name='addrule'),
+    re_path(r'^addpolicy$', views.AddPolicyView.as_view(), name='addpolicy'),
+    re_path(r'^addfirewallgroup$',
+            views.AddFirewallGroupView.as_view(),
+            name='addfirewallgroup'),
+    re_path(r'^insertrule/(?P<policy_id>[^/]+)/$',
+            views.InsertRuleToPolicyView.as_view(), name='insertrule'),
+    re_path(r'^removerule/(?P<policy_id>[^/]+)/$',
+            views.RemoveRuleFromPolicyView.as_view(), name='removerule'),
+    re_path(r'^updaterule/(?P<rule_id>[^/]+)/$',
+            views.UpdateRuleView.as_view(), name='updaterule'),
+    re_path(r'^updatepolicy/(?P<policy_id>[^/]+)/$',
+            views.UpdatePolicyView.as_view(), name='updatepolicy'),
+    re_path(r'^updatefirewall/(?P<firewall_id>[^/]+)/$',
+            views.UpdateFirewallView.as_view(), name='updatefirewall'),
+    re_path(r'^addport/(?P<firewallgroup_id>[^/]+)/$',
+            views.AddPortView.as_view(), name='addport'),
+    re_path(r'^removeport/(?P<firewallgroup_id>[^/]+)/$',
+            views.RemovePortView.as_view(), name='removeport'),
+    re_path(r'^rule/(?P<rule_id>[^/]+)/$',
+            views.RuleDetailsView.as_view(), name='ruledetails'),
+    re_path(r'^policy/(?P<policy_id>[^/]+)/$',
+            views.PolicyDetailsView.as_view(), name='policydetails'),
+    re_path(r'^firewallgroup/(?P<firewallgroup_id>[^/]+)/$',
+            views.FirewallGroupDetailsView.as_view(),
+            name='firewallgroupdetails'),
 ]