Revision 8a992938

b/snf-cyclades-app/synnefo/api/images.py
54 54
    (r'^(?:/|.json|.xml)?$', 'demux'),
55 55
    (r'^/detail(?:.json|.xml)?$', 'list_images', {'detail': True}),
56 56
    (r'^/([\w-]+)(?:.json|.xml)?$', 'image_demux'),
57
    (r'^/([\w-]+)/meta(?:.json|.xml)?$', 'metadata_demux'),
58
    (r'^/([\w-]+)/meta/(.+?)(?:.json|.xml)?$', 'metadata_item_demux')
57
    (r'^/([\w-]+)/metadata(?:.json|.xml)?$', 'metadata_demux'),
58
    (r'^/([\w-]+)/metadata/(.+?)(?:.json|.xml)?$', 'metadata_item_demux')
59 59
)
60 60

  
61 61

  
b/snf-cyclades-app/synnefo/api/servers.py
65 65
    (r'^/(\d+)/action(?:.json|.xml)?$', 'server_action'),
66 66
    (r'^/(\d+)/ips(?:.json|.xml)?$', 'list_addresses'),
67 67
    (r'^/(\d+)/ips/(.+?)(?:.json|.xml)?$', 'list_addresses_by_network'),
68
    (r'^/(\d+)/meta(?:.json|.xml)?$', 'metadata_demux'),
69
    (r'^/(\d+)/meta/(.+?)(?:.json|.xml)?$', 'metadata_item_demux'),
68
    (r'^/(\d+)/metadata(?:.json|.xml)?$', 'metadata_demux'),
69
    (r'^/(\d+)/metadata/(.+?)(?:.json|.xml)?$', 'metadata_item_demux'),
70 70
    (r'^/(\d+)/stats(?:.json|.xml)?$', 'server_stats'),
71 71
    (r'^/(\d+)/diagnostics(?:.json)?$', 'get_server_diagnostics'),
72 72
)

Also available in: Unified diff