Add API version info to api root, add dependency to setup playbook

This commit is contained in:
Michael DeHaan
2013-04-25 13:08:39 -04:00
parent 5c7cab70b7
commit 2a013a5cfe
2 changed files with 10 additions and 3 deletions

View File

@@ -25,6 +25,7 @@
- postgresql # database client - postgresql # database client
- postgresql-server # database server - postgresql-server # database server
- python-psycopg2 # database library - python-psycopg2 # database library
- python-devel # only because pexpect comes from pip
- python-lxml # xml for ?format=xml instead of json (optional) - python-lxml # xml for ?format=xml instead of json (optional)
- name: install python modules from pip - name: install python modules from pip

View File

@@ -21,6 +21,7 @@ from django.contrib.auth.models import User
from lib.main.serializers import * from lib.main.serializers import *
from lib.main.rbac import * from lib.main.rbac import *
from django.core.exceptions import PermissionDenied from django.core.exceptions import PermissionDenied
from django.core.urlresolvers import reverse
from rest_framework import mixins from rest_framework import mixins
from rest_framework import generics from rest_framework import generics
from rest_framework import permissions from rest_framework import permissions
@@ -38,15 +39,20 @@ from base_views import *
class ApiRootView(APIView): class ApiRootView(APIView):
def get(self, request, format=None): def get(self, request, format=None):
data = {} current = reverse(lib.urls.views_ApiV1RootView, args=[])
#data = python_json.dumps(data) data = dict(
description = 'Ansible Commander REST API',
current_version = current,
available_versions = dict(
v1 = current
)
)
return Response(data) return Response(data)
class ApiV1RootView(APIView): class ApiV1RootView(APIView):
def get(self, request, format=None): def get(self, request, format=None):
data = {} data = {}
#data = python_json.dumps(data)
return Response(data) return Response(data)
class AuthTokenView(ObtainAuthToken): class AuthTokenView(ObtainAuthToken):