Changeset 6242

Timestamp:

Sep 3, 2008, 3:11:38 PM (16 years ago)

Author:

roland

Message:

added comment about omni check.
used {% now %} in template, no need to use object.date in views.py

Files:

• TODO (modified) (1 diff)
• exodus/templates/dhcpd.conf (modified) (1 diff)
• exodus/templates/named.conf (modified) (1 diff)
• exodus/templates/rc-local.txt (modified) (1 diff)
• exodus/templates/rc-node-local.txt (modified) (1 diff)
• exodus/templates/resolv.conf (modified) (1 diff)
• exodus/views.py (modified) (7 diffs)

TODO

@@ -23 +23 @@
         ->Put correct modes on NIC
         ->Check that: freeinterlinkip() works going from 17.16.0.255 to 172.16.1.0
+        ->Check if 1 has an omni, omni needs to be master
         
 

exodus/templates/dhcpd.conf

@@ -1 +1 @@
 # The file is WirelessLeiden specific. Please make all changes in exodus
 #
-# Generated on {{ object.date.day }}-{{ object.date.month }}-{{ object.date.year }} 
+# Generated on {% now "G:i j-n-Y" %} 
 # by {{ object.host }}
 #

exodus/templates/named.conf

@@ -1 +1 @@
 # The file is WirelessLeiden specific. Please make all changes in exodus
 #
-# Generated on {{ object.date.day }}-{{ object.date.month }}-{{ object.date.year }} 
+# Generated on {% now "G:i j-n-Y" %} 
 # by {{ object.host }}
 #

exodus/templates/rc-local.txt

@@ -1 +1 @@
 # The file is WirelessLeiden specific. Please make all changes in exodus
 #
-# Generated on {{ object.date.day }}-{{ object.date.month }}-{{ object.date.year }} 
+# Generated on {% now "G:i j-n-Y" %} 
 # by {{ object.host }}
 #

exodus/templates/rc-node-local.txt

@@ -1 +1 @@
 # The file is WirelessLeiden specific. Please make all changes in exodus
 #
-# Generated on {{ object.date.day }}-{{ object.date.month }}-{{ object.date.year }} 
+# Generated on {% now "G:i j-n-Y" %} 
 # by {{ object.host }}
 #

exodus/templates/resolv.conf

@@ -2 +2 @@
 # next door interlink nighboors to be specified, in case of own DNS failures
 #
-# Generated on {{ object.date.day }}-{{ object.date.month }}-{{ object.date.year }} 
+# Generated on {% now "G:i j-n-Y" %} 
 # by {{ object.host }}
 #

exodus/views.py

@@ -5 +5 @@
 from django.shortcuts import render_to_response
 from django import forms
-from datetime import datetime
 from socket import gethostname 
 
@@ -105 +104 @@
                                 return render_to_response('addinterlink.html',{'form': form, 'error_message' : errorMessage })
                         #XXX :if wifi: check master and managed states for existings NICs/Interlinks
+                        #XXX :check if omni, than Nic must be in master mode
                         #Generate SSID
                         # add descriptions
@@ -145 +145 @@
 
         #Some extra values for statictics info
-        object.date = datetime.now()
         object.name = Node.objects.get(pk=object_id).name
         object.host = gethostname()
@@ -170 +169 @@
     object_id = nodename_to_id(object_id)
     object = Node.objects.get(pk=object_id)
-    object.date = datetime.now()
     object.name = Node.objects.get(pk=object_id).name
     object.host = gethostname()
@@ -193 +191 @@
         object_id = nodename_to_id(object_id)
 
-        object.date = datetime.now()
         object.name = Node.objects.get(pk=object_id).name
         object.host = gethostname()
@@ -208 +205 @@
         
         object = Node.objects.get(pk=object_id).nic_set.all()
-        object.date = datetime.now()
         object.name = Node.objects.get(pk=object_id).name
         object.host = gethostname()
@@ -224 +220 @@
         
         object = Node.objects.get(pk=object_id).nic_set.all()
-        object.date = datetime.now()
         object.name = Node.objects.get(pk=object_id).name
         object.host = gethostname()