Changeset 6473 for trunk

Timestamp:

Dec 21, 2008, 2:20:33 AM (16 years ago)

Author:

andrea

Message:

• interfaces and links handling should now be correct. Checks are still needed to determine correctness of imported data

File:

• trunk/exodus/scripts/genesis_to_exodus.py (modified) (6 diffs)

trunk/exodus/scripts/genesis_to_exodus.py

@@ +1 @@
+#
+# Usage: django runscript genesis_to_exodus /path/to/nodes/py.conf
+#
+
 from exodus.forms import NodeForm, LocationForm, InterfaceForm
-from exodus.models import Node, Location, Interface
+from exodus.models import Node, Location, Interface, Antenna
 import ConfigParser
 from sys import argv
@@ -8 +12 @@
     if len(locsearch):
         locmodel = locsearch[0]
-        location = LocationForm(instance=locmodel)
+        # XXX - should we update an existing location with new lat/lon data ?
     else:
         location = LocationForm({ 'description': location['descr'],
             'latitude': location['lat'], 'longitude': location['lon'] })
+        locmodel = location.save()
         print 'Location ' + location['descr'] + 'created'
-        locmodel = location.save()
         if not location.is_valid():
             print location._errors
@@ -27 +31 @@
         form = NodeForm(node)
         if form.is_valid():
+            nodemodel = form.save()
             print 'Node '+node['name']+' created'
-            nodemodel = form.save()
         else:
             print form._errors
@@ -46 +50 @@
     else:
         print 'Can\'t import interface '+interface['iface']
-        print form._errors
+        print form._errors # XXX - outputs html but this is supposed to be a console script
         return None
     return intfmodel.id
 
+def import_antenna(antenna):
+    antsearch = Antenna.objects.filter(type__exact=antenna['type'], gain__exact=antenna['gain'])
+    if len(antsearch):
+        return antsearch[0].id
+    else:
+        newantenna = Antenna(type=antenna['type'], gain=antenna['gain'])
+        newantenna.save()
+        return newantenna.id
 
 def run():
@@ -58 +70 @@
     dataform ={'name' : 'Foo8', 'location' : '1', 'status' : 'up',  'network' : '1', 'masterip' : '127.0.0.1' }
 
+    networks = { }
     config = ConfigParser.SafeConfigParser(dataform)
     config.read(argv[len(argv)-1]) # last cmdline argument is supposed to be the config file to use
@@ -81 +94 @@
                 interfaces = config.get(s, 'interfaces')
                 for intf in interfaces.split(','):
-                    cfgsection = node['name']+'/'+intf
-                    if config.has_section(cfgsection): # check for an interface-specific block
-                        # interface defaults
-                        interface = { 'iface': intf, 'netmask': 24, 'ip': '127.0.0.1', 'mode': 'ms' }
+                    if intf.find(':') == -1: # alias interface
+                        cfgsection = node['name']+'/'+intf
+                        if config.has_section(cfgsection): # check for an interface-specific block
+                            # interface defaults
+                            interface = { 'iface': intf, 'netmask': 24, 'ip': '127.0.0.1', 'mode': 'ms', 'polar': '', 'type': 'eth', 'accesspoint': False }
 
-                        if config.has_option(cfgsection, 'ip'):
-                            ip = config.get(cfgsection, 'ip')
-                            if ip.find('/') >= 0:
-                                interface['ip'] = ip.split('/')[0]
-                                interface['netmask'] = ip.split('/')[1]
-                            else:
-                                interface['ip'] = ip
-                        for key in [ 'type', 'desc', 'ssid', 'channel', 'mode']:
-                            if (config.has_option(cfgsection, key)):
-                                interface[key] = config.get(cfgsection, key)
-                        if interface['mode'] == 'master':
-                            interface['accesspoint'] = 1
-                        interface['node'] = nodeid
-                        import_interface(interface)
+                            if config.has_option(cfgsection, 'ip'):
+                                ip = config.get(cfgsection, 'ip')
+                                if ip.find('/') >= 0:
+                                    interface['ip'] = ip.split('/')[0]
+                                    interface['netmask'] = ip.split('/')[1]
+                                else:
+                                    interface['ip'] = ip
+                            for key in [ 'type', 'desc', 'ssid', 'channel', 'mode', 'polar' ]:
+                                if (config.has_option(cfgsection, key)):
+                                    interface[key] = config.get(cfgsection, key)
+                            interface['node'] = nodeid
 
+                            # handle Antenna
+                            # XXX - disabled because it seems to me that genesis doesn't have complete info on equipped antennas
+                            #if config.has_option(cfgsection, 'antenna') and config.has_option(cfgsection, 'gain'):
+                            #    antenna = config.get(cfgsection, 'antenna')
+                            #    gain = config.get(cfgsection, 'gain')
+                            #    if antenna and gain: # ensure we have both antenna type and gain otherwise model will complain
+                            #        interface['antenna'] = import_antenna({ 'type': antenna, 'gain': gain })
+
+                            # handle wifi links
+                            if config.has_option(cfgsection, 'ssid'):
+                                ssid = interface['ssid']
+                                if ssid not in networks:
+                                    networks[ssid] = { 'links': [] }
+                                if interface['mode'] == 'ms':
+                                    interface['accesspoint'] = 1
+                                    networks[ssid]['master'] = import_interface(interface)
+                                else:
+                                    networks[ssid]['links'].append(interface);
+                            else: # XXX - should we handle links on not-wifi interfaces?
+                                import_interface(interface)
+
+    # now we have already created all nodes and master interfaces... 
+    # let's continue configuring all wifi links!
+    # XXX - Note we need to add links later to ensure having all 'master nodes' 
+    #       already configured and their interfaces (id) can be used to define the link.
+    #       if done while processing the input file , it could happens to process managed
+    #       interfaces sooner than their master ones and it's more convenient to just add
+    #       links later (once we have already configured all master interfaces) instead of
+    #       trying to update interfaces progressively
+    for ssid in networks:
+        for interface in networks[ssid]['links']:
+            if 'master' in networks[ssid]:
+                interface['link'] = networks[ssid]['master']
+                import_interface(interface)
+            else:
+                print "No master defined for network " + ssid
     pass