Changeset 289ff7e

Timestamp:

Mar 4, 2010 3:18:33 PM (15 years ago)

Author:

Ted Faber <faber@…>

Branches:

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

Children:

c119839

Parents:

6280b1f

Message:

Netmasks

File:

• fedd/federation/experiment_control.py (modified) (3 diffs)

fedd/federation/experiment_control.py

@@ -1256 +1256 @@
 
         for idx, s in enumerate(subs):
-            a = ips.allocate(len(s.interfaces)+2)
+            net_size = len(s.interfaces)+2
+
+            a = ips.allocate(net_size)
             if a :
                 base, num = a
-                if num < len(s.interfaces) +2 : 
+                if num < net_size: 
                     raise service_error(service_error.internal,
                             "Allocator returned wrong number of IPs??")
@@ -1265 +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))
+            print "%d %x" % (mask , netmask)
 
             base += 1
@@ -1271 +1279 @@
                         topdl.Attribute('ip4_address', 
                             "%s" % ip_addr(base)))
+                i.attribute.append(
+                        topdl.Attribute('ip4_netmask', 
+                            "%s" % ip_addr(int(netmask))))
+
                 hname = i.element.name[0]
                 if ifs.has_key(hname):