From 20df0f4b5bd7ccaf0c224df00858d8a99374af52 Mon Sep 17 00:00:00 2001 From: catborise Date: Tue, 26 May 2020 20:43:15 +0300 Subject: [PATCH] convert urls to new path format --- accounts/urls.py | 4 ++-- computes/urls.py | 41 +++++++++++++++++++++-------------------- datasource/urls.py | 13 +++++-------- instances/urls.py | 18 +++++++++--------- logs/urls.py | 4 ++-- webvirtcloud/urls.py | 2 +- 6 files changed, 40 insertions(+), 42 deletions(-) diff --git a/accounts/urls.py b/accounts/urls.py index 6b49b70..cab20f9 100644 --- a/accounts/urls.py +++ b/accounts/urls.py @@ -1,4 +1,4 @@ -from django.urls import path, re_path +from django.urls import path from django.contrib.auth import views as auth_views from . import views @@ -6,5 +6,5 @@ urlpatterns = [ path('login/', auth_views.LoginView.as_view(template_name='login.html'), name='login'), path('logout/', auth_views.LogoutView.as_view(template_name='logout.html'), name='logout'), path('profile/', views.profile, name='profile'), path('', views.accounts, name='accounts'), - re_path(r'^profile/(?P[0-9]+)/$', views.account, name='account'), + path('profile//', views.account, name='account'), ] diff --git a/computes/urls.py b/computes/urls.py index be5f09b..df5ed92 100644 --- a/computes/urls.py +++ b/computes/urls.py @@ -1,4 +1,4 @@ -from django.urls import path, re_path +from django.urls import path, include from storages.views import storages, storage, get_volumes from networks.views import networks, network from secrets.views import secrets @@ -10,23 +10,24 @@ from nwfilters.views import nwfilter, nwfilters urlpatterns = [ path('', computes, name='computes'), - re_path(r'^(?P[0-9]+)/$', overview, name='overview'), - re_path(r'^(?P[0-9]+)/statistics$', compute_graph, name='compute_graph'), - re_path(r'^(?P[0-9]+)/instances/$', instances, name='instances'), - re_path(r'^(?P[0-9]+)/storages/$', storages, name='storages'), - re_path(r'^(?P[0-9]+)/storage/(?P[\w\-\.\/]+)/volumes$', get_volumes, name='volumes'), - re_path(r'^(?P[0-9]+)/storage/(?P[\w\-\.\/]+)/$', storage, name='storage'), - re_path(r'^(?P[0-9]+)/networks/$', networks, name='networks'), - re_path(r'^(?P[0-9]+)/network/(?P[\w\-\.]+)/$', network, name='network'), - re_path(r'^(?P[0-9]+)/interfaces/$', interfaces, name='interfaces'), - re_path(r'^(?P[0-9]+)/interface/(?P[\w\-\.\:]+)/$', interface, name='interface'), - re_path(r'^(?P[0-9]+)/nwfilters/$', nwfilters, name='nwfilters'), - re_path(r'^(?P[0-9]+)/nwfilter/(?P[\w\-\.\:]+)/$', nwfilter, name='nwfilter'), - re_path(r'^(?P[0-9]+)/secrets/$', secrets, name='secrets'), - re_path(r'^(?P[0-9]+)/create/$', create_instance_select_type, name='create_instance_select_type'), - re_path(r'^(?P[0-9]+)/create/archs/(?P[\w\-\.\/]+)/machines/(?P[\w\-\.\/]+)$', create_instance, name='create_instance'), - re_path(r'^(?P[0-9]+)/archs/(?P[\w\-\.\/]+)/machines$', get_compute_machine_types, name='machines'), - re_path(r'^(?P[0-9]+)/archs/(?P[\w\-\.\/]+)/machines/(?P[\w\-\.\/]+)/disks/(?P[\w\-\.\/]+)/buses$', get_compute_disk_buses, name='buses'), - re_path(r'^(?P[0-9]+)/archs/(?P[\w\-\.\/]+)/machines/(?P[\w\-\.\/]+)/capabilities$', get_dom_capabilities, name='domcaps'), + path('/', include([ + path('', overview, name='overview'), + path('statistics', compute_graph, name='compute_graph'), + path('instances/', instances, name='instances'), + path('storages/', storages, name='storages'), + path('storage//volumes', get_volumes, name='volumes'), + path('storage//', storage, name='storage'), + path('networks/', networks, name='networks'), + path('network//', network, name='network'), + path('interfaces/', interfaces, name='interfaces'), + path('interface//', interface, name='interface'), + path('nwfilters/', nwfilters, name='nwfilters'), + path('nwfilter//', nwfilter, name='nwfilter'), + path('secrets/', secrets, name='secrets'), + path('create/', create_instance_select_type, name='create_instance_select_type'), + path('create/archs//machines/', create_instance, name='create_instance'), + path('archs//machines', get_compute_machine_types, name='machines'), + path('archs//machines//disks//buses', get_compute_disk_buses, name='buses'), + path('archs//machines//capabilities', get_dom_capabilities, name='domcaps'), + ])), ] - diff --git a/datasource/urls.py b/datasource/urls.py index 2979a4e..3bfea1d 100644 --- a/datasource/urls.py +++ b/datasource/urls.py @@ -1,12 +1,9 @@ -from django.conf.urls import url +from django.urls import path from . import views urlpatterns = [ - url(r'^openstack/$', - views.os_index, name='ds_openstack_index'), - url(r'^openstack/(?P[\w\-\.]+)/meta_data.json$', - views.os_metadata_json, name='ds_openstack_metadata'), - url(r'^openstack/(?P[\w\-\.]+)/user_data$', - views.os_userdata, name='ds_openstack_userdata'), - url(r'^vdi/(?P[0-9]+)/(?P[\w\-\.]+)/$', views.get_vdi_url, name='vdi_url'), + path('openstack/', views.os_index, name='ds_openstack_index'), + path('openstack//meta_data.json', views.os_metadata_json, name='ds_openstack_metadata'), + path('openstack//user_data', views.os_userdata, name='ds_openstack_userdata'), + path('vdi///', views.get_vdi_url, name='vdi_url'), ] diff --git a/instances/urls.py b/instances/urls.py index 32922a2..f0c8618 100644 --- a/instances/urls.py +++ b/instances/urls.py @@ -1,14 +1,14 @@ -from django.urls import path, re_path +from django.urls import path from . import views urlpatterns = [ path('', views.allinstances, name='allinstances'), - re_path(r'^(?P[0-9]+)/(?P[\w\-\.]+)/$', views.instance, name='instance'), - re_path(r'^statistics/(?P[0-9]+)/(?P[\w\-\.]+)/$', views.inst_graph, name='inst_graph'), - re_path(r'^status/(?P[0-9]+)/(?P[\w\-\.]+)/$', views.inst_status, name='inst_status'), - re_path(r'^guess_mac_address/(?P[\w\-\.]+)/$', views.guess_mac_address, name='guess_mac_address'), - re_path(r'^guess_clone_name/$', views.guess_clone_name, name='guess_clone_name'), - re_path(r'^random_mac_address/$', views.random_mac_address, name='random_mac_address'), - re_path(r'^check_instance/(?P[\w\-\.]+)/$', views.check_instance, name='check_instance'), - re_path(r'^sshkeys/(?P[\w\-\.]+)/$', views.sshkeys, name='sshkeys'), + path('//', views.instance, name='instance'), + path('statistics///', views.inst_graph, name='inst_graph'), + path('status///', views.inst_status, name='inst_status'), + path('guess_mac_address//', views.guess_mac_address, name='guess_mac_address'), + path('guess_clone_name/', views.guess_clone_name, name='guess_clone_name'), + path('random_mac_address/', views.random_mac_address, name='random_mac_address'), + path('check_instance//', views.check_instance, name='check_instance'), + path('sshkeys//', views.sshkeys, name='sshkeys'), ] diff --git a/logs/urls.py b/logs/urls.py index fb8fb0b..fc7a759 100644 --- a/logs/urls.py +++ b/logs/urls.py @@ -3,6 +3,6 @@ from . import views urlpatterns = [ path('', views.showlogs, name='showlogs'), - re_path(r'^(?P[0-9]+)/$', views.showlogs, name='showlogspage'), - re_path(r'^vm_logs/(?P[\w\-\.]+)/$', views.vm_logs, name='vm_logs'), + path('/', views.showlogs, name='showlogspage'), + path('vm_logs//', views.vm_logs, name='vm_logs'), ] diff --git a/webvirtcloud/urls.py b/webvirtcloud/urls.py index 3cd22be..00be017 100644 --- a/webvirtcloud/urls.py +++ b/webvirtcloud/urls.py @@ -16,5 +16,5 @@ urlpatterns = [ path('console/', console, name='console'), path('appsettings/', appsettings, name='appsettings'), path('i18n/', include('django.conf.urls.i18n')), - # url(r'^admin/', include(admin.site.urls)), + # path('admin/', include(admin.site.urls)), ]