openstack
/
cloudkitty-dashboard
Code Issues Proposed changes

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: I5086fe5fecd46e9e2ffb223b163fbaa8ed9c1970
This commit is contained in:
manchandavishal 2022-04-29 16:09:39 +05:30
parent 8837a1d947
commit 7ac2922dd5
7 changed files with 72 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

94
cloudkittydashboard/dashboards/admin/hashmap/urls.py
View File

@ -12,55 +12,55 @@
# 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 cloudkittydashboard.dashboards.admin.hashmap import views
urlpatterns = [
url(r'^$', views.IndexView.as_view(), name='index'),
url(r'^service/(?P<service_id>[^/]+)/?$',
views.ServiceView.as_view(),
name='service'),
url(r'^create_service/?$',
views.ServiceCreateView.as_view(),
name='service_create'),
url(r'^field/(?P<field_id>[^/]+)/?$',
views.FieldView.as_view(),
name='field'),
url(r'^group/(?P<group_id>[^/]+)/?$',
views.GroupView.as_view(),
name='group'),
url(r'^group/(?P<group_id>[^/]+)/details/?$',
views.GroupDetailsView.as_view(),
name='group_details'),
url(r'^create_field/service/(?P<service_id>[^/]+)/?$',
views.FieldCreateView.as_view(),
name='field_create'),
url(r'^create_group/(?:(?P<service_id>[^/]+)/)?$',
views.GroupCreateView.as_view(),
name='group_create'),
url(r'^create_threshold/service/(?P<service_id>[^/]+)/?$',
views.ServiceThresholdCreateView.as_view(),
name='service_threshold_create'),
url(r'^create_threshold/field/(?P<field_id>[^/]+)/?$',
views.FieldThresholdCreateView.as_view(),
name='field_threshold_create'),
url(r'^create_mapping/service/(?P<service_id>[^/]+)/?$',
views.ServiceMappingCreateView.as_view(),
name='service_mapping_create'),
url(r'^create_mapping/field/(?P<field_id>[^/]+)/?$',
views.FieldMappingCreateView.as_view(),
name='field_mapping_create'),
url(r'^edit_mapping/service/(?P<mapping_id>[^/]+)/?$',
views.ServiceMappingEditView.as_view(),
name='service_mapping_edit'),
url(r'^edit_mapping/field/(?P<mapping_id>[^/]+)/?$',
views.FieldMappingEditView.as_view(),
name='field_mapping_edit'),
url(r'^edit_threshold/service/(?P<threshold_id>[^/]+)/?$',
views.ServiceThresholdEditView.as_view(),
name='service_threshold_edit'),
url(r'^edit_threshold/field/(?P<threshold_id>[^/]+)/?$',
views.FieldThresholdEditView.as_view(),
name='field_threshold_edit'),
re_path(r'^$', views.IndexView.as_view(), name='index'),
re_path(r'^service/(?P<service_id>[^/]+)/?$',
views.ServiceView.as_view(),
name='service'),
re_path(r'^create_service/?$',
views.ServiceCreateView.as_view(),
name='service_create'),
re_path(r'^field/(?P<field_id>[^/]+)/?$',
views.FieldView.as_view(),
name='field'),
re_path(r'^group/(?P<group_id>[^/]+)/?$',
views.GroupView.as_view(),
name='group'),
re_path(r'^group/(?P<group_id>[^/]+)/details/?$',
views.GroupDetailsView.as_view(),
name='group_details'),
re_path(r'^create_field/service/(?P<service_id>[^/]+)/?$',
views.FieldCreateView.as_view(),
name='field_create'),
re_path(r'^create_group/(?:(?P<service_id>[^/]+)/)?$',
views.GroupCreateView.as_view(),
name='group_create'),
re_path(r'^create_threshold/service/(?P<service_id>[^/]+)/?$',
views.ServiceThresholdCreateView.as_view(),
name='service_threshold_create'),
re_path(r'^create_threshold/field/(?P<field_id>[^/]+)/?$',
views.FieldThresholdCreateView.as_view(),
name='field_threshold_create'),
re_path(r'^create_mapping/service/(?P<service_id>[^/]+)/?$',
views.ServiceMappingCreateView.as_view(),
name='service_mapping_create'),
re_path(r'^create_mapping/field/(?P<field_id>[^/]+)/?$',
views.FieldMappingCreateView.as_view(),
name='field_mapping_create'),
re_path(r'^edit_mapping/service/(?P<mapping_id>[^/]+)/?$',
views.ServiceMappingEditView.as_view(),
name='service_mapping_edit'),
re_path(r'^edit_mapping/field/(?P<mapping_id>[^/]+)/?$',
views.FieldMappingEditView.as_view(),
name='field_mapping_edit'),
re_path(r'^edit_threshold/service/(?P<threshold_id>[^/]+)/?$',
views.ServiceThresholdEditView.as_view(),
name='service_threshold_edit'),
re_path(r'^edit_threshold/field/(?P<threshold_id>[^/]+)/?$',
views.FieldThresholdEditView.as_view(),
name='field_threshold_edit'),
]

14
cloudkittydashboard/dashboards/admin/modules/urls.py
View File

@ -12,15 +12,15 @@
# 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 cloudkittydashboard.dashboards.admin.modules import views
urlpatterns = [
url(r'^$', views.IndexView.as_view(), name='index'),
url(r'^(?P<module_id>[^/]+)/?$', views.ModuleDetailsView.as_view(),
name="module_details"),
url(r'^edit_priority/(?P<module_id>[^/]+)/?$',
views.PriorityModuleEditView.as_view(),
name="edit_priority"),
re_path(r'^$', views.IndexView.as_view(), name='index'),
re_path(r'^(?P<module_id>[^/]+)/?$', views.ModuleDetailsView.as_view(),
name="module_details"),
re_path(r'^edit_priority/(?P<module_id>[^/]+)/?$',
views.PriorityModuleEditView.as_view(),
name="edit_priority"),
]

16
cloudkittydashboard/dashboards/admin/pyscripts/urls.py
View File

@ -12,15 +12,17 @@
# 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 cloudkittydashboard.dashboards.admin.pyscripts import views
urlpatterns = [
url(r'^$', views.IndexView.as_view(), name='index'),
url(r'^create/?$', views.ScriptCreateView.as_view(), name="script_create"),
url(r'^update/(?P<script_id>[^/]+)/?$', views.ScriptUpdateView.as_view(),
name="script_update"),
url(r'^(?P<script_id>[^/]+)/?$', views.ScriptDetailsView.as_view(),
name="script_details"),
re_path(r'^$', views.IndexView.as_view(), name='index'),
re_path(r'^create/?$', views.ScriptCreateView.as_view(),
name="script_create"),
re_path(r'^update/(?P<script_id>[^/]+)/?$',
views.ScriptUpdateView.as_view(),
name="script_update"),
re_path(r'^(?P<script_id>[^/]+)/?$', views.ScriptDetailsView.as_view(),
name="script_details"),
]

8
cloudkittydashboard/dashboards/admin/summary/urls.py
View File

@ -12,12 +12,12 @@
# 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 cloudkittydashboard.dashboards.admin.summary import views
urlpatterns = [
url(r'^$', views.IndexView.as_view(), name='index'),
url(r'^(?P<project_id>[^/]+)/?$', views.TenantDetailsView.as_view(),
name="project_details"),
re_path(r'^$', views.IndexView.as_view(), name='index'),
re_path(r'^(?P<project_id>[^/]+)/?$', views.TenantDetailsView.as_view(),
name="project_details"),
]

6
cloudkittydashboard/dashboards/project/rating/urls.py
View File

@ -12,11 +12,11 @@
# 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 cloudkittydashboard.dashboards.project.rating import views
urlpatterns = [
url(r'^$', views.IndexView.as_view(), name='index'),
url(r'^quote$', views.quote, name='quote')
re_path(r'^$', views.IndexView.as_view(), name='index'),
re_path(r'^quote$', views.quote, name='quote')
]

4
cloudkittydashboard/dashboards/project/reporting/urls.py
View File

@ -1,7 +1,7 @@
from django.conf.urls import url
from django.urls import re_path
from cloudkittydashboard.dashboards.project.reporting import views
urlpatterns = [
url(r'^$', views.IndexView.as_view(), name='index'),
re_path(r'^$', views.IndexView.as_view(), name='index'),
]

1
cloudkittydashboard/overrides.py
View File

@ -14,7 +14,6 @@
# under the License.
#
from django.conf.urls import url # noqa
from django.utils.translation import ugettext_lazy as _
from openstack_dashboard.dashboards.project.instances.workflows \
import create_instance