Changeset 7027

Timestamp:

Jun 30, 2009, 3:47:11 PM (16 years ago)

Author:

roland

Message:

Mainly code cleanup.
Removed some odd import from networkx and fixed it in views.py.

Location:

trunk

Files:

• base.cfg (modified) (4 diffs)
• exodus/settings.py (modified) (1 diff)
• exodus/urls.py (modified) (1 diff)
• exodus/views.py (modified) (5 diffs)

trunk/base.cfg ¶

@@ -1 +1 @@
 [buildout]
 parts = 
-  extras
   django
   testrunner
@@ -7 +6 @@
 
 [versions]
-djangorecipe=0.15
+djangorecipe=0.19.1
+django-extensions=0.4.1
 zc.recipe.egg=1.0.0
 zc.recipe.testrunner=1.0.0
@@ -16 +16 @@
   ${django:eggs}
 extra-paths = 
-  ${django:pythonpath}
   ${buildout:directory}
   ${django:location}
@@ -26 +25 @@
   os.environ['DJANGO_SETTINGS_MODULE'] = 'exodus.development'
 
-[extras]
-recipe = iw.recipe.subversion
-urls =
-  http://django-command-extensions.googlecode.com/svn/trunk@178 django-command-extensions
-
 [django]
 recipe = djangorecipe
-version = 1.0
+version = 1.0.2
 project = exodus
 wsgi = true
 eggs =
   Werkzeug
-pythonpath = 
-  ${extras:location}/django-command-extensions/
-
+  django-extensions
+  networkx
 [supervisor]
 recipe = zc.recipe.egg

trunk/exodus/settings.py ¶

@@ -21 +21 @@
 # AP subnet size
 AP_NETMASK = 26
-# Graph for network
-try:
-    import networkx as nx
-    G = nx.Graph()
-except:
-    G = 'no_networkx'
 # Master super path, set to current working path
 EXODUS_ROOT =  os.path.dirname(__file__)

trunk/exodus/urls.py ¶

@@ -1 +1 @@
 # (c) Roland van Laar
 
-from django.conf.urls.defaults import *
-from exodus.models import *
+from django.conf.urls.defaults import patterns, url
+#from exodus.models import *
 from django.conf import settings
 from django.views.generic.simple import direct_to_template

trunk/exodus/views.py ¶

@@ -9 +9 @@
 
 from exodus.models import Node, Network, Location
-from exodus.settings import G
+import networkx as nx
 
 # Views
@@ -42 +42 @@
     writer.writerow(['name', 'location', 'longitude', 'latitude', 'masterip'])
     for node in nodes:
-        writer.writerow([node.name, node.location.description, node.location.longitude, node.location.latitude, node.masterip])
-
+        writer.writerow([node.name, node.location.description, 
+                         node.location.longitude, node.location.latitude, 
+                         node.masterip])
     return response
 
@@ -53 +54 @@
 
     writer = csv.writer(response)
-    writer.writerow(["iface","node","type","ssid","channel","antenna","polar","direction","mode","ip","netmask","linknode", "linkiface"])
+    writer.writerow(["iface","node","type","ssid","channel","antenna","polar",
+                     "direction","mode","ip","netmask","linknode", 
+                     "linkiface"])
     for node in nodes:
         for nic in node.interface_set.all():
@@ -74 +77 @@
     
     templateFile = version + '/' + file
-    return render_to_response(templateFile, {'node' : node, 'server' : server},\
+    return render_to_response(templateFile, {'node' : node, 'server' : server},
             mimetype='text/plain')
 
-def viewNagios(request, monitor='none'):
+def viewNagios(request, monitor=None):
     nodes = Node.objects.all()
     networks = Network.objects.all()
@@ -87 +90 @@
     viewpoint=monitor
     # check if networkx is available
-    if G == 'no_networkx':
-        monitor = 'none'
-        print 'Networkx is not available'
+    G = nx.Graph()
     #only if monitor is set create a graph to work with
-    if monitor != 'none':
-        G.clear
+    if monitor:
+        G.clear()
         for node in Node.objects.all():
             if node.status == 'up':
                     G.add_node(node.name)
                     for interface in node.interface_set.all():
-                        if interface.mode == 'mn' and interface.link.node.status == 'up':
+                        if interface.mode == 'mn' and \
+                                interface.link.node.status == 'up':
                             G.add_edge(node.name,interface.link.node.name)
     
-    return render_to_response('nagios/exodus.cfg', {'nodes' : nodes, 'networks' : networks, 'locations' : locations, 'viewpoint' : viewpoint}, mimetype='text/plain')
-
-
+    return render_to_response('nagios/exodus.cfg', 
+                              {'nodes' : nodes, 'networks' : networks, 
+                               'locations' : locations, 
+                               'viewpoint' : viewpoint}, 
+                              mimetype='text/plain')