Merge "Replace deprecated django.conf.urls.url()"

This commit is contained in:
Zuul 2022-07-29 16:55:28 +00:00 committed by Gerrit Code Review
commit d6a0bfb94e
1 changed files with 37 additions and 35 deletions

View File

@ -12,43 +12,45 @@
# 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 url from django.urls import re_path
from neutron_vpnaas_dashboard.dashboards.project.vpn import views from neutron_vpnaas_dashboard.dashboards.project.vpn import views
urlpatterns = [ urlpatterns = [
url(r'^$', views.IndexView.as_view(), name='index'), re_path(r'^$', views.IndexView.as_view(), name='index'),
url(r'^addikepolicy$', re_path(r'^addikepolicy$',
views.AddIKEPolicyView.as_view(), name='addikepolicy'), views.AddIKEPolicyView.as_view(), name='addikepolicy'),
url(r'^update_ikepolicy/(?P<ikepolicy_id>[^/]+)/$', re_path(r'^update_ikepolicy/(?P<ikepolicy_id>[^/]+)/$',
views.UpdateIKEPolicyView.as_view(), name='update_ikepolicy'), views.UpdateIKEPolicyView.as_view(), name='update_ikepolicy'),
url(r'^addipsecpolicy$', re_path(r'^addipsecpolicy$',
views.AddIPsecPolicyView.as_view(), name='addipsecpolicy'), views.AddIPsecPolicyView.as_view(), name='addipsecpolicy'),
url(r'^update_ipsecpolicy/(?P<ipsecpolicy_id>[^/]+)/$', re_path(r'^update_ipsecpolicy/(?P<ipsecpolicy_id>[^/]+)/$',
views.UpdateIPsecPolicyView.as_view(), name='update_ipsecpolicy'), views.UpdateIPsecPolicyView.as_view(), name='update_ipsecpolicy'),
url(r'^addipsecsiteconnection$', re_path(r'^addipsecsiteconnection$',
views.AddIPsecSiteConnectionView.as_view(), views.AddIPsecSiteConnectionView.as_view(),
name='addipsecsiteconnection'), name='addipsecsiteconnection'),
url(r'^update_ipsecsiteconnection/(?P<ipsecsiteconnection_id>[^/]+)/$', re_path(r'^update_ipsecsiteconnection/(?P<ipsecsiteconnection_id>[^/]+)/$',
views.UpdateIPsecSiteConnectionView.as_view(), views.UpdateIPsecSiteConnectionView.as_view(),
name='update_ipsecsiteconnection'), name='update_ipsecsiteconnection'),
url(r'^addvpnservice$', re_path(r'^addvpnservice$',
views.AddVPNServiceView.as_view(), name='addvpnservice'), views.AddVPNServiceView.as_view(), name='addvpnservice'),
url(r'^update_vpnservice/(?P<vpnservice_id>[^/]+)/$', re_path(r'^update_vpnservice/(?P<vpnservice_id>[^/]+)/$',
views.UpdateVPNServiceView.as_view(), name='update_vpnservice'), views.UpdateVPNServiceView.as_view(), name='update_vpnservice'),
url(r'^addendpointgroup$', re_path(r'^addendpointgroup$',
views.AddEndpointGroupView.as_view(), name='addendpointgroup'), views.AddEndpointGroupView.as_view(), name='addendpointgroup'),
url(r'^update_endpointgroup/(?P<endpoint_group_id>[^/]+)/$', re_path(r'^update_endpointgroup/(?P<endpoint_group_id>[^/]+)/$',
views.UpdateEndpointGroupView.as_view(), name='update_endpointgroup'), views.UpdateEndpointGroupView.as_view(),
url(r'^ikepolicy/(?P<ikepolicy_id>[^/]+)/$', name='update_endpointgroup'),
views.IKEPolicyDetailsView.as_view(), name='ikepolicydetails'), re_path(r'^ikepolicy/(?P<ikepolicy_id>[^/]+)/$',
url(r'^ipsecpolicy/(?P<ipsecpolicy_id>[^/]+)/$', views.IKEPolicyDetailsView.as_view(), name='ikepolicydetails'),
views.IPsecPolicyDetailsView.as_view(), name='ipsecpolicydetails'), re_path(r'^ipsecpolicy/(?P<ipsecpolicy_id>[^/]+)/$',
url(r'^vpnservice/(?P<vpnservice_id>[^/]+)/$', views.IPsecPolicyDetailsView.as_view(), name='ipsecpolicydetails'),
views.VPNServiceDetailsView.as_view(), name='vpnservicedetails'), re_path(r'^vpnservice/(?P<vpnservice_id>[^/]+)/$',
url(r'^endpointgroup/(?P<endpoint_group_id>[^/]+)/$', views.VPNServiceDetailsView.as_view(), name='vpnservicedetails'),
views.EndpointGroupDetailsView.as_view(), name='endpointgroupdetails'), re_path(r'^endpointgroup/(?P<endpoint_group_id>[^/]+)/$',
url(r'^ipsecsiteconnection/(?P<ipsecsiteconnection_id>[^/]+)/$', views.EndpointGroupDetailsView.as_view(),
views.IPsecSiteConnectionDetailsView.as_view(), name='endpointgroupdetails'),
name='ipsecsiteconnectiondetails'), re_path(r'^ipsecsiteconnection/(?P<ipsecsiteconnection_id>[^/]+)/$',
views.IPsecSiteConnectionDetailsView.as_view(),
name='ipsecsiteconnectiondetails'),
] ]