Changeset 6371

Timestamp:

Nov 6, 2008, 7:57:49 PM (16 years ago)

Author:

roland

Message:

fixed free_masterip

Location:

trunk/exodus

Files:

• tests.py (modified) (1 diff)
• views.py (modified) (2 diffs)
• wllogic.py (modified) (1 diff)

trunk/exodus/tests.py

@@ -166 +166 @@
         network = Network.objects.get(pk=1)
         ip = free_masterip(network) 
-        self.failIfEqual(ip, '172.16.0.0') 
-        self.failUnlessEqual(ip, '172.16.1.0')
+        self.failIfEqual(ip, '172.16.0.1') 
+        self.failUnlessEqual(ip, '172.16.1.1')
         
     def test_freePublicAPIP(self):

trunk/exodus/views.py

@@ -148 +148 @@
                                         pk=publicAP)
                 super(PublicAPHandler, self).__init__(request, mode)
-                #GenericHandler.__init__(self, request, mode)
 
         def _add(self):
@@ -172 +171 @@
         class Meta:
                 model = Interface
-                exclude = ( 'ip', 'ssid', 'mode', 'channel', 'shortdesc' )
+                exclude = ( 'ip', 'ssid', 'mode', 'channel', 'shortdesc', \
+                                'netmask' )
 
 class InterfaceHandler(GenericHandler):
         def __init__(self, request, node, interface, mode):
-                pdebug(100, "Function: nterfaceHandler.__init__")
+                pdebug(100, "Function: InterfaceHandler.__init__")
                 self.node = Node.objects.get(name=node)
                 if mode == 'add':

trunk/exodus/wllogic.py

@@ -78 +78 @@
                 i = i + numaddrs
     
-        return show_addr(i)
+        return show_addr(i+1)
 
 #