Changeset 6191
- Timestamp:
- Aug 14, 2008, 8:37:52 PM (17 years ago)
- Files:
-
- 1 added
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
TabularUnified TODO ¶
r6190 r6191 1 1 ** Showstoppers 2 -> nodename vs nodeprimarykey bugs; can't add NIC3 2 -> add check that nodename is unique 4 3 -
TabularUnified exodus/models.py ¶
r6190 r6191 67 67 return self.description 68 68 69 70 class 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 69 82 class Node(models.Model): 70 83 name = models.CharField(maxlength=30, unique=True) … … 72 85 status = models.ForeignKey(Status) 73 86 masterip = models.IPAddressField() 87 network = models.ForeignKey(Network) 74 88 75 89 class Admin: … … 140 154 def __str__(self): 141 155 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 pass150 151 def __str__(self):152 return self.domainname -
TabularUnified exodus/templates/addnode.html ¶
r6183 r6191 15 15 </div> 16 16 <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> 17 21 <label for="id_status">Node Status:</label> {{ form.status }} 18 22 {% if form.status.errors %} *** {{ form.status.errors|join:", " }}{% endif %} -
TabularUnified exodus/wllogic.py ¶
r6181 r6191 6 6 """Generates a new ssid name for a new wifi NIC""" 7 7 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) 9 10 10 11 def newname(test):
Note:
See TracChangeset
for help on using the changeset viewer.