openstack
/
fuel-qa
Code Issues Proposed changes

Merge "Fix vlan assignment for bond interface"

This commit is contained in:
Jenkins 2017-03-15 11:37:54 +00:00 committed by Gerrit Code Review
parent de8612b7fb 682675c33e
commit 69c3537c12
3 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
fuelweb_test/models/fuel_web_client.py
View File

@ -3335,6 +3335,11 @@ class FuelWebClient30(FuelWebClient29):
networks['baremetal']['vlan_start'] = (
pool.vlan_start if pool.vlan_start else None)
if BONDING:
# leave defaults for mgmt, storage and private if
# BONDING is enabled
continue
for pool in default_node_group.get_network_pools(
name__in=['storage', 'management']):
networks[pool.name]['cidr'] = str(pool.net)

6
fuelweb_test/tests/test_bond_offloading.py
View File

@ -79,7 +79,8 @@ class TestOffloading(BondingTestOffloading):
'slave-01': ['controller'],
'slave-02': ['compute'],
'slave-03': ['cinder']
}
},
update_interfaces=False
)
nodes = self.fuel_web.client.list_cluster_nodes(cluster_id)
@ -189,7 +190,8 @@ class TestOffloading(BondingTestOffloading):
'slave-01': ['controller'],
'slave-02': ['compute'],
'slave-03': ['cinder']
}
},
update_interfaces=False
)
nodes = self.fuel_web.client.list_cluster_nodes(cluster_id)

18
fuelweb_test/tests/test_bonding.py
View File

@ -72,7 +72,8 @@ class BondingHAOneController(BondingTest):
'slave-01': ['controller'],
'slave-02': ['compute'],
'slave-03': ['cinder']
}
},
update_interfaces=False
)
self.show_step(4)
@ -139,7 +140,8 @@ class BondingHAOneController(BondingTest):
'slave-01': ['controller'],
'slave-02': ['compute'],
'slave-03': ['cinder']
}
},
update_interfaces=False
)
self.show_step(4)
@ -200,7 +202,8 @@ class BondingHAOneController(BondingTest):
'slave-01': ['controller'],
'slave-02': ['compute'],
'slave-03': ['cinder']
}
},
update_interfaces=False
)
self.show_step(4)
@ -296,7 +299,8 @@ class BondingHA(BondingTest):
'slave-03': ['controller'],
'slave-04': ['compute'],
'slave-05': ['cinder']
}
},
update_interfaces=False
)
net_params = self.fuel_web.client.get_networks(cluster_id)
@ -389,7 +393,8 @@ class BondingHA(BondingTest):
'slave-03': ['controller'],
'slave-04': ['compute'],
'slave-05': ['cinder']
}
},
update_interfaces=False
)
net_params = self.fuel_web.client.get_networks(cluster_id)
@ -479,7 +484,8 @@ class BondingHA(BondingTest):
'slave-02': ['controller'],
'slave-03': ['controller'],
'slave-04': ['compute'],
}
},
update_interfaces=False
)
self.show_step(4)