diff options
| author | James Falcon <james.falcon@canonical.com> | 2023-01-24 08:54:05 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-24 15:54:05 +0100 |
| commit | 7d57fcff6d32fd706dd745315c0f8f72d94385eb (patch) | |
| tree | d3e84dd061b0259687e8491e1d53a78beaf11746 | |
| parent | 16cb229b8d2ae5fe8b49fd4df57d203ccbcadbbe (diff) | |
| download | cloud-init-git-7d57fcff6d32fd706dd745315c0f8f72d94385eb.tar.gz | |
Fix default route rendering on v2 ipv6 (#1973)
::/0 would get rendered as ::/64 rather than ::/0 across all renderers
using ipv6 in a v2 config.
LP: #2003562
| -rw-r--r-- | cloudinit/net/network_state.py | 2 | ||||
| -rw-r--r-- | tests/unittests/test_net.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/cloudinit/net/network_state.py b/cloudinit/net/network_state.py index 36cd582e..f88b1321 100644 --- a/cloudinit/net/network_state.py +++ b/cloudinit/net/network_state.py @@ -989,7 +989,7 @@ def _normalize_net_keys(network, address_keys=()): @returns: A dict containing normalized prefix and matching addr_key. """ - net = dict((k, v) for k, v in network.items() if v) + net = {k: v for k, v in network.items() if v or v == 0} addr_key = None for key in address_keys: if net.get(key): diff --git a/tests/unittests/test_net.py b/tests/unittests/test_net.py index 7ed041d0..ec9d76b0 100644 --- a/tests/unittests/test_net.py +++ b/tests/unittests/test_net.py @@ -5225,7 +5225,7 @@ USERCTL=no # Created by cloud-init on instance boot automatically, do not edit. # 2a00:1730:fff9:100::1/128 via ::0 dev eth0 - ::0/64 via 2a00:1730:fff9:100::1 dev eth0 + ::0/0 via 2a00:1730:fff9:100::1 dev eth0 """ # noqa: E501 ), } |