Changeset 6421 for branches/exodus-roland

Timestamp:

Dec 10, 2008, 7:48:07 AM (16 years ago)

Author:

roland

Message:

Added modelForm with specific WL save function.

Location:

branches/exodus-roland/exodus

Files:

• forms.py (modified) (1 diff)
• models.py (modified) (2 diffs)

branches/exodus-roland/exodus/forms.py

@@ -5 +5 @@
 
 class NodeForm(forms.ModelForm):
+    #masterip = forms.IPAddressField(widget=forms.HiddenInput)
     class Meta:
        model = Node
+
+    def clean_masterip(self):
+        import pdb; pdb.set_trace() ;
+        masterip = self.cleaned_data.get('masterip')
+        if self.instance.pk is None:
+            masterip = free_masterip()
+        if masterip:
+            pass
+            
+            
+        masterip = self.cleaned_data.get('masterip')
+    def save(self, commit=True):
+        import pdb; pdb.set_trace() ;
+        

branches/exodus-roland/exodus/models.py

@@ -79 +79 @@
     status = models.CharField(max_length=10, choices=STATUS_CHOICES , \
         default='up')
+    network = models.ForeignKey(Network,default=1)
     masterip = models.IPAddressField(unique=True)
-    network = models.ForeignKey(Network,default=1)
  
     class Meta:
@@ -89 +89 @@
         return self.name
 
-    def save(self, force_insert=False, force_update=False):
-        #XXX: Maybe move this to a model form, 
-        from wllogic import free_masterip
-        # check if there is a masterip, if not generate one.
-        # check if there is a network change, if so, generate a new masterip.
-        if self.masterip:
-            old = Node.objects.get(pk=self.pk)
-            if old.network != self.network:
-                self.masterip = free_masterip(self.network)
-        else:
-            self.masterip = free_masterip(self.network)
-        super(Node, self).save(force_insert, force_update)
+   # def save(self, force_insert=False, force_update=False):
+   #     #XXX: could there be racing conditions?
+   #     #XXX: Maybe move this to a model form, 
+   #     from wllogic import free_masterip
+   #     # check if there is a masterip, if not generate one.
+   #     # check if there is a network change, if so, generate a new masterip.
+   #     if self.masterip:
+   #         old = Node.objects.get(pk=self.pk)
+   #         if old.network != self.network:
+   #             self.masterip = free_masterip(self.network)
+   #     else:
+   #         self.masterip = free_masterip(self.network)
+   #     super(Node, self).save(force_insert, force_update)
 
 class Interface(models.Model):