IP allocation simulation - Pad IPv4 addresses in LCP2 algorithm.

This makes IPv4 addresses comparable with IPv6 but reduces the overall
effectiveness of the algorithm.  The alternative would be to treat
these addresses separately while trying to keep all the IPs in overall
balance...  which is basically the problem that LCP2 solves.  :-)

Signed-off-by: Martin Schwenke <martin@meltin.net>

diff --git a/tests/takeover/ctdb_takeover.py b/tests/takeover/ctdb_takeover.py
index 42feeb5b713bf06f8962c66a466829baf87886a6..c8c0ed6e337bcbbeefcbf8361a62dbdbdf6f1a80 100755 (executable)
--- a/tests/takeover/ctdb_takeover.py
+++ b/tests/takeover/ctdb_takeover.py
@@ -143,7 +143,13 @@ def ip_to_list_of_ints(ip):
     try:
         l = socket.inet_pton(socket.AF_INET6, ip)
     except:
-        l = socket.inet_pton(socket.AF_INET, ip)
+        # Pad with leading 0s.  This makes IPv4 addresses comparable
+        # with IPv6 but reduces the overall effectiveness of the
+        # algorithm.  The alternative would be to treat these
+        # addresses separately while trying to keep all the IPs in
+        # overall balance.
+        l = "".join(itertools.repeat("\0", 12)) + \
+            socket.inet_pton(socket.AF_INET, ip)
 
     return map(lambda x: struct.unpack('B', x)[0], l)