Index: /trunk/Makefile
===================================================================
--- /trunk/Makefile	(revision 6433)
+++ /trunk/Makefile	(revision 6434)
@@ -55,4 +55,8 @@
 	@./bin/test
 
+genesis:
+# import data from exodus
+	@./bin/django runscript genesis_to_exodus
+
 new: clean debug-init debug
 #Fresh start, with new datebase which include debugging code
Index: /trunk/exodus/admin.py
===================================================================
--- /trunk/exodus/admin.py	(revision 6433)
+++ /trunk/exodus/admin.py	(revision 6434)
@@ -4,5 +4,5 @@
 from django import forms
 from exodus.models import *
-from exodus.forms import NodeForm
+from exodus.forms import NodeForm, InterfaceForm
 from exodus.contrib import ReadOnlyAdminFields
 
@@ -16,4 +16,5 @@
 class InterfaceInline(admin.TabularInline):
     model = Interface
+    form = InterfaceForm
     extra = 2 
     fieldsets = (
@@ -41,5 +42,7 @@
 class NodeInline(admin.TabularInline):
     model = Node
+    form = NodeForm
     extra = 2 
+    fieldsets = ('name', 'status', 'location', 'network')
 
 class LocationAdmin(admin.ModelAdmin):
Index: /trunk/exodus/forms.py
===================================================================
--- /trunk/exodus/forms.py	(revision 6433)
+++ /trunk/exodus/forms.py	(revision 6434)
@@ -1,4 +1,4 @@
 from django import forms
-from exodus.models import Node
+from exodus.models import Node, Interface
 from exodus.wllogic import free_master_ip, free_interlink_ip, add_interlink_ip
 from exodus.contrib import ReadOnlyWidget
@@ -10,5 +10,4 @@
 
     def clean_masterip(self):
-        import pdb; pdb.set_trace() ;
         new_network = self.cleaned_data.get('network')
         #XXX: racing conditions with free_master_ip and save()?
@@ -24,8 +23,8 @@
                 #XXX: Need to update ipconfigurations for depending interfaces
                 masterip = free_master_ip(new_network) 
-        raise forms.ValidationError("Foutmelding van Rick en Roland")
         return masterip        
 
-    #def save(self, commit):
-    #    # want to override this, but can't figure out how.
-    #    super(NodeForm, self).save()
+
+class InterfaceForm(forms.ModelForm):
+    class Meta:
+        model = Interface
Index: /trunk/exodus/scripts/genesis_to_exodus.py
===================================================================
--- /trunk/exodus/scripts/genesis_to_exodus.py	(revision 6434)
+++ /trunk/exodus/scripts/genesis_to_exodus.py	(revision 6434)
@@ -0,0 +1,4 @@
+def run():
+    """Import script for genesis data."""
+    print """Import script for genesis."""
+    pass