diff --git a/generators/input/bordeaux-borderline.rb b/generators/input/bordeaux-borderline.rb
new file mode 100644
index 0000000000000000000000000000000000000000..7affe44000dd40662fc6d104a4f3ff822b3780c6
--- /dev/null
+++ b/generators/input/bordeaux-borderline.rb
@@ -0,0 +1,138 @@
+site :bordeaux do |site_uid|
+
+  cluster :borderline do |cluster_uid|
+    model "IBM System x3755"
+    created_at Time.parse("2007-10-01 12:00 GMT").httpdate
+    misc "IPMI 2.0"
+    10.times do |i|
+      node "#{cluster_uid}-#{i+1}" do |node_uid|
+        supported_job_types({:deploy => true, :besteffort => true, :virtual => "amd-v"})
+        architecture({
+          :smp_size 	 	=> 4,
+          :smt_size 	 	=> 8,
+          :platform_type 	=> "x86_64"
+          })
+        processor({
+          :vendor 	 	=> "AMD",
+          :model 		=> "AMD Opteron",
+          :version 		=> "8218",
+          :clock_speed 		=> 2.6.G,
+          :instruction_set 	=> "x86-64",
+          :other_description 	=> "",
+          :cache_l1 		=> nil,
+          :cache_l1i 		=> 64.KiB,
+          :cache_l1d 		=> 64.KiB,
+          :cache_l2 		=> 2.MiB
+	})
+        main_memory({
+          :ram_size 		=> 32.GiB,
+          :virtual_size 	=> nil
+        })
+        operating_system({
+          :name 		=> "Debian",
+          :release 		=> "Lenny",
+          :version 		=> "5.0",
+	  :kernel 		=> "2.6.26"
+        })
+        storage_devices [{
+	  :interface 		=> "SAS",
+	  :size 		=> 600.GB,
+	  :driver 		=> "aacraid",
+	  :device 		=> "sda",
+	  :model        	=> lookup('bordeaux-borderline', node_uid, 'block_devices', 'sda', 'model'),
+	  :rev        		=> lookup('bordeaux-borderline', node_uid, 'block_devices', 'sda', 'rev')
+	}]
+        network_adapters [{
+	  :interface 		=> 'Ethernet',
+	  :rate 		=> 1.G,
+	  :network_address 	=> "#{node_uid}.#{site_uid}.grid5000.fr",
+	  :ip 			=> lookup('bordeaux-borderline', node_uid, 'network_interfaces', 'eth0', 'ip'),
+	  :mac 			=> lookup('bordeaux-borderline', node_uid, 'network_interfaces', 'eth0', 'mac'),
+	  :vendor 		=> "Broadcom",
+	  :version 		=> "NetXtreme II BCM5708",
+	  :enabled 		=> true,
+	  :mounted 		=> true,
+	  :mountable 		=> true,
+	  :driver 		=> "bnx2",
+	  :management 		=> false,
+	  :device 		=> "eth0"
+	},
+        {
+	  :interface 		=> 'Ethernet',
+	  :rate 		=> 1.G,
+          :network_address 	=> "#{node_uid}-eth1.#{site_uid}.grid5000.fr",
+	  :ip 			=> lookup('bordeaux-borderline', node_uid, 'network_interfaces', 'eth1', 'ip'),
+	  :mac 			=> lookup('bordeaux-borderline', node_uid, 'network_interfaces', 'eth1', 'mac'),
+	  :vendor 		=> "Broadcom",
+	  :version 		=> "NetXtreme II BCM5708",
+          :enabled 		=> true,
+	  :mounted 		=> false,
+	  :mountable 		=> true,
+	  :driver 		=> "bnx2",
+	  :management 		=> false,
+	  :device 		=> "eth1"
+	},
+	{
+	  :interface 		=> 'InfiniBand',
+	  :rate 		=> 10.G,
+	  :network_address 	=> "#{node_uid}-ib0.#{site_uid}.grid5000.fr",
+	  :ip 			=> lookup('bordeaux-borderline', node_uid, 'network_interfaces', 'ib0', 'ip'),
+	  :guid 		=> lookup('bordeaux-borderline', node_uid, 'network_interfaces', 'ib0', 'guid'),
+	  :vendor 		=> 'Mellanox',
+	  :version 		=> "InfiniHost MT25208",
+	  :enabled 		=> true,
+	  :mountable 		=> true,
+	  :mounted 		=> true,
+	  :driver 		=> "ib_mthca",
+	  :management 		=> false,
+	  :device 		=> "ib0"
+	},
+	{
+	  :interface 		=> 'InfiniBand',
+	  :rate 		=> 10.G,
+	  :guid 		=> lookup('bordeaux-borderline', node_uid, 'network_interfaces', 'ib1', 'guid'),
+	  :vendor 		=> 'Mellanox',
+	  :version 		=> "InfiniHost MT25208",
+	  :enabled 		=> false,
+	  :device 		=> "ib1"
+	},
+	{
+	  :interface 		=> 'Myrinet',
+	  :rate 		=> 10.G,
+	  :network_address 	=> "#{node_uid}-myri0.#{site_uid}.grid5000.fr",
+	  :ip 			=> lookup('bordeaux-borderline', node_uid, 'network_interfaces', 'myri0', 'ip'),
+	  :mac 			=> lookup('bordeaux-borderline', node_uid, 'network_interfaces', 'myri0', 'mac'),
+	  :vendor 		=> 'Myrinet',
+	  :version 		=> "10G-PCIE-8A-C",
+	  :enabled 		=> true,
+	  :mountable 		=> true,
+	  :mounted 		=> true,
+	  :driver 		=> "mx_driver",
+	  :management 		=> false,
+	  :device 		=> "myri0"
+	},
+	{
+	  :interface 		=> 'Ethernet',
+	  :rate 		=> 100.M,
+	  :network_address 	=> "#{node_uid}-bmc.#{site_uid}.grid5000.fr",
+	  :ip 			=> lookup('bordeaux-borderline', node_uid, 'network_interfaces', 'bmc', 'ip'),
+	  :mac 			=> lookup('bordeaux-borderline', node_uid, 'network_interfaces', 'bmc', 'mac'),
+	  :enabled 		=> true,
+	  :mounted 		=> false,
+	  :mountable 		=> false,
+	  :management 		=> true,
+	  :device 		=> "bmc"
+	}]
+        bios({
+          :version      	=> lookup('bordeaux-borderline', node_uid, 'bios', 'version'),
+          :vendor       	=> lookup('bordeaux-borderline', node_uid, 'bios', 'vendor'),
+          :release_date 	=> lookup('bordeaux-borderline', node_uid, 'bios', 'release_date')
+        })
+	chassis({
+	  :serial		=> lookup('bordeaux-borderline', node_uid, 'chassis', 'serial_number'),
+	  :name			=> lookup('bordeaux-borderline', node_uid, 'chassis', 'product_name')
+	})
+      end
+    end
+  end # cluster borderline
+end
diff --git a/generators/input/bordeaux-borderline.yaml b/generators/input/bordeaux-borderline.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..cf5ed61bb5119bbce5c9247bc567e16592210f25
--- /dev/null
+++ b/generators/input/bordeaux-borderline.yaml
@@ -0,0 +1,331 @@
+---
+borderline-1:
+  bios:
+    version: ZYE133AUS-1.13
+    release_date: 08/09/2007
+    vendor: IBM
+  block_devices:
+    sda:
+      model: 8k-l Stripe
+      size:
+      rev: V1.0
+      vendor: ServeRA
+  network_interfaces:
+    ib0:
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:00:1d:5d
+      ip: 172.16.4.196
+    bmc:
+      mac: 00:14:5e:57:67:06
+      ip: 172.16.7.242
+    ib1:
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:00:1d:5e
+    myri0:
+      mac: 00:60:dd:47:b6:e9
+      ip: 172.16.3.196
+    eth0:
+      mac: 00:14:5e:57:67:04
+      ip: 172.16.1.196
+    eth1:
+      mac: 00:14:5e:57:67:02
+      ip: 192.168.133.196
+  chassis:
+    serial_number: 99A3249
+    manufacturer: IBM
+    product_name: IBM System x3755 -[88774RG]-
+borderline-2:
+  bios:
+    version: ZYE133AUS-1.08
+    release_date: 02/23/2007
+    vendor: IBM
+  block_devices:
+    sda:
+      model: 8k-l Stripe
+      size:
+      rev: V1.0
+      vendor: ServeRA
+  network_interfaces:
+    ib0:
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:00:1d:85
+      ip: 172.16.4.197
+    bmc:
+      mac: 00:14:5e:57:cc:40
+      ip: 172.16.7.243
+    ib1:
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:00:1d:86
+    myri0:
+      mac: 00:60:dd:47:b6:7a
+      ip: 172.16.3.197
+    eth0:
+      mac: 00:14:5e:57:cc:3e
+      ip: 172.16.1.197
+    eth1:
+      mac: 00:14:5e:57:cc:3c
+      ip: 192.168.133.197
+  chassis:
+    serial_number: 99A3255
+    manufacturer: IBM
+    product_name: IBM System x3755 -[88774RG]-
+borderline-3:
+  bios:
+    version: ZYE133AUS-1.08
+    release_date: 02/23/2007
+    vendor: IBM
+  block_devices:
+    sda:
+      model: 8k-l Stripe
+      size:
+      rev: V1.0
+      vendor: ServeRA
+  network_interfaces:
+    ib0:
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:00:1d:ed
+      ip: 172.16.4.198
+    bmc:
+      mac: 00:14:5e:57:6d:a2
+      ip: 172.16.7.244
+    ib1:
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:00:1d:ee
+    myri0:
+      mac: 00:60:dd:47:b5:69
+      ip: 172.16.3.198
+    eth0:
+      mac: 00:14:5e:57:6d:a0
+      ip: 172.16.1.198
+    eth1:
+      mac: 00:14:5e:57:6d:9e
+      ip: 192.168.133.198
+  chassis:
+    serial_number: 99A3248
+    manufacturer: IBM
+    product_name: IBM System x3755 -[88774RG]-
+borderline-4:
+  bios:
+    version: ZYE133AUS-1.08
+    release_date: 02/23/2007
+    vendor: IBM
+  block_devices:
+    sda:
+      model: 8k-l Stripe
+      size:
+      rev: V1.0
+      vendor: ServeRA
+  network_interfaces:
+    ib0:
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:00:1e:85
+      ip: 172.16.4.199
+    bmc:
+      mac: 00:14:5e:57:c4:d2
+      ip: 172.16.7.245
+    ib1:
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:00:1e:86
+    myri0:
+      mac: 00:60:dd:47:b7:6e
+      ip: 172.16.3.199
+    eth0:
+      mac: 00:14:5e:57:c4:d0
+      ip: 172.16.1.199
+    eth1:
+      mac: 00:14:5e:57:c4:ce
+      ip: 192.168.133.199
+  chassis:
+    serial_number: 99A3252
+    manufacturer: IBM
+    product_name: IBM System x3755 -[88774RG]-
+borderline-5:
+  bios:
+    version: ZYE133AUS-1.08
+    release_date: 02/23/2007
+    vendor: IBM
+  block_devices:
+    sda:
+      model: 8k-l Stripe
+      size:
+      rev: V1.0
+      vendor: ServeRA
+  network_interfaces:
+    ib0:
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:00:20:4d
+      ip: 172.16.4.200
+    bmc:
+      mac: 00:14:5e:57:6d:48
+      ip: 172.16.7.246
+    ib1:
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:00:20:4e
+    myri0:
+      mac: 00:60:dd:47:b6:50
+      ip: 172.16.3.200
+    eth0:
+      mac: 00:14:5e:57:6d:46
+      ip: 172.16.1.200
+    eth1:
+      mac: 00:14:5e:57:6d:44
+      ip: 192.168.133.200
+  chassis:
+    serial_number: 99A3257
+    manufacturer: IBM
+    product_name: IBM System x3755 -[88774RG]-
+borderline-6:
+  bios:
+    version: ZYE133AUS-1.13
+    release_date: 08/09/2007
+    vendor: IBM
+  block_devices:
+    sda:
+      model: 8k-l Stripe
+      size:
+      rev: V1.0
+      vendor: ServeRA
+  network_interfaces:
+    ib0:
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:00:20:2d
+      ip: 172.16.4.201
+    bmc:
+      mac: 00:14:5e:57:82:a8
+      ip: 172.16.7.247
+    ib1:
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:00:20:2e
+    myri0:
+      mac: 00:60:dd:47:b6:7d
+      ip: 172.16.3.201
+    eth0:
+      mac: 00:14:5e:57:82:a6
+      ip: 172.16.1.201
+    eth1:
+      mac: 00:14:5e:57:82:a4
+      ip: 192.168.133.201
+  chassis:
+    serial_number: 99A3256
+    manufacturer: IBM
+    product_name: IBM System x3755 -[88774RG]-
+borderline-7:
+  bios:
+    version: ZYE133AUS-1.08
+    release_date: 02/23/2007
+    vendor: IBM
+  block_devices:
+    sda:
+      model: 8k-l Stripe
+      size:
+      rev: V1.0
+      vendor: ServeRA
+  network_interfaces:
+    ib0:
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:00:20:3d
+      ip: 172.16.4.202
+    bmc:
+      mac: 00:14:5e:57:cc:04
+      ip: 172.16.7.248
+    ib1:
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:00:20:3e
+    myri0:
+      mac: 00:60:dd:47:86:96
+      ip: 172.16.3.202
+    eth0:
+      mac: 00:14:5e:57:cc:02
+      ip: 172.16.1.202
+    eth1:
+      mac: 00:14:5e:57:cc:00
+      ip: 192.168.133.202
+  chassis:
+    serial_number: 99A3251
+    manufacturer: IBM
+    product_name: IBM System x3755 -[88774RG]-
+borderline-8:
+  bios:
+    version: ZYE133AUS-1.08
+    release_date: 02/23/2007
+    vendor: IBM
+  block_devices:
+    sda:
+      model: 8k-l Stripe
+      size:
+      rev: V1.0
+      vendor: ServeRA
+  network_interfaces:
+    ib0:
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:00:20:49
+      ip: 172.16.4.203
+    bmc:
+      mac: 00:14:5e:57:cb:da
+      ip: 172.16.7.249
+    ib1:
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:00:20:4a
+    myri0:
+      mac: 00:60:dd:47:b5:14
+      ip: 172.16.3.203
+    eth0:
+      mac: 00:14:5e:57:cb:d8
+      ip: 172.16.1.203
+    eth1:
+      mac: 00:14:5e:57:cb:d6
+      ip: 192.168.133.203
+  chassis:
+    serial_number: 99A3250
+    manufacturer: IBM
+    product_name: IBM System x3755 -[88774RG]-
+borderline-9:
+  bios:
+    version: ZYE133AUS-1.08
+    release_date: 02/23/2007
+    vendor: IBM
+  block_devices:
+    sda:
+      model: 8k-l Stripe
+      size:
+      rev: V1.0
+      vendor: ServeRA
+  network_interfaces:
+    ib0:
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:00:1f:85
+      ip: 172.16.4.204
+    bmc:
+      mac: 00:14:5e:57:cb:b0
+      ip: 172.16.7.250
+    ib1:
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:00:1f:86
+    myri0:
+      mac: 00:60:dd:47:7d:8c
+      ip: 172.16.3.204
+    eth0:
+      mac: 00:14:5e:57:cb:ae
+      ip: 172.16.1.204
+    eth1:
+      mac: 00:14:5e:57:cb:ac
+      ip: 192.168.133.204
+  chassis:
+    serial_number: 99A3253
+    manufacturer: IBM
+    product_name: IBM System x3755 -[88774RG]-
+borderline-10:
+  bios:
+    version: ZYE133AUS-1.08
+    release_date: 02/23/2007
+    vendor: IBM
+  block_devices:
+    sda:
+      model: 8k-l Stripe
+      size:
+      rev: V1.0
+      vendor: ServeRA
+  network_interfaces:
+    ib0:
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:00:1d:fd
+      ip: 172.16.4.205
+    bmc:
+      mac: 00:14:5e:57:cb:f8
+      ip: 172.16.7.251
+    ib1:
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:00:1d:fe
+    myri0:
+      mac: 00:60:dd:47:b7:28
+      ip: 172.16.3.205
+    eth0:
+      mac: 00:14:5e:57:cb:f6
+      ip: 172.16.1.205
+    eth1:
+      mac: 00:14:5e:57:cb:f4
+      ip: 192.168.133.205
+  chassis:
+    serial_number: 99A3258
+    manufacturer: IBM
+    product_name: IBM System x3755 -[88774RG]-