openstack
/
python-tripleoclient
Code Issues Proposed changes

Merge "Fix network environment validation"

This commit is contained in:
Zuul 2021-05-03 13:40:33 +00:00 committed by Gerrit Code Review
parent 6454713fd4 930abb12b3
commit b5c7718005
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tripleoclient/tests/v1/overcloud_netenv_validate/test_overcloud_netenv_validate.py
View File

@ -46,8 +46,12 @@ class TestValidateOvercloudNetenv(fakes.TestValidateOvercloudNetenv):
'OsNetConfigImpl': { 'OsNetConfigImpl': {
'properties': { 'properties': {
'config': { 'config': {
'os_net_config': { 'str_replace': {
'network_config': bridges, 'params': {
'$network_config': {
'network_config': bridges,
}
}
} }
} }
} }

2
tripleoclient/v1/overcloud_netenv_validate.py
View File

@ -175,7 +175,7 @@ class ValidateOvercloudNetenv(command.Command):
# no bonds. # no bonds.
for item in nic_data['resources']: for item in nic_data['resources']:
bridges = nic_data['resources'][item]['properties']['config'][ bridges = nic_data['resources'][item]['properties']['config'][
'os_net_config']['network_config'] 'str_replace']['params']['$network_config']['network_config']
for bridge in bridges: for bridge in bridges:
if bridge['type'] == 'ovs_bridge': if bridge['type'] == 'ovs_bridge':
bond_count = 0 bond_count = 0