Skip to content

Fixes KeyError for bridge with no "parameters:" setting #423

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
blackboxsw merged 2 commits into from
Jun 9, 2020
Merged

Fixes KeyError for bridge with no "parameters:" setting #423

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0f36b3a
Fixes KeyError for bridge with no "parameters:" setting
candlerb Jun 6, 2020
86cf761
Merge branch 'master' into bridge-parameters
blackboxsw Jun 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions cloudinit/net/network_state.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -722,10 +722,10 @@ def _handle_bond_bridge(self, command, cmd_type=None):
item_params = dict((key, value) for (key, value) in
item_cfg.items() if key not in
NETWORK_V2_KEY_FILTER)
# we accept the fixed spelling, but write the old for compatability
# we accept the fixed spelling, but write the old for compatibility
# Xenial does not have an updated netplan which supports the
# correct spelling. LP: #1756701
params = item_params['parameters']
params = item_params.get('parameters', {})
Comment thread
candlerb marked this conversation as resolved.
grat_value = params.pop('gratuitous-arp', None)
if grat_value:
params['gratuitious-arp'] = grat_value
Expand All @@ -734,8 +734,7 @@ def _handle_bond_bridge(self, command, cmd_type=None):
'type': cmd_type,
'name': item_name,
cmd_type + '_interfaces': item_cfg.get('interfaces'),
'params': dict((v2key_to_v1[k], v) for k, v in
item_params.get('parameters', {}).items())
'params': dict((v2key_to_v1[k], v) for k, v in params.items())
}
if 'mtu' in item_cfg:
v1_cmd['mtu'] = item_cfg['mtu']
Expand Down
10 changes: 10 additions & 0 deletions tests/unittests/test_net.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -426,6 +426,11 @@
mtu: 9000
parameters:
gratuitous-arp: 2
bond2:
interfaces:
- ens5
macaddress: 68:05:ca:64:d3:6e
mtu: 9000
ethernets:
ens3:
dhcp4: false
Expand All @@ -437,6 +442,11 @@
dhcp6: false
match:
macaddress: 52:54:00:11:22:ff
ens5:
dhcp4: false
dhcp6: false
match:
macaddress: 52:54:00:99:11:99
version: 2
"""

Expand Down
1 change: 1 addition & 0 deletions tools/.github-cla-signers
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
beezly
bipinbachhao
candlerb
dhensby
lucasmoura
matthewruffell
Expand Down