Changeset 6487

Timestamp:

Dec 28, 2008, 1:16:26 AM (16 years ago)

Author:

roland

Message:

Updated comments for Andrea in genesis_to_exodus.

Location:

trunk/exodus/scripts

Files:

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

trunk/exodus/scripts/README

@@ -14 +14 @@
 
 $ cd $EXODUSROOT
-$ ./bin/django runscript genesis_to_exodus /PATH/TO/py.conf
+$ ./bin/django runscript genesis_to_exodus --verbosity=2 --traceback /PATH/TO/py.conf

trunk/exodus/scripts/genesis_to_exodus.py

@@ -19 +19 @@
             'latitude': location['lat'], 'longitude': location['lon'] })
         if not loc.is_valid():
-            print location._errors
+            for i in loc.errors.keys():
+                print loc.errors[i][0]
             return None
         locmodel = loc.save()
-        print 'Location ' + location['descr'] + 'created'
+        print 'Location ' + location['descr'] + ' created'
     return locmodel.id
 
@@ -38 +39 @@
             print 'Node '+node['name']+' created'
         else:
-            print form._errors
+            for i in form.errors.keys():
+                print form.errors[i][0]
             return None
     return nodemodel.id
@@ -56 +58 @@
         print 'Can\'t import interface '+interface['iface']
         # XXX - outputs html but this is supposed to be a console script
-        print form._errors 
+        #       fixed output to text.
+        for i in form.errors.keys():
+            print form.errors[i][0]
         return None
     return intfmodel.id
@@ -137 +141 @@
                             # XXX: The genesis data is complete, the type of 
                             #      antenna needs to be passed on.
-                            #      it's probably better 
+                            #      it's probably better to define the types
+                            #      beforehand.
 
                             # handle Antenna
@@ -148 +153 @@
 
                             # handle wifi links
+                            dhcp = config.get(cfgsection, 'dhcp')
+                            if dhcp != 'no':
+                                interface['accesspoint'] = True
                             if config.has_option(cfgsection, 'ssid'):
                                 ssid = interface['ssid']
@@ -154 +162 @@
                                 if interface['mode'] == 'ms':
                                     #XXX: if dhcp != 'no' accesspoint = 1
-                                    interface['accesspoint'] = 1
+                                    # fixed this above.
+                                    #interface['accesspoint'] = 1
                                     networks[ssid]['master'] = import_interface(interface)
                                 else:
-                                    networks[ssid]['links'].append(interface);
+                                    networks[ssid]['links'].append(interface)
                             else: 
                                 # XXX - should we handle links on not-wifi 
@@ -163 +172 @@
                                 # XXX: yes we should
                                 import_interface(interface)
+                                pass
+
 
     # now we have already created all nodes and master interfaces... 
@@ -173 +184 @@
     #       trying to update interfaces progressively
 
-    # XXX:this needn't be done, because exodus defines the ssid.
+    # 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.
     for ssid in networks:
         for interface in networks[ssid]['links']: