Changeset 074912e

Timestamp:

05/25/11 23:15:39 (2 years ago)

Author:

Tomas Edwardsson <tommi@…>

Branches:

master

Children:

c6075f0

Parents:

18798af (diff), ac3bc8a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Tomas Edwardsson <tommi@…> (05/25/11 23:15:39)

git-committer:

Tomas Edwardsson <tommi@…> (05/25/11 23:15:39)

Message:

Merge branch 'refs/heads/master' of ​http://opensource.ok.is/git/okconfig

Location:

adagios

Files:

• README (added)
• configurator/okconfig/__init__.py (added)
• configurator/views.py (modified) (3 diffs)
• settings.py (modified) (2 diffs)
• urls.py (modified) (1 diff)

adagios/configurator/views.py

@@ -1 @@
-from django.shortcuts import render_to_response
-
+from django.shortcuts import render_to_response, redirect
+from django.core import serializers
+from django.http import HttpResponse, HttpResponseServerError
+from django.utils import simplejson
 
 from doit import *
@@ -6 +8 @@
 def test(request):
         return index(request)
+
+def home(request):
+        return redirect('adagios')
+
 def index(request):
         parse()
@@ -102 +108 @@
 
 
+def api_host(request, host_name=None, ext='xml'):
+        parse()
+        c = {}
+        c['hosts'] = get_hosts()
+                
+                
+        if host_name != None:
+                c['host'] = get_host( host_name )
+                data = ''
+                if ext == 'xml':
+                        import xml.marshal.generic
+                        data = xml.marshal.generic.dumps(c['host'])
+                elif ext == 'html':
+                        return render_to_response('configuration/api/host.html', c)
+                elif ext == 'json':
+                        import json
+                        data = json.dumps(c['host'])
+                else:
+                        return HttpResponseServerError("fle")
+                return HttpResponse(data, mimetype='application/javascript')
+
+        return NotImplementedError
+
+def api_dnslookup(request, host_name=None):
+        import socket
+        
+        raise NotImplementedError
 
 
 
-

adagios/settings.py

@@ -3 +3 @@
 DEBUG = True
 TEMPLATE_DEBUG = DEBUG
+
+# Hack to allow relative template paths
+import os
+djangopath = os.path.abspath('.')
 
 ADMINS = (
@@ -82 +86 @@
     # Always use forward slashes, even on Windows.
     # Don't forget to use absolute paths, not relative paths.
-    '/opt/adagios/templates/',
+    "%s/templates" % (djangopath),
 )
 

adagios/urls.py

@@ -7 +7 @@
 urlpatterns = patterns('',
     # Example:
-     (r'^adagios/$', 'configurator.views.index'),
-     (r'^adagios/configurator$', 'configurator.views.index'),
+    (r'^$', 'configurator.views.home'),
+    (r'^adagios/api/host/(?P<host_name>.*)\.(?P<ext>.+)$', 'configurator.views.api_host'), 
+    (r'^adagios/$', 'configurator.views.index'),
+    (r'^adagios/configurator$', 'configurator.views.index'),
     (r'^adagios/configurator/host$', 'configurator.views.test'),
     (r'^adagios/configurator/host/(?P<host_name>.+)/(?P<service_description>.+)/(?P<field_name>.+)=(?P<new_value>.+)$', 'configurator.views.edit_service'),