From b7b7331b9c308d8e1cb0b3dfd4398e6e7cb1b60f Mon Sep 17 00:00:00 2001
From: Ryan Harper <ryan.harper@canonical.com>
Date: Fri, 16 Mar 2018 14:00:15 -0400
Subject: netplan: render bridge port-priority values

Update netplan renderer to write out bridge port-priority values
now that netplan supports the feature.

LP: #1735821
---
 cloudinit/net/netplan.py       | 10 +++++-----
 cloudinit/net/network_state.py |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'cloudinit')

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}}
 
-- 
cgit v1.2.3