diff -r ddb77f32b35a -r 45bedeba92e5 pvl/hosts/tests.py
--- a/pvl/hosts/tests.py	Sat Mar 07 16:31:11 2015 +0200
+++ b/pvl/hosts/tests.py	Mon Mar 09 18:00:18 2015 +0200
@@ -99,10 +99,12 @@
         ])
 
     def testApplyHostExpand(self):
-        self.assertHostsEqual(config.apply_hosts('test', 'asdf{1-3}', { 'ip': '10.100.100.$' }), [
-                ('asdf1@test', dict(ip=ipaddr.IPAddress('10.100.100.1'))),
-                ('asdf2@test', dict(ip=ipaddr.IPAddress('10.100.100.2'))),
-                ('asdf3@test', dict(ip=ipaddr.IPAddress('10.100.100.3'))),
+        self.assertHostsEqual(config.apply_hosts('test', 'asdf{1-3}', 
+                { 'ip': '10.100.100.$' }
+        ), [
+                ('asdf1@test', dict(ip4=ipaddr.IPAddress('10.100.100.1'))),
+                ('asdf2@test', dict(ip4=ipaddr.IPAddress('10.100.100.2'))),
+                ('asdf3@test', dict(ip4=ipaddr.IPAddress('10.100.100.3'))),
         ])
 
     def testApplyHostsFileError(self):
@@ -119,8 +121,8 @@
         """)
         
         self.assertHostsEqual(config.apply_hosts_config(self.options, conf_file), [
-                ('foo@test', dict(ip=ipaddr.IPAddress('127.0.0.1'))),
-                ('bar@test', dict(ip=ipaddr.IPAddress('127.0.0.2'))),
+                ('foo@test', dict(ip4=ipaddr.IPAddress('127.0.0.1'))),
+                ('bar@test', dict(ip4=ipaddr.IPAddress('127.0.0.2'))),
         ])
 
     def testApplyHostsConfigNested(self):
@@ -135,8 +137,8 @@
         """)
 
         self.assertHostsEqual(config.apply_hosts_config(self.options, conf_file), [
-                ('foo@asdf.test', dict(ip=ipaddr.IPAddress('127.0.0.1'))),
-                ('bar@quux.test', dict(ip=ipaddr.IPAddress('127.0.0.2'))),
+                ('foo@asdf.test', dict(ip4=ipaddr.IPAddress('127.0.0.1'))),
+                ('bar@quux.test', dict(ip4=ipaddr.IPAddress('127.0.0.2'))),
         ])
 
     def testHostsConfigDdefaults(self):
@@ -151,7 +153,7 @@
         
         self.assertHostsEqual(hosts, [
                 ('foo@test', dict(
-                    ip          = ipaddr.IPAddress('192.0.2.1'),
+                    ip4         = ipaddr.IPAddress('192.0.2.1'),
                     ethernet    = { 'eth0': '00:11:22:33:44:55' },
                     boot        = { 'next-server': 'boot.lan', 'filename': '/pxelinux.0' },
                 )),
@@ -162,10 +164,10 @@
     def testApplyIncludes(self):
         self.assertHostsEqual(config.apply_hosts_files(self.options, ['etc/hosts/test']), [
                 ('bar@test', dict(
-                    ip          = ipaddr.IPAddress('192.0.2.2'),
+                    ip4         = ipaddr.IPAddress('192.0.2.2'),
                 )),
                 ('foo@test', dict(
-                    ip          = ipaddr.IPAddress('192.0.2.1'),
+                    ip4         = ipaddr.IPAddress('192.0.2.1'),
                 )),
         ])
 
@@ -176,10 +178,10 @@
 include = etc/hosts/test
         """)), [
                 ('bar@test', dict(
-                    ip          = ipaddr.IPAddress('192.0.2.2'),
+                    ip4         = ipaddr.IPAddress('192.0.2.2'),
                 )),
                 ('foo@test', dict(
-                    ip          = ipaddr.IPAddress('192.0.2.1'),
+                    ip4         = ipaddr.IPAddress('192.0.2.1'),
                 )),
         ])
 
@@ -194,13 +196,13 @@
 
         self.assertHostsEqual(hosts, [
                 ('quux@asdf.test', dict(
-                    ip          = ipaddr.IPAddress('192.0.2.5'),
+                    ip4         = ipaddr.IPAddress('192.0.2.5'),
                 )),
                 ('bar@test', dict(
-                    ip          = ipaddr.IPAddress('192.0.2.2'),
+                    ip4         = ipaddr.IPAddress('192.0.2.2'),
                 )),
                 ('foo@test', dict(
-                    ip          = ipaddr.IPAddress('192.0.2.1'),
+                    ip4         = ipaddr.IPAddress('192.0.2.1'),
                 )),
         ])
 
@@ -216,11 +218,11 @@
     def testApply(self):
         self.assertHostsEqual(config.apply(self.options, ['etc/hosts/example.com']), [
                 ('foo@example.com', dict(
-                    ip          = ipaddr.IPAddress('192.0.2.1'),
+                    ip4         = ipaddr.IPAddress('192.0.2.1'),
                     ethernet    = {None: '00:11:22:33:44:55'},
                 )),
                 ('bar@example.com', dict(
-                    ip          = ipaddr.IPAddress('192.0.2.2'),
+                    ip4         = ipaddr.IPAddress('192.0.2.2'),
                     ethernet    = {None: '01:23:45:67:89:ab'},
                 )),
         ])