openstack
/
fuel-devops
Code Issues Proposed changes

Fix vlan range for private network in template generator 

Change-Id: I009e83ea3a3a6a8848158fa45a1b1b8f03a9fc4a
This commit is contained in:
Dennis Dmitriev 2016-10-04 13:09:33 +03:00
parent 25ff4b7e1a
commit 84e9f4c230
2 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
devops/helpers/templates.py
View File

@ -372,21 +372,26 @@ def create_address_pools(interfaceorder, networks_pools):
} for iname in interfaceorder
}
if 'public' in interfaceorder:
# Put floating IP range for public network
default_pool_name = 'default'
floating_pool_name = 'floating'
for address_pool in address_pools:
if 'private' in address_pool:
address_pools[address_pool]['params']['vlan_start'] = 900
address_pools[address_pool]['params']['vlan_end'] = 999
# Take a first subnet with necessary size and calculate the size
net = netaddr.IPNetwork(networks_pools['public'][0])
new_prefix = int(networks_pools['public'][1])
subnet = next(net.subnet(prefixlen=new_prefix))
network_size = subnet.size
if 'public' in address_pool:
# Put floating IP range for public network
default_pool_name = 'default'
floating_pool_name = 'floating'
address_pools['public']['params']['ip_ranges'][default_pool_name] = [
2, network_size // 2 - 1]
address_pools['public']['params']['ip_ranges'][floating_pool_name] = [
network_size // 2, -2]
# Take a first subnet with necessary size and calculate the size
net = netaddr.IPNetwork(networks_pools['public'][0])
new_prefix = int(networks_pools['public'][1])
subnet = next(net.subnet(prefixlen=new_prefix))
network_size = subnet.size
address_pools[address_pool]['params']['ip_ranges'][
default_pool_name] = [2, network_size // 2 - 1]
address_pools[address_pool]['params']['ip_ranges'][
floating_pool_name] = [network_size // 2, -2]
return address_pools

4
devops/tests/test_generated_template.py
View File

@ -87,6 +87,8 @@ class TestDefaultTemplate(TestCase):
ip_reserved:
gateway: 1
l2_network_device: 1
vlan_end: 999
vlan_start: 900
public:
net: 10.109.0.0/16:24
params:
@ -322,6 +324,8 @@ class TestDefaultTemplate(TestCase):
ip_reserved:
gateway: 1
l2_network_device: 1
vlan_end: 999
vlan_start: 900
public:
net: 10.109.0.0/16:24
params: