Changeset 6601 for trunk

Timestamp:

Jan 13, 2009, 9:50:17 PM (16 years ago)

Author:

roland

Message:

Script imports just one antenna type, namely exodus import with 0 gain.

File:

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

trunk/exodus/scripts/genesis_to_exodus.py

@@ -69 +69 @@
     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():
     """Import script for genesis data."""
@@ -88 +78 @@
     dataform ={'name' : 'Foo8', 'location' : '1', 'status' : 'up',  
             'network' : '1', 'masterip' : '127.0.0.1' }
+    # define a special antenna type for genesis to exodus import
+    newantenna = Antenna.objects.create(type='exodus import', gain=0)
     networks = {}
     ethernet = []
     conn = sqlite3.connect(':memory:')
     cursor = conn.cursor()
-    cursor.execute('CREATE TABLE ifaceip (id INTEGER PRIMARY KEY, iface VARCHAR(20), ip VARCHAR(20))')
+    cursor.execute('CREATE TABLE ifaceip (id INTEGER PRIMARY KEY, '
+            'iface VARCHAR(20), ip VARCHAR(20))')
     config = ConfigParser.SafeConfigParser(dataform)
     # last cmdline argument is supposed to be the config file to use
@@ -154 +147 @@
                                     config.has_option(cfgsection, 'mode') and \
                                     config.get(cfgsection, 'mode') == 'ms':
-                                interface['direction'] = config.get(cfgsection, 'compass-direction')
+                                interface['direction'] = config.get(
+                                        cfgsection, 'compass-direction')
                             else:
                                 interface['direction'] = ''
@@ -160 +154 @@
                             if config.has_option(cfgsection, 'extra_type'):                                     interface['ethernet_to_wifi'] = 1 
 
-                            # XXX: The genesis data is complete, the type of 
-                            #      antenna needs to be passed on.
-                            #      it's probably better to define the types
-                            #      beforehand.
-
                             # 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 })
+                            if config.has_option(cfgsection, 'antenna') and \
+                                    config.has_option(cfgsection, 'gain'):
+                                antenna = config.get(cfgsection, 'antenna')
+                                gain = config.get(cfgsection, 'gain')
+                                # ensure we have both antenna type and gain 
+                                # otherwise model will complain
+
+                                if antenna and gain: 
+                                    interface['antenna'] = newantenna.id
 
                             # handle wifi links
@@ -182 +174 @@
                                     networks[ssid] = { 'links': [] }
                                 if interface['mode'] == 'ms':
-                                    #XXX: if dhcp != 'no' accesspoint = 1
-                                    # fixed this above.
-                                    #interface['accesspoint'] = 1
-                                    networks[ssid]['master'] = import_interface(interface)
+                                    networks[ssid]['master'] = \
+                                            import_interface(interface)
                                 else:
                                     networks[ssid]['links'].append(interface)
                             else: 
-                                # XXX - should we handle links on not-wifi 
-                                # interfaces?
-                                # XXX: yes we should
+                                #just import ethernet interfaces
                                 import_interface(interface)
-                                pass
-#
-#                #ethernet stuff
-#                for intf in interfaces.split(','):
-#                    cfgsection = node['name']+'/'+intf
-#                    # build a list of all ethernet interfaces
-#                    if config.has_section(cfgsection) and \
-#                            config.get(cfgsection, 'type') == 'eth' and \
-#                            config.has_option(cfgsection, 'ip'): 
-#                        ethernet.append(cfgsection)
-#                        cursor.execute('insert INTO ifaceip VALUES '
-#                                '(null, ?, ?)', ( cfgsection, 
-#                                config.get(cfgsection, 'ip').rsplit('/')[0])) 
-#                        
-#                    conn.commit()
-#
-#    non_alias = (i for i in ethernet if not ":" in i)
-#    for i in non_alias:
-#        for j in [ k for k in ethernet if k.startswith(i)]:
-#            if config.has_section(j) and \
-#                    config.has_option(j, 'point_to_point'):
-#                p2p = config.get(j, 'point_to_point')
-#                cursor.execute('SELECT iface FROM ifaceip where ip = ?', (p2p,))
-#                print "%s has link to %s" %( j, cursor.fetchall())
-#                
-             
-
+
+                #ethernet stuff
+                for intf in interfaces.split(','):
+                    cfgsection = node['name']+'/'+intf
+                    # build a list of all ethernet interfaces
+                    if config.has_section(cfgsection) and \
+                            config.get(cfgsection, 'type') == 'eth' and \
+                            config.has_option(cfgsection, 'ip'): 
+                        ethernet.append(cfgsection)
+                        cursor.execute('insert INTO ifaceip VALUES '
+                                '(null, ?, ?)', ( cfgsection, 
+                                config.get(cfgsection, 'ip').rsplit('/')[0])) 
+                        
+                    conn.commit()
+
+    non_alias = (i for i in ethernet if not ":" in i)
+    for i in non_alias:
+        for j in [ k for k in ethernet if k.startswith(i)]:
+            if config.has_section(j) and \
+                    config.has_option(j, 'point_to_point'):
+                p2p = config.get(j, 'point_to_point')
+                cursor.execute('SELECT iface FROM ifaceip where ip = ?', (p2p,))
+                print "%s has link to %s" %( j, cursor.fetchall())
+                
     # 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
-
-    # XXX: my initial thought was that you defined the ssid here, but
-    #      you use it to determine who is the master and this seems to work
-    #      well.
+    # 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']:
@@ -239 +225 @@
             else:
                 print "No master defined for network " + ssid
-    pass