summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorScott Moser <smoser@brickies.net>2016-08-23 16:48:42 -0400
committerScott Moser <smoser@brickies.net>2016-08-23 16:48:42 -0400
commite34dfab9fa310324f835ff4fbb2cf0a414b4d65e (patch)
treef166c7dfc532514c57dfae4daaab691687f8f100 /tests
parent06fc05ea20bf42e2fe29d3c9810994e1f7158564 (diff)
parentb029dcefe1ed33be8ed80f2e376ca6874dfd64f7 (diff)
downloadvyos-cloud-init-e34dfab9fa310324f835ff4fbb2cf0a414b4d65e.tar.gz
vyos-cloud-init-e34dfab9fa310324f835ff4fbb2cf0a414b4d65e.zip
merge trunk at 0.7.7~bzr1212
Diffstat (limited to 'tests')
-rw-r--r--tests/unittests/test_net.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/tests/unittests/test_net.py b/tests/unittests/test_net.py
index dfb31710..09235c4d 100644
--- a/tests/unittests/test_net.py
+++ b/tests/unittests/test_net.py
@@ -33,6 +33,7 @@ DHCP_EXPECTED_1 = {
'name': 'eth0',
'type': 'physical',
'subnets': [{'broadcast': '192.168.122.255',
+ 'control': 'manual',
'gateway': '192.168.122.1',
'dns_search': ['foo.com'],
'type': 'dhcp',
@@ -59,7 +60,8 @@ DOMAINSEARCH='foo.com'
STATIC_EXPECTED_1 = {
'name': 'eth1',
'type': 'physical',
- 'subnets': [{'broadcast': '10.0.0.255', 'gateway': '10.0.0.1',
+ 'subnets': [{'broadcast': '10.0.0.255', 'control': 'manual',
+ 'gateway': '10.0.0.1',
'dns_search': ['foo.com'], 'type': 'static',
'netmask': '255.255.255.0',
'dns_nameservers': ['10.0.1.1']}],