Merge "Address RemovedInDjango40Warning"
This commit is contained in:
Zuul
Gerrit Code Review
commit
0c57fd76c4
|
|
@ -12,7 +12,7 @@
|
||||||
# limitations under the License.
|
# 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.views as views
|
||||||
import sahara_dashboard.content.data_processing.clusters.image_registry. \
|
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
|
views as cluster_guide_views
|
||||||
|
|
||||||
|
|
||||||
urlpatterns = [url(r'^$', views.IndexView.as_view(), name='index'),
|
urlpatterns = [re_path(r'^$', views.IndexView.as_view(), name='index'),
|
||||||
url(r'^\?tab=cluster_tabs__image_registry_tab$',
|
re_path(r'^\?tab=cluster_tabs__image_registry_tab$',
|
||||||
views.IndexView.as_view(), name='image-registry-tab'),
|
views.IndexView.as_view(), name='image-registry-tab'),
|
||||||
url(r'^\?tab=cluster_tabs__node_group_templates_tab$',
|
re_path(r'^\?tab=cluster_tabs__node_group_templates_tab$',
|
||||||
views.IndexView.as_view(), name='nodegroup-templates-tab'),
|
views.IndexView.as_view(),
|
||||||
url(r'^\?tab=cluster_tabs__clusters_templates_tab$',
|
name='nodegroup-templates-tab'),
|
||||||
views.IndexView.as_view(), name='cluster-templates-tab'),
|
re_path(r'^\?tab=cluster_tabs__clusters_templates_tab$',
|
||||||
url(r'^\?tab=cluster_tabs__clusters_tab$',
|
views.IndexView.as_view(),
|
||||||
views.IndexView.as_view(), name='clusters-tab'),
|
name='cluster-templates-tab'),
|
||||||
url(r'^create-cluster-template$',
|
re_path(r'^\?tab=cluster_tabs__clusters_tab$',
|
||||||
ct_views.CreateClusterTemplateView.as_view(),
|
views.IndexView.as_view(), name='clusters-tab'),
|
||||||
name='create-cluster-template'),
|
re_path(r'^create-cluster-template$',
|
||||||
url(r'^create-nodegroup-template$',
|
ct_views.CreateClusterTemplateView.as_view(),
|
||||||
ngt_views.CreateNodegroupTemplateView.as_view(),
|
name='create-cluster-template'),
|
||||||
name='create-nodegroup-template'),
|
re_path(r'^create-nodegroup-template$',
|
||||||
url(r'^configure-cluster-template$',
|
ngt_views.CreateNodegroupTemplateView.as_view(),
|
||||||
ct_views.ConfigureClusterTemplateView.as_view(),
|
name='create-nodegroup-template'),
|
||||||
name='configure-cluster-template'),
|
re_path(r'^configure-cluster-template$',
|
||||||
url(r'^import-cluster-template-file$',
|
ct_views.ConfigureClusterTemplateView.as_view(),
|
||||||
ct_views.ImportClusterTemplateFileView.as_view(),
|
name='configure-cluster-template'),
|
||||||
name='import-cluster-template-file'),
|
re_path(r'^import-cluster-template-file$',
|
||||||
url(r'^import-cluster-template-name$',
|
ct_views.ImportClusterTemplateFileView.as_view(),
|
||||||
ct_views.ImportClusterTemplateNameView.as_view(),
|
name='import-cluster-template-file'),
|
||||||
name='import-cluster-template-name'),
|
re_path(r'^import-cluster-template-name$',
|
||||||
url(r'^import-cluster-template-nodegroups$',
|
ct_views.ImportClusterTemplateNameView.as_view(),
|
||||||
ct_views.ImportClusterTemplateNodegroupsView.as_view(),
|
name='import-cluster-template-name'),
|
||||||
name='import-cluster-template-nodegroups'),
|
re_path(r'^import-cluster-template-nodegroups$',
|
||||||
url(r'^configure-nodegroup-template$',
|
ct_views.ImportClusterTemplateNodegroupsView.as_view(),
|
||||||
ngt_views.ConfigureNodegroupTemplateView.as_view(),
|
name='import-cluster-template-nodegroups'),
|
||||||
name='configure-nodegroup-template'),
|
re_path(r'^configure-nodegroup-template$',
|
||||||
url(r'^import-nodegroup-template-file$',
|
ngt_views.ConfigureNodegroupTemplateView.as_view(),
|
||||||
ngt_views.ImportNodegroupTemplateFileView.as_view(),
|
name='configure-nodegroup-template'),
|
||||||
name='import-nodegroup-template-file'),
|
re_path(r'^import-nodegroup-template-file$',
|
||||||
url(r'^import-nodegroup-template-details$',
|
ngt_views.ImportNodegroupTemplateFileView.as_view(),
|
||||||
ngt_views.ImportNodegroupTemplateDetailsView.as_view(),
|
name='import-nodegroup-template-file'),
|
||||||
name='import-nodegroup-template-details'),
|
re_path(r'^import-nodegroup-template-details$',
|
||||||
url(r'^cluster-template/(?P<template_id>[^/]+)$',
|
ngt_views.ImportNodegroupTemplateDetailsView.as_view(),
|
||||||
ct_views.ClusterTemplateDetailsView.as_view(),
|
name='import-nodegroup-template-details'),
|
||||||
name='ct-details'),
|
re_path(r'^cluster-template/(?P<template_id>[^/]+)$',
|
||||||
url(r'^node-group-template/(?P<template_id>[^/]+)$',
|
ct_views.ClusterTemplateDetailsView.as_view(),
|
||||||
ngt_views.NodegroupTemplateDetailsView.as_view(),
|
name='ct-details'),
|
||||||
name='details'),
|
re_path(r'^node-group-template/(?P<template_id>[^/]+)$',
|
||||||
url(r'^cluster-template/(?P<template_id>[^/]+)/copy$',
|
ngt_views.NodegroupTemplateDetailsView.as_view(),
|
||||||
ct_views.CopyClusterTemplateView.as_view(), name='ct-copy'),
|
name='details'),
|
||||||
url(r'^cluster-template/(?P<template_id>[^/]+)/edit$',
|
re_path(r'^cluster-template/(?P<template_id>[^/]+)/copy$',
|
||||||
ct_views.EditClusterTemplateView.as_view(), name='ct-edit'),
|
ct_views.CopyClusterTemplateView.as_view(),
|
||||||
url(r'^node-group-template/(?P<template_id>[^/]+)/copy$',
|
name='ct-copy'),
|
||||||
ngt_views.CopyNodegroupTemplateView.as_view(), name='copy'),
|
re_path(r'^cluster-template/(?P<template_id>[^/]+)/edit$',
|
||||||
url(r'^node-group-template/(?P<template_id>[^/]+)/edit$',
|
ct_views.EditClusterTemplateView.as_view(),
|
||||||
ngt_views.EditNodegroupTemplateView.as_view(), name='edit'),
|
name='ct-edit'),
|
||||||
url(r'^create-cluster$',
|
re_path(r'^node-group-template/(?P<template_id>[^/]+)/copy$',
|
||||||
cluster_views.CreateClusterView.as_view(),
|
ngt_views.CopyNodegroupTemplateView.as_view(),
|
||||||
name='create-cluster'),
|
name='copy'),
|
||||||
url(r'^configure-cluster$',
|
re_path(r'^node-group-template/(?P<template_id>[^/]+)/edit$',
|
||||||
cluster_views.ConfigureClusterView.as_view(),
|
ngt_views.EditNodegroupTemplateView.as_view(),
|
||||||
name='configure-cluster'),
|
name='edit'),
|
||||||
url(r'^cluster/(?P<cluster_id>[^/]+)$',
|
re_path(r'^create-cluster$',
|
||||||
cluster_views.ClusterDetailsView.as_view(),
|
cluster_views.CreateClusterView.as_view(),
|
||||||
name='cluster-details'),
|
name='create-cluster'),
|
||||||
url(r'^cluster/(?P<cluster_id>[^/]+)/events$',
|
re_path(r'^configure-cluster$',
|
||||||
cluster_views.ClusterEventsView.as_view(), name='events'),
|
cluster_views.ConfigureClusterView.as_view(),
|
||||||
url(r'^cluster/(?P<cluster_id>[^/]+)/scale$',
|
name='configure-cluster'),
|
||||||
cluster_views.ScaleClusterView.as_view(), name='scale'),
|
re_path(r'^cluster/(?P<cluster_id>[^/]+)$',
|
||||||
url(r'^cluster/(?P<cluster_id>[^/]+)/verifications$',
|
cluster_views.ClusterDetailsView.as_view(),
|
||||||
cluster_views.ClusterHealthChecksView.as_view(),
|
name='cluster-details'),
|
||||||
name='verifications'),
|
re_path(r'^cluster/(?P<cluster_id>[^/]+)/events$',
|
||||||
url(r'^cluster/(?P<cluster_id>[^/]+)/update_shares$',
|
cluster_views.ClusterEventsView.as_view(),
|
||||||
cluster_views.UpdateClusterSharesView.as_view(),
|
name='events'),
|
||||||
name='update-shares'),
|
re_path(r'^cluster/(?P<cluster_id>[^/]+)/scale$',
|
||||||
url(r'^edit_tags/(?P<image_id>[^/]+)/$',
|
cluster_views.ScaleClusterView.as_view(),
|
||||||
image_views.EditTagsView.as_view(), name='edit_tags'),
|
name='scale'),
|
||||||
url(r'^register/$',
|
re_path(r'^cluster/(?P<cluster_id>[^/]+)/verifications$',
|
||||||
image_views.RegisterImageView.as_view(), name='register'),
|
cluster_views.ClusterHealthChecksView.as_view(),
|
||||||
url(r'^cluster_guide$',
|
name='verifications'),
|
||||||
cluster_guide_views.ClusterGuideView.as_view(),
|
re_path(r'^cluster/(?P<cluster_id>[^/]+)/update_shares$',
|
||||||
name='cluster_guide'),
|
cluster_views.UpdateClusterSharesView.as_view(),
|
||||||
url(r'^cluster_guide/(?P<reset_cluster_guide>[^/]+)/$',
|
name='update-shares'),
|
||||||
cluster_guide_views.ResetClusterGuideView.as_view(),
|
re_path(r'^edit_tags/(?P<image_id>[^/]+)/$',
|
||||||
name='reset_cluster_guide'),
|
image_views.EditTagsView.as_view(), name='edit_tags'),
|
||||||
url(r'^image_register/$',
|
re_path(r'^register/$',
|
||||||
cluster_guide_views.ImageRegisterView.as_view(),
|
image_views.RegisterImageView.as_view(),
|
||||||
name='image_register'),
|
name='register'),
|
||||||
url(r'^plugin_select$',
|
re_path(r'^cluster_guide$',
|
||||||
cluster_guide_views.PluginSelectView.as_view(),
|
cluster_guide_views.ClusterGuideView.as_view(),
|
||||||
name='plugin_select'),
|
name='cluster_guide'),
|
||||||
url(r'^ngt_select$',
|
re_path(r'^cluster_guide/(?P<reset_cluster_guide>[^/]+)/$',
|
||||||
cluster_guide_views.NodeGroupSelectView.as_view(),
|
cluster_guide_views.ResetClusterGuideView.as_view(),
|
||||||
name='ngt_select'), ]
|
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'), ]
|
||||||
|
|
|
||||||
|
|
@ -11,16 +11,16 @@
|
||||||
# See the License for the specific language governing permissions and
|
# See the License for the specific language governing permissions and
|
||||||
# limitations under the License.
|
# 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
|
from sahara_dashboard.content.data_processing.data_plugins import views
|
||||||
|
|
||||||
|
|
||||||
urlpatterns = [
|
urlpatterns = [
|
||||||
url(r'^$', views.PluginsView.as_view(), name='index'),
|
re_path(r'^$', views.PluginsView.as_view(), name='index'),
|
||||||
url(r'^(?P<plugin_id>[^/]+)$',
|
re_path(r'^(?P<plugin_id>[^/]+)$',
|
||||||
views.PluginDetailsView.as_view(), name='plugin-details'),
|
views.PluginDetailsView.as_view(), name='plugin-details'),
|
||||||
url(r'^(?P<plugin_name>[^/]+)/update',
|
re_path(r'^(?P<plugin_name>[^/]+)/update',
|
||||||
views.UpdatePluginView.as_view(),
|
views.UpdatePluginView.as_view(),
|
||||||
name='update'),
|
name='update'),
|
||||||
]
|
]
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,7 @@
|
||||||
# See the License for the specific language governing permissions and
|
# See the License for the specific language governing permissions and
|
||||||
# limitations under the License.
|
# limitations under the License.
|
||||||
|
|
||||||
from django.conf.urls import url
|
from django.urls import re_path
|
||||||
|
|
||||||
import sahara_dashboard.content.data_processing. \
|
import sahara_dashboard.content.data_processing. \
|
||||||
jobs.views as views
|
jobs.views as views
|
||||||
|
|
@ -27,55 +27,56 @@ import sahara_dashboard.content.data_processing. \
|
||||||
jobs.jobs.views as jobs_views
|
jobs.jobs.views as jobs_views
|
||||||
|
|
||||||
|
|
||||||
urlpatterns = [url(r'^$', views.IndexView.as_view(), name='index'),
|
urlpatterns = [re_path(r'^$', views.IndexView.as_view(), name='index'),
|
||||||
url(r'^$', views.IndexView.as_view(), name='jobs'),
|
re_path(r'^$', views.IndexView.as_view(), name='jobs'),
|
||||||
url(r'^\?tab=job_tabs__jobs_tab$', views.IndexView.as_view(),
|
re_path(r'^\?tab=job_tabs__jobs_tab$',
|
||||||
name='jobs-tab'),
|
views.IndexView.as_view(),
|
||||||
url(r'^create-job$',
|
name='jobs-tab'),
|
||||||
job_templates_views.CreateJobView.as_view(),
|
re_path(r'^create-job$',
|
||||||
name='create-job'),
|
job_templates_views.CreateJobView.as_view(),
|
||||||
url(r'^launch-job$',
|
name='create-job'),
|
||||||
job_templates_views.LaunchJobView.as_view(),
|
re_path(r'^launch-job$',
|
||||||
name='launch-job'),
|
job_templates_views.LaunchJobView.as_view(),
|
||||||
url(r'^launch-job-new-cluster$', job_templates_views.
|
name='launch-job'),
|
||||||
LaunchJobNewClusterView.as_view(),
|
re_path(r'^launch-job-new-cluster$', job_templates_views.
|
||||||
name='launch-job-new-cluster'),
|
LaunchJobNewClusterView.as_view(),
|
||||||
url(r'^choose-plugin$',
|
name='launch-job-new-cluster'),
|
||||||
job_templates_views.ChoosePluginView.as_view(),
|
re_path(r'^choose-plugin$',
|
||||||
name='choose-plugin'),
|
job_templates_views.ChoosePluginView.as_view(),
|
||||||
url(r'^job-template/(?P<job_id>[^/]+)$',
|
name='choose-plugin'),
|
||||||
job_templates_views.
|
re_path(r'^job-template/(?P<job_id>[^/]+)$',
|
||||||
JobTemplateDetailsView.as_view(), name='jt-details'),
|
job_templates_views.
|
||||||
url(r'^job-execution/(?P<job_execution_id>[^/]+)$',
|
JobTemplateDetailsView.as_view(), name='jt-details'),
|
||||||
jobs_views.JobDetailsView.as_view(), name='details'),
|
re_path(r'^job-execution/(?P<job_execution_id>[^/]+)$',
|
||||||
url(r'^create-job-binary$',
|
jobs_views.JobDetailsView.as_view(), name='details'),
|
||||||
job_binary_views.CreateJobBinaryView.as_view(),
|
re_path(r'^create-job-binary$',
|
||||||
name='create-job-binary'),
|
job_binary_views.CreateJobBinaryView.as_view(),
|
||||||
url(r'^job-binary/(?P<job_binary_id>[^/]+)$',
|
name='create-job-binary'),
|
||||||
job_binary_views.JobBinaryDetailsView.as_view(),
|
re_path(r'^job-binary/(?P<job_binary_id>[^/]+)$',
|
||||||
name='jb-details'),
|
job_binary_views.JobBinaryDetailsView.as_view(),
|
||||||
url(r'^job-binary/(?P<job_binary_id>[^/]+)/edit$',
|
name='jb-details'),
|
||||||
job_binary_views.EditJobBinaryView.as_view(),
|
re_path(r'^job-binary/(?P<job_binary_id>[^/]+)/edit$',
|
||||||
name='edit-job-binary'),
|
job_binary_views.EditJobBinaryView.as_view(),
|
||||||
url(r'^job-binary/(?P<job_binary_id>[^/]+)/download/$',
|
name='edit-job-binary'),
|
||||||
job_binary_views.DownloadJobBinaryView.as_view(),
|
re_path(r'^job-binary/(?P<job_binary_id>[^/]+)/download/$',
|
||||||
name='download'),
|
job_binary_views.DownloadJobBinaryView.as_view(),
|
||||||
url(r'^create-data-source$',
|
name='download'),
|
||||||
data_source_views.CreateDataSourceView.as_view(),
|
re_path(r'^create-data-source$',
|
||||||
name='create-data-source'),
|
data_source_views.CreateDataSourceView.as_view(),
|
||||||
url(r'^data-source/(?P<data_source_id>[^/]+)/edit$',
|
name='create-data-source'),
|
||||||
data_source_views.EditDataSourceView.as_view(),
|
re_path(r'^data-source/(?P<data_source_id>[^/]+)/edit$',
|
||||||
name='edit-data-source'),
|
data_source_views.EditDataSourceView.as_view(),
|
||||||
url(r'^data-source/(?P<data_source_id>[^/]+)$',
|
name='edit-data-source'),
|
||||||
data_source_views.DataSourceDetailsView.as_view(),
|
re_path(r'^data-source/(?P<data_source_id>[^/]+)$',
|
||||||
name='ds-details'),
|
data_source_views.DataSourceDetailsView.as_view(),
|
||||||
url(r'^jobex_guide$',
|
name='ds-details'),
|
||||||
job_wizard_views.JobExecutionGuideView.as_view(),
|
re_path(r'^jobex_guide$',
|
||||||
name='jobex_guide'),
|
job_wizard_views.JobExecutionGuideView.as_view(),
|
||||||
url(r'^jobex_guide/(?P<reset_jobex_guide>[^/]+)/$',
|
name='jobex_guide'),
|
||||||
job_wizard_views.ResetJobExGuideView.as_view(),
|
re_path(r'^jobex_guide/(?P<reset_jobex_guide>[^/]+)/$',
|
||||||
name='reset_jobex_guide'),
|
job_wizard_views.ResetJobExGuideView.as_view(),
|
||||||
url(r'^job_type_select$',
|
name='reset_jobex_guide'),
|
||||||
job_wizard_views.JobTypeSelectView.as_view(),
|
re_path(r'^job_type_select$',
|
||||||
name='job_type_select'),
|
job_wizard_views.JobTypeSelectView.as_view(),
|
||||||
|
name='job_type_select'),
|
||||||
]
|
]
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue