openstack/fuel-qa
Code Issues Proposed changes

Rename lnx-bond to bond in tests

Browse Source 
Use 'bond' style name instead of 'lnx-bond' style

Change-Id: I147ddfa720fed730ec00a26f609205a9c40e8c25
Closes-bug: #1488476
This commit is contained in:
Dmitry Tyzhnenko 2015-10-07 14:37:12 +03:00 committed by Dmitry Tyzhnenko
parent d48a0dbf88
commit f2bf1be32e
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fuelweb_test/network_templates/cinder.yaml
View File

@ -147,7 +147,7 @@ adv_net_template:
name: br-fake
- action: add-bond
bridge: br-fake
name: lnx-bond0
name: bond0
interfaces:
- <% if5 %>
bond_properties:
@ -324,4 +324,4 @@ adv_net_template:
- br-cephrados
roles:
ceph/replication: br-cephrepl
ceph/radosgw: br-cephrados
ceph/radosgw: br-cephrados

4
fuelweb_test/network_templates/cinder_add_nodes.yaml
View File

@ -153,7 +153,7 @@ adv_net_template:
name: br-fake
- action: add-bond
bridge: br-fake
name: lnx-bond0
name: bond0
interfaces:
- <% if5 %>
bond_properties:
@ -330,4 +330,4 @@ adv_net_template:
- br-cephrados
roles:
ceph/replication: br-cephrepl
ceph/radosgw: br-cephrados
ceph/radosgw: br-cephrados

4
fuelweb_test/tests/plugins/plugin_contrail/test_fuel_plugin_contrail.py
View File

@ -719,7 +719,7 @@ class ContrailPlugin(TestBasic):
raw_data = [{
'mac': None,
'mode': 'active-backup',
'name': 'lnx-bond0',
'name': 'bond0',
'slaves': [
{'name': 'eth4'},
{'name': 'eth2'},
@ -733,7 +733,7 @@ class ContrailPlugin(TestBasic):
'eth0': ['fuelweb_admin'],
'eth1': ['public'],
'eth3': ['private'],
'lnx-bond0': [
'bond0': [
'management',
'storage',
]

8
fuelweb_test/tests/test_bonding_base.py
View File

@ -25,7 +25,7 @@ class BondingTest(TestBasic):
{
'mac': None,
'mode': 'active-backup',
'name': 'lnx-bond0',
'name': 'bond0',
'slaves': [
{'name': 'eth5'},
{'name': 'eth4'},
@ -39,7 +39,7 @@ class BondingTest(TestBasic):
{
'mac': None,
'mode': 'active-backup',
'name': 'lnx-bond1',
'name': 'bond1',
'slaves': [
{'name': 'eth1'},
{'name': 'eth0'}
@ -51,13 +51,13 @@ class BondingTest(TestBasic):
]
self.INTERFACES = {
'lnx-bond0': [
'bond0': [
'public',
'management',
'storage',
'private'
],
'lnx-bond1': ['fuelweb_admin']
'bond1': ['fuelweb_admin']
}
super(BondingTest, self).__init__()