Changeset 6253

Timestamp:

Sep 8, 2008, 11:28:41 PM (16 years ago)

Author:

roland

Message:

Reworked database model.
According to discussion-08-09-2008.txt

Files:

• doc/discussion-08-09-2008.txt (modified) (1 diff)
• exodus/models.py (modified) (5 diffs)
• exodus/sql/mode.sql (deleted)
• exodus/sql/nictype.sql (deleted)
• exodus/sql/polar.sql (deleted)
• exodus/sql/status.sql (deleted)

doc/discussion-08-09-2008.txt

@@ -49 +49 @@
 - Nic -*> Link -> PublicAP
 - Choice ssid/channel PublicAP precedence
-- Link needed due desc,status,ip,etc
+- Link needed due desc,ip,etc
 - LinkPool, linkID to Link to indentify master
 

exodus/models.py

@@ -6 +6 @@
 # Create your models here.
 
-class NICType(models.Model):
-    type = models.CharField(max_length=10)
+#No need to formalize it; CHOICES don't change much
 
-    def __str__(self):
-        return self.type
+STATUS_CHOICES = ( 
+                        ('up', 'up'),
+                        ('dw', 'down'),
+                        ('pl', 'planned'),
+                        )
 
-class Polar(models.Model):
-    polar = models.CharField(max_length=10)
-    
-    def __str__(self):
-        return self.polar
+POLAR_CHOICES = (
+                        ('hr', 'horizontal'),
+                        ('vr', 'vertical'),
+                        )
 
-class Status(models.Model):
-    status = models.CharField(max_length=200)
-    
-    def __str__(self):
-        return self.status
-
-class Mode(models.Model):
-    mode = models.CharField(max_length=10)
-
-    class Meta:
-        verbose_name = "wifi mode"
-
-    def __str__(self):
-        return self.mode
+INTERFACE_TYPE_CHOICES = (
+                        ('eth', 'eth'),
+                        ('11a', '11a'),
+                        ('11b', '11b'),
+                        ('11g', '11g'),
+                        )
+WIFI_MODE_CHOICES = (
+                        ('ms', 'master'),
+                        ('mn', 'managed'),
+                        )
 
 class Antenna(models.Model):
@@ -49 +46 @@
 
 
-class Network(models.Model):
-    domainname = models.CharField(max_length=50)
-    ipspacestart = models.IPAddressField()
-    netmask = models.IntegerField() 
-
-    def __str__(self):
-        return self.domainname
-
 class DnsServer(models.Model):
         ipaddress = models.IPAddressField( unique=True) 
-        domainname = models.ForeignKey(Network)
+        domainname = models.CharField(max_length=50)
 
         def __str__(self):
                 return self.ipaddress
 
+class Network(models.Model):
+        ipspacestart = models.IPAddressField()
+        netmask = models.IntegerField() 
+        dnsserver = models.ForeignKey(DnsServer)
+
+        def __str__(self):
+                return self.domainname
+
+
 class Node(models.Model):
     name = models.CharField(max_length=30, unique=True)
     location = models.ForeignKey(Location)
-    status = models.ForeignKey(Status,default=1)
+    status = models.CharField(max_length=10, choices=STATUS_CHOICES)
     masterip = models.IPAddressField()
     network = models.ForeignKey(Network,default=1)
@@ -77 +75 @@
         return self.name
 
-class NIC(models.Model): 
-    node = models.ForeignKey(Node)
-    iface = models.CharField(max_length=10,verbose_name="interface")
-    polar = models.ForeignKey(Polar, blank=True, null=True, 
-              verbose_name="polarisation")
-    ssid = models.CharField(max_length=30, blank=True, null=True)
-    mode = models.ForeignKey(Mode, blank=True, null=True)
-    status = models.ForeignKey(Status, default=1)
-    channel = models.IntegerField(blank=True, null=True)
-    antenna = models.ForeignKey(Antenna, blank=True, null=True) 
-    type = models.ForeignKey(NICType)
+class LinkPool(models.Model):
+        netmask = models.IntegerField(default=30)
 
-    def __str__(self):
-        return "%s, %s" % (self.node.name, self.iface)
+class Link(models.Model):
+        ip = models.IPAddressField()
+        shortdesc = models.CharField(max_length=10)
+        desc = models.CharField(max_length=100)
+        linkpool = models.ForeignKey(LinkPool)
 
-class Interlink(models.Model):
-    status = models.ForeignKey(Status,default=1)
-    netmask = models.IntegerField(default=30)
-    iface1 = models.ForeignKey(NIC,related_name='link1')
-    ip1 = models.IPAddressField()
-    iface2 = models.ForeignKey(NIC,related_name='link2')
-    ip2 = models.IPAddressField()
-    shortdesc1 = models.CharField(max_length=10)
-    shortdesc2 = models.CharField(max_length=10)
-    desc1 = models.CharField(max_length=100)
-    desc2 = models.CharField(max_length=100)
+        def __str__(self):
+                return "%s" % (self.shortdesc)
 
-    def __str__(self):
-        return "%s to %s" %(self.iface1, self.iface2)
+class Interface(models.Model): 
+        node = models.ForeignKey(Node)
+        iface = models.CharField(max_length=10, verbose_name="interface")
+        polar = models.CharField(max_length=10, choices=POLAR_CHOICES)
+        ssid = models.CharField(max_length=30, blank=True, null=True)
+        mode = models.CharField(max_length=10, choices=WIFI_MODE_CHOICES)
+        channel = models.IntegerField(blank=True, null=True)
+        antenna = models.ForeignKey(Antenna, blank=True, null=True) 
+        type = models.CharField(max_length=10, choices=INTERFACE_TYPE_CHOICES)
+        links = models.ManyToManyField(Link)
+        
+        def __str__(self):
+                return "%s:%s" % (self.node.name, self.iface)
 
-class Omni(models.Model):
-    iface = models.ForeignKey(NIC,related_name='omni')
-    status = models.ForeignKey(Status,default=1)
+
+        
+class PublicAP(models.Model):
+    iface = models.ForeignKey(Interface)
     ip = models.IPAddressField()
     netmask = models.IntegerField(default=30)
@@ -118 +113 @@
 
     def __str__(self):
-        return "%s %s" % (self.iface.node.name, self.shortdesc)
+        return "%s" % (self.shortdesc)
 
 class DhcpStatic(models.Model):
@@ -124 +119 @@
     macaddress = models.CharField(max_length=17)
     address = models.IPAddressField()
-    omni = models.ForeignKey(Omni)
+    PublicAP = models.ForeignKey(PublicAP)
 
     def __str__(self):