Changeset 6485

Timestamp:

Dec 27, 2008, 10:49:10 PM (16 years ago)

Author:

roland

Message:

Added a readme script and removed linewraps in genesis_to_exodus.
Plus added some comments.

Location:

trunk/exodus/scripts

Files:

• README (added)
• genesis_to_exodus.py (modified) (7 diffs)

trunk/exodus/scripts/genesis_to_exodus.py

@@ -39 +39 @@
 
 def import_interface(interface):
-    isearch = Interface.objects.filter(node__exact=interface['node'], iface__exact=interface['iface'])
+    isearch = Interface.objects.filter(node__exact=interface['node'], \
+            iface__exact=interface['iface'])
     if len(isearch):
         # XXX - should we update existing interfaces ??
@@ -50 +51 @@
     else:
         print 'Can\'t import interface '+interface['iface']
-        print form._errors # XXX - outputs html but this is supposed to be a console script
+        # XXX - outputs html but this is supposed to be a console script
+        print form._errors 
         return None
     return intfmodel.id
 
 def import_antenna(antenna):
-    antsearch = Antenna.objects.filter(type__exact=antenna['type'], gain__exact=antenna['gain'])
+    antsearch = Antenna.objects.filter(type__exact=antenna['type'], 
+            gain__exact=antenna['gain'])
     if len(antsearch):
         return antsearch[0].id
@@ -67 +70 @@
     print """Import script for genesis."""
 
-    # Please do mind to keep all the entries valid, altough some get values get updated
-    dataform ={'name' : 'Foo8', 'location' : '1', 'status' : 'up',  'network' : '1', 'masterip' : '127.0.0.1' }
-
+    # Please do mind to keep all the entries valid, altough some get
+    # values get updated (i.e. mastip, ip, ssid, netmask, mode, channel, 
+    # shortdesc, desc 
+    dataform ={'name' : 'Foo8', 'location' : '1', 'status' : 'up',  
+            'network' : '1', 'masterip' : '127.0.0.1' }
+    import pdb; pdb.set_trace() ;
     networks = { }
     config = ConfigParser.SafeConfigParser(dataform)
-    config.read(argv[len(argv)-1]) # last cmdline argument is supposed to be the config file to use
+    # last cmdline argument is supposed to be the config file to use
+    config.read(argv[len(argv)-1]) 
     sections = config.sections()
     sections.sort()
     for s in sections:
-        if s.find('/') == -1: # get only main node blocks (interface-specific blocks will be accessed later)
+        # get only main node blocks (interface-specific blocks 
+        #will be accessed later)
+        if s.find('/') == -1: 
             node = { }
             for key in dataform:
@@ -88 +97 @@
                     node['location'] = import_location(location)
                 else:
-                    node['location'] = 1 # unknown/unconfigured location has id 1
+                    #XXX: Don't do this, an error should be raised.
+                    # unknown/unconfigured location has id 1
+                    node['location'] = 1 
 
             nodeid = import_node(node)
@@ -96 +107 @@
                     if intf.find(':') == -1: # alias interface
                         cfgsection = node['name']+'/'+intf
-                        if config.has_section(cfgsection): # check for an interface-specific block
+                        # 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', 'accesspoint': False }
+                            interface = { 'iface': intf, 'netmask': 24, 
+                                    'ip': '127.0.0.1', 'mode': 'ms', 
+                                    'polar': '', 'type': 'eth', 
+                                    'accesspoint': False }
 
                             if config.has_option(cfgsection, 'ip'):
@@ -107 +122 @@
                                 else:
                                     interface['ip'] = ip
-                            for key in [ 'type', 'desc', 'ssid', 'channel', 'mode', 'polar' ]:
+                            for key in [ 'type', 'desc', 'ssid', 'channel', 
+                                    'mode', 'polar' ]:
                                 if (config.has_option(cfgsection, key)):
-                                    interface[key] = config.get(cfgsection, key)
+                                    interface[key] = config.get(cfgsection, 
+                                            key)
                             interface['node'] = nodeid
 
@@ -130 +147 @@
                                 else:
                                     networks[ssid]['links'].append(interface);
-                            else: # XXX - should we handle links on not-wifi interfaces?
+                            else: 
+                                # XXX - should we handle links on not-wifi 
+                                # interfaces?
+                                # ROLAND: yes we should
                                 import_interface(interface)