diff --git a/generators/input/lille-chicon.rb b/generators/input/lille-chicon.rb
index e5438e821896729302bf07279c00709790c89718..07b367655f37f03dfd745ac9efb929168e9c7ba3 100644
--- a/generators/input/lille-chicon.rb
+++ b/generators/input/lille-chicon.rb
@@ -39,7 +39,7 @@ site :lille do |site_uid|
         network_adapters [{
           :interface => 'Ethernet',
           :rate => 1.G,
-          :mac => lookup('lille',"#{node_uid}", 'mac_eth0'),
+          :mac => lookup('lille-chicon',"#{node_uid}", 'mac_eth0'),
           :vendor => 'Broadcom',
           :version => 'NetXtreme BCM5780',
           :enabled => true,
@@ -49,12 +49,12 @@ site :lille do |site_uid|
           :mounted => true,
           :device => 'eth0',
           :network_address => "#{node_uid}-eth0.#{site_uid}.grid5000.fr",
-          :ip => dns_lookup("#{node_uid}-eth0.#{site_uid}.grid5000.fr"),
+          :ip => lookup('lille-chicon',"#{node_uid}", 'ip_eth0'),
           :switch => 'gw'
         },{
           :interface => 'Ethernet',
           :rate => 1.G,
-          :mac => lookup('lille',"#{node_uid}", 'mac_eth1'),
+          :mac => lookup('lille-chicon',"#{node_uid}", 'mac_eth1'),
           :vendor => 'Broadcom',
           :version => 'NetXtreme BCM5780',
           :enabled => true,
@@ -64,20 +64,20 @@ site :lille do |site_uid|
           :mounted => true,
           :device => 'eth1',
           :network_address => "#{node_uid}.#{site_uid}.grid5000.fr",
-          :ip => dns_lookup("#{node_uid}.#{site_uid}.grid5000.fr"),
+          :ip => lookup('lille-chicon',"#{node_uid}", 'ip_eth1'),
           :switch => 'gw',
-          :switch_port => lookup('lille', "#{node_uid}", 'switch_port')
+          :switch_port => lookup('lille-chicon', "#{node_uid}", 'switch_port')
         },{
           :interface => 'Ethernet',
           :rate => 1.G,
-          :mac => lookup('lille',"#{node_uid}", 'mac_mgt'),
+          :mac => lookup('lille-chicon',"#{node_uid}", 'mac_mgt'),
           :vendor => 'IBM',
           :version => '1.18',
           :enabled => true,
           :management => true,
           :mountable => false,
           :network_address => "#{node_uid}-rsa.#{site_uid}.grid5000.fr",
-          :ip => dns_lookup("#{node_uid}-rsa.#{site_uid}.grid5000.fr"),
+          :ip => lookup('lille-chicon',"#{node_uid}", 'ip_mgt'),
           :switch => 'gw'
         },{
           :interface => 'Myrinet',
@@ -92,7 +92,7 @@ site :lille do |site_uid|
           :mounted => true,
           :device => 'myri0',
           :network_address => "#{node_uid}-myri0.#{site_uid}.grid5000.fr",
-          :ip => dns_lookup("#{node_uid}-myri0.#{site_uid}.grid5000.fr"),
+          :ip => lookup('lille-chicon',"#{node_uid}", 'ip_myri0'),
           :switch => nil
         }]
       end
diff --git a/generators/input/lille-chicon.yaml b/generators/input/lille-chicon.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..875223ad019cc6c2bc9f3ecf4e2461441928438c
--- /dev/null
+++ b/generators/input/lille-chicon.yaml
@@ -0,0 +1,261 @@
+---
+chicon-1:
+  mac_eth0: 00:11:25:c4:d4:a0
+  ip_eth0: 192.168.160.74
+  mac_eth1: 00:11:25:c4:d4:a1
+  ip_eth1: 192.168.159.74
+  mac_myri0: 00:60:dd:47:49:df
+  ip_myri0: 192.168.162.74
+  ip_mgt: 192.168.158.74
+  mac_mgt: 00:19:A9:9F:48:C0
+  switch_port: Gi3/34
+chicon-2:
+  mac_eth0: 00:11:25:c4:d9:c4
+  ip_eth0: 192.168.160.75
+  mac_eth1: 00:11:25:c4:d9:c5
+  ip_eth1: 192.168.159.75
+  mac_myri0: 00:60:dd:47:4b:3f
+  ip_myri0: 192.168.162.75
+  ip_mgt: 192.168.158.75
+  mac_mgt: 00:19:A9:9F:48:C0
+  switch_port: Gi3/35
+chicon-3:
+  mac_eth0: 00:11:25:c4:d9:d8
+  ip_eth0: 192.168.160.76
+  mac_eth1: 00:11:25:c4:d9:d9
+  ip_eth1: 192.168.159.76
+  mac_myri0: 00:60:dd:47:4b:46
+  ip_myri0: 192.168.162.76
+  ip_mgt: 192.168.158.76
+  mac_mgt: 00:19:A9:9F:48:C0
+  switch_port: Gi3/36
+chicon-4:
+  mac_eth0: 00:11:25:c4:d9:ba
+  ip_eth0: 192.168.160.77
+  mac_eth1: 00:11:25:c4:d9:bb
+  ip_eth1: 192.168.159.77
+  mac_myri0: 00:60:dd:47:4b:9e
+  ip_myri0: 192.168.162.77
+  ip_mgt: 192.168.158.77
+  mac_mgt: 00:19:A9:9F:48:C0
+  switch_port: Gi3/37
+chicon-5:
+  mac_eth0: 00:11:25:c4:d9:ac
+  ip_eth0: 192.168.160.78
+  mac_eth1: 00:11:25:c4:d9:ad
+  ip_eth1: 192.168.159.78
+  mac_myri0: 00:60:dd:47:4b:44
+  ip_myri0: 192.168.162.78
+  ip_mgt: 192.168.158.78
+  mac_mgt: 00:19:A9:9F:48:C0
+  switch_port: Gi3/38
+chicon-6:
+  mac_eth0: 00:11:25:c4:c7:72
+  ip_eth0: 192.168.160.79
+  mac_eth1: 00:11:25:c4:c7:73
+  ip_eth1: 192.168.159.79
+  mac_myri0: 00:60:dd:47:4b:99
+  ip_myri0: 192.168.162.79
+  ip_mgt: 192.168.158.79
+  mac_mgt: 00:19:A9:9F:48:C0
+  switch_port: Gi3/39
+chicon-7:
+  mac_eth0: 00:11:25:c4:d9:c2
+  ip_eth0: 192.168.160.80
+  mac_eth1: 00:11:25:c4:d9:c3
+  ip_eth1: 192.168.159.80
+  mac_myri0: 00:60:dd:47:4c:de
+  ip_myri0: 192.168.162.80
+  ip_mgt: 192.168.158.80
+  mac_mgt: 00:19:A9:9F:48:C0
+  switch_port: Gi3/40
+chicon-8:
+  mac_eth0: 00:11:25:c4:d5:94
+  ip_eth0: 192.168.160.81
+  mac_eth1: 00:11:25:c4:d5:95
+  ip_eth1: 192.168.159.81
+  mac_myri0: 00:60:dd:47:4c:db
+  ip_myri0: 192.168.162.81
+  ip_mgt: 192.168.158.81
+  mac_mgt: 00:19:A9:9F:48:C0
+  switch_port: Gi4/1
+chicon-9:
+  mac_eth0: 00:11:25:c4:d9:b0
+  ip_eth0: 192.168.160.82
+  mac_eth1: 00:11:25:c4:d9:b1
+  ip_eth1: 192.168.159.82
+  mac_myri0: 00:60:dd:47:4b:40
+  ip_myri0: 192.168.162.82
+  ip_mgt: 192.168.158.82
+  mac_mgt: 00:19:A9:9F:48:C0
+  switch_port: Gi4/2
+chicon-10:
+  mac_eth0: 00:11:25:c4:d9:c8
+  ip_eth0: 192.168.160.83
+  mac_eth1: 00:11:25:c4:d9:c9
+  ip_eth1: 192.168.159.83
+  mac_myri0: 00:60:dd:47:49:ea
+  ip_myri0: 192.168.162.83
+  ip_mgt: 192.168.158.83
+  mac_mgt: 00:19:A9:9F:48:C0
+  switch_port: Gi4/3
+chicon-11:
+  mac_eth0: 00:11:25:c4:d9:9c
+  ip_eth0: 192.168.160.84
+  mac_eth1: 00:11:25:c4:d9:9d
+  ip_eth1: 192.168.159.84
+  mac_myri0: 00:60:dd:47:4c:df
+  ip_myri0: 192.168.162.84
+  ip_mgt: 192.168.158.84
+  mac_mgt: 00:19:A9:9F:48:C0
+  switch_port: Gi4/4
+chicon-12:
+  mac_eth0: 00:11:25:c4:d9:a2
+  ip_eth0: 192.168.160.85
+  mac_eth1: 00:11:25:c4:d9:a3
+  ip_eth1: 192.168.159.85
+  mac_myri0: 00:60:dd:47:49:a5
+  ip_myri0: 192.168.162.85
+  ip_mgt: 192.168.158.85
+  mac_mgt: 00:19:A9:9F:48:C0
+  switch_port: Gi4/5
+chicon-13:
+  mac_eth0: 00:11:25:c4:d9:ae
+  ip_eth0: 192.168.160.86
+  mac_eth1: 00:11:25:c4:d9:af
+  ip_eth1: 192.168.159.86
+  mac_myri0: 00:60:dd:47:49:de
+  ip_myri0: 192.168.162.86
+  ip_mgt: 192.168.158.86
+  mac_mgt: 00:19:A9:9F:48:C0
+  switch_port: Gi4/6
+chicon-14:
+  mac_eth0: 00:11:25:c4:f5:7e
+  ip_eth0: 192.168.160.87
+  mac_eth1: 00:11:25:c4:f5:7f
+  ip_eth1: 192.168.159.87
+  mac_myri0: 00:60:dd:47:49:b1
+  ip_myri0: 192.168.162.87
+  ip_mgt: 192.168.158.87
+  mac_mgt: 00:19:A9:9F:48:C0
+  switch_port: Gi4/7
+chicon-15:
+  mac_eth0: 00:11:25:c4:d9:d6
+  ip_eth0: 192.168.160.88
+  mac_eth1: 00:11:25:c4:d9:d7
+  ip_eth1: 192.168.159.88
+  mac_myri0: 00:60:dd:47:4b:bc
+  ip_myri0: 192.168.162.88
+  ip_mgt: 192.168.158.88
+  mac_mgt: 00:19:A9:9F:48:C0
+  switch_port: Gi4/8
+chicon-16:
+  mac_eth0: 00:11:25:c4:d8:62
+  ip_eth0: 192.168.160.89
+  mac_eth1: 00:11:25:c4:d8:63
+  ip_eth1: 192.168.159.89
+  mac_myri0: 00:60:dd:47:49:99
+  ip_myri0: 192.168.162.89
+  ip_mgt: 192.168.158.89
+  mac_mgt: 00:19:A9:9F:48:C0
+  switch_port: Gi4/9
+chicon-17:
+  mac_eth0: 00:11:25:c4:e0:d8
+  ip_eth0: 192.168.160.90
+  mac_eth1: 00:11:25:c4:e0:d9
+  ip_eth1: 192.168.159.90
+  mac_myri0: 00:60:dd:47:49:ae
+  ip_myri0: 192.168.162.90
+  ip_mgt: 192.168.158.90
+  mac_mgt: 00:19:A9:9F:48:C0
+  switch_port: Gi4/10
+chicon-18:
+  mac_eth0: 00:11:25:c4:d9:cc
+  ip_eth0: 192.168.160.91
+  mac_eth1: 00:11:25:c4:d9:cd
+  ip_eth1: 192.168.159.91
+  mac_myri0: 00:60:dd:47:49:b3
+  ip_myri0: 192.168.162.91
+  ip_mgt: 192.168.158.91
+  mac_mgt: 00:19:A9:9F:48:C0
+  switch_port: Gi4/11
+chicon-19:
+  mac_eth0: 00:11:25:c4:d5:c6
+  ip_eth0: 192.168.160.92
+  mac_eth1: 00:11:25:c4:d5:c7
+  ip_eth1: 192.168.159.92
+  mac_myri0: 00:60:dd:47:49:a0
+  ip_myri0: 192.168.162.92
+  ip_mgt: 192.168.158.92
+  mac_mgt: 00:19:A9:9F:48:C0
+  switch_port: Gi4/12
+chicon-20:
+  mac_eth0: 00:11:25:c4:d9:d0
+  ip_eth0: 192.168.160.93
+  mac_eth1: 00:11:25:c4:d9:d1
+  ip_eth1: 192.168.159.93
+  mac_myri0: 00:60:dd:47:49:9b
+  ip_myri0: 192.168.162.93
+  ip_mgt: 192.168.158.93
+  mac_mgt: 00:19:A9:9F:48:C0
+  switch_port: Gi4/13
+chicon-21:
+  mac_eth0: 00:11:25:c4:d9:9e
+  ip_eth0: 192.168.160.94
+  mac_eth1: 00:11:25:c4:d9:9f
+  ip_eth1: 192.168.159.94
+  mac_myri0: 00:60:dd:47:49:a7
+  ip_myri0: 192.168.162.94
+  ip_mgt: 192.168.158.94
+  mac_mgt: 00:19:A9:9F:48:C0
+  switch_port: Gi4/14
+chicon-22:
+  mac_eth0: 00:11:25:c4:f2:f4
+  ip_eth0: 192.168.160.95
+  mac_eth1: 00:11:25:c4:f2:f5
+  ip_eth1: 192.168.159.95
+  mac_myri0: 00:60:dd:47:49:a9
+  ip_myri0: 192.168.162.95
+  ip_mgt: 192.168.158.95
+  mac_mgt: 00:19:A9:9F:48:C0
+  switch_port: Gi4/15
+chicon-23:
+  mac_eth0: 00:11:25:c4:c4:dc
+  ip_eth0: 192.168.160.96
+  mac_eth1: 00:11:25:c4:c4:dd
+  ip_eth1: 192.168.159.96
+  mac_myri0: 00:60:dd:47:49:a8
+  ip_myri0: 192.168.162.96
+  ip_mgt: 192.168.158.96
+  mac_mgt: 00:19:A9:9F:48:C0
+  switch_port: Gi4/16
+chicon-24:
+  mac_eth0: 00:11:25:c4:d9:9a
+  ip_eth0: 192.168.160.97
+  mac_eth1: 00:11:25:c4:d9:9b
+  ip_eth1: 192.168.159.97
+  mac_myri0: 00:60:dd:47:49:b0
+  ip_myri0: 192.168.162.97
+  ip_mgt: 192.168.158.97
+  mac_mgt: 00:19:A9:9F:48:C0
+  switch_port: Gi4/17
+chicon-25:
+  mac_eth0: 00:11:25:c4:d5:ba
+  ip_eth0: 192.168.160.98
+  mac_eth1: 00:11:25:c4:d5:bb
+  ip_eth1: 192.168.159.98
+  mac_myri0: 00:60:dd:47:4b:b9
+  ip_myri0: 192.168.162.98
+  ip_mgt: 192.168.158.98
+  mac_mgt: 00:19:A9:9F:48:C0
+  switch_port: Gi4/18
+chicon-26:
+  mac_eth0: 00:11:25:c4:d5:b4
+  ip_eth0: 192.168.160.99
+  mac_eth1: 00:11:25:c4:d5:b5
+  ip_eth1: 192.168.159.99
+  mac_myri0: 00:60:dd:47:4c:8c
+  ip_myri0: 192.168.162.99
+  ip_mgt: 192.168.158.99
+  mac_mgt: 00:19:A9:9F:48:C0
+  switch_port: Gi4/19
diff --git a/generators/input/lille-chimint.rb b/generators/input/lille-chimint.rb
index cdf0167197aa9ec50fecf92d15a9a38c37b40d7b..020fae947fc1e3d1f9501b8f37d568f9e869fbb4 100644
--- a/generators/input/lille-chimint.rb
+++ b/generators/input/lille-chimint.rb
@@ -42,7 +42,7 @@ site :lille do |site_uid|
         network_adapters [{
           :interface => 'Ethernet',
           :rate => 1.G,
-          :mac => lookup('lille', node_uid, 'network_interfaces', 'eth0', 'mac'),
+          :mac => lookup('lille-chimint', node_uid, 'network_interfaces', 'eth0', 'mac'),
           :vendor => 'Broadcom',
           :version => 'NetXtreme II BCM5716',
           :enabled => true,
@@ -52,12 +52,12 @@ site :lille do |site_uid|
           :mounted => true,
           :device => 'eth0',
           :network_address => "#{node_uid}-eth0.#{site_uid}.grid5000.fr",
-          :ip => dns_lookup("#{node_uid}-eth0.#{site_uid}.grid5000.fr"),
+          :ip => lookup('lille-chimint', node_uid, 'network_interfaces', 'eth0', 'ip'),
           :switch => 'gw'
         },{
           :interface => 'Ethernet',
           :rate => 1.G,
-          :mac => lookup('lille', node_uid, 'network_interfaces', 'eth1', 'mac'),
+          :mac => lookup('lille-chimint', node_uid, 'network_interfaces', 'eth1', 'mac'),
           :vendor => 'Broadcom',
           :version => 'NetXtreme II BCM5716',
           :enabled => true,
@@ -67,20 +67,20 @@ site :lille do |site_uid|
           :mounted => true,
           :device => 'eth1',
           :network_address => "#{node_uid}.#{site_uid}.grid5000.fr",
-          :ip => dns_lookup("#{node_uid}.#{site_uid}.grid5000.fr"),
+          :ip => lookup('lille-chimint', node_uid, 'network_interfaces', 'eth1', 'ip'),
           :switch => 'gw',
-          :switch_port => lookup('lille', node_uid, 'network_interfaces', 'eth1', 'switch_port')
+          :switch_port => lookup('lille-chimint', node_uid, 'network_interfaces', 'eth1', 'switch_port')
         },{
           :interface => 'Ethernet',
           :rate => 1.G,
-          :mac => lookup('lille', node_uid, 'network_interfaces', 'bmc', 'mac'),
+          :mac => lookup('lille-chimint', node_uid, 'network_interfaces', 'bmc', 'mac'),
           :vendor => 'Dell',
           :version => '1.54',
           :enabled => true,
           :management => true,
           :mountable => false,
           :network_address => "#{node_uid}-ipmi.#{site_uid}.grid5000.fr",
-          :ip => dns_lookup("#{node_uid}-ipmi.#{site_uid}.grid5000.fr"),
+          :ip => lookup('lille-chimint', node_uid, 'network_interfaces', 'bmc', 'ip'),
           :switch => 'gw'
         }]
       end
diff --git a/generators/input/lille-chimint.yaml b/generators/input/lille-chimint.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..ad01fb7052f8972f252afc65dd1a07ecb3aa5ed5
--- /dev/null
+++ b/generators/input/lille-chimint.yaml
@@ -0,0 +1,500 @@
+chimint-1:
+  bios:
+    version: 1.5.3
+    vendor: Dell Inc.
+    release_date: 10/22/2010
+  network_interfaces:
+    bmc:
+      mac: 84:2b:2b:72:d4:81
+      ip: 192.168.158.1
+    eth0:
+      mac: 84:2b:2b:72:d4:7f
+      ip: 192.168.160.1
+    eth1:
+      mac: 84:2b:2b:72:d4:80
+      ip: 192.168.159.1
+  chassis:
+    serial_number: DQM1Z4J
+    manufacturer: Dell Inc.
+    product_name: PowerEdge R410
+  block_devices:
+    sda:
+      model: PERC H700
+      size: 570949632
+      rev: 2.10
+      vendor: DELL
+chimint-2:
+  bios:
+    version: 1.5.3
+    vendor: Dell Inc.
+    release_date: 10/22/2010
+  network_interfaces:
+    bmc:
+      mac: 84:2b:2b:70:4f:4e
+      ip: 192.168.158.2
+    eth0:
+      mac: 84:2b:2b:70:4f:4c
+      ip: 192.168.160.2
+    eth1:
+      mac: 84:2b:2b:70:4f:4d
+      ip: 192.168.159.2
+  chassis:
+    serial_number: 8RM1Z4J
+    manufacturer: Dell Inc.
+    product_name: PowerEdge R410
+  block_devices:
+    sda:
+      model: PERC H700
+      size: 570949632
+      rev: 2.10
+      vendor: DELL
+chimint-3:
+  bios:
+    version: 1.5.3
+    vendor: Dell Inc.
+    release_date: 10/22/2010
+  network_interfaces:
+    bmc:
+      mac: 84:2b:2b:70:4e:20
+      ip: 192.168.158.3
+    eth0:
+      mac: 84:2b:2b:70:4e:1e
+      ip: 192.168.160.3
+    eth1:
+      mac: 84:2b:2b:70:4e:1f
+      ip: 192.168.159.3
+  chassis:
+    serial_number: 2RM1Z4J
+    manufacturer: Dell Inc.
+    product_name: PowerEdge R410
+  block_devices:
+    sda:
+      model: PERC H700
+      size: 570949632
+      rev: 2.10
+      vendor: DELL
+chimint-4:
+  bios:
+    version: 1.5.3
+    vendor: Dell Inc.
+    release_date: 10/22/2010
+  network_interfaces:
+    bmc:
+      mac: 84:2b:2b:70:cc:8b
+      ip: 192.168.158.4
+    eth0:
+      mac: 84:2b:2b:70:cc:89
+      ip: 192.168.160.4
+    eth1:
+      mac: 84:2b:2b:70:cc:8a
+      ip: 192.168.159.4
+  chassis:
+    serial_number: 3RM1Z4J
+    manufacturer: Dell Inc.
+    product_name: PowerEdge R410
+  block_devices:
+    sda:
+      model: PERC H700
+      size: 570949632
+      rev: 2.10
+      vendor: DELL
+chimint-5:
+  bios:
+    version: 1.5.3
+    vendor: Dell Inc.
+    release_date: 10/22/2010
+  network_interfaces:
+    bmc:
+      mac: 84:2b:2b:70:cc:94
+      ip: 192.168.158.5
+    eth0:
+      mac: 84:2b:2b:70:cc:92
+      ip: 192.168.160.5
+    eth1:
+      mac: 84:2b:2b:70:cc:93
+      ip: 192.168.159.5
+  chassis:
+    serial_number: 6RM1Z4J
+    manufacturer: Dell Inc.
+    product_name: PowerEdge R410
+  block_devices:
+    sda:
+      model: PERC H700
+      size: 570949632
+      rev: 2.10
+      vendor: DELL
+chimint-6:
+  bios:
+    version: 1.5.3
+    vendor: Dell Inc.
+    release_date: 10/22/2010
+  network_interfaces:
+    bmc:
+      mac: 84:2b:2b:72:d5:a0
+      ip: 192.168.158.6
+    eth0:
+      mac: 84:2b:2b:72:d5:9e
+      ip: 192.168.160.6
+    eth1:
+      mac: 84:2b:2b:72:d5:9f
+      ip: 192.168.159.6
+  chassis:
+    serial_number: FQM1Z4J
+    manufacturer: Dell Inc.
+    product_name: PowerEdge R410
+  block_devices:
+    sda:
+      model: PERC H700
+      size: 570949632
+      rev: 2.10
+      vendor: DELL
+chimint-7:
+  bios:
+    version: 1.5.3
+    vendor: Dell Inc.
+    release_date: 10/22/2010
+  network_interfaces:
+    bmc:
+      mac: 84:2b:2b:72:b3:46
+      ip: 192.168.158.7
+    eth0:
+      mac: 84:2b:2b:72:b3:44
+      ip: 192.168.160.7
+    eth1:
+      mac: 84:2b:2b:72:b3:45
+      ip: 192.168.159.7
+  chassis:
+    serial_number: 5RM1Z4J
+    manufacturer: Dell Inc.
+    product_name: PowerEdge R410
+  block_devices:
+    sda:
+      model: PERC H700
+      size: 570949632
+      rev: 2.10
+      vendor: DELL
+chimint-8:
+  bios:
+    version: 1.5.3
+    vendor: Dell Inc.
+    release_date: 10/22/2010
+  network_interfaces:
+    bmc:
+      mac: 84:2b:2b:72:da:c5
+      ip: 192.168.158.8
+    eth0:
+      mac: 84:2b:2b:72:da:c3
+      ip: 192.168.160.8
+    eth1:
+      mac: 84:2b:2b:72:da:c4
+      ip: 192.168.159.8
+  chassis:
+    serial_number: CRM1Z4J
+    manufacturer: Dell Inc.
+    product_name: PowerEdge R410
+  block_devices:
+    sda:
+      model: PERC H700
+      size: 570949632
+      rev: 2.10
+      vendor: DELL
+chimint-9:
+  bios:
+    version: 1.5.3
+    vendor: Dell Inc.
+    release_date: 10/22/2010
+  network_interfaces:
+    bmc:
+      mac: 84:2b:2b:72:cb:e5
+      ip: 192.168.158.9
+    eth0:
+      mac: 84:2b:2b:72:cb:e3
+      ip: 192.168.160.9
+    eth1:
+      mac: 84:2b:2b:72:cb:e4
+      ip: 192.168.159.9
+  chassis:
+    serial_number: 4RM1Z4J
+    manufacturer: Dell Inc.
+    product_name: PowerEdge R410
+  block_devices:
+    sda:
+      model: PERC H700
+      size: 570949632
+      rev: 2.10
+      vendor: DELL
+chimint-10:
+  bios:
+    version: 1.5.3
+    vendor: Dell Inc.
+    release_date: 10/22/2010
+  network_interfaces:
+    bmc:
+      mac: 84:2b:2b:72:d4:4b
+      ip: 192.168.158.10
+    eth0:
+      mac: 84:2b:2b:72:d4:49
+      ip: 192.168.160.10
+    eth1:
+      mac: 84:2b:2b:72:d4:4a
+      ip: 192.168.159.10
+  chassis:
+    serial_number: 9QM1Z4J
+    manufacturer: Dell Inc.
+    product_name: PowerEdge R410
+  block_devices:
+    sda:
+      model: PERC H700
+      size: 570949632
+      rev: 2.10
+      vendor: DELL
+chimint-11:
+  bios:
+    version: 1.5.3
+    vendor: Dell Inc.
+    release_date: 10/22/2010
+  network_interfaces:
+    bmc:
+      mac: 84:2b:2b:70:c9:9f
+      ip: 192.168.158.11
+    eth0:
+      mac: 84:2b:2b:70:c9:9d
+      ip: 192.168.160.11
+    eth1:
+      mac: 84:2b:2b:70:c9:9e
+      ip: 192.168.159.11
+  chassis:
+    serial_number: BRM1Z4J
+    manufacturer: Dell Inc.
+    product_name: PowerEdge R410
+  block_devices:
+    sda:
+      model: PERC H700
+      size: 570949632
+      rev: 2.10
+      vendor: DELL
+chimint-12:
+  bios:
+    version: 1.5.3
+    vendor: Dell Inc.
+    release_date: 10/22/2010
+  network_interfaces:
+    bmc:
+      mac: 84:2b:2b:72:d5:ec
+      ip: 192.168.158.12
+    eth0:
+      mac: 84:2b:2b:72:d5:ea
+      ip: 192.168.160.12
+    eth1:
+      mac: 84:2b:2b:72:d5:eb
+      ip: 192.168.159.12
+  chassis:
+    serial_number: BQM1Z4J
+    manufacturer: Dell Inc.
+    product_name: PowerEdge R410
+  block_devices:
+    sda:
+      model: PERC H700
+      size: 570949632
+      rev: 2.10
+      vendor: DELL
+chimint-13:
+  bios:
+    version: 1.5.3
+    vendor: Dell Inc.
+    release_date: 10/22/2010
+  network_interfaces:
+    bmc:
+      mac: 84:2b:2b:71:f1:26
+      ip: 192.168.158.13
+    eth0:
+      mac: 84:2b:2b:71:f1:24
+      ip: 192.168.160.13
+    eth1:
+      mac: 84:2b:2b:71:f1:25
+      ip: 192.168.159.13
+  chassis:
+    serial_number: 9RM1Z4J
+    manufacturer: Dell Inc.
+    product_name: PowerEdge R410
+  block_devices:
+    sda:
+      model: PERC H700
+      size: 570949632
+      rev: 2.10
+      vendor: DELL
+chimint-14:
+  bios:
+    version: 1.5.3
+    vendor: Dell Inc.
+    release_date: 10/22/2010
+  network_interfaces:
+    bmc:
+      mac: 84:2b:2b:72:d5:69
+      ip: 192.168.158.14
+    eth0:
+      mac: 84:2b:2b:72:d5:67
+      ip: 192.168.160.14
+    eth1:
+      mac: 84:2b:2b:72:d5:68
+      ip: 192.168.159.14
+  chassis:
+    serial_number: CQM1Z4J
+    manufacturer: Dell Inc.
+    product_name: PowerEdge R410
+  block_devices:
+    sda:
+      model: PERC H700
+      size: 570949632
+      rev: 2.10
+      vendor: DELL
+chimint-15:
+  bios:
+    version: 1.5.3
+    vendor: Dell Inc.
+    release_date: 10/22/2010
+  network_interfaces:
+    bmc:
+      mac: 84:2b:2b:72:d7:7c
+      ip: 192.168.158.15
+    eth0:
+      mac: 84:2b:2b:72:d7:7a
+      ip: 192.168.160.15
+    eth1:
+      mac: 84:2b:2b:72:d7:7b
+      ip: 192.168.159.15
+  chassis:
+    serial_number: HQM1Z4J
+    manufacturer: Dell Inc.
+    product_name: PowerEdge R410
+  block_devices:
+    sda:
+      model: PERC H700
+      size: 570949632
+      rev: 2.10
+      vendor: DELL
+chimint-16:
+  bios:
+    version: 1.5.3
+    vendor: Dell Inc.
+    release_date: 10/22/2010
+  network_interfaces:
+    bmc:
+      mac: 84:2b:2b:72:d5:dd
+      ip: 192.168.158.16
+    eth0:
+      mac: 84:2b:2b:72:d5:db
+      ip: 192.168.160.16
+    eth1:
+      mac: 84:2b:2b:72:d5:dc
+      ip: 192.168.159.16
+  chassis:
+    serial_number: JQM1Z4J
+    manufacturer: Dell Inc.
+    product_name: PowerEdge R410
+  block_devices:
+    sda:
+      model: PERC H700
+      size: 570949632
+      rev: 2.10
+      vendor: DELL
+chimint-17:
+  bios:
+    version: 1.5.3
+    vendor: Dell Inc.
+    release_date: 10/22/2010
+  network_interfaces:
+    bmc:
+      mac: 84:2b:2b:70:f6:94
+      ip: 192.168.158.17
+    eth0:
+      mac: 84:2b:2b:70:f6:92
+      ip: 192.168.160.17
+    eth1:
+      mac: 84:2b:2b:70:f6:93
+      ip: 192.168.159.17
+  chassis:
+    serial_number: 8QM1Z4J
+    manufacturer: Dell Inc.
+    product_name: PowerEdge R410
+  block_devices:
+    sda:
+      model: PERC H700
+      size: 570949632
+      rev: 2.10
+      vendor: DELL
+chimint-18:
+  bios:
+    version: 1.5.3
+    vendor: Dell Inc.
+    release_date: 10/22/2010
+  network_interfaces:
+    bmc:
+      mac: 84:2b:2b:72:d7:8b
+      ip: 192.168.158.18
+    eth0:
+      mac: 84:2b:2b:72:d7:89
+      ip: 192.168.160.18
+    eth1:
+      mac: 84:2b:2b:72:d7:8a
+      ip: 192.168.159.18
+  chassis:
+    serial_number: GQM1Z4J
+    manufacturer: Dell Inc.
+    product_name: PowerEdge R410
+  block_devices:
+    sda:
+      model: PERC H700
+      size: 570949632
+      rev: 2.10
+      vendor: DELL
+chimint-19:
+  bios:
+    version: 1.5.3
+    vendor: Dell Inc.
+    release_date: 10/22/2010
+  network_interfaces:
+    bmc:
+      mac: 84:2b:2b:70:c6:23
+      ip: 192.168.158.19
+    eth0:
+      mac: 84:2b:2b:70:c6:21
+      ip: 192.168.160.19
+    eth1:
+      mac: 84:2b:2b:70:c6:22
+      ip: 192.168.159.19
+  chassis:
+    serial_number: 1RM1Z4J
+    manufacturer: Dell Inc.
+    product_name: PowerEdge R410
+  block_devices:
+    sda:
+      model: PERC H700
+      size: 570949632
+      rev: 2.10
+      vendor: DELL
+chimint-20:
+  bios:
+    version: 1.5.3
+    vendor: Dell Inc.
+    release_date: 10/22/2010
+  network_interfaces:
+    bmc:
+      mac: 84:2b:2b:70:c3:d7
+      ip: 192.168.158.20
+    eth0:
+      mac: 84:2b:2b:70:c3:d5
+      ip: 192.168.160.20
+    eth1:
+      mac: 84:2b:2b:70:c3:d6
+      ip: 192.168.159.20
+  chassis:
+    serial_number: 7RM1Z4J
+    manufacturer: Dell Inc.
+    product_name: PowerEdge R410
+  block_devices:
+    sda:
+      model: PERC H700
+      size: 570949632
+      rev: 2.10
+      vendor: DELL
diff --git a/generators/input/lille-chinqchint.rb b/generators/input/lille-chinqchint.rb
index 460ebc4a39ff266c517a8ee245d7872b23e0f03a..508370db1ef9f743cd1bdae2982d86e8b887737f 100644
--- a/generators/input/lille-chinqchint.rb
+++ b/generators/input/lille-chinqchint.rb
@@ -39,7 +39,7 @@ site :lille do |site_uid|
         network_adapters [{
           :interface => 'Ethernet',
           :rate => 1.G,
-          :mac => lookup('lille',"#{node_uid}", 'mac_eth0'),
+          :mac => lookup('lille-chinqchint',"#{node_uid}", 'mac_eth0'),
           :vendor => 'Intel',
           :version => '80003ES2LAN',
           :enabled => true,
@@ -49,12 +49,12 @@ site :lille do |site_uid|
           :mounted => true,
           :device => 'eth0',
           :network_address => "#{node_uid}-eth0.#{site_uid}.grid5000.fr",
-          :ip => dns_lookup("#{node_uid}-eth0.#{site_uid}.grid5000.fr"),
+          :ip => lookup('lille-chinqchint',"#{node_uid}", 'ip_eth0'),
           :switch => 'gw'
         },{
           :interface => 'Ethernet',
           :rate => 1.G,
-          :mac => lookup('lille',"#{node_uid}", 'mac_eth1'),
+          :mac => lookup('lille-chinqchint',"#{node_uid}", 'mac_eth1'),
           :vendor => 'Intel',
           :version => '80003ES2LAN',
           :enabled => true,
@@ -64,20 +64,20 @@ site :lille do |site_uid|
           :mounted => true,
           :device => 'eth1',
           :network_address => "#{node_uid}.#{site_uid}.grid5000.fr",
-          :ip => dns_lookup("#{node_uid}.#{site_uid}.grid5000.fr"),
+          :ip => lookup('lille-chinqchint',"#{node_uid}", 'ip_eth1'),
           :switch => 'gw',
-          :switch_port => lookup('lille', "#{node_uid}", 'switch_port')
+          :switch_port => lookup('lille-chinqchint', "#{node_uid}", 'switch_port')
         },{
           :interface => 'Ethernet',
           :rate => 1.G,
-          :mac => lookup('lille',"#{node_uid}", 'mac_mgt'),
+          :mac => lookup('lille-chinqchint',"#{node_uid}", 'mac_mgt'),
           :vendor => 'Peppercon',
           :version => '1.46',
           :enabled => true,
           :management => true,
           :mountable => false,
           :network_address => "#{node_uid}-ipmi.#{site_uid}.grid5000.fr",
-          :ip => dns_lookup("#{node_uid}-ipmi.#{site_uid}.grid5000.fr"),
+          :ip => lookup('lille-chinqchint',"#{node_uid}", 'ip_mgt'),
           :switch => 'gw'
         },{
           :interface => 'Myrinet',
@@ -92,7 +92,7 @@ site :lille do |site_uid|
           :mounted => true,
           :device => 'myri0',
           :network_address => "#{node_uid}-myri0.#{site_uid}.grid5000.fr",
-          :ip => dns_lookup("#{node_uid}-myri0.#{site_uid}.grid5000.fr"),
+          :ip => lookup('lille-chinqchint',"#{node_uid}", 'ip_myri0'),
           :switch => nil
         }]
       end
diff --git a/generators/input/lille-chinqchint.yaml b/generators/input/lille-chinqchint.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..8f721a656c2c3d29af347c898a340df68e040d73
--- /dev/null
+++ b/generators/input/lille-chinqchint.yaml
@@ -0,0 +1,450 @@
+---
+chinqchint-1:
+  mac_eth0: 00:30:48:7c:7c:86
+  ip_eth0: 192.168.160.100
+  mac_eth1: 00:30:48:7c:7c:87
+  ip_eth1: 192.168.159.100
+  mac_myri0: 00:60:dd:47:4d:4a
+  ip_myri0: 192.168.162.100
+  ip_mgt: 192.168.161.100
+  mac_mgt: 00:30:48:96:07:E5
+  switch_port: Gi2/1
+chinqchint-2:
+  mac_eth0: 00:30:48:7c:7f:22
+  ip_eth0: 192.168.160.101
+  mac_eth1: 00:30:48:7c:7f:23
+  ip_eth1: 192.168.159.101
+  mac_myri0: 00:60:dd:47:4b:b8
+  ip_myri0: 192.168.162.101
+  ip_mgt: 192.168.161.101
+  mac_mgt: 00:30:48:96:25:67
+  switch_port: Gi2/2
+chinqchint-3:
+  mac_eth0: 00:30:48:7b:fd:0e
+  ip_eth0: 192.168.160.102
+  mac_eth1: 00:30:48:7b:fd:0f
+  ip_eth1: 192.168.159.102
+  mac_myri0: 00:60:dd:47:4c:bb
+  ip_myri0: 192.168.162.102
+  ip_mgt: 192.168.161.102
+  mac_mgt: 00:30:48:94:4A:7E
+  switch_port: Gi2/3
+chinqchint-4:
+  mac_eth0: 00:30:48:7d:2f:1a
+  ip_eth0: 192.168.160.103
+  mac_eth1: 00:30:48:7d:2f:1b
+  ip_eth1: 192.168.159.103
+  mac_myri0: 00:60:dd:47:4c:b8
+  ip_myri0: 192.168.162.103
+  ip_mgt: 192.168.161.103
+  mac_mgt: 00:30:48:94:44:21
+  switch_port: Gi2/4
+chinqchint-5:
+  mac_eth0: 00:30:48:7c:6e:be
+  ip_eth0: 192.168.160.104
+  mac_eth1: 00:30:48:7c:6e:bf
+  ip_eth1: 192.168.159.104
+  mac_myri0: 00:60:dd:47:49:e7
+  ip_myri0: 192.168.162.104
+  ip_mgt: 192.168.161.104
+  mac_mgt: 00:30:48:96:25:DD
+  switch_port: Gi2/41
+chinqchint-6:
+  mac_eth0: 00:30:48:7c:6e:bc
+  ip_eth0: 192.168.160.105
+  mac_eth1: 00:30:48:7c:6e:bd
+  ip_eth1: 192.168.159.105
+  mac_myri0: 00:60:dd:47:49:cb
+  ip_myri0: 192.168.162.105
+  ip_mgt: 192.168.161.105
+  mac_mgt: 00:30:48:96:25:E0
+  switch_port: Gi2/6
+chinqchint-7:
+  mac_eth0: 00:30:48:7c:3d:d4
+  ip_eth0: 192.168.160.106
+  mac_eth1: 00:30:48:7c:3d:d5
+  ip_eth1: 192.168.159.106
+  mac_myri0: 00:60:dd:47:4c:d5
+  ip_myri0: 192.168.162.106
+  ip_mgt: 192.168.161.106
+  mac_mgt: 00:30:48:96:07:FA
+  switch_port: Gi2/7
+chinqchint-8:
+  mac_eth0: 00:30:48:7c:3d:d6
+  ip_eth0: 192.168.160.107
+  mac_eth1: 00:30:48:7c:3d:d7
+  ip_eth1: 192.168.159.107
+  mac_myri0: 00:60:dd:47:49:cc
+  ip_myri0: 192.168.162.107
+  ip_mgt: 192.168.161.107
+  mac_mgt: 00:30:48:96:07:E4
+  switch_port: Gi2/8
+chinqchint-9:
+  mac_eth0: 00:30:48:7c:81:06
+  ip_eth0: 192.168.160.108
+  mac_eth1: 00:30:48:7c:81:07
+  ip_eth1: 192.168.159.108
+  mac_myri0: 00:60:dd:47:4c:6f
+  ip_myri0: 192.168.162.108
+  ip_mgt: 192.168.161.108
+  mac_mgt: 00:30:48:94:1B:E2
+  switch_port: Gi2/9
+chinqchint-10:
+  mac_eth0: 00:30:48:7c:81:08
+  ip_eth0: 192.168.160.109
+  mac_eth1: 00:30:48:7c:81:09
+  ip_eth1: 192.168.159.109
+  mac_myri0: 00:60:dd:47:4d:35
+  ip_myri0: 192.168.162.109
+  ip_mgt: 192.168.161.109
+  mac_mgt: 00:30:48:94:2D:7A
+  switch_port: Gi2/10
+chinqchint-11:
+  mac_eth0: 00:30:48:7c:67:b0
+  ip_eth0: 192.168.160.110
+  mac_eth1: 00:30:48:7c:67:b1
+  ip_eth1: 192.168.159.110
+  mac_myri0: 00:60:dd:47:4d:30
+  ip_myri0: 192.168.162.110
+  ip_mgt: 192.168.161.110
+  switch_port: Gi2/11
+chinqchint-12:
+  mac_eth0: 00:30:48:7c:6e:b8
+  ip_eth0: 192.168.160.111
+  mac_eth1: 00:30:48:7c:6e:b9
+  ip_eth1: 192.168.159.111
+  mac_myri0: 00:60:dd:47:4c:6c
+  ip_myri0: 192.168.162.111
+  ip_mgt: 192.168.161.111
+  switch_port: Gi2/12
+chinqchint-13:
+  mac_eth0: 00:30:48:7c:00:86
+  ip_eth0: 192.168.160.112
+  mac_eth1: 00:30:48:7c:00:87
+  ip_eth1: 192.168.159.112
+  mac_myri0: 00:60:dd:47:49:8d
+  ip_myri0: 192.168.162.112
+  ip_mgt: 192.168.161.112
+  mac_mgt: 00:30:48:94:36:4C
+  switch_port: Gi2/13
+chinqchint-14:
+  mac_eth0: 00:30:48:7c:00:74
+  ip_eth0: 192.168.160.113
+  mac_eth1: 00:30:48:7c:00:75
+  ip_eth1: 192.168.159.113
+  mac_myri0: 00:60:dd:47:49:8a
+  ip_myri0: 192.168.162.113
+  ip_mgt: 192.168.161.113
+  mac_mgt: 00:30:48:94:35:DE
+chinqchint-15:
+  mac_eth0: 00:30:48:7c:7f:9e
+  ip_eth0: 192.168.160.114
+  mac_eth1: 00:30:48:7c:7f:9f
+  ip_eth1: 192.168.159.114
+  mac_myri0: 00:60:dd:47:4d:34
+  ip_myri0: 192.168.162.114
+  ip_mgt: 192.168.161.114
+  mac_mgt: 00:30:48:96:25:B9
+  switch_port: Gi2/15
+chinqchint-16:
+  mac_eth0: 00:30:48:7c:80:fe
+  ip_eth0: 192.168.160.115
+  mac_eth1: 00:30:48:7c:80:ff
+  ip_eth1: 192.168.159.115
+  mac_myri0: 00:60:dd:47:4d:32
+  ip_myri0: 192.168.162.115
+  ip_mgt: 192.168.161.115
+  mac_mgt: 00:30:48:96:24:E1
+  switch_port: Gi2/16
+chinqchint-17:
+  mac_eth0: 00:30:48:7c:6f:5c
+  ip_eth0: 192.168.160.116
+  mac_eth1: 00:30:48:7c:6f:5d
+  ip_eth1: 192.168.159.116
+  mac_myri0: 00:60:dd:47:49:85
+  ip_myri0: 192.168.162.116
+  ip_mgt: 192.168.161.116
+  mac_mgt: 00:30:48:96:26:5A
+  switch_port: Gi2/17
+chinqchint-18:
+  mac_eth0: 00:30:48:7c:67:de
+  ip_eth0: 192.168.160.117
+  mac_eth1: 00:30:48:7c:67:df
+  ip_eth1: 192.168.159.117
+  mac_myri0: 00:60:dd:47:4d:31
+  ip_myri0: 192.168.162.117
+  ip_mgt: 192.168.161.117
+  mac_mgt: 00:30:48:96:25:76
+  switch_port: Gi2/18
+chinqchint-19:
+  mac_eth0: 00:30:48:7c:6f:0c
+  ip_eth0: 192.168.160.118
+  mac_eth1: 00:30:48:7c:6f:0d
+  ip_eth1: 192.168.159.118
+  mac_myri0: 00:60:dd:47:49:eb
+  ip_myri0: 192.168.162.118
+  ip_mgt: 192.168.161.118
+  mac_mgt: 00:30:48:96:25:DE
+  switch_port: Gi2/19
+chinqchint-20:
+  mac_eth0: 00:30:48:7c:67:bc
+  ip_eth0: 192.168.160.119
+  mac_eth1: 00:30:48:7c:67:bd
+  ip_eth1: 192.168.159.119
+  mac_myri0: 00:60:dd:47:49:86
+  ip_myri0: 192.168.162.119
+  ip_mgt: 192.168.161.119
+  mac_mgt: 00:30:48:96:25:C7
+  switch_port: Gi2/20
+chinqchint-21:
+  mac_eth0: 00:30:48:7c:70:a6
+  ip_eth0: 192.168.160.120
+  mac_eth1: 00:30:48:7c:70:a7
+  ip_eth1: 192.168.159.120
+  mac_myri0: 00:60:dd:47:49:ee
+  ip_myri0: 192.168.162.120
+  ip_mgt: 192.168.161.120
+  mac_mgt: 00:30:48:94:4A:34
+  switch_port: Gi2/21
+chinqchint-22:
+  mac_eth0: 00:30:48:7c:3d:da
+  ip_eth0: 192.168.160.121
+  mac_eth1: 00:30:48:7c:3d:db
+  ip_eth1: 192.168.159.121
+  mac_myri0: 00:60:dd:47:49:e3
+  ip_myri0: 192.168.162.121
+  ip_mgt: 192.168.161.121
+  mac_mgt: 00:30:48:94:4B:02
+  switch_port: Gi2/22
+chinqchint-23:
+  mac_eth0: 00:30:48:7c:80:f8
+  ip_eth0: 192.168.160.122
+  mac_eth1: 00:30:48:7c:80:f9
+  ip_eth1: 192.168.159.122
+  mac_myri0: 00:60:dd:47:49:f2
+  ip_myri0: 192.168.162.122
+  ip_mgt: 192.168.161.122
+  mac_mgt: 00:30:48:94:2C:9C
+  switch_port: Gi2/23
+chinqchint-24:
+  mac_eth0: 00:30:48:7c:80:e8
+  ip_eth0: 192.168.160.123
+  mac_eth1: 00:30:48:7c:80:e9
+  ip_eth1: 192.168.159.123
+  mac_myri0: 00:60:dd:47:49:f1
+  ip_myri0: 192.168.162.123
+  ip_mgt: 192.168.161.123
+  mac_mgt: 00:30:48:94:2D:76
+  switch_port: Gi2/24
+chinqchint-25:
+  mac_eth0: 00:30:48:7c:81:0a
+  ip_eth0: 192.168.160.124
+  mac_eth1: 00:30:48:7c:81:0b
+  ip_eth1: 192.168.159.124
+  mac_myri0: 00:60:dd:47:49:f0
+  ip_myri0: 192.168.162.124
+  ip_mgt: 192.168.161.124
+  mac_mgt: 00:30:48:9B:1A:CF
+  switch_port: Gi2/25
+chinqchint-26:
+  mac_eth0: 00:30:48:7c:80:ea
+  ip_eth0: 192.168.160.125
+  mac_eth1: 00:30:48:7c:80:eb
+  ip_eth1: 192.168.159.125
+  mac_myri0: 00:60:dd:47:4b:ab
+  ip_myri0: 192.168.162.125
+  ip_mgt: 192.168.161.125
+  mac_mgt: 00:30:48:96:26:54
+  switch_port: Gi2/26
+chinqchint-27:
+  mac_eth0: 00:30:48:7c:6e:b4
+  ip_eth0: 192.168.160.126
+  mac_eth1: 00:30:48:7c:6e:b5
+  ip_eth1: 192.168.159.126
+  mac_myri0: 00:60:dd:47:49:ec
+  ip_myri0: 192.168.162.126
+  ip_mgt: 192.168.161.126
+  mac_mgt: 00:30:48:96:25:63
+  switch_port: Gi2/27
+chinqchint-28:
+  mac_eth0: 00:30:48:7c:6e:da
+  ip_eth0: 192.168.160.127
+  mac_eth1: 00:30:48:7c:6e:db
+  ip_eth1: 192.168.159.127
+  mac_myri0: 00:60:dd:47:49:e5
+  ip_myri0: 192.168.162.127
+  ip_mgt: 192.168.161.127
+  mac_mgt: 00:30:48:96:26:B2
+  switch_port: Gi2/28
+chinqchint-29:
+  mac_eth0: 00:30:48:7c:81:2a
+  ip_eth0: 192.168.160.128
+  mac_eth1: 00:30:48:7c:81:2b
+  ip_eth1: 192.168.159.128
+  mac_myri0: 00:60:dd:47:4d:45
+  ip_myri0: 192.168.162.128
+  ip_mgt: 192.168.161.128
+  mac_mgt: 00:30:48:94:37:D3
+  switch_port: Gi2/29
+chinqchint-30:
+  mac_eth0: 00:30:48:7c:bb:fa
+  ip_eth0: 192.168.160.129
+  mac_eth1: 00:30:48:7c:bb:fb
+  ip_eth1: 192.168.159.129
+  mac_myri0: 00:60:dd:47:4b:b0
+  ip_myri0: 192.168.162.129
+  ip_mgt: 192.168.161.129
+  switch_port: Gi2/30
+chinqchint-31:
+  mac_eth0: 00:30:48:7b:f9:7a
+  ip_eth0: 192.168.160.130
+  mac_eth1: 00:30:48:7b:f9:7b
+  ip_eth1: 192.168.159.130
+  mac_myri0: 00:60:dd:47:49:e1
+  ip_myri0: 192.168.162.130
+  ip_mgt: 192.168.161.130
+  switch_port: Gi2/31
+chinqchint-32:
+  mac_eth0: 00:30:48:7b:f9:76
+  ip_eth0: 192.168.160.131
+  mac_eth1: 00:30:48:7b:f9:77
+  ip_eth1: 192.168.159.131
+  mac_myri0: 00:60:dd:47:49:e9
+  ip_myri0: 192.168.162.131
+  ip_mgt: 192.168.161.131
+  switch_port: Gi2/32
+chinqchint-33:
+  mac_eth0: 00:30:48:7a:56:32
+  ip_eth0: 192.168.160.132
+  mac_eth1: 00:30:48:7a:56:33
+  ip_eth1: 192.168.159.132
+  mac_myri0: 00:60:dd:47:49:e0
+  ip_myri0: 192.168.162.132
+  ip_mgt: 192.168.161.132
+  switch_port: Gi2/33
+chinqchint-34:
+  mac_eth0: 00:30:48:7a:5f:16
+  ip_eth0: 192.168.160.133
+  mac_eth1: 00:30:48:7a:5f:17
+  ip_eth1: 192.168.159.133
+  mac_myri0: 00:60:dd:47:49:b8
+  ip_myri0: 192.168.162.133
+  ip_mgt: 192.168.161.133
+  switch_port: Gi2/34
+chinqchint-35:
+  mac_eth0: 00:30:48:7c:3d:f4
+  ip_eth0: 192.168.160.134
+  mac_eth1: 00:30:48:7c:3d:f5
+  ip_eth1: 192.168.159.134
+  mac_myri0: 00:60:dd:47:49:e2
+  ip_myri0: 192.168.162.134
+  ip_mgt: 192.168.161.134
+  switch_port: Gi2/35
+chinqchint-36:
+  mac_eth0: 00:30:48:7d:2d:04
+  ip_eth0: 192.168.160.135
+  mac_eth1: 00:30:48:7d:2d:05
+  ip_eth1: 192.168.159.135
+  mac_myri0: 00:60:dd:47:49:b7
+  ip_myri0: 192.168.162.135
+  ip_mgt: 192.168.161.135
+  switch_port: Gi2/36
+chinqchint-37:
+  mac_eth0: 00:30:48:7c:81:04
+  ip_eth0: 192.168.160.136
+  mac_eth1: 00:30:48:7c:81:05
+  ip_eth1: 192.168.159.136
+  mac_myri0: 00:60:dd:47:49:e4
+  ip_myri0: 192.168.162.136
+  ip_mgt: 192.168.161.136
+  switch_port: Gi2/37
+chinqchint-38:
+  mac_eth0: 00:30:48:7c:7c:80
+  ip_eth0: 192.168.160.137
+  mac_eth1: 00:30:48:7c:7c:81
+  ip_eth1: 192.168.159.137
+  mac_myri0: 00:60:dd:47:4b:b2
+  ip_myri0: 192.168.162.137
+  ip_mgt: 192.168.161.137
+  mac_mgt: 00:30:48:94:1C:9A
+  switch_port: Gi2/38
+chinqchint-39:
+  mac_eth0: 00:30:48:7d:0f:14
+  ip_eth0: 192.168.160.138
+  mac_eth1: 00:30:48:7d:0f:15
+  ip_eth1: 192.168.159.138
+  mac_myri0: 00:60:dd:47:4b:b1
+  ip_myri0: 192.168.162.138
+  ip_mgt: 192.168.161.138
+  mac_mgt: 00:30:48:94:2F:6E
+  switch_port: Gi2/39
+chinqchint-40:
+  mac_eth0: 00:30:48:7d:35:74
+  ip_eth0: 192.168.160.139
+  mac_eth1: 00:30:48:7d:35:75
+  ip_eth1: 192.168.159.139
+  mac_myri0: 00:60:dd:47:4b:af
+  ip_myri0: 192.168.162.139
+  ip_mgt: 192.168.161.139
+  mac_mgt: 00:30:48:94:4B:4C
+  switch_port: Gi2/40
+chinqchint-41:
+  mac_eth0: 00:30:48:7a:5b:de
+  ip_eth0: 192.168.160.140
+  mac_eth1: 00:30:48:7a:5b:df
+  ip_eth1: 192.168.159.140
+  mac_myri0: 00:60:dd:47:4d:48
+  ip_myri0: 192.168.162.140
+  ip_mgt: 192.168.161.140
+  mac_mgt: 00:30:48:96:07:EF
+  switch_port: Gi3/1
+chinqchint-42:
+  mac_eth0: 00:30:48:7a:5c:e4
+  ip_eth0: 192.168.160.141
+  mac_eth1: 00:30:48:7a:5c:e5
+  ip_eth1: 192.168.159.141
+  mac_myri0: 00:60:dd:47:4c:c0
+  ip_myri0: 192.168.162.141
+  ip_mgt: 192.168.161.141
+  mac_mgt: 00:30:48:96:07:F1
+  switch_port: Gi3/2
+chinqchint-43:
+  mac_eth0: 00:30:48:7c:6e:e8
+  ip_eth0: 192.168.160.142
+  mac_eth1: 00:30:48:7c:6e:e9
+  ip_eth1: 192.168.159.142
+  mac_myri0: 00:60:dd:47:4b:ba
+  ip_myri0: 192.168.162.142
+  ip_mgt: 192.168.161.142
+  mac_mgt: 00:30:48:96:25:E1
+  switch_port: Gi3/3
+chinqchint-44:
+  mac_eth0: 00:30:48:7c:66:ec
+  ip_eth0: 192.168.160.143
+  mac_eth1: 00:30:48:7c:66:ed
+  ip_eth1: 192.168.159.143
+  mac_myri0: 00:60:dd:47:4b:b6
+  ip_myri0: 192.168.162.143
+  ip_mgt: 192.168.161.143
+  mac_mgt: 00:30:48:96:25:D1
+  switch_port: Gi3/4
+chinqchint-45:
+  mac_eth0: 00:30:48:7c:70:a0
+  ip_eth0: 192.168.160.144
+  mac_eth1: 00:30:48:7c:70:a1
+  ip_eth1: 192.168.159.144
+  mac_myri0: 00:60:dd:47:4b:b4
+  ip_myri0: 192.168.162.144
+  ip_mgt: 192.168.161.144
+  mac_mgt: 00:30:48:96:25:65
+  switch_port: Gi3/5
+chinqchint-46:
+  mac_eth0: 00:30:48:7c:6f:82
+  ip_eth0: 192.168.160.145
+  mac_eth1: 00:30:48:7c:6f:83
+  ip_eth1: 192.168.159.145
+  mac_myri0: 00:60:dd:47:4d:49
+  ip_myri0: 192.168.162.145
+  ip_mgt: 192.168.161.145
+  mac_mgt: 00:30:48:96:08:02
+  switch_port: Gi3/41
diff --git a/generators/input/lille-chirloute.rb b/generators/input/lille-chirloute.rb
index b5fb72297d12bb6f6f884b22328e8b009f0be99a..c17718f52d9fe412d6408748c08a90885294448b 100644
--- a/generators/input/lille-chirloute.rb
+++ b/generators/input/lille-chirloute.rb
@@ -42,7 +42,7 @@ site :lille do |site_uid|
         network_adapters [{
           :interface => 'Ethernet',
           :rate => 1.G,
-          :mac => lookup('lille', node_uid, 'network_interfaces', 'eth0', 'mac'),
+          :mac => lookup('lille-chirloute', node_uid, 'network_interfaces', 'eth0', 'mac'),
           :vendor => 'Intel',
           :version => '82576EB',
           :enabled => true,
@@ -52,12 +52,12 @@ site :lille do |site_uid|
           :mounted => true,
           :device => 'eth0',
           :network_address => "#{node_uid}-eth0.#{site_uid}.grid5000.fr",
-          :ip => dns_lookup("#{node_uid}-eth0.#{site_uid}.grid5000.fr"),
+          :ip => lookup('lille-chirloute', node_uid, 'network_interfaces', 'eth0', 'ip'),
           :switch => 'gw'
         },{
           :interface => 'Ethernet',
           :rate => 1.G,
-          :mac => lookup('lille', node_uid, 'network_interfaces', 'eth1', 'mac'),
+          :mac => lookup('lille-chirloute', node_uid, 'network_interfaces', 'eth1', 'mac'),
           :vendor => 'Intel',
           :version => '82576EB',
           :enabled => true,
@@ -67,20 +67,20 @@ site :lille do |site_uid|
           :mounted => true,
           :device => 'eth1',
           :network_address => "#{node_uid}.#{site_uid}.grid5000.fr",
-          :ip => dns_lookup("#{node_uid}.#{site_uid}.grid5000.fr"),
+          :ip => lookup('lille-chirloute', node_uid, 'network_interfaces', 'eth1', 'ip'),
           :switch => 'gw',
-          :switch_port => lookup('lille', node_uid, 'network_interfaces', 'eth1', 'switch_port')
+          :switch_port => lookup('lille-chirloute', node_uid, 'network_interfaces', 'eth1', 'switch_port')
         },{
           :interface => 'Ethernet',
           :rate => 1.G,
-          :mac => lookup('lille', node_uid, 'network_interfaces', 'bmc', 'mac'),
+          :mac => lookup('lille-chirloute', node_uid, 'network_interfaces', 'bmc', 'mac'),
           :vendor => 'Inventec',
           :version => 1.14,
           :enabled => true,
           :management => true,
           :mountable => false,
           :network_address => "#{node_uid}-ipmi.#{site_uid}.grid5000.fr",
-          :ip => dns_lookup("#{node_uid}-ipmi.#{site_uid}.grid5000.fr"),
+          :ip => lookup('lille-chirloute', node_uid, 'network_interfaces', 'bmc', 'ip'),
           :switch => 'gw'
         }]
       end
diff --git a/generators/input/lille-chirloute.yaml b/generators/input/lille-chirloute.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..919cb29baec663c97639579808c68239b1c52fd5
--- /dev/null
+++ b/generators/input/lille-chirloute.yaml
@@ -0,0 +1,200 @@
+chirloute-1:
+  bios:
+    version: 1.44.00
+    vendor: Inventec
+    release_date: 05/08/2010
+  network_interfaces:
+    bmc:
+      mac: 00:26:6c:f9:18:e6
+      ip: 192.168.158.21
+    eth0:
+      mac: 00:26:6c:f9:18:e4
+      ip: 192.168.160.21
+    eth1:
+      mac: 00:26:6c:f9:18:e5
+      ip: 192.168.159.21
+  chassis:
+    serial_number: D385Z4J
+    manufacturer: Dell
+    product_name: C6100
+  block_devices:
+    sda:
+      model: ST3300657SS
+      size: 585937500
+      rev: ES64
+      vendor: SEAGATE
+chirloute-2:
+  bios:
+    version: 1.49.00
+    vendor: Dell Inc.
+    release_date: 09/14/2010
+  network_interfaces:
+    bmc:
+      mac: 00:26:6c:f9:17:ea
+      ip: 192.168.158.22
+    eth0:
+      mac: 00:26:6c:f9:17:e8
+      ip: 192.168.160.22
+    eth1:
+      mac: 00:26:6c:f9:17:e9
+      ip: 192.168.159.22
+  chassis:
+    serial_number: D385Z4J
+    manufacturer: Dell
+    product_name: C6100
+  block_devices:
+    sda:
+      model: ST3300657SS
+      size: 585937500
+      rev: ES64
+      vendor: SEAGATE
+chirloute-3:
+  bios:
+    version: 1.49.00
+    vendor: Dell Inc.
+    release_date: 09/14/2010
+  network_interfaces:
+    bmc:
+      mac: 00:26:6c:f9:15:72
+      ip: 192.168.158.23
+    eth0:
+      mac: 00:26:6c:f9:15:70
+      ip: 192.168.160.23
+    eth1:
+      mac: 00:26:6c:f9:15:71
+      ip: 192.168.159.23
+  chassis:
+    serial_number: D385Z4J
+    manufacturer: Dell
+    product_name: C6100
+  block_devices:
+    sda:
+      model: ST3300657SS
+      size: 585937500
+      rev: ES64
+      vendor: SEAGATE
+chirloute-4:
+  bios:
+    version: 1.49.00
+    vendor: Dell Inc.
+    release_date: 09/14/2010
+  network_interfaces:
+    bmc:
+      mac: 00:26:6c:f9:19:62
+      ip: 192.168.158.24
+    eth0:
+      mac: 00:26:6c:f9:19:60
+      ip: 192.168.160.24
+    eth1:
+      mac: 00:26:6c:f9:19:61
+      ip: 192.168.159.24
+  chassis:
+    serial_number: D385Z4J
+    manufacturer: Dell
+    product_name: C6100
+  block_devices:
+    sda:
+      model: ST3300657SS
+      size: 585937500
+      rev: ES64
+      vendor: SEAGATE
+chirloute-5:
+  bios:
+    version: 1.49.00
+    vendor: Dell Inc.
+    release_date: 09/14/2010
+  network_interfaces:
+    bmc:
+      mac: 00:26:6c:f9:16:0a
+      ip: 192.168.158.25
+    eth0:
+      mac: 00:26:6c:f9:16:08
+      ip: 192.168.160.25
+    eth1:
+      mac: 00:26:6c:f9:16:09
+      ip: 192.168.159.25
+  chassis:
+    serial_number: F385Z4J
+    manufacturer: Dell
+    product_name: C6100
+  block_devices:
+    sda:
+      model: ST3300657SS
+      size: 585937500
+      rev: ES64
+      vendor: SEAGATE
+chirloute-6:
+  bios:
+    version: 1.49.00
+    vendor: Dell Inc.
+    release_date: 09/14/2010
+  network_interfaces:
+    bmc:
+      mac: 00:26:6c:f9:17:22
+      ip: 192.168.158.26
+    eth0:
+      mac: 00:26:6c:f9:17:20
+      ip: 192.168.160.26
+    eth1:
+      mac: 00:26:6c:f9:17:21
+      ip: 192.168.159.26
+  chassis:
+    serial_number: F385Z4J
+    manufacturer: Dell
+    product_name: C6100
+  block_devices:
+    sda:
+      model: ST3300657SS
+      size: 585937500
+      rev: ES64
+      vendor: SEAGATE
+chirloute-7:
+  bios:
+    version: 1.49.00
+    vendor: Dell Inc.
+    release_date: 09/14/2010
+  network_interfaces:
+    bmc:
+      mac: 00:26:6c:f9:17:b9
+      ip: 192.168.158.27
+    eth0:
+      mac: 00:26:6c:f9:17:b8
+      ip: 192.168.160.27
+    eth1:
+      mac: 00:26:6c:f9:17:b9
+      ip: 192.168.159.27
+  chassis:
+    serial_number: F385Z4J
+    manufacturer: Dell
+    product_name: C6100
+  block_devices:
+    sda:
+      model: ST3300657SS
+      size: 585937500
+      rev: ES64
+      vendor: SEAGATE
+chirloute-8:
+  bios:
+    version: 1.49.00
+    vendor: Dell Inc.
+    release_date: 09/14/2010
+  network_interfaces:
+    bmc:
+      mac: 00:26:6c:f9:19:82
+      ip: 192.168.158.28
+    eth0:
+      mac: 00:26:6c:f9:19:80
+      ip: 192.168.160.28
+    eth1:
+      mac: 00:26:6c:f9:19:81
+      ip: 192.168.159.28
+  chassis:
+    serial_number: F385Z4J
+    manufacturer: Dell
+    product_name: C6100
+  block_devices:
+    sda:
+      model: ST3300657SS
+      size: 585937500
+      rev: ES64
+      vendor: SEAGATE