Commit 8ca30d54 authored by Georgios D. Tsoukalas's avatar Georgios D. Tsoukalas
Browse files

cyclades: add version 'v1' in plankton/image URLs

parent 7b5aebe0
......@@ -31,7 +31,7 @@
# interpreted as representing official policies, either expressed
# or implied, of GRNET S.A.
from django.conf.urls.defaults import patterns
from django.conf.urls.defaults import patterns, include
from django.http import HttpResponseNotAllowed
from synnefo.plankton import views
......@@ -77,12 +77,17 @@ def demux_members(request, image_id, member):
return HttpResponseNotAllowed(['DELETE', 'PUT'])
urlpatterns = patterns(
image_v1_patterns = patterns(
'',
(r'^images/$', demux),
(r'^images/detail$', views.list_images, {'detail': True}),
(r'^images/([\w-]+)$', demux_image),
(r'^images/([\w-]+)/members$', demux_image_members),
(r'^images/([\w-]+)/members/([\w@._-]+)$', demux_members),
(r'^shared-images/([\w@._-]+)$', views.list_shared_images)
(r'^shared-images/([\w@._-]+)$', views.list_shared_images),
)
urlpatterns = patterns(
'',
(r'^v1/', include(image_v1_patterns)),
)
......@@ -62,7 +62,7 @@ COMPUTE_URL = getattr(settings, 'CYCLADES_UI_COMPUTE_URL',
join_urls(BASE_PATH, cyclades.COMPUTE_PREFIX,
'v1.1'))
GLANCE_URL = getattr(settings, 'CYCLADES_UI_GLANCE_URL',
join_urls(BASE_PATH, cyclades.PLANKTON_PREFIX))
join_urls(BASE_PATH, cyclades.PLANKTON_PREFIX + '/v1'))
USERDATA_URL = getattr(settings, 'CYCLADES_UI_USERDATA_URL',
join_urls(BASE_PATH, cyclades.USERDATA_PREFIX))
LOGIN_URL = getattr(settings, 'CYCLADES_UI_LOGIN_URL',
......
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