diff options
| author | Ryan Harper <ryan.harper@canonical.com> | 2017-10-03 18:56:52 -0500 |
|---|---|---|
| committer | Scott Moser <smoser@brickies.net> | 2017-10-05 12:39:24 -0400 |
| commit | 57e2e01c703cdd1818d4f4ab8a67f37037d78582 (patch) | |
| tree | 08a6404a8effbb84c6a16b18f249442aeadde743 /tests/unittests/test_net.py | |
| parent | aa024e331f8196855fa8d707a2dd7e26e1deab40 (diff) | |
| download | vyos-cloud-init-57e2e01c703cdd1818d4f4ab8a67f37037d78582.tar.gz vyos-cloud-init-57e2e01c703cdd1818d4f4ab8a67f37037d78582.zip | |
network: bridge_stp value not always correct
Update network_state to store the bridge_stp value as a boolean.
The various renderers then can map the boolean value to the correct
output as needed; eni uses 'on/off', sysconfig uses 'yes/no' and
netplan will use the boolean directly.
Update unittest values for sysconfig and netplan. Both contained the
network_state string value which resulted in not correctly enable/disable
STP in the target system.
Update network_state comment (fd -> forward-delay, add stp as boolean) on
bridge commands to match the expected format of a netplan bridge command.
LP: #1721157
Diffstat (limited to 'tests/unittests/test_net.py')
| -rw-r--r-- | tests/unittests/test_net.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tests/unittests/test_net.py b/tests/unittests/test_net.py index f2496151..17c9342b 100644 --- a/tests/unittests/test_net.py +++ b/tests/unittests/test_net.py @@ -756,6 +756,7 @@ pre-down route del -net 10.0.0.0 netmask 255.0.0.0 gw 11.0.0.1 metric 3 || true eth3: 50 eth4: 75 priority: 22 + stp: false routes: - to: ::/0 via: 2001:4800:78ff:1b::1 @@ -820,7 +821,7 @@ pre-down route del -net 10.0.0.0 netmask 255.0.0.0 gw 11.0.0.1 metric 3 || true NM_CONTROLLED=no ONBOOT=yes PRIO=22 - STP=off + STP=no TYPE=Bridge USERCTL=no"""), 'ifcfg-eth0': textwrap.dedent("""\ @@ -1296,7 +1297,7 @@ pre-down route del -net 10.0.0.0 netmask 255.0.0.0 gw 11.0.0.1 metric 3 || true NM_CONTROLLED=no ONBOOT=yes PRIO=22 - STP=off + STP=no TYPE=Bridge USERCTL=no """), |