Changeset 6210

Timestamp:

Aug 16, 2008, 1:54:46 AM (16 years ago)

Author:

RIck van der Zwet

Message:

Final commit for this morning, made sure node-detail is displaying data and newSSID is working properly

Location:

exodus

Files:

• sql/mode.sql (modified) (1 diff)
• templates/node-detail.html (modified) (1 diff)
• views.py (modified) (4 diffs)
• wllogic.py (modified) (1 diff)

exodus/sql/mode.sql

@@ -1 @@
-INSERT INTO exodus_mode VALUES ( 1, 'managed');
-INSERT INTO exodus_mode VALUES ( 2, 'ad-hoc');
-INSERT INTO exodus_mode VALUES ( 3, 'master'); 
+INSERT INTO exodus_mode VALUES ( 1, 'master');
+INSERT INTO exodus_mode VALUES ( 2, 'managed');

exodus/templates/node-detail.html

@@ -5 +5 @@
 
 <div>
-
-Location: {{ object.location.description }} <br>
-X: {{ object.location.coordinateX }} <br>
-Y: {{ object.location.coordinateY }} <br>
+<h3> Location </h3>
+Description: {{ object.location.description }} <br>
+Longitude: {{ object.location.longitude }} <br>
+Latitude: {{ object.location.latitude }} <br>
 
 Master ip: {{ object.masterip }}

exodus/views.py

@@ -9 +9 @@
 
 from exodus.models import *
-from exodus.wllogic import freemasterip, newssidname
+from exodus.wllogic import freemasterip, newSSIDName
 
 class AddLocationForm(forms.ModelForm):
@@ -54 +54 @@
                         instance  = form.save(commit=False)
                         if str(instance.type) != "eth":
-                                print instance.iface
-#                               instance.ssid = newssidname(instance.node.name,
-#                                       instance.iface)
+                                instance.ssid = newSSIDName(instance.node, instance.iface, 'unused')
                                 instance.channel = '1'
                                 instance.mode = Mode(pk=1) # set to master
@@ -76 +74 @@
                         instance  = form.save(commit=False)
                         if str(instance.iface1.type) != "eth":
-                                print instance.iface
-                                instance.ssid = newssidname(instance.node.name,
-                                        instance.iface)
+                                instance.ssid = newSSIDName(instance.node,
+                                        instance.iface,'il')
                                 instance.channel = '1'
                                 instance.mode = Mode(pk=1) # set to master
@@ -97 +94 @@
                 form = addOmniForm(request.POST)
                 if form.is_valid():
-                        instance  = form.save(commit=False)
+                        instance = form.save(commit=False)
+                        instance.ssid = newSSIDName(instance.iface.node, instance.iface, 'omni')
                         instance.save()
                         return HttpResponseRedirect("/exodus/")

exodus/wllogic.py

@@ -3 +3 @@
 from exodus.models import Node, Network
 
-def newssidname(node,desc):
+def newSSIDName(node, nic, desc):
         """Generates a new ssid name for a new wifi NIC"""
 
-        return "%s.%s.%s" % (desc, Node.objects.get(pk=node).name,
-                                Node.objects.get(pk=node).network.domainname)
+        return "%s-%s.%s.%s" % (desc, nic.iface, node.name, node.network.domainname)
 
-def newname(test):
-        return "%s.%s.%s" % ( test, test, test )
 #
 # Taken from lvoege@gmail.com's getrange.py