diff --git a/cloudkittydashboard/dashboards/admin/hashmap/urls.py b/cloudkittydashboard/dashboards/admin/hashmap/urls.py index 54fffc0..8638c9c 100644 --- a/cloudkittydashboard/dashboards/admin/hashmap/urls.py +++ b/cloudkittydashboard/dashboards/admin/hashmap/urls.py @@ -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[^/]+)/?$', - views.ServiceView.as_view(), - name='service'), - url(r'^create_service/?$', - views.ServiceCreateView.as_view(), - name='service_create'), - url(r'^field/(?P[^/]+)/?$', - views.FieldView.as_view(), - name='field'), - url(r'^group/(?P[^/]+)/?$', - views.GroupView.as_view(), - name='group'), - url(r'^group/(?P[^/]+)/details/?$', - views.GroupDetailsView.as_view(), - name='group_details'), - url(r'^create_field/service/(?P[^/]+)/?$', - views.FieldCreateView.as_view(), - name='field_create'), - url(r'^create_group/(?:(?P[^/]+)/)?$', - views.GroupCreateView.as_view(), - name='group_create'), - url(r'^create_threshold/service/(?P[^/]+)/?$', - views.ServiceThresholdCreateView.as_view(), - name='service_threshold_create'), - url(r'^create_threshold/field/(?P[^/]+)/?$', - views.FieldThresholdCreateView.as_view(), - name='field_threshold_create'), - url(r'^create_mapping/service/(?P[^/]+)/?$', - views.ServiceMappingCreateView.as_view(), - name='service_mapping_create'), - url(r'^create_mapping/field/(?P[^/]+)/?$', - views.FieldMappingCreateView.as_view(), - name='field_mapping_create'), - url(r'^edit_mapping/service/(?P[^/]+)/?$', - views.ServiceMappingEditView.as_view(), - name='service_mapping_edit'), - url(r'^edit_mapping/field/(?P[^/]+)/?$', - views.FieldMappingEditView.as_view(), - name='field_mapping_edit'), - url(r'^edit_threshold/service/(?P[^/]+)/?$', - views.ServiceThresholdEditView.as_view(), - name='service_threshold_edit'), - url(r'^edit_threshold/field/(?P[^/]+)/?$', - views.FieldThresholdEditView.as_view(), - name='field_threshold_edit'), + re_path(r'^$', views.IndexView.as_view(), name='index'), + re_path(r'^service/(?P[^/]+)/?$', + views.ServiceView.as_view(), + name='service'), + re_path(r'^create_service/?$', + views.ServiceCreateView.as_view(), + name='service_create'), + re_path(r'^field/(?P[^/]+)/?$', + views.FieldView.as_view(), + name='field'), + re_path(r'^group/(?P[^/]+)/?$', + views.GroupView.as_view(), + name='group'), + re_path(r'^group/(?P[^/]+)/details/?$', + views.GroupDetailsView.as_view(), + name='group_details'), + re_path(r'^create_field/service/(?P[^/]+)/?$', + views.FieldCreateView.as_view(), + name='field_create'), + re_path(r'^create_group/(?:(?P[^/]+)/)?$', + views.GroupCreateView.as_view(), + name='group_create'), + re_path(r'^create_threshold/service/(?P[^/]+)/?$', + views.ServiceThresholdCreateView.as_view(), + name='service_threshold_create'), + re_path(r'^create_threshold/field/(?P[^/]+)/?$', + views.FieldThresholdCreateView.as_view(), + name='field_threshold_create'), + re_path(r'^create_mapping/service/(?P[^/]+)/?$', + views.ServiceMappingCreateView.as_view(), + name='service_mapping_create'), + re_path(r'^create_mapping/field/(?P[^/]+)/?$', + views.FieldMappingCreateView.as_view(), + name='field_mapping_create'), + re_path(r'^edit_mapping/service/(?P[^/]+)/?$', + views.ServiceMappingEditView.as_view(), + name='service_mapping_edit'), + re_path(r'^edit_mapping/field/(?P[^/]+)/?$', + views.FieldMappingEditView.as_view(), + name='field_mapping_edit'), + re_path(r'^edit_threshold/service/(?P[^/]+)/?$', + views.ServiceThresholdEditView.as_view(), + name='service_threshold_edit'), + re_path(r'^edit_threshold/field/(?P[^/]+)/?$', + views.FieldThresholdEditView.as_view(), + name='field_threshold_edit'), ] diff --git a/cloudkittydashboard/dashboards/admin/modules/urls.py b/cloudkittydashboard/dashboards/admin/modules/urls.py index 90f0230..e7fcdea 100644 --- a/cloudkittydashboard/dashboards/admin/modules/urls.py +++ b/cloudkittydashboard/dashboards/admin/modules/urls.py @@ -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[^/]+)/?$', views.ModuleDetailsView.as_view(), - name="module_details"), - url(r'^edit_priority/(?P[^/]+)/?$', - views.PriorityModuleEditView.as_view(), - name="edit_priority"), + re_path(r'^$', views.IndexView.as_view(), name='index'), + re_path(r'^(?P[^/]+)/?$', views.ModuleDetailsView.as_view(), + name="module_details"), + re_path(r'^edit_priority/(?P[^/]+)/?$', + views.PriorityModuleEditView.as_view(), + name="edit_priority"), ] diff --git a/cloudkittydashboard/dashboards/admin/pyscripts/urls.py b/cloudkittydashboard/dashboards/admin/pyscripts/urls.py index 47292bb..06c0388 100644 --- a/cloudkittydashboard/dashboards/admin/pyscripts/urls.py +++ b/cloudkittydashboard/dashboards/admin/pyscripts/urls.py @@ -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[^/]+)/?$', views.ScriptUpdateView.as_view(), - name="script_update"), - url(r'^(?P[^/]+)/?$', 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[^/]+)/?$', + views.ScriptUpdateView.as_view(), + name="script_update"), + re_path(r'^(?P[^/]+)/?$', views.ScriptDetailsView.as_view(), + name="script_details"), ] diff --git a/cloudkittydashboard/dashboards/admin/summary/urls.py b/cloudkittydashboard/dashboards/admin/summary/urls.py index 11c7c47..10d3ffa 100644 --- a/cloudkittydashboard/dashboards/admin/summary/urls.py +++ b/cloudkittydashboard/dashboards/admin/summary/urls.py @@ -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[^/]+)/?$', views.TenantDetailsView.as_view(), - name="project_details"), + re_path(r'^$', views.IndexView.as_view(), name='index'), + re_path(r'^(?P[^/]+)/?$', views.TenantDetailsView.as_view(), + name="project_details"), ] diff --git a/cloudkittydashboard/dashboards/project/rating/urls.py b/cloudkittydashboard/dashboards/project/rating/urls.py index 66da38e..078175d 100644 --- a/cloudkittydashboard/dashboards/project/rating/urls.py +++ b/cloudkittydashboard/dashboards/project/rating/urls.py @@ -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') ] diff --git a/cloudkittydashboard/dashboards/project/reporting/urls.py b/cloudkittydashboard/dashboards/project/reporting/urls.py index d574124..5828af3 100644 --- a/cloudkittydashboard/dashboards/project/reporting/urls.py +++ b/cloudkittydashboard/dashboards/project/reporting/urls.py @@ -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'), ] diff --git a/cloudkittydashboard/overrides.py b/cloudkittydashboard/overrides.py index e403663..b6034c6 100644 --- a/cloudkittydashboard/overrides.py +++ b/cloudkittydashboard/overrides.py @@ -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