cloud-init-dev team mailing list archive

[Brian Candler <b.candler@xxxxxxxxx>]

Brian Candler has proposed merging ~b-candler/cloud-init:bridge-parameters into cloud-init:master.

Commit message:
Fixes KeyError for bridge with no "parameters:" setting

LP #1879673

Requested reviews:
  cloud-init Commiters (cloud-init-dev)

For more details, see:
https://code.launchpad.net/~b-candler/cloud-init/+git/cloud-init/+merge/385242

Commit ded1ec81 introduced a regression whereby a bridge with no "parameters:" setting caused a KeyError exception.
-- 
Your team cloud-init Commiters is requested to review the proposed merge of ~b-candler/cloud-init:bridge-parameters into cloud-init:master.

diff --git a/cloudinit/net/network_state.py b/cloudinit/net/network_state.py
index f28973d..4456aea 100644
--- a/cloudinit/net/network_state.py
+++ b/cloudinit/net/network_state.py
@@ -725,7 +725,7 @@ class NetworkStateInterpreter(metaclass=CommandHandlerMeta):
             # we accept the fixed spelling, but write the old for compatability
             # Xenial does not have an updated netplan which supports the
             # correct spelling.  LP: #1756701
-            params = item_params['parameters']
+            params = item_params.get('parameters', {})
             grat_value = params.pop('gratuitous-arp', None)
             if grat_value:
                 params['gratuitious-arp'] = grat_value