Changeset 6471

Timestamp:

Dec 21, 2008, 2:05:22 AM (16 years ago)

Author:

andrea

Message:

• bugfix in InterfaceForm::clean_ip() :

when dealing with ethernet interfaces (and more in general
with 'not-ap' and 'not-link' ones) an IPCalc object was
returned instead of returning an actual ip address, causing
the underlying model implementation to fail (since it wasn't
a supported datatype to be used in queries).

File:

• trunk/exodus/forms.py (modified) (2 diffs)

trunk/exodus/forms.py ¶

@@ -167 +167 @@
         ap = self.cleaned_data.get('accesspoint')
         edit = bool(self.instance.pk)
+
+        if not link_is_wireless(self):
+            return ip
+
         # if we have an error, we don't calculate new ip addresses.
-        import pdb; pdb.set_trace() ;
+        #import pdb; pdb.set_trace() ;
         if self._errors:
             return ip
@@ -187 +191 @@
         #XXX: and not accespoint
         if not link and not ap:
-            ip = IPCalc(node, 32) 
             self.data['netmask'] = 32
-            return ip
+            try:
+                new_ip = IPCalc(node, 32)
+            except Exception:
+                return ip    
+            return new_ip.ips[0]
 
         return ip