diff options
| author | Dimitri John Ledkov <xnox@ubuntu.com> | 2017-05-16 14:18:25 +0100 |
|---|---|---|
| committer | Scott Moser <smoser@brickies.net> | 2017-05-26 14:36:38 -0400 |
| commit | 16a7302f6acb69adb0aee75eaf12392fa3688853 (patch) | |
| tree | ec808d6cab9b97ef1de3d29ef91ad78f2537cec9 /tests/unittests | |
| parent | 1815c6d801933c47a01f1a94a8e689824f6797b4 (diff) | |
| download | vyos-cloud-init-16a7302f6acb69adb0aee75eaf12392fa3688853.tar.gz vyos-cloud-init-16a7302f6acb69adb0aee75eaf12392fa3688853.zip | |
net: fix reading and rendering addresses in cidr format.
Input (specifically OpenStack) that had:
"ip_address" : "104.130.20.155",
"netmask" : "255.255.255.0"
Was being rendered to netplan as '104.130.20.155/255.255.255.0'.
That is now fixed to '104.130.20.155/24'
Also fixed is reading of a route that had a network prefix integer
in the 'netmask' rather than a netmask.
LP: #1689346
LP: #1684349
Diffstat (limited to 'tests/unittests')
| -rw-r--r-- | tests/unittests/test_distros/test_netconfig.py | 2 | ||||
| -rw-r--r-- | tests/unittests/test_net.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/unittests/test_distros/test_netconfig.py b/tests/unittests/test_distros/test_netconfig.py index fd7c051f..be9a8318 100644 --- a/tests/unittests/test_distros/test_netconfig.py +++ b/tests/unittests/test_distros/test_netconfig.py @@ -127,7 +127,7 @@ network: ethernets: eth0: addresses: - - 192.168.1.5/255.255.255.0 + - 192.168.1.5/24 gateway4: 192.168.1.254 eth1: dhcp4: true diff --git a/tests/unittests/test_net.py b/tests/unittests/test_net.py index 5169821a..167ed01e 100644 --- a/tests/unittests/test_net.py +++ b/tests/unittests/test_net.py @@ -406,7 +406,7 @@ NETWORK_CONFIGS = { - sach.maas - wark.maas routes: - - to: 0.0.0.0/0.0.0.0 + - to: 0.0.0.0/0 via: 65.61.151.37 set-name: eth99 """).rstrip(' '), |