Merge "Use re_path instead of url"
This commit is contained in:
Zuul
Gerrit Code Review
commit
bdfde968cb
|
|
@ -10,17 +10,17 @@
|
|||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
from django.conf import urls
|
||||
from django.urls import re_path
|
||||
|
||||
from manila_ui.dashboards.admin.security_services import views
|
||||
|
||||
|
||||
urlpatterns = [
|
||||
urls.url(
|
||||
re_path(
|
||||
r'^$',
|
||||
views.SecurityServicesView.as_view(),
|
||||
name='index'),
|
||||
urls.url(
|
||||
re_path(
|
||||
r'^(?P<sec_service_id>[^/]+)$',
|
||||
views.SecurityServiceDetailView.as_view(),
|
||||
name='security_service_detail'),
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
from django.conf import urls
|
||||
from django.urls import re_path
|
||||
|
||||
from manila_ui.dashboards.admin.share_group_snapshots import views
|
||||
from manila_ui import features
|
||||
|
|
@ -21,15 +21,15 @@ from manila_ui import features
|
|||
|
||||
if features.is_share_groups_enabled():
|
||||
urlpatterns = [
|
||||
urls.url(
|
||||
re_path(
|
||||
r'^$',
|
||||
views.ShareGroupSnapshotsView.as_view(),
|
||||
name='index'),
|
||||
urls.url(
|
||||
re_path(
|
||||
r'^(?P<share_group_snapshot_id>[^/]+)/$',
|
||||
views.ShareGroupSnapshotDetailView.as_view(),
|
||||
name='detail'),
|
||||
urls.url(
|
||||
re_path(
|
||||
r'^(?P<share_group_snapshot_id>[^/]+)/reset_status$',
|
||||
views.ResetShareGroupSnapshotStatusView.as_view(),
|
||||
name='reset_status'),
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
from django.conf import urls
|
||||
from django.urls import re_path
|
||||
|
||||
from manila_ui.dashboards.admin.share_group_types import views
|
||||
from manila_ui import features
|
||||
|
|
@ -21,19 +21,19 @@ from manila_ui import features
|
|||
|
||||
if features.is_share_groups_enabled():
|
||||
urlpatterns = [
|
||||
urls.url(
|
||||
re_path(
|
||||
r'^$',
|
||||
views.ShareGroupTypesView.as_view(),
|
||||
name='index'),
|
||||
urls.url(
|
||||
re_path(
|
||||
r'^create$',
|
||||
views.CreateShareGroupTypeView.as_view(),
|
||||
name='create'),
|
||||
urls.url(
|
||||
re_path(
|
||||
r'^(?P<share_group_type_id>[^/]+)/update$',
|
||||
views.UpdateShareGroupTypeView.as_view(),
|
||||
name='update'),
|
||||
urls.url(
|
||||
re_path(
|
||||
r'^(?P<share_group_type_id>[^/]+)/manage_access$',
|
||||
views.ManageShareGroupTypeAccessView.as_view(),
|
||||
name='manage_access'),
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
from django.conf import urls
|
||||
from django.urls import re_path
|
||||
|
||||
from manila_ui.dashboards.admin.share_groups import views
|
||||
from manila_ui import features
|
||||
|
|
@ -21,15 +21,15 @@ from manila_ui import features
|
|||
|
||||
if features.is_share_groups_enabled():
|
||||
urlpatterns = [
|
||||
urls.url(
|
||||
re_path(
|
||||
r'^$',
|
||||
views.ShareGroupsView.as_view(),
|
||||
name='index'),
|
||||
urls.url(
|
||||
re_path(
|
||||
r'^(?P<share_group_id>[^/]+)/$',
|
||||
views.ShareGroupDetailView.as_view(),
|
||||
name='detail'),
|
||||
urls.url(
|
||||
re_path(
|
||||
r'^(?P<share_group_id>[^/]+)/reset_status$',
|
||||
views.ResetShareGroupStatusView.as_view(),
|
||||
name='reset_status'),
|
||||
|
|
|
|||
|
|
@ -10,17 +10,17 @@
|
|||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
from django.conf import urls
|
||||
from django.urls import re_path
|
||||
|
||||
from manila_ui.dashboards.admin.share_instances import views
|
||||
|
||||
|
||||
urlpatterns = [
|
||||
urls.url(
|
||||
re_path(
|
||||
r'^$',
|
||||
views.ShareInstancesView.as_view(),
|
||||
name='index'),
|
||||
urls.url(
|
||||
re_path(
|
||||
r'^(?P<share_instance_id>[^/]+)$',
|
||||
views.ShareInstanceDetailView.as_view(),
|
||||
name='share_instance_detail'),
|
||||
|
|
|
|||
|
|
@ -10,17 +10,17 @@
|
|||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
from django.conf import urls
|
||||
from django.urls import re_path
|
||||
|
||||
from manila_ui.dashboards.admin.share_networks import views
|
||||
|
||||
|
||||
urlpatterns = [
|
||||
urls.url(
|
||||
re_path(
|
||||
r'^$',
|
||||
views.ShareNetworksView.as_view(),
|
||||
name='index'),
|
||||
urls.url(
|
||||
re_path(
|
||||
r'^(?P<share_network_id>[^/]+)$',
|
||||
views.ShareNetworkDetailView.as_view(),
|
||||
name='share_network_detail'),
|
||||
|
|
|
|||
|
|
@ -10,17 +10,17 @@
|
|||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
from django.conf import urls
|
||||
from django.urls import re_path
|
||||
|
||||
from manila_ui.dashboards.admin.share_servers import views
|
||||
|
||||
|
||||
urlpatterns = [
|
||||
urls.url(
|
||||
re_path(
|
||||
r'^$',
|
||||
views.ShareServersView.as_view(),
|
||||
name='index'),
|
||||
urls.url(
|
||||
re_path(
|
||||
r'^(?P<share_server_id>[^/]+)$',
|
||||
views.ShareServerDetailView.as_view(),
|
||||
name='share_server_detail'),
|
||||
|
|
|
|||
|
|
@ -10,17 +10,17 @@
|
|||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
from django.conf import urls
|
||||
from django.urls import re_path
|
||||
|
||||
from manila_ui.dashboards.admin.share_snapshots import views
|
||||
|
||||
|
||||
urlpatterns = [
|
||||
urls.url(
|
||||
re_path(
|
||||
r'^$',
|
||||
views.ShareSnapshotsView.as_view(),
|
||||
name='index'),
|
||||
urls.url(
|
||||
re_path(
|
||||
r'^(?P<snapshot_id>[^/]+)$',
|
||||
views.ShareSnapshotDetailView.as_view(),
|
||||
name='share_snapshot_detail'),
|
||||
|
|
|
|||
|
|
@ -10,25 +10,25 @@
|
|||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
from django.conf import urls
|
||||
from django.urls import re_path
|
||||
|
||||
from manila_ui.dashboards.admin.share_types import views
|
||||
|
||||
|
||||
urlpatterns = [
|
||||
urls.url(
|
||||
re_path(
|
||||
r'^$',
|
||||
views.ShareTypesView.as_view(),
|
||||
name='index'),
|
||||
urls.url(
|
||||
re_path(
|
||||
r'^create_type$',
|
||||
views.CreateShareTypeView.as_view(),
|
||||
name='create_type'),
|
||||
urls.url(
|
||||
re_path(
|
||||
r'^update_type/(?P<share_type_id>[^/]+)/extra_specs$',
|
||||
views.UpdateShareTypeView.as_view(),
|
||||
name='update_type'),
|
||||
urls.url(
|
||||
re_path(
|
||||
r'^manage_share_type_access/(?P<share_type_id>[^/]+)$',
|
||||
views.ManageShareTypeAccessView.as_view(),
|
||||
name='manage_share_type_access'),
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
from django.conf import urls
|
||||
from django.urls import re_path
|
||||
|
||||
from manila_ui.dashboards.admin.shares.replicas import views as replica_views
|
||||
from manila_ui.dashboards.admin.shares import views
|
||||
|
|
@ -18,19 +18,19 @@ from manila_ui import features
|
|||
|
||||
|
||||
urlpatterns = [
|
||||
urls.url(
|
||||
re_path(
|
||||
r'^$',
|
||||
views.SharesView.as_view(),
|
||||
name='index'),
|
||||
urls.url(
|
||||
re_path(
|
||||
r'^(?P<share_id>[^/]+)/$',
|
||||
views.DetailView.as_view(),
|
||||
name='detail'),
|
||||
urls.url(
|
||||
re_path(
|
||||
r'^manage$',
|
||||
views.ManageShareView.as_view(),
|
||||
name='manage'),
|
||||
urls.url(
|
||||
re_path(
|
||||
r'^unmanage/(?P<share_id>[^/]+)$',
|
||||
views.UnmanageShareView.as_view(),
|
||||
name='unmanage'),
|
||||
|
|
@ -38,23 +38,23 @@ urlpatterns = [
|
|||
|
||||
if features.is_replication_enabled():
|
||||
urlpatterns.extend([
|
||||
urls.url(
|
||||
re_path(
|
||||
r'^(?P<share_id>[^/]+)/replicas/$',
|
||||
replica_views.ManageReplicasView.as_view(),
|
||||
name='manage_replicas'),
|
||||
urls.url(
|
||||
re_path(
|
||||
r'^replica/(?P<replica_id>[^/]+)$',
|
||||
replica_views.DetailReplicaView.as_view(),
|
||||
name='replica_detail'),
|
||||
urls.url(
|
||||
re_path(
|
||||
r'^replica/(?P<replica_id>[^/]+)/resync_replica$',
|
||||
replica_views.ResyncReplicaView.as_view(),
|
||||
name='resync_replica'),
|
||||
urls.url(
|
||||
re_path(
|
||||
r'^replica/(?P<replica_id>[^/]+)/reset_replica_status$',
|
||||
replica_views.ResetReplicaStatusView.as_view(),
|
||||
name='reset_replica_status'),
|
||||
urls.url(
|
||||
re_path(
|
||||
r'^replica/(?P<replica_id>[^/]+)/reset_replica_state$',
|
||||
replica_views.ResetReplicaStateView.as_view(),
|
||||
name='reset_replica_state'),
|
||||
|
|
@ -62,19 +62,19 @@ if features.is_replication_enabled():
|
|||
|
||||
if features.is_migration_enabled():
|
||||
urlpatterns.extend([
|
||||
urls.url(
|
||||
re_path(
|
||||
r'^migration_start/(?P<share_id>[^/]+)$',
|
||||
views.MigrationStartView.as_view(),
|
||||
name='migration_start'),
|
||||
urls.url(
|
||||
re_path(
|
||||
r'^migration_complete/(?P<share_id>[^/]+)$',
|
||||
views.MigrationCompleteView.as_view(),
|
||||
name='migration_complete'),
|
||||
urls.url(
|
||||
re_path(
|
||||
r'^migration_cancel/(?P<share_id>[^/]+)$',
|
||||
views.MigrationCancelView.as_view(),
|
||||
name='migration_cancel'),
|
||||
urls.url(
|
||||
re_path(
|
||||
r'^migration_get_progress/(?P<share_id>[^/]+)$',
|
||||
views.MigrationGetProgressView.as_view(),
|
||||
name='migration_get_progress'),
|
||||
|
|
|
|||
|
|
@ -12,17 +12,17 @@
|
|||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
from django.conf import urls
|
||||
from django.urls import re_path
|
||||
|
||||
from manila_ui.dashboards.admin.user_messages import views
|
||||
|
||||
|
||||
urlpatterns = [
|
||||
urls.url(
|
||||
re_path(
|
||||
r'^$',
|
||||
views.UserMessagesAdminView.as_view(),
|
||||
name='index'),
|
||||
urls.url(
|
||||
re_path(
|
||||
r'^(?P<message_id>[^/]+)$',
|
||||
views.UserMessagesAdminDetailView.as_view(),
|
||||
name='user_messages_detail'),
|
||||
|
|
|
|||
|
|
@ -12,25 +12,25 @@
|
|||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
from django.conf import urls
|
||||
from django.urls import re_path
|
||||
|
||||
from manila_ui.dashboards.project.security_services import views
|
||||
|
||||
|
||||
urlpatterns = [
|
||||
urls.url(
|
||||
re_path(
|
||||
r'^$',
|
||||
views.SecurityServicesView.as_view(),
|
||||
name='index'),
|
||||
urls.url(
|
||||
re_path(
|
||||
r'^create_security_service$',
|
||||
views.CreateView.as_view(),
|
||||
name='security_service_create'),
|
||||
urls.url(
|
||||
re_path(
|
||||
r'^(?P<sec_service_id>[^/]+)/update/$',
|
||||
views.UpdateView.as_view(),
|
||||
name='security_service_update'),
|
||||
urls.url(
|
||||
re_path(
|
||||
r'^(?P<sec_service_id>[^/]+)$',
|
||||
views.Detail.as_view(),
|
||||
name='security_service_detail'),
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
from django.conf import urls
|
||||
from django.urls import re_path
|
||||
|
||||
from manila_ui.dashboards.project.share_group_snapshots import views
|
||||
from manila_ui import features
|
||||
|
|
@ -21,19 +21,19 @@ from manila_ui import features
|
|||
|
||||
if features.is_share_groups_enabled():
|
||||
urlpatterns = [
|
||||
urls.url(
|
||||
re_path(
|
||||
r'^$',
|
||||
views.ShareGroupSnapshotsView.as_view(),
|
||||
name='index'),
|
||||
urls.url(
|
||||
re_path(
|
||||
r'^(?P<share_group_id>[^/]+)/snapshot_create/$',
|
||||
views.CreateShareGroupSnapshotView.as_view(),
|
||||
name='create'),
|
||||
urls.url(
|
||||
re_path(
|
||||
r'^(?P<share_group_snapshot_id>[^/]+)/$',
|
||||
views.ShareGroupSnapshotDetailView.as_view(),
|
||||
name='detail'),
|
||||
urls.url(
|
||||
re_path(
|
||||
r'^(?P<share_group_snapshot_id>[^/]+)/update/$',
|
||||
views.UpdateShareGroupSnapshotView.as_view(),
|
||||
name='update'),
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
from django.conf import urls
|
||||
from django.urls import re_path
|
||||
|
||||
from manila_ui.dashboards.project.share_groups import views
|
||||
from manila_ui import features
|
||||
|
|
@ -21,19 +21,19 @@ from manila_ui import features
|
|||
|
||||
if features.is_share_groups_enabled():
|
||||
urlpatterns = [
|
||||
urls.url(
|
||||
re_path(
|
||||
r'^$',
|
||||
views.ShareGroupsView.as_view(),
|
||||
name='index'),
|
||||
urls.url(
|
||||
re_path(
|
||||
r'^create/$',
|
||||
views.ShareGroupCreateView.as_view(),
|
||||
name='create'),
|
||||
urls.url(
|
||||
re_path(
|
||||
r'^(?P<share_group_id>[^/]+)/$',
|
||||
views.ShareGroupDetailView.as_view(),
|
||||
name='detail'),
|
||||
urls.url(
|
||||
re_path(
|
||||
r'^(?P<share_group_id>[^/]+)/update/$',
|
||||
views.ShareGroupUpdateView.as_view(),
|
||||
name='update'),
|
||||
|
|
|
|||
|
|
@ -12,25 +12,25 @@
|
|||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
from django.conf import urls
|
||||
from django.urls import re_path
|
||||
|
||||
from manila_ui.dashboards.project.share_networks import views
|
||||
|
||||
|
||||
urlpatterns = [
|
||||
urls.url(
|
||||
re_path(
|
||||
r'^$',
|
||||
views.ShareNetworksView.as_view(),
|
||||
name='index'),
|
||||
urls.url(
|
||||
re_path(
|
||||
r'^create_share_network$',
|
||||
views.Create.as_view(),
|
||||
name='share_network_create'),
|
||||
urls.url(
|
||||
re_path(
|
||||
r'^(?P<share_network_id>[^/]+)/update$',
|
||||
views.Update.as_view(),
|
||||
name='share_network_update'),
|
||||
urls.url(
|
||||
re_path(
|
||||
r'^(?P<share_network_id>[^/]+)$',
|
||||
views.Detail.as_view(),
|
||||
name='share_network_detail'),
|
||||
|
|
|
|||
|
|
@ -12,33 +12,33 @@
|
|||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
from django.conf import urls
|
||||
from django.urls import re_path
|
||||
|
||||
from manila_ui.dashboards.project.share_snapshots import views
|
||||
|
||||
|
||||
urlpatterns = [
|
||||
urls.url(
|
||||
re_path(
|
||||
r'^$',
|
||||
views.ShareSnapshotsView.as_view(),
|
||||
name='index'),
|
||||
urls.url(
|
||||
re_path(
|
||||
r'^(?P<share_id>[^/]+)/share_snapshot_create/$',
|
||||
views.CreateShareSnapshotView.as_view(),
|
||||
name='share_snapshot_create'),
|
||||
urls.url(
|
||||
re_path(
|
||||
r'^(?P<snapshot_id>[^/]+)/share_snapshot_edit/$',
|
||||
views.UpdateShareSnapshotView.as_view(),
|
||||
name='share_snapshot_edit'),
|
||||
urls.url(
|
||||
re_path(
|
||||
r'^(?P<snapshot_id>[^/]+)$',
|
||||
views.ShareSnapshotDetailView.as_view(),
|
||||
name='share_snapshot_detail'),
|
||||
urls.url(
|
||||
re_path(
|
||||
r'^(?P<snapshot_id>[^/]+)/share_snapshot_rules/$',
|
||||
views.ManageShareSnapshotRulesView.as_view(),
|
||||
name='share_snapshot_manage_rules'),
|
||||
urls.url(
|
||||
re_path(
|
||||
r'^(?P<snapshot_id>[^/]+)/share_snapshot_rule_add/$',
|
||||
views.AddShareSnapshotRuleView.as_view(),
|
||||
name='share_snapshot_rule_add'),
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
from django.conf import urls
|
||||
from django.urls import re_path
|
||||
|
||||
from manila_ui.dashboards.project.shares.replicas import views as replica_views
|
||||
from manila_ui.dashboards.project.shares import views as shares_views
|
||||
|
|
@ -20,43 +20,43 @@ from manila_ui import features
|
|||
|
||||
|
||||
urlpatterns = [
|
||||
urls.url(
|
||||
re_path(
|
||||
r'^$',
|
||||
shares_views.SharesView.as_view(),
|
||||
name='index'),
|
||||
urls.url(
|
||||
re_path(
|
||||
r'^create/$',
|
||||
shares_views.CreateView.as_view(),
|
||||
name='create'),
|
||||
urls.url(
|
||||
re_path(
|
||||
r'^(?P<share_id>[^/]+)/rules/$',
|
||||
shares_views.ManageRulesView.as_view(),
|
||||
name='manage_rules'),
|
||||
urls.url(
|
||||
re_path(
|
||||
r'^(?P<share_id>[^/]+)/rule_add/$',
|
||||
shares_views.AddRuleView.as_view(),
|
||||
name='rule_add'),
|
||||
urls.url(
|
||||
re_path(
|
||||
r'^rules/(?P<rule_id>[^/]+)/update_rule_metadata/$',
|
||||
shares_views.UpdateRuleMetadataView.as_view(),
|
||||
name='update_rule_metadata'),
|
||||
urls.url(
|
||||
re_path(
|
||||
r'^(?P<share_id>[^/]+)/$',
|
||||
shares_views.DetailView.as_view(),
|
||||
name='detail'),
|
||||
urls.url(
|
||||
re_path(
|
||||
r'^(?P<share_id>[^/]+)/update/$',
|
||||
shares_views.UpdateView.as_view(),
|
||||
name='update'),
|
||||
urls.url(
|
||||
re_path(
|
||||
r'^(?P<share_id>[^/]+)/update_metadata/$',
|
||||
shares_views.UpdateMetadataView.as_view(),
|
||||
name='update_metadata'),
|
||||
urls.url(
|
||||
re_path(
|
||||
r'^(?P<share_id>[^/]+)/resize/$',
|
||||
shares_views.ResizeView.as_view(),
|
||||
name='resize'),
|
||||
urls.url(
|
||||
re_path(
|
||||
r'^(?P<share_id>[^/]+)/revert/$',
|
||||
shares_views.RevertView.as_view(),
|
||||
name='revert'),
|
||||
|
|
@ -64,19 +64,19 @@ urlpatterns = [
|
|||
|
||||
if features.is_replication_enabled():
|
||||
urlpatterns.extend([
|
||||
urls.url(
|
||||
re_path(
|
||||
r'^(?P<share_id>[^/]+)/create_replica/$',
|
||||
replica_views.CreateReplicaView.as_view(),
|
||||
name='create_replica'),
|
||||
urls.url(
|
||||
re_path(
|
||||
r'^(?P<share_id>[^/]+)/replicas/$',
|
||||
replica_views.ManageReplicasView.as_view(),
|
||||
name='manage_replicas'),
|
||||
urls.url(
|
||||
re_path(
|
||||
r'^replica/(?P<replica_id>[^/]+)$',
|
||||
replica_views.DetailReplicaView.as_view(),
|
||||
name='replica_detail'),
|
||||
urls.url(
|
||||
re_path(
|
||||
r'^replica/(?P<replica_id>[^/]+)/set_replica_as_active$',
|
||||
replica_views.SetReplicaAsActiveView.as_view(),
|
||||
name='set_replica_as_active'),
|
||||
|
|
|
|||
|
|
@ -12,17 +12,17 @@
|
|||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
from django.conf import urls
|
||||
from django.urls import re_path
|
||||
|
||||
from manila_ui.dashboards.project.user_messages import views
|
||||
|
||||
|
||||
urlpatterns = [
|
||||
urls.url(
|
||||
re_path(
|
||||
r'^$',
|
||||
views.UserMessagesView.as_view(),
|
||||
name='index'),
|
||||
urls.url(
|
||||
re_path(
|
||||
r'^(?P<message_id>[^/]+)$',
|
||||
views.UserMessagesDetailView.as_view(),
|
||||
name='user_messages_detail'),
|
||||
|
|
|
|||
|
|
@ -11,9 +11,10 @@
|
|||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
from django.conf import urls
|
||||
from django.urls import include
|
||||
from django.urls import re_path
|
||||
import openstack_dashboard.urls
|
||||
|
||||
urlpatterns = [
|
||||
urls.url(r'', urls.include(openstack_dashboard.urls))
|
||||
re_path(r'', include(openstack_dashboard.urls))
|
||||
]
|
||||
|
|
|
|||
Loading…
Reference in New Issue