From 2a013a5cfe12262c60a2c6dd1450c38b787fb44e Mon Sep 17 00:00:00 2001 From: Michael DeHaan Date: Thu, 25 Apr 2013 13:08:39 -0400 Subject: [PATCH] Add API version info to api root, add dependency to setup playbook --- app_setup/setup.yml | 1 + lib/main/views.py | 12 +++++++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/app_setup/setup.yml b/app_setup/setup.yml index f233f2b70d..8e44d74347 100644 --- a/app_setup/setup.yml +++ b/app_setup/setup.yml @@ -25,6 +25,7 @@ - postgresql # database client - postgresql-server # database server - python-psycopg2 # database library + - python-devel # only because pexpect comes from pip - python-lxml # xml for ?format=xml instead of json (optional) - name: install python modules from pip diff --git a/lib/main/views.py b/lib/main/views.py index b2dab5862e..8b0feff570 100644 --- a/lib/main/views.py +++ b/lib/main/views.py @@ -21,6 +21,7 @@ from django.contrib.auth.models import User from lib.main.serializers import * from lib.main.rbac import * from django.core.exceptions import PermissionDenied +from django.core.urlresolvers import reverse from rest_framework import mixins from rest_framework import generics from rest_framework import permissions @@ -38,15 +39,20 @@ from base_views import * class ApiRootView(APIView): def get(self, request, format=None): - data = {} - #data = python_json.dumps(data) + current = reverse(lib.urls.views_ApiV1RootView, args=[]) + data = dict( + description = 'Ansible Commander REST API', + current_version = current, + available_versions = dict( + v1 = current + ) + ) return Response(data) class ApiV1RootView(APIView): def get(self, request, format=None): data = {} - #data = python_json.dumps(data) return Response(data) class AuthTokenView(ObtainAuthToken):