diff options
| author | Ryan Harper <ryan.harper@canonical.com> | 2017-06-09 15:33:37 -0500 |
|---|---|---|
| committer | Scott Moser <smoser@brickies.net> | 2017-07-19 16:03:37 -0400 |
| commit | 97abd83513bee191b58f095f4d683b18acce0b49 (patch) | |
| tree | 7a99486512ce8b86197ce9d4ec7a48938f41fd80 /tests/unittests | |
| parent | c0060fe4892197179a5cfbfd3239cf3b6c3e5029 (diff) | |
| download | vyos-cloud-init-97abd83513bee191b58f095f4d683b18acce0b49.tar.gz vyos-cloud-init-97abd83513bee191b58f095f4d683b18acce0b49.zip | |
sysconfig: ipv6 and default gateway fixes.
With this change, entries in IPV6ADDR and IPV6ADDR_SECONDARIES will now
always be in format addr/prefix. When a subnet has a gateway will be
written. If the gateway is ipv6, use the key IPV6_DEFAULTGW rather than
GATEWAY.
LP: #1704872
Diffstat (limited to 'tests/unittests')
| -rw-r--r-- | tests/unittests/test_distros/test_netconfig.py | 6 | ||||
| -rw-r--r-- | tests/unittests/test_net.py | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/tests/unittests/test_distros/test_netconfig.py b/tests/unittests/test_distros/test_netconfig.py index dffe1781..2f505d93 100644 --- a/tests/unittests/test_distros/test_netconfig.py +++ b/tests/unittests/test_distros/test_netconfig.py @@ -476,10 +476,11 @@ NETWORKING=yes # Created by cloud-init on instance boot automatically, do not edit. # BOOTPROTO=none +DEFROUTE=yes DEVICE=eth0 +GATEWAY=192.168.1.254 IPADDR=192.168.1.5 NETMASK=255.255.255.0 -GATEWAY=192.168.1.254 NM_CONTROLLED=no ONBOOT=yes TYPE=Ethernet @@ -626,10 +627,11 @@ IPV6_AUTOCONF=no # Created by cloud-init on instance boot automatically, do not edit. # BOOTPROTO=none +DEFROUTE=yes DEVICE=eth0 IPV6ADDR=2607:f0d0:1002:0011::2/64 -GATEWAY=2607:f0d0:1002:0011::1 IPV6INIT=yes +IPV6_DEFAULTGW=2607:f0d0:1002:0011::1 NM_CONTROLLED=no ONBOOT=yes TYPE=Ethernet diff --git a/tests/unittests/test_net.py b/tests/unittests/test_net.py index 76721bab..22242717 100644 --- a/tests/unittests/test_net.py +++ b/tests/unittests/test_net.py @@ -298,7 +298,7 @@ DEVICE=eth0 GATEWAY=172.19.3.254 HWADDR=fa:16:3e:ed:9a:59 IPADDR=172.19.1.34 -IPV6ADDR=2001:DB8::10 +IPV6ADDR=2001:DB8::10/64 IPV6ADDR_SECONDARIES="2001:DB9::10/64 2001:DB10::10/64" IPV6INIT=yes IPV6_DEFAULTGW=2001:DB8::1 @@ -1161,6 +1161,7 @@ USERCTL=no # Created by cloud-init on instance boot automatically, do not edit. # BOOTPROTO=none +DEFROUTE=yes DEVICE=interface0 GATEWAY=10.0.2.2 HWADDR=52:54:00:12:34:00 |