Change default fixed and internal networks to custom in tests
- Add method to update fixed and internal network - Add update of fixed and internal networks to all tests Change-Id: I22dd874f95a9ad66a2f99f5cb182cbcbeba5d953 Closes-Bug: #1358726
This commit is contained in:
parent
c450b341ea
commit
6ffdf061fb
|
@ -1227,3 +1227,19 @@ class FuelWebClient(object):
|
||||||
assert_equal(nailgun_cidr, slave_cidr.rstrip(),
|
assert_equal(nailgun_cidr, slave_cidr.rstrip(),
|
||||||
'Cidr after deployment is not equal'
|
'Cidr after deployment is not equal'
|
||||||
' to cidr by default')
|
' to cidr by default')
|
||||||
|
|
||||||
|
def update_internal_network(self, cluster_id, cidr, gateway=None):
|
||||||
|
net_provider = self.client.get_cluster(cluster_id)['net_provider']
|
||||||
|
net_config = self.client.get_networks(cluster_id)
|
||||||
|
data = (cluster_id, net_config["networking_parameters"],
|
||||||
|
net_config["networks"])
|
||||||
|
if net_provider == 'nova_network':
|
||||||
|
net_config["networking_parameters"]['fixed_networks_cidr']\
|
||||||
|
= cidr
|
||||||
|
self.client.update_network(*data)
|
||||||
|
elif net_provider == 'neutron':
|
||||||
|
net_config["networking_parameters"]['internal_cidr']\
|
||||||
|
= cidr
|
||||||
|
net_config["networking_parameters"]['internal_gateway']\
|
||||||
|
= gateway
|
||||||
|
self.client.update_network(*data)
|
||||||
|
|
|
@ -71,6 +71,8 @@ class NeutronGre(TestBasic):
|
||||||
'slave-03': ['compute', 'cinder']
|
'slave-03': ['compute', 'cinder']
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
|
self.fuel_web.update_internal_network(cluster_id, '192.168.196.0/26',
|
||||||
|
'192.168.196.1')
|
||||||
self.fuel_web.deploy_cluster_wait(cluster_id)
|
self.fuel_web.deploy_cluster_wait(cluster_id)
|
||||||
|
|
||||||
cluster = self.fuel_web.client.get_cluster(cluster_id)
|
cluster = self.fuel_web.client.get_cluster(cluster_id)
|
||||||
|
@ -252,6 +254,8 @@ class NeutronVlanHa(TestBasic):
|
||||||
'slave-05': ['compute']
|
'slave-05': ['compute']
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
|
self.fuel_web.update_internal_network(cluster_id, '192.168.196.0/22',
|
||||||
|
'192.168.196.1')
|
||||||
self.fuel_web.deploy_cluster_wait(cluster_id)
|
self.fuel_web.deploy_cluster_wait(cluster_id)
|
||||||
|
|
||||||
cluster = self.fuel_web.client.get_cluster(cluster_id)
|
cluster = self.fuel_web.client.get_cluster(cluster_id)
|
||||||
|
|
|
@ -106,6 +106,7 @@ class SimpleFlat(TestBasic):
|
||||||
'slave-02': ['compute']
|
'slave-02': ['compute']
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
|
self.fuel_web.update_internal_network(cluster_id, '10.1.0.0/24')
|
||||||
self.fuel_web.deploy_cluster_wait(cluster_id)
|
self.fuel_web.deploy_cluster_wait(cluster_id)
|
||||||
self.fuel_web.assert_cluster_ready(
|
self.fuel_web.assert_cluster_ready(
|
||||||
'slave-01', smiles_count=6, networks_count=1, timeout=300)
|
'slave-01', smiles_count=6, networks_count=1, timeout=300)
|
||||||
|
|
Loading…
Reference in New Issue