Changeset 6548

Timestamp:

Jan 4, 2009, 10:56:22 AM (16 years ago)

Author:

roland

Message:

Fixed a bug regarding hostname check.
Added debug lines in genesis_to_exodus, when an error happens
during import. Added sqlite to easily make a list of point_to_point
connections for ethernet. Ethernet interface links will probably have to
be added manually later on because not all ethernet links have p_t_p
links, and it's probably to much work to check the subnets.

Location:

trunk/exodus

Files:

• forms.py (modified) (1 diff)
• scripts/genesis_to_exodus.py (modified) (6 diffs)

trunk/exodus/forms.py

@@ -20 +20 @@
         name = self.cleaned_data.get('name')
         re_name = re.compile('[0-9a-zA-Z-]+')
-        if not re_name.match(name) or re_name.match(name) != name:
+        if not re_name.match(name) or re_name.match(name).group() != name:
+            print name
             raise forms.ValidationError(
-                    'Not a valid name. Use letters, digits and -.')
+                    'Not a Node valid name. Use letters, digits and -.')
         return name
 

trunk/exodus/scripts/genesis_to_exodus.py

@@ -6 +6 @@
 from exodus.models import Node, Location, Interface, Antenna
 import ConfigParser
+import sqlite3
 from sys import argv
 
@@ -21 +22 @@
             for i in loc.errors.keys():
                 print loc.errors[i][0]
+                print loc
+            import pdb; pdb.set_trace() ;
             return None
         locmodel = loc.save()
@@ -41 +44 @@
             for i in form.errors.keys():
                 print form.errors[i][0]
+            import pdb; pdb.set_trace() ;
             return None
     return nodemodel.id
@@ -61 +65 @@
         for i in form.errors.keys():
             print form.errors[i][0]
+        import pdb; pdb.set_trace() ;
         return None
     return intfmodel.id
@@ -83 +88 @@
     dataform ={'name' : 'Foo8', 'location' : '1', 'status' : 'up',  
             'network' : '1', 'masterip' : '127.0.0.1' }
-    networks = { }
+    networks = {}
+    ethernet = []
+    conn = sqlite3.connect(':memory:')
+    cursor = conn.cursor()
+    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
@@ -183 +192 @@
                                 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()
+
+    import pdb; pdb.set_trace() ;
+    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 cursor.fetchone()
+                
+             
 
     # now we have already created all nodes and master interfaces...