openstack/fuel-main
Code Issues Proposed changes

Merge "Fix for bonding tests"

Browse Source
This commit is contained in:
Jenkins 2014-07-01 18:23:03 +00:00 committed by Gerrit Code Review
commit 79cbcd58e7
2 changed files with 36 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
fuelweb_test/models/fuel_web_client.py
View File

@ -20,7 +20,7 @@ from devops.error import DevopsCalledProcessError
from devops.error import TimeoutError
from devops.helpers.helpers import _wait
from devops.helpers.helpers import wait
from ipaddr import IPNetwork
from netaddr import IPNetwork
from proboscis.asserts import assert_equal
from proboscis.asserts import assert_true
@ -748,34 +748,53 @@ class FuelWebClient(object):
net_name=net['name'])
self.common_net_settings(network_configuration)
logger.info('Network settings %s for push', network_configuration)
logger.info('Network settings for push: {0}'.format(
network_configuration))
return network_configuration
def common_net_settings(self, network_configuration):
nc = network_configuration["networking_parameters"]
public = IPNetwork(self.environment.get_network("public"))
nc["floating_ranges"] = self.get_range(public, 1)
float_range = public if not BONDING else list(public.subnet(27))[0]
nc["floating_ranges"] = self.get_range(float_range, 1)
def set_network(self, net_config, net_name):
if 'floating' == net_name:
self.net_settings(net_config, 'public', True)
elif net_name in ['management', 'storage', 'public']:
if not BONDING:
self.net_settings(net_config, net_name)
else:
self.net_settings(net_config, "public")
nets_wo_floating = ['public', 'management', 'storage']
if not BONDING:
if 'floating' == net_name:
self.net_settings(net_config, 'public', floating=True)
elif net_name in nets_wo_floating:
self.net_settings(net_config, net_name)
else:
pub_subnets = list(IPNetwork(
self.environment.get_network("public")).subnet(27))
if "floating" == net_name:
self.net_settings(net_config, pub_subnets[0], floating=True,
jbond=True)
elif net_name in nets_wo_floating:
i = nets_wo_floating.index(net_name)
self.net_settings(net_config, pub_subnets[i], jbond=True)
def net_settings(self, net_config, net_name, floating=False, jbond=False):
if jbond:
ip_network = net_name
else:
ip_network = IPNetwork(self.environment.get_network(net_name))
def net_settings(self, net_config, net_name, floating=False):
ip_network = IPNetwork(self.environment.get_network(net_name))
if 'nova_network':
net_config['ip_ranges'] = self.get_range(ip_network, 1) \
if floating else self.get_range(ip_network, -1)
else:
net_config['ip_ranges'] = self.get_range(ip_network)
net_config['vlan_start'] = None
net_config['ip_ranges'] = self.get_range(net_name)
net_config['cidr'] = str(ip_network)
net_config['gateway'] = self.environment.router(net_name)
if jbond:
net_config['gateway'] = self.environment.router('public')
else:
net_config['vlan_start'] = None
net_config['gateway'] = self.environment.router(net_name)
def get_range(self, ip_network, ip_range=0):
net = list(IPNetwork(ip_network))

30
fuelweb_test/tests/test_bonding.py
View File

@ -61,6 +61,7 @@ class BondingSimple(TestBasic):
"net_segment_type": segment_type,
}
)
self.fuel_web.update_nodes(
cluster_id, {
'slave-01': ['controller'],
@ -93,13 +94,6 @@ class BondingSimple(TestBasic):
}
net_params = self.fuel_web.client.get_networks(cluster_id)
nets = net_params['networks']
vlan_start = 100
for net in nets:
net.update({'vlan_start': vlan_start})
vlan_start += 1
self.fuel_web.client.update_network(cluster_id, networks=nets)
nailgun_nodes = self.fuel_web.client.list_cluster_nodes(cluster_id)
for node in nailgun_nodes:
@ -191,13 +185,6 @@ class BondingSimple(TestBasic):
}
net_params = self.fuel_web.client.get_networks(cluster_id)
nets = net_params['networks']
vlan_start = 100
for net in nets:
net.update({'vlan_start': vlan_start})
vlan_start += 1
self.fuel_web.client.update_network(cluster_id, networks=nets)
nailgun_nodes = self.fuel_web.client.list_cluster_nodes(cluster_id)
for node in nailgun_nodes:
@ -295,14 +282,6 @@ class BondingHA(TestBasic):
}
net_params = self.fuel_web.client.get_networks(cluster_id)
nets = net_params['networks']
vlan_start = 100
for net in nets:
net.update({'vlan_start': vlan_start})
vlan_start += 1
self.fuel_web.client.update_network(cluster_id, networks=nets)
nailgun_nodes = self.fuel_web.client.list_cluster_nodes(cluster_id)
for node in nailgun_nodes:
@ -396,13 +375,6 @@ class BondingHA(TestBasic):
}
net_params = self.fuel_web.client.get_networks(cluster_id)
nets = net_params['networks']
vlan_start = 100
for net in nets:
net.update({'vlan_start': vlan_start})
vlan_start += 1
self.fuel_web.client.update_network(cluster_id, networks=nets)
nailgun_nodes = self.fuel_web.client.list_cluster_nodes(cluster_id)
for node in nailgun_nodes: