Commit 100cf5af authored by Lukas Burgey's avatar Lukas Burgey
Browse files

Revert "Make urls consistent"

This reverts commit 50b384fb.
parent 393ed105
......@@ -10,9 +10,9 @@ API_PATH = 'user-api'
URLPATTERNS = [
url(r'/clientapi', include(clientapi_urls)),
url(r'/api', include(frontend_urls)),
url(r'/user-api', include(user_rest_urls)),
url(r'/auth/v1', include(auth_urls)),
url(r'/admin', admin.site.urls),
url(r'^clientapi/', include(clientapi_urls)),
url(r'^api/', include(frontend_urls)),
url(r'^user-api/', include(user_rest_urls)),
url(r'^auth/v1/', include(auth_urls)),
url(r'^admin', admin.site.urls),
]
......@@ -222,9 +222,9 @@ def response_view_error(err):
URLPATTERNS = [
url(r'/dep-state$', DeploymentStateView.as_view()),
url(r'/dep-states$', DeploymentStateListView.as_view()),
url(r'^dep-state$', DeploymentStateView.as_view()),
url(r'^dep-states$', DeploymentStateListView.as_view()),
url(r'/config$', ConfigurationView.as_view()),
url(r'/deregister$', DeregisterView.as_view()),
url(r'^config', ConfigurationView.as_view()),
url(r'^deregister', DeregisterView.as_view()),
]
......@@ -235,29 +235,28 @@ class DeploymentStateView(generics.RetrieveUpdateAPIView):
URLPATTERNS = [
url(r'/user$', UserDeletionView.as_view()),
url(r'^$', HelpView.as_view()),
url(r'/services$', ServiceListView.as_view()),
url(r'/service/(?P<id>[0-9]+)$', ServiceView.as_view()),
url(r'/service(/.+)*$', HelpView.as_view()),
url(r'^user$', UserDeletionView.as_view()),
url(r'/vos$', VOListView.as_view()),
url(r'/vo/(?P<id>[0-9]+)$', VOView.as_view()),
url(r'/vo(/.+)*$', HelpView.as_view()),
url(r'^services$', ServiceListView.as_view()),
url(r'^service/(?P<id>[0-9]+)$', ServiceView.as_view()),
url(r'^service(/.+)*$', HelpView.as_view()),
url(r'/ssh-keys$', SSHPublicKeyListView.as_view()),
url(r'/ssh-key/(?P<id>[0-9]+)$', SSHPublicKeyView.as_view()),
url(r'/ssh-key(/.+)*$', HelpView.as_view()),
url(r'^vos$', VOListView.as_view()),
url(r'^vo/(?P<id>[0-9]+)$', VOView.as_view()),
url(r'^vo(/.+)*$', HelpView.as_view()),
# type/is either 'vo' or 'service'
url(r'/deployments/?(?P<type>.+)?$', DeploymentListView.as_view()),
url(r'/deployment/(?P<type>.+)/(?P<id>[0-9]+)$', DeploymentView.as_view()),
url(r'/deployment(/.+)*$', HelpView.as_view()),
url(r'^ssh-keys$', SSHPublicKeyListView.as_view()),
url(r'^ssh-key/(?P<id>[0-9]+)$', SSHPublicKeyView.as_view()),
url(r'^ssh-key(/.+)*$', HelpView.as_view()),
url(r'/states$', DeploymentStateListView.as_view()),
url(r'/state/(?P<id>[0-9]+)$', DeploymentStateView.as_view()),
url(r'/state(/.+)*$', HelpView.as_view()),
# type is either 'vo' or 'service'
url(r'^deployments/?(?P<type>.+)?$', DeploymentListView.as_view()),
url(r'^deployment/(?P<type>.+)/(?P<id>[0-9]+)$', DeploymentView.as_view()),
url(r'^deployment(/.+)*$', HelpView.as_view()),
# print help if nothing matches
url(r'.*', HelpView.as_view()),
url(r'^states$', DeploymentStateListView.as_view()),
url(r'^state/(?P<id>[0-9]+)$', DeploymentStateView.as_view()),
url(r'^state(/.+)*$', HelpView.as_view()),
]
......@@ -38,5 +38,5 @@ class StateView(generics.RetrieveAPIView):
URLPATTERNS = [
url(r'/state$', StateView.as_view()),
url(r'^state', StateView.as_view()),
]
......@@ -4,5 +4,5 @@ from .backend import urls
# pylint: disable=invalid-name
urlpatterns = [
url(r'^backend', include(urls.URLPATTERNS)),
url(r'^backend/', include(urls.URLPATTERNS)),
]
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment