Commit 5b426e08 authored by Christos Stavrakakis's avatar Christos Stavrakakis
Browse files

cyclades: Rename meta to metadata at Cyclades URLs

For compatibility with OpenStack Compute API v2, rename 'meta' to
'metadata' to Cyclades API URLs. Specifically, to the following ones:

* /servers/<server-id>/meta
* /servers/<server-id>/meta/<key>
* /images/<image-id>/meta
* /images/<image-id>/meta/<key>

Refs #3768
parent eb59dfa0
......@@ -54,8 +54,8 @@ urlpatterns = patterns(
(r'^(?:/|.json|.xml)?$', 'demux'),
(r'^/detail(?:.json|.xml)?$', 'list_images', {'detail': True}),
(r'^/([\w-]+)(?:.json|.xml)?$', 'image_demux'),
(r'^/([\w-]+)/meta(?:.json|.xml)?$', 'metadata_demux'),
(r'^/([\w-]+)/meta/(.+?)(?:.json|.xml)?$', 'metadata_item_demux')
(r'^/([\w-]+)/metadata(?:.json|.xml)?$', 'metadata_demux'),
(r'^/([\w-]+)/metadata/(.+?)(?:.json|.xml)?$', 'metadata_item_demux')
)
......
......@@ -65,8 +65,8 @@ urlpatterns = patterns(
(r'^/(\d+)/action(?:.json|.xml)?$', 'server_action'),
(r'^/(\d+)/ips(?:.json|.xml)?$', 'list_addresses'),
(r'^/(\d+)/ips/(.+?)(?:.json|.xml)?$', 'list_addresses_by_network'),
(r'^/(\d+)/meta(?:.json|.xml)?$', 'metadata_demux'),
(r'^/(\d+)/meta/(.+?)(?:.json|.xml)?$', 'metadata_item_demux'),
(r'^/(\d+)/metadata(?:.json|.xml)?$', 'metadata_demux'),
(r'^/(\d+)/metadata/(.+?)(?:.json|.xml)?$', 'metadata_item_demux'),
(r'^/(\d+)/stats(?:.json|.xml)?$', 'server_stats'),
(r'^/(\d+)/diagnostics(?:.json)?$', 'get_server_diagnostics'),
)
......
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