Changeset 6191


Ignore:
Timestamp:
Aug 14, 2008, 8:37:52 PM (17 years ago)
Author:
RIck van der Zwet
Message:

Not able to add a node was caused due the fact ssid generation, which
apparently happens on creation was using the network domain name, which was not
implemented yet :-)

Files:
1 added
4 edited

Legend:

Unmodified
Added
Removed
  • TabularUnified TODO

    r6190 r6191  
    11** Showstoppers
    2 -> nodename vs nodeprimarykey bugs; can't add NIC
    32-> add check that nodename is unique
    43
  • TabularUnified exodus/models.py

    r6190 r6191  
    6767        return self.description
    6868
     69
     70class Network(models.Model):
     71    domainname = models.CharField(maxlength=50)
     72    ipspacestart = models.IPAddressField()
     73    netmask = models.IntegerField()
     74
     75    class Admin:
     76        pass
     77
     78    def __str__(self):
     79        return self.domainname
     80
     81
    6982class Node(models.Model):
    7083    name = models.CharField(maxlength=30, unique=True)
     
    7285    status = models.ForeignKey(Status)
    7386    masterip = models.IPAddressField()
     87    network = models.ForeignKey(Network)
    7488
    7589    class Admin:
     
    140154    def __str__(self):
    141155        return self.hostname
    142 
    143 class Network(models.Model):
    144     domainname = models.CharField(maxlength=50)
    145     ipspacestart = models.IPAddressField()
    146     netmask = models.IntegerField()
    147 
    148     class Admin:
    149         pass
    150 
    151     def __str__(self):
    152         return self.domainname
  • TabularUnified exodus/templates/addnode.html

    r6183 r6191  
    1515</div>
    1616<div>
     17        <label for="id_status">Node Network:</label> {{ form.network }}
     18        {% if form.network.errors %} *** {{ form.network.errors|join:", " }}{% endif %}
     19</div>
     20<div>
    1721        <label for="id_status">Node Status:</label> {{ form.status }}
    1822        {% if form.status.errors %} *** {{ form.status.errors|join:", " }}{% endif %}
  • TabularUnified exodus/wllogic.py

    r6181 r6191  
    66        """Generates a new ssid name for a new wifi NIC"""
    77
    8         return "%s.%s.%s" % (desc, Node.objects.get(pk=6).name, Network.objects.get(pk=1).domainname)
     8        return "%s.%s.%s" % (desc, Node.objects.get(pk=node).name,
     9                                Node.objects.get(pk=node).network.domainname)
    910
    1011def newname(test):
Note: See TracChangeset for help on using the changeset viewer.