Changeset 6486

Timestamp:

Dec 28, 2008, 12:34:42 AM (16 years ago)

Author:

roland

Message:

Updated genesis_to_exodus.py with some stuff.
Fixed a bug, and rewrote code, added comments.

Location:

trunk/exodus/scripts

Files:

• README (modified) (1 diff)
• genesis_to_exodus.py (modified) (11 diffs)

trunk/exodus/scripts/README

@@ -3 +3 @@
 $ svn co http://svn.wirelessleiden.nl/svn/node-config/genesis $SVNROOT
 $ cd $SVNROOT/nodes
+# make sure that unused nodes aren't in the py.conf file
 $ for file in */wleiden.conf; do ./genesis-to-py.pl $file; done > py.conf
 $ cd  

trunk/exodus/scripts/genesis_to_exodus.py

@@ -14 +14 @@
         # XXX - should we update an existing location with new lat/lon data ?
     else:
-        location = LocationForm({ 'description': location['descr'],
+        # XXX: you were overwriting location, which meant that the dict
+        #      location was overwritten.
+        loc = LocationForm({ 'description': location['descr'],
             'latitude': location['lat'], 'longitude': location['lon'] })
-        locmodel = location.save()
-        print 'Location ' + location['descr'] + 'created'
-        if not location.is_valid():
+        if not loc.is_valid():
             print location._errors
             return None
+        locmodel = loc.save()
+        print 'Location ' + location['descr'] + 'created'
     return locmodel.id
 
@@ -26 +28 @@
     nodesearch = Node.objects.filter(name__exact=node['name'])
     if len(nodesearch):
+        # XXX: Add check that len == 1, else multiple nodes with the same
+        # name could exist and the wrong one might be returned 
         print 'Node '+node['name']+' already exists'
         nodemodel = nodesearch[0]
@@ -75 +79 @@
     dataform ={'name' : 'Foo8', 'location' : '1', 'status' : 'up',  
             'network' : '1', 'masterip' : '127.0.0.1' }
-    import pdb; pdb.set_trace() ;
     networks = { }
     config = ConfigParser.SafeConfigParser(dataform)
@@ -84 +87 @@
     for s in sections:
         # get only main node blocks (interface-specific blocks 
-        #will be accessed later)
-        if s.find('/') == -1: 
+        # will be accessed later)
+        if not '/' in s : 
             node = { }
             for key in dataform:
@@ -92 +95 @@
                 location = { }
                 location['descr'] = config.get(s, 'location')
-                if location['descr']:
+                if location.has_key('descr'):
                     location['lat'] = config.get(s, 'latitude')
                     location['lon'] = config.get(s, 'longitude')
@@ -105 +108 @@
                 interfaces = config.get(s, 'interfaces')
                 for intf in interfaces.split(','):
-                    if intf.find(':') == -1: # alias interface
+                    if not ':' in intf: # discard alias interface
                         cfgsection = node['name']+'/'+intf
                         # check for an interface-specific block
                         if config.has_section(cfgsection): 
                             # interface defaults
-                            interface = { 'iface': intf, 'netmask': 24, 
-                                    'ip': '127.0.0.1', 'mode': 'ms', 
-                                    'polar': '', 'type': 'eth', 
+                            interface = { 'iface': intf, 'netmask': 32,
+                                    'ip': '127.0.0.1', 'mode': 'ms',
+                                    'polar': '', 'type': 'eth',
                                     'accesspoint': False }
 
+                            #XXX: this section can be discarded because
+                            #     there is no need to import ips.
                             if config.has_option(cfgsection, 'ip'):
                                 ip = config.get(cfgsection, 'ip')
@@ -122 +127 @@
                                 else:
                                     interface['ip'] = ip
+                            
                             for key in [ 'type', 'desc', 'ssid', 'channel', 
                                     'mode', 'polar' ]:
@@ -128 +134 @@
                                             key)
                             interface['node'] = nodeid
+
+                            # XXX: The genesis data is complete, the type of 
+                            #      antenna needs to be passed on.
+                            #      it's probably better 
 
                             # handle Antenna
@@ -143 +153 @@
                                     networks[ssid] = { 'links': [] }
                                 if interface['mode'] == 'ms':
+                                    #XXX: if dhcp != 'no' accesspoint = 1
                                     interface['accesspoint'] = 1
                                     networks[ssid]['master'] = import_interface(interface)
@@ -150 +161 @@
                                 # XXX - should we handle links on not-wifi 
                                 # interfaces?
-                                # ROLAND: yes we should
+                                # XXX: yes we should
                                 import_interface(interface)
 
@@ -161 +172 @@
     #       links later (once we have already configured all master interfaces) instead of
     #       trying to update interfaces progressively
+
+    # XXX:this needn't be done, because exodus defines the ssid.
     for ssid in networks:
         for interface in networks[ssid]['links']: