diff options
| author | Ryan Harper <ryan.harper@canonical.com> | 2018-03-16 14:00:15 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@brickies.net> | 2018-03-16 14:00:15 -0400 |
| commit | b7b7331b9c308d8e1cb0b3dfd4398e6e7cb1b60f (patch) | |
| tree | 876fd67b90b67f95f9dfe8682d53c846d5874700 | |
| parent | 97012fbb5207ddf1d2dcbb1c5eae710c47ab8ec0 (diff) | |
| download | vyos-cloud-init-b7b7331b9c308d8e1cb0b3dfd4398e6e7cb1b60f.tar.gz vyos-cloud-init-b7b7331b9c308d8e1cb0b3dfd4398e6e7cb1b60f.zip | |
netplan: render bridge port-priority values
Update netplan renderer to write out bridge port-priority values
now that netplan supports the feature.
LP: #1735821
| -rw-r--r-- | cloudinit/net/netplan.py | 10 | ||||
| -rw-r--r-- | cloudinit/net/network_state.py | 2 | ||||
| -rw-r--r-- | tests/unittests/test_net.py | 3 |
3 files changed, 9 insertions, 6 deletions
diff --git a/cloudinit/net/netplan.py b/cloudinit/net/netplan.py index d3788af8..6bee3d37 100644 --- a/cloudinit/net/netplan.py +++ b/cloudinit/net/netplan.py @@ -311,12 +311,12 @@ class Renderer(renderer.Renderer): if newname is None: continue br_config.update({newname: value}) - if newname == 'path-cost': - # <interface> <cost> -> <interface>: int(<cost>) + if newname in ['path-cost', 'port-priority']: + # <interface> <value> -> <interface>: int(<value>) newvalue = {} - for costval in value: - (port, cost) = costval.split() - newvalue[port] = int(cost) + for val in value: + (port, portval) = val.split() + newvalue[port] = int(portval) br_config.update({newname: newvalue}) if len(br_config) > 0: diff --git a/cloudinit/net/network_state.py b/cloudinit/net/network_state.py index fe667d88..1dd7ded7 100644 --- a/cloudinit/net/network_state.py +++ b/cloudinit/net/network_state.py @@ -47,7 +47,7 @@ NET_CONFIG_TO_V2 = { 'bridge_maxage': 'max-age', 'bridge_maxwait': None, 'bridge_pathcost': 'path-cost', - 'bridge_portprio': None, + 'bridge_portprio': 'port-priority', 'bridge_stp': 'stp', 'bridge_waitport': None}} diff --git a/tests/unittests/test_net.py b/tests/unittests/test_net.py index ac33e8ef..9cf11f2e 100644 --- a/tests/unittests/test_net.py +++ b/tests/unittests/test_net.py @@ -758,6 +758,9 @@ pre-down route del -net 10.0.0.0 netmask 255.0.0.0 gw 11.0.0.1 metric 3 || true path-cost: eth3: 50 eth4: 75 + port-priority: + eth3: 28 + eth4: 14 priority: 22 stp: false routes: |