openstack
/
fuel-web
Code Issues Proposed changes

Merge "Fix random failures of test_assign_given_vips_for_net_groups"

This commit is contained in:
Jenkins 2016-02-19 14:35:03 +00:00 committed by Gerrit Code Review
parent 19a7c79eac dd552bb20c
commit b338b311e9
1 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
nailgun/nailgun/test/integration/test_network_manager.py
View File

@ -1265,25 +1265,17 @@ class TestNeutronManager70(BaseIntegrationTest):
self.assertEqual(expected_vips, vips)
def test_assign_given_vips_for_net_groups(self):
vips_to_create = {
'management': {
'vrouter': '192.168.0.1',
},
'public': {
'vrouter_pub': '172.16.0.2',
},
}
# rewrite VIPs allocated on creation of cluster
vips_to_assign = {
'management': {
'vrouter': '192.168.0.2',
'management': '192.168.0.3',
'vrouter': '192.168.0.4',
'management': '192.168.0.5',
},
'public': {
'vrouter_pub': '172.16.0.4',
'public': '172.16.0.5',
},
}
self.env.create_ip_addrs_by_rules(self.cluster, vips_to_create)
self.net_manager.assign_given_vips_for_net_groups(
self.cluster, vips_to_assign)
vips = self.net_manager.get_assigned_vips(self.cluster)