From 45d361cb0b7f5e4e7d79522bd285871898358623 Mon Sep 17 00:00:00 2001 From: Chad Smith Date: Thu, 5 Oct 2017 14:26:34 -0600 Subject: net: Handle bridge stp values of 0 and convert to boolean type Update unit tests to pass a 0 instead of 'off' to validate that network state is properly written. --- cloudinit/net/network_state.py | 2 +- 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 890dbf8d..0e830ee8 100644 --- a/cloudinit/net/network_state.py +++ b/cloudinit/net/network_state.py @@ -468,7 +468,7 @@ class NetworkStateInterpreter(object): # convert value to boolean bridge_stp = iface.get('bridge_stp') - if bridge_stp and type(bridge_stp) != bool: + if bridge_stp is not None and type(bridge_stp) != bool: if bridge_stp in ['on', '1', 1]: bridge_stp = True elif bridge_stp in ['off', '0', 0]: diff --git a/tests/unittests/test_net.py b/tests/unittests/test_net.py index 17c9342b..bbb63cb3 100644 --- a/tests/unittests/test_net.py +++ b/tests/unittests/test_net.py @@ -1283,7 +1283,7 @@ pre-down route del -net 10.0.0.0 netmask 255.0.0.0 gw 11.0.0.1 metric 3 || true - eth0 - eth1 params: - bridge_stp: 'off' + bridge_stp: 0 bridge_bridgeprio: 22 subnets: - type: static -- cgit v1.2.3