From e91ab23210e14651439a10344aff04208096e820 Mon Sep 17 00:00:00 2001 From: manchandavishal Date: Fri, 29 Apr 2022 17:56:30 +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: I3671c2bb499664997e18cd200d6293cb146895e3 --- .../content/data_processing/clusters/urls.py | 187 +++++++++--------- .../data_processing/data_plugins/urls.py | 14 +- .../content/data_processing/jobs/urls.py | 105 +++++----- 3 files changed, 158 insertions(+), 148 deletions(-) diff --git a/sahara_dashboard/content/data_processing/clusters/urls.py b/sahara_dashboard/content/data_processing/clusters/urls.py index 2a7323a4..ff81822b 100644 --- a/sahara_dashboard/content/data_processing/clusters/urls.py +++ b/sahara_dashboard/content/data_processing/clusters/urls.py @@ -12,7 +12,7 @@ # limitations under the License. -from django.conf.urls import url +from django.urls import re_path import sahara_dashboard.content.data_processing.clusters.views as views import sahara_dashboard.content.data_processing.clusters.image_registry. \ @@ -27,91 +27,100 @@ import sahara_dashboard.content.data_processing.clusters.wizard. \ views as cluster_guide_views -urlpatterns = [url(r'^$', views.IndexView.as_view(), name='index'), - url(r'^\?tab=cluster_tabs__image_registry_tab$', - views.IndexView.as_view(), name='image-registry-tab'), - url(r'^\?tab=cluster_tabs__node_group_templates_tab$', - views.IndexView.as_view(), name='nodegroup-templates-tab'), - url(r'^\?tab=cluster_tabs__clusters_templates_tab$', - views.IndexView.as_view(), name='cluster-templates-tab'), - url(r'^\?tab=cluster_tabs__clusters_tab$', - views.IndexView.as_view(), name='clusters-tab'), - url(r'^create-cluster-template$', - ct_views.CreateClusterTemplateView.as_view(), - name='create-cluster-template'), - url(r'^create-nodegroup-template$', - ngt_views.CreateNodegroupTemplateView.as_view(), - name='create-nodegroup-template'), - url(r'^configure-cluster-template$', - ct_views.ConfigureClusterTemplateView.as_view(), - name='configure-cluster-template'), - url(r'^import-cluster-template-file$', - ct_views.ImportClusterTemplateFileView.as_view(), - name='import-cluster-template-file'), - url(r'^import-cluster-template-name$', - ct_views.ImportClusterTemplateNameView.as_view(), - name='import-cluster-template-name'), - url(r'^import-cluster-template-nodegroups$', - ct_views.ImportClusterTemplateNodegroupsView.as_view(), - name='import-cluster-template-nodegroups'), - url(r'^configure-nodegroup-template$', - ngt_views.ConfigureNodegroupTemplateView.as_view(), - name='configure-nodegroup-template'), - url(r'^import-nodegroup-template-file$', - ngt_views.ImportNodegroupTemplateFileView.as_view(), - name='import-nodegroup-template-file'), - url(r'^import-nodegroup-template-details$', - ngt_views.ImportNodegroupTemplateDetailsView.as_view(), - name='import-nodegroup-template-details'), - url(r'^cluster-template/(?P[^/]+)$', - ct_views.ClusterTemplateDetailsView.as_view(), - name='ct-details'), - url(r'^node-group-template/(?P[^/]+)$', - ngt_views.NodegroupTemplateDetailsView.as_view(), - name='details'), - url(r'^cluster-template/(?P[^/]+)/copy$', - ct_views.CopyClusterTemplateView.as_view(), name='ct-copy'), - url(r'^cluster-template/(?P[^/]+)/edit$', - ct_views.EditClusterTemplateView.as_view(), name='ct-edit'), - url(r'^node-group-template/(?P[^/]+)/copy$', - ngt_views.CopyNodegroupTemplateView.as_view(), name='copy'), - url(r'^node-group-template/(?P[^/]+)/edit$', - ngt_views.EditNodegroupTemplateView.as_view(), name='edit'), - url(r'^create-cluster$', - cluster_views.CreateClusterView.as_view(), - name='create-cluster'), - url(r'^configure-cluster$', - cluster_views.ConfigureClusterView.as_view(), - name='configure-cluster'), - url(r'^cluster/(?P[^/]+)$', - cluster_views.ClusterDetailsView.as_view(), - name='cluster-details'), - url(r'^cluster/(?P[^/]+)/events$', - cluster_views.ClusterEventsView.as_view(), name='events'), - url(r'^cluster/(?P[^/]+)/scale$', - cluster_views.ScaleClusterView.as_view(), name='scale'), - url(r'^cluster/(?P[^/]+)/verifications$', - cluster_views.ClusterHealthChecksView.as_view(), - name='verifications'), - url(r'^cluster/(?P[^/]+)/update_shares$', - cluster_views.UpdateClusterSharesView.as_view(), - name='update-shares'), - url(r'^edit_tags/(?P[^/]+)/$', - image_views.EditTagsView.as_view(), name='edit_tags'), - url(r'^register/$', - image_views.RegisterImageView.as_view(), name='register'), - url(r'^cluster_guide$', - cluster_guide_views.ClusterGuideView.as_view(), - name='cluster_guide'), - url(r'^cluster_guide/(?P[^/]+)/$', - cluster_guide_views.ResetClusterGuideView.as_view(), - name='reset_cluster_guide'), - url(r'^image_register/$', - cluster_guide_views.ImageRegisterView.as_view(), - name='image_register'), - url(r'^plugin_select$', - cluster_guide_views.PluginSelectView.as_view(), - name='plugin_select'), - url(r'^ngt_select$', - cluster_guide_views.NodeGroupSelectView.as_view(), - name='ngt_select'), ] +urlpatterns = [re_path(r'^$', views.IndexView.as_view(), name='index'), + re_path(r'^\?tab=cluster_tabs__image_registry_tab$', + views.IndexView.as_view(), name='image-registry-tab'), + re_path(r'^\?tab=cluster_tabs__node_group_templates_tab$', + views.IndexView.as_view(), + name='nodegroup-templates-tab'), + re_path(r'^\?tab=cluster_tabs__clusters_templates_tab$', + views.IndexView.as_view(), + name='cluster-templates-tab'), + re_path(r'^\?tab=cluster_tabs__clusters_tab$', + views.IndexView.as_view(), name='clusters-tab'), + re_path(r'^create-cluster-template$', + ct_views.CreateClusterTemplateView.as_view(), + name='create-cluster-template'), + re_path(r'^create-nodegroup-template$', + ngt_views.CreateNodegroupTemplateView.as_view(), + name='create-nodegroup-template'), + re_path(r'^configure-cluster-template$', + ct_views.ConfigureClusterTemplateView.as_view(), + name='configure-cluster-template'), + re_path(r'^import-cluster-template-file$', + ct_views.ImportClusterTemplateFileView.as_view(), + name='import-cluster-template-file'), + re_path(r'^import-cluster-template-name$', + ct_views.ImportClusterTemplateNameView.as_view(), + name='import-cluster-template-name'), + re_path(r'^import-cluster-template-nodegroups$', + ct_views.ImportClusterTemplateNodegroupsView.as_view(), + name='import-cluster-template-nodegroups'), + re_path(r'^configure-nodegroup-template$', + ngt_views.ConfigureNodegroupTemplateView.as_view(), + name='configure-nodegroup-template'), + re_path(r'^import-nodegroup-template-file$', + ngt_views.ImportNodegroupTemplateFileView.as_view(), + name='import-nodegroup-template-file'), + re_path(r'^import-nodegroup-template-details$', + ngt_views.ImportNodegroupTemplateDetailsView.as_view(), + name='import-nodegroup-template-details'), + re_path(r'^cluster-template/(?P[^/]+)$', + ct_views.ClusterTemplateDetailsView.as_view(), + name='ct-details'), + re_path(r'^node-group-template/(?P[^/]+)$', + ngt_views.NodegroupTemplateDetailsView.as_view(), + name='details'), + re_path(r'^cluster-template/(?P[^/]+)/copy$', + ct_views.CopyClusterTemplateView.as_view(), + name='ct-copy'), + re_path(r'^cluster-template/(?P[^/]+)/edit$', + ct_views.EditClusterTemplateView.as_view(), + name='ct-edit'), + re_path(r'^node-group-template/(?P[^/]+)/copy$', + ngt_views.CopyNodegroupTemplateView.as_view(), + name='copy'), + re_path(r'^node-group-template/(?P[^/]+)/edit$', + ngt_views.EditNodegroupTemplateView.as_view(), + name='edit'), + re_path(r'^create-cluster$', + cluster_views.CreateClusterView.as_view(), + name='create-cluster'), + re_path(r'^configure-cluster$', + cluster_views.ConfigureClusterView.as_view(), + name='configure-cluster'), + re_path(r'^cluster/(?P[^/]+)$', + cluster_views.ClusterDetailsView.as_view(), + name='cluster-details'), + re_path(r'^cluster/(?P[^/]+)/events$', + cluster_views.ClusterEventsView.as_view(), + name='events'), + re_path(r'^cluster/(?P[^/]+)/scale$', + cluster_views.ScaleClusterView.as_view(), + name='scale'), + re_path(r'^cluster/(?P[^/]+)/verifications$', + cluster_views.ClusterHealthChecksView.as_view(), + name='verifications'), + re_path(r'^cluster/(?P[^/]+)/update_shares$', + cluster_views.UpdateClusterSharesView.as_view(), + name='update-shares'), + re_path(r'^edit_tags/(?P[^/]+)/$', + image_views.EditTagsView.as_view(), name='edit_tags'), + re_path(r'^register/$', + image_views.RegisterImageView.as_view(), + name='register'), + re_path(r'^cluster_guide$', + cluster_guide_views.ClusterGuideView.as_view(), + name='cluster_guide'), + re_path(r'^cluster_guide/(?P[^/]+)/$', + cluster_guide_views.ResetClusterGuideView.as_view(), + name='reset_cluster_guide'), + re_path(r'^image_register/$', + cluster_guide_views.ImageRegisterView.as_view(), + name='image_register'), + re_path(r'^plugin_select$', + cluster_guide_views.PluginSelectView.as_view(), + name='plugin_select'), + re_path(r'^ngt_select$', + cluster_guide_views.NodeGroupSelectView.as_view(), + name='ngt_select'), ] diff --git a/sahara_dashboard/content/data_processing/data_plugins/urls.py b/sahara_dashboard/content/data_processing/data_plugins/urls.py index 6aeb2949..4af508c1 100644 --- a/sahara_dashboard/content/data_processing/data_plugins/urls.py +++ b/sahara_dashboard/content/data_processing/data_plugins/urls.py @@ -11,16 +11,16 @@ # See the 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 sahara_dashboard.content.data_processing.data_plugins import views urlpatterns = [ - url(r'^$', views.PluginsView.as_view(), name='index'), - url(r'^(?P[^/]+)$', - views.PluginDetailsView.as_view(), name='plugin-details'), - url(r'^(?P[^/]+)/update', - views.UpdatePluginView.as_view(), - name='update'), + re_path(r'^$', views.PluginsView.as_view(), name='index'), + re_path(r'^(?P[^/]+)$', + views.PluginDetailsView.as_view(), name='plugin-details'), + re_path(r'^(?P[^/]+)/update', + views.UpdatePluginView.as_view(), + name='update'), ] diff --git a/sahara_dashboard/content/data_processing/jobs/urls.py b/sahara_dashboard/content/data_processing/jobs/urls.py index f9624140..5c973cce 100644 --- a/sahara_dashboard/content/data_processing/jobs/urls.py +++ b/sahara_dashboard/content/data_processing/jobs/urls.py @@ -11,7 +11,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -from django.conf.urls import url +from django.urls import re_path import sahara_dashboard.content.data_processing. \ jobs.views as views @@ -27,55 +27,56 @@ import sahara_dashboard.content.data_processing. \ jobs.jobs.views as jobs_views -urlpatterns = [url(r'^$', views.IndexView.as_view(), name='index'), - url(r'^$', views.IndexView.as_view(), name='jobs'), - url(r'^\?tab=job_tabs__jobs_tab$', views.IndexView.as_view(), - name='jobs-tab'), - url(r'^create-job$', - job_templates_views.CreateJobView.as_view(), - name='create-job'), - url(r'^launch-job$', - job_templates_views.LaunchJobView.as_view(), - name='launch-job'), - url(r'^launch-job-new-cluster$', job_templates_views. - LaunchJobNewClusterView.as_view(), - name='launch-job-new-cluster'), - url(r'^choose-plugin$', - job_templates_views.ChoosePluginView.as_view(), - name='choose-plugin'), - url(r'^job-template/(?P[^/]+)$', - job_templates_views. - JobTemplateDetailsView.as_view(), name='jt-details'), - url(r'^job-execution/(?P[^/]+)$', - jobs_views.JobDetailsView.as_view(), name='details'), - url(r'^create-job-binary$', - job_binary_views.CreateJobBinaryView.as_view(), - name='create-job-binary'), - url(r'^job-binary/(?P[^/]+)$', - job_binary_views.JobBinaryDetailsView.as_view(), - name='jb-details'), - url(r'^job-binary/(?P[^/]+)/edit$', - job_binary_views.EditJobBinaryView.as_view(), - name='edit-job-binary'), - url(r'^job-binary/(?P[^/]+)/download/$', - job_binary_views.DownloadJobBinaryView.as_view(), - name='download'), - url(r'^create-data-source$', - data_source_views.CreateDataSourceView.as_view(), - name='create-data-source'), - url(r'^data-source/(?P[^/]+)/edit$', - data_source_views.EditDataSourceView.as_view(), - name='edit-data-source'), - url(r'^data-source/(?P[^/]+)$', - data_source_views.DataSourceDetailsView.as_view(), - name='ds-details'), - url(r'^jobex_guide$', - job_wizard_views.JobExecutionGuideView.as_view(), - name='jobex_guide'), - url(r'^jobex_guide/(?P[^/]+)/$', - job_wizard_views.ResetJobExGuideView.as_view(), - name='reset_jobex_guide'), - url(r'^job_type_select$', - job_wizard_views.JobTypeSelectView.as_view(), - name='job_type_select'), +urlpatterns = [re_path(r'^$', views.IndexView.as_view(), name='index'), + re_path(r'^$', views.IndexView.as_view(), name='jobs'), + re_path(r'^\?tab=job_tabs__jobs_tab$', + views.IndexView.as_view(), + name='jobs-tab'), + re_path(r'^create-job$', + job_templates_views.CreateJobView.as_view(), + name='create-job'), + re_path(r'^launch-job$', + job_templates_views.LaunchJobView.as_view(), + name='launch-job'), + re_path(r'^launch-job-new-cluster$', job_templates_views. + LaunchJobNewClusterView.as_view(), + name='launch-job-new-cluster'), + re_path(r'^choose-plugin$', + job_templates_views.ChoosePluginView.as_view(), + name='choose-plugin'), + re_path(r'^job-template/(?P[^/]+)$', + job_templates_views. + JobTemplateDetailsView.as_view(), name='jt-details'), + re_path(r'^job-execution/(?P[^/]+)$', + jobs_views.JobDetailsView.as_view(), name='details'), + re_path(r'^create-job-binary$', + job_binary_views.CreateJobBinaryView.as_view(), + name='create-job-binary'), + re_path(r'^job-binary/(?P[^/]+)$', + job_binary_views.JobBinaryDetailsView.as_view(), + name='jb-details'), + re_path(r'^job-binary/(?P[^/]+)/edit$', + job_binary_views.EditJobBinaryView.as_view(), + name='edit-job-binary'), + re_path(r'^job-binary/(?P[^/]+)/download/$', + job_binary_views.DownloadJobBinaryView.as_view(), + name='download'), + re_path(r'^create-data-source$', + data_source_views.CreateDataSourceView.as_view(), + name='create-data-source'), + re_path(r'^data-source/(?P[^/]+)/edit$', + data_source_views.EditDataSourceView.as_view(), + name='edit-data-source'), + re_path(r'^data-source/(?P[^/]+)$', + data_source_views.DataSourceDetailsView.as_view(), + name='ds-details'), + re_path(r'^jobex_guide$', + job_wizard_views.JobExecutionGuideView.as_view(), + name='jobex_guide'), + re_path(r'^jobex_guide/(?P[^/]+)/$', + job_wizard_views.ResetJobExGuideView.as_view(), + name='reset_jobex_guide'), + re_path(r'^job_type_select$', + job_wizard_views.JobTypeSelectView.as_view(), + name='job_type_select'), ]