Revision 9071888e api/urls.py

b/api/urls.py
1 1
# vim: ts=4 sts=4 et ai sw=4 fileencoding=utf-8
2 2
#
3
# Copyright © 2010 Greek Research and Technology Network
3
# Copyright © 2010 Greek Research and Technology Network
4 4
#
5 5

  
6 6
from django.conf.urls.defaults import *
......
24 24
image_handler = Resource(ImageHandler, auth)
25 25
shared_ip_group_handler = Resource(SharedIPGroupHandler, auth)
26 26
virtual_machine_group_handler = Resource(VirtualMachineGroupHandler, auth)
27
disk_handler = Resource(DiskHandler, auth)
27 28

  
28 29
def url_with_format(regex, *args, **kwargs):
29 30
    if regex[-1] == '$':
......
31 32
    regex = regex + r'(\.(?P<emitter_format>json|xml))?$'
32 33
    return url(regex, *args, **kwargs)
33 34

  
35
# The Rackspace v1.0 Cloud Servers API
34 36
v10patterns = patterns('',
35 37
    url_with_format(r'^limits$', limit_handler),
36 38
    url_with_format(r'^servers$', server_handler),
......
51 53
    url(r'^.+', notFound), # catch-all
52 54
)
53 55

  
56
# The Rackspace v1.0 Cloud Servers API + GRNET v1.0 extension
57
v10grnet10patterns = patterns('',
58
    url_with_format(r'^limits$', limit_handler),
59
    url_with_format(r'^servers$', server_handler),
60
    url_with_format(r'^servers/(?P<id>[^/]+)$', server_handler),
61
    url_with_format(r'^servers/(?P<id>[^/]+)/action$', server_actions_handler),
62
    url_with_format(r'^servers/(?P<id>[^/]+)/ips$', server_address_handler),
63
    url_with_format(r'^servers/(?P<id>[^/]+)/ips/private$', server_address_handler),
64
    url_with_format(r'^servers/(?P<id>[^/]+)/ips/public/(?P<address>[^/]+)$', server_address_handler),
65
    url_with_format(r'^servers/(?P<id>[^/]+)/backup_schedule', server_backup_handler),
66
    url_with_format(r'^flavors$', flavor_handler),
67
    url_with_format(r'^flavors/(?P<id>[^/]+)$', flavor_handler),
68
    url_with_format(r'^images$', image_handler),
69
    url_with_format(r'^images/(?P<id>[^/]+)$', image_handler),
70
    url_with_format(r'^shared_ip_groups$', shared_ip_group_handler),
71
    url_with_format(r'^shared_ip_groups/(?P<id>[^/]+)$', shared_ip_group_handler),
72
    url_with_format(r'^groups$', virtual_machine_group_handler),
73
    url_with_format(r'^disks$', disk_handler),
74
    url_with_format(r'^disks/(?P<id>[^/]+)$', disk_handler),
75
    url_with_format(r'^groups/(?P<id>[^/]+)$', virtual_machine_group_handler),
76
    url(r'^.+', notFound), # catch-all
77
)
78

  
54 79
version_handler = Resource(VersionHandler)
55 80

  
56 81
urlpatterns = patterns('',
57 82
    url_with_format(r'^(?P<number>[^/]+)/?$', version_handler),
58 83
    url(r'^$', version_handler),
59 84
    url(r'^v1.0/', include(v10patterns)),
85
    url(r'^v1.0grnet1/', include(v10grnet10patterns)),
60 86
    url(r'^.+', notFound), # catch-all
61 87
)

Also available in: Unified diff