Changeset 6454

Timestamp:

Dec 13, 2008, 9:38:07 AM (16 years ago)

Author:

roland

Message:

First try for an ipcalc module for WL.

Location:

trunk/exodus

Files:

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

trunk/exodus/forms.py

@@ -118 +118 @@
         else:
             return link
+
+    #XXX: change SSID when iface.name changes    

trunk/exodus/models.py

@@ -126 +126 @@
         return "%s/%s" % (self.node, self.iface)
 
+    def save(self, force_insert=False, force_update=False):
+        super(Interface, self).save(force_insert, force_update)
+        # If link is not defined we link to self.
+        #XXX: need to assign an IP address in forms.
+        if not self.link:
+            self.link = self
+            super(Interface, self).save(force_insert, force_update)
+        
+
 #
 # XXX: Currently not used, require rethinking wether we _really_ still needs
 # this feature as we going to use a new interlink IP naming model
-class InterfaceAlias(models.Model):
-    iface = models.ForeignKey(Interface,related_name='child')
-    ip = models.IPAddressField(unique=True)
-    netmask = models.IntegerField(default=30)
-    shortdesc = models.CharField(blank=True, max_length=10)
-    desc = models.CharField(blank=True, max_length=100)
-    linkAlias = models.ForeignKey('self', blank=True, null=True)
-    link = models.ForeignKey(Interface, blank=True, null=True)
-   
-    def __unicode__(self):
-        return "Alias %s" % (self.iface)
-
+#class InterfaceAlias(models.Model):
+#    iface = models.ForeignKey(Interface,related_name='child')
+#    ip = models.IPAddressField(unique=True)
+#    netmask = models.IntegerField(default=30)
+#    shortdesc = models.CharField(blank=True, max_length=10)
+#    desc = models.CharField(blank=True, max_length=100)
+#    linkAlias = models.ForeignKey('self', blank=True, null=True)
+#    link = models.ForeignKey(Interface, blank=True, null=True)
+#   
+#    def __unicode__(self):
+#        return "Alias %s" % (self.iface)
+#
 #
 # XXX: Needs rethinking, dhcp[start|stop] could be removed if whole publicAP is
@@ -165 +174 @@
     macaddress = models.CharField(max_length=17)
     address = models.IPAddressField()
-    PublicAP = models.ForeignKey(Interface)
+    public_accesspoint = models.ForeignKey(Interface)
+
 
     class Meta:

trunk/exodus/wllogic.py

@@ -175 +175 @@
                 return 32       
         return int(32) - int(ceil(log(number_ifaces+2,2)))
+
+
+