From f57bc6a95fb8b80a2f4a7f48d55c3856996bf005 Mon Sep 17 00:00:00 2001 From: Andrew Melton Date: Fri, 28 Feb 2014 10:27:07 -0500 Subject: [PATCH] Properly anchor API urls --- stacktach/urls.py | 84 +++++++++++++++++++++++------------------------ 1 file changed, 42 insertions(+), 42 deletions(-) diff --git a/stacktach/urls.py b/stacktach/urls.py index 701783d..45274c3 100644 --- a/stacktach/urls.py +++ b/stacktach/urls.py @@ -23,76 +23,76 @@ web_urls = ( ) stacky_urls = ( - url(r'stacky/deployments/$', 'stacktach.stacky_server.do_deployments'), - url(r'stacky/events/$', 'stacktach.stacky_server.do_events'), - url(r'stacky/hosts/$', 'stacktach.stacky_server.do_hosts'), - url(r'stacky/uuid/$', 'stacktach.stacky_server.do_uuid'), - url(r'stacky/timings/$', 'stacktach.stacky_server.do_timings'), - url(r'stacky/timings/uuid/$', 'stacktach.stacky_server.do_timings_uuid'), - url(r'stacky/summary/$', 'stacktach.stacky_server.do_summary'), - url(r'stacky/request/$', 'stacktach.stacky_server.do_request'), - url(r'stacky/reports/search/$', + url(r'^stacky/deployments/$', 'stacktach.stacky_server.do_deployments'), + url(r'^stacky/events/$', 'stacktach.stacky_server.do_events'), + url(r'^stacky/hosts/$', 'stacktach.stacky_server.do_hosts'), + url(r'^stacky/uuid/$', 'stacktach.stacky_server.do_uuid'), + url(r'^stacky/timings/$', 'stacktach.stacky_server.do_timings'), + url(r'^stacky/timings/uuid/$', 'stacktach.stacky_server.do_timings_uuid'), + url(r'^stacky/summary/$', 'stacktach.stacky_server.do_summary'), + url(r'^stacky/request/$', 'stacktach.stacky_server.do_request'), + url(r'^stacky/reports/search/$', 'stacktach.stacky_server.do_jsonreports_search'), - url(r'stacky/reports/$', 'stacktach.stacky_server.do_jsonreports'), - url(r'stacky/report/(?P\d+)/$', + url(r'^stacky/reports/$', 'stacktach.stacky_server.do_jsonreports'), + url(r'^stacky/report/(?P\d+)/$', 'stacktach.stacky_server.do_jsonreport'), - url(r'stacky/show/(?P\d+)/$', + url(r'^stacky/show/(?P\d+)/$', 'stacktach.stacky_server.do_show'), - url(r'stacky/watch/(?P\d+)/$', + url(r'^stacky/watch/(?P\d+)/$', 'stacktach.stacky_server.do_watch'), - url(r'stacky/search/$', 'stacktach.stacky_server.search'), - url(r'stacky/kpi/$', 'stacktach.stacky_server.do_kpi'), - url(r'stacky/kpi/(?P\w+)/$', 'stacktach.stacky_server.do_kpi'), - url(r'stacky/usage/launches/$', + url(r'^stacky/search/$', 'stacktach.stacky_server.search'), + url(r'^stacky/kpi/$', 'stacktach.stacky_server.do_kpi'), + url(r'^stacky/kpi/(?P\w+)/$', 'stacktach.stacky_server.do_kpi'), + url(r'^stacky/usage/launches/$', 'stacktach.stacky_server.do_list_usage_launches'), - url(r'stacky/usage/deletes/$', + url(r'^stacky/usage/deletes/$', 'stacktach.stacky_server.do_list_usage_deletes'), - url(r'stacky/usage/exists/$', + url(r'^stacky/usage/exists/$', 'stacktach.stacky_server.do_list_usage_exists'), ) dbapi_urls = ( - url(r'db/usage/launches/$', + url(r'^db/usage/launches/$', 'stacktach.dbapi.list_usage_launches'), - url(r'db/usage/nova/launches/$', + url(r'^db/usage/nova/launches/$', 'stacktach.dbapi.list_usage_launches'), - url(r'db/usage/glance/images/$', + url(r'^db/usage/glance/images/$', 'stacktach.dbapi.list_usage_images'), - url(r'db/usage/launches/(?P\d+)/$', + url(r'^db/usage/launches/(?P\d+)/$', 'stacktach.dbapi.get_usage_launch'), - url(r'db/usage/nova/launches/(?P\d+)/$', + url(r'^db/usage/nova/launches/(?P\d+)/$', 'stacktach.dbapi.get_usage_launch'), - url(r'db/usage/glance/images/(?P\d+)/$', + url(r'^db/usage/glance/images/(?P\d+)/$', 'stacktach.dbapi.get_usage_image'), - url(r'db/usage/deletes/$', + url(r'^db/usage/deletes/$', 'stacktach.dbapi.list_usage_deletes'), - url(r'db/usage/nova/deletes/$', + url(r'^db/usage/nova/deletes/$', 'stacktach.dbapi.list_usage_deletes'), - url(r'db/usage/glance/deletes/$', + url(r'^db/usage/glance/deletes/$', 'stacktach.dbapi.list_usage_deletes_glance'), - url(r'db/usage/deletes/(?P\d+)/$', + url(r'^db/usage/deletes/(?P\d+)/$', 'stacktach.dbapi.get_usage_delete'), - url(r'db/usage/nova/deletes/(?P\d+)/$', + url(r'^db/usage/nova/deletes/(?P\d+)/$', 'stacktach.dbapi.get_usage_delete'), - url(r'db/usage/glance/deletes/(?P\d+)/$', + url(r'^db/usage/glance/deletes/(?P\d+)/$', 'stacktach.dbapi.get_usage_delete_glance'), - url(r'db/usage/exists/$', 'stacktach.dbapi.list_usage_exists'), - url(r'db/usage/nova/exists/$', 'stacktach.dbapi.list_usage_exists'), - url(r'db/usage/glance/exists/$', 'stacktach.dbapi.list_usage_exists_glance'), - url(r'db/usage/exists/(?P\d+)/$', + url(r'^db/usage/exists/$', 'stacktach.dbapi.list_usage_exists'), + url(r'^db/usage/nova/exists/$', 'stacktach.dbapi.list_usage_exists'), + url(r'^db/usage/glance/exists/$', 'stacktach.dbapi.list_usage_exists_glance'), + url(r'^db/usage/exists/(?P\d+)/$', 'stacktach.dbapi.get_usage_exist'), - url(r'db/usage/nova/exists/(?P\d+)/$', + url(r'^db/usage/nova/exists/(?P\d+)/$', 'stacktach.dbapi.get_usage_exist'), - url(r'db/usage/glance/exists/(?P\d+)/$', + url(r'^db/usage/glance/exists/(?P\d+)/$', 'stacktach.dbapi.get_usage_exist_glance'), - url(r'db/confirm/usage/exists/(?P[\w\-]+)/$', + url(r'^db/confirm/usage/exists/(?P[\w\-]+)/$', 'stacktach.dbapi.exists_send_status'), - url(r'db/stats/nova/exists$', + url(r'^db/stats/nova/exists/$', 'stacktach.dbapi.get_usage_exist_stats'), - url(r'db/stats/glance/exists$', + url(r'^db/stats/glance/exists/$', 'stacktach.dbapi.get_usage_exist_stats_glance'), - url(r'db/stats/events', 'stacktach.dbapi.get_event_stats'), - url(r'db/repair/', 'stacktach.dbapi.repair_stacktach_down'), + url(r'^db/stats/events/', 'stacktach.dbapi.get_event_stats'), + url(r'^db/repair/', 'stacktach.dbapi.repair_stacktach_down'), ) urlpatterns = patterns('', *(web_urls + stacky_urls + dbapi_urls))