Changeset 062b991

Timestamp:

Mar 7, 2010 8:02:15 AM (14 years ago)

Author:

Ted Faber <faber@…>

Branches:

axis_example, compt_changes, info-ops, master, version-3.01, version-3.02

Children:

0b799e0

Parents:

dd3e38b

Message:

Fix netmask calculation

File:

• fedd/federation/experiment_control.py (modified) (1 diff)

fedd/federation/experiment_control.py

@@ -1267 +1267 @@
                 raise service_error(service_error.req, 
                         "Cannot allocate IP addresses")
-            mask = 2
-            while 2 **mask < net_size:
-                mask += 1
-
-            netmask = ((2**32-1) ^ (mask**2 -1))
+            mask = ips.min_alloc
+            while mask < net_size:
+                mask *= 2
+
+            netmask = ((2**32-1) ^ (mask-1))
 
             base += 1