update the logic for calculating network sizes

1 files changed, 6 insertions, 1 deletions

diff --git a/nova/compute/network.py b/nova/compute/network.py
index bdb8a22f9..43011f696 100644
--- a/nova/compute/network.py
+++ b/nova/compute/network.py
@@ -162,6 +162,7 @@ class Vlan(datastore.BasicModel):
 
 class BaseNetwork(datastore.BasicModel):
     override_type = 'network'
+    NUM_STATIC_IPS = 3 # Network, Gateway, and CloudPipe
 
     @property
     def identifier(self):
@@ -237,11 +238,15 @@ class BaseNetwork(datastore.BasicModel):
     def available(self):
         # the .2 address is always CloudPipe
         # and the top <n> are for vpn clients
-        for idx in range(3, len(self.network)-(1 + FLAGS.cnt_vpn_clients)):
+        for idx in range(self.num_static_ips, len(self.network)-(1 + FLAGS.cnt_vpn_clients)):
             address = str(self.network[idx])
             if not address in self.hosts.keys():
                 yield str(address)
 
+    @property
+    def num_static_ips(self):
+        return BaseNetwork.NUM_STATIC_IPS
+
     def allocate_ip(self, user_id, project_id, mac):
         for address in self.available:
             logging.debug("Allocating IP %s to %s" % (address, project_id))