Changeset 6365 for trunk

Timestamp:

Nov 5, 2008, 11:32:49 AM (16 years ago)

Author:

roland

Message:

renaming functions and classes to be in line with python naming

Location:

trunk/exodus

Files:

• tests.py (modified) (5 diffs)
• views.py (modified) (2 diffs)
• wllogic.py (modified) (9 diffs)

trunk/exodus/tests.py

@@ -34 +34 @@
         from exodus.models import Location
     
-        try: 
-            l = Location.objects.get(description = 'JohnLaan2')
-        except Location.DoesNotExist:
-            self.fail("Location wasn't get added.")
+        l = Location.objects.get(description = 'JohnLaan2')
         self.failUnless(str(l.longitude), '34.55')
         self.failUnless(str(l.latitude), '44.55')
@@ -99 +96 @@
     def test_parse_show_addr(self):
         ip = '172.16.2.0'
-        from exodus.wllogic import parseaddr
-        parsed = parseaddr(ip)
+        from exodus.wllogic import parse_addr
+        parsed = parse_addr(ip)
         self.failUnlessEqual(str(parsed), '2886730240')
 
-        from exodus.wllogic import showaddr
-        o_ip = showaddr(parsed)
+        from exodus.wllogic import show_addr
+        o_ip = show_addr(parsed)
         self.failUnlessEqual(o_ip, ip)
 
         # when using an address larger then 256, move 1 address up.
         ip = '172.16.2.256'
-        o_ip = showaddr(parseaddr(ip))
+        o_ip = show_addr(parse_addr(ip))
         self.failUnlessEqual(o_ip, '172.16.3.0')
 
@@ -131 +128 @@
     def test_network(self):
         from wllogic import network
-        from wllogic import showaddr
-        network_addr = showaddr(network('172.18.5.10', 24))
+        from wllogic import show_addr
+        network_addr = show_addr(network('172.18.5.10', 24))
         self.failUnlessEqual(network_addr, '172.18.5.0')
 
     def test_broadcast(self):
         from wllogic import broadcast
-        from wllogic import showaddr
+        from wllogic import show_addr
         
-        broadcast_addr = showaddr(broadcast('172.16.5.232', 24))
+        broadcast_addr = show_addr(broadcast('172.16.5.232', 24))
         self.failUnlessEqual(broadcast_addr, '172.16.5.255')
 
@@ -161 +158 @@
         self.failUnlessRaises(ValueError, getBroadcast, '172.17.2.0', 33)
 
-    def test_freeMasterIP(self):
-        from wllogic import freeMasterIP
+    def test_free_masterip(self):
+        from wllogic import free_masterip
         from exodus.models import Node, Network
 
@@ -168 +165 @@
                 masterip = '172.16.0.1', name = 'testnode')
         network = Network.objects.get(pk=1)
-        ip = freeMasterIP(network) 
+        ip = free_masterip(network) 
         self.failIfEqual(ip, '172.16.0.0') 
         self.failUnlessEqual(ip, '172.16.1.0')

trunk/exodus/views.py

@@ -11 +11 @@
 
 from exodus.models import *
-from exodus.wllogic import freeMasterIP, newSSIDName, addInterlinkIP, \
+from exodus.wllogic import free_masterip, newSSIDName, addInterlinkIP, \
                 freeInterlinkIP, freePublicAPIP
 
@@ -245 +245 @@
                 # input a valid master ip into new_data
                 _instance  = self.form.save(commit=False)
-                _instance.masterip = freeMasterIP(_instance.network)
+                _instance.masterip = free_masterip(_instance.network)
                 _instance.save()
                 self.response = HttpResponseRedirect(reverse('exodus.views.viewNode', \

trunk/exodus/wllogic.py

@@ -15 +15 @@
 # Taken from lvoege@gmail.com's getrange.py
 #
-def parseaddr(s):
+def parse_addr(s):
         """Remember when using an address has a section which is higher than
-        255, such as 172.16.0.256, the ip address from showaddr turns out as
+        255, such as 172.16.0.256, the ip address from show_addr turns out as
         172.16.1.0
         """
@@ -26 +26 @@
                 long(f[3])
 
-def showaddr(a):
+def show_addr(a):
         return "%d.%d.%d.%d" % ((a >> 24) & 0xff, (a >> 16) & 0xff, (a >> 8) & 0xff, a & 0xff)
 
@@ -36 +36 @@
 
 def getSubnet(netmask):
-        return(showaddr(netmask2subnet(netmask)))
+        return(show_addr(netmask2subnet(netmask)))
 
 def network(address, netmask):
         """IPv4 network address when address and netmask are given"""
-        return(parseaddr(address) & netmask2subnet(netmask))
+        return(parse_addr(address) & netmask2subnet(netmask))
 
 def broadcast(address, netmask):
@@ -46 +46 @@
         if netmask > 32:
                 raise ValueError, 'netmask too large'
-        return(parseaddr(address) | 0xffffffff >> netmask)
+        return(parse_addr(address) | 0xffffffff >> netmask)
 
 def getNetwork(address, netmask):
-        return(showaddr(network(address,netmask)))
+        return(show_addr(network(address,netmask)))
 
 def getBroadcast(address, netmask):
-        return(showaddr(broadcast(address,netmask)))
+        return(show_addr(broadcast(address,netmask)))
 
-#XXX: freeMasterIP/addInterlinkIP should be more general by writing a function
+#XXX: free_masterip/addInterlinkIP should be more general by writing a function
 #     which finds a range based on a given range, taken ip/netmask and 
 #     requested subnet
 
-def freeMasterIP(city_network, netmask = None):
+def free_masterip(city_network, netmask = None):
         if netmask == None:
                 netmask = MASTERIP_NETMASK
@@ -74 +74 @@
 
         #XXX: No out of bond checking done yet
-        i = parseaddr(city_network.ipspacestart)
+        i = parse_addr(city_network.ipspacestart)
         while taken.has_key(i):
                 i = i + numaddrs
     
-        return showaddr(i)
+        return show_addr(i)
 
 #
@@ -109 +109 @@
                 i = i + numaddrs
         
-        return showaddr(i)
+        return show_addr(i)
 
 def freeInterlinkIP(masterLink):
@@ -126 +126 @@
                 i = i + numaddrs
         
-        return showaddr(i)
+        return show_addr(i)
 
 def addInterlinkIP(masterLink):
@@ -133 +133 @@
         for interface in Interface.objects.filter(link=masterLink):
                 #Grr, needs all interfaces which are master requires a bit of a hack
-                addr = parseaddr(interface.ip)
+                addr = parse_addr(interface.ip)
                 taken[addr] = 1
 
@@ -142 +142 @@
                 i = i + 1
         
-        return showaddr(i)
+        return show_addr(i)