commit f1705c11be55800bb5fc38f6a3590ac5cf27b36b
author Sapan Bhatia <sapanb@cs.princeton.edu> Fri Jan 23 16:22:12 2015 +0000
committer Sapan Bhatia <sapanb@cs.princeton.edu> Fri Jan 23 16:22:12 2015 +0000
tree f029a09cb5df5a694ef34f44333c708b30336431
parent 3b3e1e130ea37986e4edb908e343098f7209b4e0

Fix bug in CIDR allocation

planetstack/openstack_observer/steps/sync_controller_networks.py

diff --git a/planetstack/openstack_observer/steps/sync_controller_networks.py b/planetstack/openstack_observer/steps/sync_controller_networks.py
index ea888c7..47a50a0 100644
--- a/planetstack/openstack_observer/steps/sync_controller_networks.py
+++ b/planetstack/openstack_observer/steps/sync_controller_networks.py
@@ -18,14 +18,16 @@
     provides=[ControllerNetwork, Network]
 
     def alloc_subnet(self, uuid):
+        # 16 bits only
+        uuid_masked = uuid & 0xffff
         a = 10
-        b = uuid >> 32
-        c = uuid & 0xffffffff
-	d = 0
+        b = uuid_masked >> 8
+        c = uuid_masked & 0xff
+        d = 0
 
-	cidr = '%d.%d.%d.%d/24'%(a,b,c,d)
-	return cidr
-	
+        cidr = '%d.%d.%d.%d/24'%(a,b,c,d)
+        return cidr
+
 
     def fetch_pending(self, deleted):
         if (deleted):