From d1431757eaf23923fbd93d39097a50dce703685a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89mile=20Morel?= <emile.morel@inria.fr>
Date: Fri, 23 Aug 2013 14:20:49 +0200
Subject: [PATCH] [All] seperate rb files en two files (one generated by
 g5k-checks, one set manualy)

---
 .../sites/bordeaux/clusters/bordeplage.rb     |  140 +-
 ...deplage.yaml => bordeplage_generated.yaml} |   61 +-
 .../bordeaux/clusters/bordeplage_manual.yaml  |  205 ++
 .../sites/bordeaux/clusters/bordereau.rb      |  106 +-
 ...ordereau.yaml => bordereau_generated.yaml} |  127 +-
 .../bordeaux/clusters/bordereau_manual.yaml   |  361 ++++
 .../sites/bordeaux/clusters/borderline.rb     |  154 +-
 ...derline.yaml => borderline_generated.yaml} |    0
 .../input/sites/grenoble/clusters/adonis.rb   |  140 +-
 .../{adonis.yaml => adonis_generated.yaml}    |  100 -
 .../grenoble/clusters/adonis_manual.yaml      |  131 ++
 .../input/sites/grenoble/clusters/edel.rb     |  142 +-
 .../{edel.yaml => edel_generated.yaml}        |  147 +-
 .../sites/grenoble/clusters/edel_manual.yaml  |  361 ++++
 .../input/sites/grenoble/clusters/genepi.rb   |  140 +-
 .../{genepi.yaml => genepi_generated.yaml}    |   90 +-
 .../grenoble/clusters/genepi_manual.yaml      |  170 ++
 .../input/sites/lille/clusters/chimint.rb     |  104 +-
 .../{chimint.yaml => chimint_generated.yaml}  |   20 -
 .../sites/lille/clusters/chimint_manual.yaml  |   81 +
 .../input/sites/lille/clusters/chinqchint.rb  |  122 +-
 ...nqchint.yaml => chinqchint_generated.yaml} |   66 +-
 .../lille/clusters/chinqchint_manual.yaml     |  185 ++
 .../input/sites/lille/clusters/chirloute.rb   |  108 +-
 ...hirloute.yaml => chirloute_generated.yaml} |   32 -
 .../lille/clusters/chirloute_manual.yaml      |   57 +
 .../sites/luxembourg/clusters/granduc.rb      |  138 +-
 .../{granduc.yaml => granduc_generated.yaml}  |   89 +-
 .../luxembourg/clusters/granduc_manual.yaml   |  219 ++
 .../input/sites/lyon/clusters/hercule.rb      |  136 +-
 .../{hercule.yaml => hercule_generated.yaml}  |    0
 generators/input/sites/lyon/clusters/orion.rb |  156 +-
 .../{orion.yaml => orion_generated.yaml}      |    0
 .../input/sites/lyon/clusters/sagittaire.rb   |  116 +-
 ...ittaire.yaml => sagittaire_generated.yaml} |    6 +-
 .../input/sites/lyon/clusters/taurus.rb       |  156 +-
 .../{taurus.yaml => taurus_generated.yaml}    |    0
 .../input/sites/nancy/clusters/graphene.rb    |  164 +-
 ...{graphene.yaml => graphene_generated.yaml} | 1152 ----------
 .../sites/nancy/clusters/graphene_manual.yaml | 1873 +++++++++++++++++
 .../input/sites/nancy/clusters/griffon.rb     |  150 +-
 .../{griffon.yaml => griffon_generated.yaml}  |  924 +-------
 .../sites/nancy/clusters/griffon_manual.yaml  | 1339 ++++++++++++
 .../input/sites/reims/clusters/stremi.rb      |  138 +-
 .../{stremi.yaml => stremi_generated.yaml}    |  222 +-
 .../sites/reims/clusters/stremi_manual.yaml   |  353 ++++
 generators/input/sites/rennes/clusters/<q     |  219 --
 .../input/sites/rennes/clusters/paradent.rb   |  104 +-
 ...{paradent.yaml => paradent_generated.yaml} |  254 ---
 .../rennes/clusters/paradent_manual.yaml      |  447 ++++
 .../input/sites/rennes/clusters/parapide.rb   |  146 +-
 ...{parapide.yaml => parapide_generated.yaml} |  100 -
 .../rennes/clusters/parapide_manual.yaml      |  176 ++
 .../input/sites/rennes/clusters/parapluie.rb  |  180 +-
 ...arapluie.yaml => parapluie_generated.yaml} |  200 --
 .../rennes/clusters/parapluie_manual.yaml     |  321 +++
 .../input/sites/sophia/clusters/helios.rb     |  160 +-
 .../{helios.yaml => helios_generated.yaml}    |  112 -
 .../sites/sophia/clusters/helios_manual.yaml  |  281 +++
 generators/input/sites/sophia/clusters/sol.rb |  124 +-
 .../clusters/{sol.yaml => sol_generated.yaml} |  104 +-
 .../sites/sophia/clusters/sol_manual.yaml     |  251 +++
 .../input/sites/sophia/clusters/suno.rb       |  104 +-
 .../{suno.yaml => suno_generated.yaml}        |   90 -
 .../sites/sophia/clusters/suno_manual.yaml    |  226 ++
 .../input/sites/toulouse/clusters/pastel.rb   |  102 +-
 .../{pastel.yaml => pastel_generated.yaml}    |  280 ---
 .../toulouse/clusters/pastel_manual.yaml      |  701 ++++++
 68 files changed, 9406 insertions(+), 5957 deletions(-)
 rename generators/input/sites/bordeaux/clusters/{bordeplage.yaml => bordeplage_generated.yaml} (98%)
 create mode 100644 generators/input/sites/bordeaux/clusters/bordeplage_manual.yaml
 rename generators/input/sites/bordeaux/clusters/{bordereau.yaml => bordereau_generated.yaml} (98%)
 create mode 100644 generators/input/sites/bordeaux/clusters/bordereau_manual.yaml
 rename generators/input/sites/bordeaux/clusters/{borderline.yaml => borderline_generated.yaml} (100%)
 rename generators/input/sites/grenoble/clusters/{adonis.yaml => adonis_generated.yaml} (88%)
 create mode 100644 generators/input/sites/grenoble/clusters/adonis_manual.yaml
 rename generators/input/sites/grenoble/clusters/{edel.yaml => edel_generated.yaml} (97%)
 create mode 100644 generators/input/sites/grenoble/clusters/edel_manual.yaml
 rename generators/input/sites/grenoble/clusters/{genepi.yaml => genepi_generated.yaml} (96%)
 create mode 100644 generators/input/sites/grenoble/clusters/genepi_manual.yaml
 rename generators/input/sites/lille/clusters/{chimint.yaml => chimint_generated.yaml} (98%)
 create mode 100644 generators/input/sites/lille/clusters/chimint_manual.yaml
 rename generators/input/sites/lille/clusters/{chinqchint.yaml => chinqchint_generated.yaml} (98%)
 create mode 100644 generators/input/sites/lille/clusters/chinqchint_manual.yaml
 rename generators/input/sites/lille/clusters/{chirloute.yaml => chirloute_generated.yaml} (94%)
 create mode 100644 generators/input/sites/lille/clusters/chirloute_manual.yaml
 rename generators/input/sites/luxembourg/clusters/{granduc.yaml => granduc_generated.yaml} (94%)
 create mode 100644 generators/input/sites/luxembourg/clusters/granduc_manual.yaml
 rename generators/input/sites/lyon/clusters/{hercule.yaml => hercule_generated.yaml} (100%)
 rename generators/input/sites/lyon/clusters/{orion.yaml => orion_generated.yaml} (100%)
 rename generators/input/sites/lyon/clusters/{sagittaire.yaml => sagittaire_generated.yaml} (99%)
 rename generators/input/sites/lyon/clusters/{taurus.yaml => taurus_generated.yaml} (100%)
 rename generators/input/sites/nancy/clusters/{graphene.yaml => graphene_generated.yaml} (90%)
 create mode 100644 generators/input/sites/nancy/clusters/graphene_manual.yaml
 rename generators/input/sites/nancy/clusters/{griffon.yaml => griffon_generated.yaml} (87%)
 create mode 100644 generators/input/sites/nancy/clusters/griffon_manual.yaml
 rename generators/input/sites/reims/clusters/{stremi.yaml => stremi_generated.yaml} (92%)
 create mode 100644 generators/input/sites/reims/clusters/stremi_manual.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/<q
 rename generators/input/sites/rennes/clusters/{paradent.yaml => paradent_generated.yaml} (94%)
 create mode 100644 generators/input/sites/rennes/clusters/paradent_manual.yaml
 rename generators/input/sites/rennes/clusters/{parapide.yaml => parapide_generated.yaml} (95%)
 create mode 100644 generators/input/sites/rennes/clusters/parapide_manual.yaml
 rename generators/input/sites/rennes/clusters/{parapluie.yaml => parapluie_generated.yaml} (95%)
 create mode 100644 generators/input/sites/rennes/clusters/parapluie_manual.yaml
 rename generators/input/sites/sophia/clusters/{helios.yaml => helios_generated.yaml} (97%)
 create mode 100644 generators/input/sites/sophia/clusters/helios_manual.yaml
 rename generators/input/sites/sophia/clusters/{sol.yaml => sol_generated.yaml} (96%)
 create mode 100644 generators/input/sites/sophia/clusters/sol_manual.yaml
 rename generators/input/sites/sophia/clusters/{suno.yaml => suno_generated.yaml} (96%)
 create mode 100644 generators/input/sites/sophia/clusters/suno_manual.yaml
 rename generators/input/sites/toulouse/clusters/{pastel.yaml => pastel_generated.yaml} (96%)
 create mode 100644 generators/input/sites/toulouse/clusters/pastel_manual.yaml

diff --git a/generators/input/sites/bordeaux/clusters/bordeplage.rb b/generators/input/sites/bordeaux/clusters/bordeplage.rb
index ab161020d0f..adb59fd2266 100644
--- a/generators/input/sites/bordeaux/clusters/bordeplage.rb
+++ b/generators/input/sites/bordeaux/clusters/bordeplage.rb
@@ -16,121 +16,121 @@ site :bordeaux do |site_uid|
         supported_job_types({
           :deploy       => true,
           :besteffort   => true,
-          :virtual      => lookup('bordeplage', node_uid, 'supported_job_types', 'virtual')
+          :virtual      => lookup('bordeplage_generated', node_uid, 'supported_job_types', 'virtual')
         })
 
         architecture({
-          :smp_size       => lookup('bordeplage', node_uid, 'architecture', 'smp_size'),
-          :smt_size       => lookup('bordeplage', node_uid, 'architecture', 'smt_size'),
-          :platform_type  => lookup('bordeplage', node_uid, 'architecture', 'platform_type')
+          :smp_size       => lookup('bordeplage_generated', node_uid, 'architecture', 'smp_size'),
+          :smt_size       => lookup('bordeplage_generated', node_uid, 'architecture', 'smt_size'),
+          :platform_type  => lookup('bordeplage_generated', node_uid, 'architecture', 'platform_type')
         })
 
         processor({
-          :vendor             => lookup('bordeplage', node_uid, 'processor', 'vendor'),
-          :model              => lookup('bordeplage', node_uid, 'processor', 'model'),
-          :version            => lookup('bordeplage', node_uid, 'processor', 'version'),
-          :clock_speed        => lookup('bordeplage', node_uid, 'processor', 'clock_speed'),
-          :instruction_set    => lookup('bordeplage', node_uid, 'processor', 'instruction_set'),
-          :other_description  => lookup('bordeplage', node_uid, 'processor', 'other_description'),
-          :cache_l1           => lookup('bordeplage', node_uid, 'processor', 'cache_l1'),
-          :cache_l1i          => lookup('bordeplage', node_uid, 'processor', 'cache_l1i'),
-          :cache_l1d          => lookup('bordeplage', node_uid, 'processor', 'cache_l1d'),
-          :cache_l2           => lookup('bordeplage', node_uid, 'processor', 'cache_l2'),
-          :cache_l3           => lookup('bordeplage', node_uid, 'processor', 'cache_l3')
+          :vendor             => lookup('bordeplage_generated', node_uid, 'processor', 'vendor'),
+          :model              => lookup('bordeplage_generated', node_uid, 'processor', 'model'),
+          :version            => lookup('bordeplage_generated', node_uid, 'processor', 'version'),
+          :clock_speed        => lookup('bordeplage_generated', node_uid, 'processor', 'clock_speed'),
+          :instruction_set    => lookup('bordeplage_generated', node_uid, 'processor', 'instruction_set'),
+          :other_description  => lookup('bordeplage_generated', node_uid, 'processor', 'other_description'),
+          :cache_l1           => lookup('bordeplage_generated', node_uid, 'processor', 'cache_l1'),
+          :cache_l1i          => lookup('bordeplage_generated', node_uid, 'processor', 'cache_l1i'),
+          :cache_l1d          => lookup('bordeplage_generated', node_uid, 'processor', 'cache_l1d'),
+          :cache_l2           => lookup('bordeplage_generated', node_uid, 'processor', 'cache_l2'),
+          :cache_l3           => lookup('bordeplage_generated', node_uid, 'processor', 'cache_l3')
         })
 
         main_memory({
-          :ram_size     => lookup('bordeplage', node_uid, 'main_memory', 'ram_size'),
+          :ram_size     => lookup('bordeplage_generated', node_uid, 'main_memory', 'ram_size'),
           :virtual_size => nil
         })
 
         operating_system({
-          :name     => lookup('bordeplage', node_uid, 'operating_system', 'name'),
+          :name     => lookup('bordeplage_generated', node_uid, 'operating_system', 'name'),
           :release  => "Squeeze",
-          :version  => lookup('bordeplage', node_uid, 'operating_system', 'version'),
-          :kernel   => lookup('bordeplage', node_uid, 'operating_system', 'kernel')
+          :version  => lookup('bordeplage_generated', node_uid, 'operating_system', 'version'),
+          :kernel   => lookup('bordeplage_generated', node_uid, 'operating_system', 'kernel')
         })
 
         storage_devices [{
           :interface  => 'SCSI',
-          :size       => lookup('bordeplage', node_uid, 'block_devices', 'sda', 'size'),
+          :size       => lookup('bordeplage_generated', node_uid, 'block_devices', 'sda', 'size'),
           :driver     => "mptspi",
-          :device     => lookup('bordeplage', node_uid, 'block_devices', 'sda', 'device'),
-          :model      => lookup('bordeplage', node_uid, 'block_devices', 'sda', 'model'),
-          :vendor     => lookup('bordeplage', node_uid, 'block_devices', 'sda', 'vendor'),
-          :rev        => lookup('bordeplage', node_uid, 'block_devices', 'sda', 'rev')
+          :device     => lookup('bordeplage_generated', node_uid, 'block_devices', 'sda', 'device'),
+          :model      => lookup('bordeplage_generated', node_uid, 'block_devices', 'sda', 'model'),
+          :vendor     => lookup('bordeplage_generated', node_uid, 'block_devices', 'sda', 'vendor'),
+          :rev        => lookup('bordeplage_generated', node_uid, 'block_devices', 'sda', 'rev')
         }]
 
         network_adapters [{
-          :interface        => lookup('bordeplage', node_uid, 'network_interfaces', 'eth0', 'interface'),
-          :rate             => lookup('bordeplage', node_uid, 'network_interfaces', 'eth0', 'rate'),
-          :enabled          => lookup('bordeplage', node_uid, 'network_interfaces', 'eth0', 'enabled'),
-          :management       => lookup('bordeplage', node_uid, 'network_interfaces', 'eth0', 'management'),
-          :mountable        => lookup('bordeplage', node_uid, 'network_interfaces', 'eth0', 'mountable'),
-          :mounted          => lookup('bordeplage', node_uid, 'network_interfaces', 'eth0', 'mounted'),
+          :interface        => lookup('bordeplage_generated', node_uid, 'network_interfaces', 'eth0', 'interface'),
+          :rate             => lookup('bordeplage_generated', node_uid, 'network_interfaces', 'eth0', 'rate'),
+          :enabled          => lookup('bordeplage_generated', node_uid, 'network_interfaces', 'eth0', 'enabled'),
+          :management       => lookup('bordeplage_generated', node_uid, 'network_interfaces', 'eth0', 'management'),
+          :mountable        => lookup('bordeplage_generated', node_uid, 'network_interfaces', 'eth0', 'mountable'),
+          :mounted          => lookup('bordeplage_generated', node_uid, 'network_interfaces', 'eth0', 'mounted'),
           :bridged          => true,
           :device           => "eth0",
           :vendor 	    => "Intel",
           :version 	    => "82546GB Gigabit Ethernet Controller",
-          :driver           => lookup('bordeplage', node_uid, 'network_interfaces', 'eth0', 'driver'),
+          :driver           => lookup('bordeplage_generated', node_uid, 'network_interfaces', 'eth0', 'driver'),
           :network_address  => "#{node_uid}.#{site_uid}.grid5000.fr",
-          :ip               => lookup('bordeplage', node_uid, 'network_interfaces', 'eth0', 'ip'),
-          :ip6              => lookup('bordeplage', node_uid, 'network_interfaces', 'eth0', 'ip6'),
+          :ip               => lookup('bordeplage_generated', node_uid, 'network_interfaces', 'eth0', 'ip'),
+          :ip6              => lookup('bordeplage_generated', node_uid, 'network_interfaces', 'eth0', 'ip6'),
           :switch           => "sbordeplage",
-          :switch_port      => lookup('bordeplage', node_uid, 'network_interfaces', 'eth0', 'switch_port'),
-          :mac              => lookup('bordeplage', node_uid, 'network_interfaces', 'eth0', 'mac')
+          :switch_port      => lookup('bordeplage_generated', node_uid, 'network_interfaces', 'eth0', 'switch_port'),
+          :mac              => lookup('bordeplage_generated', node_uid, 'network_interfaces', 'eth0', 'mac')
         },
         {
-          :interface        => lookup('bordeplage', node_uid, 'network_interfaces', 'eth1', 'interface'),
+          :interface        => lookup('bordeplage_generated', node_uid, 'network_interfaces', 'eth1', 'interface'),
           :rate             => 1.G,
-          :enabled          => lookup('bordeplage', node_uid, 'network_interfaces', 'eth1', 'enabled'),
-          :management       => lookup('bordeplage', node_uid, 'network_interfaces', 'eth1', 'management'),
-          :mountable        => lookup('bordeplage', node_uid, 'network_interfaces', 'eth1', 'mountable'),
-          :mounted          => lookup('bordeplage', node_uid, 'network_interfaces', 'eth1', 'mounted'),
+          :enabled          => lookup('bordeplage_generated', node_uid, 'network_interfaces', 'eth1', 'enabled'),
+          :management       => lookup('bordeplage_generated', node_uid, 'network_interfaces', 'eth1', 'management'),
+          :mountable        => lookup('bordeplage_generated', node_uid, 'network_interfaces', 'eth1', 'mountable'),
+          :mounted          => lookup('bordeplage_generated', node_uid, 'network_interfaces', 'eth1', 'mounted'),
           :bridged          => false,
           :device           => "eth1",
           :vendor 	    => "Intel",
           :version 	    => "82546GB Gigabit Ethernet Controller",
           :network_address  => "#{node_uid}-eth1.#{site_uid}.grid5000.fr",
-          :ip               => lookup('bordeplage', node_uid, 'network_interfaces', 'eth1', 'ip'),
-          :driver           => lookup('bordeplage', node_uid, 'network_interfaces', 'eth1', 'driver'),
-          :mac              => lookup('bordeplage', node_uid, 'network_interfaces', 'eth1', 'mac')
+          :ip               => lookup('bordeplage_generated', node_uid, 'network_interfaces', 'eth1', 'ip'),
+          :driver           => lookup('bordeplage_generated', node_uid, 'network_interfaces', 'eth1', 'driver'),
+          :mac              => lookup('bordeplage_generated', node_uid, 'network_interfaces', 'eth1', 'mac')
         },
         {
-          :interface        => lookup('bordeplage', node_uid, 'network_interfaces', 'ib0', 'interface'),
-          :rate             => lookup('bordeplage', node_uid, 'network_interfaces', 'ib0', 'rate'),
+          :interface        => lookup('bordeplage_generated', node_uid, 'network_interfaces', 'ib0', 'interface'),
+          :rate             => lookup('bordeplage_generated', node_uid, 'network_interfaces', 'ib0', 'rate'),
           :device           => "ib0",
-          :enabled          => lookup('bordeplage', node_uid, 'network_interfaces', 'ib0', 'enabled'),
-          :management       => lookup('bordeplage', node_uid, 'network_interfaces', 'ib0', 'management'),
-          :mountable        => lookup('bordeplage', node_uid, 'network_interfaces', 'ib0', 'mountable'),
-          :mounted          => lookup('bordeplage', node_uid, 'network_interfaces', 'ib0', 'mounted'),
+          :enabled          => lookup('bordeplage_generated', node_uid, 'network_interfaces', 'ib0', 'enabled'),
+          :management       => lookup('bordeplage_generated', node_uid, 'network_interfaces', 'ib0', 'management'),
+          :mountable        => lookup('bordeplage_generated', node_uid, 'network_interfaces', 'ib0', 'mountable'),
+          :mounted          => lookup('bordeplage_generated', node_uid, 'network_interfaces', 'ib0', 'mounted'),
           :vendor           => 'Mellanox',
-          :version          => lookup('bordeplage', node_uid, 'network_interfaces', 'ib0', 'version'),
-          :driver           => lookup('bordeplage', node_uid, 'network_interfaces', 'ib0', 'driver'),
+          :version          => lookup('bordeplage_generated', node_uid, 'network_interfaces', 'ib0', 'version'),
+          :driver           => lookup('bordeplage_generated', node_uid, 'network_interfaces', 'ib0', 'driver'),
           :network_address  => "#{node_uid}-ib0.#{site_uid}.grid5000.fr",
-          :ip               => lookup('bordeplage', node_uid, 'network_interfaces', 'ib0', 'ip'),
-          :ip6              => lookup('bordeplage', node_uid, 'network_interfaces', 'ib0', 'ip6'),
-          :guid             => lookup('bordeplage', node_uid, 'network_interfaces', 'ib0', 'guid')
+          :ip               => lookup('bordeplage_generated', node_uid, 'network_interfaces', 'ib0', 'ip'),
+          :ip6              => lookup('bordeplage_generated', node_uid, 'network_interfaces', 'ib0', 'ip6'),
+          :guid             => lookup('bordeplage_generated', node_uid, 'network_interfaces', 'ib0', 'guid')
         },
         {
-          :interface        => lookup('bordeplage', node_uid, 'network_interfaces', 'ib1', 'interface'),
+          :interface        => lookup('bordeplage_generated', node_uid, 'network_interfaces', 'ib1', 'interface'),
           :rate             => 10.G,
           :device           => "ib1",
-          :enabled          => lookup('bordeplage', node_uid, 'network_interfaces', 'ib1', 'enabled'),
-          :management       => lookup('bordeplage', node_uid, 'network_interfaces', 'ib1', 'management'),
-          :mountable        => lookup('bordeplage', node_uid, 'network_interfaces', 'ib1', 'mountable'),
-          :mounted          => lookup('bordeplage', node_uid, 'network_interfaces', 'ib1', 'mounted'),
+          :enabled          => lookup('bordeplage_generated', node_uid, 'network_interfaces', 'ib1', 'enabled'),
+          :management       => lookup('bordeplage_generated', node_uid, 'network_interfaces', 'ib1', 'management'),
+          :mountable        => lookup('bordeplage_generated', node_uid, 'network_interfaces', 'ib1', 'mountable'),
+          :mounted          => lookup('bordeplage_generated', node_uid, 'network_interfaces', 'ib1', 'mounted'),
           :vendor           => 'Mellanox',
-          :version          => lookup('bordeplage', node_uid, 'network_interfaces', 'ib1', 'version'),
-          :driver           => lookup('bordeplage', node_uid, 'network_interfaces', 'ib1', 'driver'),
-          :guid             => lookup('bordeplage', node_uid, 'network_interfaces', 'ib1', 'guid')
+          :version          => lookup('bordeplage_generated', node_uid, 'network_interfaces', 'ib1', 'version'),
+          :driver           => lookup('bordeplage_generated', node_uid, 'network_interfaces', 'ib1', 'driver'),
+          :guid             => lookup('bordeplage_generated', node_uid, 'network_interfaces', 'ib1', 'guid')
         },
         {
           :interface            => 'Ethernet',
           :rate                 => 100.M,
           :network_address      => "#{node_uid}-bmc.#{site_uid}.grid5000.fr",
-          :ip                   => lookup('bordeplage', node_uid, 'network_interfaces', 'bmc', 'ip'),
-          :mac                  => lookup('bordeplage', node_uid, 'network_interfaces', 'bmc', 'mac'),
+          :ip                   => lookup('bordeplage_generated', node_uid, 'network_interfaces', 'bmc', 'ip'),
+          :mac                  => lookup('bordeplage_generated', node_uid, 'network_interfaces', 'bmc', 'mac'),
           :enabled              => true,
           :mounted              => false,
           :mountable            => false,
@@ -139,15 +139,15 @@ site :bordeaux do |site_uid|
         }]
 
         chassis({
-          :serial       => lookup('bordeplage', node_uid, 'chassis', 'serial_number'),
-          :name         => lookup('bordeplage', node_uid, 'chassis', 'product_name'),
-          :manufacturer => lookup('bordeplage', node_uid, 'chassis', 'manufacturer')
+          :serial       => lookup('bordeplage_generated', node_uid, 'chassis', 'serial_number'),
+          :name         => lookup('bordeplage_generated', node_uid, 'chassis', 'product_name'),
+          :manufacturer => lookup('bordeplage_generated', node_uid, 'chassis', 'manufacturer')
         })
 
         bios({
-          :version      => lookup('bordeplage', node_uid, 'bios', 'version'),
-          :vendor       => lookup('bordeplage', node_uid, 'bios', 'vendor'),
-          :release_date => lookup('bordeplage', node_uid, 'bios', 'release_date')
+          :version      => lookup('bordeplage_generated', node_uid, 'bios', 'version'),
+          :vendor       => lookup('bordeplage_generated', node_uid, 'bios', 'vendor'),
+          :release_date => lookup('bordeplage_generated', node_uid, 'bios', 'release_date')
         })
 
         gpu({
diff --git a/generators/input/sites/bordeaux/clusters/bordeplage.yaml b/generators/input/sites/bordeaux/clusters/bordeplage_generated.yaml
similarity index 98%
rename from generators/input/sites/bordeaux/clusters/bordeplage.yaml
rename to generators/input/sites/bordeaux/clusters/bordeplage_generated.yaml
index 2e6e8926556..a0a2524225f 100644
--- a/generators/input/sites/bordeaux/clusters/bordeplage.yaml
+++ b/generators/input/sites/bordeaux/clusters/bordeplage_generated.yaml
@@ -49,7 +49,6 @@ bordeplage-1:
       driver: e1000
       mountable: true
       ip: 172.16.0.1
-      switch: sbordeplage-1
     eth1:
       mounted: false
       rate: 1000000000
@@ -125,7 +124,6 @@ bordeplage-2:
       driver: e1000
       mountable: true
       ip: 172.16.0.2
-      switch: sbordeplage-1
     eth1:
       mounted: false
       rate: 1000000000
@@ -212,7 +210,6 @@ bordeplage-3:
       driver: e1000
       mountable: true
       ip: 172.16.0.3
-      switch: sbordeplage-1
     eth1:
       mounted: false
       rate: 1000000000
@@ -306,7 +303,6 @@ bordeplage-4:
       driver: e1000
       mountable: true
       ip: 172.16.0.4
-      switch: sbordeplage-1
     eth1:
       mounted: false
       rate: 1000000000
@@ -386,7 +382,6 @@ bordeplage-5:
       driver: e1000
       mountable: true
       ip: 172.16.0.5
-      switch: sbordeplage-1
     eth1:
       mounted: false
       rate: 1000000000
@@ -473,7 +468,6 @@ bordeplage-6:
       driver: e1000
       mountable: true
       ip: 172.16.0.6
-      switch: sbordeplage-1
     eth1:
       mounted: false
       rate: 1000000000
@@ -560,7 +554,6 @@ bordeplage-7:
       driver: e1000
       mountable: true
       ip: 172.16.0.7
-      switch: sbordeplage-1
     eth1:
       mounted: false
       rate: 1000000000
@@ -647,7 +640,6 @@ bordeplage-8:
       driver: e1000
       mountable: true
       ip: 172.16.0.8
-      switch: sbordeplage-1
     eth1:
       mounted: false
       rate: 1000000000
@@ -734,7 +726,6 @@ bordeplage-9:
       driver: e1000
       mountable: true
       ip: 172.16.0.9
-      switch: sbordeplage-1
     eth1:
       mounted: false
       rate: 1000000000
@@ -813,7 +804,7 @@ bordeplage-10:
     eth0:
       mounted: true
       rate: 1000000000
-      mac:
+      mac: 
       ip6: fe80::214:22ff:fe0c:da94
       management: false
       enabled: true
@@ -821,11 +812,10 @@ bordeplage-10:
       driver: e1000
       mountable: true
       ip: 172.16.0.10
-      switch: sbordeplage-1
     eth1:
       mounted: false
       rate: 1000000000
-      mac:
+      mac: 
       management: false
       enabled: false
       interface: Ethernet
@@ -915,7 +905,6 @@ bordeplage-11:
       driver: e1000
       mountable: true
       ip: 172.16.0.11
-      switch: sbordeplage-2
     eth1:
       mounted: false
       rate: 1000000000
@@ -1006,7 +995,6 @@ bordeplage-12:
       driver: e1000
       mountable: true
       ip: 172.16.0.12
-      switch: sbordeplage-2
     eth1:
       mounted: false
       rate: 1000000000
@@ -1082,7 +1070,6 @@ bordeplage-13:
       driver: e1000
       mountable: true
       ip: 172.16.0.13
-      switch: sbordeplage-2
     eth1:
       mounted: false
       rate: 1000000000
@@ -1176,7 +1163,6 @@ bordeplage-14:
       driver: e1000
       mountable: true
       ip: 172.16.0.14
-      switch: sbordeplage-2
     eth1:
       mounted: false
       rate: 1000000000
@@ -1267,7 +1253,6 @@ bordeplage-15:
       driver: e1000
       mountable: true
       ip: 172.16.0.15
-      switch: sbordeplage-2
     eth1:
       mounted: false
       rate: 1000000000
@@ -1343,7 +1328,6 @@ bordeplage-16:
       driver: e1000
       mountable: true
       ip: 172.16.0.16
-      switch: sbordeplage-2
     eth1:
       mounted: false
       rate: 1000000000
@@ -1430,7 +1414,6 @@ bordeplage-17:
       driver: e1000
       mountable: true
       ip: 172.16.0.17
-      switch: sbordeplage-2
     eth1:
       mounted: false
       rate: 1000000000
@@ -1524,7 +1507,6 @@ bordeplage-18:
       driver: e1000
       mountable: true
       ip: 172.16.0.18
-      switch: sbordeplage-2
     eth1:
       mounted: false
       rate: 1000000000
@@ -1615,7 +1597,6 @@ bordeplage-19:
       driver: e1000
       mountable: true
       ip: 172.16.0.19
-      switch: sbordeplage-2
     eth1:
       mounted: false
       rate: 1000000000
@@ -1691,7 +1672,6 @@ bordeplage-20:
       driver: e1000
       mountable: true
       ip: 172.16.0.20
-      switch: sbordeplage-2
     eth1:
       mounted: false
       rate: 1000000000
@@ -1778,7 +1758,6 @@ bordeplage-21:
       driver: e1000
       mountable: true
       ip: 172.16.0.21
-      switch: sbordeplage-2
     eth1:
       mounted: false
       rate: 1000000000
@@ -1865,7 +1844,6 @@ bordeplage-22:
       driver: e1000
       mountable: true
       ip: 172.16.0.22
-      switch: sbordeplage-2
     eth1:
       mounted: false
       rate: 1000000000
@@ -1952,7 +1930,6 @@ bordeplage-23:
       driver: e1000
       mountable: true
       ip: 172.16.0.23
-      switch: sbordeplage-2
     eth1:
       mounted: false
       rate: 1000000000
@@ -2039,7 +2016,6 @@ bordeplage-24:
       driver: e1000
       mountable: true
       ip: 172.16.0.24
-      switch: sbordeplage-2
     eth1:
       mounted: false
       rate: 1000000000
@@ -2137,7 +2113,6 @@ bordeplage-25:
       driver: e1000
       mountable: true
       ip: 172.16.0.25
-      switch: sbordeplage-2
     eth1:
       mounted: false
       rate: 1000000000
@@ -2224,7 +2199,6 @@ bordeplage-26:
       driver: e1000
       mountable: true
       ip: 172.16.0.26
-      switch: sbordeplage-2
     eth1:
       mounted: false
       rate: 1000000000
@@ -2300,7 +2274,6 @@ bordeplage-27:
       driver: e1000
       mountable: true
       ip: 172.16.0.27
-      switch: sbordeplage-2
     eth1:
       mounted: false
       rate: 1000000000
@@ -2398,7 +2371,6 @@ bordeplage-28:
       driver: e1000
       mountable: true
       ip: 172.16.0.28
-      switch: sbordeplage-2
     eth1:
       mounted: false
       rate: 1000000000
@@ -2474,7 +2446,6 @@ bordeplage-29:
       driver: e1000
       mountable: true
       ip: 172.16.0.29
-      switch: sbordeplage-2
     eth1:
       mounted: false
       rate: 1000000000
@@ -2561,7 +2532,6 @@ bordeplage-30:
       driver: e1000
       mountable: true
       ip: 172.16.0.30
-      switch: sbordeplage-2
     eth1:
       mounted: false
       rate: 1000000000
@@ -2648,11 +2618,10 @@ bordeplage-31:
       driver: e1000
       mountable: true
       ip: 172.16.0.31
-      switch: sbordeplage-2
     eth1:
       mounted: false
       rate: 1000000000
-      mac:
+      mac: 
       management: false
       enabled: false
       interface: Ethernet
@@ -2746,7 +2715,6 @@ bordeplage-32:
       driver: e1000
       mountable: true
       ip: 172.16.0.32
-      switch: sbordeplage-2
     eth1:
       mounted: false
       rate: 1000000000
@@ -2822,7 +2790,6 @@ bordeplage-33:
       driver: e1000
       mountable: true
       ip: 172.16.0.33
-      switch: sbordeplage-2
     eth1:
       mounted: false
       rate: 1000000000
@@ -2909,7 +2876,6 @@ bordeplage-34:
       driver: e1000
       mountable: true
       ip: 172.16.0.34
-      switch: sbordeplage-2
     eth1:
       mounted: false
       rate: 1000000000
@@ -2996,7 +2962,6 @@ bordeplage-35:
       driver: e1000
       mountable: true
       ip: 172.16.0.35
-      switch: sbordeplage-2
     eth1:
       mounted: false
       rate: 1000000000
@@ -3094,7 +3059,6 @@ bordeplage-36:
       driver: e1000
       mountable: true
       ip: 172.16.0.36
-      switch: sbordeplage-2
     eth1:
       mounted: false
       rate: 1000000000
@@ -3177,7 +3141,6 @@ bordeplage-37:
       driver: e1000
       mountable: true
       ip: 172.16.0.37
-      switch: sbordeplage-2
     eth1:
       mounted: false
       rate: 1000000000
@@ -3257,7 +3220,6 @@ bordeplage-38:
       driver: e1000
       mountable: true
       ip: 172.16.0.38
-      switch: sbordeplage-2
     eth1:
       mounted: false
       rate: 1000000000
@@ -3344,7 +3306,6 @@ bordeplage-39:
       driver: e1000
       mountable: true
       ip: 172.16.0.39
-      switch: sbordeplage-2
     eth1:
       mounted: false
       rate: 1000000000
@@ -3438,7 +3399,6 @@ bordeplage-40:
       driver: e1000
       mountable: true
       ip: 172.16.0.40
-      switch: sbordeplage-2
     eth1:
       mounted: false
       rate: 1000000000
@@ -3518,7 +3478,6 @@ bordeplage-41:
       driver: e1000
       mountable: true
       ip: 172.16.0.41
-      switch: sbordeplage-2
     eth1:
       mounted: false
       rate: 1000000000
@@ -3616,7 +3575,6 @@ bordeplage-42:
       driver: e1000
       mountable: true
       ip: 172.16.0.42
-      switch: sbordeplage-2
     eth1:
       mounted: false
       rate: 1000000000
@@ -3696,7 +3654,6 @@ bordeplage-43:
       driver: e1000
       mountable: true
       ip: 172.16.0.43
-      switch: sbordeplage-2
     eth1:
       mounted: false
       rate: 1000000000
@@ -3790,7 +3747,6 @@ bordeplage-44:
       driver: e1000
       mountable: true
       ip: 172.16.0.44
-      switch: sbordeplage-2
     eth1:
       mounted: false
       rate: 1000000000
@@ -3866,7 +3822,6 @@ bordeplage-45:
       driver: e1000
       mountable: true
       ip: 172.16.0.45
-      switch: sbordeplage-2
     eth1:
       mounted: false
       rate: 1000000000
@@ -3953,7 +3908,6 @@ bordeplage-46:
       driver: e1000
       mountable: true
       ip: 172.16.0.46
-      switch: sbordeplage-2
     eth1:
       mounted: false
       rate: 1000000000
@@ -4047,7 +4001,6 @@ bordeplage-47:
       driver: e1000
       mountable: true
       ip: 172.16.0.47
-      switch: sbordeplage-2
     eth1:
       mounted: false
       rate: 1000000000
@@ -4131,7 +4084,6 @@ bordeplage-48:
       driver: e1000
       mountable: true
       ip: 172.16.0.48
-      switch: sbordeplage-2
     eth1:
       mounted: false
       rate: 1000000000
@@ -4214,11 +4166,10 @@ bordeplage-49:
       driver: e1000
       mountable: true
       ip: 172.16.0.49
-      switch: sbordeplage-2
     eth1:
       mounted: false
       rate: 1000000000
-      mac:
+      mac: 
       management: false
       enabled: false
       interface: Ethernet
@@ -4226,7 +4177,7 @@ bordeplage-49:
       mountable: true
       ip: 172.16.3.49
     bmc:
-      mac:
+      mac: 
       ip: 172.17.0.49
   block_devices:
     sda:
@@ -4301,7 +4252,6 @@ bordeplage-50:
       driver: e1000
       mountable: true
       ip: 172.16.0.50
-      switch: sbordeplage-2
     eth1:
       mounted: false
       rate: 1000000000
@@ -4388,7 +4338,6 @@ bordeplage-51:
       driver: e1000
       mountable: true
       ip: 172.16.0.51
-      switch: sbordeplage-2
     eth1:
       mounted: false
       rate: 1000000000
diff --git a/generators/input/sites/bordeaux/clusters/bordeplage_manual.yaml b/generators/input/sites/bordeaux/clusters/bordeplage_manual.yaml
new file mode 100644
index 00000000000..bdd9425453c
--- /dev/null
+++ b/generators/input/sites/bordeaux/clusters/bordeplage_manual.yaml
@@ -0,0 +1,205 @@
+---
+bordeplage-1:
+  network_interfaces:
+    eth0:
+      switch_name: sbordeplage-1
+bordeplage-2:
+  network_interfaces:
+    eth0:
+      switch_name: sbordeplage-1
+bordeplage-3:
+  network_interfaces:
+    eth0:
+      switch_name: sbordeplage-1
+bordeplage-4:
+  network_interfaces:
+    eth0:
+      switch_name: sbordeplage-1
+bordeplage-5:
+  network_interfaces:
+    eth0:
+      switch_name: sbordeplage-1
+bordeplage-6:
+  network_interfaces:
+    eth0:
+      switch_name: sbordeplage-1
+bordeplage-7:
+  network_interfaces:
+    eth0:
+      switch_name: sbordeplage-1
+bordeplage-8:
+  network_interfaces:
+    eth0:
+      switch_name: sbordeplage-1
+bordeplage-9:
+  network_interfaces:
+    eth0:
+      switch_name: sbordeplage-1
+bordeplage-10:
+  network_interfaces:
+    eth0:
+      switch_name: sbordeplage-1
+bordeplage-11:
+  network_interfaces:
+    eth0:
+      switch_name: sbordeplage-2
+bordeplage-12:
+  network_interfaces:
+    eth0:
+      switch_name: sbordeplage-2
+bordeplage-13:
+  network_interfaces:
+    eth0:
+      switch_name: sbordeplage-2
+bordeplage-14:
+  network_interfaces:
+    eth0:
+      switch_name: sbordeplage-2
+bordeplage-15:
+  network_interfaces:
+    eth0:
+      switch_name: sbordeplage-2
+bordeplage-16:
+  network_interfaces:
+    eth0:
+      switch_name: sbordeplage-2
+bordeplage-17:
+  network_interfaces:
+    eth0:
+      switch_name: sbordeplage-2
+bordeplage-18:
+  network_interfaces:
+    eth0:
+      switch_name: sbordeplage-2
+bordeplage-19:
+  network_interfaces:
+    eth0:
+      switch_name: sbordeplage-2
+bordeplage-20:
+  network_interfaces:
+    eth0:
+      switch_name: sbordeplage-2
+bordeplage-21:
+  network_interfaces:
+    eth0:
+      switch_name: sbordeplage-2
+bordeplage-22:
+  network_interfaces:
+    eth0:
+      switch_name: sbordeplage-2
+bordeplage-23:
+  network_interfaces:
+    eth0:
+      switch_name: sbordeplage-2
+bordeplage-24:
+  network_interfaces:
+    eth0:
+      switch_name: sbordeplage-2
+bordeplage-25:
+  network_interfaces:
+    eth0:
+      switch_name: sbordeplage-2
+bordeplage-26:
+  network_interfaces:
+    eth0:
+      switch_name: sbordeplage-2
+bordeplage-27:
+  network_interfaces:
+    eth0:
+      switch_name: sbordeplage-2
+bordeplage-28:
+  network_interfaces:
+    eth0:
+      switch_name: sbordeplage-2
+bordeplage-29:
+  network_interfaces:
+    eth0:
+      switch_name: sbordeplage-2
+bordeplage-30:
+  network_interfaces:
+    eth0:
+      switch_name: sbordeplage-2
+bordeplage-31:
+  network_interfaces:
+    eth0:
+      switch_name: sbordeplage-2
+bordeplage-32:
+  network_interfaces:
+    eth0:
+      switch_name: sbordeplage-2
+bordeplage-33:
+  network_interfaces:
+    eth0:
+      switch_name: sbordeplage-2
+bordeplage-34:
+  network_interfaces:
+    eth0:
+      switch_name: sbordeplage-2
+bordeplage-35:
+  network_interfaces:
+    eth0:
+      switch_name: sbordeplage-2
+bordeplage-36:
+  network_interfaces:
+    eth0:
+      switch_name: sbordeplage-2
+bordeplage-37:
+  network_interfaces:
+    eth0:
+      switch_name: sbordeplage-2
+bordeplage-38:
+  network_interfaces:
+    eth0:
+      switch_name: sbordeplage-2
+bordeplage-39:
+  network_interfaces:
+    eth0:
+      switch_name: sbordeplage-2
+bordeplage-40:
+  network_interfaces:
+    eth0:
+      switch_name: sbordeplage-2
+bordeplage-41:
+  network_interfaces:
+    eth0:
+      switch_name: sbordeplage-2
+bordeplage-42:
+  network_interfaces:
+    eth0:
+      switch_name: sbordeplage-2
+bordeplage-43:
+  network_interfaces:
+    eth0:
+      switch_name: sbordeplage-2
+bordeplage-44:
+  network_interfaces:
+    eth0:
+      switch_name: sbordeplage-2
+bordeplage-45:
+  network_interfaces:
+    eth0:
+      switch_name: sbordeplage-2
+bordeplage-46:
+  network_interfaces:
+    eth0:
+      switch_name: sbordeplage-2
+bordeplage-47:
+  network_interfaces:
+    eth0:
+      switch_name: sbordeplage-2
+bordeplage-48:
+  network_interfaces:
+    eth0:
+      switch_name: sbordeplage-2
+bordeplage-49:
+  network_interfaces:
+    eth0:
+      switch_name: sbordeplage-2
+bordeplage-50:
+  network_interfaces:
+    eth0:
+      switch_name: sbordeplage-2
+bordeplage-51:
+  network_interfaces:
+    eth0:
+      switch_name: sbordeplage-2
diff --git a/generators/input/sites/bordeaux/clusters/bordereau.rb b/generators/input/sites/bordeaux/clusters/bordereau.rb
index 1258d759c77..d4d7ab96233 100644
--- a/generators/input/sites/bordeaux/clusters/bordereau.rb
+++ b/generators/input/sites/bordeaux/clusters/bordereau.rb
@@ -17,91 +17,91 @@ site :bordeaux do |site_uid|
         supported_job_types({
           :deploy       => true,
           :besteffort   => true,
-          :virtual      => lookup('bordereau', node_uid, 'supported_job_types', 'virtual')
+          :virtual      => lookup('bordereau_generated', node_uid, 'supported_job_types', 'virtual')
         })
 
         architecture({
-          :smp_size       => lookup('bordereau', node_uid, 'architecture', 'smp_size'),
-          :smt_size       => lookup('bordereau', node_uid, 'architecture', 'smt_size'),
-          :platform_type  => lookup('bordereau', node_uid, 'architecture', 'platform_type')
+          :smp_size       => lookup('bordereau_generated', node_uid, 'architecture', 'smp_size'),
+          :smt_size       => lookup('bordereau_generated', node_uid, 'architecture', 'smt_size'),
+          :platform_type  => lookup('bordereau_generated', node_uid, 'architecture', 'platform_type')
         })
 
         processor({
-          :vendor             => lookup('bordereau', node_uid, 'processor', 'vendor'),
-          :model              => lookup('bordereau', node_uid, 'processor', 'model'),
-          :version            => lookup('bordereau', node_uid, 'processor', 'version'),
-          :clock_speed        => lookup('bordereau', node_uid, 'processor', 'clock_speed'),
-          :instruction_set    => lookup('bordereau', node_uid, 'processor', 'instruction_set'),
-          :other_description  => lookup('bordereau', node_uid, 'processor', 'other_description'),
-          :cache_l1           => lookup('bordereau', node_uid, 'processor', 'cache_l1'),
-          :cache_l1i          => lookup('bordereau', node_uid, 'processor', 'cache_l1i'),
-          :cache_l1d          => lookup('bordereau', node_uid, 'processor', 'cache_l1d'),
-          :cache_l2           => lookup('bordereau', node_uid, 'processor', 'cache_l2'),
-          :cache_l3           => lookup('bordereau', node_uid, 'processor', 'cache_l3')
+          :vendor             => lookup('bordereau_generated', node_uid, 'processor', 'vendor'),
+          :model              => lookup('bordereau_generated', node_uid, 'processor', 'model'),
+          :version            => lookup('bordereau_generated', node_uid, 'processor', 'version'),
+          :clock_speed        => lookup('bordereau_generated', node_uid, 'processor', 'clock_speed'),
+          :instruction_set    => lookup('bordereau_generated', node_uid, 'processor', 'instruction_set'),
+          :other_description  => lookup('bordereau_generated', node_uid, 'processor', 'other_description'),
+          :cache_l1           => lookup('bordereau_generated', node_uid, 'processor', 'cache_l1'),
+          :cache_l1i          => lookup('bordereau_generated', node_uid, 'processor', 'cache_l1i'),
+          :cache_l1d          => lookup('bordereau_generated', node_uid, 'processor', 'cache_l1d'),
+          :cache_l2           => lookup('bordereau_generated', node_uid, 'processor', 'cache_l2'),
+          :cache_l3           => lookup('bordereau_generated', node_uid, 'processor', 'cache_l3')
         })
 
         main_memory({
-          :ram_size     => lookup('bordereau', node_uid, 'main_memory', 'ram_size'),
+          :ram_size     => lookup('bordereau_generated', node_uid, 'main_memory', 'ram_size'),
           :virtual_size => nil
         })
 
         operating_system({
-          :name     => lookup('bordereau', node_uid, 'operating_system', 'name'),
+          :name     => lookup('bordereau_generated', node_uid, 'operating_system', 'name'),
           :release  => "Squeeze",
-          :version  => lookup('bordereau', node_uid, 'operating_system', 'version'),
-          :kernel   => lookup('bordereau', node_uid, 'operating_system', 'kernel')
+          :version  => lookup('bordereau_generated', node_uid, 'operating_system', 'version'),
+          :kernel   => lookup('bordereau_generated', node_uid, 'operating_system', 'kernel')
         })
         storage_devices [{
           :interface  => 'SATA',
-          :size       => lookup('bordereau', node_uid, 'block_devices', 'sda', 'size'),
+          :size       => lookup('bordereau_generated', node_uid, 'block_devices', 'sda', 'size'),
           :driver     => "sata_svw",
-          :device     => lookup('bordereau', node_uid, 'block_devices', 'sda', 'device'),
-          :model      => lookup('bordereau', node_uid, 'block_devices', 'sda', 'model'),
-          :vendor     => lookup('bordereau', node_uid, 'block_devices', 'sda', 'vendor'),
-          :rev        => lookup('bordereau', node_uid, 'block_devices', 'sda', 'rev')
+          :device     => lookup('bordereau_generated', node_uid, 'block_devices', 'sda', 'device'),
+          :model      => lookup('bordereau_generated', node_uid, 'block_devices', 'sda', 'model'),
+          :vendor     => lookup('bordereau_generated', node_uid, 'block_devices', 'sda', 'vendor'),
+          :rev        => lookup('bordereau_generated', node_uid, 'block_devices', 'sda', 'rev')
         }]
         network_adapters [{
-          :interface        => lookup('bordereau', node_uid, 'network_interfaces', 'eth0', 'interface'),
-          :rate             => lookup('bordereau', node_uid, 'network_interfaces', 'eth0', 'rate'),
-          :enabled          => lookup('bordereau', node_uid, 'network_interfaces', 'eth0', 'enabled'),
-          :management       => lookup('bordereau', node_uid, 'network_interfaces', 'eth0', 'management'),
-          :mountable        => lookup('bordereau', node_uid, 'network_interfaces', 'eth0', 'mountable'),
-          :mounted          => lookup('bordereau', node_uid, 'network_interfaces', 'eth0', 'mounted'),
+          :interface        => lookup('bordereau_generated', node_uid, 'network_interfaces', 'eth0', 'interface'),
+          :rate             => lookup('bordereau_generated', node_uid, 'network_interfaces', 'eth0', 'rate'),
+          :enabled          => lookup('bordereau_generated', node_uid, 'network_interfaces', 'eth0', 'enabled'),
+          :management       => lookup('bordereau_generated', node_uid, 'network_interfaces', 'eth0', 'management'),
+          :mountable        => lookup('bordereau_generated', node_uid, 'network_interfaces', 'eth0', 'mountable'),
+          :mounted          => lookup('bordereau_generated', node_uid, 'network_interfaces', 'eth0', 'mounted'),
           :bridged          => true,
           :device           => "eth0",
           :vendor           => "Broadcom",
           :version 	    => "BCM5704",
-          :driver           => lookup('bordereau', node_uid, 'network_interfaces', 'eth0', 'driver'),
+          :driver           => lookup('bordereau_generated', node_uid, 'network_interfaces', 'eth0', 'driver'),
           :network_address  => "#{node_uid}.#{site_uid}.grid5000.fr",
-          :ip               => lookup('bordereau', node_uid, 'network_interfaces', 'eth0', 'ip'),
-          :ip6              => lookup('bordereau', node_uid, 'network_interfaces', 'eth0', 'ip6'),
+          :ip               => lookup('bordereau_generated', node_uid, 'network_interfaces', 'eth0', 'ip'),
+          :ip6              => lookup('bordereau_generated', node_uid, 'network_interfaces', 'eth0', 'ip6'),
           :switch           => "gw-bordeaux",
-          :switch_port      => lookup('bordereau', node_uid, 'network_interfaces', 'eth0', 'switch_port'),
-          :mac              => lookup('bordereau', node_uid, 'network_interfaces', 'eth0', 'mac')
+          :switch_port      => lookup('bordereau_manual', node_uid, 'network_interfaces', 'eth0', 'switch_port'),
+          :mac              => lookup('bordereau_generated', node_uid, 'network_interfaces', 'eth0', 'mac')
         },
         {
-          :interface        => lookup('bordereau', node_uid, 'network_interfaces', 'eth1', 'interface'),
-          :rate             => lookup('bordereau', node_uid, 'network_interfaces', 'eth0', 'rate'),
-          :enabled          => lookup('bordereau', node_uid, 'network_interfaces', 'eth1', 'enabled'),
-          :management       => lookup('bordereau', node_uid, 'network_interfaces', 'eth1', 'management'),
-          :mountable        => lookup('bordereau', node_uid, 'network_interfaces', 'eth1', 'mountable'),
-          :mounted          => lookup('bordereau', node_uid, 'network_interfaces', 'eth1', 'mounted'),
+          :interface        => lookup('bordereau_generated', node_uid, 'network_interfaces', 'eth1', 'interface'),
+          :rate             => lookup('bordereau_generated', node_uid, 'network_interfaces', 'eth0', 'rate'),
+          :enabled          => lookup('bordereau_generated', node_uid, 'network_interfaces', 'eth1', 'enabled'),
+          :management       => lookup('bordereau_generated', node_uid, 'network_interfaces', 'eth1', 'management'),
+          :mountable        => lookup('bordereau_generated', node_uid, 'network_interfaces', 'eth1', 'mountable'),
+          :mounted          => lookup('bordereau_generated', node_uid, 'network_interfaces', 'eth1', 'mounted'),
           :bridged          => false,
           :device           => "eth1",
           :vendor           => "Broadcom",
           :version 	    => "BCM5704",
           :network_address  => "#{node_uid}-eth1.#{site_uid}.grid5000.fr",
-          :ip               => lookup('bordereau', node_uid, 'network_interfaces', 'eth1', 'ip'),
-          :ip6              => lookup('bordereau', node_uid, 'network_interfaces', 'eth0', 'ip6'),
-          :driver           => lookup('bordereau', node_uid, 'network_interfaces', 'eth1', 'driver'),
-          :mac              => lookup('bordereau', node_uid, 'network_interfaces', 'eth1', 'mac')
+          :ip               => lookup('bordereau_generated', node_uid, 'network_interfaces', 'eth1', 'ip'),
+          :ip6              => lookup('bordereau_generated', node_uid, 'network_interfaces', 'eth0', 'ip6'),
+          :driver           => lookup('bordereau_generated', node_uid, 'network_interfaces', 'eth1', 'driver'),
+          :mac              => lookup('bordereau_generated', node_uid, 'network_interfaces', 'eth1', 'mac')
         },
         {
           :interface            => 'Ethernet',
           :rate                 => 100.M,
           :network_address      => "#{node_uid}-bmc.#{site_uid}.grid5000.fr",
-          :ip                   => lookup('bordereau', node_uid, 'network_interfaces', 'bmc', 'ip'),
-          :mac                  => lookup('bordereau', node_uid, 'network_interfaces', 'bmc', 'mac'),
+          :ip                   => lookup('bordereau_generated', node_uid, 'network_interfaces', 'bmc', 'ip'),
+          :mac                  => lookup('bordereau_generated', node_uid, 'network_interfaces', 'bmc', 'mac'),
           :enabled              => true,
           :mounted              => false,
           :mountable            => false,
@@ -110,15 +110,15 @@ site :bordeaux do |site_uid|
         }]
 
         chassis({
-          :serial       => lookup('bordereau', node_uid, 'chassis', 'serial_number'),
-          :name         => lookup('bordereau', node_uid, 'chassis', 'product_name'),
-          :manufacturer => lookup('bordereau', node_uid, 'chassis', 'manufacturer')
+          :serial       => lookup('bordereau_generated', node_uid, 'chassis', 'serial_number'),
+          :name         => lookup('bordereau_generated', node_uid, 'chassis', 'product_name'),
+          :manufacturer => lookup('bordereau_generated', node_uid, 'chassis', 'manufacturer')
         })
 
         bios({
-          :version      => lookup('bordereau', node_uid, 'bios', 'version'),
-          :vendor       => lookup('bordereau', node_uid, 'bios', 'vendor'),
-          :release_date => lookup('bordereau', node_uid, 'bios', 'release_date')
+          :version      => lookup('bordereau_generated', node_uid, 'bios', 'version'),
+          :vendor       => lookup('bordereau_generated', node_uid, 'bios', 'vendor'),
+          :release_date => lookup('bordereau_generated', node_uid, 'bios', 'release_date')
         })
 
         gpu({
diff --git a/generators/input/sites/bordeaux/clusters/bordereau.yaml b/generators/input/sites/bordeaux/clusters/bordereau_generated.yaml
similarity index 98%
rename from generators/input/sites/bordeaux/clusters/bordereau.yaml
rename to generators/input/sites/bordeaux/clusters/bordereau_generated.yaml
index 2d42e02a8de..2b18b4f0754 100644
--- a/generators/input/sites/bordeaux/clusters/bordereau.yaml
+++ b/generators/input/sites/bordeaux/clusters/bordereau_generated.yaml
@@ -19,7 +19,7 @@ bordereau-1:
     eth0:
       mounted: true
       rate: 1000000000
-      mac:
+      mac: 
       ip6: fe80::214:5eff:fe55:6ca8
       management: false
       enabled: true
@@ -27,10 +27,9 @@ bordereau-1:
       driver: tg3
       mountable: true
       ip: 172.16.1.1
-      switch_port: Gi/C1
     eth1:
       mounted: false
-      mac:
+      mac: 
       management: false
       enabled: true
       interface: Ethernet
@@ -38,10 +37,10 @@ bordereau-1:
       mountable: true
       ip: 172.16.4.1
     bmc:
-      mac:
+      mac: 
       ip: 172.17.4.1
   chassis:
-    serial_number:
+    serial_number: 
     manufacturer: IBM
     product_name: IBM System x3455-[7986Z1J]-
   supported_job_types:
@@ -91,7 +90,6 @@ bordereau-2:
       driver: tg3
       mountable: true
       ip: 172.16.1.2
-      switch_port: Gi/C2
     eth1:
       mounted: false
       mac: 00:14:5e:55:5d:2d
@@ -105,7 +103,7 @@ bordereau-2:
       mac: 00:14:5e:55:5d:2e
       ip: 172.17.4.2
   chassis:
-    serial_number:
+    serial_number: 
     manufacturer: IBM
     product_name: IBM System x3455-[7986Z1J]-
   supported_job_types:
@@ -155,7 +153,6 @@ bordereau-3:
       driver: tg3
       mountable: true
       ip: 172.16.1.3
-      switch_port: Gi/C3
     eth1:
       mounted: false
       mac: 00:14:5e:55:5c:43
@@ -219,7 +216,6 @@ bordereau-4:
       driver: tg3
       mountable: true
       ip: 172.16.1.4
-      switch_port: Gi/C4
     eth1:
       mounted: false
       mac: 00:14:5e:55:68:c8
@@ -233,7 +229,7 @@ bordereau-4:
       mac: 00:14:5e:55:68:c9
       ip: 172.17.4.4
   chassis:
-    serial_number:
+    serial_number: 
     manufacturer: IBM
     product_name: IBM System x3455-[7986Z1J]-
   supported_job_types:
@@ -283,7 +279,6 @@ bordereau-5:
       driver: tg3
       mountable: true
       ip: 172.16.1.5
-      switch_port: Gi/C5
     eth1:
       mounted: false
       mac: 00:14:5e:55:61:95
@@ -347,7 +342,6 @@ bordereau-6:
       driver: tg3
       mountable: true
       ip: 172.16.1.6
-      switch_port: Gi/C6
     eth1:
       mounted: false
       mac: 00:14:5e:55:58:ef
@@ -411,7 +405,6 @@ bordereau-7:
       driver: tg3
       mountable: true
       ip: 172.16.1.7
-      switch_port: Gi/C7
     eth1:
       mounted: false
       mac: 00:14:5e:55:5e:7d
@@ -475,7 +468,6 @@ bordereau-8:
       driver: tg3
       mountable: true
       ip: 172.16.1.8
-      switch_port: Gi/C8
     eth1:
       mounted: false
       mac: 00:14:5e:55:60:f9
@@ -539,7 +531,6 @@ bordereau-9:
       driver: tg3
       mountable: true
       ip: 172.16.1.9
-      switch_port: Gi/C9
     eth1:
       mounted: false
       mac: 00:14:5e:55:5e:e9
@@ -603,7 +594,6 @@ bordereau-10:
       driver: tg3
       mountable: true
       ip: 172.16.1.10
-      switch_port: Gi/C10
     eth1:
       mounted: false
       mac: 00:14:5e:55:6b:cb
@@ -656,7 +646,6 @@ bordereau-11:
       driver: tg3
       mountable: true
       ip: 172.16.1.11
-      switch_port: Gi/C11
     eth1:
       mounted: false
       mac: 00:14:5e:55:5c:82
@@ -731,7 +720,6 @@ bordereau-12:
       driver: tg3
       mountable: true
       ip: 172.16.1.12
-      switch_port: Gi/C12
     eth1:
       mounted: false
       mac: 00:14:5e:55:58:f8
@@ -795,7 +783,6 @@ bordereau-13:
       driver: tg3
       mountable: true
       ip: 172.16.1.13
-      switch_port: Gi/C13
     eth1:
       mounted: false
       mac: 00:14:5e:55:59:64
@@ -859,7 +846,6 @@ bordereau-14:
       driver: tg3
       mountable: true
       ip: 172.16.1.14
-      switch_port: Gi/C14
     eth1:
       mounted: false
       mac: 00:14:5e:55:59:5e
@@ -923,7 +909,6 @@ bordereau-15:
       driver: tg3
       mountable: true
       ip: 172.16.1.15
-      switch_port: Gi/C15
     eth1:
       mounted: false
       mac: 00:14:5e:55:6a:f3
@@ -987,7 +972,6 @@ bordereau-16:
       driver: tg3
       mountable: true
       ip: 172.16.1.16
-      switch_port: Gi/C16
     eth1:
       mounted: false
       mac: 00:14:5e:55:5d:ed
@@ -1040,7 +1024,6 @@ bordereau-17:
       driver: tg3
       mountable: true
       ip: 172.16.1.17
-      switch_port: Gi/C17
     eth1:
       mounted: false
       mac: 00:14:5e:55:5e:aa
@@ -1115,7 +1098,6 @@ bordereau-18:
       driver: tg3
       mountable: true
       ip: 172.16.1.18
-      switch_port: Gi/C18
     eth1:
       mounted: false
       mac: 00:14:5e:55:64:0e
@@ -1179,7 +1161,6 @@ bordereau-19:
       driver: tg3
       mountable: true
       ip: 172.16.1.19
-      switch_port: Gi/C19
     eth1:
       mounted: false
       mac: 00:14:5e:55:68:68
@@ -1243,7 +1224,6 @@ bordereau-20:
       driver: tg3
       mountable: true
       ip: 172.16.1.20
-      switch_port: Gi/C20
     eth1:
       mounted: false
       mac: 00:14:5e:55:62:b2
@@ -1307,7 +1287,6 @@ bordereau-21:
       driver: tg3
       mountable: true
       ip: 172.16.1.21
-      switch_port: Gi/C21
     eth1:
       mounted: false
       mac: 00:14:5e:55:5a:99
@@ -1371,7 +1350,6 @@ bordereau-22:
       driver: tg3
       mountable: true
       ip: 172.16.1.22
-      switch_port: Gi/C22
     eth1:
       mounted: false
       mac: 00:14:5e:55:59:85
@@ -1435,7 +1413,6 @@ bordereau-23:
       driver: tg3
       mountable: true
       ip: 172.16.1.23
-      switch_port: Gi/C23
     eth1:
       mounted: false
       mac: 00:14:5e:55:62:97
@@ -1499,7 +1476,6 @@ bordereau-24:
       driver: tg3
       mountable: true
       ip: 172.16.1.24
-      switch_port:
     eth1:
       mounted: false
       mac: 00:14:5e:55:5d:db
@@ -1563,7 +1539,6 @@ bordereau-25:
       driver: tg3
       mountable: true
       ip: 172.16.1.25
-      switch_port:
     eth1:
       mounted: false
       mac: 00:14:5e:55:5d:ba
@@ -1627,7 +1602,6 @@ bordereau-26:
       driver: tg3
       mountable: true
       ip: 172.16.1.26
-      switch_port:
     eth1:
       mounted: false
       mac: 00:14:5e:55:6d:30
@@ -1687,7 +1661,6 @@ bordereau-27:
       driver: tg3
       mountable: true
       ip: 172.16.1.27
-      switch_port:
     eth1:
       mounted: false
       mac: 00:14:5e:55:5c:6a
@@ -1755,7 +1728,6 @@ bordereau-28:
       driver: tg3
       mountable: true
       ip: 172.16.1.28
-      switch_port: Gi/E4
     eth1:
       mounted: false
       mac: 00:14:5e:55:5e:89
@@ -1812,7 +1784,6 @@ bordereau-29:
       driver: tg3
       mountable: true
       ip: 172.16.1.29
-      switch_port: Gi/E5
     eth1:
       mounted: false
       mac: 00:14:5e:55:5c:c4
@@ -1883,7 +1854,6 @@ bordereau-30:
       driver: tg3
       mountable: true
       ip: 172.16.1.30
-      switch_port: Gi/E6
     eth1:
       mounted: false
       mac: 00:14:5e:55:5e:d7
@@ -1897,7 +1867,7 @@ bordereau-30:
       mac: 00:14:5e:55:5e:d8
       ip: 172.17.4.30
   chassis:
-    serial_number:
+    serial_number: 
     manufacturer: IBM
     product_name: IBM System x3455-[7986Z1J]-
   supported_job_types:
@@ -1947,7 +1917,6 @@ bordereau-31:
       driver: tg3
       mountable: true
       ip: 172.16.1.31
-      switch_port: Gi/E7
     eth1:
       mounted: false
       mac: 00:14:5e:55:59:b8
@@ -2011,7 +1980,6 @@ bordereau-32:
       driver: tg3
       mountable: true
       ip: 172.16.1.32
-      switch_port: Gi/E8
     eth1:
       mounted: false
       mac: 00:14:5e:55:59:be
@@ -2075,7 +2043,6 @@ bordereau-33:
       driver: tg3
       mountable: true
       ip: 172.16.1.33
-      switch_port: Gi/E9
     eth1:
       mounted: false
       mac: 00:14:5e:55:5e:b3
@@ -2139,7 +2106,6 @@ bordereau-34:
       driver: tg3
       mountable: true
       ip: 172.16.1.34
-      switch_port: Gi/E10
     eth1:
       mounted: false
       mac: 00:14:5e:55:5d:03
@@ -2153,7 +2119,7 @@ bordereau-34:
       mac: 00:14:5e:55:5d:04
       ip: 172.17.4.34
   chassis:
-    serial_number:
+    serial_number: 
     manufacturer: IBM
     product_name: IBM System x3455-[7986Z1J]-
   supported_job_types:
@@ -2196,7 +2162,6 @@ bordereau-35:
       driver: tg3
       mountable: true
       ip: 172.16.1.35
-      switch_port: Gi/E11
     eth1:
       mounted: false
       mac: 00:14:5e:55:5e:23
@@ -2267,7 +2232,6 @@ bordereau-36:
       driver: tg3
       mountable: true
       ip: 172.16.1.36
-      switch_port: Gi/E12
     eth1:
       mounted: false
       mac: 00:14:5e:55:69:f1
@@ -2331,7 +2295,6 @@ bordereau-37:
       driver: tg3
       mountable: true
       ip: 172.16.1.37
-      switch_port: Gi/E13
     eth1:
       mounted: false
       mac: 00:14:5e:55:5f:d3
@@ -2395,7 +2358,6 @@ bordereau-38:
       driver: tg3
       mountable: true
       ip: 172.16.1.38
-      switch_port: Gi/E14
     eth1:
       mounted: false
       mac: 00:14:5e:55:5f:10
@@ -2452,7 +2414,6 @@ bordereau-39:
       driver: tg3
       mountable: true
       ip: 172.16.1.39
-      switch_port: Gi/B1
     eth1:
       mounted: false
       mac: 00:14:5e:55:63:30
@@ -2515,7 +2476,7 @@ bordereau-40:
     eth0:
       mounted: true
       rate: 1000000000
-      mac:
+      mac: 
       ip6: fe80::214:5eff:fe55:6ca8
       management: false
       enabled: true
@@ -2523,10 +2484,9 @@ bordereau-40:
       driver: tg3
       mountable: true
       ip: 172.16.1.40
-      switch_port: Gi/B2
     eth1:
       mounted: false
-      mac:
+      mac: 
       management: false
       enabled: true
       interface: Ethernet
@@ -2534,10 +2494,10 @@ bordereau-40:
       mountable: true
       ip: 172.16.4.40
     bmc:
-      mac:
+      mac: 
       ip: 172.17.4.40
   chassis:
-    serial_number:
+    serial_number: 
     manufacturer: IBM
     product_name: IBM System x3455-[7986Z1J]-
   supported_job_types:
@@ -2576,7 +2536,6 @@ bordereau-41:
       driver: tg3
       mountable: true
       ip: 172.16.1.41
-      switch_port: Gi/B3
     eth1:
       mounted: false
       mac: 00:14:5e:55:59:01
@@ -2640,7 +2599,6 @@ bordereau-42:
       driver: tg3
       mountable: true
       ip: 172.16.1.42
-      switch_port: Gi/B4
     eth1:
       mounted: false
       mac: 00:14:5e:55:60:96
@@ -2704,7 +2662,6 @@ bordereau-43:
       driver: tg3
       mountable: true
       ip: 172.16.1.43
-      switch_port: Gi/B5
     eth1:
       mounted: false
       mac: 00:14:5e:55:6c:01
@@ -2772,7 +2729,6 @@ bordereau-44:
       driver: tg3
       mountable: true
       ip: 172.16.1.44
-      switch_port: Gi/B6
     eth1:
       mounted: false
       mac: 00:14:5e:55:59:d3
@@ -2832,7 +2788,6 @@ bordereau-45:
       driver: tg3
       mountable: true
       ip: 172.16.1.45
-      switch_port: Gi/B7
     eth1:
       mounted: false
       mac: 00:14:5e:55:5c:be
@@ -2900,7 +2855,6 @@ bordereau-46:
       driver: tg3
       mountable: true
       ip: 172.16.1.46
-      switch_port: Gi/B8
     eth1:
       mounted: false
       mac: 00:14:5e:55:5c:61
@@ -2971,7 +2925,6 @@ bordereau-47:
       driver: tg3
       mountable: true
       ip: 172.16.1.47
-      switch_port: Gi/B9
     eth1:
       mounted: false
       mac: 00:14:5e:55:6c:a9
@@ -3028,7 +2981,6 @@ bordereau-48:
       driver: tg3
       mountable: true
       ip: 172.16.1.48
-      switch_port: Gi/B10
     eth1:
       mounted: false
       mac: 00:14:5e:55:58:fe
@@ -3099,7 +3051,6 @@ bordereau-49:
       driver: tg3
       mountable: true
       ip: 172.16.1.49
-      switch_port: Gi/B11
     eth1:
       mounted: false
       mac: 00:14:5e:55:62:e8
@@ -3163,7 +3114,6 @@ bordereau-50:
       driver: tg3
       mountable: true
       ip: 172.16.1.50
-      switch_port: Gi/B12
     eth1:
       mounted: false
       mac: 00:14:5e:55:5e:ad
@@ -3223,7 +3173,6 @@ bordereau-51:
       driver: tg3
       mountable: true
       ip: 172.16.1.51
-      switch_port: Gi/B13
     eth1:
       mounted: false
       mac: 00:14:5e:55:5c:d6
@@ -3280,7 +3229,6 @@ bordereau-52:
       driver: tg3
       mountable: true
       ip: 172.16.1.52
-      switch_port: Gi/B14
     eth1:
       mounted: false
       mac: 00:14:5e:55:5d:b4
@@ -3344,7 +3292,6 @@ bordereau-53:
       driver: tg3
       mountable: true
       ip: 172.16.1.53
-      switch_port: Gi/B15
     eth1:
       mounted: false
       mac: 00:14:5e:55:6c:1c
@@ -3412,7 +3359,6 @@ bordereau-54:
       driver: tg3
       mountable: true
       ip: 172.16.1.54
-      switch_port: Gi/B16
     eth1:
       mounted: false
       mac: 00:14:5e:55:63:b7
@@ -3483,7 +3429,6 @@ bordereau-55:
       driver: tg3
       mountable: true
       ip: 172.16.1.55
-      switch_port:
     eth1:
       mounted: false
       mac: 00:14:5e:55:5c:ee
@@ -3547,7 +3492,6 @@ bordereau-56:
       driver: tg3
       mountable: true
       ip: 172.16.1.56
-      switch_port: Gi/D1
     eth1:
       mounted: false
       mac: 00:14:5e:55:60:cc
@@ -3603,7 +3547,7 @@ bordereau-57:
     eth0:
       mounted: true
       rate: 1000000000
-      mac:
+      mac: 
       ip6: fe80::214:5eff:fe55:6ca8
       management: false
       enabled: true
@@ -3611,10 +3555,9 @@ bordereau-57:
       driver: tg3
       mountable: true
       ip: 172.16.1.57
-      switch_port: Gi/D2
     eth1:
       mounted: false
-      mac:
+      mac: 
       management: false
       enabled: true
       interface: Ethernet
@@ -3622,10 +3565,10 @@ bordereau-57:
       mountable: true
       ip: 172.16.4.57
     bmc:
-      mac:
+      mac: 
       ip: 172.17.4.57
   chassis:
-    serial_number:
+    serial_number: 
     manufacturer: IBM
     product_name: IBM System x3455-[7986Z1J]-
   supported_job_types:
@@ -3675,7 +3618,6 @@ bordereau-58:
       driver: tg3
       mountable: true
       ip: 172.16.1.58
-      switch_port: Gi/D3
     eth1:
       mounted: false
       mac: 00:14:5e:55:5e:a7
@@ -3739,7 +3681,6 @@ bordereau-59:
       driver: tg3
       mountable: true
       ip: 172.16.1.59
-      switch_port: Gi/D4
     eth1:
       mounted: false
       mac: 00:14:5e:55:5c:d9
@@ -3803,7 +3744,6 @@ bordereau-60:
       driver: tg3
       mountable: true
       ip: 172.16.1.60
-      switch_port: Gi/D5
     eth1:
       mounted: false
       mac: 00:14:5e:55:5b:5c
@@ -3867,7 +3807,6 @@ bordereau-61:
       driver: tg3
       mountable: true
       ip: 172.16.1.61
-      switch_port: Gi/D6
     eth1:
       mounted: false
       mac: 00:14:5e:55:58:4a
@@ -3931,7 +3870,6 @@ bordereau-62:
       driver: tg3
       mountable: true
       ip: 172.16.1.62
-      switch_port: Gi/D7
     eth1:
       mounted: false
       mac: 00:14:5e:55:63:27
@@ -3995,7 +3933,6 @@ bordereau-63:
       driver: tg3
       mountable: true
       ip: 172.16.1.63
-      switch_port: Gi/D8
     eth1:
       mounted: false
       mac: 00:14:5e:55:5c:6d
@@ -4059,7 +3996,6 @@ bordereau-64:
       driver: tg3
       mountable: true
       ip: 172.16.1.64
-      switch_port: Gi/D9
     eth1:
       mounted: false
       mac: 00:14:5e:55:5c:d0
@@ -4123,7 +4059,6 @@ bordereau-65:
       driver: tg3
       mountable: true
       ip: 172.16.1.65
-      switch_port: Gi/D10
     eth1:
       mounted: false
       mac: 00:14:5e:55:59:fa
@@ -4187,7 +4122,6 @@ bordereau-66:
       driver: tg3
       mountable: true
       ip: 172.16.1.66
-      switch_port: Gi/D11
     eth1:
       mounted: false
       mac: 00:14:5e:55:5e:1a
@@ -4251,7 +4185,6 @@ bordereau-67:
       driver: tg3
       mountable: true
       ip: 172.16.1.67
-      switch_port: Gi/D12
     eth1:
       mounted: false
       mac: 00:14:5e:55:5c:1c
@@ -4315,7 +4248,6 @@ bordereau-68:
       driver: tg3
       mountable: true
       ip: 172.16.1.68
-      switch_port: Gi/D13
     eth1:
       mounted: false
       mac: 00:14:5e:55:57:8a
@@ -4379,7 +4311,6 @@ bordereau-69:
       driver: tg3
       mountable: true
       ip: 172.16.1.69
-      switch_port: Gi/D14
     eth1:
       mounted: false
       mac: 00:14:5e:55:63:cf
@@ -4443,7 +4374,6 @@ bordereau-70:
       driver: tg3
       mountable: true
       ip: 172.16.1.70
-      switch_port: Gi/D15
     eth1:
       mounted: false
       mac: 00:14:5e:55:6a:ff
@@ -4507,7 +4437,6 @@ bordereau-71:
       driver: tg3
       mountable: true
       ip: 172.16.1.71
-      switch_port: Gi/D16
     eth1:
       mounted: false
       mac: 00:14:5e:55:59:45
@@ -4571,7 +4500,6 @@ bordereau-72:
       driver: tg3
       mountable: true
       ip: 172.16.1.72
-      switch_port: Gi/D17
     eth1:
       mounted: false
       mac: 00:14:5e:55:5a:3f
@@ -4635,7 +4563,6 @@ bordereau-73:
       driver: tg3
       mountable: true
       ip: 172.16.1.73
-      switch_port: Gi/D18
     eth1:
       mounted: false
       mac: 00:14:5e:55:6a:1b
@@ -4699,7 +4626,6 @@ bordereau-74:
       driver: tg3
       mountable: true
       ip: 172.16.1.74
-      switch_port: Gi/D19
     eth1:
       mounted: false
       mac: 00:14:5e:55:64:05
@@ -4763,7 +4689,6 @@ bordereau-75:
       driver: tg3
       mountable: true
       ip: 172.16.1.75
-      switch_port: Gi/D20
     eth1:
       mounted: false
       mac: 00:14:5e:55:5e:b0
@@ -4827,7 +4752,6 @@ bordereau-76:
       driver: tg3
       mountable: true
       ip: 172.16.1.76
-      switch_port: Gi/D21
     eth1:
       mounted: false
       mac: 00:14:5e:55:5d:09
@@ -4891,7 +4815,6 @@ bordereau-77:
       driver: tg3
       mountable: true
       ip: 172.16.1.77
-      switch_port: Gi/D22
     eth1:
       mounted: false
       mac: 00:14:5e:55:63:60
@@ -4955,7 +4878,6 @@ bordereau-78:
       driver: tg3
       mountable: true
       ip: 172.16.1.78
-      switch_port: Gi/D23
     eth1:
       mounted: false
       mac: 00:14:5e:55:63:fc
@@ -5019,7 +4941,6 @@ bordereau-79:
       driver: tg3
       mountable: true
       ip: 172.16.1.79
-      switch_port:
     eth1:
       mounted: false
       mac: 00:14:5e:55:62:ee
@@ -5033,7 +4954,7 @@ bordereau-79:
       mac: 00:14:5e:55:62:ef
       ip: 172.17.4.79
   chassis:
-    serial_number:
+    serial_number: 
     manufacturer: IBM
     product_name: IBM System x3455-[7986Z1J]-
   supported_job_types:
@@ -5083,7 +5004,6 @@ bordereau-80:
       driver: tg3
       mountable: true
       ip: 172.16.1.80
-      switch_port: Gi/F1
     eth1:
       mounted: false
       mac: 00:14:5e:55:5c:af
@@ -5147,7 +5067,6 @@ bordereau-81:
       driver: tg3
       mountable: true
       ip: 172.16.1.81
-      switch_port: Gi/F2
     eth1:
       mounted: false
       mac: 00:14:5e:55:58:a7
@@ -5211,7 +5130,6 @@ bordereau-82:
       driver: tg3
       mountable: true
       ip: 172.16.1.82
-      switch_port: Gi/F3
     eth1:
       mounted: false
       mac: 00:14:5e:55:68:86
@@ -5275,7 +5193,6 @@ bordereau-83:
       driver: tg3
       mountable: true
       ip: 172.16.1.83
-      switch_port: Gi/F4
     eth1:
       mounted: false
       mac: 00:14:5e:55:6d:24
@@ -5339,7 +5256,6 @@ bordereau-84:
       driver: tg3
       mountable: true
       ip: 172.16.1.84
-      switch_port: Gi/F5
     eth1:
       mounted: false
       mac: 00:14:5e:55:5c:49
@@ -5403,7 +5319,6 @@ bordereau-85:
       driver: tg3
       mountable: true
       ip: 172.16.1.85
-      switch_port: Gi/F6
     eth1:
       mounted: false
       mac: 00:14:5e:55:59:42
@@ -5467,7 +5382,6 @@ bordereau-86:
       driver: tg3
       mountable: true
       ip: 172.16.1.86
-      switch_port: Gi/F8
     eth1:
       mounted: false
       mac: 00:14:5e:55:68:cb
@@ -5531,7 +5445,6 @@ bordereau-87:
       driver: tg3
       mountable: true
       ip: 172.16.1.87
-      switch_port: Gi/F8
     eth1:
       mounted: false
       mac: 00:14:5e:55:5e:29
@@ -5595,7 +5508,6 @@ bordereau-88:
       driver: tg3
       mountable: true
       ip: 172.16.1.88
-      switch_port: Gi/F9
     eth1:
       mounted: false
       mac: 00:14:5e:55:5d:6c
@@ -5659,7 +5571,6 @@ bordereau-89:
       driver: tg3
       mountable: true
       ip: 172.16.1.89
-      switch_port: Gi/F10
     eth1:
       mounted: false
       mac: 00:14:5e:55:6d:06
@@ -5723,7 +5634,6 @@ bordereau-90:
       driver: tg3
       mountable: true
       ip: 172.16.1.90
-      switch_port: Gi/F11
     eth1:
       mounted: false
       mac: 00:14:5e:55:6d:2a
@@ -5787,7 +5697,6 @@ bordereau-91:
       driver: tg3
       mountable: true
       ip: 172.16.1.91
-      switch_port: Gi/F12
     eth1:
       mounted: false
       mac: 00:14:5e:55:5c:c7
@@ -5851,7 +5760,6 @@ bordereau-92:
       driver: tg3
       mountable: true
       ip: 172.16.1.92
-      switch_port: Gi/F13
     eth1:
       mounted: false
       mac: 00:14:5e:55:6a:4b
@@ -5915,7 +5823,6 @@ bordereau-93:
       driver: tg3
       mountable: true
       ip: 172.16.1.93
-      switch_port: Gi/F14
     eth1:
       mounted: false
       mac: 00:14:5e:55:6d:15
diff --git a/generators/input/sites/bordeaux/clusters/bordereau_manual.yaml b/generators/input/sites/bordeaux/clusters/bordereau_manual.yaml
new file mode 100644
index 00000000000..d2d85c988af
--- /dev/null
+++ b/generators/input/sites/bordeaux/clusters/bordereau_manual.yaml
@@ -0,0 +1,361 @@
+---
+bordereau-1:
+  network_interfaces:
+    eth0:
+      switch_port: Gi/C1
+bordereau-2:
+  network_interfaces:
+    eth0:
+      switch_port: Gi/C2
+bordereau-3:
+  network_interfaces:
+    eth0:
+      switch_port: Gi/C3
+bordereau-4:
+  network_interfaces:
+    eth0:
+      switch_port: Gi/C4
+bordereau-5:
+  network_interfaces:
+    eth0:
+      switch_port: Gi/C5
+bordereau-6:
+  network_interfaces:
+    eth0:
+      switch_port: Gi/C6
+bordereau-7:
+  network_interfaces:
+    eth0:
+      switch_port: Gi/C7
+bordereau-8:
+  network_interfaces:
+    eth0:
+      switch_port: Gi/C8
+bordereau-9:
+  network_interfaces:
+    eth0:
+      switch_port: Gi/C9
+bordereau-10:
+  network_interfaces:
+    eth0:
+      switch_port: Gi/C10
+bordereau-11:
+  network_interfaces:
+    eth0:
+      switch_port: Gi/C11
+bordereau-12:
+  network_interfaces:
+    eth0:
+      switch_port: Gi/C12
+bordereau-13:
+  network_interfaces:
+    eth0:
+      switch_port: Gi/C13
+bordereau-14:
+  network_interfaces:
+    eth0:
+      switch_port: Gi/C14
+bordereau-15:
+  network_interfaces:
+    eth0:
+      switch_port: Gi/C15
+bordereau-16:
+  network_interfaces:
+    eth0:
+      switch_port: Gi/C16
+bordereau-17:
+  network_interfaces:
+    eth0:
+      switch_port: Gi/C17
+bordereau-18:
+  network_interfaces:
+    eth0:
+      switch_port: Gi/C18
+bordereau-19:
+  network_interfaces:
+    eth0:
+      switch_port: Gi/C19
+bordereau-20:
+  network_interfaces:
+    eth0:
+      switch_port: Gi/C20
+bordereau-21:
+  network_interfaces:
+    eth0:
+      switch_port: Gi/C21
+bordereau-22:
+  network_interfaces:
+    eth0:
+      switch_port: Gi/C22
+bordereau-23:
+  network_interfaces:
+    eth0:
+      switch_port: Gi/C23
+bordereau-24:
+  network_interfaces: {}
+bordereau-25:
+  network_interfaces: {}
+bordereau-26:
+  network_interfaces: {}
+bordereau-27:
+  network_interfaces: {}
+bordereau-28:
+  network_interfaces:
+    eth0:
+      switch_port: Gi/E4
+bordereau-29:
+  network_interfaces:
+    eth0:
+      switch_port: Gi/E5
+bordereau-30:
+  network_interfaces:
+    eth0:
+      switch_port: Gi/E6
+bordereau-31:
+  network_interfaces:
+    eth0:
+      switch_port: Gi/E7
+bordereau-32:
+  network_interfaces:
+    eth0:
+      switch_port: Gi/E8
+bordereau-33:
+  network_interfaces:
+    eth0:
+      switch_port: Gi/E9
+bordereau-34:
+  network_interfaces:
+    eth0:
+      switch_port: Gi/E10
+bordereau-35:
+  network_interfaces:
+    eth0:
+      switch_port: Gi/E11
+bordereau-36:
+  network_interfaces:
+    eth0:
+      switch_port: Gi/E12
+bordereau-37:
+  network_interfaces:
+    eth0:
+      switch_port: Gi/E13
+bordereau-38:
+  network_interfaces:
+    eth0:
+      switch_port: Gi/E14
+bordereau-39:
+  network_interfaces:
+    eth0:
+      switch_port: Gi/B1
+bordereau-40:
+  network_interfaces:
+    eth0:
+      switch_port: Gi/B2
+bordereau-41:
+  network_interfaces:
+    eth0:
+      switch_port: Gi/B3
+bordereau-42:
+  network_interfaces:
+    eth0:
+      switch_port: Gi/B4
+bordereau-43:
+  network_interfaces:
+    eth0:
+      switch_port: Gi/B5
+bordereau-44:
+  network_interfaces:
+    eth0:
+      switch_port: Gi/B6
+bordereau-45:
+  network_interfaces:
+    eth0:
+      switch_port: Gi/B7
+bordereau-46:
+  network_interfaces:
+    eth0:
+      switch_port: Gi/B8
+bordereau-47:
+  network_interfaces:
+    eth0:
+      switch_port: Gi/B9
+bordereau-48:
+  network_interfaces:
+    eth0:
+      switch_port: Gi/B10
+bordereau-49:
+  network_interfaces:
+    eth0:
+      switch_port: Gi/B11
+bordereau-50:
+  network_interfaces:
+    eth0:
+      switch_port: Gi/B12
+bordereau-51:
+  network_interfaces:
+    eth0:
+      switch_port: Gi/B13
+bordereau-52:
+  network_interfaces:
+    eth0:
+      switch_port: Gi/B14
+bordereau-53:
+  network_interfaces:
+    eth0:
+      switch_port: Gi/B15
+bordereau-54:
+  network_interfaces:
+    eth0:
+      switch_port: Gi/B16
+bordereau-55:
+  network_interfaces: {}
+bordereau-56:
+  network_interfaces:
+    eth0:
+      switch_port: Gi/D1
+bordereau-57:
+  network_interfaces:
+    eth0:
+      switch_port: Gi/D2
+bordereau-58:
+  network_interfaces:
+    eth0:
+      switch_port: Gi/D3
+bordereau-59:
+  network_interfaces:
+    eth0:
+      switch_port: Gi/D4
+bordereau-60:
+  network_interfaces:
+    eth0:
+      switch_port: Gi/D5
+bordereau-61:
+  network_interfaces:
+    eth0:
+      switch_port: Gi/D6
+bordereau-62:
+  network_interfaces:
+    eth0:
+      switch_port: Gi/D7
+bordereau-63:
+  network_interfaces:
+    eth0:
+      switch_port: Gi/D8
+bordereau-64:
+  network_interfaces:
+    eth0:
+      switch_port: Gi/D9
+bordereau-65:
+  network_interfaces:
+    eth0:
+      switch_port: Gi/D10
+bordereau-66:
+  network_interfaces:
+    eth0:
+      switch_port: Gi/D11
+bordereau-67:
+  network_interfaces:
+    eth0:
+      switch_port: Gi/D12
+bordereau-68:
+  network_interfaces:
+    eth0:
+      switch_port: Gi/D13
+bordereau-69:
+  network_interfaces:
+    eth0:
+      switch_port: Gi/D14
+bordereau-70:
+  network_interfaces:
+    eth0:
+      switch_port: Gi/D15
+bordereau-71:
+  network_interfaces:
+    eth0:
+      switch_port: Gi/D16
+bordereau-72:
+  network_interfaces:
+    eth0:
+      switch_port: Gi/D17
+bordereau-73:
+  network_interfaces:
+    eth0:
+      switch_port: Gi/D18
+bordereau-74:
+  network_interfaces:
+    eth0:
+      switch_port: Gi/D19
+bordereau-75:
+  network_interfaces:
+    eth0:
+      switch_port: Gi/D20
+bordereau-76:
+  network_interfaces:
+    eth0:
+      switch_port: Gi/D21
+bordereau-77:
+  network_interfaces:
+    eth0:
+      switch_port: Gi/D22
+bordereau-78:
+  network_interfaces:
+    eth0:
+      switch_port: Gi/D23
+bordereau-79:
+  network_interfaces: {}
+bordereau-80:
+  network_interfaces:
+    eth0:
+      switch_port: Gi/F1
+bordereau-81:
+  network_interfaces:
+    eth0:
+      switch_port: Gi/F2
+bordereau-82:
+  network_interfaces:
+    eth0:
+      switch_port: Gi/F3
+bordereau-83:
+  network_interfaces:
+    eth0:
+      switch_port: Gi/F4
+bordereau-84:
+  network_interfaces:
+    eth0:
+      switch_port: Gi/F5
+bordereau-85:
+  network_interfaces:
+    eth0:
+      switch_port: Gi/F6
+bordereau-86:
+  network_interfaces:
+    eth0:
+      switch_port: Gi/F8
+bordereau-87:
+  network_interfaces:
+    eth0:
+      switch_port: Gi/F8
+bordereau-88:
+  network_interfaces:
+    eth0:
+      switch_port: Gi/F9
+bordereau-89:
+  network_interfaces:
+    eth0:
+      switch_port: Gi/F10
+bordereau-90:
+  network_interfaces:
+    eth0:
+      switch_port: Gi/F11
+bordereau-91:
+  network_interfaces:
+    eth0:
+      switch_port: Gi/F12
+bordereau-92:
+  network_interfaces:
+    eth0:
+      switch_port: Gi/F13
+bordereau-93:
+  network_interfaces:
+    eth0:
+      switch_port: Gi/F14
diff --git a/generators/input/sites/bordeaux/clusters/borderline.rb b/generators/input/sites/bordeaux/clusters/borderline.rb
index 2551edb1ffc..a52139231ff 100644
--- a/generators/input/sites/bordeaux/clusters/borderline.rb
+++ b/generators/input/sites/bordeaux/clusters/borderline.rb
@@ -17,127 +17,127 @@ site :bordeaux do |site_uid|
         supported_job_types({
           :deploy       => true,
           :besteffort   => true,
-          :virtual      => lookup('borderline', node_uid, 'supported_job_types', 'virtual')
+          :virtual      => lookup('borderline_generated', node_uid, 'supported_job_types', 'virtual')
         })
 
         architecture({
-          :smp_size       => lookup('borderline', node_uid, 'architecture', 'smp_size'),
-          :smt_size       => lookup('borderline', node_uid, 'architecture', 'smt_size'),
-          :platform_type  => lookup('borderline', node_uid, 'architecture', 'platform_type')
+          :smp_size       => lookup('borderline_generated', node_uid, 'architecture', 'smp_size'),
+          :smt_size       => lookup('borderline_generated', node_uid, 'architecture', 'smt_size'),
+          :platform_type  => lookup('borderline_generated', node_uid, 'architecture', 'platform_type')
         })
 
         processor({
-          :vendor             => lookup('borderline', node_uid, 'processor', 'vendor'),
-          :model              => lookup('borderline', node_uid, 'processor', 'model'),
-          :version            => lookup('borderline', node_uid, 'processor', 'version'),
-          :clock_speed        => lookup('borderline', node_uid, 'processor', 'clock_speed'),
-          :instruction_set    => lookup('borderline', node_uid, 'processor', 'instruction_set'),
-          :other_description  => lookup('borderline', node_uid, 'processor', 'other_description'),
-          :cache_l1           => lookup('borderline', node_uid, 'processor', 'cache_l1'),
-          :cache_l1i          => lookup('borderline', node_uid, 'processor', 'cache_l1i'),
-          :cache_l1d          => lookup('borderline', node_uid, 'processor', 'cache_l1d'),
-          :cache_l2           => lookup('borderline', node_uid, 'processor', 'cache_l2'),
-          :cache_l3           => lookup('borderline', node_uid, 'processor', 'cache_l3')
+          :vendor             => lookup('borderline_generated', node_uid, 'processor', 'vendor'),
+          :model              => lookup('borderline_generated', node_uid, 'processor', 'model'),
+          :version            => lookup('borderline_generated', node_uid, 'processor', 'version'),
+          :clock_speed        => lookup('borderline_generated', node_uid, 'processor', 'clock_speed'),
+          :instruction_set    => lookup('borderline_generated', node_uid, 'processor', 'instruction_set'),
+          :other_description  => lookup('borderline_generated', node_uid, 'processor', 'other_description'),
+          :cache_l1           => lookup('borderline_generated', node_uid, 'processor', 'cache_l1'),
+          :cache_l1i          => lookup('borderline_generated', node_uid, 'processor', 'cache_l1i'),
+          :cache_l1d          => lookup('borderline_generated', node_uid, 'processor', 'cache_l1d'),
+          :cache_l2           => lookup('borderline_generated', node_uid, 'processor', 'cache_l2'),
+          :cache_l3           => lookup('borderline_generated', node_uid, 'processor', 'cache_l3')
         })
 
         main_memory({
-          :ram_size     => lookup('borderline', node_uid, 'main_memory', 'ram_size'),
+          :ram_size     => lookup('borderline_generated', node_uid, 'main_memory', 'ram_size'),
           :virtual_size => nil
         })
 
         operating_system({
-          :name     => lookup('borderline', node_uid, 'operating_system', 'name'),
+          :name     => lookup('borderline_generated', node_uid, 'operating_system', 'name'),
           :release  => "Squeeze",
-          :version  => lookup('borderline', node_uid, 'operating_system', 'version'),
-          :kernel   => lookup('borderline', node_uid, 'operating_system', 'kernel')
+          :version  => lookup('borderline_generated', node_uid, 'operating_system', 'version'),
+          :kernel   => lookup('borderline_generated', node_uid, 'operating_system', 'kernel')
         })
         storage_devices [{
           :interface  => 'SAS',
-          :size       => lookup('borderline', node_uid, 'block_devices', 'sda', 'size'),
+          :size       => lookup('borderline_generated', node_uid, 'block_devices', 'sda', 'size'),
           :driver     => "aacraid",
-          :device     => lookup('borderline', node_uid, 'block_devices', 'sda', 'device'),
-          :model      => lookup('borderline', node_uid, 'block_devices', 'sda', 'model'),
-          :vendor     => lookup('borderline', node_uid, 'block_devices', 'sda', 'vendor'),
-          :rev        => lookup('borderline', node_uid, 'block_devices', 'sda', 'rev')
+          :device     => lookup('borderline_generated', node_uid, 'block_devices', 'sda', 'device'),
+          :model      => lookup('borderline_generated', node_uid, 'block_devices', 'sda', 'model'),
+          :vendor     => lookup('borderline_generated', node_uid, 'block_devices', 'sda', 'vendor'),
+          :rev        => lookup('borderline_generated', node_uid, 'block_devices', 'sda', 'rev')
         }]
 
         network_adapters [{
-          :interface        => lookup('borderline', node_uid, 'network_interfaces', 'eth0', 'interface'),
-          :rate             => lookup('borderline', node_uid, 'network_interfaces', 'eth0', 'rate'),
-          :enabled          => lookup('borderline', node_uid, 'network_interfaces', 'eth0', 'enabled'),
-          :management       => lookup('borderline', node_uid, 'network_interfaces', 'eth0', 'management'),
-          :mountable        => lookup('borderline', node_uid, 'network_interfaces', 'eth0', 'mountable'),
-          :mounted          => lookup('borderline', node_uid, 'network_interfaces', 'eth0', 'mounted'),
+          :interface        => lookup('borderline_generated', node_uid, 'network_interfaces', 'eth0', 'interface'),
+          :rate             => lookup('borderline_generated', node_uid, 'network_interfaces', 'eth0', 'rate'),
+          :enabled          => lookup('borderline_generated', node_uid, 'network_interfaces', 'eth0', 'enabled'),
+          :management       => lookup('borderline_generated', node_uid, 'network_interfaces', 'eth0', 'management'),
+          :mountable        => lookup('borderline_generated', node_uid, 'network_interfaces', 'eth0', 'mountable'),
+          :mounted          => lookup('borderline_generated', node_uid, 'network_interfaces', 'eth0', 'mounted'),
           :bridged          => true,
           :device           => "eth0",
           :vendor           => "Broadcom",
           :version 	    => "NetXtreme II BCM5708",
-          :driver           => lookup('borderline', node_uid, 'network_interfaces', 'eth0', 'driver'),
+          :driver           => lookup('borderline_generated', node_uid, 'network_interfaces', 'eth0', 'driver'),
           :network_address  => "#{node_uid}.#{site_uid}.grid5000.fr",
-          :ip               => lookup('borderline', node_uid, 'network_interfaces', 'eth0', 'ip'),
-          :ip6              => lookup('borderline', node_uid, 'network_interfaces', 'eth0', 'ip6'),
+          :ip               => lookup('borderline_generated', node_uid, 'network_interfaces', 'eth0', 'ip'),
+          :ip6              => lookup('borderline_generated', node_uid, 'network_interfaces', 'eth0', 'ip6'),
           :switch           => "sborderline",
-          :switch_port      => lookup('borderline', node_uid, 'network_interfaces', 'eth0', 'switch_port'),
-          :mac              => lookup('borderline', node_uid, 'network_interfaces', 'eth0', 'mac')
+          :switch_port      => lookup('borderline_generated', node_uid, 'network_interfaces', 'eth0', 'switch_port'),
+          :mac              => lookup('borderline_generated', node_uid, 'network_interfaces', 'eth0', 'mac')
         },
         {
-          :interface        => lookup('borderline', node_uid, 'network_interfaces', 'eth1', 'interface'),
+          :interface        => lookup('borderline_generated', node_uid, 'network_interfaces', 'eth1', 'interface'),
           :rate             => 1.G,
-          :enabled          => lookup('borderline', node_uid, 'network_interfaces', 'eth1', 'enabled'),
-          :management       => lookup('borderline', node_uid, 'network_interfaces', 'eth1', 'management'),
-          :mountable        => lookup('borderline', node_uid, 'network_interfaces', 'eth1', 'mountable'),
-          :mounted          => lookup('borderline', node_uid, 'network_interfaces', 'eth1', 'mounted'),
+          :enabled          => lookup('borderline_generated', node_uid, 'network_interfaces', 'eth1', 'enabled'),
+          :management       => lookup('borderline_generated', node_uid, 'network_interfaces', 'eth1', 'management'),
+          :mountable        => lookup('borderline_generated', node_uid, 'network_interfaces', 'eth1', 'mountable'),
+          :mounted          => lookup('borderline_generated', node_uid, 'network_interfaces', 'eth1', 'mounted'),
           :bridged          => false,
           :device           => "eth1",
           :vendor 	    => "Broadcom",
           :version 	    => "NetXtreme II BCM5708",
           :network_address  => "#{node_uid}-eth1.#{site_uid}.grid5000.fr",
-          :ip               => lookup('borderline', node_uid, 'network_interfaces', 'eth1', 'ip'),
-          :driver           => lookup('borderline', node_uid, 'network_interfaces', 'eth1', 'driver'),
-          :mac              => lookup('borderline', node_uid, 'network_interfaces', 'eth1', 'mac')
+          :ip               => lookup('borderline_generated', node_uid, 'network_interfaces', 'eth1', 'ip'),
+          :driver           => lookup('borderline_generated', node_uid, 'network_interfaces', 'eth1', 'driver'),
+          :mac              => lookup('borderline_generated', node_uid, 'network_interfaces', 'eth1', 'mac')
         },
         {
-          :interface        => lookup('borderline', node_uid, 'network_interfaces', 'ib0', 'interface'),
-          :rate             => lookup('borderline', node_uid, 'network_interfaces', 'ib0', 'rate'),
+          :interface        => lookup('borderline_generated', node_uid, 'network_interfaces', 'ib0', 'interface'),
+          :rate             => lookup('borderline_generated', node_uid, 'network_interfaces', 'ib0', 'rate'),
           :device           => "ib0",
-          :enabled          => lookup('borderline', node_uid, 'network_interfaces', 'ib0', 'enabled'),
-          :management       => lookup('borderline', node_uid, 'network_interfaces', 'ib0', 'management'),
-          :mountable        => lookup('borderline', node_uid, 'network_interfaces', 'ib0', 'mountable'),
-          :mounted          => lookup('borderline', node_uid, 'network_interfaces', 'ib0', 'mounted'),
+          :enabled          => lookup('borderline_generated', node_uid, 'network_interfaces', 'ib0', 'enabled'),
+          :management       => lookup('borderline_generated', node_uid, 'network_interfaces', 'ib0', 'management'),
+          :mountable        => lookup('borderline_generated', node_uid, 'network_interfaces', 'ib0', 'mountable'),
+          :mounted          => lookup('borderline_generated', node_uid, 'network_interfaces', 'ib0', 'mounted'),
           :vendor           => 'Mellanox',
-          :version 	    => lookup('borderline', node_uid, 'network_interfaces', 'ib0', 'version'),
-          :driver           => lookup('borderline', node_uid, 'network_interfaces', 'ib0', 'driver'),
+          :version 	    => lookup('borderline_generated', node_uid, 'network_interfaces', 'ib0', 'version'),
+          :driver           => lookup('borderline_generated', node_uid, 'network_interfaces', 'ib0', 'driver'),
           :network_address  => "#{node_uid}-ib0.#{site_uid}.grid5000.fr",
-          :ip               => lookup('borderline', node_uid, 'network_interfaces', 'ib0', 'ip'),
-          :guid             => lookup('borderline', node_uid, 'network_interfaces', 'ib0', 'guid')
+          :ip               => lookup('borderline_generated', node_uid, 'network_interfaces', 'ib0', 'ip'),
+          :guid             => lookup('borderline_generated', node_uid, 'network_interfaces', 'ib0', 'guid')
         },
         {
-          :interface        => lookup('borderline', node_uid, 'network_interfaces', 'ib1', 'interface'),
+          :interface        => lookup('borderline_generated', node_uid, 'network_interfaces', 'ib1', 'interface'),
           :rate             => 10.G,
           :device           => "ib1",
-          :enabled          => lookup('borderline', node_uid, 'network_interfaces', 'ib1', 'enabled'),
-          :management       => lookup('borderline', node_uid, 'network_interfaces', 'ib1', 'management'),
-          :mountable        => lookup('borderline', node_uid, 'network_interfaces', 'ib1', 'mountable'),
-          :mounted          => lookup('borderline', node_uid, 'network_interfaces', 'ib1', 'mounted'),
+          :enabled          => lookup('borderline_generated', node_uid, 'network_interfaces', 'ib1', 'enabled'),
+          :management       => lookup('borderline_generated', node_uid, 'network_interfaces', 'ib1', 'management'),
+          :mountable        => lookup('borderline_generated', node_uid, 'network_interfaces', 'ib1', 'mountable'),
+          :mounted          => lookup('borderline_generated', node_uid, 'network_interfaces', 'ib1', 'mounted'),
           :vendor           => 'Mellanox',
-          :version 	    => lookup('borderline', node_uid, 'network_interfaces', 'ib1', 'version'),
-          :driver           => lookup('borderline', node_uid, 'network_interfaces', 'ib1', 'driver'),
-          :guid             => lookup('borderline', node_uid, 'network_interfaces', 'ib1', 'guid')
+          :version 	    => lookup('borderline_generated', node_uid, 'network_interfaces', 'ib1', 'version'),
+          :driver           => lookup('borderline_generated', node_uid, 'network_interfaces', 'ib1', 'driver'),
+          :guid             => lookup('borderline_generated', node_uid, 'network_interfaces', 'ib1', 'guid')
         },
         {
           :interface 		=> 'Myrinet',
           :rate 		=> 10.G,
           :network_address 	=> "#{node_uid}-myri0.#{site_uid}.grid5000.fr",
-          :ip 			=> lookup('borderline', node_uid, 'network_interfaces', 'myri0', 'ip'),
-          :ip6 			=> lookup('borderline', node_uid, 'network_interfaces', 'myri0', 'ip6'),
-          :mac 			=> lookup('borderline', node_uid, 'network_interfaces', 'myri0', 'mac'),
+          :ip 			=> lookup('borderline_generated', node_uid, 'network_interfaces', 'myri0', 'ip'),
+          :ip6 			=> lookup('borderline_generated', node_uid, 'network_interfaces', 'myri0', 'ip6'),
+          :mac 			=> lookup('borderline_generated', node_uid, 'network_interfaces', 'myri0', 'mac'),
           :vendor 		=> 'Myrinet',
           :version 		=> "10G-PCIE-8A-C",
-          :driver               => lookup('borderline', node_uid, 'network_interfaces', 'myri0', 'driver'),
-          :enabled              => lookup('borderline', node_uid, 'network_interfaces', 'myri0', 'enabled'),
-          :management           => lookup('borderline', node_uid, 'network_interfaces', 'myri0', 'management'),
-          :mountable            => lookup('borderline', node_uid, 'network_interfaces', 'myri0', 'mountable'),
-          :mounted              => lookup('borderline', node_uid, 'network_interfaces', 'myri0', 'mounted'),
+          :driver               => lookup('borderline_generated', node_uid, 'network_interfaces', 'myri0', 'driver'),
+          :enabled              => lookup('borderline_generated', node_uid, 'network_interfaces', 'myri0', 'enabled'),
+          :management           => lookup('borderline_generated', node_uid, 'network_interfaces', 'myri0', 'management'),
+          :mountable            => lookup('borderline_generated', node_uid, 'network_interfaces', 'myri0', 'mountable'),
+          :mounted              => lookup('borderline_generated', node_uid, 'network_interfaces', 'myri0', 'mounted'),
           :management 		=> false,
           :device 		=> "myri0"
         },
@@ -145,8 +145,8 @@ site :bordeaux do |site_uid|
           :interface 		=> 'Ethernet',
           :rate 		=> 100.M,
           :network_address 	=> "#{node_uid}-bmc.#{site_uid}.grid5000.fr",
-          :ip 			=> lookup('borderline', node_uid, 'network_interfaces', 'bmc', 'ip'),
-          :mac 			=> lookup('borderline', node_uid, 'network_interfaces', 'bmc', 'mac'),
+          :ip 			=> lookup('borderline_generated', node_uid, 'network_interfaces', 'bmc', 'ip'),
+          :mac 			=> lookup('borderline_generated', node_uid, 'network_interfaces', 'bmc', 'mac'),
           :enabled 		=> true,
           :mounted 		=> false,
           :mountable 		=> false,
@@ -155,15 +155,15 @@ site :bordeaux do |site_uid|
         }]
 
         chassis({
-          :serial       => lookup('borderline', node_uid, 'chassis', 'serial_number'),
-          :name         => lookup('borderline', node_uid, 'chassis', 'product_name'),
-          :manufacturer => lookup('borderline', node_uid, 'chassis', 'manufacturer')
+          :serial       => lookup('borderline_generated', node_uid, 'chassis', 'serial_number'),
+          :name         => lookup('borderline_generated', node_uid, 'chassis', 'product_name'),
+          :manufacturer => lookup('borderline_generated', node_uid, 'chassis', 'manufacturer')
         })
 
         bios({
-          :version      => lookup('borderline', node_uid, 'bios', 'version'),
-          :vendor       => lookup('borderline', node_uid, 'bios', 'vendor'),
-          :release_date => lookup('borderline', node_uid, 'bios', 'release_date')
+          :version      => lookup('borderline_generated', node_uid, 'bios', 'version'),
+          :vendor       => lookup('borderline_generated', node_uid, 'bios', 'vendor'),
+          :release_date => lookup('borderline_generated', node_uid, 'bios', 'release_date')
         })
 
         gpu({
diff --git a/generators/input/sites/bordeaux/clusters/borderline.yaml b/generators/input/sites/bordeaux/clusters/borderline_generated.yaml
similarity index 100%
rename from generators/input/sites/bordeaux/clusters/borderline.yaml
rename to generators/input/sites/bordeaux/clusters/borderline_generated.yaml
diff --git a/generators/input/sites/grenoble/clusters/adonis.rb b/generators/input/sites/grenoble/clusters/adonis.rb
index 13a061ba584..9c3be229666 100644
--- a/generators/input/sites/grenoble/clusters/adonis.rb
+++ b/generators/input/sites/grenoble/clusters/adonis.rb
@@ -16,99 +16,99 @@ site :grenoble do |site_uid|
         supported_job_types({
           :deploy       => true,
           :besteffort   => true,
-          :virtual      => lookup('adonis', node_uid, 'supported_job_types', 'virtual')
+          :virtual      => lookup('adonis_generated', node_uid, 'supported_job_types', 'virtual')
         })
 
         architecture({
-          :smp_size       => lookup('adonis', node_uid, 'architecture', 'smp_size'),
-          :smt_size       => lookup('adonis', node_uid, 'architecture', 'smt_size'),
-          :platform_type  => lookup('adonis', node_uid, 'architecture', 'platform_type')
+          :smp_size       => lookup('adonis_generated', node_uid, 'architecture', 'smp_size'),
+          :smt_size       => lookup('adonis_generated', node_uid, 'architecture', 'smt_size'),
+          :platform_type  => lookup('adonis_generated', node_uid, 'architecture', 'platform_type')
         })
 
         processor({
-          :vendor             => lookup('adonis', node_uid, 'processor', 'vendor'),
-          :model              => lookup('adonis', node_uid, 'processor', 'model'),
-          :version            => lookup('adonis', node_uid, 'processor', 'version'),
-          :clock_speed        => lookup('adonis', node_uid, 'processor', 'clock_speed'),
-          :instruction_set    => lookup('adonis', node_uid, 'processor', 'instruction_set'),
-          :other_description  => lookup('adonis', node_uid, 'processor', 'other_description'),
-          :cache_l1           => lookup('adonis', node_uid, 'processor', 'cache_l1'),
-          :cache_l1i          => lookup('adonis', node_uid, 'processor', 'cache_l1i'),
-          :cache_l1d          => lookup('adonis', node_uid, 'processor', 'cache_l1d'),
-          :cache_l2           => lookup('adonis', node_uid, 'processor', 'cache_l2'),
-          :cache_l3           => lookup('adonis', node_uid, 'processor', 'cache_l3')
+          :vendor             => lookup('adonis_generated', node_uid, 'processor', 'vendor'),
+          :model              => lookup('adonis_generated', node_uid, 'processor', 'model'),
+          :version            => lookup('adonis_generated', node_uid, 'processor', 'version'),
+          :clock_speed        => lookup('adonis_generated', node_uid, 'processor', 'clock_speed'),
+          :instruction_set    => lookup('adonis_generated', node_uid, 'processor', 'instruction_set'),
+          :other_description  => lookup('adonis_generated', node_uid, 'processor', 'other_description'),
+          :cache_l1           => lookup('adonis_generated', node_uid, 'processor', 'cache_l1'),
+          :cache_l1i          => lookup('adonis_generated', node_uid, 'processor', 'cache_l1i'),
+          :cache_l1d          => lookup('adonis_generated', node_uid, 'processor', 'cache_l1d'),
+          :cache_l2           => lookup('adonis_generated', node_uid, 'processor', 'cache_l2'),
+          :cache_l3           => lookup('adonis_generated', node_uid, 'processor', 'cache_l3')
         })
 
         main_memory({
-          :ram_size     => lookup('adonis', node_uid, 'main_memory', 'ram_size'),
+          :ram_size     => lookup('adonis_generated', node_uid, 'main_memory', 'ram_size'),
           :virtual_size => nil
         })
 
         operating_system({
-          :name     => lookup('adonis', node_uid, 'operating_system', 'name'),
+          :name     => lookup('adonis_generated', node_uid, 'operating_system', 'name'),
           :release  => "Squeeze",
-          :version  => lookup('adonis', node_uid, 'operating_system', 'version'),
-          :kernel   => lookup('adonis', node_uid, 'operating_system', 'kernel')
+          :version  => lookup('adonis_generated', node_uid, 'operating_system', 'version'),
+          :kernel   => lookup('adonis_generated', node_uid, 'operating_system', 'kernel')
         })
 
         storage_devices [{
           :interface  => 'SATA',
-          :size       => lookup('adonis', node_uid, 'block_devices', 'sda', 'size'),
+          :size       => lookup('adonis_generated', node_uid, 'block_devices', 'sda', 'size'),
           :driver     => "ahci",
-          :device     => lookup('adonis', node_uid, 'block_devices', 'sda', 'device'),
-          :model      => lookup('adonis', node_uid, 'block_devices', 'sda', 'model'),
-          :vendor     => lookup('adonis', node_uid, 'block_devices', 'sda', 'vendor'),
-          :rev        => lookup('adonis', node_uid, 'block_devices', 'sda', 'rev')
+          :device     => lookup('adonis_generated', node_uid, 'block_devices', 'sda', 'device'),
+          :model      => lookup('adonis_generated', node_uid, 'block_devices', 'sda', 'model'),
+          :vendor     => lookup('adonis_generated', node_uid, 'block_devices', 'sda', 'vendor'),
+          :rev        => lookup('adonis_generated', node_uid, 'block_devices', 'sda', 'rev')
         }]
 
         network_adapters [{
-          :interface        => lookup('adonis', node_uid, 'network_interfaces', 'eth0', 'interface'),
-          :rate             => lookup('adonis', node_uid, 'network_interfaces', 'eth0', 'rate'),
-          :enabled          => lookup('adonis', node_uid, 'network_interfaces', 'eth0', 'enabled'),
-          :management       => lookup('adonis', node_uid, 'network_interfaces', 'eth0', 'management'),
-          :mountable        => lookup('adonis', node_uid, 'network_interfaces', 'eth0', 'mountable'),
-          :mounted          => lookup('adonis', node_uid, 'network_interfaces', 'eth0', 'mounted'),
+          :interface        => lookup('adonis_generated', node_uid, 'network_interfaces', 'eth0', 'interface'),
+          :rate             => lookup('adonis_generated', node_uid, 'network_interfaces', 'eth0', 'rate'),
+          :enabled          => lookup('adonis_generated', node_uid, 'network_interfaces', 'eth0', 'enabled'),
+          :management       => lookup('adonis_generated', node_uid, 'network_interfaces', 'eth0', 'management'),
+          :mountable        => lookup('adonis_generated', node_uid, 'network_interfaces', 'eth0', 'mountable'),
+          :mounted          => lookup('adonis_generated', node_uid, 'network_interfaces', 'eth0', 'mounted'),
           :bridged          => true,
           :device           => "eth0",
           :vendor           => 'Intel',
           :version          => "Device 10c9 (rev 01)",
-          :driver           => lookup('adonis', node_uid, 'network_interfaces', 'eth0', 'driver'),
+          :driver           => lookup('adonis_generated', node_uid, 'network_interfaces', 'eth0', 'driver'),
           :network_address  => "#{node_uid}.#{site_uid}.grid5000.fr",
-          :ip               => lookup('adonis', node_uid, 'network_interfaces', 'eth0', 'ip'),
-          :ip6              => lookup('adonis', node_uid, 'network_interfaces', 'eth0', 'ip6'),
-          :switch           => "gw-grenoble",
-          :switch_port      => lookup('adonis', node_uid, 'network_interfaces', 'eth0', 'switch_port'),
-          :mac              => lookup('adonis', node_uid, 'network_interfaces', 'eth0', 'mac')
+          :ip               => lookup('adonis_generated', node_uid, 'network_interfaces', 'eth0', 'ip'),
+          :ip6              => lookup('adonis_generated', node_uid, 'network_interfaces', 'eth0', 'ip6'),
+          :switch           => lookup('adonis_manual', node_uid, 'network_interfaces', 'eth0', 'switch_name'),
+          :switch_port      => lookup('adonis_manual', node_uid, 'network_interfaces', 'eth0', 'switch_port'),
+          :mac              => lookup('adonis_generated', node_uid, 'network_interfaces', 'eth0', 'mac')
         },
         {
-          :interface        => lookup('adonis', node_uid, 'network_interfaces', 'eth1', 'interface'),
+          :interface        => lookup('adonis_generated', node_uid, 'network_interfaces', 'eth1', 'interface'),
           :rate             => 1.G,
-          :enabled          => lookup('adonis', node_uid, 'network_interfaces', 'eth1', 'enabled'),
-          :management       => lookup('adonis', node_uid, 'network_interfaces', 'eth1', 'management'),
-          :mountable        => lookup('adonis', node_uid, 'network_interfaces', 'eth1', 'mountable'),
-          :mounted          => lookup('adonis', node_uid, 'network_interfaces', 'eth1', 'mounted'),
+          :enabled          => lookup('adonis_generated', node_uid, 'network_interfaces', 'eth1', 'enabled'),
+          :management       => lookup('adonis_generated', node_uid, 'network_interfaces', 'eth1', 'management'),
+          :mountable        => lookup('adonis_generated', node_uid, 'network_interfaces', 'eth1', 'mountable'),
+          :mounted          => lookup('adonis_generated', node_uid, 'network_interfaces', 'eth1', 'mounted'),
           :bridged          => false,
           :device           => "eth1",
           :vendor           => 'Intel',
           :version          => "Device 10c9 (rev 01)",
-          :driver           => lookup('adonis', node_uid, 'network_interfaces', 'eth1', 'driver'),
-          :mac              => lookup('adonis', node_uid, 'network_interfaces', 'eth1', 'mac')
+          :driver           => lookup('adonis_generated', node_uid, 'network_interfaces', 'eth1', 'driver'),
+          :mac              => lookup('adonis_generated', node_uid, 'network_interfaces', 'eth1', 'mac')
         },
         {
-          :interface        => lookup('adonis', node_uid, 'network_interfaces', 'ib0', 'interface'),
-          :rate             => lookup('adonis', node_uid, 'network_interfaces', 'ib0', 'rate'),
+          :interface        => lookup('adonis_generated', node_uid, 'network_interfaces', 'ib0', 'interface'),
+          :rate             => lookup('adonis_generated', node_uid, 'network_interfaces', 'ib0', 'rate'),
           :device           => "ib0",
-          :enabled          => lookup('adonis', node_uid, 'network_interfaces', 'ib0', 'enabled'),
-          :management       => lookup('adonis', node_uid, 'network_interfaces', 'ib0', 'management'),
-          :mountable        => lookup('adonis', node_uid, 'network_interfaces', 'ib0', 'mountable'),
-          :mounted          => lookup('adonis', node_uid, 'network_interfaces', 'ib0', 'mounted'),
+          :enabled          => lookup('adonis_generated', node_uid, 'network_interfaces', 'ib0', 'enabled'),
+          :management       => lookup('adonis_generated', node_uid, 'network_interfaces', 'ib0', 'management'),
+          :mountable        => lookup('adonis_generated', node_uid, 'network_interfaces', 'ib0', 'mountable'),
+          :mounted          => lookup('adonis_generated', node_uid, 'network_interfaces', 'ib0', 'mounted'),
           :vendor           => 'Mellanox',
-          :version          => lookup('adonis', node_uid, 'network_interfaces', 'ib0', 'version'),
-          :driver           => lookup('adonis', node_uid, 'network_interfaces', 'ib0', 'driver'),
+          :version          => lookup('adonis_generated', node_uid, 'network_interfaces', 'ib0', 'version'),
+          :driver           => lookup('adonis_generated', node_uid, 'network_interfaces', 'ib0', 'driver'),
           :network_address  => "#{node_uid}-ib0.#{site_uid}.grid5000.fr",
-          :ip               => lookup('adonis', node_uid, 'network_interfaces', 'ib0', 'ip'),
-          :ip6              => lookup('adonis', node_uid, 'network_interfaces', 'ib0', 'ip6'),
-          :guid             => lookup('adonis', node_uid, 'network_interfaces', 'ib0', 'guid')
+          :ip               => lookup('adonis_generated', node_uid, 'network_interfaces', 'ib0', 'ip'),
+          :ip6              => lookup('adonis_generated', node_uid, 'network_interfaces', 'ib0', 'ip6'),
+          :guid             => lookup('adonis_generated', node_uid, 'network_interfaces', 'ib0', 'guid')
         },
         {
           :interface        => 'Ethernet',
@@ -119,28 +119,28 @@ site :grenoble do |site_uid|
           :mounted          => false,
           :device           => "bmc",
           :network_address  => "#{node_uid}-bmc.#{site_uid}.grid5000.fr",
-          :ip               => lookup('adonis', node_uid, 'network_interfaces', 'bmc', 'ip'),
+          :ip               => lookup('adonis_generated', node_uid, 'network_interfaces', 'bmc', 'ip'),
           :vendor           => 'Super Micro Computer Inc.',
           :version          => "1.15",
-          :mac              => lookup('adonis', node_uid, 'network_interfaces', 'bmc', 'mac')
+          :mac              => lookup('adonis_generated', node_uid, 'network_interfaces', 'bmc', 'mac')
         }]
 
         chassis({
-          :serial       => lookup('adonis', node_uid, 'chassis', 'serial_number'),
-          :name         => lookup('adonis', node_uid, 'chassis', 'product_name'),
-          :manufacturer => lookup('adonis', node_uid, 'chassis', 'manufacturer')
+          :serial       => lookup('adonis_generated', node_uid, 'chassis', 'serial_number'),
+          :name         => lookup('adonis_generated', node_uid, 'chassis', 'product_name'),
+          :manufacturer => lookup('adonis_generated', node_uid, 'chassis', 'manufacturer')
         })
 
         bios({
-          :version      => lookup('adonis', node_uid, 'bios', 'version'),
-          :vendor       => lookup('adonis', node_uid, 'bios', 'vendor'),
-          :release_date => lookup('adonis', node_uid, 'bios', 'release_date')
+          :version      => lookup('adonis_generated', node_uid, 'bios', 'version'),
+          :vendor       => lookup('adonis_generated', node_uid, 'bios', 'vendor'),
+          :release_date => lookup('adonis_generated', node_uid, 'bios', 'release_date')
         })
 
         gpu({
           :gpu         => true,
-          :gpu_count   =>  lookup('adonis', node_uid, 'gpu', 'gpu_count'),
-          :gpu_model   =>  lookup('adonis', node_uid, 'gpu', 'gpu_model'),
+          :gpu_count   =>  lookup('adonis_manual', node_uid, 'gpu', 'gpu_count'),
+          :gpu_model   =>  lookup('adonis_manual', node_uid, 'gpu', 'gpu_model'),
         })
 
         sensors({
@@ -148,13 +148,13 @@ site :grenoble do |site_uid|
             :available => true,
             :via => {
               :pdu  => [
-                [ { :measure 	=>  lookup('adonis', node_uid, 'sensors', 'measure1'), 
-                    :uid			=>  lookup('adonis', node_uid, 'sensors', 'pdu')},
-                  { :measure	=> 	lookup('adonis', node_uid, 'sensors', 'measure2'), 
-                    :uid			=>  lookup('adonis', node_uid, 'sensors', 'pdu')}
+                [ { :measure 	=>  lookup('adonis_manual', node_uid, 'sensors', 'measure1'),
+                    :uid			=>  lookup('adonis_manual', node_uid, 'sensors', 'pdu')},
+                  { :measure	=> 	lookup('adonis_manual', node_uid, 'sensors', 'measure2'),
+                    :uid			=>  lookup('adonis_manual', node_uid, 'sensors', 'pdu')}
                 ],
-                [ { :measure	=> 	"global", 
-                    :uid			=>	lookup('adonis', node_uid, 'sensors', 'block')}
+                [ { :measure	=> 	"global",
+                    :uid			=>	lookup('adonis_manual', node_uid, 'sensors', 'block')}
                 ]
               ]
             }
diff --git a/generators/input/sites/grenoble/clusters/adonis.yaml b/generators/input/sites/grenoble/clusters/adonis_generated.yaml
similarity index 88%
rename from generators/input/sites/grenoble/clusters/adonis.yaml
rename to generators/input/sites/grenoble/clusters/adonis_generated.yaml
index b65873b7ddb..4b6a6b254b5 100644
--- a/generators/input/sites/grenoble/clusters/adonis.yaml
+++ b/generators/input/sites/grenoble/clusters/adonis_generated.yaml
@@ -39,8 +39,6 @@ adonis-1:
       driver: igb
       mountable: true
       ip: 172.16.18.1
-      switch_name: gw-grenoble
-      switch_port: '3:11'
     eth1:
       mounted: false
       mac: 00:30:48:cc:7f:d9
@@ -75,14 +73,6 @@ adonis-1:
     smp_size: 2
     platform_type: x86_64
     smt_size: 8
-  gpu:
-    gpu_count: 2
-    gpu_model: Tesla-C1060
-  sensors:
-    measure1: outlet-11
-    measure2: outlet-12
-    pdu: adonis-pdu-1.grenoble.grid5000.fr
-    block: block-1
 adonis-2:
   bios:
     version: R4222X52
@@ -123,8 +113,6 @@ adonis-2:
       driver: igb
       mountable: true
       ip: 172.16.18.2
-      switch_name: gw-grenoble
-      switch_port: '3:12'
     eth1:
       mounted: false
       mac: 00:30:48:cc:7f:db
@@ -159,14 +147,6 @@ adonis-2:
     smp_size: 2
     platform_type: x86_64
     smt_size: 8
-  gpu:
-    gpu_count: 2
-    gpu_model: Tesla-C1060
-  sensors:
-    measure1: outlet-11
-    measure2: outlet-12
-    pdu: adonis-pdu-1.grenoble.grid5000.fr
-    block: block-1
 adonis-3:
   bios:
     version: R4222X52
@@ -196,8 +176,6 @@ adonis-3:
       driver: igb
       mountable: true
       ip: 172.16.18.3
-      switch_name: gw-grenoble
-      switch_port: '3:13'
     eth1:
       mounted: false
       mac: 00:30:48:cd:c6:a5
@@ -243,14 +221,6 @@ adonis-3:
     smp_size: 2
     platform_type: x86_64
     smt_size: 8
-  gpu:
-    gpu_count: 2
-    gpu_model: Tesla-C1060
-  sensors:
-    measure1: outlet-13
-    measure2: outlet-14
-    pdu: adonis-pdu-1.grenoble.grid5000.fr
-    block: block-2
 adonis-4:
   bios:
     version: R4222X52
@@ -290,8 +260,6 @@ adonis-4:
       driver: igb
       mountable: true
       ip: 172.16.18.4
-      switch_name: gw-grenoble
-      switch_port: '3:14'
     eth1:
       mounted: false
       mac: 00:30:48:cd:c0:ad
@@ -326,14 +294,6 @@ adonis-4:
     smp_size: 2
     platform_type: x86_64
     smt_size: 8
-  gpu:
-    gpu_count: 2
-    gpu_model: Tesla-C1060
-  sensors:
-    measure1: outlet-13
-    measure2: outlet-14
-    pdu: adonis-pdu-1.grenoble.grid5000.fr
-    block: block-2
 adonis-5:
   bios:
     version: R4222X52
@@ -363,8 +323,6 @@ adonis-5:
       driver: igb
       mountable: true
       ip: 172.16.18.5
-      switch_name: gw-grenoble
-      switch_port: '3:15'
     eth1:
       mounted: false
       mac: 00:30:48:cc:7e:0b
@@ -410,14 +368,6 @@ adonis-5:
     smp_size: 2
     platform_type: x86_64
     smt_size: 8
-  gpu:
-    gpu_count: 2
-    gpu_model: Tesla-C1060
-  sensors:
-    measure1: outlet-5
-    measure2: outlet-6
-    pdu: adonis-pdu-1.grenoble.grid5000.fr
-    block: block-1
 adonis-6:
   bios:
     version: R4222X52
@@ -447,8 +397,6 @@ adonis-6:
       driver: igb
       mountable: true
       ip: 172.16.18.6
-      switch_name: gw-grenoble
-      switch_port: '3:16'
     eth1:
       mounted: false
       mac: 00:30:48:cc:7a:bd
@@ -494,14 +442,6 @@ adonis-6:
     smp_size: 2
     platform_type: x86_64
     smt_size: 8
-  gpu:
-    gpu_count: 2
-    gpu_model: Tesla-C1060
-  sensors:
-    measure1: outlet-5
-    measure2: outlet-6
-    pdu: adonis-pdu-1.grenoble.grid5000.fr
-    block: block-1
 adonis-7:
   bios:
     version: R4222X52
@@ -538,8 +478,6 @@ adonis-7:
       driver: igb
       mountable: true
       ip: 172.16.18.7
-      switch_name: gw-grenoble
-      switch_port: '3:17'
     eth1:
       mounted: false
       mac: 00:30:48:cd:c6:81
@@ -578,14 +516,6 @@ adonis-7:
     smp_size: 2
     platform_type: x86_64
     smt_size: 8
-  gpu:
-    gpu_count: 2
-    gpu_model: Tesla-C1060
-  sensors:
-    measure1: outlet-1
-    measure2: outlet-2
-    pdu: adonis-pdu-2.grenoble.grid5000.fr
-    block: block-1
 adonis-8:
   bios:
     version: R4222X52
@@ -626,8 +556,6 @@ adonis-8:
       driver: igb
       mountable: true
       ip: 172.16.18.8
-      switch_name: gw-grenoble
-      switch_port: '3:18'
     eth1:
       mounted: false
       mac: 00:30:48:cd:c0:af
@@ -662,14 +590,6 @@ adonis-8:
     smp_size: 2
     platform_type: x86_64
     smt_size: 8
-  gpu:
-    gpu_count: 2
-    gpu_model: Tesla-C1060
-  sensors:
-    measure1: outlet-1
-    measure2: outlet-2
-    pdu: adonis-pdu-2.grenoble.grid5000.fr
-    block: block-1
 adonis-9:
   bios:
     version: R4222X52
@@ -699,8 +619,6 @@ adonis-9:
       driver: igb
       mountable: true
       ip: 172.16.18.9
-      switch_name: gw-grenoble
-      switch_port: '3:19'
     eth1:
       mounted: false
       mac: 00:25:90:4c:e9:85
@@ -746,14 +664,6 @@ adonis-9:
     smp_size: 2
     platform_type: x86_64
     smt_size: 8
-  gpu:
-    gpu_count: 2
-    gpu_model: Tesla-C1060
-  sensors:
-    measure1: outlet-13
-    measure2: outlet-14
-    pdu: adonis-pdu-2.grenoble.grid5000.fr
-    block: block-2
 adonis-10:
   bios:
     version: R4222X52
@@ -787,8 +697,6 @@ adonis-10:
       driver: igb
       mountable: true
       ip: 172.16.18.10
-      switch_name: gw-grenoble
-      switch_port: '3:20'
     eth1:
       mounted: false
       mac: 00:30:48:cc:83:11
@@ -830,11 +738,3 @@ adonis-10:
     smp_size: 2
     platform_type: x86_64
     smt_size: 8
-  gpu:
-    gpu_count: 2
-    gpu_model: Tesla-C1060
-  sensors:
-    measure1: outlet-13
-    measure2: outlet-14
-    pdu: adonis-pdu-2.grenoble.grid5000.fr
-    block: block-2
diff --git a/generators/input/sites/grenoble/clusters/adonis_manual.yaml b/generators/input/sites/grenoble/clusters/adonis_manual.yaml
new file mode 100644
index 00000000000..d9fc9013031
--- /dev/null
+++ b/generators/input/sites/grenoble/clusters/adonis_manual.yaml
@@ -0,0 +1,131 @@
+---
+adonis-1:
+  network_interfaces:
+    eth0:
+      switch_name: gw-grenoble
+      switch_port: '3:11'
+  sensors:
+    measure1: outlet-11
+    measure2: outlet-12
+    pdu: adonis-pdu-1.grenoble.grid5000.fr
+    block: block-1
+  gpu:
+    gpu_count: 2
+    gpu_model: Tesla-C1060
+adonis-2:
+  network_interfaces:
+    eth0:
+      switch_name: gw-grenoble
+      switch_port: '3:12'
+  sensors:
+    measure1: outlet-11
+    measure2: outlet-12
+    pdu: adonis-pdu-1.grenoble.grid5000.fr
+    block: block-1
+  gpu:
+    gpu_count: 2
+    gpu_model: Tesla-C1060
+adonis-3:
+  network_interfaces:
+    eth0:
+      switch_name: gw-grenoble
+      switch_port: '3:13'
+  sensors:
+    measure1: outlet-13
+    measure2: outlet-14
+    pdu: adonis-pdu-1.grenoble.grid5000.fr
+    block: block-2
+  gpu:
+    gpu_count: 2
+    gpu_model: Tesla-C1060
+adonis-4:
+  network_interfaces:
+    eth0:
+      switch_name: gw-grenoble
+      switch_port: '3:14'
+  sensors:
+    measure1: outlet-13
+    measure2: outlet-14
+    pdu: adonis-pdu-1.grenoble.grid5000.fr
+    block: block-2
+  gpu:
+    gpu_count: 2
+    gpu_model: Tesla-C1060
+adonis-5:
+  network_interfaces:
+    eth0:
+      switch_name: gw-grenoble
+      switch_port: '3:15'
+  sensors:
+    measure1: outlet-5
+    measure2: outlet-6
+    pdu: adonis-pdu-1.grenoble.grid5000.fr
+    block: block-1
+  gpu:
+    gpu_count: 2
+    gpu_model: Tesla-C1060
+adonis-6:
+  network_interfaces:
+    eth0:
+      switch_name: gw-grenoble
+      switch_port: '3:16'
+  sensors:
+    measure1: outlet-5
+    measure2: outlet-6
+    pdu: adonis-pdu-1.grenoble.grid5000.fr
+    block: block-1
+  gpu:
+    gpu_count: 2
+    gpu_model: Tesla-C1060
+adonis-7:
+  network_interfaces:
+    eth0:
+      switch_name: gw-grenoble
+      switch_port: '3:17'
+  sensors:
+    measure1: outlet-1
+    measure2: outlet-2
+    pdu: adonis-pdu-2.grenoble.grid5000.fr
+    block: block-1
+  gpu:
+    gpu_count: 2
+    gpu_model: Tesla-C1060
+adonis-8:
+  network_interfaces:
+    eth0:
+      switch_name: gw-grenoble
+      switch_port: '3:18'
+  sensors:
+    measure1: outlet-1
+    measure2: outlet-2
+    pdu: adonis-pdu-2.grenoble.grid5000.fr
+    block: block-1
+  gpu:
+    gpu_count: 2
+    gpu_model: Tesla-C1060
+adonis-9:
+  network_interfaces:
+    eth0:
+      switch_name: gw-grenoble
+      switch_port: '3:19'
+  sensors:
+    measure1: outlet-13
+    measure2: outlet-14
+    pdu: adonis-pdu-2.grenoble.grid5000.fr
+    block: block-2
+  gpu:
+    gpu_count: 2
+    gpu_model: Tesla-C1060
+adonis-10:
+  network_interfaces:
+    eth0:
+      switch_name: gw-grenoble
+      switch_port: '3:20'
+  sensors:
+    measure1: outlet-13
+    measure2: outlet-14
+    pdu: adonis-pdu-2.grenoble.grid5000.fr
+    block: block-2
+  gpu:
+    gpu_count: 2
+    gpu_model: Tesla-C1060
diff --git a/generators/input/sites/grenoble/clusters/edel.rb b/generators/input/sites/grenoble/clusters/edel.rb
index cd5df1783a6..eadac81e8e3 100644
--- a/generators/input/sites/grenoble/clusters/edel.rb
+++ b/generators/input/sites/grenoble/clusters/edel.rb
@@ -16,113 +16,113 @@ site :grenoble do |site_uid|
         supported_job_types({
           :deploy       => true,
           :besteffort   => true,
-          :virtual      => lookup('edel', node_uid, 'supported_job_types', 'virtual')
+          :virtual      => lookup('edel_generated', node_uid, 'supported_job_types', 'virtual')
         })
 
         architecture({
-          :smp_size       => lookup('edel', node_uid, 'architecture', 'smp_size'),
-          :smt_size       => lookup('edel', node_uid, 'architecture', 'smt_size'),
-          :platform_type  => lookup('edel', node_uid, 'architecture', 'platform_type')
+          :smp_size       => lookup('edel_generated', node_uid, 'architecture', 'smp_size'),
+          :smt_size       => lookup('edel_generated', node_uid, 'architecture', 'smt_size'),
+          :platform_type  => lookup('edel_generated', node_uid, 'architecture', 'platform_type')
         })
 
         processor({
-          :vendor             => lookup('edel', node_uid, 'processor', 'vendor'),
-          :model              => lookup('edel', node_uid, 'processor', 'model'),
-          :version            => lookup('edel', node_uid, 'processor', 'version'),
-          :clock_speed        => lookup('edel', node_uid, 'processor', 'clock_speed'),
-          :instruction_set    => lookup('edel', node_uid, 'processor', 'instruction_set'),
-          :other_description  => lookup('edel', node_uid, 'processor', 'other_description'),
-          :cache_l1           => lookup('edel', node_uid, 'processor', 'cache_l1'),
-          :cache_l1i          => lookup('edel', node_uid, 'processor', 'cache_l1i'),
-          :cache_l1d          => lookup('edel', node_uid, 'processor', 'cache_l1d'),
-          :cache_l2           => lookup('edel', node_uid, 'processor', 'cache_l2'),
-          :cache_l3           => lookup('edel', node_uid, 'processor', 'cache_l3')
+          :vendor             => lookup('edel_generated', node_uid, 'processor', 'vendor'),
+          :model              => lookup('edel_generated', node_uid, 'processor', 'model'),
+          :version            => lookup('edel_generated', node_uid, 'processor', 'version'),
+          :clock_speed        => lookup('edel_generated', node_uid, 'processor', 'clock_speed'),
+          :instruction_set    => lookup('edel_generated', node_uid, 'processor', 'instruction_set'),
+          :other_description  => lookup('edel_generated', node_uid, 'processor', 'other_description'),
+          :cache_l1           => lookup('edel_generated', node_uid, 'processor', 'cache_l1'),
+          :cache_l1i          => lookup('edel_generated', node_uid, 'processor', 'cache_l1i'),
+          :cache_l1d          => lookup('edel_generated', node_uid, 'processor', 'cache_l1d'),
+          :cache_l2           => lookup('edel_generated', node_uid, 'processor', 'cache_l2'),
+          :cache_l3           => lookup('edel_generated', node_uid, 'processor', 'cache_l3')
         })
 
         main_memory({
-          :ram_size     => lookup('edel', node_uid, 'main_memory', 'ram_size'),
+          :ram_size     => lookup('edel_generated', node_uid, 'main_memory', 'ram_size'),
           :virtual_size => nil
         })
 
         operating_system({
-          :name     => lookup('edel', node_uid, 'operating_system', 'name'),
+          :name     => lookup('edel_generated', node_uid, 'operating_system', 'name'),
           :release  => "Squeeze",
-          :version  => lookup('edel', node_uid, 'operating_system', 'version'),
-          :kernel   => lookup('edel', node_uid, 'operating_system', 'kernel')
+          :version  => lookup('edel_generated', node_uid, 'operating_system', 'version'),
+          :kernel   => lookup('edel_generated', node_uid, 'operating_system', 'kernel')
         })
 
         storage_devices [{
           :interface  => 'SATA',
-          :size       => lookup('edel', node_uid, 'block_devices', 'sda', 'size'),
+          :size       => lookup('edel_generated', node_uid, 'block_devices', 'sda', 'size'),
           :driver     => "ahci",
-          :device     => lookup('edel', node_uid, 'block_devices', 'sda', 'device'),
-          :model      => lookup('edel', node_uid, 'block_devices', 'sda', 'model'),
-          :vendor     => lookup('edel', node_uid, 'block_devices', 'sda', 'vendor'),
-          :rev        => lookup('edel', node_uid, 'block_devices', 'sda', 'rev')
+          :device     => lookup('edel_generated', node_uid, 'block_devices', 'sda', 'device'),
+          :model      => lookup('edel_generated', node_uid, 'block_devices', 'sda', 'model'),
+          :vendor     => lookup('edel_generated', node_uid, 'block_devices', 'sda', 'vendor'),
+          :rev        => lookup('edel_generated', node_uid, 'block_devices', 'sda', 'rev')
         }]
 
         network_adapters [{
-          :interface        => lookup('edel', node_uid, 'network_interfaces', 'eth0', 'interface'),
-          :rate             => lookup('edel', node_uid, 'network_interfaces', 'eth0', 'rate'),
-          :enabled          => lookup('edel', node_uid, 'network_interfaces', 'eth0', 'enabled'),
-          :management       => lookup('edel', node_uid, 'network_interfaces', 'eth0', 'management'),
-          :mountable        => lookup('edel', node_uid, 'network_interfaces', 'eth0', 'mountable'),
-          :mounted          => lookup('edel', node_uid, 'network_interfaces', 'eth0', 'mounted'),
+          :interface        => lookup('edel_generated', node_uid, 'network_interfaces', 'eth0', 'interface'),
+          :rate             => lookup('edel_generated', node_uid, 'network_interfaces', 'eth0', 'rate'),
+          :enabled          => lookup('edel_generated', node_uid, 'network_interfaces', 'eth0', 'enabled'),
+          :management       => lookup('edel_generated', node_uid, 'network_interfaces', 'eth0', 'management'),
+          :mountable        => lookup('edel_generated', node_uid, 'network_interfaces', 'eth0', 'mountable'),
+          :mounted          => lookup('edel_generated', node_uid, 'network_interfaces', 'eth0', 'mounted'),
           :bridged          => true,
           :device           => "eth0",
           :vendor           => 'Intel',
           :version          => "82576 Gigabit Network Connection",
-          :driver           => lookup('edel', node_uid, 'network_interfaces', 'eth0', 'driver'),
+          :driver           => lookup('edel_generated', node_uid, 'network_interfaces', 'eth0', 'driver'),
           :network_address  => "#{node_uid}.#{site_uid}.grid5000.fr",
-          :ip               => lookup('edel', node_uid, 'network_interfaces', 'eth0', 'ip'),
-          :ip6              => lookup('edel', node_uid, 'network_interfaces', 'eth0', 'ip6'),
-          :switch           => lookup('edel', node_uid, 'network_interfaces', 'eth0', 'switch_name'),
-          :switch_port      => lookup('edel', node_uid, 'network_interfaces', 'eth0', 'switch_port'),
-          :mac              => lookup('edel', node_uid, 'network_interfaces', 'eth0', 'mac')
+          :ip               => lookup('edel_generated', node_uid, 'network_interfaces', 'eth0', 'ip'),
+          :ip6              => lookup('edel_generated', node_uid, 'network_interfaces', 'eth0', 'ip6'),
+          :switch           => lookup('edel_manual', node_uid, 'network_interfaces', 'eth0', 'switch_name'),
+          :switch_port      => lookup('edel_manual', node_uid, 'network_interfaces', 'eth0', 'switch_port'),
+          :mac              => lookup('edel_generated', node_uid, 'network_interfaces', 'eth0', 'mac')
         },
         {
-          :interface        => lookup('edel', node_uid, 'network_interfaces', 'eth1', 'interface'),
+          :interface        => lookup('edel_generated', node_uid, 'network_interfaces', 'eth1', 'interface'),
           :rate             => 1.G,
-          :enabled          => lookup('edel', node_uid, 'network_interfaces', 'eth1', 'enabled'),
-          :management       => lookup('edel', node_uid, 'network_interfaces', 'eth1', 'management'),
-          :mountable        => lookup('edel', node_uid, 'network_interfaces', 'eth1', 'mountable'),
-          :mounted          => lookup('edel', node_uid, 'network_interfaces', 'eth1', 'mounted'),
+          :enabled          => lookup('edel_generated', node_uid, 'network_interfaces', 'eth1', 'enabled'),
+          :management       => lookup('edel_generated', node_uid, 'network_interfaces', 'eth1', 'management'),
+          :mountable        => lookup('edel_generated', node_uid, 'network_interfaces', 'eth1', 'mountable'),
+          :mounted          => lookup('edel_generated', node_uid, 'network_interfaces', 'eth1', 'mounted'),
           :bridged          => false,
           :device           => "eth1",
           :vendor           => 'Intel',
           :version          => "82576 Gigabit Network Connection",
-          :driver           => lookup('edel', node_uid, 'network_interfaces', 'eth1', 'driver'),
-          :mac              => lookup('edel', node_uid, 'network_interfaces', 'eth1', 'mac')
+          :driver           => lookup('edel_generated', node_uid, 'network_interfaces', 'eth1', 'driver'),
+          :mac              => lookup('edel_generated', node_uid, 'network_interfaces', 'eth1', 'mac')
         },
         {
-          :interface        => lookup('edel', node_uid, 'network_interfaces', 'ib0', 'interface'),
-          :rate             => lookup('edel', node_uid, 'network_interfaces', 'ib0', 'rate'),
+          :interface        => lookup('edel_generated', node_uid, 'network_interfaces', 'ib0', 'interface'),
+          :rate             => lookup('edel_generated', node_uid, 'network_interfaces', 'ib0', 'rate'),
           :device           => "ib0",
-          :enabled          => lookup('edel', node_uid, 'network_interfaces', 'ib0', 'enabled'),
-          :management       => lookup('edel', node_uid, 'network_interfaces', 'ib0', 'management'),
-          :mountable        => lookup('edel', node_uid, 'network_interfaces', 'ib0', 'mountable'),
-          :mounted          => lookup('edel', node_uid, 'network_interfaces', 'ib0', 'mounted'),
+          :enabled          => lookup('edel_generated', node_uid, 'network_interfaces', 'ib0', 'enabled'),
+          :management       => lookup('edel_generated', node_uid, 'network_interfaces', 'ib0', 'management'),
+          :mountable        => lookup('edel_generated', node_uid, 'network_interfaces', 'ib0', 'mountable'),
+          :mounted          => lookup('edel_generated', node_uid, 'network_interfaces', 'ib0', 'mounted'),
           :vendor           => 'Mellanox',
-          :version          => lookup('edel', node_uid, 'network_interfaces', 'ib0', 'version'),
-          :driver           => lookup('edel', node_uid, 'network_interfaces', 'ib0', 'driver'),
+          :version          => lookup('edel_generated', node_uid, 'network_interfaces', 'ib0', 'version'),
+          :driver           => lookup('edel_generated', node_uid, 'network_interfaces', 'ib0', 'driver'),
           :network_address  => "#{node_uid}-ib0.#{site_uid}.grid5000.fr",
-          :ip               => lookup('edel', node_uid, 'network_interfaces', 'ib0', 'ip'),
-          :ip6              => lookup('edel', node_uid, 'network_interfaces', 'ib0', 'ip6'),
-          :guid             => lookup('edel', node_uid, 'network_interfaces', 'ib0', 'guid')
+          :ip               => lookup('edel_generated', node_uid, 'network_interfaces', 'ib0', 'ip'),
+          :ip6              => lookup('edel_generated', node_uid, 'network_interfaces', 'ib0', 'ip6'),
+          :guid             => lookup('edel_generated', node_uid, 'network_interfaces', 'ib0', 'guid')
         },
         {
-          :interface        => lookup('edel', node_uid, 'network_interfaces', 'ib1', 'interface'),
+          :interface        => lookup('edel_generated', node_uid, 'network_interfaces', 'ib1', 'interface'),
           :rate             => 40.G,
-          :rate             => lookup('edel', node_uid, 'network_interfaces', 'ib1', 'rate'),
+          :rate             => lookup('edel_generated', node_uid, 'network_interfaces', 'ib1', 'rate'),
           :device           => "ib1",
-          :enabled          => lookup('edel', node_uid, 'network_interfaces', 'ib1', 'enabled'),
-          :management       => lookup('edel', node_uid, 'network_interfaces', 'ib1', 'management'),
-          :mountable        => lookup('edel', node_uid, 'network_interfaces', 'ib1', 'mountable'),
-          :mounted          => lookup('edel', node_uid, 'network_interfaces', 'ib1', 'mounted'),
+          :enabled          => lookup('edel_generated', node_uid, 'network_interfaces', 'ib1', 'enabled'),
+          :management       => lookup('edel_generated', node_uid, 'network_interfaces', 'ib1', 'management'),
+          :mountable        => lookup('edel_generated', node_uid, 'network_interfaces', 'ib1', 'mountable'),
+          :mounted          => lookup('edel_generated', node_uid, 'network_interfaces', 'ib1', 'mounted'),
           :vendor           => 'Mellanox',
-          :version          => lookup('edel', node_uid, 'network_interfaces', 'ib1', 'version'),
-          :driver           => lookup('edel', node_uid, 'network_interfaces', 'ib1', 'driver'),
-          :guid             => lookup('edel', node_uid, 'network_interfaces', 'ib1', 'guid')
+          :version          => lookup('edel_generated', node_uid, 'network_interfaces', 'ib1', 'version'),
+          :driver           => lookup('edel_generated', node_uid, 'network_interfaces', 'ib1', 'driver'),
+          :guid             => lookup('edel_generated', node_uid, 'network_interfaces', 'ib1', 'guid')
         },
         {
           :interface        => 'Ethernet',
@@ -133,22 +133,22 @@ site :grenoble do |site_uid|
           :mounted          => false,
           :device           => "bmc",
           :network_address  => "#{node_uid}-bmc.#{site_uid}.grid5000.fr",
-          :ip               => lookup('edel', node_uid, 'network_interfaces', 'bmc', 'ip'),
+          :ip               => lookup('edel_generated', node_uid, 'network_interfaces', 'bmc', 'ip'),
           :vendor           => "Unknown",
           :version          => "1.7",
-          :mac              => lookup('edel', node_uid, 'network_interfaces', 'bmc', 'mac')
+          :mac              => lookup('edel_generated', node_uid, 'network_interfaces', 'bmc', 'mac')
         }]
 
         chassis({
-          :serial       => lookup('edel', node_uid, 'chassis', 'serial_number'),
-          :name         => lookup('edel', node_uid, 'chassis', 'product_name'),
-          :manufacturer => lookup('edel', node_uid, 'chassis', 'manufacturer')
+          :serial       => lookup('edel_generated', node_uid, 'chassis', 'serial_number'),
+          :name         => lookup('edel_generated', node_uid, 'chassis', 'product_name'),
+          :manufacturer => lookup('edel_generated', node_uid, 'chassis', 'manufacturer')
         })
 
         bios({
-          :version      => lookup('edel', node_uid, 'bios', 'version'),
-          :vendor       => lookup('edel', node_uid, 'bios', 'vendor'),
-          :release_date => lookup('edel', node_uid, 'bios', 'release_date')
+          :version      => lookup('edel_generated', node_uid, 'bios', 'version'),
+          :vendor       => lookup('edel_generated', node_uid, 'bios', 'vendor'),
+          :release_date => lookup('edel_generated', node_uid, 'bios', 'release_date')
         })
 
         gpu({
diff --git a/generators/input/sites/grenoble/clusters/edel.yaml b/generators/input/sites/grenoble/clusters/edel_generated.yaml
similarity index 97%
rename from generators/input/sites/grenoble/clusters/edel.yaml
rename to generators/input/sites/grenoble/clusters/edel_generated.yaml
index f3580791ae6..15c4aab5340 100644
--- a/generators/input/sites/grenoble/clusters/edel.yaml
+++ b/generators/input/sites/grenoble/clusters/edel_generated.yaml
@@ -28,8 +28,6 @@ edel-1:
       ip: 172.16.17.1
       driver: igb
       mountable: true
-      switch_name: edel-sw-1
-      switch_port: Gi1/0/5
     eth1:
       mounted: false
       mac: 08:00:38:36:f3:bf
@@ -113,8 +111,6 @@ edel-2:
       ip: 172.16.17.2
       driver: igb
       mountable: true
-      switch_name: edel-sw-1
-      switch_port: Gi1/0/6
     eth1:
       mounted: false
       mac: 08:00:38:35:ac:07
@@ -204,8 +200,6 @@ edel-3:
       ip: 172.16.17.3
       driver: igb
       mountable: true
-      switch_name: edel-sw-1
-      switch_port: Gi1/0/7
     eth1:
       mounted: false
       mac: 08:00:38:35:ab:8d
@@ -281,8 +275,6 @@ edel-4:
       ip: 172.16.17.4
       driver: igb
       mountable: true
-      switch_name: edel-sw-1
-      switch_port: Gi1/0/8
     eth1:
       mounted: false
       mac: 08:00:38:36:d2:4d
@@ -356,8 +348,6 @@ edel-5:
       ip: 172.16.17.5
       driver: igb
       mountable: true
-      switch_name: edel-sw-1
-      switch_port: Gi1/0/9
     eth1:
       mounted: false
       mac: 08:00:38:36:f3:3b
@@ -437,8 +427,6 @@ edel-6:
       ip: 172.16.17.6
       driver: igb
       mountable: true
-      switch_name: edel-sw-1
-      switch_port: Gi1/0/10
     eth1:
       mounted: false
       mac: 08:00:38:35:ac:55
@@ -534,8 +522,6 @@ edel-7:
       ip: 172.16.17.7
       driver: igb
       mountable: true
-      switch_name: edel-sw-1
-      switch_port: Gi1/0/11
     eth1:
       mounted: false
       mac: 08:00:38:35:ab:41
@@ -615,8 +601,6 @@ edel-8:
       ip: 172.16.17.8
       driver: igb
       mountable: true
-      switch_name: edel-sw-1
-      switch_port: Gi1/0/12
     eth1:
       mounted: false
       mac: 08:00:38:35:ab:57
@@ -690,8 +674,6 @@ edel-9:
       ip: 172.16.17.9
       driver: igb
       mountable: true
-      switch_name: edel-sw-1
-      switch_port: Gi1/0/13
     eth1:
       mounted: false
       mac: 08:00:38:35:ab:d9
@@ -777,8 +759,6 @@ edel-10:
       ip: 172.16.17.10
       driver: igb
       mountable: true
-      switch_name: edel-sw-1
-      switch_port: Gi1/0/14
     eth1:
       mounted: false
       mac: 08:00:38:35:ab:95
@@ -858,8 +838,6 @@ edel-11:
       ip: 172.16.17.11
       driver: igb
       mountable: true
-      switch_name: edel-sw-1
-      switch_port: Gi1/0/15
     eth1:
       mounted: false
       mac: 08:00:38:35:ab:91
@@ -939,8 +917,6 @@ edel-12:
       ip: 172.16.17.12
       driver: igb
       mountable: true
-      switch_name: edel-sw-1
-      switch_port: Gi1/0/16
     eth1:
       mounted: false
       mac: 08:00:38:35:ac:3d
@@ -1014,8 +990,6 @@ edel-13:
       ip: 172.16.17.13
       driver: igb
       mountable: true
-      switch_name: edel-sw-1
-      switch_port: Gi1/0/17
     eth1:
       mounted: false
       mac: 08:00:38:35:ab:dd
@@ -1095,8 +1069,6 @@ edel-14:
       ip: 172.16.17.14
       driver: igb
       mountable: true
-      switch_name: edel-sw-1
-      switch_port: Gi1/0/18
     eth1:
       mounted: false
       mac: 08:00:38:35:ab:ad
@@ -1176,8 +1148,6 @@ edel-15:
       ip: 172.16.17.15
       driver: igb
       mountable: true
-      switch_name: edel-sw-1
-      switch_port: Gi1/0/19
     eth1:
       mounted: false
       mac: 08:00:38:35:ab:fd
@@ -1261,8 +1231,6 @@ edel-16:
       ip: 172.16.17.16
       driver: igb
       mountable: true
-      switch_name: edel-sw-1
-      switch_port: Gi1/0/20
     eth1:
       mounted: false
       mac: 08:00:38:35:ac:0d
@@ -1352,8 +1320,6 @@ edel-17:
       ip: 172.16.17.17
       driver: igb
       mountable: true
-      switch_name: edel-sw-1
-      switch_port: Gi1/0/21
     eth1:
       mounted: false
       mac: 08:00:38:35:ab:9f
@@ -1427,8 +1393,6 @@ edel-18:
       ip: 172.16.17.18
       driver: igb
       mountable: true
-      switch_name: edel-sw-1
-      switch_port: Gi1/0/22
     eth1:
       mounted: false
       mac: 08:00:38:35:ab:83
@@ -1498,8 +1462,6 @@ edel-19:
       ip: 172.16.17.19
       driver: igb
       mountable: true
-      switch_name: edel-sw-2
-      switch_port: Gi1/0/5
     eth1:
       mounted: false
       mac: 08:00:38:35:ab:d1
@@ -1589,8 +1551,6 @@ edel-20:
       ip: 172.16.17.20
       driver: igb
       mountable: true
-      switch_name: edel-sw-2
-      switch_port: Gi1/0/6
     eth1:
       mounted: false
       mac: 08:00:38:35:ab:79
@@ -1670,8 +1630,6 @@ edel-21:
       ip: 172.16.17.21
       driver: igb
       mountable: true
-      switch_name: edel-sw-2
-      switch_port: Gi1/0/7
     eth1:
       mounted: false
       mac: 08:00:38:35:ac:4b
@@ -1757,8 +1715,6 @@ edel-22:
       ip: 172.16.17.22
       driver: igb
       mountable: true
-      switch_name: edel-sw-2
-      switch_port: Gi1/0/8
     eth1:
       mounted: false
       mac: 08:00:38:35:ab:9d
@@ -1832,8 +1788,6 @@ edel-23:
       ip: 172.16.17.23
       driver: igb
       mountable: true
-      switch_name: edel-sw-2
-      switch_port: Gi1/0/9
     eth1:
       mounted: false
       mac: 08:00:38:35:ab:d7
@@ -1919,8 +1873,6 @@ edel-24:
       ip: 172.16.17.24
       driver: igb
       mountable: true
-      switch_name: edel-sw-2
-      switch_port: Gi1/0/10
     eth1:
       mounted: false
       mac: 08:00:38:35:ac:27
@@ -2000,8 +1952,6 @@ edel-25:
       ip: 172.16.17.25
       driver: igb
       mountable: true
-      switch_name: edel-sw-2
-      switch_port: Gi1/0/11
     eth1:
       mounted: false
       mac: 08:00:38:35:aa:b9
@@ -2081,8 +2031,6 @@ edel-26:
       ip: 172.16.17.26
       driver: igb
       mountable: true
-      switch_name: edel-sw-2
-      switch_port: Gi1/0/12
     eth1:
       mounted: false
       mac: 08:00:38:35:ab:55
@@ -2146,8 +2094,6 @@ edel-27:
       ip: 172.16.17.27
       driver: igb
       mountable: true
-      switch_name: edel-sw-2
-      switch_port: Gi1/0/13
     eth1:
       mounted: false
       mac: 08:00:38:35:ac:3f
@@ -2243,8 +2189,6 @@ edel-28:
       ip: 172.16.17.28
       driver: igb
       mountable: true
-      switch_name: edel-sw-2
-      switch_port: Gi1/0/14
     eth1:
       mounted: false
       mac: 08:00:38:35:ac:49
@@ -2324,8 +2268,6 @@ edel-29:
       ip: 172.16.17.29
       driver: igb
       mountable: true
-      switch_name: edel-sw-2
-      switch_port: Gi1/0/15
     eth1:
       mounted: false
       mac: 08:00:38:35:ab:bf
@@ -2405,8 +2347,6 @@ edel-30:
       ip: 172.16.17.30
       driver: igb
       mountable: true
-      switch_name: edel-sw-2
-      switch_port: Gi1/0/16
     eth1:
       mounted: false
       mac: 08:00:38:35:ab:bb
@@ -2486,8 +2426,6 @@ edel-31:
       ip: 172.16.17.31
       driver: igb
       mountable: true
-      switch_name: edel-sw-2
-      switch_port: Gi1/0/17
     eth1:
       mounted: false
       mac: 08:00:38:35:af:3f
@@ -2567,8 +2505,6 @@ edel-32:
       ip: 172.16.17.32
       driver: igb
       mountable: true
-      switch_name: edel-sw-2
-      switch_port: Gi1/0/18
     eth1:
       mounted: false
       mac: 08:00:38:35:ab:47
@@ -2632,8 +2568,6 @@ edel-33:
       ip: 172.16.17.33
       driver: igb
       mountable: true
-      switch_name: edel-sw-2
-      switch_port: Gi1/0/19
     eth1:
       mounted: false
       mac: 08:00:38:35:ac:4d
@@ -2729,8 +2663,6 @@ edel-34:
       ip: 172.16.17.34
       driver: igb
       mountable: true
-      switch_name: edel-sw-2
-      switch_port: Gi1/0/20
     eth1:
       mounted: false
       mac: 08:00:38:35:ab:a3
@@ -2810,8 +2742,6 @@ edel-35:
       ip: 172.16.17.35
       driver: igb
       mountable: true
-      switch_name: edel-sw-2
-      switch_port: Gi1/0/21
     eth1:
       mounted: false
       mac: 08:00:38:35:ab:63
@@ -2891,8 +2821,6 @@ edel-36:
       ip: 172.16.17.36
       driver: igb
       mountable: true
-      switch_name: edel-sw-2
-      switch_port: Gi1/0/22
     eth1:
       mounted: false
       mac: 08:00:38:35:ab:e7
@@ -2962,8 +2890,6 @@ edel-37:
       ip: 172.16.17.37
       driver: igb
       mountable: true
-      switch_name: edel-sw-3
-      switch_port: Gi1/0/5
     eth1:
       mounted: false
       mac: 08:00:38:36:f3:07
@@ -3047,8 +2973,6 @@ edel-38:
       ip: 172.16.17.38
       driver: igb
       mountable: true
-      switch_name: edel-sw-3
-      switch_port: Gi1/0/6
     eth1:
       mounted: false
       mac: 08:00:38:35:ab:d3
@@ -3134,8 +3058,6 @@ edel-39:
       ip: 172.16.17.39
       driver: igb
       mountable: true
-      switch_name: edel-sw-3
-      switch_port: Gi1/0/7
     eth1:
       mounted: false
       mac: 08:00:38:35:ac:2b
@@ -3209,8 +3131,6 @@ edel-40:
       ip: 172.16.17.40
       driver: igb
       mountable: true
-      switch_name: edel-sw-3
-      switch_port: Gi1/0/8
     eth1:
       mounted: false
       mac: 08:00:38:35:ab:a9
@@ -3280,8 +3200,6 @@ edel-41:
       ip: 172.16.17.41
       driver: igb
       mountable: true
-      switch_name: edel-sw-3
-      switch_port: Gi1/0/9
     eth1:
       mounted: false
       mac: 08:00:38:36:f5:a5
@@ -3361,8 +3279,6 @@ edel-42:
       ip: 172.16.17.42
       driver: igb
       mountable: true
-      switch_name: edel-sw-3
-      switch_port: Gi1/0/10
     eth1:
       mounted: false
       mac: 08:00:38:36:cf:d9
@@ -3452,8 +3368,6 @@ edel-43:
       ip: 172.16.17.43
       driver: igb
       mountable: true
-      switch_name: edel-sw-3
-      switch_port: Gi1/0/11
     eth1:
       mounted: false
       mac: 08:00:38:35:ab:d5
@@ -3539,8 +3453,6 @@ edel-44:
       ip: 172.16.17.44
       driver: igb
       mountable: true
-      switch_name: edel-sw-3
-      switch_port: Gi1/0/12
     eth1:
       mounted: false
       mac: 08:00:38:35:ab:ab
@@ -3604,8 +3516,6 @@ edel-45:
       ip: 172.16.17.45
       driver: igb
       mountable: true
-      switch_name: edel-sw-3
-      switch_port: Gi1/0/13
     eth1:
       mounted: false
       mac: 08:00:38:35:ac:23
@@ -3701,8 +3611,6 @@ edel-46:
       ip: 172.16.17.46
       driver: igb
       mountable: true
-      switch_name: edel-sw-3
-      switch_port: Gi1/0/14
     eth1:
       mounted: false
       mac: 08:00:38:35:ab:4b
@@ -3782,8 +3690,6 @@ edel-47:
       ip: 172.16.17.47
       driver: igb
       mountable: true
-      switch_name: edel-sw-3
-      switch_port: Gi1/0/15
     eth1:
       mounted: false
       mac: 08:00:38:35:ab:bd
@@ -3863,8 +3769,6 @@ edel-48:
       ip: 172.16.17.48
       driver: igb
       mountable: true
-      switch_name: edel-sw-3
-      switch_port: Gi1/0/16
     eth1:
       mounted: false
       mac: 08:00:38:35:ab:71
@@ -3938,8 +3842,6 @@ edel-49:
       ip: 172.16.17.49
       driver: igb
       mountable: true
-      switch_name: edel-sw-3
-      switch_port: Gi1/0/17
     eth1:
       mounted: false
       mac: 08:00:38:35:ab:b7
@@ -4025,8 +3927,6 @@ edel-50:
       ip: 172.16.17.50
       driver: igb
       mountable: true
-      switch_name: edel-sw-3
-      switch_port: Gi1/0/18
     eth1:
       mounted: false
       mac: 08:00:38:35:ac:11
@@ -4106,8 +4006,6 @@ edel-51:
       ip: 172.16.17.51
       driver: igb
       mountable: true
-      switch_name: edel-sw-3
-      switch_port: Gi1/0/19
     eth1:
       mounted: false
       mac: 08:00:38:35:ac:41
@@ -4187,8 +4085,6 @@ edel-52:
       ip: 172.16.17.52
       driver: igb
       mountable: true
-      switch_name: edel-sw-3
-      switch_port: Gi1/0/20
     eth1:
       mounted: false
       mac: 08:00:38:35:ac:1b
@@ -4262,8 +4158,6 @@ edel-53:
       ip: 172.16.17.53
       driver: igb
       mountable: true
-      switch_name: edel-sw-3
-      switch_port: Gi1/0/21
     eth1:
       mounted: false
       mac: 08:00:38:35:ac:35
@@ -4333,8 +4227,6 @@ edel-54:
       ip: 172.16.17.54
       driver: igb
       mountable: true
-      switch_name: edel-sw-3
-      switch_port: Gi1/0/22
     eth1:
       mounted: false
       mac: 08:00:38:35:ac:3b
@@ -4424,8 +4316,6 @@ edel-55:
       ip: 172.16.17.55
       driver: igb
       mountable: true
-      switch_name: edel-sw-4
-      switch_port: Gi1/0/5
     eth1:
       mounted: false
       mac: 08:00:38:35:ab:e9
@@ -4495,8 +4385,6 @@ edel-56:
       ip: 172.16.17.56
       driver: igb
       mountable: true
-      switch_name: edel-sw-4
-      switch_port: Gi1/0/6
     eth1:
       mounted: false
       mac: 08:00:38:35:ac:01
@@ -4586,8 +4474,6 @@ edel-57:
       ip: 172.16.17.57
       driver: igb
       mountable: true
-      switch_name: edel-sw-4
-      switch_port: Gi1/0/7
     eth1:
       mounted: false
       mac: 08:00:38:35:ab:af
@@ -4673,8 +4559,6 @@ edel-58:
       ip: 172.16.17.58
       driver: igb
       mountable: true
-      switch_name: edel-sw-4
-      switch_port: Gi1/0/8
     eth1:
       mounted: false
       mac: 08:00:38:35:ac:09
@@ -4748,8 +4632,6 @@ edel-59:
       ip: 172.16.17.59
       driver: igb
       mountable: true
-      switch_name: edel-sw-4
-      switch_port: Gi1/0/9
     eth1:
       mounted: false
       mac: 08:00:38:35:ab:5b
@@ -4835,8 +4717,6 @@ edel-60:
       ip: 172.16.17.60
       driver: igb
       mountable: true
-      switch_name: edel-sw-4
-      switch_port: Gi1/0/10
     eth1:
       mounted: false
       mac: 08:00:38:35:ac:25
@@ -4910,8 +4790,6 @@ edel-61:
       ip: 172.16.17.61
       driver: igb
       mountable: true
-      switch_name: edel-sw-4
-      switch_port: Gi1/0/11
     eth1:
       mounted: false
       mac: 08:00:38:35:ab:5d
@@ -4991,8 +4869,6 @@ edel-62:
       ip: 172.16.17.62
       driver: igb
       mountable: true
-      switch_name: edel-sw-4
-      switch_port: Gi1/0/12
     eth1:
       mounted: false
       mac: 08:00:38:35:ab:db
@@ -5072,8 +4948,6 @@ edel-63:
       ip: 172.16.17.63
       driver: igb
       mountable: true
-      switch_name: edel-sw-4
-      switch_port: Gi1/0/13
     eth1:
       mounted: false
       mac: 08:00:38:35:ab:b3
@@ -5163,8 +5037,6 @@ edel-64:
       ip: 172.16.17.64
       driver: igb
       mountable: true
-      switch_name: edel-sw-4
-      switch_port: Gi1/0/14
     eth1:
       mounted: false
       mac: 08:00:38:35:ad:bf
@@ -5187,14 +5059,13 @@ edel-64:
   processor:
     model: Intel Xeon
     cache_l1d: 32768
-    clock_speed: 2267000000
+    clock_speed: 2266000000
     other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
     version: E5520
     cache_l2: 262144
     cache_l3: 8388608
     vendor: Intel
     instruction_set: x86-64
-    clock_speed: 2266000000
     cache_l1i: 32768
   architecture:
     smp_size: 2
@@ -5229,8 +5100,6 @@ edel-65:
       ip: 172.16.17.65
       driver: igb
       mountable: true
-      switch_name: edel-sw-4
-      switch_port: Gi1/0/15
     eth1:
       mounted: false
       mac: 08:00:38:35:ab:e5
@@ -5320,8 +5189,6 @@ edel-66:
       ip: 172.16.17.66
       driver: igb
       mountable: true
-      switch_name: edel-sw-4
-      switch_port: Gi1/0/16
     eth1:
       mounted: false
       mac: 08:00:38:35:ac:15
@@ -5407,8 +5274,6 @@ edel-67:
       ip: 172.16.17.67
       driver: igb
       mountable: true
-      switch_name: edel-sw-4
-      switch_port: Gi1/0/17
     eth1:
       mounted: false
       mac: 08:00:38:35:ab:fb
@@ -5482,8 +5347,6 @@ edel-68:
       ip: 172.16.17.68
       driver: igb
       mountable: true
-      switch_name: edel-sw-4
-      switch_port: Gi1/0/18
     eth1:
       mounted: false
       mac: 08:00:38:35:ab:b1
@@ -5569,8 +5432,6 @@ edel-69:
       ip: 172.16.17.69
       driver: igb
       mountable: true
-      switch_name: edel-sw-4
-      switch_port: Gi1/0/19
     eth1:
       mounted: false
       mac: 08:00:38:35:ac:69
@@ -5650,8 +5511,6 @@ edel-70:
       ip: 172.16.17.70
       driver: igb
       mountable: true
-      switch_name: edel-sw-4
-      switch_port: Gi1/0/20
     eth1:
       mounted: false
       mac: 08:00:38:35:ac:67
@@ -5715,8 +5574,6 @@ edel-71:
       ip: 172.16.17.71
       driver: igb
       mountable: true
-      switch_name: edel-sw-4
-      switch_port: Gi1/0/21
     eth1:
       mounted: false
       mac: 08:00:38:35:ab:67
@@ -5802,8 +5659,6 @@ edel-72:
       ip: 172.16.17.72
       driver: igb
       mountable: true
-      switch_name: edel-sw-4
-      switch_port: Gi1/0/22
     eth1:
       mounted: false
       mac: 08:00:38:36:f3:dd
diff --git a/generators/input/sites/grenoble/clusters/edel_manual.yaml b/generators/input/sites/grenoble/clusters/edel_manual.yaml
new file mode 100644
index 00000000000..2d4c7fc3a5b
--- /dev/null
+++ b/generators/input/sites/grenoble/clusters/edel_manual.yaml
@@ -0,0 +1,361 @@
+---
+edel-1:
+  network_interfaces:
+    eth0:
+      switch_name: edel-sw-1
+      switch_port: Gi1/0/5
+edel-2:
+  network_interfaces:
+    eth0:
+      switch_name: edel-sw-1
+      switch_port: Gi1/0/6
+edel-3:
+  network_interfaces:
+    eth0:
+      switch_name: edel-sw-1
+      switch_port: Gi1/0/7
+edel-4:
+  network_interfaces:
+    eth0:
+      switch_name: edel-sw-1
+      switch_port: Gi1/0/8
+edel-5:
+  network_interfaces:
+    eth0:
+      switch_name: edel-sw-1
+      switch_port: Gi1/0/9
+edel-6:
+  network_interfaces:
+    eth0:
+      switch_name: edel-sw-1
+      switch_port: Gi1/0/10
+edel-7:
+  network_interfaces:
+    eth0:
+      switch_name: edel-sw-1
+      switch_port: Gi1/0/11
+edel-8:
+  network_interfaces:
+    eth0:
+      switch_name: edel-sw-1
+      switch_port: Gi1/0/12
+edel-9:
+  network_interfaces:
+    eth0:
+      switch_name: edel-sw-1
+      switch_port: Gi1/0/13
+edel-10:
+  network_interfaces:
+    eth0:
+      switch_name: edel-sw-1
+      switch_port: Gi1/0/14
+edel-11:
+  network_interfaces:
+    eth0:
+      switch_name: edel-sw-1
+      switch_port: Gi1/0/15
+edel-12:
+  network_interfaces:
+    eth0:
+      switch_name: edel-sw-1
+      switch_port: Gi1/0/16
+edel-13:
+  network_interfaces:
+    eth0:
+      switch_name: edel-sw-1
+      switch_port: Gi1/0/17
+edel-14:
+  network_interfaces:
+    eth0:
+      switch_name: edel-sw-1
+      switch_port: Gi1/0/18
+edel-15:
+  network_interfaces:
+    eth0:
+      switch_name: edel-sw-1
+      switch_port: Gi1/0/19
+edel-16:
+  network_interfaces:
+    eth0:
+      switch_name: edel-sw-1
+      switch_port: Gi1/0/20
+edel-17:
+  network_interfaces:
+    eth0:
+      switch_name: edel-sw-1
+      switch_port: Gi1/0/21
+edel-18:
+  network_interfaces:
+    eth0:
+      switch_name: edel-sw-1
+      switch_port: Gi1/0/22
+edel-19:
+  network_interfaces:
+    eth0:
+      switch_name: edel-sw-2
+      switch_port: Gi1/0/5
+edel-20:
+  network_interfaces:
+    eth0:
+      switch_name: edel-sw-2
+      switch_port: Gi1/0/6
+edel-21:
+  network_interfaces:
+    eth0:
+      switch_name: edel-sw-2
+      switch_port: Gi1/0/7
+edel-22:
+  network_interfaces:
+    eth0:
+      switch_name: edel-sw-2
+      switch_port: Gi1/0/8
+edel-23:
+  network_interfaces:
+    eth0:
+      switch_name: edel-sw-2
+      switch_port: Gi1/0/9
+edel-24:
+  network_interfaces:
+    eth0:
+      switch_name: edel-sw-2
+      switch_port: Gi1/0/10
+edel-25:
+  network_interfaces:
+    eth0:
+      switch_name: edel-sw-2
+      switch_port: Gi1/0/11
+edel-26:
+  network_interfaces:
+    eth0:
+      switch_name: edel-sw-2
+      switch_port: Gi1/0/12
+edel-27:
+  network_interfaces:
+    eth0:
+      switch_name: edel-sw-2
+      switch_port: Gi1/0/13
+edel-28:
+  network_interfaces:
+    eth0:
+      switch_name: edel-sw-2
+      switch_port: Gi1/0/14
+edel-29:
+  network_interfaces:
+    eth0:
+      switch_name: edel-sw-2
+      switch_port: Gi1/0/15
+edel-30:
+  network_interfaces:
+    eth0:
+      switch_name: edel-sw-2
+      switch_port: Gi1/0/16
+edel-31:
+  network_interfaces:
+    eth0:
+      switch_name: edel-sw-2
+      switch_port: Gi1/0/17
+edel-32:
+  network_interfaces:
+    eth0:
+      switch_name: edel-sw-2
+      switch_port: Gi1/0/18
+edel-33:
+  network_interfaces:
+    eth0:
+      switch_name: edel-sw-2
+      switch_port: Gi1/0/19
+edel-34:
+  network_interfaces:
+    eth0:
+      switch_name: edel-sw-2
+      switch_port: Gi1/0/20
+edel-35:
+  network_interfaces:
+    eth0:
+      switch_name: edel-sw-2
+      switch_port: Gi1/0/21
+edel-36:
+  network_interfaces:
+    eth0:
+      switch_name: edel-sw-2
+      switch_port: Gi1/0/22
+edel-37:
+  network_interfaces:
+    eth0:
+      switch_name: edel-sw-3
+      switch_port: Gi1/0/5
+edel-38:
+  network_interfaces:
+    eth0:
+      switch_name: edel-sw-3
+      switch_port: Gi1/0/6
+edel-39:
+  network_interfaces:
+    eth0:
+      switch_name: edel-sw-3
+      switch_port: Gi1/0/7
+edel-40:
+  network_interfaces:
+    eth0:
+      switch_name: edel-sw-3
+      switch_port: Gi1/0/8
+edel-41:
+  network_interfaces:
+    eth0:
+      switch_name: edel-sw-3
+      switch_port: Gi1/0/9
+edel-42:
+  network_interfaces:
+    eth0:
+      switch_name: edel-sw-3
+      switch_port: Gi1/0/10
+edel-43:
+  network_interfaces:
+    eth0:
+      switch_name: edel-sw-3
+      switch_port: Gi1/0/11
+edel-44:
+  network_interfaces:
+    eth0:
+      switch_name: edel-sw-3
+      switch_port: Gi1/0/12
+edel-45:
+  network_interfaces:
+    eth0:
+      switch_name: edel-sw-3
+      switch_port: Gi1/0/13
+edel-46:
+  network_interfaces:
+    eth0:
+      switch_name: edel-sw-3
+      switch_port: Gi1/0/14
+edel-47:
+  network_interfaces:
+    eth0:
+      switch_name: edel-sw-3
+      switch_port: Gi1/0/15
+edel-48:
+  network_interfaces:
+    eth0:
+      switch_name: edel-sw-3
+      switch_port: Gi1/0/16
+edel-49:
+  network_interfaces:
+    eth0:
+      switch_name: edel-sw-3
+      switch_port: Gi1/0/17
+edel-50:
+  network_interfaces:
+    eth0:
+      switch_name: edel-sw-3
+      switch_port: Gi1/0/18
+edel-51:
+  network_interfaces:
+    eth0:
+      switch_name: edel-sw-3
+      switch_port: Gi1/0/19
+edel-52:
+  network_interfaces:
+    eth0:
+      switch_name: edel-sw-3
+      switch_port: Gi1/0/20
+edel-53:
+  network_interfaces:
+    eth0:
+      switch_name: edel-sw-3
+      switch_port: Gi1/0/21
+edel-54:
+  network_interfaces:
+    eth0:
+      switch_name: edel-sw-3
+      switch_port: Gi1/0/22
+edel-55:
+  network_interfaces:
+    eth0:
+      switch_name: edel-sw-4
+      switch_port: Gi1/0/5
+edel-56:
+  network_interfaces:
+    eth0:
+      switch_name: edel-sw-4
+      switch_port: Gi1/0/6
+edel-57:
+  network_interfaces:
+    eth0:
+      switch_name: edel-sw-4
+      switch_port: Gi1/0/7
+edel-58:
+  network_interfaces:
+    eth0:
+      switch_name: edel-sw-4
+      switch_port: Gi1/0/8
+edel-59:
+  network_interfaces:
+    eth0:
+      switch_name: edel-sw-4
+      switch_port: Gi1/0/9
+edel-60:
+  network_interfaces:
+    eth0:
+      switch_name: edel-sw-4
+      switch_port: Gi1/0/10
+edel-61:
+  network_interfaces:
+    eth0:
+      switch_name: edel-sw-4
+      switch_port: Gi1/0/11
+edel-62:
+  network_interfaces:
+    eth0:
+      switch_name: edel-sw-4
+      switch_port: Gi1/0/12
+edel-63:
+  network_interfaces:
+    eth0:
+      switch_name: edel-sw-4
+      switch_port: Gi1/0/13
+edel-64:
+  network_interfaces:
+    eth0:
+      switch_name: edel-sw-4
+      switch_port: Gi1/0/14
+edel-65:
+  network_interfaces:
+    eth0:
+      switch_name: edel-sw-4
+      switch_port: Gi1/0/15
+edel-66:
+  network_interfaces:
+    eth0:
+      switch_name: edel-sw-4
+      switch_port: Gi1/0/16
+edel-67:
+  network_interfaces:
+    eth0:
+      switch_name: edel-sw-4
+      switch_port: Gi1/0/17
+edel-68:
+  network_interfaces:
+    eth0:
+      switch_name: edel-sw-4
+      switch_port: Gi1/0/18
+edel-69:
+  network_interfaces:
+    eth0:
+      switch_name: edel-sw-4
+      switch_port: Gi1/0/19
+edel-70:
+  network_interfaces:
+    eth0:
+      switch_name: edel-sw-4
+      switch_port: Gi1/0/20
+edel-71:
+  network_interfaces:
+    eth0:
+      switch_name: edel-sw-4
+      switch_port: Gi1/0/21
+edel-72:
+  network_interfaces:
+    eth0:
+      switch_name: edel-sw-4
+      switch_port: Gi1/0/22
diff --git a/generators/input/sites/grenoble/clusters/genepi.rb b/generators/input/sites/grenoble/clusters/genepi.rb
index f3fb1cb6f65..64deab5236c 100644
--- a/generators/input/sites/grenoble/clusters/genepi.rb
+++ b/generators/input/sites/grenoble/clusters/genepi.rb
@@ -16,113 +16,113 @@ site :grenoble do |site_uid|
         supported_job_types({
           :deploy       => true,
           :besteffort   => true,
-          :virtual      => lookup('genepi', node_uid, 'supported_job_types', 'virtual')
+          :virtual      => lookup('genepi_generated', node_uid, 'supported_job_types', 'virtual')
         })
 
         architecture({
-          :smp_size       => lookup('genepi', node_uid, 'architecture', 'smp_size'),
-          :smt_size       => lookup('genepi', node_uid, 'architecture', 'smt_size'),
-          :platform_type  => lookup('genepi', node_uid, 'architecture', 'platform_type')
+          :smp_size       => lookup('genepi_generated', node_uid, 'architecture', 'smp_size'),
+          :smt_size       => lookup('genepi_generated', node_uid, 'architecture', 'smt_size'),
+          :platform_type  => lookup('genepi_generated', node_uid, 'architecture', 'platform_type')
         })
 
         processor({
-          :vendor             => lookup('genepi', node_uid, 'processor', 'vendor'),
-          :model              => lookup('genepi', node_uid, 'processor', 'model'),
-          :version            => lookup('genepi', node_uid, 'processor', 'version'),
-          :clock_speed        => lookup('genepi', node_uid, 'processor', 'clock_speed'),
-          :instruction_set    => lookup('genepi', node_uid, 'processor', 'instruction_set'),
-          :other_description  => lookup('genepi', node_uid, 'processor', 'other_description'),
-          :cache_l1           => lookup('genepi', node_uid, 'processor', 'cache_l1'),
-          :cache_l1i          => lookup('genepi', node_uid, 'processor', 'cache_l1i'),
-          :cache_l1d          => lookup('genepi', node_uid, 'processor', 'cache_l1d'),
-          :cache_l2           => lookup('genepi', node_uid, 'processor', 'cache_l2'),
-          :cache_l3           => lookup('genepi', node_uid, 'processor', 'cache_l3')
+          :vendor             => lookup('genepi_generated', node_uid, 'processor', 'vendor'),
+          :model              => lookup('genepi_generated', node_uid, 'processor', 'model'),
+          :version            => lookup('genepi_generated', node_uid, 'processor', 'version'),
+          :clock_speed        => lookup('genepi_generated', node_uid, 'processor', 'clock_speed'),
+          :instruction_set    => lookup('genepi_generated', node_uid, 'processor', 'instruction_set'),
+          :other_description  => lookup('genepi_generated', node_uid, 'processor', 'other_description'),
+          :cache_l1           => lookup('genepi_generated', node_uid, 'processor', 'cache_l1'),
+          :cache_l1i          => lookup('genepi_generated', node_uid, 'processor', 'cache_l1i'),
+          :cache_l1d          => lookup('genepi_generated', node_uid, 'processor', 'cache_l1d'),
+          :cache_l2           => lookup('genepi_generated', node_uid, 'processor', 'cache_l2'),
+          :cache_l3           => lookup('genepi_generated', node_uid, 'processor', 'cache_l3')
         })
 
         main_memory({
-          :ram_size     => lookup('genepi', node_uid, 'main_memory', 'ram_size'),
+          :ram_size     => lookup('genepi_generated', node_uid, 'main_memory', 'ram_size'),
           :virtual_size => nil
         })
 
         operating_system({
-          :name     => lookup('genepi', node_uid, 'operating_system', 'name'),
+          :name     => lookup('genepi_generated', node_uid, 'operating_system', 'name'),
           :release  => "Squeeze",
-          :version  => lookup('genepi', node_uid, 'operating_system', 'version'),
-          :kernel   => lookup('genepi', node_uid, 'operating_system', 'kernel')
+          :version  => lookup('genepi_generated', node_uid, 'operating_system', 'version'),
+          :kernel   => lookup('genepi_generated', node_uid, 'operating_system', 'kernel')
         })
 
         storage_devices [{
           :interface  => 'SATA',
-          :size       => lookup('genepi', node_uid, 'block_devices', 'sda', 'size'),
+          :size       => lookup('genepi_generated', node_uid, 'block_devices', 'sda', 'size'),
           :driver     => "ata_piix",
-          :device     => lookup('genepi', node_uid, 'block_devices', 'sda', 'device'),
-          :model      => lookup('genepi', node_uid, 'block_devices', 'sda', 'model'),
-          :vendor     => lookup('genepi', node_uid, 'block_devices', 'sda', 'vendor'),
-          :rev        => lookup('genepi', node_uid, 'block_devices', 'sda', 'rev')
+          :device     => lookup('genepi_generated', node_uid, 'block_devices', 'sda', 'device'),
+          :model      => lookup('genepi_generated', node_uid, 'block_devices', 'sda', 'model'),
+          :vendor     => lookup('genepi_generated', node_uid, 'block_devices', 'sda', 'vendor'),
+          :rev        => lookup('genepi_generated', node_uid, 'block_devices', 'sda', 'rev')
         }]
 
         network_adapters [{
-          :interface        => lookup('genepi', node_uid, 'network_interfaces', 'eth0', 'interface'),
+          :interface        => lookup('genepi_generated', node_uid, 'network_interfaces', 'eth0', 'interface'),
           :rate             => 1.G,
-          :enabled          => lookup('genepi', node_uid, 'network_interfaces', 'eth0', 'enabled'),
-          :management       => lookup('genepi', node_uid, 'network_interfaces', 'eth0', 'management'),
-          :mountable        => lookup('genepi', node_uid, 'network_interfaces', 'eth0', 'mountable'),
-          :mounted          => lookup('genepi', node_uid, 'network_interfaces', 'eth0', 'mounted'),
+          :enabled          => lookup('genepi_generated', node_uid, 'network_interfaces', 'eth0', 'enabled'),
+          :management       => lookup('genepi_generated', node_uid, 'network_interfaces', 'eth0', 'management'),
+          :mountable        => lookup('genepi_generated', node_uid, 'network_interfaces', 'eth0', 'mountable'),
+          :mounted          => lookup('genepi_generated', node_uid, 'network_interfaces', 'eth0', 'mounted'),
           :bridged          => false,
           :device           => "eth0",
           :vendor           => 'Intel',
           :version          => "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)",
-          :driver           => lookup('genepi', node_uid, 'network_interfaces', 'eth0', 'driver'),
-          :mac              => lookup('genepi', node_uid, 'network_interfaces', 'eth0', 'mac')
+          :driver           => lookup('genepi_generated', node_uid, 'network_interfaces', 'eth0', 'driver'),
+          :mac              => lookup('genepi_generated', node_uid, 'network_interfaces', 'eth0', 'mac')
         },
         {
-          :interface        => lookup('genepi', node_uid, 'network_interfaces', 'eth1', 'interface'),
+          :interface        => lookup('genepi_generated', node_uid, 'network_interfaces', 'eth1', 'interface'),
           :rate             => 1.G,
-          :enabled          => lookup('genepi', node_uid, 'network_interfaces', 'eth1', 'enabled'),
-          :management       => lookup('genepi', node_uid, 'network_interfaces', 'eth1', 'management'),
-          :mountable        => lookup('genepi', node_uid, 'network_interfaces', 'eth1', 'mountable'),
-          :mounted          => lookup('genepi', node_uid, 'network_interfaces', 'eth1', 'mounted'),
+          :enabled          => lookup('genepi_generated', node_uid, 'network_interfaces', 'eth1', 'enabled'),
+          :management       => lookup('genepi_generated', node_uid, 'network_interfaces', 'eth1', 'management'),
+          :mountable        => lookup('genepi_generated', node_uid, 'network_interfaces', 'eth1', 'mountable'),
+          :mounted          => lookup('genepi_generated', node_uid, 'network_interfaces', 'eth1', 'mounted'),
           :bridged          => true,
           :device           => "eth1",
           :vendor           => 'Intel',
           :version          => "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)",
-          :ip               => lookup('genepi', node_uid, 'network_interfaces', 'eth1', 'ip'),
-          :ip6              => lookup('genepi', node_uid, 'network_interfaces', 'eth1', 'ip6'),
+          :ip               => lookup('genepi_generated', node_uid, 'network_interfaces', 'eth1', 'ip'),
+          :ip6              => lookup('genepi_generated', node_uid, 'network_interfaces', 'eth1', 'ip6'),
           :network_address  => "#{node_uid}.#{site_uid}.grid5000.fr",
-          :switch           => lookup('genepi', node_uid, 'network_interfaces', 'eth1', 'switch_name'),
-          :switch_port      => lookup('genepi', node_uid, 'network_interfaces', 'eth1', 'switch_port'),
-          :driver           => lookup('genepi', node_uid, 'network_interfaces', 'eth1', 'driver'),
-          :mac              => lookup('genepi', node_uid, 'network_interfaces', 'eth1', 'mac')
+          :switch           => lookup('genepi_manual', node_uid, 'network_interfaces', 'eth1', 'switch_name'),
+          :switch_port      => lookup('genepi_manual', node_uid, 'network_interfaces', 'eth1', 'switch_port'),
+          :driver           => lookup('genepi_generated', node_uid, 'network_interfaces', 'eth1', 'driver'),
+          :mac              => lookup('genepi_generated', node_uid, 'network_interfaces', 'eth1', 'mac')
         },
         {
-          :interface        => lookup('genepi', node_uid, 'network_interfaces', 'ib0', 'interface'),
-          :rate             => lookup('genepi', node_uid, 'network_interfaces', 'ib0', 'rate'),
+          :interface        => lookup('genepi_generated', node_uid, 'network_interfaces', 'ib0', 'interface'),
+          :rate             => lookup('genepi_generated', node_uid, 'network_interfaces', 'ib0', 'rate'),
           :device           => "ib0",
-          :enabled          => lookup('genepi', node_uid, 'network_interfaces', 'ib0', 'enabled'),
-          :management       => lookup('genepi', node_uid, 'network_interfaces', 'ib0', 'management'),
-          :mountable        => lookup('genepi', node_uid, 'network_interfaces', 'ib0', 'mountable'),
-          :mounted          => lookup('genepi', node_uid, 'network_interfaces', 'ib0', 'mounted'),
+          :enabled          => lookup('genepi_generated', node_uid, 'network_interfaces', 'ib0', 'enabled'),
+          :management       => lookup('genepi_generated', node_uid, 'network_interfaces', 'ib0', 'management'),
+          :mountable        => lookup('genepi_generated', node_uid, 'network_interfaces', 'ib0', 'mountable'),
+          :mounted          => lookup('genepi_generated', node_uid, 'network_interfaces', 'ib0', 'mounted'),
           :vendor           => 'Mellanox',
-          :version          => lookup('genepi', node_uid, 'network_interfaces', 'ib0', 'version'),
-          :driver           => lookup('genepi', node_uid, 'network_interfaces', 'ib0', 'driver'),
+          :version          => lookup('genepi_generated', node_uid, 'network_interfaces', 'ib0', 'version'),
+          :driver           => lookup('genepi_generated', node_uid, 'network_interfaces', 'ib0', 'driver'),
           :network_address  => "#{node_uid}-ib0.#{site_uid}.grid5000.fr",
-          :ip               => lookup('genepi', node_uid, 'network_interfaces', 'ib0', 'ip'),
-          :ip6              => lookup('genepi', node_uid, 'network_interfaces', 'ib0', 'ip6'),
-          :guid             => lookup('genepi', node_uid, 'network_interfaces', 'ib0', 'guid')
+          :ip               => lookup('genepi_generated', node_uid, 'network_interfaces', 'ib0', 'ip'),
+          :ip6              => lookup('genepi_generated', node_uid, 'network_interfaces', 'ib0', 'ip6'),
+          :guid             => lookup('genepi_generated', node_uid, 'network_interfaces', 'ib0', 'guid')
         },
         {
-          :interface        => lookup('genepi', node_uid, 'network_interfaces', 'ib1', 'interface'),
+          :interface        => lookup('genepi_generated', node_uid, 'network_interfaces', 'ib1', 'interface'),
           :rate             => 40.G,
-          :rate             => lookup('genepi', node_uid, 'network_interfaces', 'ib1', 'rate'),
+          :rate             => lookup('genepi_generated', node_uid, 'network_interfaces', 'ib1', 'rate'),
           :device           => "ib1",
-          :enabled          => lookup('genepi', node_uid, 'network_interfaces', 'ib1', 'enabled'),
-          :management       => lookup('genepi', node_uid, 'network_interfaces', 'ib1', 'management'),
-          :mountable        => lookup('genepi', node_uid, 'network_interfaces', 'ib1', 'mountable'),
-          :mounted          => lookup('genepi', node_uid, 'network_interfaces', 'ib1', 'mounted'),
+          :enabled          => lookup('genepi_generated', node_uid, 'network_interfaces', 'ib1', 'enabled'),
+          :management       => lookup('genepi_generated', node_uid, 'network_interfaces', 'ib1', 'management'),
+          :mountable        => lookup('genepi_generated', node_uid, 'network_interfaces', 'ib1', 'mountable'),
+          :mounted          => lookup('genepi_generated', node_uid, 'network_interfaces', 'ib1', 'mounted'),
           :vendor           => 'Mellanox',
-          :version          => lookup('genepi', node_uid, 'network_interfaces', 'ib1', 'version'),
-          :driver           => lookup('genepi', node_uid, 'network_interfaces', 'ib1', 'driver'),
-          :guid             => lookup('genepi', node_uid, 'network_interfaces', 'ib1', 'guid')
+          :version          => lookup('genepi_generated', node_uid, 'network_interfaces', 'ib1', 'version'),
+          :driver           => lookup('genepi_generated', node_uid, 'network_interfaces', 'ib1', 'driver'),
+          :guid             => lookup('genepi_generated', node_uid, 'network_interfaces', 'ib1', 'guid')
         },
         {
           :interface        => 'Ethernet',
@@ -133,22 +133,22 @@ site :grenoble do |site_uid|
           :mounted          => false,
           :device           => "bmc",
           :network_address  => "#{node_uid}-bmc.#{site_uid}.grid5000.fr",
-          :ip               => lookup('genepi', node_uid, 'network_interfaces', 'bmc', 'ip'),
-          :mac              => lookup('genepi', node_uid, 'network_interfaces', 'bmc', 'mac'),
+          :ip               => lookup('genepi_generated', node_uid, 'network_interfaces', 'bmc', 'ip'),
+          :mac              => lookup('genepi_generated', node_uid, 'network_interfaces', 'bmc', 'mac'),
           :vendor => "Peppercon AG (10437)",
           :version => "1.50"
         }]
 
         chassis({
-          :serial       => lookup('genepi', node_uid, 'chassis', 'serial_number'),
-          :name         => lookup('genepi', node_uid, 'chassis', 'product_name'),
-          :manufacturer => lookup('genepi', node_uid, 'chassis', 'manufacturer')
+          :serial       => lookup('genepi_generated', node_uid, 'chassis', 'serial_number'),
+          :name         => lookup('genepi_generated', node_uid, 'chassis', 'product_name'),
+          :manufacturer => lookup('genepi_generated', node_uid, 'chassis', 'manufacturer')
         })
 
         bios({
-          :version      => lookup('genepi', node_uid, 'bios', 'version'),
-          :vendor       => lookup('genepi', node_uid, 'bios', 'vendor'),
-          :release_date => lookup('genepi', node_uid, 'bios', 'release_date')
+          :version      => lookup('genepi_generated', node_uid, 'bios', 'version'),
+          :vendor       => lookup('genepi_generated', node_uid, 'bios', 'vendor'),
+          :release_date => lookup('genepi_generated', node_uid, 'bios', 'release_date')
         })
 
         gpu({
diff --git a/generators/input/sites/grenoble/clusters/genepi.yaml b/generators/input/sites/grenoble/clusters/genepi_generated.yaml
similarity index 96%
rename from generators/input/sites/grenoble/clusters/genepi.yaml
rename to generators/input/sites/grenoble/clusters/genepi_generated.yaml
index 2702ed4f8da..f83dfef071e 100644
--- a/generators/input/sites/grenoble/clusters/genepi.yaml
+++ b/generators/input/sites/grenoble/clusters/genepi_generated.yaml
@@ -58,8 +58,6 @@ genepi-1:
       ip: 172.16.16.1
       driver: e1000e
       mountable: true
-      switch_name: gw-grenoble
-      switch_port: '4:22'
     bmc:
       mac: 00:30:48:96:d6:b5
       ip: 172.17.16.1
@@ -83,7 +81,7 @@ genepi-1:
     platform_type: x86_64
     smt_size: 8
   chassis:
-    serial_number:
+    serial_number: 
     manufacturer: Bull SAS
     product_name: R422E1/R422E1INF
 genepi-2:
@@ -134,8 +132,6 @@ genepi-2:
       ip: 172.16.16.2
       driver: e1000e
       mountable: true
-      switch_name: gw-grenoble
-      switch_port: '3:42'
     bmc:
       mac: 00:30:48:96:d1:e2
       ip: 172.17.16.2
@@ -221,8 +217,6 @@ genepi-3:
       ip: 172.16.16.3
       driver: e1000e
       mountable: true
-      switch_name: gw-grenoble
-      switch_port: '4:21'
     bmc:
       mac: 00:30:48:96:d3:44
       ip: 172.17.16.3
@@ -257,7 +251,7 @@ genepi-3:
     platform_type: x86_64
     smt_size: 8
   chassis:
-    serial_number:
+    serial_number: 
     manufacturer: Bull SAS
     product_name: R422E1/R422E1INF
 genepi-4:
@@ -319,8 +313,6 @@ genepi-4:
       ip: 172.16.16.4
       driver: e1000e
       mountable: true
-      switch_name: gw-grenoble
-      switch_port: '3:40'
     bmc:
       mac: 00:30:48:96:d2:5d
       ip: 172.17.16.4
@@ -395,8 +387,6 @@ genepi-5:
       ip: 172.16.16.5
       driver: e1000e
       mountable: true
-      switch_name: gw-grenoble
-      switch_port: '4:19'
     bmc:
       mac: 00:30:48:93:39:e8
       ip: 172.17.16.5
@@ -489,10 +479,8 @@ genepi-6:
       ip: 172.16.16.6
       driver: e1000e
       mountable: true
-      switch_name: gw-grenoble
-      switch_port:
     bmc:
-      mac:
+      mac: 
       ip: 172.17.16.6
   operating_system:
     kernel: 2.6.32-5-amd64
@@ -518,7 +506,7 @@ genepi-6:
     platform_type: x86_64
     smt_size: 8
   chassis:
-    serial_number:
+    serial_number: 
     manufacturer: Bull SAS
     product_name: R422E1/R422E1INF
 genepi-7:
@@ -576,8 +564,6 @@ genepi-7:
       ip: 172.16.16.7
       driver: e1000e
       mountable: true
-      switch_name: gw-grenoble
-      switch_port: '4:20'
     bmc:
       mac: 00:30:48:96:d1:d2
       ip: 172.17.16.7
@@ -605,7 +591,7 @@ genepi-7:
     platform_type: x86_64
     smt_size: 8
   chassis:
-    serial_number:
+    serial_number: 
     manufacturer: Bull SAS
     product_name: R422E1/R422E1INF
 genepi-8:
@@ -667,8 +653,6 @@ genepi-8:
       ip: 172.16.16.8
       driver: e1000e
       mountable: true
-      switch_name: gw-grenoble
-      switch_port: '3:39'
     bmc:
       mac: 00:30:48:96:d6:94
       ip: 172.17.16.8
@@ -747,8 +731,6 @@ genepi-9:
       ip: 172.16.16.9
       driver: e1000e
       mountable: true
-      switch_name: gw-grenoble
-      switch_port: '4:18'
     bmc:
       mac: 00:30:48:96:d4:8e
       ip: 172.17.16.9
@@ -837,8 +819,6 @@ genepi-10:
       ip: 172.16.16.10
       driver: e1000e
       mountable: true
-      switch_name: gw-grenoble
-      switch_port: '3:37'
     bmc:
       mac: 00:30:48:96:d4:2d
       ip: 172.17.16.10
@@ -866,7 +846,7 @@ genepi-10:
     platform_type: x86_64
     smt_size: 8
   chassis:
-    serial_number:
+    serial_number: 
     manufacturer: Bull SAS
     product_name: R422E1/R422E1INF
 genepi-11:
@@ -924,8 +904,6 @@ genepi-11:
       ip: 172.16.16.11
       driver: e1000e
       mountable: true
-      switch_name: gw-grenoble
-      switch_port: '4:9'
     bmc:
       mac: 00:30:48:96:d6:90
       ip: 172.17.16.11
@@ -1011,8 +989,6 @@ genepi-12:
       ip: 172.16.16.12
       driver: e1000e
       mountable: true
-      switch_name: gw-grenoble
-      switch_port: '3:38'
     bmc:
       mac: 00:30:48:96:d2:39
       ip: 172.17.16.12
@@ -1040,7 +1016,7 @@ genepi-12:
     platform_type: x86_64
     smt_size: 8
   chassis:
-    serial_number:
+    serial_number: 
     manufacturer: Bull SAS
     product_name: R422E1/R422E1INF
 genepi-13:
@@ -1095,8 +1071,6 @@ genepi-13:
       ip: 172.16.16.13
       driver: e1000e
       mountable: true
-      switch_name: gw-grenoble
-      switch_port: '4:17'
     bmc:
       mac: 00:30:48:96:d4:9a
       ip: 172.17.16.13
@@ -1189,8 +1163,6 @@ genepi-14:
       ip: 172.16.16.14
       driver: e1000e
       mountable: true
-      switch_name: gw-grenoble
-      switch_port: '3:29'
     bmc:
       mac: 00:30:48:96:d3:40
       ip: 172.17.16.14
@@ -1265,8 +1237,6 @@ genepi-15:
       ip: 172.16.16.15
       driver: e1000e
       mountable: true
-      switch_name: gw-grenoble
-      switch_port: '4:7'
     bmc:
       mac: 00:30:48:96:d3:2f
       ip: 172.17.16.15
@@ -1352,8 +1322,6 @@ genepi-16:
       ip: 172.16.16.16
       driver: e1000e
       mountable: true
-      switch_name: gw-grenoble
-      switch_port: '3:25'
     bmc:
       mac: 00:30:48:96:d4:37
       ip: 172.17.16.16
@@ -1443,8 +1411,6 @@ genepi-17:
       ip: 172.16.16.17
       driver: e1000e
       mountable: true
-      switch_name: gw-grenoble
-      switch_port: '4:6'
     bmc:
       mac: 00:30:48:96:d2:42
       ip: 172.17.16.17
@@ -1533,8 +1499,6 @@ genepi-18:
       ip: 172.16.16.18
       driver: e1000e
       mountable: true
-      switch_name: gw-grenoble
-      switch_port: '3:27'
     bmc:
       mac: 00:30:48:96:d3:4d
       ip: 172.17.16.18
@@ -1620,8 +1584,6 @@ genepi-19:
       ip: 172.16.16.19
       driver: e1000e
       mountable: true
-      switch_name: gw-grenoble
-      switch_port: '4:16'
     bmc:
       mac: 00:30:48:96:d1:f5
       ip: 172.17.16.19
@@ -1704,8 +1666,6 @@ genepi-20:
       ip: 172.16.16.20
       driver: e1000e
       mountable: true
-      switch_name: gw-grenoble
-      switch_port: '3:31'
     bmc:
       mac: 00:30:48:96:d3:bf
       ip: 172.17.16.20
@@ -1794,8 +1754,6 @@ genepi-21:
       ip: 172.16.16.21
       driver: e1000e
       mountable: true
-      switch_name: gw-grenoble
-      switch_port: '4:10'
     bmc:
       mac: 00:30:48:96:d3:56
       ip: 172.17.16.21
@@ -1878,8 +1836,6 @@ genepi-22:
       ip: 172.16.16.22
       driver: e1000e
       mountable: true
-      switch_name: gw-grenoble
-      switch_port: '3:32'
     bmc:
       mac: 00:30:48:96:d2:fd
       ip: 172.17.16.22
@@ -1972,8 +1928,6 @@ genepi-23:
       ip: 172.16.16.23
       driver: e1000e
       mountable: true
-      switch_name: gw-grenoble
-      switch_port: '4:14'
     bmc:
       mac: 00:30:48:96:d2:d1
       ip: 172.17.16.23
@@ -2048,8 +2002,6 @@ genepi-24:
       ip: 172.16.16.24
       driver: e1000e
       mountable: true
-      switch_name: gw-grenoble
-      switch_port: '3:30'
     bmc:
       mac: 00:30:48:96:d6:ff
       ip: 172.17.16.24
@@ -2146,8 +2098,6 @@ genepi-25:
       ip: 172.16.16.25
       driver: e1000e
       mountable: true
-      switch_name: gw-grenoble
-      switch_port: '4:15'
     bmc:
       mac: 00:30:48:96:d3:2d
       ip: 172.17.16.25
@@ -2171,7 +2121,7 @@ genepi-25:
     platform_type: x86_64
     smt_size: 8
   chassis:
-    serial_number:
+    serial_number: 
     manufacturer: Bull SAS
     product_name: R422E1/R422E1INF
 genepi-26:
@@ -2229,8 +2179,6 @@ genepi-26:
       ip: 172.16.16.26
       driver: e1000e
       mountable: true
-      switch_name: gw-grenoble
-      switch_port: '4:8'
     bmc:
       mac: 00:30:48:96:d6:08
       ip: 172.17.16.26
@@ -2258,7 +2206,7 @@ genepi-26:
     platform_type: x86_64
     smt_size: 8
   chassis:
-    serial_number:
+    serial_number: 
     manufacturer: Bull SAS
     product_name: R422E1/R422E1INF
 genepi-27:
@@ -2320,8 +2268,6 @@ genepi-27:
       ip: 172.16.16.27
       driver: e1000e
       mountable: true
-      switch_name: gw-grenoble
-      switch_port: '4:4'
     bmc:
       mac: 00:30:48:96:d3:1f
       ip: 172.17.16.27
@@ -2396,8 +2342,6 @@ genepi-28:
       ip: 172.16.16.28
       driver: e1000e
       mountable: true
-      switch_name: gw-grenoble
-      switch_port: '3:33'
     bmc:
       mac: 00:30:48:96:d7:76
       ip: 172.17.16.28
@@ -2483,8 +2427,6 @@ genepi-29:
       ip: 172.16.16.29
       driver: e1000e
       mountable: true
-      switch_name: gw-grenoble
-      switch_port: '4:3'
     bmc:
       mac: 00:30:48:96:d2:db
       ip: 172.17.16.29
@@ -2570,8 +2512,6 @@ genepi-30:
       ip: 172.16.16.30
       driver: e1000e
       mountable: true
-      switch_name: gw-grenoble
-      switch_port: '3:28'
     bmc:
       mac: 00:30:48:96:d4:2f
       ip: 172.17.16.30
@@ -2657,10 +2597,8 @@ genepi-31:
       ip: 172.16.16.31
       driver: e1000e
       mountable: true
-      switch_name: gw-grenoble
-      switch_port: '4:13'
     bmc:
-      mac:
+      mac: 
       ip: 172.17.16.31
   block_devices:
     sda:
@@ -2693,7 +2631,7 @@ genepi-31:
     platform_type: x86_64
     smt_size: 8
   chassis:
-    serial_number:
+    serial_number: 
     manufacturer: Bull SAS
     product_name: R422E1/R422E1INF
 genepi-32:
@@ -2744,8 +2682,6 @@ genepi-32:
       ip: 172.16.16.32
       driver: e1000e
       mountable: true
-      switch_name: gw-grenoble
-      switch_port: '3:34'
     bmc:
       mac: 00:30:48:96:d7:84
       ip: 172.17.16.32
@@ -2831,8 +2767,6 @@ genepi-33:
       ip: 172.16.16.33
       driver: e1000e
       mountable: true
-      switch_name: gw-grenoble
-      switch_port: '4:5'
     bmc:
       mac: 00:30:48:96:d2:dc
       ip: 172.17.16.33
@@ -2925,8 +2859,6 @@ genepi-34:
       ip: 172.16.16.34
       driver: e1000e
       mountable: true
-      switch_name: gw-grenoble
-      switch_port: '3:26'
     bmc:
       mac: 00:30:48:96:d2:dd
       ip: 172.17.16.34
diff --git a/generators/input/sites/grenoble/clusters/genepi_manual.yaml b/generators/input/sites/grenoble/clusters/genepi_manual.yaml
new file mode 100644
index 00000000000..804b544d5d1
--- /dev/null
+++ b/generators/input/sites/grenoble/clusters/genepi_manual.yaml
@@ -0,0 +1,170 @@
+---
+genepi-1:
+  network_interfaces:
+    eth1:
+      switch_name: gw-grenoble
+      switch_port: '4:22'
+genepi-2:
+  network_interfaces:
+    eth1:
+      switch_name: gw-grenoble
+      switch_port: '3:42'
+genepi-3:
+  network_interfaces:
+    eth1:
+      switch_name: gw-grenoble
+      switch_port: '4:21'
+genepi-4:
+  network_interfaces:
+    eth1:
+      switch_name: gw-grenoble
+      switch_port: '3:40'
+genepi-5:
+  network_interfaces:
+    eth1:
+      switch_name: gw-grenoble
+      switch_port: '4:19'
+genepi-6:
+  network_interfaces:
+    eth1:
+      switch_name: gw-grenoble
+genepi-7:
+  network_interfaces:
+    eth1:
+      switch_name: gw-grenoble
+      switch_port: '4:20'
+genepi-8:
+  network_interfaces:
+    eth1:
+      switch_name: gw-grenoble
+      switch_port: '3:39'
+genepi-9:
+  network_interfaces:
+    eth1:
+      switch_name: gw-grenoble
+      switch_port: '4:18'
+genepi-10:
+  network_interfaces:
+    eth1:
+      switch_name: gw-grenoble
+      switch_port: '3:37'
+genepi-11:
+  network_interfaces:
+    eth1:
+      switch_name: gw-grenoble
+      switch_port: '4:9'
+genepi-12:
+  network_interfaces:
+    eth1:
+      switch_name: gw-grenoble
+      switch_port: '3:38'
+genepi-13:
+  network_interfaces:
+    eth1:
+      switch_name: gw-grenoble
+      switch_port: '4:17'
+genepi-14:
+  network_interfaces:
+    eth1:
+      switch_name: gw-grenoble
+      switch_port: '3:29'
+genepi-15:
+  network_interfaces:
+    eth1:
+      switch_name: gw-grenoble
+      switch_port: '4:7'
+genepi-16:
+  network_interfaces:
+    eth1:
+      switch_name: gw-grenoble
+      switch_port: '3:25'
+genepi-17:
+  network_interfaces:
+    eth1:
+      switch_name: gw-grenoble
+      switch_port: '4:6'
+genepi-18:
+  network_interfaces:
+    eth1:
+      switch_name: gw-grenoble
+      switch_port: '3:27'
+genepi-19:
+  network_interfaces:
+    eth1:
+      switch_name: gw-grenoble
+      switch_port: '4:16'
+genepi-20:
+  network_interfaces:
+    eth1:
+      switch_name: gw-grenoble
+      switch_port: '3:31'
+genepi-21:
+  network_interfaces:
+    eth1:
+      switch_name: gw-grenoble
+      switch_port: '4:10'
+genepi-22:
+  network_interfaces:
+    eth1:
+      switch_name: gw-grenoble
+      switch_port: '3:32'
+genepi-23:
+  network_interfaces:
+    eth1:
+      switch_name: gw-grenoble
+      switch_port: '4:14'
+genepi-24:
+  network_interfaces:
+    eth1:
+      switch_name: gw-grenoble
+      switch_port: '3:30'
+genepi-25:
+  network_interfaces:
+    eth1:
+      switch_name: gw-grenoble
+      switch_port: '4:15'
+genepi-26:
+  network_interfaces:
+    eth1:
+      switch_name: gw-grenoble
+      switch_port: '4:8'
+genepi-27:
+  network_interfaces:
+    eth1:
+      switch_name: gw-grenoble
+      switch_port: '4:4'
+genepi-28:
+  network_interfaces:
+    eth1:
+      switch_name: gw-grenoble
+      switch_port: '3:33'
+genepi-29:
+  network_interfaces:
+    eth1:
+      switch_name: gw-grenoble
+      switch_port: '4:3'
+genepi-30:
+  network_interfaces:
+    eth1:
+      switch_name: gw-grenoble
+      switch_port: '3:28'
+genepi-31:
+  network_interfaces:
+    eth1:
+      switch_name: gw-grenoble
+      switch_port: '4:13'
+genepi-32:
+  network_interfaces:
+    eth1:
+      switch_name: gw-grenoble
+      switch_port: '3:34'
+genepi-33:
+  network_interfaces:
+    eth1:
+      switch_name: gw-grenoble
+      switch_port: '4:5'
+genepi-34:
+  network_interfaces:
+    eth1:
+      switch_name: gw-grenoble
+      switch_port: '3:26'
diff --git a/generators/input/sites/lille/clusters/chimint.rb b/generators/input/sites/lille/clusters/chimint.rb
index a7a5df496a7..0b5f12689bb 100644
--- a/generators/input/sites/lille/clusters/chimint.rb
+++ b/generators/input/sites/lille/clusters/chimint.rb
@@ -16,93 +16,93 @@ site :lille do |site_uid|
         supported_job_types({
           :deploy       => true,
           :besteffort   => true,
-          :virtual      => lookup('chimint', node_uid, 'supported_job_types', 'virtual')
+          :virtual      => lookup('chimint_generated', node_uid, 'supported_job_types', 'virtual')
         })
 
         architecture({
-          :smp_size       => lookup('chimint', node_uid, 'architecture', 'smp_size'),
-          :smt_size       => lookup('chimint', node_uid, 'architecture', 'smt_size'),
-          :platform_type  => lookup('chimint', node_uid, 'architecture', 'platform_type')
+          :smp_size       => lookup('chimint_generated', node_uid, 'architecture', 'smp_size'),
+          :smt_size       => lookup('chimint_generated', node_uid, 'architecture', 'smt_size'),
+          :platform_type  => lookup('chimint_generated', node_uid, 'architecture', 'platform_type')
         })
 
         processor({
-          :vendor             => lookup('chimint', node_uid, 'processor', 'vendor'),
-          :model              => lookup('chimint', node_uid, 'processor', 'model'),
-          :version            => lookup('chimint', node_uid, 'processor', 'version'),
-          :clock_speed        => lookup('chimint', node_uid, 'processor', 'clock_speed'),
-          :instruction_set    => lookup('chimint', node_uid, 'processor', 'instruction_set'),
-          :other_description  => lookup('chimint', node_uid, 'processor', 'other_description'),
-          :cache_l1           => lookup('chimint', node_uid, 'processor', 'cache_l1'),
-          :cache_l1i          => lookup('chimint', node_uid, 'processor', 'cache_l1i'),
-          :cache_l1d          => lookup('chimint', node_uid, 'processor', 'cache_l1d'),
-          :cache_l2           => lookup('chimint', node_uid, 'processor', 'cache_l2'),
-          :cache_l3           => lookup('chimint', node_uid, 'processor', 'cache_l3')
+          :vendor             => lookup('chimint_generated', node_uid, 'processor', 'vendor'),
+          :model              => lookup('chimint_generated', node_uid, 'processor', 'model'),
+          :version            => lookup('chimint_generated', node_uid, 'processor', 'version'),
+          :clock_speed        => lookup('chimint_generated', node_uid, 'processor', 'clock_speed'),
+          :instruction_set    => lookup('chimint_generated', node_uid, 'processor', 'instruction_set'),
+          :other_description  => lookup('chimint_generated', node_uid, 'processor', 'other_description'),
+          :cache_l1           => lookup('chimint_generated', node_uid, 'processor', 'cache_l1'),
+          :cache_l1i          => lookup('chimint_generated', node_uid, 'processor', 'cache_l1i'),
+          :cache_l1d          => lookup('chimint_generated', node_uid, 'processor', 'cache_l1d'),
+          :cache_l2           => lookup('chimint_generated', node_uid, 'processor', 'cache_l2'),
+          :cache_l3           => lookup('chimint_generated', node_uid, 'processor', 'cache_l3')
         })
 
         main_memory({
-          :ram_size     => lookup('chimint', node_uid, 'main_memory', 'ram_size'),
+          :ram_size     => lookup('chimint_generated', node_uid, 'main_memory', 'ram_size'),
           :virtual_size => nil
         })
 
         operating_system({
-          :name     => lookup('chimint', node_uid, 'operating_system', 'name'),
+          :name     => lookup('chimint_generated', node_uid, 'operating_system', 'name'),
           :release  => "Squeeze",
-          :version  => lookup('chimint', node_uid, 'operating_system', 'version'),
-          :kernel   => lookup('chimint', node_uid, 'operating_system', 'kernel')
+          :version  => lookup('chimint_generated', node_uid, 'operating_system', 'version'),
+          :kernel   => lookup('chimint_generated', node_uid, 'operating_system', 'kernel')
         })
 
         storage_devices [{
           :interface  => 'SATA',
-          :size       => lookup('chimint', node_uid, 'block_devices', 'sda', 'size'),
+          :size       => lookup('chimint_generated', node_uid, 'block_devices', 'sda', 'size'),
           :driver     => "megaraid_sas",
-          :device     => lookup('chimint', node_uid, 'block_devices', 'sda', 'device'),
-          :model      => lookup('chimint', node_uid, 'block_devices', 'sda', 'model'),
-          :vendor     => lookup('chimint', node_uid, 'block_devices', 'sda', 'vendor'),
-          :rev        => lookup('chimint', node_uid, 'block_devices', 'sda', 'rev'),
+          :device     => lookup('chimint_generated', node_uid, 'block_devices', 'sda', 'device'),
+          :model      => lookup('chimint_generated', node_uid, 'block_devices', 'sda', 'model'),
+          :vendor     => lookup('chimint_generated', node_uid, 'block_devices', 'sda', 'vendor'),
+          :rev        => lookup('chimint_generated', node_uid, 'block_devices', 'sda', 'rev'),
           :raid       => "0"
         }]
 
         network_adapters [{
-          :interface        => lookup('chimint', node_uid, 'network_interfaces', 'eth0', 'interface'),
+          :interface        => lookup('chimint_generated', node_uid, 'network_interfaces', 'eth0', 'interface'),
           :rate             => 1.G,
-          :enabled          => lookup('chimint', node_uid, 'network_interfaces', 'eth0', 'enabled'),
-          :management       => lookup('chimint', node_uid, 'network_interfaces', 'eth0', 'management'),
-          :mountable        => lookup('chimint', node_uid, 'network_interfaces', 'eth0', 'mountable'),
-          :mounted          => lookup('chimint', node_uid, 'network_interfaces', 'eth0', 'mounted'),
+          :enabled          => lookup('chimint_generated', node_uid, 'network_interfaces', 'eth0', 'enabled'),
+          :management       => lookup('chimint_generated', node_uid, 'network_interfaces', 'eth0', 'management'),
+          :mountable        => lookup('chimint_generated', node_uid, 'network_interfaces', 'eth0', 'mountable'),
+          :mounted          => lookup('chimint_generated', node_uid, 'network_interfaces', 'eth0', 'mounted'),
           :bridged          => true,
           :device           => "eth0",
           :vendor           => 'Broadcom',
           :version          => 'NetXtreme II BCM5716',
           :network_address  => "#{node_uid}.#{site_uid}.grid5000.fr",
           :switch           => 'gw-lille',
-          :ip               => lookup('chimint', node_uid, 'network_interfaces', 'eth0', 'ip'),
-          :ip6              => lookup('chimint', node_uid, 'network_interfaces', 'eth0', 'ip6'),
-          :switch_port      => lookup('chimint', node_uid, 'network_interfaces', 'eth0', 'switch_port'),
-          :driver           => lookup('chimint', node_uid, 'network_interfaces', 'eth0', 'driver'),
-          :mac              => lookup('chimint', node_uid, 'network_interfaces', 'eth0', 'mac')
+          :ip               => lookup('chimint_generated', node_uid, 'network_interfaces', 'eth0', 'ip'),
+          :ip6              => lookup('chimint_generated', node_uid, 'network_interfaces', 'eth0', 'ip6'),
+          :switch_port      => lookup('chimint_manual', node_uid, 'network_interfaces', 'eth0', 'switch_port'),
+          :driver           => lookup('chimint_generated', node_uid, 'network_interfaces', 'eth0', 'driver'),
+          :mac              => lookup('chimint_generated', node_uid, 'network_interfaces', 'eth0', 'mac')
         },
         {
-          :interface        => lookup('chimint', node_uid, 'network_interfaces', 'eth1', 'interface'),
-          :rate             => lookup('chimint', node_uid, 'network_interfaces', 'eth1', 'rate'),
-          :enabled          => lookup('chimint', node_uid, 'network_interfaces', 'eth1', 'enabled'),
-          :management       => lookup('chimint', node_uid, 'network_interfaces', 'eth1', 'management'),
-          :mountable        => lookup('chimint', node_uid, 'network_interfaces', 'eth1', 'mountable'),
-          :mounted          => lookup('chimint', node_uid, 'network_interfaces', 'eth1', 'mounted'),
+          :interface        => lookup('chimint_generated', node_uid, 'network_interfaces', 'eth1', 'interface'),
+          :rate             => lookup('chimint_generated', node_uid, 'network_interfaces', 'eth1', 'rate'),
+          :enabled          => lookup('chimint_generated', node_uid, 'network_interfaces', 'eth1', 'enabled'),
+          :management       => lookup('chimint_generated', node_uid, 'network_interfaces', 'eth1', 'management'),
+          :mountable        => lookup('chimint_generated', node_uid, 'network_interfaces', 'eth1', 'mountable'),
+          :mounted          => lookup('chimint_generated', node_uid, 'network_interfaces', 'eth1', 'mounted'),
           :bridged          => false,
           :device           => "eth1",
           :vendor           => 'Broadcom',
           :version          => 'NetXtreme II BCM5716',
-          :driver           => lookup('chimint', node_uid, 'network_interfaces', 'eth1', 'driver'),
-          :mac              => lookup('chimint', node_uid, 'network_interfaces', 'eth1', 'mac')
+          :driver           => lookup('chimint_generated', node_uid, 'network_interfaces', 'eth1', 'driver'),
+          :mac              => lookup('chimint_generated', node_uid, 'network_interfaces', 'eth1', 'mac')
         },
         {
           :interface            => 'Ethernet',
           :rate                 => 1.G,
           :network_address      => "#{node_uid}-impi.#{site_uid}.grid5000.fr",
-          :ip                   => lookup('chimint', node_uid, 'network_interfaces', 'bmc', 'ip'),
-          :mac                  => lookup('chimint', node_uid, 'network_interfaces', 'bmc', 'mac'),
-          :switch               => lookup('chimint', node_uid, 'network_interfaces', 'bmc', 'switch_name'),
-          :switch_port          => lookup('chimint', node_uid, 'network_interfaces', 'bmc', 'switch_port'),
+          :ip                   => lookup('chimint_generated', node_uid, 'network_interfaces', 'bmc', 'ip'),
+          :mac                  => lookup('chimint_generated', node_uid, 'network_interfaces', 'bmc', 'mac'),
+          :switch               => lookup('chimint_generated', node_uid, 'network_interfaces', 'bmc', 'switch_name'),
+          :switch_port          => lookup('chimint_generated', node_uid, 'network_interfaces', 'bmc', 'switch_port'),
           :enabled              => true,
           :mounted              => false,
           :mountable            => false,
@@ -111,15 +111,15 @@ site :lille do |site_uid|
         }]
 
         chassis({
-          :serial       => lookup('chimint', node_uid, 'chassis', 'serial_number'),
-          :name         => lookup('chimint', node_uid, 'chassis', 'product_name'),
-          :manufacturer => lookup('chimint', node_uid, 'chassis', 'manufacturer')
+          :serial       => lookup('chimint_generated', node_uid, 'chassis', 'serial_number'),
+          :name         => lookup('chimint_generated', node_uid, 'chassis', 'product_name'),
+          :manufacturer => lookup('chimint_generated', node_uid, 'chassis', 'manufacturer')
         })
 
         bios({
-          :version      => lookup('chimint', node_uid, 'bios', 'version'),
-          :vendor       => lookup('chimint', node_uid, 'bios', 'vendor'),
-          :release_date => lookup('chimint', node_uid, 'bios', 'release_date')
+          :version      => lookup('chimint_generated', node_uid, 'bios', 'version'),
+          :vendor       => lookup('chimint_generated', node_uid, 'bios', 'vendor'),
+          :release_date => lookup('chimint_generated', node_uid, 'bios', 'release_date')
         })
 
         gpu({
diff --git a/generators/input/sites/lille/clusters/chimint.yaml b/generators/input/sites/lille/clusters/chimint_generated.yaml
similarity index 98%
rename from generators/input/sites/lille/clusters/chimint.yaml
rename to generators/input/sites/lille/clusters/chimint_generated.yaml
index ecc268f0b19..2d8f9949dac 100644
--- a/generators/input/sites/lille/clusters/chimint.yaml
+++ b/generators/input/sites/lille/clusters/chimint_generated.yaml
@@ -27,7 +27,6 @@ chimint-1:
       ip: 172.16.33.1
       driver: bnx2
       mountable: true
-      switch_port: Gi3/7
     eth1:
       mounted: false
       rate: 1000000000
@@ -92,7 +91,6 @@ chimint-2:
       ip: 172.16.33.2
       driver: bnx2
       mountable: true
-      switch_port: Gi3/9
     eth1:
       mounted: false
       rate: 1000000000
@@ -146,7 +144,6 @@ chimint-3:
       ip: 172.16.33.3
       driver: bnx2
       mountable: true
-      switch_port: Gi3/8
     eth1:
       mounted: false
       rate: 1000000000
@@ -211,7 +208,6 @@ chimint-4:
       ip: 172.16.33.4
       driver: bnx2
       mountable: true
-      switch_port: Gi3/11
     eth1:
       mounted: false
       rate: 1000000000
@@ -287,7 +283,6 @@ chimint-5:
       ip: 172.16.33.5
       driver: bnx2
       mountable: true
-      switch_port: Gi3/10
     eth1:
       mounted: false
       rate: 1000000000
@@ -348,7 +343,6 @@ chimint-6:
       ip: 172.16.33.6
       driver: bnx2
       mountable: true
-      switch_port: Gi3/12
     eth1:
       mounted: false
       rate: 1000000000
@@ -406,7 +400,6 @@ chimint-7:
       ip: 172.16.33.7
       driver: bnx2
       mountable: true
-      switch_port: Gi3/14
     eth1:
       mounted: false
       rate: 1000000000
@@ -482,7 +475,6 @@ chimint-8:
       ip: 172.16.33.8
       driver: bnx2
       mountable: true
-      switch_port: Gi3/13
     eth1:
       mounted: false
       rate: 1000000000
@@ -536,7 +528,6 @@ chimint-9:
       ip: 172.16.33.9
       driver: bnx2
       mountable: true
-      switch_port: Gi3/15
     eth1:
       mounted: false
       rate: 1000000000
@@ -601,7 +592,6 @@ chimint-10:
       ip: 172.16.33.10
       driver: bnx2
       mountable: true
-      switch_port: Gi3/16
     eth1:
       mounted: false
       rate: 1000000000
@@ -670,7 +660,6 @@ chimint-11:
       ip: 172.16.33.11
       driver: bnx2
       mountable: true
-      switch_port: Gi3/17
     eth1:
       mounted: false
       rate: 1000000000
@@ -731,7 +720,6 @@ chimint-12:
       ip: 172.16.33.12
       driver: bnx2
       mountable: true
-      switch_port: Gi3/18
     eth1:
       mounted: false
       rate: 1000000000
@@ -796,7 +784,6 @@ chimint-13:
       ip: 172.16.33.13
       driver: bnx2
       mountable: true
-      switch_port: Gi3/19
     eth1:
       mounted: false
       rate: 1000000000
@@ -872,7 +859,6 @@ chimint-14:
       ip: 172.16.33.14
       driver: bnx2
       mountable: true
-      switch_port: Gi3/20
     eth1:
       mounted: false
       rate: 1000000000
@@ -937,7 +923,6 @@ chimint-15:
       ip: 172.16.33.15
       driver: bnx2
       mountable: true
-      switch_port: Gi3/23
     eth1:
       mounted: false
       rate: 1000000000
@@ -995,7 +980,6 @@ chimint-16:
       ip: 172.16.33.16
       driver: bnx2
       mountable: true
-      switch_port: Gi3/22
     eth1:
       mounted: false
       rate: 1000000000
@@ -1056,7 +1040,6 @@ chimint-17:
       ip: 172.16.33.17
       driver: bnx2
       mountable: true
-      switch_port: Gi3/21
     eth1:
       mounted: false
       rate: 1000000000
@@ -1132,7 +1115,6 @@ chimint-18:
       ip: 172.16.33.18
       driver: bnx2
       mountable: true
-      switch_port: Gi3/24
     eth1:
       mounted: false
       rate: 1000000000
@@ -1186,7 +1168,6 @@ chimint-19:
       ip: 172.16.33.19
       driver: bnx2
       mountable: true
-      switch_port: Gi3/28
     eth1:
       mounted: false
       rate: 1000000000
@@ -1255,7 +1236,6 @@ chimint-20:
       ip: 172.16.33.20
       driver: bnx2
       mountable: true
-      switch_port: Gi3/27
     eth1:
       mounted: false
       rate: 1000000000
diff --git a/generators/input/sites/lille/clusters/chimint_manual.yaml b/generators/input/sites/lille/clusters/chimint_manual.yaml
new file mode 100644
index 00000000000..c8c6ef680a3
--- /dev/null
+++ b/generators/input/sites/lille/clusters/chimint_manual.yaml
@@ -0,0 +1,81 @@
+---
+chimint-1:
+  network_interfaces:
+    eth0:
+      switch_port: Gi3/7
+chimint-2:
+  network_interfaces:
+    eth0:
+      switch_port: Gi3/9
+chimint-3:
+  network_interfaces:
+    eth0:
+      switch_port: Gi3/8
+chimint-4:
+  network_interfaces:
+    eth0:
+      switch_port: Gi3/11
+chimint-5:
+  network_interfaces:
+    eth0:
+      switch_port: Gi3/10
+chimint-6:
+  network_interfaces:
+    eth0:
+      switch_port: Gi3/12
+chimint-7:
+  network_interfaces:
+    eth0:
+      switch_port: Gi3/14
+chimint-8:
+  network_interfaces:
+    eth0:
+      switch_port: Gi3/13
+chimint-9:
+  network_interfaces:
+    eth0:
+      switch_port: Gi3/15
+chimint-10:
+  network_interfaces:
+    eth0:
+      switch_port: Gi3/16
+chimint-11:
+  network_interfaces:
+    eth0:
+      switch_port: Gi3/17
+chimint-12:
+  network_interfaces:
+    eth0:
+      switch_port: Gi3/18
+chimint-13:
+  network_interfaces:
+    eth0:
+      switch_port: Gi3/19
+chimint-14:
+  network_interfaces:
+    eth0:
+      switch_port: Gi3/20
+chimint-15:
+  network_interfaces:
+    eth0:
+      switch_port: Gi3/23
+chimint-16:
+  network_interfaces:
+    eth0:
+      switch_port: Gi3/22
+chimint-17:
+  network_interfaces:
+    eth0:
+      switch_port: Gi3/21
+chimint-18:
+  network_interfaces:
+    eth0:
+      switch_port: Gi3/24
+chimint-19:
+  network_interfaces:
+    eth0:
+      switch_port: Gi3/28
+chimint-20:
+  network_interfaces:
+    eth0:
+      switch_port: Gi3/27
diff --git a/generators/input/sites/lille/clusters/chinqchint.rb b/generators/input/sites/lille/clusters/chinqchint.rb
index 101bf54cecf..b81792c43c9 100644
--- a/generators/input/sites/lille/clusters/chinqchint.rb
+++ b/generators/input/sites/lille/clusters/chinqchint.rb
@@ -16,100 +16,100 @@ site :lille do |site_uid|
         supported_job_types({
           :deploy       => true,
           :besteffort   => true,
-          :virtual      => lookup('chinqchint', node_uid, 'supported_job_types', 'virtual')
+          :virtual      => lookup('chinqchint_generated', node_uid, 'supported_job_types', 'virtual')
         })
 
         architecture({
-          :smp_size       => lookup('chinqchint', node_uid, 'architecture', 'smp_size'),
-          :smt_size       => lookup('chinqchint', node_uid, 'architecture', 'smt_size'),
-          :platform_type  => lookup('chinqchint', node_uid, 'architecture', 'platform_type')
+          :smp_size       => lookup('chinqchint_generated', node_uid, 'architecture', 'smp_size'),
+          :smt_size       => lookup('chinqchint_generated', node_uid, 'architecture', 'smt_size'),
+          :platform_type  => lookup('chinqchint_generated', node_uid, 'architecture', 'platform_type')
         })
 
         processor({
-          :vendor             => lookup('chinqchint', node_uid, 'processor', 'vendor'),
-          :model              => lookup('chinqchint', node_uid, 'processor', 'model'),
-          :version            => lookup('chinqchint', node_uid, 'processor', 'version'),
-          :clock_speed        => lookup('chinqchint', node_uid, 'processor', 'clock_speed'),
-          :instruction_set    => lookup('chinqchint', node_uid, 'processor', 'instruction_set'),
-          :other_description  => lookup('chinqchint', node_uid, 'processor', 'other_description'),
-          :cache_l1           => lookup('chinqchint', node_uid, 'processor', 'cache_l1'),
-          :cache_l1i          => lookup('chinqchint', node_uid, 'processor', 'cache_l1i'),
-          :cache_l1d          => lookup('chinqchint', node_uid, 'processor', 'cache_l1d'),
-          :cache_l2           => lookup('chinqchint', node_uid, 'processor', 'cache_l2'),
-          :cache_l3           => lookup('chinqchint', node_uid, 'processor', 'cache_l3')
+          :vendor             => lookup('chinqchint_generated', node_uid, 'processor', 'vendor'),
+          :model              => lookup('chinqchint_generated', node_uid, 'processor', 'model'),
+          :version            => lookup('chinqchint_generated', node_uid, 'processor', 'version'),
+          :clock_speed        => lookup('chinqchint_generated', node_uid, 'processor', 'clock_speed'),
+          :instruction_set    => lookup('chinqchint_generated', node_uid, 'processor', 'instruction_set'),
+          :other_description  => lookup('chinqchint_generated', node_uid, 'processor', 'other_description'),
+          :cache_l1           => lookup('chinqchint_generated', node_uid, 'processor', 'cache_l1'),
+          :cache_l1i          => lookup('chinqchint_generated', node_uid, 'processor', 'cache_l1i'),
+          :cache_l1d          => lookup('chinqchint_generated', node_uid, 'processor', 'cache_l1d'),
+          :cache_l2           => lookup('chinqchint_generated', node_uid, 'processor', 'cache_l2'),
+          :cache_l3           => lookup('chinqchint_generated', node_uid, 'processor', 'cache_l3')
         })
 
         main_memory({
-          :ram_size     => lookup('chinqchint', node_uid, 'main_memory', 'ram_size'),
+          :ram_size     => lookup('chinqchint_generated', node_uid, 'main_memory', 'ram_size'),
           :virtual_size => nil
         })
 
         operating_system({
-          :name     => lookup('chinqchint', node_uid, 'operating_system', 'name'),
+          :name     => lookup('chinqchint_generated', node_uid, 'operating_system', 'name'),
           :release  => "Squeeze",
-          :version  => lookup('chinqchint', node_uid, 'operating_system', 'version'),
-          :kernel   => lookup('chinqchint', node_uid, 'operating_system', 'kernel')
+          :version  => lookup('chinqchint_generated', node_uid, 'operating_system', 'version'),
+          :kernel   => lookup('chinqchint_generated', node_uid, 'operating_system', 'kernel')
         })
 
         storage_devices [{
           :interface  => 'SATA II',
-          :size       => lookup('chinqchint', node_uid, 'block_devices', 'sda', 'size'),
+          :size       => lookup('chinqchint_generated', node_uid, 'block_devices', 'sda', 'size'),
           :driver     => "ahci",
-          :device     => lookup('chinqchint', node_uid, 'block_devices', 'sda', 'device'),
-          :model      => lookup('chinqchint', node_uid, 'block_devices', 'sda', 'model'),
-          :vendor     => lookup('chinqchint', node_uid, 'block_devices', 'sda', 'vendor'),
-          :rev        => lookup('chinqchint', node_uid, 'block_devices', 'sda', 'rev')
+          :device     => lookup('chinqchint_generated', node_uid, 'block_devices', 'sda', 'device'),
+          :model      => lookup('chinqchint_generated', node_uid, 'block_devices', 'sda', 'model'),
+          :vendor     => lookup('chinqchint_generated', node_uid, 'block_devices', 'sda', 'vendor'),
+          :rev        => lookup('chinqchint_generated', node_uid, 'block_devices', 'sda', 'rev')
         }]
 
         network_adapters [{
-          :interface        => lookup('chinqchint', node_uid, 'network_interfaces', 'eth0', 'interface'),
-          :rate             => lookup('chinqchint', node_uid, 'network_interfaces', 'eth0', 'rate'),
-          :enabled          => lookup('chinqchint', node_uid, 'network_interfaces', 'eth0', 'enabled'),
-          :management       => lookup('chinqchint', node_uid, 'network_interfaces', 'eth0', 'management'),
-          :mountable        => lookup('chinqchint', node_uid, 'network_interfaces', 'eth0', 'mountable'),
-          :mounted          => lookup('chinqchint', node_uid, 'network_interfaces', 'eth0', 'mounted'),
+          :interface        => lookup('chinqchint_generated', node_uid, 'network_interfaces', 'eth0', 'interface'),
+          :rate             => lookup('chinqchint_generated', node_uid, 'network_interfaces', 'eth0', 'rate'),
+          :enabled          => lookup('chinqchint_generated', node_uid, 'network_interfaces', 'eth0', 'enabled'),
+          :management       => lookup('chinqchint_generated', node_uid, 'network_interfaces', 'eth0', 'management'),
+          :mountable        => lookup('chinqchint_generated', node_uid, 'network_interfaces', 'eth0', 'mountable'),
+          :mounted          => lookup('chinqchint_generated', node_uid, 'network_interfaces', 'eth0', 'mounted'),
           :bridged          => false,
           :vendor           => 'Intel',
           :version          => '80003ES2LAN',
           :device           => "eth0",
-          :driver           => lookup('chinqchint', node_uid, 'network_interfaces', 'eth0', 'driver'),
-          :ip               => lookup('chinqchint', node_uid, 'network_interfaces', 'eth0', 'ip'),
+          :driver           => lookup('chinqchint_generated', node_uid, 'network_interfaces', 'eth0', 'driver'),
+          :ip               => lookup('chinqchint_generated', node_uid, 'network_interfaces', 'eth0', 'ip'),
           :switch           => "gw-lille",
-          :mac              => lookup('chinqchint', node_uid, 'network_interfaces', 'eth0', 'mac')
+          :mac              => lookup('chinqchint_generated', node_uid, 'network_interfaces', 'eth0', 'mac')
         },
         {
-          :interface        => lookup('chinqchint', node_uid, 'network_interfaces', 'eth1', 'interface'),
+          :interface        => lookup('chinqchint_generated', node_uid, 'network_interfaces', 'eth1', 'interface'),
           :rate             => 1.G,
-          :enabled          => lookup('chinqchint', node_uid, 'network_interfaces', 'eth1', 'enabled'),
-          :management       => lookup('chinqchint', node_uid, 'network_interfaces', 'eth1', 'management'),
-          :mountable        => lookup('chinqchint', node_uid, 'network_interfaces', 'eth1', 'mountable'),
-          :mounted          => lookup('chinqchint', node_uid, 'network_interfaces', 'eth1', 'mounted'),
+          :enabled          => lookup('chinqchint_generated', node_uid, 'network_interfaces', 'eth1', 'enabled'),
+          :management       => lookup('chinqchint_generated', node_uid, 'network_interfaces', 'eth1', 'management'),
+          :mountable        => lookup('chinqchint_generated', node_uid, 'network_interfaces', 'eth1', 'mountable'),
+          :mounted          => lookup('chinqchint_generated', node_uid, 'network_interfaces', 'eth1', 'mounted'),
           :bridged          => true,
           :device           => "eth1",
           :vendor           => 'Intel',
           :version          => '80003ES2LAN',
           :network_address  => "#{node_uid}.#{site_uid}.grid5000.fr",
           :switch           => 'gw-lille',
-          :switch_port      => lookup('chinqchint',"#{node_uid}",'network_interfaces', 'eth1', 'switch_port'),
-          :ip               => lookup('chinqchint', node_uid, 'network_interfaces', 'eth1', 'ip'),
-          :ip6              => lookup('chinqchint', node_uid, 'network_interfaces', 'eth1', 'ip6'),
-          :driver           => lookup('chinqchint', node_uid, 'network_interfaces', 'eth1', 'driver'),
-          :mac              => lookup('chinqchint', node_uid, 'network_interfaces', 'eth1', 'mac')
+          :switch_port      => lookup('chinqchint_manual',"#{node_uid}",'network_interfaces', 'eth1', 'switch_port'),
+          :ip               => lookup('chinqchint_generated', node_uid, 'network_interfaces', 'eth1', 'ip'),
+          :ip6              => lookup('chinqchint_generated', node_uid, 'network_interfaces', 'eth1', 'ip6'),
+          :driver           => lookup('chinqchint_generated', node_uid, 'network_interfaces', 'eth1', 'driver'),
+          :mac              => lookup('chinqchint_generated', node_uid, 'network_interfaces', 'eth1', 'mac')
         },
         {
-          :interface            => lookup('chinqchint', node_uid, 'network_interfaces', 'myri0', 'interface'),
-          :rate                 => lookup('chinqchint', node_uid, 'network_interfaces', 'myri0', 'rate'),
+          :interface            => lookup('chinqchint_generated', node_uid, 'network_interfaces', 'myri0', 'interface'),
+          :rate                 => lookup('chinqchint_generated', node_uid, 'network_interfaces', 'myri0', 'rate'),
           :network_address      => "#{node_uid}-myri0.#{site_uid}.grid5000.fr",
-          :ip                   => lookup('chinqchint', node_uid, 'network_interfaces', 'myri0', 'ip'),
-          :ip6                  => lookup('chinqchint', node_uid, 'network_interfaces', 'myri0', 'ip6'),
-          :mac                  => lookup('chinqchint', node_uid, 'network_interfaces', 'myri0', 'mac'),
+          :ip                   => lookup('chinqchint_generated', node_uid, 'network_interfaces', 'myri0', 'ip'),
+          :ip6                  => lookup('chinqchint_generated', node_uid, 'network_interfaces', 'myri0', 'ip6'),
+          :mac                  => lookup('chinqchint_generated', node_uid, 'network_interfaces', 'myri0', 'mac'),
           :vendor               => 'Myricom',
           :version              => "10G-PCIE-8A-C",
-          :driver               => lookup('chinqchint', node_uid, 'network_interfaces', 'myri0', 'driver'),
-          :enabled              => lookup('chinqchint', node_uid, 'network_interfaces', 'myri0', 'enabled'),
-          :management           => lookup('chinqchint', node_uid, 'network_interfaces', 'myri0', 'management'),
-          :mountable            => lookup('chinqchint', node_uid, 'network_interfaces', 'myri0', 'mountable'),
-          :mounted              => lookup('chinqchint', node_uid, 'network_interfaces', 'myri0', 'mounted'),
+          :driver               => lookup('chinqchint_generated', node_uid, 'network_interfaces', 'myri0', 'driver'),
+          :enabled              => lookup('chinqchint_generated', node_uid, 'network_interfaces', 'myri0', 'enabled'),
+          :management           => lookup('chinqchint_generated', node_uid, 'network_interfaces', 'myri0', 'management'),
+          :mountable            => lookup('chinqchint_generated', node_uid, 'network_interfaces', 'myri0', 'mountable'),
+          :mounted              => lookup('chinqchint_generated', node_uid, 'network_interfaces', 'myri0', 'mounted'),
           :management           => false,
           :device               => "myri0",
           :switch               => 'switch-myri'
@@ -118,8 +118,8 @@ site :lille do |site_uid|
           :interface            => 'Ethernet',
           :rate                 => 100.M,
           :network_address      => "#{node_uid}-ipmi.#{site_uid}.grid5000.fr",
-          :ip                   => lookup('chinqchint', node_uid, 'network_interfaces', 'bmc', 'ip'),
-          :mac                  => lookup('chinqchint', node_uid, 'network_interfaces', 'bmc', 'mac'),
+          :ip                   => lookup('chinqchint_generated', node_uid, 'network_interfaces', 'bmc', 'ip'),
+          :mac                  => lookup('chinqchint_generated', node_uid, 'network_interfaces', 'bmc', 'mac'),
           :enabled              => true,
           :mounted              => false,
           :mountable            => false,
@@ -129,15 +129,15 @@ site :lille do |site_uid|
         }]
 
         chassis({
-          :serial       => lookup('chinqchint', node_uid, 'chassis', 'serial_number'),
-          :name         => lookup('chinqchint', node_uid, 'chassis', 'product_name'),
-          :manufacturer => lookup('chinqchint', node_uid, 'chassis', 'manufacturer')
+          :serial       => lookup('chinqchint_generated', node_uid, 'chassis', 'serial_number'),
+          :name         => lookup('chinqchint_generated', node_uid, 'chassis', 'product_name'),
+          :manufacturer => lookup('chinqchint_generated', node_uid, 'chassis', 'manufacturer')
         })
 
         bios({
-          :version      => lookup('chinqchint', node_uid, 'bios', 'version'),
-          :vendor       => lookup('chinqchint', node_uid, 'bios', 'vendor'),
-          :release_date => lookup('chinqchint', node_uid, 'bios', 'release_date')
+          :version      => lookup('chinqchint_generated', node_uid, 'bios', 'version'),
+          :vendor       => lookup('chinqchint_generated', node_uid, 'bios', 'vendor'),
+          :release_date => lookup('chinqchint_generated', node_uid, 'bios', 'release_date')
         })
 
         gpu({
diff --git a/generators/input/sites/lille/clusters/chinqchint.yaml b/generators/input/sites/lille/clusters/chinqchint_generated.yaml
similarity index 98%
rename from generators/input/sites/lille/clusters/chinqchint.yaml
rename to generators/input/sites/lille/clusters/chinqchint_generated.yaml
index cd696c1d872..5df5de794df 100644
--- a/generators/input/sites/lille/clusters/chinqchint.yaml
+++ b/generators/input/sites/lille/clusters/chinqchint_generated.yaml
@@ -37,7 +37,6 @@ chinqchint-1:
       driver: e1000e
       mountable: true
       ip: 172.16.34.1
-      switch_port: Gi2/1
     bmc:
       mac: 00:30:48:96:07:e5
       ip: 172.17.34.101
@@ -122,7 +121,6 @@ chinqchint-2:
       driver: e1000e
       mountable: true
       ip: 172.16.34.2
-      switch_port: Gi2/2
     bmc:
       mac: 00:30:48:96:25:67
       ip: 172.17.34.102
@@ -197,7 +195,6 @@ chinqchint-3:
       driver: e1000e
       mountable: true
       ip: 172.16.34.3
-      switch_port: Gi2/3
     bmc:
       mac: 00:30:48:94:4a:7e
       ip: 172.17.34.103
@@ -266,7 +263,6 @@ chinqchint-4:
       driver: e1000e
       mountable: true
       ip: 172.16.34.4
-      switch_port: Gi2/4
     bmc:
       mac: 00:30:48:94:44:21
       ip: 172.17.34.104
@@ -337,7 +333,6 @@ chinqchint-5:
       driver: e1000e
       mountable: true
       ip: 172.16.34.5
-      switch_port: Gi2/5
     bmc:
       mac: 00:30:48:96:25:dd
       ip: 172.17.34.105
@@ -422,7 +417,6 @@ chinqchint-6:
       driver: e1000e
       mountable: true
       ip: 172.16.34.6
-      switch_port: Gi2/6
     bmc:
       mac: 00:30:48:96:25:e0
       ip: 172.17.34.106
@@ -491,7 +485,6 @@ chinqchint-7:
       driver: e1000e
       mountable: true
       ip: 172.16.34.7
-      switch_port: Gi2/7
     bmc:
       mac: 00:30:48:96:07:fa
       ip: 172.17.34.107
@@ -562,7 +555,6 @@ chinqchint-8:
       driver: e1000e
       mountable: true
       ip: 172.16.34.8
-      switch_port: Gi2/8
     bmc:
       mac: 00:30:48:96:07:e4
       ip: 172.17.34.108
@@ -637,7 +629,6 @@ chinqchint-9:
       driver: e1000e
       mountable: true
       ip: 172.16.34.9
-      switch_port: Gi2/9
     bmc:
       mac: 00:30:48:94:1b:e2
       ip: 172.17.34.109
@@ -712,7 +703,6 @@ chinqchint-10:
       driver: e1000e
       mountable: true
       ip: 172.16.34.10
-      switch_port: Gi2/10
     bmc:
       mac: 00:30:48:94:2d:7a
       ip: 172.17.34.110
@@ -797,9 +787,8 @@ chinqchint-11:
       driver: e1000e
       mountable: true
       ip: 172.16.34.11
-      switch_port: Gi2/11
     bmc:
-      mac:
+      mac: 
       ip: 172.17.34.111
   chassis:
     serial_number: X0004758
@@ -872,9 +861,8 @@ chinqchint-12:
       driver: e1000e
       mountable: true
       ip: 172.16.34.12
-      switch_port: Gi2/12
     bmc:
-      mac:
+      mac: 
       ip: 172.17.34.112
   supported_job_types:
     virtual: ivt
@@ -947,7 +935,6 @@ chinqchint-13:
       driver: e1000e
       mountable: true
       ip: 172.16.34.13
-      switch_port: Gi4/26
     bmc:
       mac: 00:30:48:94:36:4c
       ip: 172.17.34.113
@@ -1022,7 +1009,6 @@ chinqchint-14:
       driver: e1000e
       mountable: true
       ip: 172.16.34.14
-      switch_port: Gi4/29
     bmc:
       mac: 00:30:48:94:35:de
       ip: 172.17.34.114
@@ -1097,7 +1083,6 @@ chinqchint-15:
       driver: e1000e
       mountable: true
       ip: 172.16.34.15
-      switch_port: Gi2/15
     bmc:
       mac: 00:30:48:96:25:b9
       ip: 172.17.34.115
@@ -1162,7 +1147,6 @@ chinqchint-16:
       driver: e1000e
       mountable: true
       ip: 172.16.34.16
-      switch_port: Gi2/16
     bmc:
       mac: 00:30:48:96:24:e1
       ip: 172.17.34.116
@@ -1237,7 +1221,6 @@ chinqchint-17:
       driver: e1000e
       mountable: true
       ip: 172.16.34.17
-      switch_port: Gi2/17
     bmc:
       mac: 00:30:48:96:26:5a
       ip: 172.17.34.117
@@ -1312,7 +1295,6 @@ chinqchint-18:
       driver: e1000e
       mountable: true
       ip: 172.16.34.18
-      switch_port: Gi2/18
     bmc:
       mac: 00:30:48:96:25:76
       ip: 172.17.34.118
@@ -1397,7 +1379,6 @@ chinqchint-19:
       driver: e1000e
       mountable: true
       ip: 172.16.34.19
-      switch_port: Gi2/19
     bmc:
       mac: 00:30:48:96:25:de
       ip: 172.17.34.119
@@ -1462,7 +1443,6 @@ chinqchint-20:
       driver: e1000e
       mountable: true
       ip: 172.16.34.20
-      switch_port: Gi2/20
     bmc:
       mac: 00:30:48:96:25:c7
       ip: 172.17.34.120
@@ -1541,7 +1521,6 @@ chinqchint-21:
       driver: e1000e
       mountable: true
       ip: 172.16.34.21
-      switch_port: Gi2/21
     bmc:
       mac: 00:30:48:94:4a:34
       ip: 172.17.34.121
@@ -1612,7 +1591,6 @@ chinqchint-22:
       driver: e1000e
       mountable: true
       ip: 172.16.34.22
-      switch_port: Gi2/22
     bmc:
       mac: 00:30:48:94:4b:02
       ip: 172.17.34.122
@@ -1691,7 +1669,6 @@ chinqchint-23:
       driver: e1000e
       mountable: true
       ip: 172.16.34.23
-      switch_port: Gi2/23
     bmc:
       mac: 00:30:48:94:2c:9c
       ip: 172.17.34.123
@@ -1772,7 +1749,6 @@ chinqchint-24:
       driver: e1000e
       mountable: true
       ip: 172.16.34.24
-      switch_port: Gi2/24
     bmc:
       mac: 00:30:48:94:2d:76
       ip: 172.17.34.124
@@ -1837,7 +1813,6 @@ chinqchint-25:
       driver: e1000e
       mountable: true
       ip: 172.16.34.25
-      switch_port: Gi2/25
     bmc:
       mac: 00:30:48:9b:1a:cf
       ip: 172.17.34.125
@@ -1916,7 +1891,6 @@ chinqchint-26:
       driver: e1000e
       mountable: true
       ip: 172.16.34.26
-      switch_port: Gi2/26
     bmc:
       mac: 00:30:48:96:26:54
       ip: 172.17.34.126
@@ -1987,7 +1961,6 @@ chinqchint-27:
       driver: e1000e
       mountable: true
       ip: 172.16.34.27
-      switch_port: Gi2/27
     bmc:
       mac: 00:30:48:96:25:63
       ip: 172.17.34.127
@@ -2072,7 +2045,6 @@ chinqchint-28:
       driver: e1000e
       mountable: true
       ip: 172.16.34.28
-      switch_port: Gi2/28
     bmc:
       mac: 00:30:48:96:26:b2
       ip: 172.17.34.128
@@ -2137,7 +2109,6 @@ chinqchint-29:
       driver: e1000e
       mountable: true
       ip: 172.16.34.29
-      switch_port: Gi2/29
     bmc:
       mac: 00:30:48:94:37:d3
       ip: 172.17.34.129
@@ -2216,9 +2187,8 @@ chinqchint-30:
       driver: e1000e
       mountable: true
       ip: 172.16.34.30
-      switch_port: Gi2/30
     bmc:
-      mac:
+      mac: 
       ip: 172.17.34.130
   block_devices:
     sda:
@@ -2287,9 +2257,8 @@ chinqchint-31:
       driver: e1000e
       mountable: true
       ip: 172.16.34.31
-      switch_port: Gi2/31
     bmc:
-      mac:
+      mac: 
       ip: 172.17.34.131
   operating_system:
     kernel: 2.6.32-5-amd64
@@ -2366,9 +2335,8 @@ chinqchint-32:
       driver: e1000e
       mountable: true
       ip: 172.16.34.32
-      switch_port: Gi2/32
     bmc:
-      mac:
+      mac: 
       ip: 172.17.34.132
   block_devices:
     sda:
@@ -2437,9 +2405,8 @@ chinqchint-33:
       driver: e1000e
       mountable: true
       ip: 172.16.34.33
-      switch_port: Gi2/33
     bmc:
-      mac:
+      mac: 
       ip: 172.17.34.133
   block_devices:
     sda:
@@ -2522,9 +2489,8 @@ chinqchint-34:
       driver: e1000e
       mountable: true
       ip: 172.16.34.34
-      switch_port: Gi4/30
     bmc:
-      mac:
+      mac: 
       ip: 172.17.34.134
   supported_job_types:
     virtual: ivt
@@ -2587,9 +2553,8 @@ chinqchint-35:
       driver: e1000e
       mountable: true
       ip: 172.16.34.35
-      switch_port: Gi4/31
     bmc:
-      mac:
+      mac: 
       ip: 172.17.34.135
   block_devices:
     sda:
@@ -2662,9 +2627,8 @@ chinqchint-36:
       driver: e1000e
       mountable: true
       ip: 172.16.34.36
-      switch_port: Gi4/28
     bmc:
-      mac:
+      mac: 
       ip: 172.17.34.136
   block_devices:
     sda:
@@ -2741,9 +2705,8 @@ chinqchint-37:
       driver: e1000e
       mountable: true
       ip: 172.16.34.37
-      switch_port: Gi2/37
     bmc:
-      mac:
+      mac: 
       ip: 172.17.34.137
   block_devices:
     sda:
@@ -2812,7 +2775,6 @@ chinqchint-38:
       driver: e1000e
       mountable: true
       ip: 172.16.34.38
-      switch_port: Gi2/38
     bmc:
       mac: 00:30:48:94:1c:9a
       ip: 172.17.34.138
@@ -2887,7 +2849,6 @@ chinqchint-39:
       driver: e1000e
       mountable: true
       ip: 172.16.34.39
-      switch_port: Gi2/39
     bmc:
       mac: 00:30:48:94:2f:6e
       ip: 172.17.34.139
@@ -2966,7 +2927,6 @@ chinqchint-40:
       driver: e1000e
       mountable: true
       ip: 172.16.34.40
-      switch_port: Gi2/40
     bmc:
       mac: 00:30:48:94:4b:4c
       ip: 172.17.34.140
@@ -3047,7 +3007,6 @@ chinqchint-41:
       driver: e1000e
       mountable: true
       ip: 172.16.34.41
-      switch_port: Gi3/1
     bmc:
       mac: 00:30:48:96:07:ef
       ip: 172.17.34.141
@@ -3122,7 +3081,6 @@ chinqchint-42:
       driver: e1000e
       mountable: true
       ip: 172.16.34.42
-      switch_port: Gi3/2
     bmc:
       mac: 00:30:48:96:07:f1
       ip: 172.17.34.142
@@ -3201,7 +3159,6 @@ chinqchint-43:
       driver: e1000e
       mountable: true
       ip: 172.16.34.43
-      switch_port: Gi3/3
     bmc:
       mac: 00:30:48:96:25:e1
       ip: 172.17.34.143
@@ -3266,7 +3223,6 @@ chinqchint-44:
       driver: e1000e
       mountable: true
       ip: 172.16.34.44
-      switch_port: Gi3/4
     bmc:
       mac: 00:30:48:96:25:d1
       ip: 172.17.34.144
@@ -3341,7 +3297,6 @@ chinqchint-45:
       driver: e1000e
       mountable: true
       ip: 172.16.34.45
-      switch_port: Gi3/5
     bmc:
       mac: 00:30:48:96:25:65
       ip: 172.17.34.145
@@ -3416,7 +3371,6 @@ chinqchint-46:
       driver: e1000e
       mountable: true
       ip: 172.16.34.46
-      switch_port: Gi3/41
     bmc:
       mac: 00:30:48:96:08:02
       ip: 172.17.34.146
diff --git a/generators/input/sites/lille/clusters/chinqchint_manual.yaml b/generators/input/sites/lille/clusters/chinqchint_manual.yaml
new file mode 100644
index 00000000000..eb4e6a712d3
--- /dev/null
+++ b/generators/input/sites/lille/clusters/chinqchint_manual.yaml
@@ -0,0 +1,185 @@
+---
+chinqchint-1:
+  network_interfaces:
+    eth1:
+      switch_port: Gi2/1
+chinqchint-2:
+  network_interfaces:
+    eth1:
+      switch_port: Gi2/2
+chinqchint-3:
+  network_interfaces:
+    eth1:
+      switch_port: Gi2/3
+chinqchint-4:
+  network_interfaces:
+    eth1:
+      switch_port: Gi2/4
+chinqchint-5:
+  network_interfaces:
+    eth1:
+      switch_port: Gi2/5
+chinqchint-6:
+  network_interfaces:
+    eth1:
+      switch_port: Gi2/6
+chinqchint-7:
+  network_interfaces:
+    eth1:
+      switch_port: Gi2/7
+chinqchint-8:
+  network_interfaces:
+    eth1:
+      switch_port: Gi2/8
+chinqchint-9:
+  network_interfaces:
+    eth1:
+      switch_port: Gi2/9
+chinqchint-10:
+  network_interfaces:
+    eth1:
+      switch_port: Gi2/10
+chinqchint-11:
+  network_interfaces:
+    eth1:
+      switch_port: Gi2/11
+chinqchint-12:
+  network_interfaces:
+    eth1:
+      switch_port: Gi2/12
+chinqchint-13:
+  network_interfaces:
+    eth1:
+      switch_port: Gi4/26
+chinqchint-14:
+  network_interfaces:
+    eth1:
+      switch_port: Gi4/29
+chinqchint-15:
+  network_interfaces:
+    eth1:
+      switch_port: Gi2/15
+chinqchint-16:
+  network_interfaces:
+    eth1:
+      switch_port: Gi2/16
+chinqchint-17:
+  network_interfaces:
+    eth1:
+      switch_port: Gi2/17
+chinqchint-18:
+  network_interfaces:
+    eth1:
+      switch_port: Gi2/18
+chinqchint-19:
+  network_interfaces:
+    eth1:
+      switch_port: Gi2/19
+chinqchint-20:
+  network_interfaces:
+    eth1:
+      switch_port: Gi2/20
+chinqchint-21:
+  network_interfaces:
+    eth1:
+      switch_port: Gi2/21
+chinqchint-22:
+  network_interfaces:
+    eth1:
+      switch_port: Gi2/22
+chinqchint-23:
+  network_interfaces:
+    eth1:
+      switch_port: Gi2/23
+chinqchint-24:
+  network_interfaces:
+    eth1:
+      switch_port: Gi2/24
+chinqchint-25:
+  network_interfaces:
+    eth1:
+      switch_port: Gi2/25
+chinqchint-26:
+  network_interfaces:
+    eth1:
+      switch_port: Gi2/26
+chinqchint-27:
+  network_interfaces:
+    eth1:
+      switch_port: Gi2/27
+chinqchint-28:
+  network_interfaces:
+    eth1:
+      switch_port: Gi2/28
+chinqchint-29:
+  network_interfaces:
+    eth1:
+      switch_port: Gi2/29
+chinqchint-30:
+  network_interfaces:
+    eth1:
+      switch_port: Gi2/30
+chinqchint-31:
+  network_interfaces:
+    eth1:
+      switch_port: Gi2/31
+chinqchint-32:
+  network_interfaces:
+    eth1:
+      switch_port: Gi2/32
+chinqchint-33:
+  network_interfaces:
+    eth1:
+      switch_port: Gi2/33
+chinqchint-34:
+  network_interfaces:
+    eth1:
+      switch_port: Gi4/30
+chinqchint-35:
+  network_interfaces:
+    eth1:
+      switch_port: Gi4/31
+chinqchint-36:
+  network_interfaces:
+    eth1:
+      switch_port: Gi4/28
+chinqchint-37:
+  network_interfaces:
+    eth1:
+      switch_port: Gi2/37
+chinqchint-38:
+  network_interfaces:
+    eth1:
+      switch_port: Gi2/38
+chinqchint-39:
+  network_interfaces:
+    eth1:
+      switch_port: Gi2/39
+chinqchint-40:
+  network_interfaces:
+    eth1:
+      switch_port: Gi2/40
+chinqchint-41:
+  network_interfaces:
+    eth1:
+      switch_port: Gi3/1
+chinqchint-42:
+  network_interfaces:
+    eth1:
+      switch_port: Gi3/2
+chinqchint-43:
+  network_interfaces:
+    eth1:
+      switch_port: Gi3/3
+chinqchint-44:
+  network_interfaces:
+    eth1:
+      switch_port: Gi3/4
+chinqchint-45:
+  network_interfaces:
+    eth1:
+      switch_port: Gi3/5
+chinqchint-46:
+  network_interfaces:
+    eth1:
+      switch_port: Gi3/41
diff --git a/generators/input/sites/lille/clusters/chirloute.rb b/generators/input/sites/lille/clusters/chirloute.rb
index 54b8863dc6a..e0f39d8dfad 100644
--- a/generators/input/sites/lille/clusters/chirloute.rb
+++ b/generators/input/sites/lille/clusters/chirloute.rb
@@ -7,7 +7,7 @@ site :lille do |site_uid|
 
     8.times do |i|
       node "#{cluster_uid}-#{i+1}" do |node_uid|
-       
+
         performance({
         :core_flops => 7593000000,
         :node_flops => 58460000000
@@ -22,94 +22,94 @@ site :lille do |site_uid|
         supported_job_types({
           :deploy       => true,
           :besteffort   => true,
-          :virtual      => lookup('chirloute', node_uid, 'supported_job_types', 'virtual')
+          :virtual      => lookup('chirloute_generated', node_uid, 'supported_job_types', 'virtual')
         })
 
         architecture({
-          :smp_size       => lookup('chirloute', node_uid, 'architecture', 'smp_size'),
-          :smt_size       => lookup('chirloute', node_uid, 'architecture', 'smt_size'),
-          :platform_type  => lookup('chirloute', node_uid, 'architecture', 'platform_type')
+          :smp_size       => lookup('chirloute_generated', node_uid, 'architecture', 'smp_size'),
+          :smt_size       => lookup('chirloute_generated', node_uid, 'architecture', 'smt_size'),
+          :platform_type  => lookup('chirloute_generated', node_uid, 'architecture', 'platform_type')
         })
 
         processor({
-          :vendor             => lookup('chirloute', node_uid, 'processor', 'vendor'),
-          :model              => lookup('chirloute', node_uid, 'processor', 'model'),
-          :version            => lookup('chirloute', node_uid, 'processor', 'version'),
-          :clock_speed        => lookup('chirloute', node_uid, 'processor', 'clock_speed'),
-          :instruction_set    => lookup('chirloute', node_uid, 'processor', 'instruction_set'),
-          :other_description  => lookup('chirloute', node_uid, 'processor', 'other_description'),
-          :cache_l1           => lookup('chirloute', node_uid, 'processor', 'cache_l1'),
-          :cache_l1i          => lookup('chirloute', node_uid, 'processor', 'cache_l1i'),
-          :cache_l1d          => lookup('chirloute', node_uid, 'processor', 'cache_l1d'),
-          :cache_l2           => lookup('chirloute', node_uid, 'processor', 'cache_l2'),
-          :cache_l3           => lookup('chirloute', node_uid, 'processor', 'cache_l3')
+          :vendor             => lookup('chirloute_generated', node_uid, 'processor', 'vendor'),
+          :model              => lookup('chirloute_generated', node_uid, 'processor', 'model'),
+          :version            => lookup('chirloute_generated', node_uid, 'processor', 'version'),
+          :clock_speed        => lookup('chirloute_generated', node_uid, 'processor', 'clock_speed'),
+          :instruction_set    => lookup('chirloute_generated', node_uid, 'processor', 'instruction_set'),
+          :other_description  => lookup('chirloute_generated', node_uid, 'processor', 'other_description'),
+          :cache_l1           => lookup('chirloute_generated', node_uid, 'processor', 'cache_l1'),
+          :cache_l1i          => lookup('chirloute_generated', node_uid, 'processor', 'cache_l1i'),
+          :cache_l1d          => lookup('chirloute_generated', node_uid, 'processor', 'cache_l1d'),
+          :cache_l2           => lookup('chirloute_generated', node_uid, 'processor', 'cache_l2'),
+          :cache_l3           => lookup('chirloute_generated', node_uid, 'processor', 'cache_l3')
         })
 
         main_memory({
-          :ram_size     => lookup('chirloute', node_uid, 'main_memory', 'ram_size'),
+          :ram_size     => lookup('chirloute_generated', node_uid, 'main_memory', 'ram_size'),
           :virtual_size => nil
         })
 
         operating_system({
-          :name     => lookup('chirloute', node_uid, 'operating_system', 'name'),
+          :name     => lookup('chirloute_generated', node_uid, 'operating_system', 'name'),
           :release  => "Squeeze",
-          :version  => lookup('chirloute', node_uid, 'operating_system', 'version'),
-          :kernel   => lookup('chirloute', node_uid, 'operating_system', 'kernel')
+          :version  => lookup('chirloute_generated', node_uid, 'operating_system', 'version'),
+          :kernel   => lookup('chirloute_generated', node_uid, 'operating_system', 'kernel')
         })
 
         storage_devices [{
           :interface  => 'SATA',
-          :size       => lookup('chirloute', node_uid, 'block_devices', 'sda', 'size'),
+          :size       => lookup('chirloute_generated', node_uid, 'block_devices', 'sda', 'size'),
           :driver     => "mptsas",
-          :device     => lookup('chirloute', node_uid, 'block_devices', 'sda', 'device'),
-          :model      => lookup('chirloute', node_uid, 'block_devices', 'sda', 'model'),
-          :vendor     => lookup('chirloute', node_uid, 'block_devices', 'sda', 'vendor'),
-          :rev        => lookup('chirloute', node_uid, 'block_devices', 'sda', 'rev'),
+          :device     => lookup('chirloute_generated', node_uid, 'block_devices', 'sda', 'device'),
+          :model      => lookup('chirloute_generated', node_uid, 'block_devices', 'sda', 'model'),
+          :vendor     => lookup('chirloute_generated', node_uid, 'block_devices', 'sda', 'vendor'),
+          :rev        => lookup('chirloute_generated', node_uid, 'block_devices', 'sda', 'rev'),
           :raid       => "0"
         }]
 
         network_adapters [{
-          :interface        => lookup('chirloute', node_uid, 'network_interfaces', 'eth0', 'interface'),
+          :interface        => lookup('chirloute_generated', node_uid, 'network_interfaces', 'eth0', 'interface'),
           :rate             => 1.G,
-          :enabled          => lookup('chirloute', node_uid, 'network_interfaces', 'eth0', 'enabled'),
-          :management       => lookup('chirloute', node_uid, 'network_interfaces', 'eth0', 'management'),
-          :mountable        => lookup('chirloute', node_uid, 'network_interfaces', 'eth0', 'mountable'),
-          :mounted          => lookup('chirloute', node_uid, 'network_interfaces', 'eth0', 'mounted'),
+          :enabled          => lookup('chirloute_generated', node_uid, 'network_interfaces', 'eth0', 'enabled'),
+          :management       => lookup('chirloute_generated', node_uid, 'network_interfaces', 'eth0', 'management'),
+          :mountable        => lookup('chirloute_generated', node_uid, 'network_interfaces', 'eth0', 'mountable'),
+          :mounted          => lookup('chirloute_generated', node_uid, 'network_interfaces', 'eth0', 'mounted'),
           :vendor           => 'Intel',
           :version          => '82576EB',
           :bridged          => false,
           :device           => "eth0",
           :network_address  => "#{node_uid}-eth0.#{site_uid}.grid5000.fr",
           :switch           => 'gw-lille',
-          :driver           => lookup('chirloute', node_uid, 'network_interfaces', 'eth0', 'driver'),
-          :ip               => lookup('chirloute', node_uid, 'network_interfaces', 'eth0', 'ip'),
-          :mac              => lookup('chirloute', node_uid, 'network_interfaces', 'eth0', 'mac')
+          :driver           => lookup('chirloute_generated', node_uid, 'network_interfaces', 'eth0', 'driver'),
+          :ip               => lookup('chirloute_generated', node_uid, 'network_interfaces', 'eth0', 'ip'),
+          :mac              => lookup('chirloute_generated', node_uid, 'network_interfaces', 'eth0', 'mac')
         },
         {
-          :interface        => lookup('chirloute', node_uid, 'network_interfaces', 'eth1', 'interface'),
-          :rate             => lookup('chirloute', node_uid, 'network_interfaces', 'eth1', 'rate'),
-          :enabled          => lookup('chirloute', node_uid, 'network_interfaces', 'eth1', 'enabled'),
-          :management       => lookup('chirloute', node_uid, 'network_interfaces', 'eth1', 'management'),
-          :mountable        => lookup('chirloute', node_uid, 'network_interfaces', 'eth1', 'mountable'),
-          :mounted          => lookup('chirloute', node_uid, 'network_interfaces', 'eth1', 'mounted'),
+          :interface        => lookup('chirloute_generated', node_uid, 'network_interfaces', 'eth1', 'interface'),
+          :rate             => lookup('chirloute_generated', node_uid, 'network_interfaces', 'eth1', 'rate'),
+          :enabled          => lookup('chirloute_generated', node_uid, 'network_interfaces', 'eth1', 'enabled'),
+          :management       => lookup('chirloute_generated', node_uid, 'network_interfaces', 'eth1', 'management'),
+          :mountable        => lookup('chirloute_generated', node_uid, 'network_interfaces', 'eth1', 'mountable'),
+          :mounted          => lookup('chirloute_generated', node_uid, 'network_interfaces', 'eth1', 'mounted'),
           :bridged          => true,
           :device           => "eth1",
           :vendor           => 'Intel',
           :version          => '82576EB',
-          :driver           => lookup('chirloute', node_uid, 'network_interfaces', 'eth1', 'driver'),
+          :driver           => lookup('chirloute_generated', node_uid, 'network_interfaces', 'eth1', 'driver'),
           :network_address  => "#{node_uid}.#{site_uid}.grid5000.fr",
-          :ip               => lookup('chirloute', node_uid, 'network_interfaces', 'eth1', 'ip'),
-          :ip6              => lookup('chirloute', node_uid, 'network_interfaces', 'eth1', 'ip6'),
+          :ip               => lookup('chirloute_generated', node_uid, 'network_interfaces', 'eth1', 'ip'),
+          :ip6              => lookup('chirloute_generated', node_uid, 'network_interfaces', 'eth1', 'ip6'),
           :switch           => 'gw-lille',
-          :switch_port      => lookup('chirloute', node_uid, 'network_interfaces', 'eth1', 'switch_port'),
-          :mac              => lookup('chirloute', node_uid, 'network_interfaces', 'eth1', 'mac')
+          :switch_port      => lookup('chirloute_manual', node_uid, 'network_interfaces', 'eth1', 'switch_port'),
+          :mac              => lookup('chirloute_generated', node_uid, 'network_interfaces', 'eth1', 'mac')
         },
         {
           :interface            => 'Ethernet',
           :rate                 => 1.G,
           :network_address      => "#{node_uid}-ipmi.#{site_uid}.grid5000.fr",
-          :ip                   => lookup('chirloute', node_uid, 'network_interfaces', 'bmc', 'ip'),
-          :mac                  => lookup('chirloute', node_uid, 'network_interfaces', 'bmc', 'mac'),
+          :ip                   => lookup('chirloute_generated', node_uid, 'network_interfaces', 'bmc', 'ip'),
+          :mac                  => lookup('chirloute_generated', node_uid, 'network_interfaces', 'bmc', 'mac'),
           :vendor               => 'Inventec',
           :enabled              => true,
           :mounted              => false,
@@ -123,21 +123,21 @@ site :lille do |site_uid|
         }]
 
         chassis({
-          :serial       => lookup('chirloute', node_uid, 'chassis', 'serial_number'),
-          :name         => lookup('chirloute', node_uid, 'chassis', 'product_name'),
-          :manufacturer => lookup('chirloute', node_uid, 'chassis', 'manufacturer')
+          :serial       => lookup('chirloute_generated', node_uid, 'chassis', 'serial_number'),
+          :name         => lookup('chirloute_generated', node_uid, 'chassis', 'product_name'),
+          :manufacturer => lookup('chirloute_generated', node_uid, 'chassis', 'manufacturer')
         })
 
         bios({
-          :version      => lookup('chirloute', node_uid, 'bios', 'version'),
-          :vendor       => lookup('chirloute', node_uid, 'bios', 'vendor'),
-          :release_date => lookup('chirloute', node_uid, 'bios', 'release_date')
+          :version      => lookup('chirloute_generated', node_uid, 'bios', 'version'),
+          :vendor       => lookup('chirloute_generated', node_uid, 'bios', 'vendor'),
+          :release_date => lookup('chirloute_generated', node_uid, 'bios', 'release_date')
         })
 
         gpu({
           :gpu        => true,
-          :gpu_count  => lookup('chirloute', node_uid, 'gpu', 'gpu_count'),
-          :gpu_model => lookup('chirloute', node_uid, 'gpu', 'gpu_model'),
+          :gpu_count  => lookup('chirloute_manual', node_uid, 'gpu', 'gpu_count'),
+          :gpu_model => lookup('chirloute_manual', node_uid, 'gpu', 'gpu_model'),
         })
 
         monitoring({
diff --git a/generators/input/sites/lille/clusters/chirloute.yaml b/generators/input/sites/lille/clusters/chirloute_generated.yaml
similarity index 94%
rename from generators/input/sites/lille/clusters/chirloute.yaml
rename to generators/input/sites/lille/clusters/chirloute_generated.yaml
index b90a3fbd733..889a6e46dd5 100644
--- a/generators/input/sites/lille/clusters/chirloute.yaml
+++ b/generators/input/sites/lille/clusters/chirloute_generated.yaml
@@ -26,7 +26,6 @@ chirloute-1:
       driver: igb
       mountable: true
       ip: 172.16.35.1
-      switch_port: Gi4/25
     bmc:
       mac: 00:26:6c:f9:18:e6
       ip: 172.17.35.101
@@ -64,9 +63,6 @@ chirloute-1:
     smp_size: 2
     platform_type: x86_64
     smt_size: 8
-  gpu:
-    gpu_count: 4
-    gpu_model: Tesla-S2050
 chirloute-2:
   bios:
     version: 1.66
@@ -105,7 +101,6 @@ chirloute-2:
       driver: igb
       mountable: true
       ip: 172.16.35.2
-      switch_port: Gi3/25
     bmc:
       mac: 00:26:6c:f9:17:ea
       ip: 172.17.35.102
@@ -132,9 +127,6 @@ chirloute-2:
     smp_size: 2
     platform_type: x86_64
     smt_size: 8
-  gpu:
-    gpu_count: 4
-    gpu_model: Tesla-S2050
 chirloute-3:
   bios:
     version: 1.66
@@ -173,7 +165,6 @@ chirloute-3:
       driver: igb
       mountable: true
       ip: 172.16.35.3
-      switch_port: Gi4/44
     bmc:
       mac: 00:26:6c:f9:15:72
       ip: 172.17.35.103
@@ -200,9 +191,6 @@ chirloute-3:
     smp_size: 2
     platform_type: x86_64
     smt_size: 8
-  gpu:
-    gpu_count: 4
-    gpu_model: Tesla-S2050
 chirloute-4:
   bios:
     version: 1.66
@@ -241,7 +229,6 @@ chirloute-4:
       driver: igb
       mountable: true
       ip: 172.16.35.4
-      switch_port: Gi3/26
     bmc:
       mac: 00:26:6c:f9:19:62
       ip: 172.17.35.104
@@ -268,9 +255,6 @@ chirloute-4:
     smp_size: 2
     platform_type: x86_64
     smt_size: 8
-  gpu:
-    gpu_count: 4
-    gpu_model: Tesla-S2050
 chirloute-5:
   bios:
     version: 1.66
@@ -309,7 +293,6 @@ chirloute-5:
       driver: igb
       mountable: true
       ip: 172.16.35.5
-      switch_port: Gi4/23
     bmc:
       mac: 00:26:6c:f9:16:0a
       ip: 172.17.35.105
@@ -336,9 +319,6 @@ chirloute-5:
     smp_size: 2
     platform_type: x86_64
     smt_size: 8
-  gpu:
-    gpu_count: 4
-    gpu_model: Tesla-S2050
 chirloute-6:
   bios:
     version: 1.66
@@ -377,7 +357,6 @@ chirloute-6:
       driver: igb
       mountable: true
       ip: 172.16.35.6
-      switch_port: Gi3/31
     bmc:
       mac: 00:26:6c:f9:17:22
       ip: 172.17.35.106
@@ -404,9 +383,6 @@ chirloute-6:
     smp_size: 2
     platform_type: x86_64
     smt_size: 8
-  gpu:
-    gpu_count: 4
-    gpu_model: Tesla-S2050
 chirloute-7:
   bios:
     version: 1.66
@@ -434,7 +410,6 @@ chirloute-7:
       driver: igb
       mountable: true
       ip: 172.16.35.7
-      switch_port: Gi2/41
     bmc:
       mac: 00:26:6c:f9:17:b9
       ip: 172.17.35.107
@@ -472,9 +447,6 @@ chirloute-7:
     smp_size: 2
     platform_type: x86_64
     smt_size: 8
-  gpu:
-    gpu_count: 4
-    gpu_model: Tesla-S2050
 chirloute-8:
   bios:
     version: 1.66
@@ -513,7 +485,6 @@ chirloute-8:
       driver: igb
       mountable: true
       ip: 172.16.35.8
-      switch_port: Gi3/32
     bmc:
       mac: 00:26:6c:f9:19:82
       ip: 172.17.35.108
@@ -540,6 +511,3 @@ chirloute-8:
     smp_size: 2
     platform_type: x86_64
     smt_size: 8
-  gpu:
-    gpu_count: 4
-    gpu_model: Tesla-S2050
diff --git a/generators/input/sites/lille/clusters/chirloute_manual.yaml b/generators/input/sites/lille/clusters/chirloute_manual.yaml
new file mode 100644
index 00000000000..88561d41594
--- /dev/null
+++ b/generators/input/sites/lille/clusters/chirloute_manual.yaml
@@ -0,0 +1,57 @@
+---
+chirloute-1:
+  network_interfaces:
+    eth1:
+      switch_port: Gi4/25
+  gpu:
+    gpu_count: 4
+    gpu_model: Tesla-S2050
+chirloute-2:
+  network_interfaces:
+    eth1:
+      switch_port: Gi3/25
+  gpu:
+    gpu_count: 4
+    gpu_model: Tesla-S2050
+chirloute-3:
+  network_interfaces:
+    eth1:
+      switch_port: Gi4/44
+  gpu:
+    gpu_count: 4
+    gpu_model: Tesla-S2050
+chirloute-4:
+  network_interfaces:
+    eth1:
+      switch_port: Gi3/26
+  gpu:
+    gpu_count: 4
+    gpu_model: Tesla-S2050
+chirloute-5:
+  network_interfaces:
+    eth1:
+      switch_port: Gi4/23
+  gpu:
+    gpu_count: 4
+    gpu_model: Tesla-S2050
+chirloute-6:
+  network_interfaces:
+    eth1:
+      switch_port: Gi3/31
+  gpu:
+    gpu_count: 4
+    gpu_model: Tesla-S2050
+chirloute-7:
+  network_interfaces:
+    eth1:
+      switch_port: Gi2/41
+  gpu:
+    gpu_count: 4
+    gpu_model: Tesla-S2050
+chirloute-8:
+  network_interfaces:
+    eth1:
+      switch_port: Gi3/32
+  gpu:
+    gpu_count: 4
+    gpu_model: Tesla-S2050
diff --git a/generators/input/sites/luxembourg/clusters/granduc.rb b/generators/input/sites/luxembourg/clusters/granduc.rb
index 43fc1d93933..ac4b9a9febe 100644
--- a/generators/input/sites/luxembourg/clusters/granduc.rb
+++ b/generators/input/sites/luxembourg/clusters/granduc.rb
@@ -16,108 +16,108 @@ site :luxembourg do |site_uid|
         supported_job_types({
           :deploy       => true,
           :besteffort   => true,
-          :virtual      => lookup('granduc', node_uid, 'supported_job_types', 'virtual')
+          :virtual      => lookup('granduc_generated', node_uid, 'supported_job_types', 'virtual')
         })
 
         architecture({
-          :smp_size       => lookup('granduc', node_uid, 'architecture', 'smp_size'),
-          :smt_size       => lookup('granduc', node_uid, 'architecture', 'smt_size'),
-          :platform_type  => lookup('granduc', node_uid, 'architecture', 'platform_type')
+          :smp_size       => lookup('granduc_generated', node_uid, 'architecture', 'smp_size'),
+          :smt_size       => lookup('granduc_generated', node_uid, 'architecture', 'smt_size'),
+          :platform_type  => lookup('granduc_generated', node_uid, 'architecture', 'platform_type')
         })
 
         processor({
-          :vendor             => lookup('granduc', node_uid, 'processor', 'vendor'),
-          :model              => lookup('granduc', node_uid, 'processor', 'model'),
-          :version            => lookup('granduc', node_uid, 'processor', 'version'),
-          :clock_speed        => lookup('granduc', node_uid, 'processor', 'clock_speed'),
-          :instruction_set    => lookup('granduc', node_uid, 'processor', 'instruction_set'),
-          :other_description  => lookup('granduc', node_uid, 'processor', 'other_description'),
-          :cache_l1           => lookup('granduc', node_uid, 'processor', 'cache_l1'),
-          :cache_l1i          => lookup('granduc', node_uid, 'processor', 'cache_l1i'),
-          :cache_l1d          => lookup('granduc', node_uid, 'processor', 'cache_l1d'),
-          :cache_l2           => lookup('granduc', node_uid, 'processor', 'cache_l2'),
-          :cache_l3           => lookup('granduc', node_uid, 'processor', 'cache_l3')
+          :vendor             => lookup('granduc_generated', node_uid, 'processor', 'vendor'),
+          :model              => lookup('granduc_generated', node_uid, 'processor', 'model'),
+          :version            => lookup('granduc_generated', node_uid, 'processor', 'version'),
+          :clock_speed        => lookup('granduc_generated', node_uid, 'processor', 'clock_speed'),
+          :instruction_set    => lookup('granduc_generated', node_uid, 'processor', 'instruction_set'),
+          :other_description  => lookup('granduc_generated', node_uid, 'processor', 'other_description'),
+          :cache_l1           => lookup('granduc_generated', node_uid, 'processor', 'cache_l1'),
+          :cache_l1i          => lookup('granduc_generated', node_uid, 'processor', 'cache_l1i'),
+          :cache_l1d          => lookup('granduc_generated', node_uid, 'processor', 'cache_l1d'),
+          :cache_l2           => lookup('granduc_generated', node_uid, 'processor', 'cache_l2'),
+          :cache_l3           => lookup('granduc_generated', node_uid, 'processor', 'cache_l3')
         })
 
         main_memory({
-          :ram_size     => lookup('granduc', node_uid, 'main_memory', 'ram_size'),
+          :ram_size     => lookup('granduc_generated', node_uid, 'main_memory', 'ram_size'),
           :virtual_size => nil
         })
 
         operating_system({
-          :name     => lookup('granduc', node_uid, 'operating_system', 'name'),
+          :name     => lookup('granduc_generated', node_uid, 'operating_system', 'name'),
           :release  => "Squeeze",
-          :version  => lookup('granduc', node_uid, 'operating_system', 'version'),
-          :kernel   => lookup('granduc', node_uid, 'operating_system', 'kernel')
+          :version  => lookup('granduc_generated', node_uid, 'operating_system', 'version'),
+          :kernel   => lookup('granduc_generated', node_uid, 'operating_system', 'kernel')
         })
 
         storage_devices [{
           :interface  => 'SAS',
-          :size       => lookup('granduc', node_uid, 'block_devices', 'sda', 'size'),
+          :size       => lookup('granduc_generated', node_uid, 'block_devices', 'sda', 'size'),
           :driver     => "mptsas",
-          :device     => lookup('granduc', node_uid, 'block_devices', 'sda', 'device'),
-          :model      => lookup('granduc', node_uid, 'block_devices', 'sda', 'model'),
-          :vendor     => lookup('granduc', node_uid, 'block_devices', 'sda', 'vendor'),
-          :rev        => lookup('granduc', node_uid, 'block_devices', 'sda', 'rev')
+          :device     => lookup('granduc_generated', node_uid, 'block_devices', 'sda', 'device'),
+          :model      => lookup('granduc_generated', node_uid, 'block_devices', 'sda', 'model'),
+          :vendor     => lookup('granduc_generated', node_uid, 'block_devices', 'sda', 'vendor'),
+          :rev        => lookup('granduc_generated', node_uid, 'block_devices', 'sda', 'rev')
         }]
 
         network_adapters [{
-          :interface        => lookup('granduc', node_uid, 'network_interfaces', 'eth0', 'interface'),
-          :rate             => lookup('granduc', node_uid, 'network_interfaces', 'eth0', 'rate'),
-          :enabled          => lookup('granduc', node_uid, 'network_interfaces', 'eth0', 'enabled'),
-          :management       => lookup('granduc', node_uid, 'network_interfaces', 'eth0', 'management'),
-          :mountable        => lookup('granduc', node_uid, 'network_interfaces', 'eth0', 'mountable'),
-          :mounted          => lookup('granduc', node_uid, 'network_interfaces', 'eth0', 'mounted'),
+          :interface        => lookup('granduc_generated', node_uid, 'network_interfaces', 'eth0', 'interface'),
+          :rate             => lookup('granduc_generated', node_uid, 'network_interfaces', 'eth0', 'rate'),
+          :enabled          => lookup('granduc_generated', node_uid, 'network_interfaces', 'eth0', 'enabled'),
+          :management       => lookup('granduc_generated', node_uid, 'network_interfaces', 'eth0', 'management'),
+          :mountable        => lookup('granduc_generated', node_uid, 'network_interfaces', 'eth0', 'mountable'),
+          :mounted          => lookup('granduc_generated', node_uid, 'network_interfaces', 'eth0', 'mounted'),
           :bridged 	    => true,
           :device           => "eth0",
-          :driver           => lookup('granduc', node_uid, 'network_interfaces', 'eth0', 'driver'),
+          :driver           => lookup('granduc_generated', node_uid, 'network_interfaces', 'eth0', 'driver'),
           :network_address  => "#{node_uid}.#{site_uid}.grid5000.fr",
-          :ip               => lookup('granduc', node_uid, 'network_interfaces', 'eth0', 'ip'),
-          :ip6              => lookup('granduc', node_uid, 'network_interfaces', 'eth0', 'ip6'),
+          :ip               => lookup('granduc_generated', node_uid, 'network_interfaces', 'eth0', 'ip'),
+          :ip6              => lookup('granduc_generated', node_uid, 'network_interfaces', 'eth0', 'ip6'),
           :switch           => "gw-luxembourg",
-          :switch_port      => lookup('granduc', node_uid, 'network_interfaces', 'eth0', 'switch_port'),
-          :mac              => lookup('granduc', node_uid, 'network_interfaces', 'eth0', 'mac')
+          :switch_port      => lookup('granduc_manual', node_uid, 'network_interfaces', 'eth0', 'switch_port'),
+          :mac              => lookup('granduc_generated', node_uid, 'network_interfaces', 'eth0', 'mac')
         },
         {
-          :interface        => lookup('granduc', node_uid, 'network_interfaces', 'eth1', 'interface'),
+          :interface        => lookup('granduc_generated', node_uid, 'network_interfaces', 'eth1', 'interface'),
           :rate             => 1.G,
-          :enabled          => lookup('granduc', node_uid, 'network_interfaces', 'eth1', 'enabled'),
-          :management       => lookup('granduc', node_uid, 'network_interfaces', 'eth1', 'management'),
-          :mountable        => lookup('granduc', node_uid, 'network_interfaces', 'eth1', 'mountable'),
-          :mounted          => lookup('granduc', node_uid, 'network_interfaces', 'eth1', 'mounted'),
+          :enabled          => lookup('granduc_generated', node_uid, 'network_interfaces', 'eth1', 'enabled'),
+          :management       => lookup('granduc_generated', node_uid, 'network_interfaces', 'eth1', 'management'),
+          :mountable        => lookup('granduc_generated', node_uid, 'network_interfaces', 'eth1', 'mountable'),
+          :mounted          => lookup('granduc_generated', node_uid, 'network_interfaces', 'eth1', 'mounted'),
           :bridged 	    => false,
           :device           => "eth1",
-          :driver           => lookup('granduc', node_uid, 'network_interfaces', 'eth1', 'driver'),
-          :mac              => lookup('granduc', node_uid, 'network_interfaces', 'eth1', 'mac')
+          :driver           => lookup('granduc_generated', node_uid, 'network_interfaces', 'eth1', 'driver'),
+          :mac              => lookup('granduc_generated', node_uid, 'network_interfaces', 'eth1', 'mac')
         },
         {
-          :interface        => lookup('granduc', node_uid, 'network_interfaces', 'eth2', 'interface'),
-          :rate             => lookup('granduc', node_uid, 'network_interfaces', 'eth2', 'rate'),
-          :enabled          => lookup('granduc', node_uid, 'network_interfaces', 'eth2', 'enabled'),
-          :management       => lookup('granduc', node_uid, 'network_interfaces', 'eth2', 'management'),
-          :mountable        => lookup('granduc', node_uid, 'network_interfaces', 'eth2', 'mountable'),
-          :mounted          => lookup('granduc', node_uid, 'network_interfaces', 'eth2', 'mounted'),
+          :interface        => lookup('granduc_generated', node_uid, 'network_interfaces', 'eth2', 'interface'),
+          :rate             => lookup('granduc_generated', node_uid, 'network_interfaces', 'eth2', 'rate'),
+          :enabled          => lookup('granduc_generated', node_uid, 'network_interfaces', 'eth2', 'enabled'),
+          :management       => lookup('granduc_generated', node_uid, 'network_interfaces', 'eth2', 'management'),
+          :mountable        => lookup('granduc_generated', node_uid, 'network_interfaces', 'eth2', 'mountable'),
+          :mounted          => lookup('granduc_generated', node_uid, 'network_interfaces', 'eth2', 'mounted'),
           :bridged 	    => false,
           :device           => "eth2",
-          :driver           => lookup('granduc', node_uid, 'network_interfaces', 'eth2', 'driver'),
+          :driver           => lookup('granduc_generated', node_uid, 'network_interfaces', 'eth2', 'driver'),
           :switch           => "ul-grid5000-sw02",
-          :switch_port      => lookup('granduc', node_uid, 'network_interfaces', 'eth2', 'switch_port'),
+          :switch_port      => lookup('granduc_manual', node_uid, 'network_interfaces', 'eth2', 'switch_port'),
           :network_address  => "#{node_uid}-eth2.#{site_uid}.grid5000.fr",
-          :ip               => lookup('granduc', node_uid, 'network_interfaces', 'eth2', 'ip'),
-          :ip6              => lookup('granduc', node_uid, 'network_interfaces', 'eth2', 'ip6'),
-          :mac              => lookup('granduc', node_uid, 'network_interfaces', 'eth2', 'mac')
+          :ip               => lookup('granduc_generated', node_uid, 'network_interfaces', 'eth2', 'ip'),
+          :ip6              => lookup('granduc_generated', node_uid, 'network_interfaces', 'eth2', 'ip6'),
+          :mac              => lookup('granduc_generated', node_uid, 'network_interfaces', 'eth2', 'mac')
         },
         {
-          :interface        => lookup('granduc', node_uid, 'network_interfaces', 'eth3', 'interface'),
+          :interface        => lookup('granduc_generated', node_uid, 'network_interfaces', 'eth3', 'interface'),
           :rate             => 10.G,
-          :enabled          => lookup('granduc', node_uid, 'network_interfaces', 'eth3', 'enabled'),
-          :management       => lookup('granduc', node_uid, 'network_interfaces', 'eth3', 'management'),
-          :mountable        => lookup('granduc', node_uid, 'network_interfaces', 'eth3', 'mountable'),
-          :mounted          => lookup('granduc', node_uid, 'network_interfaces', 'eth3', 'mounted'),
+          :enabled          => lookup('granduc_generated', node_uid, 'network_interfaces', 'eth3', 'enabled'),
+          :management       => lookup('granduc_generated', node_uid, 'network_interfaces', 'eth3', 'management'),
+          :mountable        => lookup('granduc_generated', node_uid, 'network_interfaces', 'eth3', 'mountable'),
+          :mounted          => lookup('granduc_generated', node_uid, 'network_interfaces', 'eth3', 'mounted'),
           :bridged 	    => false,
           :device           => "eth3",
-          :driver           => lookup('granduc', node_uid, 'network_interfaces', 'eth3', 'driver'),
-          :mac              => lookup('granduc', node_uid, 'network_interfaces', 'eth3', 'mac')
+          :driver           => lookup('granduc_generated', node_uid, 'network_interfaces', 'eth3', 'driver'),
+          :mac              => lookup('granduc_generated', node_uid, 'network_interfaces', 'eth3', 'mac')
         },
         {
           :interface        => 'Ethernet',
@@ -128,23 +128,23 @@ site :luxembourg do |site_uid|
           :mounted          => false,
           :device           => "bmc",
           :network_address  => "#{node_uid}-bmc.#{site_uid}.grid5000.fr",
-          :ip               => lookup('granduc', node_uid, 'network_interfaces', 'bmc', 'ip'),
+          :ip               => lookup('granduc_generated', node_uid, 'network_interfaces', 'bmc', 'ip'),
           :switch           => "gw-luxembourg",
-          :switch_port      => lookup('granduc', node_uid, 'network_interfaces', 'eth0', 'switch_port'),
-          :mac              => lookup('granduc', node_uid, 'network_interfaces', 'bmc', 'mac'),
+          :switch_port      => lookup('granduc_manual', node_uid, 'network_interfaces', 'eth0', 'switch_port'),
+          :mac              => lookup('granduc_generated', node_uid, 'network_interfaces', 'bmc', 'mac'),
           :driver           => "bnx2"
         }]
 
         chassis({
-          :serial       => lookup('granduc', node_uid, 'chassis', 'serial_number'),
-          :name         => lookup('granduc', node_uid, 'chassis', 'product_name'),
-          :manufacturer => lookup('granduc', node_uid, 'chassis', 'manufacturer')
+          :serial       => lookup('granduc_generated', node_uid, 'chassis', 'serial_number'),
+          :name         => lookup('granduc_generated', node_uid, 'chassis', 'product_name'),
+          :manufacturer => lookup('granduc_generated', node_uid, 'chassis', 'manufacturer')
         })
 
         bios({
-          :version      => lookup('granduc', node_uid, 'bios', 'version'),
-          :vendor       => lookup('granduc', node_uid, 'bios', 'vendor'),
-          :release_date => lookup('granduc', node_uid, 'bios', 'release_date')
+          :version      => lookup('granduc_generated', node_uid, 'bios', 'version'),
+          :vendor       => lookup('granduc_generated', node_uid, 'bios', 'vendor'),
+          :release_date => lookup('granduc_generated', node_uid, 'bios', 'release_date')
         })
 
         gpu({
diff --git a/generators/input/sites/luxembourg/clusters/granduc.yaml b/generators/input/sites/luxembourg/clusters/granduc_generated.yaml
similarity index 94%
rename from generators/input/sites/luxembourg/clusters/granduc.yaml
rename to generators/input/sites/luxembourg/clusters/granduc_generated.yaml
index f37af553986..b3b571b25b1 100644
--- a/generators/input/sites/luxembourg/clusters/granduc.yaml
+++ b/generators/input/sites/luxembourg/clusters/granduc_generated.yaml
@@ -16,7 +16,6 @@ granduc-1:
       driver: bnx2
       mountable: true
       ip: 172.16.176.1
-      switch_port: Gi2/1
     eth1:
       mounted: false
       mac: 00:19:b9:f0:01:ca
@@ -26,7 +25,6 @@ granduc-1:
       driver: bnx2
       mountable: true
       ip: 172.16.176.101
-      switch_port: Gi1/24
     eth2:
       mounted: true
       rate: 10000000000
@@ -38,7 +36,6 @@ granduc-1:
       ip: 192.168.14.1
       driver: ixgbe
       mountable: true
-      switch_port: Eth1/2
     eth3:
       mounted: false
       mac: 00:1b:21:34:e1:4a
@@ -50,7 +47,6 @@ granduc-1:
     bmc:
       ip: 172.17.176.1
       mac: 00:1c:23:c8:69:c2
-      switch_port: Gi1/1
   block_devices:
     sda:
       model: ST9146802SS
@@ -106,7 +102,6 @@ granduc-2:
       driver: bnx2
       mountable: true
       ip: 172.16.176.2
-      switch_port: Gi2/2
     eth1:
       mounted: false
       mac: 00:19:b9:f0:01:d9
@@ -116,7 +111,6 @@ granduc-2:
       driver: bnx2
       mountable: true
       ip: 172.16.176.102
-      switch_port: Gi1/25
     eth2:
       mounted: true
       rate: 10000000000
@@ -128,7 +122,6 @@ granduc-2:
       ip: 192.168.14.2
       driver: ixgbe
       mountable: true
-      switch_port: Eth1/3
     eth3:
       mounted: false
       mac: 00:1b:21:34:e1:34
@@ -140,7 +133,6 @@ granduc-2:
     bmc:
       ip: 172.17.176.2
       mac: 00:1c:23:c8:69:aa
-      switch_port: Gi1/2
   block_devices:
     sda:
       model: ST9146802SS
@@ -199,7 +191,6 @@ granduc-3:
       driver: bnx2
       mountable: true
       ip: 172.16.176.3
-      switch_port: Gi2/3
     eth1:
       mounted: false
       mac: 00:19:b9:f2:0e:85
@@ -209,7 +200,6 @@ granduc-3:
       driver: bnx2
       mountable: true
       ip: 172.16.176.103
-      switch_port: Gi1/26
     eth2:
       mounted: true
       rate: 10000000000
@@ -221,7 +211,6 @@ granduc-3:
       ip: 192.168.14.3
       driver: ixgbe
       mountable: true
-      switch_port: Eth1/4
     eth3:
       mounted: false
       mac: 00:1b:21:3c:87:ca
@@ -233,7 +222,6 @@ granduc-3:
     bmc:
       ip: 172.17.176.3
       mac: 00:1c:23:d6:c3:0a
-      switch_port: Gi1/3
   chassis:
     serial_number: 3R2593J
     manufacturer: Dell Inc.
@@ -285,7 +273,6 @@ granduc-4:
       driver: bnx2
       mountable: true
       ip: 172.16.176.4
-      switch_port: Gi2/4
     eth1:
       mounted: false
       mac: 00:19:b9:f2:0a:e8
@@ -295,7 +282,6 @@ granduc-4:
       driver: bnx2
       mountable: true
       ip: 172.16.176.104
-      switch_port: Gi1/27
     eth2:
       mounted: true
       rate: 10000000000
@@ -307,7 +293,6 @@ granduc-4:
       ip: 192.168.14.4
       driver: ixgbe
       mountable: true
-      switch_port: Eth1/5
     eth3:
       mounted: false
       mac: 00:1b:21:3d:12:e8
@@ -319,7 +304,6 @@ granduc-4:
     bmc:
       ip: 172.17.176.4
       mac: 00:1c:23:d6:c3:06
-      switch_port: Gi1/4
   supported_job_types:
     virtual: ivt
   chassis:
@@ -360,7 +344,6 @@ granduc-5:
       driver: bnx2
       mountable: true
       ip: 172.16.176.5
-      switch_port: Gi2/5
     eth1:
       mounted: false
       mac: 00:19:b9:f1:f8:0b
@@ -370,7 +353,6 @@ granduc-5:
       driver: bnx2
       mountable: true
       ip: 172.16.176.105
-      switch_port: Gi1/28
     eth2:
       mounted: true
       rate: 10000000000
@@ -382,7 +364,6 @@ granduc-5:
       ip: 192.168.14.5
       driver: ixgbe
       mountable: true
-      switch_port: Eth1/6
     eth3:
       mounted: false
       mac: 00:1b:21:3d:12:d0
@@ -394,7 +375,6 @@ granduc-5:
     bmc:
       ip: 172.17.176.5
       mac: 00:1c:23:d3:42:46
-      switch_port: Gi1/5
   block_devices:
     sda:
       model: ST9146802SS
@@ -457,7 +437,6 @@ granduc-6:
       driver: bnx2
       mountable: true
       ip: 172.16.176.6
-      switch_port: Gi2/6
     eth1:
       mounted: false
       mac: 00:19:b9:f2:0c:82
@@ -467,7 +446,6 @@ granduc-6:
       driver: bnx2
       mountable: true
       ip: 172.16.176.106
-      switch_port: Gi1/29
     eth2:
       mounted: true
       rate: 10000000000
@@ -479,7 +457,6 @@ granduc-6:
       ip: 192.168.14.6
       driver: ixgbe
       mountable: true
-      switch_port: Eth1/7
     eth3:
       mounted: false
       mac: 00:1b:21:3d:13:aa
@@ -491,7 +468,6 @@ granduc-6:
     bmc:
       ip: 172.17.176.6
       mac: 00:1c:23:d6:c3:08
-      switch_port: Gi1/6
   chassis:
     serial_number: BQ2593J
     manufacturer: Dell Inc.
@@ -532,7 +508,6 @@ granduc-7:
       driver: bnx2
       mountable: true
       ip: 172.16.176.7
-      switch_port: Gi2/7
     eth1:
       mounted: false
       mac: 00:19:b9:f2:0e:71
@@ -542,7 +517,6 @@ granduc-7:
       driver: bnx2
       mountable: true
       ip: 172.16.176.107
-      switch_port: Gi1/30
     eth2:
       mounted: true
       rate: 10000000000
@@ -554,7 +528,6 @@ granduc-7:
       ip: 192.168.14.7
       driver: ixgbe
       mountable: true
-      switch_port: Eth1/8
     eth3:
       mounted: false
       mac: 00:1b:21:34:e1:5e
@@ -566,7 +539,6 @@ granduc-7:
     bmc:
       ip: 172.17.176.7
       mac: 00:1c:23:d3:42:2c
-      switch_port: Gi1/7
   block_devices:
     sda:
       model: ST9146802SS
@@ -618,7 +590,6 @@ granduc-8:
       driver: bnx2
       mountable: true
       ip: 172.16.176.8
-      switch_port: Gi2/8
     eth1:
       mounted: false
       mac: 00:19:b9:ee:11:4c
@@ -628,7 +599,6 @@ granduc-8:
       driver: bnx2
       mountable: true
       ip: 172.16.176.108
-      switch_port: Gi1/31
     eth2:
       mounted: true
       rate: 10000000000
@@ -640,7 +610,6 @@ granduc-8:
       ip: 192.168.14.8
       driver: ixgbe
       mountable: true
-      switch_port: Eth1/9
     eth3:
       mounted: false
       mac: 00:1b:21:34:e1:8c
@@ -652,7 +621,6 @@ granduc-8:
     bmc:
       ip: 172.17.176.8
       mac: 00:1c:23:d3:08:7a
-      switch_port: Gi1/8
   block_devices:
     sda:
       model: ST9146802SS
@@ -667,7 +635,7 @@ granduc-8:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: ""
+    serial_number: ''
     manufacturer: Dell Inc.
     product_name: PowerEdge 1950
   processor:
@@ -704,7 +672,6 @@ granduc-9:
       driver: bnx2
       mountable: true
       ip: 172.16.176.9
-      switch_port: Gi2/9
     eth1:
       mounted: false
       mac: 00:19:b9:f1:fc:4b
@@ -714,7 +681,6 @@ granduc-9:
       driver: bnx2
       mountable: true
       ip: 172.16.176.109
-      switch_port: Gi1/32
     eth2:
       mounted: true
       rate: 10000000000
@@ -726,7 +692,6 @@ granduc-9:
       ip: 192.168.14.9
       driver: ixgbe
       mountable: true
-      switch_port: Eth1/10
     eth3:
       mounted: false
       mac: 00:1b:21:3d:14:30
@@ -738,7 +703,6 @@ granduc-9:
     bmc:
       ip: 172.17.176.9
       mac: 00:1c:23:d3:42:88
-      switch_port: Gi1/9
   operating_system:
     kernel: 2.6.32-5-amd64
     name: debian
@@ -794,7 +758,6 @@ granduc-10:
       driver: bnx2
       mountable: true
       ip: 172.16.176.10
-      switch_port: Gi2/10
     eth1:
       mounted: false
       mac: 00:22:19:6d:85:0c
@@ -804,7 +767,6 @@ granduc-10:
       driver: bnx2
       mountable: true
       ip: 172.16.176.110
-      switch_port: Gi1/33
     eth2:
       mounted: true
       rate: 10000000000
@@ -816,7 +778,6 @@ granduc-10:
       ip: 192.168.14.10
       driver: ixgbe
       mountable: true
-      switch_port: Eth1/11
     eth3:
       mounted: false
       mac: 00:1b:21:34:e1:3c
@@ -828,7 +789,6 @@ granduc-10:
     bmc:
       ip: 172.17.176.10
       mac: 00:1c:23:d3:42:56
-      switch_port: Gi1/10
   block_devices:
     sda:
       model: ST9146802SS
@@ -887,7 +847,6 @@ granduc-11:
       driver: bnx2
       mountable: true
       ip: 172.16.176.11
-      switch_port: Gi2/11
     eth1:
       mounted: false
       mac: 00:19:b9:f2:0f:48
@@ -897,7 +856,6 @@ granduc-11:
       driver: bnx2
       mountable: true
       ip: 172.16.176.111
-      switch_port: Gi1/34
     eth2:
       mounted: true
       rate: 10000000000
@@ -909,7 +867,6 @@ granduc-11:
       ip: 192.168.14.11
       driver: ixgbe
       mountable: true
-      switch_port: Eth1/12
     eth3:
       mounted: false
       mac: 00:1b:21:34:e1:26
@@ -921,7 +878,6 @@ granduc-11:
     bmc:
       ip: 172.17.176.11
       mac: 00:1c:23:d3:57:59
-      switch_port: Gi1/11
   supported_job_types:
     virtual: ivt
   chassis:
@@ -962,7 +918,6 @@ granduc-12:
       driver: bnx2
       mountable: true
       ip: 172.16.176.12
-      switch_port: Gi2/12
     eth1:
       mounted: false
       mac: 00:19:b9:f2:0e:12
@@ -972,7 +927,6 @@ granduc-12:
       driver: bnx2
       mountable: true
       ip: 172.16.176.112
-      switch_port: Gi2/24
     eth2:
       mounted: true
       rate: 10000000000
@@ -984,7 +938,6 @@ granduc-12:
       ip: 192.168.14.12
       driver: ixgbe
       mountable: true
-      switch_port: Eth1/13
     eth3:
       mounted: false
       mac: 00:1b:21:34:e1:1d
@@ -996,7 +949,6 @@ granduc-12:
     bmc:
       ip: 172.17.176.12
       mac: 00:1c:23:d3:57:5f
-      switch_port: Gi1/12
   block_devices:
     sda:
       model: ST9146802SS
@@ -1048,7 +1000,6 @@ granduc-13:
       driver: bnx2
       mountable: true
       ip: 172.16.176.13
-      switch_port: Gi2/13
     eth1:
       mounted: false
       mac: 00:19:b9:f2:0e:58
@@ -1058,7 +1009,6 @@ granduc-13:
       driver: bnx2
       mountable: true
       ip: 172.16.176.113
-      switch_port: Gi2/25
     eth2:
       mounted: true
       rate: 10000000000
@@ -1070,7 +1020,6 @@ granduc-13:
       ip: 192.168.14.13
       driver: ixgbe
       mountable: true
-      switch_port: Eth1/14
     eth3:
       mounted: false
       mac: 00:1b:21:3d:13:ae
@@ -1082,7 +1031,6 @@ granduc-13:
     bmc:
       ip: 172.17.176.13
       mac: 00:1c:23:d3:57:75
-      switch_port: Gi1/13
   operating_system:
     kernel: 2.6.32-5-amd64
     name: debian
@@ -1145,7 +1093,6 @@ granduc-14:
       driver: bnx2
       mountable: true
       ip: 172.16.176.14
-      switch_port: Gi2/14
     eth1:
       mounted: false
       mac: 00:19:b9:f2:03:bd
@@ -1155,7 +1102,6 @@ granduc-14:
       driver: bnx2
       mountable: true
       ip: 172.16.176.114
-      switch_port: Gi2/26
     eth2:
       mounted: true
       rate: 10000000000
@@ -1167,7 +1113,6 @@ granduc-14:
       ip: 192.168.14.14
       driver: ixgbe
       mountable: true
-      switch_port: Eth1/15
     eth3:
       mounted: false
       mac: 00:1b:21:3d:11:f6
@@ -1179,7 +1124,6 @@ granduc-14:
     bmc:
       ip: 172.17.176.14
       mac: 00:1c:23:d3:57:3b
-      switch_port: Gi1/14
   supported_job_types:
     virtual: ivt
   chassis:
@@ -1231,7 +1175,6 @@ granduc-15:
       driver: bnx2
       mountable: true
       ip: 172.16.176.15
-      switch_port: Gi2/15
     eth1:
       mounted: false
       mac: 00:19:b9:f2:0e:30
@@ -1241,7 +1184,6 @@ granduc-15:
       driver: bnx2
       mountable: true
       ip: 172.16.176.115
-      switch_port: Gi2/27
     eth2:
       mounted: true
       rate: 10000000000
@@ -1253,7 +1195,6 @@ granduc-15:
       ip: 192.168.14.15
       driver: ixgbe
       mountable: true
-      switch_port: Eth1/16
     eth3:
       mounted: false
       mac: 00:1b:21:34:e0:f0
@@ -1265,7 +1206,6 @@ granduc-15:
     bmc:
       ip: 172.17.176.15
       mac: 00:1c:23:d3:57:37
-      switch_port: Gi1/15
   supported_job_types:
     virtual: ivt
   chassis:
@@ -1306,7 +1246,6 @@ granduc-16:
       driver: bnx2
       mountable: true
       ip: 172.16.176.16
-      switch_port: Gi2/16
     eth1:
       mounted: false
       mac: 00:19:b9:f2:0f:4d
@@ -1316,7 +1255,6 @@ granduc-16:
       driver: bnx2
       mountable: true
       ip: 172.16.176.116
-      switch_port: Gi2/28
     eth2:
       mounted: true
       rate: 10000000000
@@ -1339,7 +1277,6 @@ granduc-16:
     bmc:
       ip: 172.17.176.16
       mac: 00:1c:23:d3:57:67
-      switch_port: Gi1/16
   operating_system:
     kernel: 2.6.32-5-amd64
     name: debian
@@ -1395,7 +1332,6 @@ granduc-17:
       driver: bnx2
       mountable: true
       ip: 172.16.176.17
-      switch_port: Gi2/17
     eth1:
       mounted: false
       mac: 00:19:b9:de:b9:1e
@@ -1405,7 +1341,6 @@ granduc-17:
       driver: bnx2
       mountable: true
       ip: 172.16.176.117
-      switch_port: Gi2/29
     eth2:
       mounted: true
       rate: 10000000000
@@ -1417,7 +1352,6 @@ granduc-17:
       ip: 192.168.14.17
       driver: ixgbe
       mountable: true
-      switch_port: Eth1/18
     eth3:
       mounted: false
       mac: 00:1b:21:3c:87:70
@@ -1429,7 +1363,6 @@ granduc-17:
     bmc:
       ip: 172.17.176.17
       mac: 00:1c:23:d3:57:89
-      switch_port: Gi1/17
   block_devices:
     sda:
       model: ST9300603SS
@@ -1477,7 +1410,6 @@ granduc-18:
       driver: bnx2
       mountable: true
       ip: 172.16.176.18
-      switch_port: Gi2/18
     eth1:
       mounted: false
       mac: 00:19:b9:f3:ba:b2
@@ -1487,7 +1419,6 @@ granduc-18:
       driver: bnx2
       mountable: true
       ip: 172.16.176.118
-      switch_port: Gi2/30
     eth2:
       mounted: true
       rate: 10000000000
@@ -1499,7 +1430,6 @@ granduc-18:
       ip: 192.168.14.18
       driver: ixgbe
       mountable: true
-      switch_port: Eth1/19
     eth3:
       mounted: false
       mac: 00:1b:21:34:e1:06
@@ -1511,7 +1441,6 @@ granduc-18:
     bmc:
       ip: 172.17.176.18
       mac: 00:1c:23:d6:c4:ea
-      switch_port: Gi1/18
   operating_system:
     kernel: 2.6.32-5-amd64
     name: debian
@@ -1574,7 +1503,6 @@ granduc-19:
       driver: bnx2
       mountable: true
       ip: 172.16.176.19
-      switch_port: Gi2/19
     eth1:
       mounted: false
       mac: 00:19:b9:f2:0e:df
@@ -1584,7 +1512,6 @@ granduc-19:
       driver: bnx2
       mountable: true
       ip: 172.16.176.119
-      switch_port: Gi2/31
     eth2:
       mounted: true
       rate: 10000000000
@@ -1596,7 +1523,6 @@ granduc-19:
       ip: 192.168.14.19
       driver: ixgbe
       mountable: true
-      switch_port: Eth1/20
     eth3:
       mounted: false
       mac: 00:1b:21:3d:13:9a
@@ -1608,7 +1534,6 @@ granduc-19:
     bmc:
       ip: 172.17.176.19
       mac: 00:1c:23:d3:42:4e
-      switch_port: Gi1/19
   chassis:
     serial_number: 69N983J
     manufacturer: Dell Inc.
@@ -1653,7 +1578,6 @@ granduc-20:
       driver: bnx2
       mountable: true
       ip: 172.16.176.20
-      switch_port: Gi2/20
     eth1:
       mounted: false
       mac: 00:19:b9:f2:08:cc
@@ -1663,7 +1587,6 @@ granduc-20:
       driver: bnx2
       mountable: true
       ip: 172.16.176.120
-      switch_port: Gi2/32
     eth2:
       mounted: true
       rate: 10000000000
@@ -1675,7 +1598,6 @@ granduc-20:
       ip: 192.168.14.20
       driver: ixgbe
       mountable: true
-      switch_port: Eth1/21
     eth3:
       mounted: false
       mac: 00:1b:21:3d:13:26
@@ -1687,7 +1609,6 @@ granduc-20:
     bmc:
       ip: 172.17.176.20
       mac: 00:1c:23:d3:42:6c
-      switch_port: Gi1/20
   block_devices:
     sda:
       model: ST9146802SS
@@ -1746,7 +1667,6 @@ granduc-21:
       driver: bnx2
       mountable: true
       ip: 172.16.176.21
-      switch_port: Gi2/21
     eth1:
       mounted: false
       mac: 00:19:b9:f3:c2:7f
@@ -1756,7 +1676,6 @@ granduc-21:
       driver: bnx2
       mountable: true
       ip: 172.16.176.121
-      switch_port: Gi2/33
     eth2:
       mounted: true
       rate: 10000000000
@@ -1768,7 +1687,6 @@ granduc-21:
       ip: 192.168.14.21
       driver: ixgbe
       mountable: true
-      switch_port: Eth1/22
     eth3:
       mounted: false
       mac: 00:1b:21:3d:13:7c
@@ -1780,7 +1698,6 @@ granduc-21:
     bmc:
       ip: 172.17.176.21
       mac: 00:1c:23:d6:c3:0c
-      switch_port: Gi1/21
   supported_job_types:
     virtual: ivt
   chassis:
@@ -1832,7 +1749,6 @@ granduc-22:
       driver: bnx2
       mountable: true
       ip: 172.16.176.22
-      switch_port: Gi2/22
     eth1:
       mounted: false
       mac: 00:19:b9:f3:ba:a8
@@ -1842,7 +1758,6 @@ granduc-22:
       driver: bnx2
       mountable: true
       ip: 172.16.176.122
-      switch_port: Gi2/34
     eth2:
       mounted: true
       rate: 10000000000
@@ -1854,7 +1769,6 @@ granduc-22:
       ip: 192.168.14.22
       driver: ixgbe
       mountable: true
-      switch_port: Eth1/23
     eth3:
       mounted: false
       mac: 00:1b:21:34:e0:e6
@@ -1866,7 +1780,6 @@ granduc-22:
     bmc:
       ip: 172.17.176.22
       mac: 00:1c:23:d6:c3:32
-      switch_port: Gi1/22
   supported_job_types:
     virtual: ivt
   chassis:
diff --git a/generators/input/sites/luxembourg/clusters/granduc_manual.yaml b/generators/input/sites/luxembourg/clusters/granduc_manual.yaml
new file mode 100644
index 00000000000..62f30fab27c
--- /dev/null
+++ b/generators/input/sites/luxembourg/clusters/granduc_manual.yaml
@@ -0,0 +1,219 @@
+---
+granduc-1:
+  network_interfaces:
+    eth0:
+      switch_port: Gi2/1
+    eth1:
+      switch_port: Gi1/24
+    eth2:
+      switch_port: Eth1/2
+    bmc:
+      switch_port: Gi1/1
+granduc-2:
+  network_interfaces:
+    eth0:
+      switch_port: Gi2/2
+    eth1:
+      switch_port: Gi1/25
+    eth2:
+      switch_port: Eth1/3
+    bmc:
+      switch_port: Gi1/2
+granduc-3:
+  network_interfaces:
+    eth0:
+      switch_port: Gi2/3
+    eth1:
+      switch_port: Gi1/26
+    eth2:
+      switch_port: Eth1/4
+    bmc:
+      switch_port: Gi1/3
+granduc-4:
+  network_interfaces:
+    eth0:
+      switch_port: Gi2/4
+    eth1:
+      switch_port: Gi1/27
+    eth2:
+      switch_port: Eth1/5
+    bmc:
+      switch_port: Gi1/4
+granduc-5:
+  network_interfaces:
+    eth0:
+      switch_port: Gi2/5
+    eth1:
+      switch_port: Gi1/28
+    eth2:
+      switch_port: Eth1/6
+    bmc:
+      switch_port: Gi1/5
+granduc-6:
+  network_interfaces:
+    eth0:
+      switch_port: Gi2/6
+    eth1:
+      switch_port: Gi1/29
+    eth2:
+      switch_port: Eth1/7
+    bmc:
+      switch_port: Gi1/6
+granduc-7:
+  network_interfaces:
+    eth0:
+      switch_port: Gi2/7
+    eth1:
+      switch_port: Gi1/30
+    eth2:
+      switch_port: Eth1/8
+    bmc:
+      switch_port: Gi1/7
+granduc-8:
+  network_interfaces:
+    eth0:
+      switch_port: Gi2/8
+    eth1:
+      switch_port: Gi1/31
+    eth2:
+      switch_port: Eth1/9
+    bmc:
+      switch_port: Gi1/8
+granduc-9:
+  network_interfaces:
+    eth0:
+      switch_port: Gi2/9
+    eth1:
+      switch_port: Gi1/32
+    eth2:
+      switch_port: Eth1/10
+    bmc:
+      switch_port: Gi1/9
+granduc-10:
+  network_interfaces:
+    eth0:
+      switch_port: Gi2/10
+    eth1:
+      switch_port: Gi1/33
+    eth2:
+      switch_port: Eth1/11
+    bmc:
+      switch_port: Gi1/10
+granduc-11:
+  network_interfaces:
+    eth0:
+      switch_port: Gi2/11
+    eth1:
+      switch_port: Gi1/34
+    eth2:
+      switch_port: Eth1/12
+    bmc:
+      switch_port: Gi1/11
+granduc-12:
+  network_interfaces:
+    eth0:
+      switch_port: Gi2/12
+    eth1:
+      switch_port: Gi2/24
+    eth2:
+      switch_port: Eth1/13
+    bmc:
+      switch_port: Gi1/12
+granduc-13:
+  network_interfaces:
+    eth0:
+      switch_port: Gi2/13
+    eth1:
+      switch_port: Gi2/25
+    eth2:
+      switch_port: Eth1/14
+    bmc:
+      switch_port: Gi1/13
+granduc-14:
+  network_interfaces:
+    eth0:
+      switch_port: Gi2/14
+    eth1:
+      switch_port: Gi2/26
+    eth2:
+      switch_port: Eth1/15
+    bmc:
+      switch_port: Gi1/14
+granduc-15:
+  network_interfaces:
+    eth0:
+      switch_port: Gi2/15
+    eth1:
+      switch_port: Gi2/27
+    eth2:
+      switch_port: Eth1/16
+    bmc:
+      switch_port: Gi1/15
+granduc-16:
+  network_interfaces:
+    eth0:
+      switch_port: Gi2/16
+    eth1:
+      switch_port: Gi2/28
+    bmc:
+      switch_port: Gi1/16
+granduc-17:
+  network_interfaces:
+    eth0:
+      switch_port: Gi2/17
+    eth1:
+      switch_port: Gi2/29
+    eth2:
+      switch_port: Eth1/18
+    bmc:
+      switch_port: Gi1/17
+granduc-18:
+  network_interfaces:
+    eth0:
+      switch_port: Gi2/18
+    eth1:
+      switch_port: Gi2/30
+    eth2:
+      switch_port: Eth1/19
+    bmc:
+      switch_port: Gi1/18
+granduc-19:
+  network_interfaces:
+    eth0:
+      switch_port: Gi2/19
+    eth1:
+      switch_port: Gi2/31
+    eth2:
+      switch_port: Eth1/20
+    bmc:
+      switch_port: Gi1/19
+granduc-20:
+  network_interfaces:
+    eth0:
+      switch_port: Gi2/20
+    eth1:
+      switch_port: Gi2/32
+    eth2:
+      switch_port: Eth1/21
+    bmc:
+      switch_port: Gi1/20
+granduc-21:
+  network_interfaces:
+    eth0:
+      switch_port: Gi2/21
+    eth1:
+      switch_port: Gi2/33
+    eth2:
+      switch_port: Eth1/22
+    bmc:
+      switch_port: Gi1/21
+granduc-22:
+  network_interfaces:
+    eth0:
+      switch_port: Gi2/22
+    eth1:
+      switch_port: Gi2/34
+    eth2:
+      switch_port: Eth1/23
+    bmc:
+      switch_port: Gi1/22
diff --git a/generators/input/sites/lyon/clusters/hercule.rb b/generators/input/sites/lyon/clusters/hercule.rb
index e9da25b5dff..8737952eacf 100644
--- a/generators/input/sites/lyon/clusters/hercule.rb
+++ b/generators/input/sites/lyon/clusters/hercule.rb
@@ -16,133 +16,133 @@ site :lyon do |site_uid|
         supported_job_types({
           :deploy       => true,
           :besteffort   => true,
-          :virtual      => lookup('hercule', node_uid, 'supported_job_types', 'virtual')
+          :virtual      => lookup('hercule_generated', node_uid, 'supported_job_types', 'virtual')
         })
 
         architecture({
-          :smp_size       => lookup('hercule', node_uid, 'architecture', 'smp_size'),
-          :smt_size       => lookup('hercule', node_uid, 'architecture', 'smt_size'),
-          :platform_type  => lookup('hercule', node_uid, 'architecture', 'platform_type')
+          :smp_size       => lookup('hercule_generated', node_uid, 'architecture', 'smp_size'),
+          :smt_size       => lookup('hercule_generated', node_uid, 'architecture', 'smt_size'),
+          :platform_type  => lookup('hercule_generated', node_uid, 'architecture', 'platform_type')
         })
 
         processor({
-          :vendor             => lookup('hercule', node_uid, 'processor', 'vendor'),
-          :model              => lookup('hercule', node_uid, 'processor', 'model'),
-          :version            => lookup('hercule', node_uid, 'processor', 'version'),
-          :clock_speed        => lookup('hercule', node_uid, 'processor', 'clock_speed'),
-          :instruction_set    => lookup('hercule', node_uid, 'processor', 'instruction_set'),
-          :other_description  => lookup('hercule', node_uid, 'processor', 'other_description'),
-          :cache_l1           => lookup('hercule', node_uid, 'processor', 'cache_l1'),
-          :cache_l1i          => lookup('hercule', node_uid, 'processor', 'cache_l1i'),
-          :cache_l1d          => lookup('hercule', node_uid, 'processor', 'cache_l1d'),
-          :cache_l2           => lookup('hercule', node_uid, 'processor', 'cache_l2'),
-          :cache_l3           => lookup('hercule', node_uid, 'processor', 'cache_l3')
+          :vendor             => lookup('hercule_generated', node_uid, 'processor', 'vendor'),
+          :model              => lookup('hercule_generated', node_uid, 'processor', 'model'),
+          :version            => lookup('hercule_generated', node_uid, 'processor', 'version'),
+          :clock_speed        => lookup('hercule_generated', node_uid, 'processor', 'clock_speed'),
+          :instruction_set    => lookup('hercule_generated', node_uid, 'processor', 'instruction_set'),
+          :other_description  => lookup('hercule_generated', node_uid, 'processor', 'other_description'),
+          :cache_l1           => lookup('hercule_generated', node_uid, 'processor', 'cache_l1'),
+          :cache_l1i          => lookup('hercule_generated', node_uid, 'processor', 'cache_l1i'),
+          :cache_l1d          => lookup('hercule_generated', node_uid, 'processor', 'cache_l1d'),
+          :cache_l2           => lookup('hercule_generated', node_uid, 'processor', 'cache_l2'),
+          :cache_l3           => lookup('hercule_generated', node_uid, 'processor', 'cache_l3')
         })
 
         main_memory({
-          :ram_size     => lookup('hercule', node_uid, 'main_memory', 'ram_size'),
+          :ram_size     => lookup('hercule_generated', node_uid, 'main_memory', 'ram_size'),
           :virtual_size => nil
         })
 
         operating_system({
-          :name     => lookup('hercule', node_uid, 'operating_system', 'name'),
+          :name     => lookup('hercule_generated', node_uid, 'operating_system', 'name'),
           :release  => "Squeeze",
-          :version  => lookup('hercule', node_uid, 'operating_system', 'version'),
-          :kernel   => lookup('hercule', node_uid, 'operating_system', 'kernel')
+          :version  => lookup('hercule_generated', node_uid, 'operating_system', 'version'),
+          :kernel   => lookup('hercule_generated', node_uid, 'operating_system', 'kernel')
         })
 
         storage_devices [{
           :interface => 'SATA',
-          :size => lookup('hercule', node_uid, 'block_devices' ,'sda',  'size'),
+          :size => lookup('hercule_generated', node_uid, 'block_devices' ,'sda',  'size'),
           :driver => "ahci",
           :device => "sda",
-          :model => lookup('hercule', node_uid, 'block_devices' ,'sda',  'model'),
-          :rev => lookup('hercule', node_uid, 'block_devices', 'sda', 'rev'),
+          :model => lookup('hercule_generated', node_uid, 'block_devices' ,'sda',  'model'),
+          :rev => lookup('hercule_generated', node_uid, 'block_devices', 'sda', 'rev'),
         },
         {
           :interface => 'SATA',
           :driver => "ahci",
           :device => "sdb",
-          :size => lookup('hercule', node_uid, 'block_devices' ,'sdb',  'size'),
-          :model => lookup('hercule', node_uid, 'block_devices' ,'sdb',  'model'),
-          :rev => lookup('hercule', node_uid, 'block_devices', 'sdb', 'rev'),
+          :size => lookup('hercule_generated', node_uid, 'block_devices' ,'sdb',  'size'),
+          :model => lookup('hercule_generated', node_uid, 'block_devices' ,'sdb',  'model'),
+          :rev => lookup('hercule_generated', node_uid, 'block_devices', 'sdb', 'rev'),
         },
         {
           :interface => 'SATA',
           :driver => "ahci",
           :device => "sdc",
-          :size => lookup('hercule', node_uid, 'block_devices' ,'sdc',  'size'),
-          :model => lookup('hercule', node_uid, 'block_devices' ,'sdc',  'model'),
-          :rev => lookup('hercule', node_uid, 'block_devices', 'sdc', 'rev'),
+          :size => lookup('hercule_generated', node_uid, 'block_devices' ,'sdc',  'size'),
+          :model => lookup('hercule_generated', node_uid, 'block_devices' ,'sdc',  'model'),
+          :rev => lookup('hercule_generated', node_uid, 'block_devices', 'sdc', 'rev'),
         }]
 
         network_adapters [        {
-          :interface        => lookup('hercule', node_uid, 'network_interfaces', 'eth0', 'interface'),
+          :interface        => lookup('hercule_generated', node_uid, 'network_interfaces', 'eth0', 'interface'),
           :rate             => 1.G,
           :device           => "eth0",
-          :enabled          => lookup('hercule', node_uid, 'network_interfaces', 'eth0', 'enabled'),
-          :management       => lookup('hercule', node_uid, 'network_interfaces', 'eth0', 'management'),
-          :mountable        => lookup('hercule', node_uid, 'network_interfaces', 'eth0', 'mountable'),
-          :mounted          => lookup('hercule', node_uid, 'network_interfaces', 'eth0', 'mounted'),
+          :enabled          => lookup('hercule_generated', node_uid, 'network_interfaces', 'eth0', 'enabled'),
+          :management       => lookup('hercule_generated', node_uid, 'network_interfaces', 'eth0', 'management'),
+          :mountable        => lookup('hercule_generated', node_uid, 'network_interfaces', 'eth0', 'mountable'),
+          :mounted          => lookup('hercule_generated', node_uid, 'network_interfaces', 'eth0', 'mounted'),
           :bridged          => false,
           :vendor           => "Intel",
           :version          => '82599EB 10-Gigabit SFI/SFP+ Network Connection',
-          :driver           => lookup('hercule', node_uid, 'network_interfaces', 'eth0', 'driver'),
-          :mac              => lookup('hercule', node_uid, 'network_interfaces', 'eth0', 'mac')
+          :driver           => lookup('hercule_generated', node_uid, 'network_interfaces', 'eth0', 'driver'),
+          :mac              => lookup('hercule_generated', node_uid, 'network_interfaces', 'eth0', 'mac')
         },
         {
-          :interface        => lookup('hercule', node_uid, 'network_interfaces', 'eth1', 'interface'),
-          :rate             => lookup('hercule', node_uid, 'network_interfaces', 'eth1', 'rate'),
-          :enabled          => lookup('hercule', node_uid, 'network_interfaces', 'eth1', 'enabled'),
-          :management       => lookup('hercule', node_uid, 'network_interfaces', 'eth1', 'management'),
-          :mountable        => lookup('hercule', node_uid, 'network_interfaces', 'eth1', 'mountable'),
-          :mounted          => lookup('hercule', node_uid, 'network_interfaces', 'eth1', 'mounted'),
+          :interface        => lookup('hercule_generated', node_uid, 'network_interfaces', 'eth1', 'interface'),
+          :rate             => lookup('hercule_generated', node_uid, 'network_interfaces', 'eth1', 'rate'),
+          :enabled          => lookup('hercule_generated', node_uid, 'network_interfaces', 'eth1', 'enabled'),
+          :management       => lookup('hercule_generated', node_uid, 'network_interfaces', 'eth1', 'management'),
+          :mountable        => lookup('hercule_generated', node_uid, 'network_interfaces', 'eth1', 'mountable'),
+          :mounted          => lookup('hercule_generated', node_uid, 'network_interfaces', 'eth1', 'mounted'),
           :bridged          => true,
           :device           => "eth1",
           :vendor           => "Intel",
           :version          => '82599EB 10-Gigabit SFI/SFP+ Network Connection',
-          :driver           => lookup('hercule', node_uid, 'network_interfaces', 'eth1', 'driver'),
+          :driver           => lookup('hercule_generated', node_uid, 'network_interfaces', 'eth1', 'driver'),
           :network_address  => "#{node_uid}.#{site_uid}.grid5000.fr",
-          :ip               => lookup('hercule', node_uid, 'network_interfaces', 'eth1', 'ip'),
-          :ip6              => lookup('hercule', node_uid, 'network_interfaces', 'eth1', 'ip6'),
+          :ip               => lookup('hercule_generated', node_uid, 'network_interfaces', 'eth1', 'ip'),
+          :ip6              => lookup('hercule_generated', node_uid, 'network_interfaces', 'eth1', 'ip6'),
           :switch           => "force10",
-          :switch_port      => lookup('hercule', node_uid, 'network_interfaces', 'eth1', 'switch_port'),
-          :mac              => lookup('hercule', node_uid, 'network_interfaces', 'eth1', 'mac')
+          :switch_port      => lookup('hercule_generated', node_uid, 'network_interfaces', 'eth1', 'switch_port'),
+          :mac              => lookup('hercule_generated', node_uid, 'network_interfaces', 'eth1', 'mac')
         },
         {
-          :interface        => lookup('hercule', node_uid, 'network_interfaces', 'eth2', 'interface'),
+          :interface        => lookup('hercule_generated', node_uid, 'network_interfaces', 'eth2', 'interface'),
           :rate             => 1.G,
-          :enabled          => lookup('hercule', node_uid, 'network_interfaces', 'eth2', 'enabled'),
-          :management       => lookup('hercule', node_uid, 'network_interfaces', 'eth2', 'management'),
-          :mountable        => lookup('hercule', node_uid, 'network_interfaces', 'eth2', 'mountable'),
-          :mounted          => lookup('hercule', node_uid, 'network_interfaces', 'eth2', 'mounted'),
+          :enabled          => lookup('hercule_generated', node_uid, 'network_interfaces', 'eth2', 'enabled'),
+          :management       => lookup('hercule_generated', node_uid, 'network_interfaces', 'eth2', 'management'),
+          :mountable        => lookup('hercule_generated', node_uid, 'network_interfaces', 'eth2', 'mountable'),
+          :mounted          => lookup('hercule_generated', node_uid, 'network_interfaces', 'eth2', 'mounted'),
           :bridged          => false,
           :device           => "eth2",
           :vendor           => "Intel",
           :version          => "Intel Corporation",
-          :driver           => lookup('hercule', node_uid, 'network_interfaces', 'eth2', 'driver'),
-          :mac              => lookup('hercule', node_uid, 'network_interfaces', 'eth2', 'mac')
+          :driver           => lookup('hercule_generated', node_uid, 'network_interfaces', 'eth2', 'driver'),
+          :mac              => lookup('hercule_generated', node_uid, 'network_interfaces', 'eth2', 'mac')
         },
         {
-          :interface        => lookup('hercule', node_uid, 'network_interfaces', 'eth3', 'interface'),
+          :interface        => lookup('hercule_generated', node_uid, 'network_interfaces', 'eth3', 'interface'),
           :rate             => 1.G,
-          :enabled          => lookup('hercule', node_uid, 'network_interfaces', 'eth3', 'enabled'),
-          :management       => lookup('hercule', node_uid, 'network_interfaces', 'eth3', 'management'),
-          :mountable        => lookup('hercule', node_uid, 'network_interfaces', 'eth3', 'mountable'),
-          :mounted          => lookup('hercule', node_uid, 'network_interfaces', 'eth3', 'mounted'),
+          :enabled          => lookup('hercule_generated', node_uid, 'network_interfaces', 'eth3', 'enabled'),
+          :management       => lookup('hercule_generated', node_uid, 'network_interfaces', 'eth3', 'management'),
+          :mountable        => lookup('hercule_generated', node_uid, 'network_interfaces', 'eth3', 'mountable'),
+          :mounted          => lookup('hercule_generated', node_uid, 'network_interfaces', 'eth3', 'mounted'),
           :bridged          => false,
           :device           => "eth3",
           :vendor           => "Intel",
           :version          => "Intel Corporation",
-          :driver           => lookup('hercule', node_uid, 'network_interfaces', 'eth3', 'driver'),
-          :mac              => lookup('hercule', node_uid, 'network_interfaces', 'eth3', 'mac')
+          :driver           => lookup('hercule_generated', node_uid, 'network_interfaces', 'eth3', 'driver'),
+          :mac              => lookup('hercule_generated', node_uid, 'network_interfaces', 'eth3', 'mac')
         },
         {
           :interface            => 'Ethernet',
           :rate                 => 1.G,
           :network_address      => "#{node_uid}-bmc.#{site_uid}.grid5000.fr",
-          :ip                   => lookup('hercule', node_uid, 'network_interfaces', 'bmc', 'ip'),
-          :mac                  => lookup('hercule', node_uid, 'network_interfaces', 'bmc', 'mac'),
+          :ip                   => lookup('hercule_generated', node_uid, 'network_interfaces', 'bmc', 'ip'),
+          :mac                  => lookup('hercule_generated', node_uid, 'network_interfaces', 'bmc', 'mac'),
           :enabled              => true,
           :mounted              => false,
           :mountable            => false,
@@ -151,15 +151,15 @@ site :lyon do |site_uid|
         }]
 
         chassis({
-          :serial       => lookup('hercule', node_uid, 'chassis', 'serial_number'),
-          :name         => lookup('hercule', node_uid, 'chassis', 'product_name'),
-          :manufacturer => lookup('hercule', node_uid, 'chassis', 'manufacturer')
+          :serial       => lookup('hercule_generated', node_uid, 'chassis', 'serial_number'),
+          :name         => lookup('hercule_generated', node_uid, 'chassis', 'product_name'),
+          :manufacturer => lookup('hercule_generated', node_uid, 'chassis', 'manufacturer')
         })
 
         bios({
-          :version      => lookup('hercule', node_uid, 'bios', 'version'),
-          :vendor       => lookup('hercule', node_uid, 'bios', 'vendor'),
-          :release_date => lookup('hercule', node_uid, 'bios', 'release_date')
+          :version      => lookup('hercule_generated', node_uid, 'bios', 'version'),
+          :vendor       => lookup('hercule_generated', node_uid, 'bios', 'vendor'),
+          :release_date => lookup('hercule_generated', node_uid, 'bios', 'release_date')
         })
 
         monitoring({
diff --git a/generators/input/sites/lyon/clusters/hercule.yaml b/generators/input/sites/lyon/clusters/hercule_generated.yaml
similarity index 100%
rename from generators/input/sites/lyon/clusters/hercule.yaml
rename to generators/input/sites/lyon/clusters/hercule_generated.yaml
diff --git a/generators/input/sites/lyon/clusters/orion.rb b/generators/input/sites/lyon/clusters/orion.rb
index 589d36b825e..361ffecba3b 100644
--- a/generators/input/sites/lyon/clusters/orion.rb
+++ b/generators/input/sites/lyon/clusters/orion.rb
@@ -16,146 +16,146 @@ site :lyon do |site_uid|
         supported_job_types({
           :deploy       => true,
           :besteffort   => true,
-          :virtual      => lookup('orion', node_uid, 'supported_job_types', 'virtual')
+          :virtual      => lookup('orion_generated', node_uid, 'supported_job_types', 'virtual')
         })
 
         architecture({
-          :smp_size       => lookup('orion', node_uid, 'architecture', 'smp_size'),
-          :smt_size       => lookup('orion', node_uid, 'architecture', 'smt_size'),
-          :platform_type  => lookup('orion', node_uid, 'architecture', 'platform_type')
+          :smp_size       => lookup('orion_generated', node_uid, 'architecture', 'smp_size'),
+          :smt_size       => lookup('orion_generated', node_uid, 'architecture', 'smt_size'),
+          :platform_type  => lookup('orion_generated', node_uid, 'architecture', 'platform_type')
         })
 
         processor({
-          :vendor             => lookup('orion', node_uid, 'processor', 'vendor'),
-          :model              => lookup('orion', node_uid, 'processor', 'model'),
-          :version            => lookup('orion', node_uid, 'processor', 'version'),
-          :clock_speed        => lookup('orion', node_uid, 'processor', 'clock_speed'),
-          :instruction_set    => lookup('orion', node_uid, 'processor', 'instruction_set'),
-          :other_description  => lookup('orion', node_uid, 'processor', 'other_description'),
-          :cache_l1           => lookup('orion', node_uid, 'processor', 'cache_l1'),
-          :cache_l1i          => lookup('orion', node_uid, 'processor', 'cache_l1i'),
-          :cache_l1d          => lookup('orion', node_uid, 'processor', 'cache_l1d'),
-          :cache_l2           => lookup('orion', node_uid, 'processor', 'cache_l2'),
-          :cache_l3           => lookup('orion', node_uid, 'processor', 'cache_l3')
+          :vendor             => lookup('orion_generated', node_uid, 'processor', 'vendor'),
+          :model              => lookup('orion_generated', node_uid, 'processor', 'model'),
+          :version            => lookup('orion_generated', node_uid, 'processor', 'version'),
+          :clock_speed        => lookup('orion_generated', node_uid, 'processor', 'clock_speed'),
+          :instruction_set    => lookup('orion_generated', node_uid, 'processor', 'instruction_set'),
+          :other_description  => lookup('orion_generated', node_uid, 'processor', 'other_description'),
+          :cache_l1           => lookup('orion_generated', node_uid, 'processor', 'cache_l1'),
+          :cache_l1i          => lookup('orion_generated', node_uid, 'processor', 'cache_l1i'),
+          :cache_l1d          => lookup('orion_generated', node_uid, 'processor', 'cache_l1d'),
+          :cache_l2           => lookup('orion_generated', node_uid, 'processor', 'cache_l2'),
+          :cache_l3           => lookup('orion_generated', node_uid, 'processor', 'cache_l3')
         })
 
         main_memory({
-          :ram_size     => lookup('orion', node_uid, 'main_memory', 'ram_size'),
+          :ram_size     => lookup('orion_generated', node_uid, 'main_memory', 'ram_size'),
           :virtual_size => nil
         })
 
         operating_system({
-          :name     => lookup('orion', node_uid, 'operating_system', 'name'),
+          :name     => lookup('orion_generated', node_uid, 'operating_system', 'name'),
           :release  => "Squeeze",
-          :version  => lookup('orion', node_uid, 'operating_system', 'version'),
-          :kernel   => lookup('orion', node_uid, 'operating_system', 'kernel')
+          :version  => lookup('orion_generated', node_uid, 'operating_system', 'version'),
+          :kernel   => lookup('orion_generated', node_uid, 'operating_system', 'kernel')
         })
 
         storage_devices [{
           :interface  => 'SCSI',
-          :size       => lookup('orion', node_uid, 'block_devices', 'sda', 'size'),
+          :size       => lookup('orion_generated', node_uid, 'block_devices', 'sda', 'size'),
           :driver     => "megaraid_sas",
-          :device     => lookup('orion', node_uid, 'block_devices', 'sda', 'device'),
-          :model      => lookup('orion', node_uid, 'block_devices', 'sda', 'model'),
-          :vendor     => lookup('orion', node_uid, 'block_devices', 'sda', 'vendor'),
-          :rev        => lookup('orion', node_uid, 'block_devices', 'sda', 'rev')
+          :device     => lookup('orion_generated', node_uid, 'block_devices', 'sda', 'device'),
+          :model      => lookup('orion_generated', node_uid, 'block_devices', 'sda', 'model'),
+          :vendor     => lookup('orion_generated', node_uid, 'block_devices', 'sda', 'vendor'),
+          :rev        => lookup('orion_generated', node_uid, 'block_devices', 'sda', 'rev')
         }]
 
         network_adapters [{
-          :interface        => lookup('orion', node_uid, 'network_interfaces', 'eth0', 'interface'),
-          :rate             => lookup('orion', node_uid, 'network_interfaces', 'eth0', 'rate'),
-          :enabled          => lookup('orion', node_uid, 'network_interfaces', 'eth0', 'enabled'),
-          :management       => lookup('orion', node_uid, 'network_interfaces', 'eth0', 'management'),
-          :mountable        => lookup('orion', node_uid, 'network_interfaces', 'eth0', 'mountable'),
-          :mounted          => lookup('orion', node_uid, 'network_interfaces', 'eth0', 'mounted'),
+          :interface        => lookup('orion_generated', node_uid, 'network_interfaces', 'eth0', 'interface'),
+          :rate             => lookup('orion_generated', node_uid, 'network_interfaces', 'eth0', 'rate'),
+          :enabled          => lookup('orion_generated', node_uid, 'network_interfaces', 'eth0', 'enabled'),
+          :management       => lookup('orion_generated', node_uid, 'network_interfaces', 'eth0', 'management'),
+          :mountable        => lookup('orion_generated', node_uid, 'network_interfaces', 'eth0', 'mountable'),
+          :mounted          => lookup('orion_generated', node_uid, 'network_interfaces', 'eth0', 'mounted'),
           :bridged          => true,
           :device           => "eth0",
           :vendor           => 'Intel',
           :model            => 'Intel X520 DP 10Gb DA/SFP+ Server Adapter',
-          :driver           => lookup('orion', node_uid, 'network_interfaces', 'eth0', 'driver'),
+          :driver           => lookup('orion_generated', node_uid, 'network_interfaces', 'eth0', 'driver'),
           :network_address  => "#{node_uid}.#{site_uid}.grid5000.fr",
-          :ip               => lookup('orion', node_uid, 'network_interfaces', 'eth0', 'ip'),
-          :ip6              => lookup('orion', node_uid, 'network_interfaces', 'eth0', 'ip6'),
+          :ip               => lookup('orion_generated', node_uid, 'network_interfaces', 'eth0', 'ip'),
+          :ip6              => lookup('orion_generated', node_uid, 'network_interfaces', 'eth0', 'ip6'),
           :switch           => "force10",
-          :switch_port      => lookup('orion', node_uid, 'network_interfaces', 'eth0', 'switch_port'),
-          :mac              => lookup('orion', node_uid, 'network_interfaces', 'eth0', 'mac')
+          :switch_port      => lookup('orion_generated', node_uid, 'network_interfaces', 'eth0', 'switch_port'),
+          :mac              => lookup('orion_generated', node_uid, 'network_interfaces', 'eth0', 'mac')
         },
         {
-          :interface        => lookup('orion', node_uid, 'network_interfaces', 'eth1', 'interface'),
+          :interface        => lookup('orion_generated', node_uid, 'network_interfaces', 'eth1', 'interface'),
           :rate             => 1.G,
-          :enabled          => lookup('orion', node_uid, 'network_interfaces', 'eth1', 'enabled'),
-          :management       => lookup('orion', node_uid, 'network_interfaces', 'eth1', 'management'),
-          :mountable        => lookup('orion', node_uid, 'network_interfaces', 'eth1', 'mountable'),
-          :mounted          => lookup('orion', node_uid, 'network_interfaces', 'eth1', 'mounted'),
+          :enabled          => lookup('orion_generated', node_uid, 'network_interfaces', 'eth1', 'enabled'),
+          :management       => lookup('orion_generated', node_uid, 'network_interfaces', 'eth1', 'management'),
+          :mountable        => lookup('orion_generated', node_uid, 'network_interfaces', 'eth1', 'mountable'),
+          :mounted          => lookup('orion_generated', node_uid, 'network_interfaces', 'eth1', 'mounted'),
           :device           => "eth1",
           :bridged          => false,
           :vendor           => 'Intel',
           :model            => 'Intel X520 DP 10Gb DA/SFP+ Server Adapter',
-          :driver           => lookup('orion', node_uid, 'network_interfaces', 'eth1', 'driver'),
-          :mac              => lookup('orion', node_uid, 'network_interfaces', 'eth1', 'mac')
+          :driver           => lookup('orion_generated', node_uid, 'network_interfaces', 'eth1', 'driver'),
+          :mac              => lookup('orion_generated', node_uid, 'network_interfaces', 'eth1', 'mac')
         },
         {
-          :interface        => lookup('orion', node_uid, 'network_interfaces', 'eth2', 'interface'),
+          :interface        => lookup('orion_generated', node_uid, 'network_interfaces', 'eth2', 'interface'),
           :rate             => 1.G,
-          :enabled          => lookup('orion', node_uid, 'network_interfaces', 'eth2', 'enabled'),
-          :management       => lookup('orion', node_uid, 'network_interfaces', 'eth2', 'management'),
-          :mountable        => lookup('orion', node_uid, 'network_interfaces', 'eth2', 'mountable'),
-          :mounted          => lookup('orion', node_uid, 'network_interfaces', 'eth2', 'mounted'),
+          :enabled          => lookup('orion_generated', node_uid, 'network_interfaces', 'eth2', 'enabled'),
+          :management       => lookup('orion_generated', node_uid, 'network_interfaces', 'eth2', 'management'),
+          :mountable        => lookup('orion_generated', node_uid, 'network_interfaces', 'eth2', 'mountable'),
+          :mounted          => lookup('orion_generated', node_uid, 'network_interfaces', 'eth2', 'mounted'),
           :device           => "eth2",
           :bridged          => false,
           :vendor           => 'Intel',
           :model            => 'Intel Ethernet I350 QP 1Gb',
-          :driver           => lookup('orion', node_uid, 'network_interfaces', 'eth2', 'driver'),
-          :mac              => lookup('orion', node_uid, 'network_interfaces', 'eth2', 'mac')
+          :driver           => lookup('orion_generated', node_uid, 'network_interfaces', 'eth2', 'driver'),
+          :mac              => lookup('orion_generated', node_uid, 'network_interfaces', 'eth2', 'mac')
         },
         {
-          :interface        => lookup('orion', node_uid, 'network_interfaces', 'eth3', 'interface'),
+          :interface        => lookup('orion_generated', node_uid, 'network_interfaces', 'eth3', 'interface'),
           :rate             => 1.G,
-          :enabled          => lookup('orion', node_uid, 'network_interfaces', 'eth3', 'enabled'),
-          :management       => lookup('orion', node_uid, 'network_interfaces', 'eth3', 'management'),
-          :mountable        => lookup('orion', node_uid, 'network_interfaces', 'eth3', 'mountable'),
-          :mounted          => lookup('orion', node_uid, 'network_interfaces', 'eth3', 'mounted'),
+          :enabled          => lookup('orion_generated', node_uid, 'network_interfaces', 'eth3', 'enabled'),
+          :management       => lookup('orion_generated', node_uid, 'network_interfaces', 'eth3', 'management'),
+          :mountable        => lookup('orion_generated', node_uid, 'network_interfaces', 'eth3', 'mountable'),
+          :mounted          => lookup('orion_generated', node_uid, 'network_interfaces', 'eth3', 'mounted'),
           :device           => "eth3",
           :bridged          => false,
           :vendor           => 'Intel',
           :model            => 'Intel Ethernet I350 QP 1Gb',
-          :driver           => lookup('orion', node_uid, 'network_interfaces', 'eth3', 'driver'),
-          :mac              => lookup('orion', node_uid, 'network_interfaces', 'eth3', 'mac')
+          :driver           => lookup('orion_generated', node_uid, 'network_interfaces', 'eth3', 'driver'),
+          :mac              => lookup('orion_generated', node_uid, 'network_interfaces', 'eth3', 'mac')
         },
         {
-          :interface        => lookup('orion', node_uid, 'network_interfaces', 'eth4', 'interface'),
+          :interface        => lookup('orion_generated', node_uid, 'network_interfaces', 'eth4', 'interface'),
           :rate             => 1.G,
-          :enabled          => lookup('orion', node_uid, 'network_interfaces', 'eth4', 'enabled'),
-          :management       => lookup('orion', node_uid, 'network_interfaces', 'eth4', 'management'),
-          :mountable        => lookup('orion', node_uid, 'network_interfaces', 'eth4', 'mountable'),
-          :mounted          => lookup('orion', node_uid, 'network_interfaces', 'eth4', 'mounted'),
+          :enabled          => lookup('orion_generated', node_uid, 'network_interfaces', 'eth4', 'enabled'),
+          :management       => lookup('orion_generated', node_uid, 'network_interfaces', 'eth4', 'management'),
+          :mountable        => lookup('orion_generated', node_uid, 'network_interfaces', 'eth4', 'mountable'),
+          :mounted          => lookup('orion_generated', node_uid, 'network_interfaces', 'eth4', 'mounted'),
           :device           => "eth4",
           :bridged          => false,
           :vendor           => 'Intel',
           :model            => 'Intel Ethernet I350 QP 1Gb',
-          :driver           => lookup('orion', node_uid, 'network_interfaces', 'eth4', 'driver'),
-          :mac              => lookup('orion', node_uid, 'network_interfaces', 'eth4', 'mac')
+          :driver           => lookup('orion_generated', node_uid, 'network_interfaces', 'eth4', 'driver'),
+          :mac              => lookup('orion_generated', node_uid, 'network_interfaces', 'eth4', 'mac')
         },
         {
-          :interface        => lookup('orion', node_uid, 'network_interfaces', 'eth5', 'interface'),
+          :interface        => lookup('orion_generated', node_uid, 'network_interfaces', 'eth5', 'interface'),
           :rate             => 1.G,
-          :enabled          => lookup('orion', node_uid, 'network_interfaces', 'eth5', 'enabled'),
-          :management       => lookup('orion', node_uid, 'network_interfaces', 'eth5', 'management'),
-          :mountable        => lookup('orion', node_uid, 'network_interfaces', 'eth5', 'mountable'),
-          :mounted          => lookup('orion', node_uid, 'network_interfaces', 'eth5', 'mounted'),
+          :enabled          => lookup('orion_generated', node_uid, 'network_interfaces', 'eth5', 'enabled'),
+          :management       => lookup('orion_generated', node_uid, 'network_interfaces', 'eth5', 'management'),
+          :mountable        => lookup('orion_generated', node_uid, 'network_interfaces', 'eth5', 'mountable'),
+          :mounted          => lookup('orion_generated', node_uid, 'network_interfaces', 'eth5', 'mounted'),
           :device           => "eth5",
           :bridged          => false,
           :vendor           => 'Intel',
           :model            => 'Intel Ethernet I350 QP 1Gb',
-          :driver           => lookup('orion', node_uid, 'network_interfaces', 'eth5', 'driver'),
-          :mac              => lookup('orion', node_uid, 'network_interfaces', 'eth5', 'mac')
+          :driver           => lookup('orion_generated', node_uid, 'network_interfaces', 'eth5', 'driver'),
+          :mac              => lookup('orion_generated', node_uid, 'network_interfaces', 'eth5', 'mac')
         },
         {
           :interface            => 'Ethernet',
           :rate                 => 1.G,
           :network_address      => "#{node_uid}-bmc.#{site_uid}.grid5000.fr",
-          :ip                   => lookup('orion', node_uid, 'network_interfaces', 'bmc', 'ip'),
-          :mac                  => lookup('orion', node_uid, 'network_interfaces', 'bmc', 'mac'),
+          :ip                   => lookup('orion_generated', node_uid, 'network_interfaces', 'bmc', 'ip'),
+          :mac                  => lookup('orion_generated', node_uid, 'network_interfaces', 'bmc', 'mac'),
           :enabled              => true,
           :mounted              => false,
           :mountable            => false,
@@ -164,15 +164,15 @@ site :lyon do |site_uid|
         }]
 
         chassis({
-          :serial       => lookup('orion', node_uid, 'chassis', 'serial_number'),
-          :name         => lookup('orion', node_uid, 'chassis', 'product_name'),
-          :manufacturer => lookup('orion', node_uid, 'chassis', 'manufacturer')
+          :serial       => lookup('orion_generated', node_uid, 'chassis', 'serial_number'),
+          :name         => lookup('orion_generated', node_uid, 'chassis', 'product_name'),
+          :manufacturer => lookup('orion_generated', node_uid, 'chassis', 'manufacturer')
         })
 
         bios({
-          :version      => lookup('orion', node_uid, 'bios', 'version'),
-          :vendor       => lookup('orion', node_uid, 'bios', 'vendor'),
-          :release_date => lookup('orion', node_uid, 'bios', 'release_date')
+          :version      => lookup('orion_generated', node_uid, 'bios', 'version'),
+          :vendor       => lookup('orion_generated', node_uid, 'bios', 'vendor'),
+          :release_date => lookup('orion_generated', node_uid, 'bios', 'release_date')
         })
 
         monitoring({
diff --git a/generators/input/sites/lyon/clusters/orion.yaml b/generators/input/sites/lyon/clusters/orion_generated.yaml
similarity index 100%
rename from generators/input/sites/lyon/clusters/orion.yaml
rename to generators/input/sites/lyon/clusters/orion_generated.yaml
diff --git a/generators/input/sites/lyon/clusters/sagittaire.rb b/generators/input/sites/lyon/clusters/sagittaire.rb
index 329ac579f63..1ba1dc626e6 100644
--- a/generators/input/sites/lyon/clusters/sagittaire.rb
+++ b/generators/input/sites/lyon/clusters/sagittaire.rb
@@ -16,101 +16,101 @@ site :lyon do |site_uid|
         supported_job_types({
           :deploy       => true,
           :besteffort   => true,
-          :virtual      => lookup('sagittaire', node_uid, 'supported_job_types', 'virtual')
+          :virtual      => lookup('sagittaire_generated', node_uid, 'supported_job_types', 'virtual')
         })
 
         architecture({
-          :smp_size       => lookup('sagittaire', node_uid, 'architecture', 'smp_size'),
-          :smt_size       => lookup('sagittaire', node_uid, 'architecture', 'smt_size'),
-          :platform_type  => lookup('sagittaire', node_uid, 'architecture', 'platform_type')
+          :smp_size       => lookup('sagittaire_generated', node_uid, 'architecture', 'smp_size'),
+          :smt_size       => lookup('sagittaire_generated', node_uid, 'architecture', 'smt_size'),
+          :platform_type  => lookup('sagittaire_generated', node_uid, 'architecture', 'platform_type')
         })
 
         processor({
-          :vendor             => lookup('sagittaire', node_uid, 'processor', 'vendor'),
-          :model              => lookup('sagittaire', node_uid, 'processor', 'model'),
-          :version            => lookup('sagittaire', node_uid, 'processor', 'version'),
-          :clock_speed        => lookup('sagittaire', node_uid, 'processor', 'clock_speed'),
-          :instruction_set    => lookup('sagittaire', node_uid, 'processor', 'instruction_set'),
-          :other_description  => lookup('sagittaire', node_uid, 'processor', 'other_description'),
-          :cache_l1           => lookup('sagittaire', node_uid, 'processor', 'cache_l1'),
-          :cache_l1i          => lookup('sagittaire', node_uid, 'processor', 'cache_l1i'),
-          :cache_l1d          => lookup('sagittaire', node_uid, 'processor', 'cache_l1d'),
-          :cache_l2           => lookup('sagittaire', node_uid, 'processor', 'cache_l2'),
-          :cache_l3           => lookup('sagittaire', node_uid, 'processor', 'cache_l3')
+          :vendor             => lookup('sagittaire_generated', node_uid, 'processor', 'vendor'),
+          :model              => lookup('sagittaire_generated', node_uid, 'processor', 'model'),
+          :version            => lookup('sagittaire_generated', node_uid, 'processor', 'version'),
+          :clock_speed        => lookup('sagittaire_generated', node_uid, 'processor', 'clock_speed'),
+          :instruction_set    => lookup('sagittaire_generated', node_uid, 'processor', 'instruction_set'),
+          :other_description  => lookup('sagittaire_generated', node_uid, 'processor', 'other_description'),
+          :cache_l1           => lookup('sagittaire_generated', node_uid, 'processor', 'cache_l1'),
+          :cache_l1i          => lookup('sagittaire_generated', node_uid, 'processor', 'cache_l1i'),
+          :cache_l1d          => lookup('sagittaire_generated', node_uid, 'processor', 'cache_l1d'),
+          :cache_l2           => lookup('sagittaire_generated', node_uid, 'processor', 'cache_l2'),
+          :cache_l3           => lookup('sagittaire_generated', node_uid, 'processor', 'cache_l3')
         })
 
         main_memory({
-          :ram_size     => lookup('sagittaire', node_uid, 'main_memory', 'ram_size'),
+          :ram_size     => lookup('sagittaire_generated', node_uid, 'main_memory', 'ram_size'),
           :virtual_size => nil
         })
 
         operating_system({
-          :name     => lookup('sagittaire', node_uid, 'operating_system', 'name'),
+          :name     => lookup('sagittaire_generated', node_uid, 'operating_system', 'name'),
           :release  => "Squeeze",
-          :version  => lookup('sagittaire', node_uid, 'operating_system', 'version'),
-          :kernel   => lookup('sagittaire', node_uid, 'operating_system', 'kernel')
+          :version  => lookup('sagittaire_generated', node_uid, 'operating_system', 'version'),
+          :kernel   => lookup('sagittaire_generated', node_uid, 'operating_system', 'kernel')
         })
 
         if (i<69) then
           storage_devices [{
             :interface  => 'SCSI',
-            :size       => lookup('sagittaire', node_uid, 'block_devices', 'sda', 'size'),
+            :size       => lookup('sagittaire_generated', node_uid, 'block_devices', 'sda', 'size'),
             :driver     => "mptspi",
-            :device     => lookup('sagittaire', node_uid, 'block_devices', 'sda', 'device'),
-            :model      => lookup('sagittaire', node_uid, 'block_devices', 'sda', 'model'),
-            :rev        => lookup('sagittaire', node_uid, 'block_devices', 'sda', 'rev')
+            :device     => lookup('sagittaire_generated', node_uid, 'block_devices', 'sda', 'device'),
+            :model      => lookup('sagittaire_generated', node_uid, 'block_devices', 'sda', 'model'),
+            :rev        => lookup('sagittaire_generated', node_uid, 'block_devices', 'sda', 'rev')
           }]
         else
           storage_devices [{
             :interface  => 'SCSI',
-            :size       => lookup('sagittaire', node_uid, 'block_devices', 'sda', 'size'),
+            :size       => lookup('sagittaire_generated', node_uid, 'block_devices', 'sda', 'size'),
             :driver     => "mptspi",
-            :device     => lookup('sagittaire', node_uid, 'block_devices', 'sda', 'device'),
-            :model      => lookup('sagittaire', node_uid, 'block_devices', 'sda', 'model'),
-            :rev        => lookup('sagittaire', node_uid, 'block_devices', 'sda', 'rev')
+            :device     => lookup('sagittaire_generated', node_uid, 'block_devices', 'sda', 'device'),
+            :model      => lookup('sagittaire_generated', node_uid, 'block_devices', 'sda', 'model'),
+            :rev        => lookup('sagittaire_generated', node_uid, 'block_devices', 'sda', 'rev')
           },
           {
             :interface  => 'SCSI',
-            :size       => lookup('sagittaire', node_uid, 'block_devices', 'sdb', 'size'),
+            :size       => lookup('sagittaire_generated', node_uid, 'block_devices', 'sdb', 'size'),
             :driver     => "mptspi",
-            :device     => lookup('sagittaire', node_uid, 'block_devices', 'sdb', 'device'),
-            :model      => lookup('sagittaire', node_uid, 'block_devices', 'sdb', 'model'),
-            :rev        => lookup('sagittaire', node_uid, 'block_devices', 'sdb', 'rev')
+            :device     => lookup('sagittaire_generated', node_uid, 'block_devices', 'sdb', 'device'),
+            :model      => lookup('sagittaire_generated', node_uid, 'block_devices', 'sdb', 'model'),
+            :rev        => lookup('sagittaire_generated', node_uid, 'block_devices', 'sdb', 'rev')
           }]
         end
         network_adapters [{
-          :interface        => lookup('sagittaire', node_uid, 'network_interfaces', 'eth0', 'interface'),
+          :interface        => lookup('sagittaire_generated', node_uid, 'network_interfaces', 'eth0', 'interface'),
           :rate             => 1.G,
-          :enabled          => lookup('sagittaire', node_uid, 'network_interfaces', 'eth0', 'enabled'),
-          :management       => lookup('sagittaire', node_uid, 'network_interfaces', 'eth0', 'management'),
-          :mountable        => lookup('sagittaire', node_uid, 'network_interfaces', 'eth0', 'mountable'),
-          :mounted          => lookup('sagittaire', node_uid, 'network_interfaces', 'eth0', 'mounted'),
+          :enabled          => lookup('sagittaire_generated', node_uid, 'network_interfaces', 'eth0', 'enabled'),
+          :management       => lookup('sagittaire_generated', node_uid, 'network_interfaces', 'eth0', 'management'),
+          :mountable        => lookup('sagittaire_generated', node_uid, 'network_interfaces', 'eth0', 'mountable'),
+          :mounted          => lookup('sagittaire_generated', node_uid, 'network_interfaces', 'eth0', 'mounted'),
           :bridged          => false,
           :device           => "eth0",
           :vendor           => 'Broadcom',
           :model            => 'BCM5704',
-          :ip               => lookup('sagittaire', node_uid, 'network_interfaces', 'eth0', 'ip'),
-          :driver           => lookup('sagittaire', node_uid, 'network_interfaces', 'eth0', 'driver'),
-          :mac              => lookup('sagittaire', node_uid, 'network_interfaces', 'eth0', 'mac')
+          :ip               => lookup('sagittaire_generated', node_uid, 'network_interfaces', 'eth0', 'ip'),
+          :driver           => lookup('sagittaire_generated', node_uid, 'network_interfaces', 'eth0', 'driver'),
+          :mac              => lookup('sagittaire_generated', node_uid, 'network_interfaces', 'eth0', 'mac')
         },
         {
-          :interface        => lookup('sagittaire', node_uid, 'network_interfaces', 'eth1', 'interface'),
-          :rate             => lookup('sagittaire', node_uid, 'network_interfaces', 'eth1', 'rate'),
-          :enabled          => lookup('sagittaire', node_uid, 'network_interfaces', 'eth1', 'enabled'),
-          :management       => lookup('sagittaire', node_uid, 'network_interfaces', 'eth1', 'management'),
-          :mountable        => lookup('sagittaire', node_uid, 'network_interfaces', 'eth1', 'mountable'),
-          :mounted          => lookup('sagittaire', node_uid, 'network_interfaces', 'eth1', 'mounted'),
+          :interface        => lookup('sagittaire_generated', node_uid, 'network_interfaces', 'eth1', 'interface'),
+          :rate             => lookup('sagittaire_generated', node_uid, 'network_interfaces', 'eth1', 'rate'),
+          :enabled          => lookup('sagittaire_generated', node_uid, 'network_interfaces', 'eth1', 'enabled'),
+          :management       => lookup('sagittaire_generated', node_uid, 'network_interfaces', 'eth1', 'management'),
+          :mountable        => lookup('sagittaire_generated', node_uid, 'network_interfaces', 'eth1', 'mountable'),
+          :mounted          => lookup('sagittaire_generated', node_uid, 'network_interfaces', 'eth1', 'mounted'),
           :bridged          => true,
           :device           => "eth1",
           :vendor           => 'Broadcom',
           :model            => 'BCM5704',
-          :driver           => lookup('sagittaire', node_uid, 'network_interfaces', 'eth1', 'driver'),
+          :driver           => lookup('sagittaire_generated', node_uid, 'network_interfaces', 'eth1', 'driver'),
           :network_address  => "#{node_uid}.#{site_uid}.grid5000.fr",
-          :ip               => lookup('sagittaire', node_uid, 'network_interfaces', 'eth1', 'ip'),
-          :ip6              => lookup('sagittaire', node_uid, 'network_interfaces', 'eth1', 'ip6'),
+          :ip               => lookup('sagittaire_generated', node_uid, 'network_interfaces', 'eth1', 'ip'),
+          :ip6              => lookup('sagittaire_generated', node_uid, 'network_interfaces', 'eth1', 'ip6'),
           :switch           => "gw-lyon",
-          :switch_port      => lookup('sagittaire', node_uid, 'network_interfaces', 'eth1', 'switch_port'),
-          :mac              => lookup('sagittaire', node_uid, 'network_interfaces', 'eth1', 'mac')
+          :switch_port      => lookup('sagittaire_generated', node_uid, 'network_interfaces', 'eth1', 'switch_port'),
+          :mac              => lookup('sagittaire_generated', node_uid, 'network_interfaces', 'eth1', 'mac')
         },
         {
           :interface        => 'Ethernet',
@@ -121,21 +121,21 @@ site :lyon do |site_uid|
           :mounted          => false,
           :device           => "bmc",
           :network_address  => "#{node_uid}-bmc.#{site_uid}.grid5000.fr",
-          :ip               => lookup('sagittaire', node_uid, 'network_interfaces', 'bmc', 'ip'),
-          :mac              => lookup('sagittaire', node_uid, 'network_interfaces', 'bmc', 'mac'),
+          :ip               => lookup('sagittaire_generated', node_uid, 'network_interfaces', 'bmc', 'ip'),
+          :mac              => lookup('sagittaire_generated', node_uid, 'network_interfaces', 'bmc', 'mac'),
           :driver           => "bnx2"
         }]
 
         chassis({
-          :serial       => lookup('sagittaire', node_uid, 'chassis', 'serial_number'),
-          :name         => lookup('sagittaire', node_uid, 'chassis', 'product_name'),
-          :manufacturer => lookup('sagittaire', node_uid, 'chassis', 'manufacturer')
+          :serial       => lookup('sagittaire_generated', node_uid, 'chassis', 'serial_number'),
+          :name         => lookup('sagittaire_generated', node_uid, 'chassis', 'product_name'),
+          :manufacturer => lookup('sagittaire_generated', node_uid, 'chassis', 'manufacturer')
         })
 
         bios({
-          :version      => lookup('sagittaire', node_uid, 'bios', 'version'),
-          :vendor       => lookup('sagittaire', node_uid, 'bios', 'vendor'),
-          :release_date => lookup('sagittaire', node_uid, 'bios', 'release_date')
+          :version      => lookup('sagittaire_generated', node_uid, 'bios', 'version'),
+          :vendor       => lookup('sagittaire_generated', node_uid, 'bios', 'vendor'),
+          :release_date => lookup('sagittaire_generated', node_uid, 'bios', 'release_date')
         })
 
         gpu({
diff --git a/generators/input/sites/lyon/clusters/sagittaire.yaml b/generators/input/sites/lyon/clusters/sagittaire_generated.yaml
similarity index 99%
rename from generators/input/sites/lyon/clusters/sagittaire.yaml
rename to generators/input/sites/lyon/clusters/sagittaire_generated.yaml
index 755361bd231..887a952e00a 100644
--- a/generators/input/sites/lyon/clusters/sagittaire.yaml
+++ b/generators/input/sites/lyon/clusters/sagittaire_generated.yaml
@@ -4571,7 +4571,7 @@ sagittaire-73:
   network_interfaces:
     eth0:
       mounted: false
-      mac:
+      mac: 
       management: false
       enabled: true
       interface: Ethernet
@@ -4581,7 +4581,7 @@ sagittaire-73:
     eth1:
       mounted: true
       rate: 1000000000
-      mac:
+      mac: 
       ip6: fe80::209:3dff:fe11:9522
       management: false
       enabled: true
@@ -4590,7 +4590,7 @@ sagittaire-73:
       mountable: true
       ip: 172.16.49.73
     bmc:
-      mac:
+      mac: 
       ip: 172.17.49.73
   supported_job_types:
     virtual: false
diff --git a/generators/input/sites/lyon/clusters/taurus.rb b/generators/input/sites/lyon/clusters/taurus.rb
index 141252ddc50..95c31311517 100644
--- a/generators/input/sites/lyon/clusters/taurus.rb
+++ b/generators/input/sites/lyon/clusters/taurus.rb
@@ -16,146 +16,146 @@ site :lyon do |site_uid|
         supported_job_types({
           :deploy       => true,
           :besteffort   => true,
-          :virtual      => lookup('taurus', node_uid, 'supported_job_types', 'virtual')
+          :virtual      => lookup('taurus_generated', node_uid, 'supported_job_types', 'virtual')
         })
 
         architecture({
-          :smp_size       => lookup('taurus', node_uid, 'architecture', 'smp_size'),
-          :smt_size       => lookup('taurus', node_uid, 'architecture', 'smt_size'),
-          :platform_type  => lookup('taurus', node_uid, 'architecture', 'platform_type')
+          :smp_size       => lookup('taurus_generated', node_uid, 'architecture', 'smp_size'),
+          :smt_size       => lookup('taurus_generated', node_uid, 'architecture', 'smt_size'),
+          :platform_type  => lookup('taurus_generated', node_uid, 'architecture', 'platform_type')
         })
 
         processor({
-          :vendor             => lookup('taurus', node_uid, 'processor', 'vendor'),
-          :model              => lookup('taurus', node_uid, 'processor', 'model'),
-          :version            => lookup('taurus', node_uid, 'processor', 'version'),
-          :clock_speed        => lookup('taurus', node_uid, 'processor', 'clock_speed'),
-          :instruction_set    => lookup('taurus', node_uid, 'processor', 'instruction_set'),
-          :other_description  => lookup('taurus', node_uid, 'processor', 'other_description'),
-          :cache_l1           => lookup('taurus', node_uid, 'processor', 'cache_l1'),
-          :cache_l1i          => lookup('taurus', node_uid, 'processor', 'cache_l1i'),
-          :cache_l1d          => lookup('taurus', node_uid, 'processor', 'cache_l1d'),
-          :cache_l2           => lookup('taurus', node_uid, 'processor', 'cache_l2'),
-          :cache_l3           => lookup('taurus', node_uid, 'processor', 'cache_l3')
+          :vendor             => lookup('taurus_generated', node_uid, 'processor', 'vendor'),
+          :model              => lookup('taurus_generated', node_uid, 'processor', 'model'),
+          :version            => lookup('taurus_generated', node_uid, 'processor', 'version'),
+          :clock_speed        => lookup('taurus_generated', node_uid, 'processor', 'clock_speed'),
+          :instruction_set    => lookup('taurus_generated', node_uid, 'processor', 'instruction_set'),
+          :other_description  => lookup('taurus_generated', node_uid, 'processor', 'other_description'),
+          :cache_l1           => lookup('taurus_generated', node_uid, 'processor', 'cache_l1'),
+          :cache_l1i          => lookup('taurus_generated', node_uid, 'processor', 'cache_l1i'),
+          :cache_l1d          => lookup('taurus_generated', node_uid, 'processor', 'cache_l1d'),
+          :cache_l2           => lookup('taurus_generated', node_uid, 'processor', 'cache_l2'),
+          :cache_l3           => lookup('taurus_generated', node_uid, 'processor', 'cache_l3')
         })
 
         main_memory({
-          :ram_size     => lookup('taurus', node_uid, 'main_memory', 'ram_size'),
+          :ram_size     => lookup('taurus_generated', node_uid, 'main_memory', 'ram_size'),
           :virtual_size => nil
         })
 
         operating_system({
-          :name     => lookup('taurus', node_uid, 'operating_system', 'name'),
+          :name     => lookup('taurus_generated', node_uid, 'operating_system', 'name'),
           :release  => "Squeeze",
-          :version  => lookup('taurus', node_uid, 'operating_system', 'version'),
-          :kernel   => lookup('taurus', node_uid, 'operating_system', 'kernel')
+          :version  => lookup('taurus_generated', node_uid, 'operating_system', 'version'),
+          :kernel   => lookup('taurus_generated', node_uid, 'operating_system', 'kernel')
         })
 
         storage_devices [{
           :interface  => 'SCSI',
-          :size       => lookup('taurus', node_uid, 'block_devices', 'sda', 'size'),
+          :size       => lookup('taurus_generated', node_uid, 'block_devices', 'sda', 'size'),
           :driver     => "megaraid_sas",
-          :device     => lookup('taurus', node_uid, 'block_devices', 'sda', 'device'),
-          :model      => lookup('taurus', node_uid, 'block_devices', 'sda', 'model'),
-          :vendor     => lookup('taurus', node_uid, 'block_devices', 'sda', 'vendor'),
-          :rev        => lookup('taurus', node_uid, 'block_devices', 'sda', 'rev')
+          :device     => lookup('taurus_generated', node_uid, 'block_devices', 'sda', 'device'),
+          :model      => lookup('taurus_generated', node_uid, 'block_devices', 'sda', 'model'),
+          :vendor     => lookup('taurus_generated', node_uid, 'block_devices', 'sda', 'vendor'),
+          :rev        => lookup('taurus_generated', node_uid, 'block_devices', 'sda', 'rev')
         }]
 
         network_adapters [{
-          :interface        => lookup('taurus', node_uid, 'network_interfaces', 'eth0', 'interface'),
-          :rate             => lookup('taurus', node_uid, 'network_interfaces', 'eth0', 'rate'),
-          :enabled          => lookup('taurus', node_uid, 'network_interfaces', 'eth0', 'enabled'),
-          :management       => lookup('taurus', node_uid, 'network_interfaces', 'eth0', 'management'),
-          :mountable        => lookup('taurus', node_uid, 'network_interfaces', 'eth0', 'mountable'),
-          :mounted          => lookup('taurus', node_uid, 'network_interfaces', 'eth0', 'mounted'),
+          :interface        => lookup('taurus_generated', node_uid, 'network_interfaces', 'eth0', 'interface'),
+          :rate             => lookup('taurus_generated', node_uid, 'network_interfaces', 'eth0', 'rate'),
+          :enabled          => lookup('taurus_generated', node_uid, 'network_interfaces', 'eth0', 'enabled'),
+          :management       => lookup('taurus_generated', node_uid, 'network_interfaces', 'eth0', 'management'),
+          :mountable        => lookup('taurus_generated', node_uid, 'network_interfaces', 'eth0', 'mountable'),
+          :mounted          => lookup('taurus_generated', node_uid, 'network_interfaces', 'eth0', 'mounted'),
           :bridged          => true,
           :device           => "eth0",
           :vendor           => 'Intel',
           :model            => 'Intel X520 DP 10Gb DA/SFP+ Server Adapter',
-          :driver           => lookup('taurus', node_uid, 'network_interfaces', 'eth0', 'driver'),
+          :driver           => lookup('taurus_generated', node_uid, 'network_interfaces', 'eth0', 'driver'),
           :network_address  => "#{node_uid}.#{site_uid}.grid5000.fr",
-          :ip               => lookup('taurus', node_uid, 'network_interfaces', 'eth0', 'ip'),
-          :ip6              => lookup('taurus', node_uid, 'network_interfaces', 'eth0', 'ip6'),
+          :ip               => lookup('taurus_generated', node_uid, 'network_interfaces', 'eth0', 'ip'),
+          :ip6              => lookup('taurus_generated', node_uid, 'network_interfaces', 'eth0', 'ip6'),
           :switch           => "force10",
-          :switch_port      => lookup('taurus', node_uid, 'network_interfaces', 'eth0', 'switch_port'),
-          :mac              => lookup('taurus', node_uid, 'network_interfaces', 'eth0', 'mac')
+          :switch_port      => lookup('taurus_generated', node_uid, 'network_interfaces', 'eth0', 'switch_port'),
+          :mac              => lookup('taurus_generated', node_uid, 'network_interfaces', 'eth0', 'mac')
         },
         {
-          :interface        => lookup('taurus', node_uid, 'network_interfaces', 'eth1', 'interface'),
+          :interface        => lookup('taurus_generated', node_uid, 'network_interfaces', 'eth1', 'interface'),
           :rate             => 1.G,
-          :enabled          => lookup('taurus', node_uid, 'network_interfaces', 'eth1', 'enabled'),
-          :management       => lookup('taurus', node_uid, 'network_interfaces', 'eth1', 'management'),
-          :mountable        => lookup('taurus', node_uid, 'network_interfaces', 'eth1', 'mountable'),
-          :mounted          => lookup('taurus', node_uid, 'network_interfaces', 'eth1', 'mounted'),
+          :enabled          => lookup('taurus_generated', node_uid, 'network_interfaces', 'eth1', 'enabled'),
+          :management       => lookup('taurus_generated', node_uid, 'network_interfaces', 'eth1', 'management'),
+          :mountable        => lookup('taurus_generated', node_uid, 'network_interfaces', 'eth1', 'mountable'),
+          :mounted          => lookup('taurus_generated', node_uid, 'network_interfaces', 'eth1', 'mounted'),
           :device           => "eth1",
           :bridged          => false,
           :vendor           => 'Intel',
           :model            => 'Intel X520 DP 10Gb DA/SFP+ Server Adapter',
-          :driver           => lookup('taurus', node_uid, 'network_interfaces', 'eth1', 'driver'),
-          :mac              => lookup('taurus', node_uid, 'network_interfaces', 'eth1', 'mac')
+          :driver           => lookup('taurus_generated', node_uid, 'network_interfaces', 'eth1', 'driver'),
+          :mac              => lookup('taurus_generated', node_uid, 'network_interfaces', 'eth1', 'mac')
         },
         {
-          :interface        => lookup('taurus', node_uid, 'network_interfaces', 'eth2', 'interface'),
+          :interface        => lookup('taurus_generated', node_uid, 'network_interfaces', 'eth2', 'interface'),
           :rate             => 1.G,
-          :enabled          => lookup('taurus', node_uid, 'network_interfaces', 'eth2', 'enabled'),
-          :management       => lookup('taurus', node_uid, 'network_interfaces', 'eth2', 'management'),
-          :mountable        => lookup('taurus', node_uid, 'network_interfaces', 'eth2', 'mountable'),
-          :mounted          => lookup('taurus', node_uid, 'network_interfaces', 'eth2', 'mounted'),
+          :enabled          => lookup('taurus_generated', node_uid, 'network_interfaces', 'eth2', 'enabled'),
+          :management       => lookup('taurus_generated', node_uid, 'network_interfaces', 'eth2', 'management'),
+          :mountable        => lookup('taurus_generated', node_uid, 'network_interfaces', 'eth2', 'mountable'),
+          :mounted          => lookup('taurus_generated', node_uid, 'network_interfaces', 'eth2', 'mounted'),
           :device           => "eth2",
           :bridged          => false,
           :vendor           => 'Intel',
           :model            => 'Intel Ethernet I350 QP 1Gb',
-          :driver           => lookup('taurus', node_uid, 'network_interfaces', 'eth2', 'driver'),
-          :mac              => lookup('taurus', node_uid, 'network_interfaces', 'eth2', 'mac')
+          :driver           => lookup('taurus_generated', node_uid, 'network_interfaces', 'eth2', 'driver'),
+          :mac              => lookup('taurus_generated', node_uid, 'network_interfaces', 'eth2', 'mac')
         },
         {
-          :interface        => lookup('taurus', node_uid, 'network_interfaces', 'eth3', 'interface'),
+          :interface        => lookup('taurus_generated', node_uid, 'network_interfaces', 'eth3', 'interface'),
           :rate             => 1.G,
-          :enabled          => lookup('taurus', node_uid, 'network_interfaces', 'eth3', 'enabled'),
-          :management       => lookup('taurus', node_uid, 'network_interfaces', 'eth3', 'management'),
-          :mountable        => lookup('taurus', node_uid, 'network_interfaces', 'eth3', 'mountable'),
-          :mounted          => lookup('taurus', node_uid, 'network_interfaces', 'eth3', 'mounted'),
+          :enabled          => lookup('taurus_generated', node_uid, 'network_interfaces', 'eth3', 'enabled'),
+          :management       => lookup('taurus_generated', node_uid, 'network_interfaces', 'eth3', 'management'),
+          :mountable        => lookup('taurus_generated', node_uid, 'network_interfaces', 'eth3', 'mountable'),
+          :mounted          => lookup('taurus_generated', node_uid, 'network_interfaces', 'eth3', 'mounted'),
           :device           => "eth3",
           :bridged          => false,
           :vendor           => 'Intel',
           :model            => 'Intel Ethernet I350 QP 1Gb',
-          :driver           => lookup('taurus', node_uid, 'network_interfaces', 'eth3', 'driver'),
-          :mac              => lookup('taurus', node_uid, 'network_interfaces', 'eth3', 'mac')
+          :driver           => lookup('taurus_generated', node_uid, 'network_interfaces', 'eth3', 'driver'),
+          :mac              => lookup('taurus_generated', node_uid, 'network_interfaces', 'eth3', 'mac')
         },
         {
-          :interface        => lookup('taurus', node_uid, 'network_interfaces', 'eth4', 'interface'),
+          :interface        => lookup('taurus_generated', node_uid, 'network_interfaces', 'eth4', 'interface'),
           :rate             => 1.G,
-          :enabled          => lookup('taurus', node_uid, 'network_interfaces', 'eth4', 'enabled'),
-          :management       => lookup('taurus', node_uid, 'network_interfaces', 'eth4', 'management'),
-          :mountable        => lookup('taurus', node_uid, 'network_interfaces', 'eth4', 'mountable'),
-          :mounted          => lookup('taurus', node_uid, 'network_interfaces', 'eth4', 'mounted'),
+          :enabled          => lookup('taurus_generated', node_uid, 'network_interfaces', 'eth4', 'enabled'),
+          :management       => lookup('taurus_generated', node_uid, 'network_interfaces', 'eth4', 'management'),
+          :mountable        => lookup('taurus_generated', node_uid, 'network_interfaces', 'eth4', 'mountable'),
+          :mounted          => lookup('taurus_generated', node_uid, 'network_interfaces', 'eth4', 'mounted'),
           :device           => "eth4",
           :bridged          => false,
           :vendor           => 'Intel',
           :model            => 'Intel Ethernet I350 QP 1Gb',
-          :driver           => lookup('taurus', node_uid, 'network_interfaces', 'eth4', 'driver'),
-          :mac              => lookup('taurus', node_uid, 'network_interfaces', 'eth4', 'mac')
+          :driver           => lookup('taurus_generated', node_uid, 'network_interfaces', 'eth4', 'driver'),
+          :mac              => lookup('taurus_generated', node_uid, 'network_interfaces', 'eth4', 'mac')
         },
         {
-          :interface        => lookup('taurus', node_uid, 'network_interfaces', 'eth5', 'interface'),
+          :interface        => lookup('taurus_generated', node_uid, 'network_interfaces', 'eth5', 'interface'),
           :rate             => 1.G,
-          :enabled          => lookup('taurus', node_uid, 'network_interfaces', 'eth5', 'enabled'),
-          :management       => lookup('taurus', node_uid, 'network_interfaces', 'eth5', 'management'),
-          :mountable        => lookup('taurus', node_uid, 'network_interfaces', 'eth5', 'mountable'),
-          :mounted          => lookup('taurus', node_uid, 'network_interfaces', 'eth5', 'mounted'),
+          :enabled          => lookup('taurus_generated', node_uid, 'network_interfaces', 'eth5', 'enabled'),
+          :management       => lookup('taurus_generated', node_uid, 'network_interfaces', 'eth5', 'management'),
+          :mountable        => lookup('taurus_generated', node_uid, 'network_interfaces', 'eth5', 'mountable'),
+          :mounted          => lookup('taurus_generated', node_uid, 'network_interfaces', 'eth5', 'mounted'),
           :device           => "eth5",
           :bridged          => false,
           :vendor           => 'Intel',
           :model            => 'Intel Ethernet I350 QP 1Gb',
-          :driver           => lookup('taurus', node_uid, 'network_interfaces', 'eth5', 'driver'),
-          :mac              => lookup('taurus', node_uid, 'network_interfaces', 'eth5', 'mac')
+          :driver           => lookup('taurus_generated', node_uid, 'network_interfaces', 'eth5', 'driver'),
+          :mac              => lookup('taurus_generated', node_uid, 'network_interfaces', 'eth5', 'mac')
         },
         {
           :interface            => 'Ethernet',
           :rate                 => 1.G,
           :network_address      => "#{node_uid}-bmc.#{site_uid}.grid5000.fr",
-          :ip                   => lookup('taurus', node_uid, 'network_interfaces', 'bmc', 'ip'),
-          :mac                  => lookup('taurus', node_uid, 'network_interfaces', 'bmc', 'mac'),
+          :ip                   => lookup('taurus_generated', node_uid, 'network_interfaces', 'bmc', 'ip'),
+          :mac                  => lookup('taurus_generated', node_uid, 'network_interfaces', 'bmc', 'mac'),
           :enabled              => true,
           :mounted              => false,
           :mountable            => false,
@@ -164,15 +164,15 @@ site :lyon do |site_uid|
         }]
 
         chassis({
-          :serial       => lookup('taurus', node_uid, 'chassis', 'serial_number'),
-          :name         => lookup('taurus', node_uid, 'chassis', 'product_name'),
-          :manufacturer => lookup('taurus', node_uid, 'chassis', 'manufacturer')
+          :serial       => lookup('taurus_generated', node_uid, 'chassis', 'serial_number'),
+          :name         => lookup('taurus_generated', node_uid, 'chassis', 'product_name'),
+          :manufacturer => lookup('taurus_generated', node_uid, 'chassis', 'manufacturer')
         })
 
         bios({
-          :version      => lookup('taurus', node_uid, 'bios', 'version'),
-          :vendor       => lookup('taurus', node_uid, 'bios', 'vendor'),
-          :release_date => lookup('taurus', node_uid, 'bios', 'release_date')
+          :version      => lookup('taurus_generated', node_uid, 'bios', 'version'),
+          :vendor       => lookup('taurus_generated', node_uid, 'bios', 'vendor'),
+          :release_date => lookup('taurus_generated', node_uid, 'bios', 'release_date')
         })
 
         gpu({
diff --git a/generators/input/sites/lyon/clusters/taurus.yaml b/generators/input/sites/lyon/clusters/taurus_generated.yaml
similarity index 100%
rename from generators/input/sites/lyon/clusters/taurus.yaml
rename to generators/input/sites/lyon/clusters/taurus_generated.yaml
diff --git a/generators/input/sites/nancy/clusters/graphene.rb b/generators/input/sites/nancy/clusters/graphene.rb
index 2ceb960c77b..6cf6e14409c 100644
--- a/generators/input/sites/nancy/clusters/graphene.rb
+++ b/generators/input/sites/nancy/clusters/graphene.rb
@@ -16,126 +16,126 @@ site :nancy do |site_uid|
         supported_job_types({
           :deploy       => true,
           :besteffort   => true,
-          :virtual      => lookup('graphene', node_uid, 'supported_job_types', 'virtual')
+          :virtual      => lookup('graphene_generated', node_uid, 'supported_job_types', 'virtual')
         })
 
         architecture({
-          :smp_size       => lookup('graphene', node_uid, 'architecture', 'smp_size'),
-          :smt_size       => lookup('graphene', node_uid, 'architecture', 'smt_size'),
-          :platform_type  => lookup('graphene', node_uid, 'architecture', 'platform_type')
+          :smp_size       => lookup('graphene_generated', node_uid, 'architecture', 'smp_size'),
+          :smt_size       => lookup('graphene_generated', node_uid, 'architecture', 'smt_size'),
+          :platform_type  => lookup('graphene_generated', node_uid, 'architecture', 'platform_type')
         })
 
         processor({
-          :vendor             => lookup('graphene', node_uid, 'processor', 'vendor'),
-          :model              => lookup('graphene', node_uid, 'processor', 'model'),
-          :version            => lookup('graphene', node_uid, 'processor', 'version'),
-          :clock_speed        => lookup('graphene', node_uid, 'processor', 'clock_speed'),
-          :instruction_set    => lookup('graphene', node_uid, 'processor', 'instruction_set'),
-          :other_description  => lookup('graphene', node_uid, 'processor', 'other_description'),
-          :cache_l1           => lookup('graphene', node_uid, 'processor', 'cache_l1'),
-          :cache_l1i          => lookup('graphene', node_uid, 'processor', 'cache_l1i'),
-          :cache_l1d          => lookup('graphene', node_uid, 'processor', 'cache_l1d'),
-          :cache_l2           => lookup('graphene', node_uid, 'processor', 'cache_l2'),
-          :cache_l3           => lookup('graphene', node_uid, 'processor', 'cache_l3')
+          :vendor             => lookup('graphene_generated', node_uid, 'processor', 'vendor'),
+          :model              => lookup('graphene_generated', node_uid, 'processor', 'model'),
+          :version            => lookup('graphene_generated', node_uid, 'processor', 'version'),
+          :clock_speed        => lookup('graphene_generated', node_uid, 'processor', 'clock_speed'),
+          :instruction_set    => lookup('graphene_generated', node_uid, 'processor', 'instruction_set'),
+          :other_description  => lookup('graphene_generated', node_uid, 'processor', 'other_description'),
+          :cache_l1           => lookup('graphene_generated', node_uid, 'processor', 'cache_l1'),
+          :cache_l1i          => lookup('graphene_generated', node_uid, 'processor', 'cache_l1i'),
+          :cache_l1d          => lookup('graphene_generated', node_uid, 'processor', 'cache_l1d'),
+          :cache_l2           => lookup('graphene_generated', node_uid, 'processor', 'cache_l2'),
+          :cache_l3           => lookup('graphene_generated', node_uid, 'processor', 'cache_l3')
         })
 
         main_memory({
-          :ram_size     => lookup('graphene', node_uid, 'main_memory', 'ram_size'),
+          :ram_size     => lookup('graphene_generated', node_uid, 'main_memory', 'ram_size'),
           :virtual_size => nil
         })
 
         operating_system({
-          :name     => lookup('graphene', node_uid, 'operating_system', 'name'),
+          :name     => lookup('graphene_generated', node_uid, 'operating_system', 'name'),
           :release  => "Squeeze",
-          :version  => lookup('graphene', node_uid, 'operating_system', 'version'),
-          :kernel   => lookup('graphene', node_uid, 'operating_system', 'kernel')
+          :version  => lookup('graphene_generated', node_uid, 'operating_system', 'version'),
+          :kernel   => lookup('graphene_generated', node_uid, 'operating_system', 'kernel')
         })
 
         storage_devices [{
           :interface  => 'SATA II',
-          :size       => lookup('graphene', node_uid, 'block_devices', 'sda', 'size'),
+          :size       => lookup('graphene_generated', node_uid, 'block_devices', 'sda', 'size'),
           :driver     => "ahci",
-          :device     => lookup('graphene', node_uid, 'block_devices', 'sda', 'device'),
-          :model      => lookup('graphene', node_uid, 'block_devices', 'sda', 'model'),
-          :vendor     => lookup('graphene', node_uid, 'block_devices', 'sda', 'vendor'),
-          :rev        => lookup('graphene', node_uid, 'block_devices', 'sda', 'rev')
+          :device     => lookup('graphene_generated', node_uid, 'block_devices', 'sda', 'device'),
+          :model      => lookup('graphene_generated', node_uid, 'block_devices', 'sda', 'model'),
+          :vendor     => lookup('graphene_generated', node_uid, 'block_devices', 'sda', 'vendor'),
+          :rev        => lookup('graphene_generated', node_uid, 'block_devices', 'sda', 'rev')
         }]
 
         network_adapters [{
-          :interface        => lookup('graphene', node_uid, 'network_interfaces', 'eth0', 'interface'),
-          :rate             => lookup('graphene', node_uid, 'network_interfaces', 'eth0', 'rate'),
-          :enabled          => lookup('graphene', node_uid, 'network_interfaces', 'eth0', 'enabled'),
-          :management       => lookup('graphene', node_uid, 'network_interfaces', 'eth0', 'management'),
-          :mountable        => lookup('graphene', node_uid, 'network_interfaces', 'eth0', 'mountable'),
-          :mounted          => lookup('graphene', node_uid, 'network_interfaces', 'eth0', 'mounted'),
+          :interface        => lookup('graphene_generated', node_uid, 'network_interfaces', 'eth0', 'interface'),
+          :rate             => lookup('graphene_generated', node_uid, 'network_interfaces', 'eth0', 'rate'),
+          :enabled          => lookup('graphene_generated', node_uid, 'network_interfaces', 'eth0', 'enabled'),
+          :management       => lookup('graphene_generated', node_uid, 'network_interfaces', 'eth0', 'management'),
+          :mountable        => lookup('graphene_generated', node_uid, 'network_interfaces', 'eth0', 'mountable'),
+          :mounted          => lookup('graphene_generated', node_uid, 'network_interfaces', 'eth0', 'mounted'),
           :bridged          => true,
           :device           => "eth0",
           :vendor           => "intel",
           :version          => "82574L",
-          :driver           => lookup('graphene', node_uid, 'network_interfaces', 'eth0', 'driver'),
+          :driver           => lookup('graphene_generated', node_uid, 'network_interfaces', 'eth0', 'driver'),
           :network_address  => "#{node_uid}.#{site_uid}.grid5000.fr",
-          :ip               => lookup('graphene', node_uid, 'network_interfaces', 'eth0', 'ip'),
-          :ip6              => lookup('graphene', node_uid, 'network_interfaces', 'eth0', 'ip6'),
-          :switch           => lookup('graphene', node_uid, 'network_interfaces', 'eth0', 'switch_name'),
-          :switch_port      => lookup('graphene', node_uid, 'network_interfaces', 'eth0', 'switch_port'),
-          :mac              => lookup('graphene', node_uid, 'network_interfaces', 'eth0', 'mac')
+          :ip               => lookup('graphene_generated', node_uid, 'network_interfaces', 'eth0', 'ip'),
+          :ip6              => lookup('graphene_generated', node_uid, 'network_interfaces', 'eth0', 'ip6'),
+          :switch           => lookup('graphene_manual', node_uid, 'network_interfaces', 'eth0', 'switch_name'),
+          :switch_port      => lookup('graphene_manual', node_uid, 'network_interfaces', 'eth0', 'switch_port'),
+          :mac              => lookup('graphene_generated', node_uid, 'network_interfaces', 'eth0', 'mac')
         },
         {
-          :interface        => lookup('graphene', node_uid, 'network_interfaces', 'eth1', 'interface'),
-          :rate             => lookup('graphene', node_uid, 'network_interfaces', 'eth1', 'rate'),
-          :enabled          => lookup('graphene', node_uid, 'network_interfaces', 'eth1', 'enabled'),
-          :management       => lookup('graphene', node_uid, 'network_interfaces', 'eth1', 'management'),
-          :mountable        => lookup('graphene', node_uid, 'network_interfaces', 'eth1', 'mountable'),
-          :mounted          => lookup('graphene', node_uid, 'network_interfaces', 'eth1', 'mounted'),
+          :interface        => lookup('graphene_generated', node_uid, 'network_interfaces', 'eth1', 'interface'),
+          :rate             => lookup('graphene_generated', node_uid, 'network_interfaces', 'eth1', 'rate'),
+          :enabled          => lookup('graphene_generated', node_uid, 'network_interfaces', 'eth1', 'enabled'),
+          :management       => lookup('graphene_generated', node_uid, 'network_interfaces', 'eth1', 'management'),
+          :mountable        => lookup('graphene_generated', node_uid, 'network_interfaces', 'eth1', 'mountable'),
+          :mounted          => lookup('graphene_generated', node_uid, 'network_interfaces', 'eth1', 'mounted'),
           :bridged          => false,
           :device           => "eth1",
           :vendor           => "intel",
           :version          => "82574L",
-          :driver           => lookup('graphene', node_uid, 'network_interfaces', 'eth1', 'driver'),
-          :mac              => lookup('graphene', node_uid, 'network_interfaces', 'eth1', 'mac')
+          :driver           => lookup('graphene_generated', node_uid, 'network_interfaces', 'eth1', 'driver'),
+          :mac              => lookup('graphene_generated', node_uid, 'network_interfaces', 'eth1', 'mac')
         },
         {
-          :interface        => lookup('graphene', node_uid, 'network_interfaces', 'eth2', 'interface'),
-          :enabled          => lookup('graphene', node_uid, 'network_interfaces', 'eth2', 'enabled'),
-          :management       => lookup('graphene', node_uid, 'network_interfaces', 'eth2', 'management'),
-          :mountable        => lookup('graphene', node_uid, 'network_interfaces', 'eth2', 'mountable'),
-          :mounted          => lookup('graphene', node_uid, 'network_interfaces', 'eth2', 'mounted'),
+          :interface        => lookup('graphene_generated', node_uid, 'network_interfaces', 'eth2', 'interface'),
+          :enabled          => lookup('graphene_generated', node_uid, 'network_interfaces', 'eth2', 'enabled'),
+          :management       => lookup('graphene_generated', node_uid, 'network_interfaces', 'eth2', 'management'),
+          :mountable        => lookup('graphene_generated', node_uid, 'network_interfaces', 'eth2', 'mountable'),
+          :mounted          => lookup('graphene_generated', node_uid, 'network_interfaces', 'eth2', 'mounted'),
           :bridged          => false,
           :device           => "eth2",
           :vendor           => "intel",
           :version          => "82574L",
-          :driver           => lookup('graphene', node_uid, 'network_interfaces', 'eth2', 'driver'),
-          :mac              => lookup('graphene', node_uid, 'network_interfaces', 'eth2', 'mac')
+          :driver           => lookup('graphene_generated', node_uid, 'network_interfaces', 'eth2', 'driver'),
+          :mac              => lookup('graphene_generated', node_uid, 'network_interfaces', 'eth2', 'mac')
         },
         {
-          :interface        => lookup('graphene', node_uid, 'network_interfaces', 'ib0', 'interface'),
-          :rate             => lookup('graphene', node_uid, 'network_interfaces', 'ib0', 'rate'),
+          :interface        => lookup('graphene_generated', node_uid, 'network_interfaces', 'ib0', 'interface'),
+          :rate             => lookup('graphene_generated', node_uid, 'network_interfaces', 'ib0', 'rate'),
           :device           => "ib0",
-          :enabled          => lookup('graphene', node_uid, 'network_interfaces', 'ib0', 'enabled'),
-          :management       => lookup('graphene', node_uid, 'network_interfaces', 'ib0', 'management'),
-          :mountable        => lookup('graphene', node_uid, 'network_interfaces', 'ib0', 'mountable'),
-          :mounted          => lookup('graphene', node_uid, 'network_interfaces', 'ib0', 'mounted'),
+          :enabled          => lookup('graphene_generated', node_uid, 'network_interfaces', 'ib0', 'enabled'),
+          :management       => lookup('graphene_generated', node_uid, 'network_interfaces', 'ib0', 'management'),
+          :mountable        => lookup('graphene_generated', node_uid, 'network_interfaces', 'ib0', 'mountable'),
+          :mounted          => lookup('graphene_generated', node_uid, 'network_interfaces', 'ib0', 'mounted'),
           :vendor           => 'Mellanox',
           :version          => "MT26418",
-          :driver           => lookup('graphene', node_uid, 'network_interfaces', 'ib0', 'driver'),
+          :driver           => lookup('graphene_generated', node_uid, 'network_interfaces', 'ib0', 'driver'),
           :network_address  => "#{node_uid}-ib0.#{site_uid}.grid5000.fr",
-          :ip               => lookup('graphene', node_uid, 'network_interfaces', 'ib0', 'ip'),
-          :ip6              => lookup('graphene', node_uid, 'network_interfaces', 'ib0', 'ip6'),
-          :guid             => lookup('graphene', node_uid, 'network_interfaces', 'ib0', 'guid'),
+          :ip               => lookup('graphene_generated', node_uid, 'network_interfaces', 'ib0', 'ip'),
+          :ip6              => lookup('graphene_generated', node_uid, 'network_interfaces', 'ib0', 'ip6'),
+          :guid             => lookup('graphene_generated', node_uid, 'network_interfaces', 'ib0', 'guid'),
           :switch           => "sgrapheneib",
         },
         {
-          :interface        => lookup('graphene', node_uid, 'network_interfaces', 'ib1', 'interface'),
-          :rate             => lookup('graphene', node_uid, 'network_interfaces', 'ib1', 'rate'),
+          :interface        => lookup('graphene_generated', node_uid, 'network_interfaces', 'ib1', 'interface'),
+          :rate             => lookup('graphene_generated', node_uid, 'network_interfaces', 'ib1', 'rate'),
           :device           => "ib1",
-          :enabled          => lookup('graphene', node_uid, 'network_interfaces', 'ib1', 'enabled'),
-          :management       => lookup('graphene', node_uid, 'network_interfaces', 'ib1', 'management'),
-          :mountable        => lookup('graphene', node_uid, 'network_interfaces', 'ib1', 'mountable'),
-          :mounted          => lookup('graphene', node_uid, 'network_interfaces', 'ib1', 'mounted'),
+          :enabled          => lookup('graphene_generated', node_uid, 'network_interfaces', 'ib1', 'enabled'),
+          :management       => lookup('graphene_generated', node_uid, 'network_interfaces', 'ib1', 'management'),
+          :mountable        => lookup('graphene_generated', node_uid, 'network_interfaces', 'ib1', 'mountable'),
+          :mounted          => lookup('graphene_generated', node_uid, 'network_interfaces', 'ib1', 'mounted'),
           :vendor           => 'Mellanox',
           :version          => "MT26418",
-          :driver           => lookup('graphene', node_uid, 'network_interfaces', 'ib1', 'driver'),
-          :guid             => lookup('graphene', node_uid, 'network_interfaces', 'ib1', 'guid')
+          :driver           => lookup('graphene_generated', node_uid, 'network_interfaces', 'ib1', 'driver'),
+          :guid             => lookup('graphene_generated', node_uid, 'network_interfaces', 'ib1', 'guid')
         },
         {
           :interface => 'Ethernet',
@@ -147,23 +147,23 @@ site :nancy do |site_uid|
           :vendor => "Tyan",
           :version => "AST2050",
           :device => "bmc",
-          :ip => lookup('graphene', node_uid, 'network_interfaces', 'bmc', 'ip'),
-          :mac => lookup('graphene', node_uid, 'network_interfaces', 'bmc', 'mac'),
+          :ip => lookup('graphene_generated', node_uid, 'network_interfaces', 'bmc', 'ip'),
+          :mac => lookup('graphene_generated', node_uid, 'network_interfaces', 'bmc', 'mac'),
           :network_address => "#{node_uid}-bmc.#{site_uid}.grid5000.fr",
-          :switch => lookup('graphene', node_uid, 'network_interfaces', 'bmc', 'switch_name'),
-          :switch_port => lookup('graphene', node_uid, 'network_interfaces', 'bmc', 'switch_port')
+          :switch => lookup('graphene_manual', node_uid, 'network_interfaces', 'bmc', 'switch_name'),
+          :switch_port => lookup('graphene_manual', node_uid, 'network_interfaces', 'bmc', 'switch_port')
         }]
 
         chassis({
-          :serial       => lookup('graphene', node_uid, 'chassis', 'serial_number'),
-          :name         => lookup('graphene', node_uid, 'chassis', 'product_name'),
-          :manufacturer => lookup('graphene', node_uid, 'chassis', 'manufacturer')
+          :serial       => lookup('graphene_generated', node_uid, 'chassis', 'serial_number'),
+          :name         => lookup('graphene_generated', node_uid, 'chassis', 'product_name'),
+          :manufacturer => lookup('graphene_generated', node_uid, 'chassis', 'manufacturer')
         })
 
         bios({
-          :version      => lookup('graphene', node_uid, 'bios', 'version'),
-          :vendor       => lookup('graphene', node_uid, 'bios', 'vendor'),
-          :release_date => lookup('graphene', node_uid, 'bios', 'release_date')
+          :version      => lookup('graphene_generated', node_uid, 'bios', 'version'),
+          :vendor       => lookup('graphene_generated', node_uid, 'bios', 'vendor'),
+          :release_date => lookup('graphene_generated', node_uid, 'bios', 'release_date')
         })
 
         gpu({
@@ -177,8 +177,8 @@ site :nancy do |site_uid|
               :via => {
                 :api => { :metric => 'pdu' },
                 :pdu => {
-                  :uid  => lookup('graphene', node_uid, 'pdu', 'pdu_name'),
-                  :port => lookup('graphene', node_uid, 'pdu', 'pdu_position'),
+                  :uid  => lookup('graphene_manual', node_uid, 'pdu', 'pdu_name'),
+                  :port => lookup('graphene_manual', node_uid, 'pdu', 'pdu_position'),
                 }
               }
             }
@@ -188,7 +188,7 @@ site :nancy do |site_uid|
             :power => {
               :available => false, # Set to true when pdu resources will be declared
               :via => {
-                :pdu => { :uid  => lookup('graphene', node_uid, 'pdu', 'pdu_name') }
+                :pdu => { :uid  => lookup('graphene_manual', node_uid, 'pdu', 'pdu_name') }
               }
             }
           })
diff --git a/generators/input/sites/nancy/clusters/graphene.yaml b/generators/input/sites/nancy/clusters/graphene_generated.yaml
similarity index 90%
rename from generators/input/sites/nancy/clusters/graphene.yaml
rename to generators/input/sites/nancy/clusters/graphene_generated.yaml
index 7e8aa53bde3..1ed19be43d1 100644
--- a/generators/input/sites/nancy/clusters/graphene.yaml
+++ b/generators/input/sites/nancy/clusters/graphene_generated.yaml
@@ -24,7 +24,6 @@ graphene-1:
       ip: 172.18.64.1
       driver: mlx4_core
       mountable: true
-      switch_name: sgrapheneib
     ib1:
       mounted: false
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:82
@@ -46,8 +45,6 @@ graphene-1:
       driver: e1000e
       mountable: true
       ip: 172.16.64.1
-      switch_name: sgraphene1
-      switch_port: Gi1/0/2
     eth1:
       mounted: false
       rate: 100000000
@@ -68,8 +65,6 @@ graphene-1:
     bmc:
       mac: 00:e0:81:d5:06:83
       ip: 172.17.64.1
-      switch_name: sgraphene1-ipmi
-      switch_port: 1/0/25
   operating_system:
     kernel: 2.6.32-5-amd64
     name: debian
@@ -97,9 +92,6 @@ graphene-1:
     serial_number: 1009390003
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: graphene-pdu1.nancy.grid5000.fr
-    pdu_position: 2
 graphene-2:
   bios:
     version: V7.01e
@@ -125,7 +117,6 @@ graphene-2:
       ip: 172.18.64.2
       driver: mlx4_core
       mountable: true
-      switch_name: sgrapheneib
     ib1:
       mounted: false
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:5e
@@ -147,8 +138,6 @@ graphene-2:
       driver: e1000e
       mountable: true
       ip: 172.16.64.2
-      switch_name: sgraphene1
-      switch_port: Gi1/0/1
     eth1:
       mounted: false
       rate: 100000000
@@ -169,8 +158,6 @@ graphene-2:
     bmc:
       mac: 00:e0:81:d5:07:73
       ip: 172.17.64.2
-      switch_name: sgraphene1-ipmi
-      switch_port: 1/0/26
   operating_system:
     kernel: 2.6.32-5-amd64
     name: debian
@@ -198,9 +185,6 @@ graphene-2:
     serial_number: 1009390004
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: graphene-pdu1.nancy.grid5000.fr
-    pdu_position: 3
 graphene-3:
   bios:
     version: V7.01e
@@ -230,7 +214,6 @@ graphene-3:
       ip: 172.18.64.3
       driver: mlx4_core
       mountable: true
-      switch_name: sgrapheneib
     ib1:
       mounted: false
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:5a
@@ -252,8 +235,6 @@ graphene-3:
       driver: e1000e
       mountable: true
       ip: 172.16.64.3
-      switch_name: sgraphene1
-      switch_port: Gi1/0/4
     eth1:
       mounted: false
       rate: 100000000
@@ -274,8 +255,6 @@ graphene-3:
     bmc:
       mac: 00:e0:81:d5:08:73
       ip: 172.17.64.3
-      switch_name: sgraphene1-ipmi
-      switch_port: 1/0/27
   supported_job_types:
     virtual: ivt
   main_memory:
@@ -299,9 +278,6 @@ graphene-3:
     serial_number: 605634005
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: graphene-pdu1.nancy.grid5000.fr
-    pdu_position: 4
 graphene-4:
   bios:
     version: V7.01e
@@ -324,7 +300,6 @@ graphene-4:
       ip: 172.18.64.4
       driver: mlx4_core
       mountable: true
-      switch_name: sgrapheneib
     ib1:
       mounted: false
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:00:02:c9:03:00:0b:92:be
@@ -346,8 +321,6 @@ graphene-4:
       driver: e1000e
       mountable: true
       ip: 172.16.64.4
-      switch_name: sgraphene1
-      switch_port: Gi1/0/3
     eth1:
       mounted: false
       rate: 100000000
@@ -368,8 +341,6 @@ graphene-4:
     bmc:
       mac: 00:e0:81:d5:08:57
       ip: 172.17.64.4
-      switch_name: sgraphene1-ipmi
-      switch_port: 1/0/28
   block_devices:
     sda:
       model: Hitachi HDS72103
@@ -400,9 +371,6 @@ graphene-4:
     serial_number: 1009390096b
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: graphene-pdu1.nancy.grid5000.fr
-    pdu_position: 5
 graphene-5:
   bios:
     version: V7.01e
@@ -421,7 +389,6 @@ graphene-5:
       ip: 172.18.64.5
       driver: mlx4_core
       mountable: true
-      switch_name: sgrapheneib
     ib1:
       mounted: false
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:7a
@@ -443,8 +410,6 @@ graphene-5:
       driver: e1000e
       mountable: true
       ip: 172.16.64.5
-      switch_name: sgraphene1
-      switch_port: Gi1/0/6
     eth1:
       mounted: false
       rate: 100000000
@@ -465,8 +430,6 @@ graphene-5:
     bmc:
       mac: 00:e0:81:d5:08:bb
       ip: 172.17.64.5
-      switch_name: sgraphene1-ipmi
-      switch_port: 1/0/29
   block_devices:
     sda:
       model: Hitachi HDS72103
@@ -501,9 +464,6 @@ graphene-5:
     serial_number: 1009390007
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: graphene-pdu2.nancy.grid5000.fr
-    pdu_position: 1
 graphene-6:
   bios:
     version: V7.01e
@@ -529,7 +489,6 @@ graphene-6:
       ip: 172.18.64.6
       driver: mlx4_core
       mountable: true
-      switch_name: sgrapheneib
     ib1:
       mounted: false
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:7e
@@ -551,8 +510,6 @@ graphene-6:
       driver: e1000e
       mountable: true
       ip: 172.16.64.6
-      switch_name: sgraphene1
-      switch_port: Gi1/0/5
     eth1:
       mounted: false
       rate: 100000000
@@ -573,8 +530,6 @@ graphene-6:
     bmc:
       mac: 00:e0:81:d5:06:ef
       ip: 172.17.64.6
-      switch_name: sgraphene1-ipmi
-      switch_port: 1/0/30
   operating_system:
     kernel: 2.6.32-5-amd64
     name: debian
@@ -602,9 +557,6 @@ graphene-6:
     serial_number: 1009390008
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: graphene-pdu2.nancy.grid5000.fr
-    pdu_position: 2
 graphene-7:
   bios:
     version: V7.01e
@@ -634,7 +586,6 @@ graphene-7:
       ip: 172.18.64.7
       driver: mlx4_core
       mountable: true
-      switch_name: sgrapheneib
     ib1:
       mounted: false
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:62
@@ -656,8 +607,6 @@ graphene-7:
       driver: e1000e
       mountable: true
       ip: 172.16.64.7
-      switch_name: sgraphene1
-      switch_port: Gi1/0/8
     eth1:
       mounted: false
       rate: 100000000
@@ -678,8 +627,6 @@ graphene-7:
     bmc:
       mac: 00:e0:81:d5:07:3f
       ip: 172.17.64.7
-      switch_name: sgraphene1-ipmi
-      switch_port: 1/0/31
   supported_job_types:
     virtual: ivt
   processor:
@@ -703,9 +650,6 @@ graphene-7:
     serial_number: 1009390009
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: graphene-pdu2.nancy.grid5000.fr
-    pdu_position: 3
 graphene-8:
   bios:
     version: V7.01e
@@ -724,7 +668,6 @@ graphene-8:
       ip: 172.18.64.8
       driver: mlx4_core
       mountable: true
-      switch_name: sgrapheneib
     ib1:
       mounted: false
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:76
@@ -746,8 +689,6 @@ graphene-8:
       driver: e1000e
       mountable: true
       ip: 172.16.64.8
-      switch_name: sgraphene1
-      switch_port: Gi1/0/12
     eth1:
       mounted: false
       rate: 100000000
@@ -768,8 +709,6 @@ graphene-8:
     bmc:
       mac: 00:e0:81:d5:08:0b
       ip: 172.17.64.8
-      switch_name: sgraphene1-ipmi
-      switch_port: 1/0/32
   operating_system:
     kernel: 2.6.32-5-amd64
     name: debian
@@ -804,9 +743,6 @@ graphene-8:
     serial_number: 1009390010
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: graphene-pdu2.nancy.grid5000.fr
-    pdu_position: 4
 graphene-9:
   bios:
     version: V7.01e
@@ -836,7 +772,6 @@ graphene-9:
       ip: 172.18.64.9
       driver: mlx4_core
       mountable: true
-      switch_name: sgrapheneib
     ib1:
       mounted: false
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:6a
@@ -858,8 +793,6 @@ graphene-9:
       driver: e1000e
       mountable: true
       ip: 172.16.64.9
-      switch_name: sgraphene1
-      switch_port: Gi1/0/11
     eth1:
       mounted: false
       rate: 100000000
@@ -880,8 +813,6 @@ graphene-9:
     bmc:
       mac: 00:e0:81:d5:08:87
       ip: 172.17.64.9
-      switch_name: sgraphene1-ipmi
-      switch_port: 1/0/33
   supported_job_types:
     virtual: ivt
   processor:
@@ -905,9 +836,6 @@ graphene-9:
     serial_number: 1009390011
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: graphene-pdu2.nancy.grid5000.fr
-    pdu_position: 5
 graphene-10:
   bios:
     version: V7.01e
@@ -937,7 +865,6 @@ graphene-10:
       ip: 172.18.64.10
       driver: mlx4_core
       mountable: true
-      switch_name: sgrapheneib
     ib1:
       mounted: false
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:6e
@@ -959,8 +886,6 @@ graphene-10:
       driver: e1000e
       mountable: true
       ip: 172.16.64.10
-      switch_name: sgraphene1
-      switch_port: Gi1/0/7
     eth1:
       mounted: false
       rate: 100000000
@@ -981,8 +906,6 @@ graphene-10:
     bmc:
       mac: 00:e0:81:d5:06:d3
       ip: 172.17.64.10
-      switch_name: sgraphene1-ipmi
-      switch_port: 1/0/34
   supported_job_types:
     virtual: ivt
   processor:
@@ -1006,9 +929,6 @@ graphene-10:
     serial_number: 1009390012
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: graphene-pdu2.nancy.grid5000.fr
-    pdu_position: 6
 graphene-11:
   bios:
     version: V7.01e
@@ -1038,7 +958,6 @@ graphene-11:
       ip: 172.18.64.11
       driver: mlx4_core
       mountable: true
-      switch_name: sgrapheneib
     ib1:
       mounted: false
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:72
@@ -1060,8 +979,6 @@ graphene-11:
       driver: e1000e
       mountable: true
       ip: 172.16.64.11
-      switch_name: sgraphene1
-      switch_port: Gi1/0/10
     eth1:
       mounted: false
       rate: 100000000
@@ -1082,8 +999,6 @@ graphene-11:
     bmc:
       mac: 00:e0:81:d5:08:7f
       ip: 172.17.64.11
-      switch_name: sgraphene1-ipmi
-      switch_port: 1/0/35
   supported_job_types:
     virtual: ivt
   main_memory:
@@ -1107,9 +1022,6 @@ graphene-11:
     serial_number: 1009390013
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: graphene-pdu2.nancy.grid5000.fr
-    pdu_position: 7
 graphene-12:
   bios:
     version: V7.01e
@@ -1139,7 +1051,6 @@ graphene-12:
       ip: 172.18.64.12
       driver: mlx4_core
       mountable: true
-      switch_name: sgrapheneib
     ib1:
       mounted: false
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:82
@@ -1161,8 +1072,6 @@ graphene-12:
       driver: e1000e
       mountable: true
       ip: 172.16.64.12
-      switch_name: sgraphene1
-      switch_port: Gi1/0/9
     eth1:
       mounted: false
       rate: 100000000
@@ -1183,8 +1092,6 @@ graphene-12:
     bmc:
       mac: 00:e0:81:d5:07:8f
       ip: 172.17.64.12
-      switch_name: sgraphene1-ipmi
-      switch_port: 1/0/36
   supported_job_types:
     virtual: ivt
   processor:
@@ -1208,9 +1115,6 @@ graphene-12:
     serial_number: 1009390014
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: graphene-pdu1.nancy.grid5000.fr
-    pdu_position: 9
 graphene-13:
   bios:
     version: V7.01e
@@ -1229,7 +1133,6 @@ graphene-13:
       ip: 172.18.64.13
       driver: mlx4_core
       mountable: true
-      switch_name: sgrapheneib
     ib1:
       mounted: false
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:86
@@ -1251,8 +1154,6 @@ graphene-13:
       driver: e1000e
       mountable: true
       ip: 172.16.64.13
-      switch_name: sgraphene1
-      switch_port: Gi1/0/14
     eth1:
       mounted: false
       rate: 100000000
@@ -1273,8 +1174,6 @@ graphene-13:
     bmc:
       mac: 00:e0:81:d5:06:ff
       ip: 172.17.64.13
-      switch_name: sgraphene1-ipmi
-      switch_port: 1/0/37
   block_devices:
     sda:
       model: Hitachi HDS72103
@@ -1309,9 +1208,6 @@ graphene-13:
     serial_number: 1009390015
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: graphene-pdu1.nancy.grid5000.fr
-    pdu_position: 10
 graphene-14:
   bios:
     version: V7.01e
@@ -1334,7 +1230,6 @@ graphene-14:
       ip: 172.18.64.14
       driver: mlx4_core
       mountable: true
-      switch_name: sgrapheneib
     ib1:
       mounted: false
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:e2
@@ -1356,8 +1251,6 @@ graphene-14:
       driver: e1000e
       mountable: true
       ip: 172.16.64.14
-      switch_name: sgraphene1
-      switch_port: Gi1/0/13
     eth1:
       mounted: false
       rate: 100000000
@@ -1378,8 +1271,6 @@ graphene-14:
     bmc:
       mac: 00:e0:81:d5:06:d7
       ip: 172.17.64.14
-      switch_name: sgraphene1-ipmi
-      switch_port: 1/0/38
   block_devices:
     sda:
       model: Hitachi HDS72103
@@ -1410,9 +1301,6 @@ graphene-14:
     serial_number: 1009390016
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: graphene-pdu1.nancy.grid5000.fr
-    pdu_position: 11
 graphene-15:
   bios:
     version: V7.01e
@@ -1435,7 +1323,6 @@ graphene-15:
       ip: 172.18.64.15
       driver: mlx4_core
       mountable: true
-      switch_name: sgrapheneib
     ib1:
       mounted: false
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:ca
@@ -1457,8 +1344,6 @@ graphene-15:
       driver: e1000e
       mountable: true
       ip: 172.16.64.15
-      switch_name: sgraphene1
-      switch_port: Gi1/0/16
     eth1:
       mounted: false
       rate: 100000000
@@ -1479,8 +1364,6 @@ graphene-15:
     bmc:
       mac: 00:e0:81:d5:07:eb
       ip: 172.17.64.15
-      switch_name: sgraphene1-ipmi
-      switch_port: 1/0/39
   block_devices:
     sda:
       model: Hitachi HDS72103
@@ -1511,9 +1394,6 @@ graphene-15:
     serial_number: 1009390017
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: graphene-pdu1.nancy.grid5000.fr
-    pdu_position: 12
 graphene-16:
   bios:
     version: V7.01e
@@ -1543,7 +1423,6 @@ graphene-16:
       ip: 172.18.64.16
       driver: mlx4_core
       mountable: true
-      switch_name: sgrapheneib
     ib1:
       mounted: false
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:76
@@ -1565,8 +1444,6 @@ graphene-16:
       driver: e1000e
       mountable: true
       ip: 172.16.64.16
-      switch_name: sgraphene1
-      switch_port: Gi1/0/15
     eth1:
       mounted: false
       rate: 100000000
@@ -1587,8 +1464,6 @@ graphene-16:
     bmc:
       mac: 00:e0:81:d5:07:c3
       ip: 172.17.64.16
-      switch_name: sgraphene1-ipmi
-      switch_port: 1/0/40
   supported_job_types:
     virtual: ivt
   processor:
@@ -1612,9 +1487,6 @@ graphene-16:
     serial_number: 1009390018
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: graphene-pdu1.nancy.grid5000.fr
-    pdu_position: 13
 graphene-17:
   bios:
     version: V7.01e
@@ -1637,7 +1509,6 @@ graphene-17:
       ip: 172.18.64.17
       driver: mlx4_core
       mountable: true
-      switch_name: sgrapheneib
     ib1:
       mounted: false
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:72
@@ -1659,8 +1530,6 @@ graphene-17:
       driver: e1000e
       mountable: true
       ip: 172.16.64.17
-      switch_name: sgraphene1
-      switch_port: Gi1/0/18
     eth1:
       mounted: false
       rate: 100000000
@@ -1681,8 +1550,6 @@ graphene-17:
     bmc:
       mac: 00:e0:81:d5:08:ab
       ip: 172.17.64.17
-      switch_name: sgraphene1-ipmi
-      switch_port: 1/0/41
   block_devices:
     sda:
       model: Hitachi HDS72103
@@ -1713,9 +1580,6 @@ graphene-17:
     serial_number: 1009390019
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: graphene-pdu1.nancy.grid5000.fr
-    pdu_position: 14
 graphene-18:
   bios:
     version: V7.01e
@@ -1734,7 +1598,6 @@ graphene-18:
       ip: 172.18.64.18
       driver: mlx4_core
       mountable: true
-      switch_name: sgrapheneib
     ib1:
       mounted: false
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:7e
@@ -1756,8 +1619,6 @@ graphene-18:
       driver: e1000e
       mountable: true
       ip: 172.16.64.18
-      switch_name: sgraphene1
-      switch_port: Gi1/0/17
     eth1:
       mounted: false
       rate: 100000000
@@ -1778,8 +1639,6 @@ graphene-18:
     bmc:
       mac: 00:e0:81:d5:08:3f
       ip: 172.17.64.18
-      switch_name: sgraphene1-ipmi
-      switch_port: 1/0/42
   block_devices:
     sda:
       model: Hitachi HDS72103
@@ -1814,9 +1673,6 @@ graphene-18:
     serial_number: 1009390020
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: graphene-pdu1.nancy.grid5000.fr
-    pdu_position: 15
 graphene-19:
   bios:
     version: V7.01e
@@ -1839,7 +1695,6 @@ graphene-19:
       ip: 172.18.64.19
       driver: mlx4_core
       mountable: true
-      switch_name: sgrapheneib
     ib1:
       mounted: false
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:56
@@ -1861,8 +1716,6 @@ graphene-19:
       driver: e1000e
       mountable: true
       ip: 172.16.64.19
-      switch_name: sgraphene1
-      switch_port: Gi1/0/20
     eth1:
       mounted: false
       rate: 100000000
@@ -1883,8 +1736,6 @@ graphene-19:
     bmc:
       mac: 00:e0:81:d5:08:b7
       ip: 172.17.64.19
-      switch_name: sgraphene1-ipmi
-      switch_port: 1/0/43
   block_devices:
     sda:
       model: Hitachi HDS72103
@@ -1915,9 +1766,6 @@ graphene-19:
     serial_number: 1009390021
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: graphene-pdu2.nancy.grid5000.fr
-    pdu_position: 9
 graphene-20:
   bios:
     version: V7.01e
@@ -1936,7 +1784,6 @@ graphene-20:
       ip: 172.18.64.20
       driver: mlx4_core
       mountable: true
-      switch_name: sgrapheneib
     ib1:
       mounted: false
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:46
@@ -1958,8 +1805,6 @@ graphene-20:
       driver: e1000e
       mountable: true
       ip: 172.16.64.20
-      switch_name: sgraphene1
-      switch_port: Gi1/0/19
     eth1:
       mounted: false
       rate: 100000000
@@ -1980,8 +1825,6 @@ graphene-20:
     bmc:
       mac: 00:e0:81:d5:07:6b
       ip: 172.17.64.20
-      switch_name: sgraphene1-ipmi
-      switch_port: 1/0/44
   block_devices:
     sda:
       model: Hitachi HDS72103
@@ -2016,9 +1859,6 @@ graphene-20:
     serial_number: 1009390022
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: graphene-pdu2.nancy.grid5000.fr
-    pdu_position: 10
 graphene-21:
   bios:
     version: V7.01e
@@ -2037,7 +1877,6 @@ graphene-21:
       ip: 172.18.64.21
       driver: mlx4_core
       mountable: true
-      switch_name: sgrapheneib
     ib1:
       mounted: false
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:0004:53:6e
@@ -2059,8 +1898,6 @@ graphene-21:
       driver: e1000e
       mountable: true
       ip: 172.16.64.21
-      switch_name: sgraphene1
-      switch_port: Gi1/0/22
     eth1:
       mounted: false
       rate: 100000000
@@ -2081,8 +1918,6 @@ graphene-21:
     bmc:
       mac: 00:e0:81:d2:59:fb
       ip: 172.17.64.21
-      switch_name: sgraphene1-ipmi
-      switch_port: 1/0/1
   operating_system:
     kernel: 2.6.32-5-amd64
     name: debian
@@ -2117,9 +1952,6 @@ graphene-21:
     serial_number: 1009390023b
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: graphene-pdu2.nancy.grid5000.fr
-    pdu_position: 11
 graphene-22:
   bios:
     version: V7.01e
@@ -2149,7 +1981,6 @@ graphene-22:
       ip: 172.18.64.22
       driver: mlx4_core
       mountable: true
-      switch_name: sgrapheneib
     ib1:
       mounted: false
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:7a
@@ -2171,8 +2002,6 @@ graphene-22:
       driver: e1000e
       mountable: true
       ip: 172.16.64.22
-      switch_name: sgraphene1
-      switch_port: Gi1/0/21
     eth1:
       mounted: false
       rate: 100000000
@@ -2193,8 +2022,6 @@ graphene-22:
     bmc:
       mac: 00:e0:81:d5:07:db
       ip: 172.17.64.22
-      switch_name: sgraphene1-ipmi
-      switch_port: 1/0/2
   supported_job_types:
     virtual: ivt
   processor:
@@ -2218,9 +2045,6 @@ graphene-22:
     serial_number: 1009390024
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: graphene-pdu2.nancy.grid5000.fr
-    pdu_position: 12
 graphene-23:
   bios:
     version: V7.01e
@@ -2250,7 +2074,6 @@ graphene-23:
       ip: 172.18.64.23
       driver: mlx4_core
       mountable: true
-      switch_name: sgrapheneib
     ib1:
       mounted: false
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:66
@@ -2272,8 +2095,6 @@ graphene-23:
       driver: e1000e
       mountable: true
       ip: 172.16.64.23
-      switch_name: sgraphene1
-      switch_port: Gi1/0/24
     eth1:
       mounted: false
       rate: 100000000
@@ -2294,8 +2115,6 @@ graphene-23:
     bmc:
       mac: 00:e0:81:d5:06:c7
       ip: 172.17.64.23
-      switch_name: sgraphene1-ipmi
-      switch_port: 1/0/3
   supported_job_types:
     virtual: ivt
   processor:
@@ -2319,9 +2138,6 @@ graphene-23:
     serial_number: 1009390025
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: graphene-pdu2.nancy.grid5000.fr
-    pdu_position: 13
 graphene-24:
   bios:
     version: V7.01e
@@ -2340,7 +2156,6 @@ graphene-24:
       ip: 172.18.64.24
       driver: mlx4_core
       mountable: true
-      switch_name: sgrapheneib
     ib1:
       mounted: false
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:ce
@@ -2362,8 +2177,6 @@ graphene-24:
       driver: e1000e
       mountable: true
       ip: 172.16.64.24
-      switch_name: sgraphene1
-      switch_port: Gi1/0/23
     eth1:
       mounted: false
       rate: 100000000
@@ -2384,8 +2197,6 @@ graphene-24:
     bmc:
       mac: 00:e0:81:d5:07:13
       ip: 172.17.64.24
-      switch_name: sgraphene1-ipmi
-      switch_port: 1/0/4
   operating_system:
     kernel: 2.6.32-5-amd64
     name: debian
@@ -2420,9 +2231,6 @@ graphene-24:
     serial_number: 1009390026
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: graphene-pdu2.nancy.grid5000.fr
-    pdu_position: 14
 graphene-25:
   bios:
     version: V7.01e
@@ -2441,7 +2249,6 @@ graphene-25:
       ip: 172.18.64.25
       driver: mlx4_core
       mountable: true
-      switch_name: sgrapheneib
     ib1:
       mounted: false
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:a6
@@ -2463,8 +2270,6 @@ graphene-25:
       driver: e1000e
       mountable: true
       ip: 172.16.64.25
-      switch_name: sgraphene1
-      switch_port: Gi1/0/26
     eth1:
       mounted: false
       rate: 100000000
@@ -2485,8 +2290,6 @@ graphene-25:
     bmc:
       mac: 00:e0:81:d5:07:53
       ip: 172.17.64.25
-      switch_name: sgraphene1-ipmi
-      switch_port: 1/0/5
   operating_system:
     kernel: 2.6.32-5-amd64
     name: debian
@@ -2521,9 +2324,6 @@ graphene-25:
     serial_number: 1009390027
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: graphene-pdu2.nancy.grid5000.fr
-    pdu_position: 15
 graphene-26:
   bios:
     version: V7.01e
@@ -2549,7 +2349,6 @@ graphene-26:
       ip: 172.18.64.26
       driver: mlx4_core
       mountable: true
-      switch_name: sgrapheneib
     ib1:
       mounted: false
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:9e
@@ -2571,8 +2370,6 @@ graphene-26:
       driver: e1000e
       mountable: true
       ip: 172.16.64.26
-      switch_name: sgraphene1
-      switch_port: Gi1/0/25
     eth1:
       mounted: false
       rate: 100000000
@@ -2593,8 +2390,6 @@ graphene-26:
     bmc:
       mac: 00:e0:81:d5:08:6f
       ip: 172.17.64.26
-      switch_name: sgraphene1-ipmi
-      switch_port: 1/0/6
   operating_system:
     kernel: 2.6.32-5-amd64
     name: debian
@@ -2622,9 +2417,6 @@ graphene-26:
     serial_number: 1009390028
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: graphene-pdu1.nancy.grid5000.fr
-    pdu_position: 17
 graphene-27:
   bios:
     version: V7.01e
@@ -2643,7 +2435,6 @@ graphene-27:
       ip: 172.18.64.27
       driver: mlx4_core
       mountable: true
-      switch_name: sgrapheneib
     ib1:
       mounted: false
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:8a
@@ -2665,8 +2456,6 @@ graphene-27:
       driver: e1000e
       mountable: true
       ip: 172.16.64.27
-      switch_name: sgraphene1
-      switch_port: Gi1/0/28
     eth1:
       mounted: false
       rate: 100000000
@@ -2687,8 +2476,6 @@ graphene-27:
     bmc:
       mac: 00:e0:81:d5:07:5f
       ip: 172.17.64.27
-      switch_name: sgraphene1-ipmi
-      switch_port: 1/0/7
   block_devices:
     sda:
       model: Hitachi HDS72103
@@ -2723,9 +2510,6 @@ graphene-27:
     serial_number: 1009390029
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: graphene-pdu1.nancy.grid5000.fr
-    pdu_position: 18
 graphene-28:
   bios:
     version: V7.01e
@@ -2744,7 +2528,6 @@ graphene-28:
       ip: 172.18.64.28
       driver: mlx4_core
       mountable: true
-      switch_name: sgrapheneib
     ib1:
       mounted: false
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:8e
@@ -2766,8 +2549,6 @@ graphene-28:
       driver: e1000e
       mountable: true
       ip: 172.16.64.28
-      switch_name: sgraphene1
-      switch_port: Gi1/0/27
     eth1:
       mounted: false
       rate: 100000000
@@ -2788,8 +2569,6 @@ graphene-28:
     bmc:
       mac: 00:E0:81:d5:06:5f
       ip: 172.17.64.28
-      switch_name: sgraphene1-ipmi
-      switch_port: 1/0/8
   block_devices:
     sda:
       model: Hitachi HDS72103
@@ -2824,9 +2603,6 @@ graphene-28:
     serial_number: 1009390030
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: graphene-pdu1.nancy.grid5000.fr
-    pdu_position: 19
 graphene-29:
   bios:
     version: V7.01e
@@ -2856,7 +2632,6 @@ graphene-29:
       ip: 172.18.64.29
       driver: mlx4_core
       mountable: true
-      switch_name: sgrapheneib
     ib1:
       mounted: false
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:90:de
@@ -2878,8 +2653,6 @@ graphene-29:
       driver: e1000e
       mountable: true
       ip: 172.16.64.29
-      switch_name: sgraphene1
-      switch_port: Gi1/0/30
     eth1:
       mounted: false
       rate: 100000000
@@ -2900,8 +2673,6 @@ graphene-29:
     bmc:
       mac: 00:e0:81:d5:07:f3
       ip: 172.17.64.29
-      switch_name: sgraphene1-ipmi
-      switch_port: 1/0/9
   supported_job_types:
     virtual: ivt
   main_memory:
@@ -2925,9 +2696,6 @@ graphene-29:
     serial_number: 1009390031
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: graphene-pdu1.nancy.grid5000.fr
-    pdu_position: 20
 graphene-30:
   bios:
     version: V7.01e
@@ -2957,7 +2725,6 @@ graphene-30:
       ip: 172.18.64.30
       driver: mlx4_core
       mountable: true
-      switch_name: sgrapheneib
     ib1:
       mounted: false
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:7a
@@ -2979,8 +2746,6 @@ graphene-30:
       driver: e1000e
       mountable: true
       ip: 172.16.64.30
-      switch_name: sgraphene1
-      switch_port: Gi1/0/29
     eth1:
       mounted: false
       rate: 100000000
@@ -3001,8 +2766,6 @@ graphene-30:
     bmc:
       mac: 00:e0:81:d5:08:ef
       ip: 172.17.64.30
-      switch_name: sgraphene1-ipmi
-      switch_port: 1/0/10
   supported_job_types:
     virtual: ivt
   processor:
@@ -3026,9 +2789,6 @@ graphene-30:
     serial_number: 1009390032
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: graphene-pdu1.nancy.grid5000.fr
-    pdu_position: 21
 graphene-31:
   bios:
     version: V7.01e
@@ -3047,7 +2807,6 @@ graphene-31:
       ip: 172.18.64.31
       driver: mlx4_core
       mountable: true
-      switch_name: sgrapheneib
     ib1:
       mounted: false
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:1e
@@ -3069,8 +2828,6 @@ graphene-31:
       driver: e1000e
       mountable: true
       ip: 172.16.64.31
-      switch_name: sgraphene1
-      switch_port: Gi1/0/32
     eth1:
       mounted: false
       rate: 100000000
@@ -3091,8 +2848,6 @@ graphene-31:
     bmc:
       mac: 00:e0:81:d5:06:63
       ip: 172.17.64.31
-      switch_name: sgraphene1-ipmi
-      switch_port: 1/0/11
   block_devices:
     sda:
       model: Hitachi HDS72103
@@ -3127,9 +2882,6 @@ graphene-31:
     serial_number: 1009390033
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: graphene-pdu1.nancy.grid5000.fr
-    pdu_position: 22
 graphene-32:
   bios:
     version: V7.01e
@@ -3148,7 +2900,6 @@ graphene-32:
       ip: 172.18.64.32
       driver: mlx4_core
       mountable: true
-      switch_name: sgrapheneib
     ib1:
       mounted: false
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:7e
@@ -3170,8 +2921,6 @@ graphene-32:
       driver: e1000e
       mountable: true
       ip: 172.16.64.32
-      switch_name: sgraphene1
-      switch_port: Gi1/0/31
     eth1:
       mounted: false
       rate: 100000000
@@ -3192,8 +2941,6 @@ graphene-32:
     bmc:
       mac: 00:e0:81:d5:06:cb
       ip: 172.17.64.32
-      switch_name: sgraphene1-ipmi
-      switch_port: 1/0/12
   block_devices:
     sda:
       model: Hitachi HDS72103
@@ -3228,9 +2975,6 @@ graphene-32:
     serial_number: 1009390034
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: graphene-pdu1.nancy.grid5000.fr
-    pdu_position: 23
 graphene-33:
   bios:
     version: V7.01e
@@ -3256,7 +3000,6 @@ graphene-33:
       ip: 172.18.64.33
       driver: mlx4_core
       mountable: true
-      switch_name: sgrapheneib
     ib1:
       mounted: false
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:90:da
@@ -3278,8 +3021,6 @@ graphene-33:
       driver: e1000e
       mountable: true
       ip: 172.16.64.33
-      switch_name: sgraphene1
-      switch_port: Gi1/0/34
     eth1:
       mounted: false
       rate: 100000000
@@ -3300,8 +3041,6 @@ graphene-33:
     bmc:
       mac: 00:e0:81:d5:06:6f
       ip: 172.17.64.33
-      switch_name: sgraphene1-ipmi
-      switch_port: 1/0/13
   operating_system:
     kernel: 2.6.32-5-amd64
     name: debian
@@ -3329,9 +3068,6 @@ graphene-33:
     serial_number: 1009390035
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: graphene-pdu2.nancy.grid5000.fr
-    pdu_position: 17
 graphene-34:
   bios:
     version: V7.01e
@@ -3361,7 +3097,6 @@ graphene-34:
       ip: 172.18.64.34
       driver: mlx4_core
       mountable: true
-      switch_name: sgrapheneib
     ib1:
       mounted: false
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:66
@@ -3383,8 +3118,6 @@ graphene-34:
       driver: e1000e
       mountable: true
       ip: 172.16.64.34
-      switch_name: sgraphene1
-      switch_port: Gi1/0/33
     eth1:
       mounted: false
       rate: 100000000
@@ -3405,8 +3138,6 @@ graphene-34:
     bmc:
       mac: 00:e0:81:d5:08:9f
       ip: 172.17.64.34
-      switch_name: sgraphene1-ipmi
-      switch_port: 1/0/14
   supported_job_types:
     virtual: ivt
   main_memory:
@@ -3430,9 +3161,6 @@ graphene-34:
     serial_number: 1009390036
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: graphene-pdu2.nancy.grid5000.fr
-    pdu_position: 18
 graphene-35:
   bios:
     version: V7.01e
@@ -3461,7 +3189,6 @@ graphene-35:
       ip: 172.18.64.35
       driver: mlx4_core
       mountable: true
-      switch_name: sgrapheneib
     ib1:
       mounted: false
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:ca
@@ -3483,8 +3210,6 @@ graphene-35:
       driver: e1000e
       mountable: true
       ip: 172.16.64.35
-      switch_name: sgraphene1
-      switch_port: Gi1/0/36
     eth1:
       mounted: false
       rate: 100000000
@@ -3505,8 +3230,6 @@ graphene-35:
     bmc:
       mac: 00:e0:81:d5:08:1f
       ip: 172.17.64.35
-      switch_name: sgraphene1-ipmi
-      switch_port: 1/0/15
   supported_job_types:
     virtual: ivt
   main_memory:
@@ -3530,9 +3253,6 @@ graphene-35:
     serial_number: 1009390037
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: graphene-pdu2.nancy.grid5000.fr
-    pdu_position: 19
 graphene-36:
   bios:
     version: V7.01e
@@ -3562,7 +3282,6 @@ graphene-36:
       ip: 172.18.64.36
       driver: mlx4_core
       mountable: true
-      switch_name: sgrapheneib
     ib1:
       mounted: false
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:ba
@@ -3584,8 +3303,6 @@ graphene-36:
       driver: e1000e
       mountable: true
       ip: 172.16.64.36
-      switch_name: sgraphene1
-      switch_port: Gi1/0/35
     eth1:
       mounted: false
       rate: 100000000
@@ -3606,8 +3323,6 @@ graphene-36:
     bmc:
       mac: 00:e0:81:d5:06:4b
       ip: 172.17.64.36
-      switch_name: sgraphene1-ipmi
-      switch_port: 1/0/16
   supported_job_types:
     virtual: ivt
   main_memory:
@@ -3631,9 +3346,6 @@ graphene-36:
     serial_number: 1009390038
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: graphene-pdu2.nancy.grid5000.fr
-    pdu_position: 20
 graphene-37:
   bios:
     version: V7.01e
@@ -3663,7 +3375,6 @@ graphene-37:
       ip: 172.18.64.37
       driver: mlx4_core
       mountable: true
-      switch_name: sgrapheneib
     ib1:
       mounted: false
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:c6
@@ -3685,8 +3396,6 @@ graphene-37:
       driver: e1000e
       mountable: true
       ip: 172.16.64.37
-      switch_name: sgraphene1
-      switch_port: Gi1/0/38
     eth1:
       mounted: false
       rate: 100000000
@@ -3707,8 +3416,6 @@ graphene-37:
     bmc:
       mac: 00:e0:81:d5:08:a7
       ip: 172.17.64.37
-      switch_name: sgraphene1-ipmi
-      switch_port: 1/0/17
   supported_job_types:
     virtual: ivt
   processor:
@@ -3732,9 +3439,6 @@ graphene-37:
     serial_number: 1009390039
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: graphene-pdu2.nancy.grid5000.fr
-    pdu_position: 21
 graphene-38:
   bios:
     version: V7.01e
@@ -3757,7 +3461,6 @@ graphene-38:
       ip: 172.18.64.38
       driver: mlx4_core
       mountable: true
-      switch_name: sgrapheneib
     ib1:
       mounted: false
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:b2
@@ -3779,8 +3482,6 @@ graphene-38:
       driver: e1000e
       mountable: true
       ip: 172.16.64.38
-      switch_name: sgraphene1
-      switch_port: Gi1/0/37
     eth1:
       mounted: false
       rate: 100000000
@@ -3801,8 +3502,6 @@ graphene-38:
     bmc:
       mac: 00:e0:81:d5:07:33
       ip: 172.17.64.38
-      switch_name: sgraphene1-ipmi
-      switch_port: 1/0/18
   block_devices:
     sda:
       model: Hitachi HDS72103
@@ -3833,9 +3532,6 @@ graphene-38:
     serial_number: 1009390040
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: graphene-pdu2.nancy.grid5000.fr
-    pdu_position: 22
 graphene-39:
   bios:
     version: V7.01e
@@ -3858,7 +3554,6 @@ graphene-39:
       ip: 172.18.64.39
       driver: mlx4_core
       mountable: true
-      switch_name: sgrapheneib
     ib1:
       mounted: false
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:c2
@@ -3880,8 +3575,6 @@ graphene-39:
       driver: e1000e
       mountable: true
       ip: 172.16.64.39
-      switch_name: sgraphene1
-      switch_port: Gi1/0/40
     eth1:
       mounted: false
       rate: 100000000
@@ -3902,8 +3595,6 @@ graphene-39:
     bmc:
       mac: 00:e0:81:d5:07:df
       ip: 172.17.64.39
-      switch_name: sgraphene1-ipmi
-      switch_port: 1/0/19
   block_devices:
     sda:
       model: Hitachi HDS72103
@@ -3934,9 +3625,6 @@ graphene-39:
     serial_number: 1009390041
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: graphene-pdu2.nancy.grid5000.fr
-    pdu_position: 23
 graphene-40:
   bios:
     version: V7.01e
@@ -3959,7 +3647,6 @@ graphene-40:
       ip: 172.18.64.40
       driver: mlx4_core
       mountable: true
-      switch_name: sgrapheneib
     ib1:
       mounted: false
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:00:02:c9:03:00:0b:93:ce
@@ -3981,8 +3668,6 @@ graphene-40:
       driver: e1000e
       mountable: true
       ip: 172.16.64.40
-      switch_name: sgraphene2
-      switch_port: Gi1/0/1
     eth1:
       mounted: false
       rate: 100000000
@@ -4003,8 +3688,6 @@ graphene-40:
     bmc:
       mac: 00:10:20:3d:40:5f
       ip: 172.17.64.40
-      switch_name: sgraphene2-ipmi
-      switch_port: 1/0/25
   block_devices:
     sda:
       model: Hitachi HDS72103
@@ -4035,9 +3718,6 @@ graphene-40:
     serial_number: 1009390042
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: graphene-pdu3.nancy.grid5000.fr
-    pdu_position: 3
 graphene-41:
   bios:
     version: V7.01e
@@ -4056,7 +3736,6 @@ graphene-41:
       ip: 172.18.64.41
       driver: mlx4_core
       mountable: true
-      switch_name: sgrapheneib
     ib1:
       mounted: false
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:9a
@@ -4078,8 +3757,6 @@ graphene-41:
       driver: e1000e
       mountable: true
       ip: 172.16.64.41
-      switch_name: sgraphene2
-      switch_port: Gi1/0/2
     eth1:
       mounted: false
       rate: 100000000
@@ -4100,8 +3777,6 @@ graphene-41:
     bmc:
       mac: 00:e0:81:d5:07:af
       ip: 172.17.64.41
-      switch_name: sgraphene2-ipmi
-      switch_port: 1/0/26
   block_devices:
     sda:
       model: Hitachi HDS72103
@@ -4136,9 +3811,6 @@ graphene-41:
     serial_number: 1009390043
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: graphene-pdu3.nancy.grid5000.fr
-    pdu_position: 4
 graphene-42:
   bios:
     version: V7.01e
@@ -4157,7 +3829,6 @@ graphene-42:
       ip: 172.18.64.42
       driver: mlx4_core
       mountable: true
-      switch_name: sgrapheneib
     ib1:
       mounted: false
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:aa
@@ -4179,8 +3850,6 @@ graphene-42:
       driver: e1000e
       mountable: true
       ip: 172.16.64.42
-      switch_name: sgraphene2
-      switch_port: Gi1/0/3
     eth1:
       mounted: false
       rate: 100000000
@@ -4201,8 +3870,6 @@ graphene-42:
     bmc:
       mac: 00:e0:81:d5:07:8b
       ip: 172.17.64.42
-      switch_name: sgraphene2-ipmi
-      switch_port: 1/0/27
   block_devices:
     sda:
       model: Hitachi HDS72103
@@ -4237,9 +3904,6 @@ graphene-42:
     serial_number: 1009390044
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: graphene-pdu3.nancy.grid5000.fr
-    pdu_position: 5
 graphene-43:
   bios:
     version: V7.01e
@@ -4265,7 +3929,6 @@ graphene-43:
       ip: 172.18.64.43
       driver: mlx4_core
       mountable: true
-      switch_name: sgrapheneib
     ib1:
       mounted: false
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:ae
@@ -4287,8 +3950,6 @@ graphene-43:
       driver: e1000e
       mountable: true
       ip: 172.16.64.43
-      switch_name: sgraphene2
-      switch_port: Gi1/0/4
     eth1:
       mounted: false
       rate: 100000000
@@ -4309,8 +3970,6 @@ graphene-43:
     bmc:
       mac: 00:e0:81:d5:08:27
       ip: 172.17.64.43
-      switch_name: sgraphene2-ipmi
-      switch_port: 1/0/28
   operating_system:
     kernel: 2.6.32-5-amd64
     name: debian
@@ -4338,9 +3997,6 @@ graphene-43:
     serial_number: 1009390045
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: graphene-pdu4.nancy.grid5000.fr
-    pdu_position: 1
 graphene-44:
   bios:
     version: V7.01e
@@ -4359,7 +4015,6 @@ graphene-44:
       ip: 172.18.64.44
       driver: mlx4_core
       mountable: true
-      switch_name: sgrapheneib
     ib1:
       mounted: false
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:b6
@@ -4381,8 +4036,6 @@ graphene-44:
       driver: e1000e
       mountable: true
       ip: 172.16.64.44
-      switch_name: sgraphene2
-      switch_port: Gi1/0/5
     eth1:
       mounted: false
       rate: 100000000
@@ -4403,8 +4056,6 @@ graphene-44:
     bmc:
       mac: 00:e0:81:d5:06:e3
       ip: 172.17.64.44
-      switch_name: sgraphene2-ipmi
-      switch_port: 1/0/29
   operating_system:
     kernel: 2.6.32-5-amd64
     name: debian
@@ -4439,9 +4090,6 @@ graphene-44:
     serial_number: 1009390046
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: graphene-pdu4.nancy.grid5000.fr
-    pdu_position: 2
 graphene-45:
   bios:
     version: V7.01e
@@ -4464,7 +4112,6 @@ graphene-45:
       ip: 172.18.64.45
       driver: mlx4_core
       mountable: true
-      switch_name: sgrapheneib
     ib1:
       mounted: false
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:22
@@ -4486,8 +4133,6 @@ graphene-45:
       driver: e1000e
       mountable: true
       ip: 172.16.64.45
-      switch_name: sgraphene2
-      switch_port: Gi1/0/6
     eth1:
       mounted: false
       rate: 100000000
@@ -4508,8 +4153,6 @@ graphene-45:
     bmc:
       mac: 00:e0:81:d5:06:8b
       ip: 172.17.64.45
-      switch_name: sgraphene2-ipmi
-      switch_port: 1/0/30
   block_devices:
     sda:
       model: Hitachi HDS72103
@@ -4540,9 +4183,6 @@ graphene-45:
     serial_number: 1009390047
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: graphene-pdu4.nancy.grid5000.fr
-    pdu_position: 3
 graphene-46:
   bios:
     version: V7.01e
@@ -4561,7 +4201,6 @@ graphene-46:
       ip: 172.18.64.46
       driver: mlx4_core
       mountable: true
-      switch_name: sgrapheneib
     ib1:
       mounted: false
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:d6
@@ -4583,8 +4222,6 @@ graphene-46:
       driver: e1000e
       mountable: true
       ip: 172.16.64.46
-      switch_name: sgraphene2
-      switch_port: Gi1/0/7
     eth1:
       mounted: false
       rate: 100000000
@@ -4605,8 +4242,6 @@ graphene-46:
     bmc:
       mac: 00:e0:81:d5:06:97
       ip: 172.17.64.46
-      switch_name: sgraphene2-ipmi
-      switch_port: 1/0/31
   block_devices:
     sda:
       model: Hitachi HDS72103
@@ -4641,9 +4276,6 @@ graphene-46:
     serial_number: 1009390048
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: graphene-pdu4.nancy.grid5000.fr
-    pdu_position: 4
 graphene-47:
   bios:
     version: V7.01e
@@ -4669,7 +4301,6 @@ graphene-47:
       ip: 172.18.64.47
       driver: mlx4_core
       mountable: true
-      switch_name: sgrapheneib
     ib1:
       mounted: false
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:e6
@@ -4691,8 +4322,6 @@ graphene-47:
       driver: e1000e
       mountable: true
       ip: 172.16.64.47
-      switch_name: sgraphene2
-      switch_port: Gi1/0/8
     eth1:
       mounted: false
       rate: 100000000
@@ -4713,8 +4342,6 @@ graphene-47:
     bmc:
       mac: 00:e0:81:d5:08:97
       ip: 172.17.64.47
-      switch_name: sgraphene2-ipmi
-      switch_port: 1/0/32
   operating_system:
     kernel: 2.6.32-5-amd64
     name: debian
@@ -4742,9 +4369,6 @@ graphene-47:
     serial_number: 1009390049
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: graphene-pdu3.nancy.grid5000.fr
-    pdu_position: 9
 graphene-48:
   bios:
     version: V7.01e
@@ -4763,7 +4387,6 @@ graphene-48:
       ip: 172.18.64.48
       driver: mlx4_core
       mountable: true
-      switch_name: sgrapheneib
     ib1:
       mounted: false
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:de
@@ -4785,8 +4408,6 @@ graphene-48:
       driver: e1000e
       mountable: true
       ip: 172.16.64.48
-      switch_name: sgraphene2
-      switch_port: Gi1/0/9
     eth1:
       mounted: false
       rate: 100000000
@@ -4807,8 +4428,6 @@ graphene-48:
     bmc:
       mac: 00:e0:81:d5:06:eb
       ip: 172.17.64.48
-      switch_name: sgraphene2-ipmi
-      switch_port: 1/0/33
   block_devices:
     sda:
       model: Hitachi HDS72103
@@ -4843,9 +4462,6 @@ graphene-48:
     serial_number: 1009390050
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: graphene-pdu3.nancy.grid5000.fr
-    pdu_position: 10
 graphene-49:
   bios:
     version: V7.01e
@@ -4871,7 +4487,6 @@ graphene-49:
       ip: 172.18.64.49
       driver: mlx4_core
       mountable: true
-      switch_name: sgrapheneib
     ib1:
       mounted: false
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:d2
@@ -4893,8 +4508,6 @@ graphene-49:
       driver: e1000e
       mountable: true
       ip: 172.16.64.49
-      switch_name: sgraphene2
-      switch_port: Gi1/0/10
     eth1:
       mounted: false
       rate: 100000000
@@ -4915,8 +4528,6 @@ graphene-49:
     bmc:
       mac: 00:e0:81:d5:08:5f
       ip: 172.17.64.49
-      switch_name: sgraphene2-ipmi
-      switch_port: 1/0/34
   operating_system:
     kernel: 2.6.32-5-amd64
     name: debian
@@ -4944,9 +4555,6 @@ graphene-49:
     serial_number: 1009390051
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: graphene-pdu3.nancy.grid5000.fr
-    pdu_position: 11
 graphene-50:
   bios:
     version: V7.01e
@@ -4976,7 +4584,6 @@ graphene-50:
       ip: 172.18.64.50
       driver: mlx4_core
       mountable: true
-      switch_name: sgrapheneib
     ib1:
       mounted: false
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:f2
@@ -4998,8 +4605,6 @@ graphene-50:
       driver: e1000e
       mountable: true
       ip: 172.16.64.50
-      switch_name: sgraphene2
-      switch_port: Gi1/0/11
     eth1:
       mounted: false
       rate: 100000000
@@ -5020,8 +4625,6 @@ graphene-50:
     bmc:
       mac: 00:e0:81:d5:06:77
       ip: 172.17.64.50
-      switch_name: sgraphene2-ipmi
-      switch_port: 1/0/35
   supported_job_types:
     virtual: ivt
   main_memory:
@@ -5045,9 +4648,6 @@ graphene-50:
     serial_number: 1009390052
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: graphene-pdu3.nancy.grid5000.fr
-    pdu_position: 12
 graphene-51:
   bios:
     version: V7.01e
@@ -5077,7 +4677,6 @@ graphene-51:
       ip: 172.18.64.51
       driver: mlx4_core
       mountable: true
-      switch_name: sgrapheneib
     ib1:
       mounted: false
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:ea
@@ -5099,8 +4698,6 @@ graphene-51:
       driver: e1000e
       mountable: true
       ip: 172.16.64.51
-      switch_name: sgraphene2
-      switch_port: Gi1/0/12
     eth1:
       mounted: false
       rate: 100000000
@@ -5121,8 +4718,6 @@ graphene-51:
     bmc:
       mac: 00:e0:81:d5:07:63
       ip: 172.17.64.51
-      switch_name: sgraphene2-ipmi
-      switch_port: 1/0/36
   supported_job_types:
     virtual: ivt
   main_memory:
@@ -5146,9 +4741,6 @@ graphene-51:
     serial_number: 1009390053
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: graphene-pdu3.nancy.grid5000.fr
-    pdu_position: 13
 graphene-52:
   bios:
     version: V7.01e
@@ -5178,7 +4770,6 @@ graphene-52:
       ip: 172.18.64.52
       driver: mlx4_core
       mountable: true
-      switch_name: sgrapheneib
     ib1:
       mounted: false
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:fa
@@ -5200,8 +4791,6 @@ graphene-52:
       driver: e1000e
       mountable: true
       ip: 172.16.64.52
-      switch_name: sgraphene2
-      switch_port: Gi1/0/13
     eth1:
       mounted: false
       rate: 100000000
@@ -5222,8 +4811,6 @@ graphene-52:
     bmc:
       mac: 00:e0:81:d5:07:0f
       ip: 172.17.64.52
-      switch_name: sgraphene2-ipmi
-      switch_port: 1/0/37
   supported_job_types:
     virtual: ivt
   processor:
@@ -5247,9 +4834,6 @@ graphene-52:
     serial_number: 1009390054
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: graphene-pdu3.nancy.grid5000.fr
-    pdu_position: 14
 graphene-53:
   bios:
     version: V7.01e
@@ -5275,7 +4859,6 @@ graphene-53:
       ip: 172.18.64.53
       driver: mlx4_core
       mountable: true
-      switch_name: sgrapheneib
     ib1:
       mounted: false
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:0a
@@ -5297,8 +4880,6 @@ graphene-53:
       driver: e1000e
       mountable: true
       ip: 172.16.64.53
-      switch_name: sgraphene2
-      switch_port: Gi1/0/14
     eth1:
       mounted: false
       rate: 100000000
@@ -5319,8 +4900,6 @@ graphene-53:
     bmc:
       mac: 00:e0:81:d5:07:fb
       ip: 172.17.64.53
-      switch_name: sgraphene2-ipmi
-      switch_port: 1/0/38
   operating_system:
     kernel: 2.6.32-5-amd64
     name: debian
@@ -5348,9 +4927,6 @@ graphene-53:
     serial_number: 1009390055
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: graphene-pdu3.nancy.grid5000.fr
-    pdu_position: 15
 graphene-54:
   bios:
     version: V7.01e
@@ -5369,7 +4945,6 @@ graphene-54:
       ip: 172.18.64.54
       driver: mlx4_core
       mountable: true
-      switch_name: sgrapheneib
     ib1:
       mounted: false
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:16
@@ -5391,8 +4966,6 @@ graphene-54:
       driver: e1000e
       mountable: true
       ip: 172.16.64.54
-      switch_name: sgraphene2
-      switch_port: Gi1/0/15
     eth1:
       mounted: false
       rate: 100000000
@@ -5413,8 +4986,6 @@ graphene-54:
     bmc:
       mac: 00:e0:81:d5:07:ab
       ip: 172.17.64.54
-      switch_name: sgraphene2-ipmi
-      switch_port: 1/0/39
   operating_system:
     kernel: 2.6.32-5-amd64
     name: debian
@@ -5449,9 +5020,6 @@ graphene-54:
     serial_number: 1009390056
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: graphene-pdu4.nancy.grid5000.fr
-    pdu_position: 5
 graphene-55:
   bios:
     version: V7.01e
@@ -5474,7 +5042,6 @@ graphene-55:
       ip: 172.18.64.55
       driver: mlx4_core
       mountable: true
-      switch_name: sgrapheneib
     ib1:
       mounted: false
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:0e
@@ -5496,8 +5063,6 @@ graphene-55:
       driver: e1000e
       mountable: true
       ip: 172.16.64.55
-      switch_name: sgraphene2
-      switch_port: Gi1/0/16
     eth1:
       mounted: false
       rate: 100000000
@@ -5518,8 +5083,6 @@ graphene-55:
     bmc:
       mac: 00:e0:81:d5:08:93
       ip: 172.17.64.55
-      switch_name: sgraphene2-ipmi
-      switch_port: 1/0/40
   block_devices:
     sda:
       model: Hitachi HDS72103
@@ -5550,9 +5113,6 @@ graphene-55:
     serial_number: 1009390057
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: graphene-pdu4.nancy.grid5000.fr
-    pdu_position: 6
 graphene-56:
   bios:
     version: V7.01e
@@ -5571,7 +5131,6 @@ graphene-56:
       ip: 172.18.64.56
       driver: mlx4_core
       mountable: true
-      switch_name: sgrapheneib
     ib1:
       mounted: false
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:8a
@@ -5593,8 +5152,6 @@ graphene-56:
       driver: e1000e
       mountable: true
       ip: 172.16.64.56
-      switch_name: sgraphene2
-      switch_port: Gi1/0/17
     eth1:
       mounted: false
       rate: 100000000
@@ -5615,8 +5172,6 @@ graphene-56:
     bmc:
       mac: 00:e0:81:d5:06:7b
       ip: 172.17.64.56
-      switch_name: sgraphene2-ipmi
-      switch_port: 1/0/1
   operating_system:
     kernel: 2.6.32-5-amd64
     name: debian
@@ -5651,9 +5206,6 @@ graphene-56:
     serial_number: 1009390058
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: graphene-pdu4.nancy.grid5000.fr
-    pdu_position: 11
 graphene-57:
   bios:
     version: V7.01e
@@ -5676,7 +5228,6 @@ graphene-57:
       ip: 172.18.64.57
       driver: mlx4_core
       mountable: true
-      switch_name: sgrapheneib
     ib1:
       mounted: false
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:8e
@@ -5698,8 +5249,6 @@ graphene-57:
       driver: e1000e
       mountable: true
       ip: 172.16.64.57
-      switch_name: sgraphene2
-      switch_port: Gi1/0/18
     eth1:
       mounted: false
       rate: 100000000
@@ -5720,8 +5269,6 @@ graphene-57:
     bmc:
       mac: 00:e0:81:d5:08:a3
       ip: 172.17.64.57
-      switch_name: sgraphene2-ipmi
-      switch_port: 1/0/2
   block_devices:
     sda:
       model: Hitachi HDS72103
@@ -5752,9 +5299,6 @@ graphene-57:
     serial_number: 1009390059
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: graphene-pdu4.nancy.grid5000.fr
-    pdu_position: 12
 graphene-58:
   bios:
     version: V7.01e
@@ -5773,7 +5317,6 @@ graphene-58:
       ip: 172.18.64.58
       driver: mlx4_core
       mountable: true
-      switch_name: sgrapheneib
     ib1:
       mounted: false
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:9e
@@ -5795,8 +5338,6 @@ graphene-58:
       driver: e1000e
       mountable: true
       ip: 172.16.64.58
-      switch_name: sgraphene2
-      switch_port: Gi1/0/19
     eth1:
       mounted: false
       rate: 100000000
@@ -5817,8 +5358,6 @@ graphene-58:
     bmc:
       mac: 00:e0:81:d5:07:37
       ip: 172.17.64.58
-      switch_name: sgraphene2-ipmi
-      switch_port: 1/0/3
   block_devices:
     sda:
       model: Hitachi HDS72103
@@ -5853,9 +5392,6 @@ graphene-58:
     serial_number: 1009390060
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: graphene-pdu4.nancy.grid5000.fr
-    pdu_position: 13
 graphene-59:
   bios:
     version: V7.01e
@@ -5885,7 +5421,6 @@ graphene-59:
       ip: 172.18.64.59
       driver: mlx4_core
       mountable: true
-      switch_name: sgrapheneib
     ib1:
       mounted: false
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:96
@@ -5907,8 +5442,6 @@ graphene-59:
       driver: e1000e
       mountable: true
       ip: 172.16.64.59
-      switch_name: sgraphene2
-      switch_port: Gi1/0/20
     eth1:
       mounted: false
       rate: 100000000
@@ -5929,8 +5462,6 @@ graphene-59:
     bmc:
       mac: 00:e0:81:d5:07:2f
       ip: 172.17.64.59
-      switch_name: sgraphene2-ipmi
-      switch_port: 1/0/4
   supported_job_types:
     virtual: ivt
   processor:
@@ -5954,9 +5485,6 @@ graphene-59:
     serial_number: 1009390061
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: graphene-pdu4.nancy.grid5000.fr
-    pdu_position: 14
 graphene-60:
   bios:
     version: V7.01e
@@ -5975,7 +5503,6 @@ graphene-60:
       ip: 172.18.64.60
       driver: mlx4_core
       mountable: true
-      switch_name: sgrapheneib
     ib1:
       mounted: false
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:86
@@ -5997,8 +5524,6 @@ graphene-60:
       driver: e1000e
       mountable: true
       ip: 172.16.64.60
-      switch_name: sgraphene2
-      switch_port: Gi1/0/21
     eth1:
       mounted: false
       rate: 100000000
@@ -6019,8 +5544,6 @@ graphene-60:
     bmc:
       mac: 00:e0:81:d5:08:4f
       ip: 172.17.64.60
-      switch_name: sgraphene2-ipmi
-      switch_port: 1/0/5
   operating_system:
     kernel: 2.6.32-5-amd64
     name: debian
@@ -6055,9 +5578,6 @@ graphene-60:
     serial_number: 1009390062
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: graphene-pdu4.nancy.grid5000.fr
-    pdu_position: 15
 graphene-61:
   bios:
     version: V7.01e
@@ -6087,7 +5607,6 @@ graphene-61:
       ip: 172.18.64.61
       driver: mlx4_core
       mountable: true
-      switch_name: sgrapheneib
     ib1:
       mounted: false
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:92
@@ -6109,8 +5628,6 @@ graphene-61:
       driver: e1000e
       mountable: true
       ip: 172.16.64.61
-      switch_name: sgraphene2
-      switch_port: Gi1/0/22
     eth1:
       mounted: false
       rate: 100000000
@@ -6131,8 +5648,6 @@ graphene-61:
     bmc:
       mac: 00:e0:81:d5:07:03
       ip: 172.17.64.61
-      switch_name: sgraphene2-ipmi
-      switch_port: 1/0/6
   supported_job_types:
     virtual: ivt
   main_memory:
@@ -6156,9 +5671,6 @@ graphene-61:
     serial_number: 1009390063
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: graphene-pdu3.nancy.grid5000.fr
-    pdu_position: 17
 graphene-62:
   bios:
     version: V7.01e
@@ -6181,7 +5693,6 @@ graphene-62:
       ip: 172.18.64.62
       driver: mlx4_core
       mountable: true
-      switch_name: sgrapheneib
     ib1:
       mounted: false
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:9a
@@ -6203,8 +5714,6 @@ graphene-62:
       driver: e1000e
       mountable: true
       ip: 172.16.64.62
-      switch_name: sgraphene2
-      switch_port: Gi1/0/23
     eth1:
       mounted: false
       rate: 100000000
@@ -6225,8 +5734,6 @@ graphene-62:
     bmc:
       mac: 00:e0:81:d5:07:c7
       ip: 172.17.64.62
-      switch_name: sgraphene2-ipmi
-      switch_port: 1/0/7
   block_devices:
     sda:
       model: Hitachi HDS72103
@@ -6257,9 +5764,6 @@ graphene-62:
     serial_number: 1009390064
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: graphene-pdu3.nancy.grid5000.fr
-    pdu_position: 18
 graphene-63:
   bios:
     version: V7.01e
@@ -6289,7 +5793,6 @@ graphene-63:
       ip: 172.18.64.63
       driver: mlx4_core
       mountable: true
-      switch_name: sgrapheneib
     ib1:
       mounted: false
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:82
@@ -6311,8 +5814,6 @@ graphene-63:
       driver: e1000e
       mountable: true
       ip: 172.16.64.63
-      switch_name: sgraphene2
-      switch_port: Gi1/0/24
     eth1:
       mounted: false
       rate: 100000000
@@ -6333,8 +5834,6 @@ graphene-63:
     bmc:
       mac: 00:e0:81:d5:06:6b
       ip: 172.17.64.63
-      switch_name: sgraphene2-ipmi
-      switch_port: 1/0/8
   supported_job_types:
     virtual: ivt
   processor:
@@ -6358,9 +5857,6 @@ graphene-63:
     serial_number: 1009390065
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: graphene-pdu3.nancy.grid5000.fr
-    pdu_position: 19
 graphene-64:
   bios:
     version: V7.01e
@@ -6386,7 +5882,6 @@ graphene-64:
       ip: 172.18.64.64
       driver: mlx4_core
       mountable: true
-      switch_name: sgrapheneib
     ib1:
       mounted: false
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:a2
@@ -6408,8 +5903,6 @@ graphene-64:
       driver: e1000e
       mountable: true
       ip: 172.16.64.64
-      switch_name: sgraphene2
-      switch_port: Gi1/0/25
     eth1:
       mounted: false
       rate: 100000000
@@ -6430,8 +5923,6 @@ graphene-64:
     bmc:
       mac: 00:e0:81:d5:08:8b
       ip: 172.17.64.64
-      switch_name: sgraphene2-ipmi
-      switch_port: 1/0/9
   operating_system:
     kernel: 2.6.32-5-amd64
     name: debian
@@ -6459,9 +5950,6 @@ graphene-64:
     serial_number: 1009390066
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: graphene-pdu3.nancy.grid5000.fr
-    pdu_position: 20
 graphene-65:
   bios:
     version: V7.01e
@@ -6484,7 +5972,6 @@ graphene-65:
       ip: 172.18.64.65
       driver: mlx4_core
       mountable: true
-      switch_name: sgrapheneib
     ib1:
       mounted: false
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:da
@@ -6506,8 +5993,6 @@ graphene-65:
       driver: e1000e
       mountable: true
       ip: 172.16.64.65
-      switch_name: sgraphene2
-      switch_port: Gi1/0/26
     eth1:
       mounted: false
       rate: 100000000
@@ -6528,8 +6013,6 @@ graphene-65:
     bmc:
       mac: 00:e0:81:d5:07:47
       ip: 172.17.64.65
-      switch_name: sgraphene2-ipmi
-      switch_port: 1/0/10
   block_devices:
     sda:
       model: Hitachi HDS72103
@@ -6560,9 +6043,6 @@ graphene-65:
     serial_number: 1009390067
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: graphene-pdu3.nancy.grid5000.fr
-    pdu_position: 21
 graphene-66:
   bios:
     version: V7.01e
@@ -6581,7 +6061,6 @@ graphene-66:
       ip: 172.18.64.66
       driver: mlx4_core
       mountable: true
-      switch_name: sgrapheneib
     ib1:
       mounted: false
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:4a
@@ -6603,8 +6082,6 @@ graphene-66:
       driver: e1000e
       mountable: true
       ip: 172.16.64.66
-      switch_name: sgraphene2
-      switch_port: Gi1/0/27
     eth1:
       mounted: false
       rate: 100000000
@@ -6625,8 +6102,6 @@ graphene-66:
     bmc:
       mac: 00:e0:81:d5:08:17
       ip: 172.17.64.66
-      switch_name: sgraphene2-ipmi
-      switch_port: 1/0/11
   operating_system:
     kernel: 2.6.32-5-amd64
     name: debian
@@ -6661,9 +6136,6 @@ graphene-66:
     serial_number: 1009390068
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: graphene-pdu3.nancy.grid5000.fr
-    pdu_position: 22
 graphene-67:
   bios:
     version: V7.01e
@@ -6682,7 +6154,6 @@ graphene-67:
       ip: 172.18.64.67
       driver: mlx4_core
       mountable: true
-      switch_name: sgrapheneib
     ib1:
       mounted: false
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:ba
@@ -6704,8 +6175,6 @@ graphene-67:
       driver: e1000e
       mountable: true
       ip: 172.16.64.67
-      switch_name: sgraphene2
-      switch_port: Gi1/0/28
     eth1:
       mounted: false
       rate: 100000000
@@ -6726,8 +6195,6 @@ graphene-67:
     bmc:
       mac: 00:e0:81:d5:07:b3
       ip: 172.17.64.67
-      switch_name: sgraphene2-ipmi
-      switch_port: 1/0/12
   block_devices:
     sda:
       model: Hitachi HDS72103
@@ -6762,9 +6229,6 @@ graphene-67:
     serial_number: 1009390069
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: graphene-pdu3.nancy.grid5000.fr
-    pdu_position: 23
 graphene-68:
   bios:
     version: V7.01e
@@ -6794,7 +6258,6 @@ graphene-68:
       ip: 172.18.64.68
       driver: mlx4_core
       mountable: true
-      switch_name: sgrapheneib
     ib1:
       mounted: false
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:92
@@ -6816,8 +6279,6 @@ graphene-68:
       driver: e1000e
       mountable: true
       ip: 172.16.64.68
-      switch_name: sgraphene2
-      switch_port: Gi1/0/29
     eth1:
       mounted: false
       rate: 100000000
@@ -6838,8 +6299,6 @@ graphene-68:
     bmc:
       mac: 00:e0:81:d5:06:53
       ip: 172.17.64.68
-      switch_name: sgraphene2-ipmi
-      switch_port: 1/0/13
   supported_job_types:
     virtual: ivt
   main_memory:
@@ -6863,9 +6322,6 @@ graphene-68:
     serial_number: 1009390070
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: graphene-pdu4.nancy.grid5000.fr
-    pdu_position: 17
 graphene-69:
   bios:
     version: V7.01e
@@ -6895,7 +6351,6 @@ graphene-69:
       ip: 172.18.64.69
       driver: mlx4_core
       mountable: true
-      switch_name: sgrapheneib
     ib1:
       mounted: false
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:c2
@@ -6917,8 +6372,6 @@ graphene-69:
       driver: e1000e
       mountable: true
       ip: 172.16.64.69
-      switch_name: sgraphene2
-      switch_port: Gi1/0/30
     eth1:
       mounted: false
       rate: 100000000
@@ -6939,8 +6392,6 @@ graphene-69:
     bmc:
       mac: 00:e0:81:d5:06:9b
       ip: 172.17.64.69
-      switch_name: sgraphene2-ipmi
-      switch_port: 1/0/14
   supported_job_types:
     virtual: ivt
   processor:
@@ -6964,9 +6415,6 @@ graphene-69:
     serial_number: 1009390071
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: graphene-pdu4.nancy.grid5000.fr
-    pdu_position: 18
 graphene-70:
   bios:
     version: V7.01e
@@ -6985,7 +6433,6 @@ graphene-70:
       ip: 172.18.64.70
       driver: mlx4_core
       mountable: true
-      switch_name: sgrapheneib
     ib1:
       mounted: false
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:12
@@ -7007,8 +6454,6 @@ graphene-70:
       driver: e1000e
       mountable: true
       ip: 172.16.64.70
-      switch_name: sgraphene2
-      switch_port: Gi1/0/31
     eth1:
       mounted: false
       rate: 100000000
@@ -7029,8 +6474,6 @@ graphene-70:
     bmc:
       mac: 00:e0:81:d5:07:4f
       ip: 172.17.64.70
-      switch_name: sgraphene2-ipmi
-      switch_port: 1/0/15
   operating_system:
     kernel: 2.6.32-5-amd64
     name: debian
@@ -7065,9 +6508,6 @@ graphene-70:
     serial_number: 1009390072
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: graphene-pdu4.nancy.grid5000.fr
-    pdu_position: 19
 graphene-71:
   bios:
     version: V7.01e
@@ -7086,7 +6526,6 @@ graphene-71:
       ip: 172.18.64.71
       driver: mlx4_core
       mountable: true
-      switch_name: sgrapheneib
     ib1:
       mounted: false
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:ee
@@ -7108,8 +6547,6 @@ graphene-71:
       driver: e1000e
       mountable: true
       ip: 172.16.64.71
-      switch_name: sgraphene2
-      switch_port: Gi1/0/32
     eth1:
       mounted: false
       rate: 100000000
@@ -7130,8 +6567,6 @@ graphene-71:
     bmc:
       mac: 00:e0:81:d5:07:2b
       ip: 172.17.64.71
-      switch_name: sgraphene2-ipmi
-      switch_port: 1/0/16
   operating_system:
     kernel: 2.6.32-5-amd64
     name: debian
@@ -7166,9 +6601,6 @@ graphene-71:
     serial_number: 1009390073
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: graphene-pdu4.nancy.grid5000.fr
-    pdu_position: 20
 graphene-72:
   bios:
     version: V7.01e
@@ -7194,7 +6626,6 @@ graphene-72:
       ip: 172.18.64.72
       driver: mlx4_core
       mountable: true
-      switch_name: sgrapheneib
     ib1:
       mounted: false
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:96
@@ -7216,8 +6647,6 @@ graphene-72:
       driver: e1000e
       mountable: true
       ip: 172.16.64.72
-      switch_name: sgraphene2
-      switch_port: Gi1/0/33
     eth1:
       mounted: false
       rate: 100000000
@@ -7238,8 +6667,6 @@ graphene-72:
     bmc:
       mac: 00:e0:81:d5:07:e7
       ip: 172.17.64.72
-      switch_name: sgraphene2-ipmi
-      switch_port: 1/0/17
   operating_system:
     kernel: 2.6.32-5-amd64
     name: debian
@@ -7267,9 +6694,6 @@ graphene-72:
     serial_number: 1009390074
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: graphene-pdu4.nancy.grid5000.fr
-    pdu_position: 21
 graphene-73:
   bios:
     version: V7.01e
@@ -7288,7 +6712,6 @@ graphene-73:
       ip: 172.18.64.73
       driver: mlx4_core
       mountable: true
-      switch_name: sgrapheneib
     ib1:
       mounted: false
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:fe
@@ -7310,8 +6733,6 @@ graphene-73:
       driver: e1000e
       mountable: true
       ip: 172.16.64.73
-      switch_name: sgraphene2
-      switch_port: Gi1/0/34
     eth1:
       mounted: false
       rate: 100000000
@@ -7332,8 +6753,6 @@ graphene-73:
     bmc:
       mac: 00:e0:81:d5:07:43
       ip: 172.17.64.73
-      switch_name: sgraphene2-ipmi
-      switch_port: 1/0/18
   block_devices:
     sda:
       model: Hitachi HDS72103
@@ -7368,9 +6787,6 @@ graphene-73:
     serial_number: 1009390075
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: graphene-pdu4.nancy.grid5000.fr
-    pdu_position: 22
 graphene-74:
   bios:
     version: V7.01e
@@ -7396,7 +6812,6 @@ graphene-74:
       ip: 172.18.64.74
       driver: mlx4_core
       mountable: true
-      switch_name: sgrapheneib
     ib1:
       mounted: false
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:de
@@ -7418,8 +6833,6 @@ graphene-74:
       driver: e1000e
       mountable: true
       ip: 172.16.64.74
-      switch_name: sgraphene2
-      switch_port: Gi1/0/35
     eth1:
       mounted: false
       rate: 100000000
@@ -7440,8 +6853,6 @@ graphene-74:
     bmc:
       mac: 00:e0:81:d5:08:83
       ip: 172.17.64.74
-      switch_name: sgraphene2-ipmi
-      switch_port: 1/0/19
   operating_system:
     kernel: 2.6.32-5-amd64
     name: debian
@@ -7469,9 +6880,6 @@ graphene-74:
     serial_number: 1009390076
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: graphene-pdu4.nancy.grid5000.fr
-    pdu_position: 23
 graphene-75:
   bios:
     version: V7.01e
@@ -7501,7 +6909,6 @@ graphene-75:
       ip: 172.18.64.75
       driver: mlx4_core
       mountable: true
-      switch_name: sgrapheneib
     ib1:
       mounted: false
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:e6
@@ -7523,8 +6930,6 @@ graphene-75:
       driver: e1000e
       mountable: true
       ip: 172.16.64.75
-      switch_name: sgraphene3
-      switch_port: Gi1/0/2
     eth1:
       mounted: false
       rate: 100000000
@@ -7545,8 +6950,6 @@ graphene-75:
     bmc:
       mac: 00:e0:81:d5:07:07
       ip: 172.17.64.75
-      switch_name: sgraphene3-ipmi
-      switch_port: 1/0/25
   supported_job_types:
     virtual: ivt
   processor:
@@ -7570,9 +6973,6 @@ graphene-75:
     serial_number: 1009390077
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: graphene-pdu6.nancy.grid5000.fr
-    pdu_position: 6
 graphene-76:
   bios:
     version: V7.01e
@@ -7602,7 +7002,6 @@ graphene-76:
       ip: 172.18.64.76
       driver: mlx4_core
       mountable: true
-      switch_name: sgrapheneib
     ib1:
       mounted: false
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:d6
@@ -7624,8 +7023,6 @@ graphene-76:
       driver: e1000e
       mountable: true
       ip: 172.16.64.76
-      switch_name: sgraphene3
-      switch_port: Gi1/0/1
     eth1:
       mounted: false
       rate: 100000000
@@ -7646,8 +7043,6 @@ graphene-76:
     bmc:
       mac: 00:e0:81:d5:07:23
       ip: 172.17.64.76
-      switch_name: sgraphene3-ipmi
-      switch_port: 1/0/26
   supported_job_types:
     virtual: ivt
   processor:
@@ -7671,9 +7066,6 @@ graphene-76:
     serial_number: 1009390078
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: graphene-pdu6.nancy.grid5000.fr
-    pdu_position: 7
 graphene-77:
   bios:
     version: V7.01e
@@ -7692,7 +7084,6 @@ graphene-77:
       ip: 172.18.64.77
       driver: mlx4_core
       mountable: true
-      switch_name: sgrapheneib
     ib1:
       mounted: false
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:e2
@@ -7714,8 +7105,6 @@ graphene-77:
       driver: e1000e
       mountable: true
       ip: 172.16.64.77
-      switch_name: sgraphene3
-      switch_port: Gi1/0/4
     eth1:
       mounted: false
       rate: 100000000
@@ -7736,8 +7125,6 @@ graphene-77:
     bmc:
       mac: 00:e0:81:d5:07:a3
       ip: 172.17.64.77
-      switch_name: sgraphene3-ipmi
-      switch_port: 1/0/27
   block_devices:
     sda:
       model: Hitachi HDS72103
@@ -7772,9 +7159,6 @@ graphene-77:
     serial_number: 1009390079
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: graphene-pdu5.nancy.grid5000.fr
-    pdu_position: 9
 graphene-78:
   bios:
     version: V7.01e
@@ -7793,7 +7177,6 @@ graphene-78:
       ip: 172.18.64.78
       driver: mlx4_core
       mountable: true
-      switch_name: sgrapheneib
     ib1:
       mounted: false
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:02
@@ -7815,8 +7198,6 @@ graphene-78:
       driver: e1000e
       mountable: true
       ip: 172.16.64.78
-      switch_name: sgraphene3
-      switch_port: Gi1/0/3
     eth1:
       mounted: false
       rate: 100000000
@@ -7837,8 +7218,6 @@ graphene-78:
     bmc:
       mac: 00:e0:81:d5:08:53
       ip: 172.17.64.78
-      switch_name: sgraphene3-ipmi
-      switch_port: 1/0/28
   operating_system:
     kernel: 2.6.32-5-amd64
     name: debian
@@ -7873,9 +7252,6 @@ graphene-78:
     serial_number: 1009390080
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: graphene-pdu5.nancy.grid5000.fr
-    pdu_position: 10
 graphene-79:
   bios:
     version: V7.01e
@@ -7894,7 +7270,6 @@ graphene-79:
       ip: 172.18.64.79
       driver: mlx4_core
       mountable: true
-      switch_name: sgrapheneib
     ib1:
       mounted: false
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:f6
@@ -7916,8 +7291,6 @@ graphene-79:
       driver: e1000e
       mountable: true
       ip: 172.16.64.79
-      switch_name: sgraphene3
-      switch_port: Gi1/0/6
     eth1:
       mounted: false
       rate: 100000000
@@ -7938,8 +7311,6 @@ graphene-79:
     bmc:
       mac: 00:e0:81:d5:08:7b
       ip: 172.17.64.79
-      switch_name: sgraphene3-ipmi
-      switch_port: 1/0/29
   operating_system:
     kernel: 2.6.32-5-amd64
     name: debian
@@ -7974,9 +7345,6 @@ graphene-79:
     serial_number: 1009390081
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: graphene-pdu5.nancy.grid5000.fr
-    pdu_position: 11
 graphene-80:
   bios:
     version: V7.01e
@@ -7995,7 +7363,6 @@ graphene-80:
       ip: 172.18.64.80
       driver: mlx4_core
       mountable: true
-      switch_name: sgrapheneib
     ib1:
       mounted: false
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:d2
@@ -8017,8 +7384,6 @@ graphene-80:
       driver: e1000e
       mountable: true
       ip: 172.16.64.80
-      switch_name: sgraphene3
-      switch_port: Gi1/0/5
     eth1:
       mounted: false
       rate: 100000000
@@ -8039,8 +7404,6 @@ graphene-80:
     bmc:
       mac: 00:e0:81:d5:06:db
       ip: 172.17.64.80
-      switch_name: sgraphene3-ipmi
-      switch_port: 1/0/30
   operating_system:
     kernel: 2.6.32-5-amd64
     name: debian
@@ -8075,9 +7438,6 @@ graphene-80:
     serial_number: 1009390082
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: graphene-pdu5.nancy.grid5000.fr
-    pdu_position: 12
 graphene-81:
   bios:
     version: V7.01e
@@ -8100,7 +7460,6 @@ graphene-81:
       ip: 172.18.64.81
       driver: mlx4_core
       mountable: true
-      switch_name: sgrapheneib
     ib1:
       mounted: false
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:aa
@@ -8122,8 +7481,6 @@ graphene-81:
       driver: e1000e
       mountable: true
       ip: 172.16.64.81
-      switch_name: sgraphene3
-      switch_port: Gi1/0/8
     eth1:
       mounted: false
       rate: 100000000
@@ -8144,8 +7501,6 @@ graphene-81:
     bmc:
       mac: 00:e0:81:d5:07:27
       ip: 172.17.64.81
-      switch_name: sgraphene3-ipmi
-      switch_port: 1/0/31
   block_devices:
     sda:
       model: Hitachi HDS72103
@@ -8176,9 +7531,6 @@ graphene-81:
     serial_number: 1009390083
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: graphene-pdu5.nancy.grid5000.fr
-    pdu_position: 13
 graphene-82:
   bios:
     version: V7.01e
@@ -8197,7 +7549,6 @@ graphene-82:
       ip: 172.18.64.82
       driver: mlx4_core
       mountable: true
-      switch_name: sgrapheneib
     ib1:
       mounted: false
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:96
@@ -8219,8 +7570,6 @@ graphene-82:
       driver: e1000e
       mountable: true
       ip: 172.16.64.82
-      switch_name: sgraphene3
-      switch_port: Gi1/0/7
     eth1:
       mounted: false
       rate: 100000000
@@ -8241,8 +7590,6 @@ graphene-82:
     bmc:
       mac: 00:e0:81:d5:07:b7
       ip: 172.17.64.82
-      switch_name: sgraphene3-ipmi
-      switch_port: 1/0/32
   block_devices:
     sda:
       model: Hitachi HDS72103
@@ -8277,9 +7624,6 @@ graphene-82:
     serial_number: 1009390084
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: graphene-pdu5.nancy.grid5000.fr
-    pdu_position: 14
 graphene-83:
   bios:
     version: V7.01e
@@ -8309,7 +7653,6 @@ graphene-83:
       ip: 172.18.64.83
       driver: mlx4_core
       mountable: true
-      switch_name: sgrapheneib
     ib1:
       mounted: false
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:a6
@@ -8331,8 +7674,6 @@ graphene-83:
       driver: e1000e
       mountable: true
       ip: 172.16.64.83
-      switch_name: sgraphene3
-      switch_port: Gi1/0/10
     eth1:
       mounted: false
       rate: 100000000
@@ -8353,8 +7694,6 @@ graphene-83:
     bmc:
       mac: 00:e0:81:d5:06:93
       ip: 172.17.64.83
-      switch_name: sgraphene3-ipmi
-      switch_port: 1/0/33
   supported_job_types:
     virtual: ivt
   processor:
@@ -8378,9 +7717,6 @@ graphene-83:
     serial_number: 1009390085
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: graphene-pdu5.nancy.grid5000.fr
-    pdu_position: 15
 graphene-84:
   bios:
     version: V7.01e
@@ -8402,7 +7738,6 @@ graphene-84:
       ip: 172.18.64.84
       driver: mlx4_core
       mountable: true
-      switch_name: sgrapheneib
     ib1:
       mounted: false
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:9e
@@ -8424,8 +7759,6 @@ graphene-84:
       driver: e1000e
       mountable: true
       ip: 172.16.64.84
-      switch_name: sgraphene3
-      switch_port: Gi1/0/9
     eth1:
       mounted: false
       rate: 100000000
@@ -8446,8 +7779,6 @@ graphene-84:
     bmc:
       mac: 00:e0:81:d5:07:1b
       ip: 172.17.64.84
-      switch_name: sgraphene3-ipmi
-      switch_port: 1/0/34
   block_devices:
     sda:
       model: Hitachi HDS72103
@@ -8478,9 +7809,6 @@ graphene-84:
     serial_number: 1009390086
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: graphene-pdu6.nancy.grid5000.fr
-    pdu_position: 9
 graphene-85:
   bios:
     version: V7.01e
@@ -8499,7 +7827,6 @@ graphene-85:
       ip: 172.18.64.85
       driver: mlx4_core
       mountable: true
-      switch_name: sgrapheneib
     ib1:
       mounted: false
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:9a
@@ -8521,8 +7848,6 @@ graphene-85:
       driver: e1000e
       mountable: true
       ip: 172.16.64.85
-      switch_name: sgraphene3
-      switch_port: Gi1/0/12
     eth1:
       mounted: false
       rate: 100000000
@@ -8543,8 +7868,6 @@ graphene-85:
     bmc:
       mac: 00:e0:81:d5:07:ef
       ip: 172.17.64.85
-      switch_name: sgraphene3-ipmi
-      switch_port: 1/0/1
   operating_system:
     kernel: 2.6.32-5-amd64
     name: debian
@@ -8579,9 +7902,6 @@ graphene-85:
     serial_number: 1009390087
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: graphene-pdu6.nancy.grid5000.fr
-    pdu_position: 10
 graphene-86:
   bios:
     version: V7.01e
@@ -8600,7 +7920,6 @@ graphene-86:
       ip: 172.18.64.86
       driver: mlx4_core
       mountable: true
-      switch_name: sgrapheneib
     ib1:
       mounted: false
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:a2
@@ -8622,8 +7941,6 @@ graphene-86:
       driver: e1000e
       mountable: true
       ip: 172.16.64.86
-      switch_name: sgraphene3
-      switch_port: Gi1/0/11
     eth1:
       mounted: false
       rate: 100000000
@@ -8644,8 +7961,6 @@ graphene-86:
     bmc:
       mac: 00:e0:81:d5:08:0f
       ip: 172.17.64.86
-      switch_name: sgraphene3-ipmi
-      switch_port: 1/0/2
   operating_system:
     kernel: 2.6.32-5-amd64
     name: debian
@@ -8680,9 +7995,6 @@ graphene-86:
     serial_number: 1009390088
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: graphene-pdu6.nancy.grid5000.fr
-    pdu_position: 11
 graphene-87:
   bios:
     version: V7.01e
@@ -8701,7 +8013,6 @@ graphene-87:
       ip: 172.18.64.87
       driver: mlx4_core
       mountable: true
-      switch_name: sgrapheneib
     ib1:
       mounted: false
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:ae
@@ -8723,8 +8034,6 @@ graphene-87:
       driver: e1000e
       mountable: true
       ip: 172.16.64.87
-      switch_name: sgraphene3
-      switch_port: Gi1/0/14
     eth1:
       mounted: false
       rate: 100000000
@@ -8745,8 +8054,6 @@ graphene-87:
     bmc:
       mac: 00:e0:81:d5:07:5b
       ip: 172.17.64.87
-      switch_name: sgraphene3-ipmi
-      switch_port: 1/0/3
   block_devices:
     sda:
       model: Hitachi HDS72103
@@ -8781,9 +8088,6 @@ graphene-87:
     serial_number: 1009390089
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: graphene-pdu6.nancy.grid5000.fr
-    pdu_position: 12
 graphene-88:
   bios:
     version: V7.01e
@@ -8809,7 +8113,6 @@ graphene-88:
       ip: 172.18.64.88
       driver: mlx4_core
       mountable: true
-      switch_name: sgrapheneib
     ib1:
       mounted: false
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:b2
@@ -8831,8 +8134,6 @@ graphene-88:
       driver: e1000e
       mountable: true
       ip: 172.16.64.88
-      switch_name: sgraphene3
-      switch_port: Gi1/0/13
     eth1:
       mounted: false
       rate: 100000000
@@ -8853,8 +8154,6 @@ graphene-88:
     bmc:
       mac: 00:e0:81:d5:08:63
       ip: 172.17.64.88
-      switch_name: sgraphene3-ipmi
-      switch_port: 1/0/4
   operating_system:
     kernel: 2.6.32-5-amd64
     name: debian
@@ -8882,9 +8181,6 @@ graphene-88:
     serial_number: 1009390090
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: graphene-pdu6.nancy.grid5000.fr
-    pdu_position: 13
 graphene-89:
   bios:
     version: V7.01e
@@ -8903,7 +8199,6 @@ graphene-89:
       ip: 172.18.64.89
       driver: mlx4_core
       mountable: true
-      switch_name: sgrapheneib
     ib1:
       mounted: false
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5c:ee
@@ -8925,8 +8220,6 @@ graphene-89:
       driver: e1000e
       mountable: true
       ip: 172.16.64.89
-      switch_name: sgraphene3
-      switch_port: Gi1/0/16
     eth1:
       mounted: false
       rate: 100000000
@@ -8947,8 +8240,6 @@ graphene-89:
     bmc:
       mac: 00:e0:81:d5:08:9b
       ip: 172.17.64.89
-      switch_name: sgraphene3-ipmi
-      switch_port: 1/0/5
   operating_system:
     kernel: 2.6.32-5-amd64
     name: debian
@@ -8983,9 +8274,6 @@ graphene-89:
     serial_number: 1009390091
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: graphene-pdu6.nancy.grid5000.fr
-    pdu_position: 14
 graphene-90:
   bios:
     version: V7.01e
@@ -9011,7 +8299,6 @@ graphene-90:
       ip: 172.18.64.90
       driver: mlx4_core
       mountable: true
-      switch_name: sgrapheneib
     ib1:
       mounted: false
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5d:0a
@@ -9033,8 +8320,6 @@ graphene-90:
       driver: e1000e
       mountable: true
       ip: 172.16.64.90
-      switch_name: sgraphene3
-      switch_port: Gi1/0/15
     eth1:
       mounted: false
       rate: 100000000
@@ -9055,8 +8340,6 @@ graphene-90:
     bmc:
       mac: 00:e0:81:d5:06:67
       ip: 172.17.64.90
-      switch_name: sgraphene3-ipmi
-      switch_port: 1/0/6
   operating_system:
     kernel: 2.6.32-5-amd64
     name: debian
@@ -9084,9 +8367,6 @@ graphene-90:
     serial_number: 1009390092
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: graphene-pdu6.nancy.grid5000.fr
-    pdu_position: 15
 graphene-91:
   bios:
     version: V7.01e
@@ -9105,7 +8385,6 @@ graphene-91:
       ip: 172.18.64.91
       driver: mlx4_core
       mountable: true
-      switch_name: sgrapheneib
     ib1:
       mounted: false
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5c:d2
@@ -9127,8 +8406,6 @@ graphene-91:
       driver: e1000e
       mountable: true
       ip: 172.16.64.91
-      switch_name: sgraphene3
-      switch_port: Gi1/0/18
     eth1:
       mounted: false
       rate: 100000000
@@ -9149,8 +8426,6 @@ graphene-91:
     bmc:
       mac: 00:e0:81:d5:06:df
       ip: 172.17.64.91
-      switch_name: sgraphene3-ipmi
-      switch_port: 1/0/7
   block_devices:
     sda:
       model: Hitachi HDS72103
@@ -9185,9 +8460,6 @@ graphene-91:
     serial_number: 1009390093
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: graphene-pdu5.nancy.grid5000.fr
-    pdu_position: 17
 graphene-92:
   bios:
     version: V7.01e
@@ -9217,7 +8489,6 @@ graphene-92:
       ip: 172.18.64.92
       driver: mlx4_core
       mountable: true
-      switch_name: sgrapheneib
     ib1:
       mounted: false
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5c:e6
@@ -9239,8 +8510,6 @@ graphene-92:
       driver: e1000e
       mountable: true
       ip: 172.16.64.92
-      switch_name: sgraphene3
-      switch_port: Gi1/0/17
     eth1:
       mounted: false
       rate: 100000000
@@ -9261,8 +8530,6 @@ graphene-92:
     bmc:
       mac: 00:e0:81:d5:07:a7
       ip: 172.17.64.92
-      switch_name: sgraphene3-ipmi
-      switch_port: 1/0/8
   supported_job_types:
     virtual: ivt
   main_memory:
@@ -9286,9 +8553,6 @@ graphene-92:
     serial_number: 1009390094
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: graphene-pdu5.nancy.grid5000.fr
-    pdu_position: 18
 graphene-93:
   bios:
     version: V7.01e
@@ -9307,7 +8571,6 @@ graphene-93:
       ip: 172.18.64.93
       driver: mlx4_core
       mountable: true
-      switch_name: sgrapheneib
     ib1:
       mounted: false
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5e:ae
@@ -9329,8 +8592,6 @@ graphene-93:
       driver: e1000e
       mountable: true
       ip: 172.16.64.93
-      switch_name: sgraphene3
-      switch_port: Gi1/0/20
     eth1:
       mounted: false
       rate: 100000000
@@ -9351,8 +8612,6 @@ graphene-93:
     bmc:
       mac: 00:e0:81:d5:06:4f
       ip: 172.17.64.93
-      switch_name: sgraphene3-ipmi
-      switch_port: 1/0/9
   operating_system:
     kernel: 2.6.32-5-amd64
     name: debian
@@ -9387,9 +8646,6 @@ graphene-93:
     serial_number: 1009390095
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: graphene-pdu5.nancy.grid5000.fr
-    pdu_position: 19
 graphene-94:
   bios:
     version: V7.01e
@@ -9412,7 +8668,6 @@ graphene-94:
       ip: 172.18.64.94
       driver: mlx4_core
       mountable: true
-      switch_name: sgrapheneib
     ib1:
       mounted: false
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5c:96
@@ -9434,8 +8689,6 @@ graphene-94:
       driver: e1000e
       mountable: true
       ip: 172.16.64.94
-      switch_name: sgraphene3
-      switch_port: Gi1/0/19
     eth1:
       mounted: false
       rate: 100000000
@@ -9456,8 +8709,6 @@ graphene-94:
     bmc:
       mac: 00:e0:81:d5:07:93
       ip: 172.17.64.94
-      switch_name: sgraphene3-ipmi
-      switch_port: 1/0/10
   block_devices:
     sda:
       model: Hitachi HDS72103
@@ -9488,9 +8739,6 @@ graphene-94:
     serial_number: 1009390096
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: graphene-pdu5.nancy.grid5000.fr
-    pdu_position: 20
 graphene-95:
   bios:
     version: V7.01e
@@ -9509,7 +8757,6 @@ graphene-95:
       ip: 172.18.64.95
       driver: mlx4_core
       mountable: true
-      switch_name: sgrapheneib
     ib1:
       mounted: false
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5e:96
@@ -9531,8 +8778,6 @@ graphene-95:
       driver: e1000e
       mountable: true
       ip: 172.16.64.95
-      switch_name: sgraphene3
-      switch_port: Gi1/0/22
     eth1:
       mounted: false
       rate: 100000000
@@ -9553,8 +8798,6 @@ graphene-95:
     bmc:
       mac: 00:e0:81:d5:06:c3
       ip: 172.17.64.95
-      switch_name: sgraphene3-ipmi
-      switch_port: 1/0/11
   block_devices:
     sda:
       model: Hitachi HDS72103
@@ -9589,9 +8832,6 @@ graphene-95:
     serial_number: 1009390097
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: graphene-pdu5.nancy.grid5000.fr
-    pdu_position: 21
 graphene-96:
   bios:
     version: V7.01e
@@ -9617,7 +8857,6 @@ graphene-96:
       ip: 172.18.64.96
       driver: mlx4_core
       mountable: true
-      switch_name: sgrapheneib
     ib1:
       mounted: false
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5e:9e
@@ -9639,8 +8878,6 @@ graphene-96:
       driver: e1000e
       mountable: true
       ip: 172.16.64.96
-      switch_name: sgraphene3
-      switch_port: Gi1/0/21
     eth1:
       mounted: false
       rate: 100000000
@@ -9661,8 +8898,6 @@ graphene-96:
     bmc:
       mac: 00:e0:81:d5:08:37
       ip: 172.17.64.96
-      switch_name: sgraphene3-ipmi
-      switch_port: 1/0/12
   operating_system:
     kernel: 2.6.32-5-amd64
     name: debian
@@ -9690,9 +8925,6 @@ graphene-96:
     serial_number: 1009390098
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: graphene-pdu5.nancy.grid5000.fr
-    pdu_position: 22
 graphene-97:
   bios:
     version: V7.01e
@@ -9722,7 +8954,6 @@ graphene-97:
       ip: 172.18.64.97
       driver: mlx4_core
       mountable: true
-      switch_name: sgrapheneib
     ib1:
       mounted: false
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5e:d6
@@ -9744,8 +8975,6 @@ graphene-97:
       driver: e1000e
       mountable: true
       ip: 172.16.64.97
-      switch_name: sgraphene3
-      switch_port: Gi1/0/24
     eth1:
       mounted: false
       rate: 100000000
@@ -9766,8 +8995,6 @@ graphene-97:
     bmc:
       mac: 00:e0:81:d5:08:03
       ip: 172.17.64.97
-      switch_name: sgraphene3-ipmi
-      switch_port: 1/0/13
   supported_job_types:
     virtual: ivt
   main_memory:
@@ -9791,9 +9018,6 @@ graphene-97:
     serial_number: 1009390099
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: graphene-pdu5.nancy.grid5000.fr
-    pdu_position: 23
 graphene-98:
   bios:
     version: V7.01e
@@ -9823,7 +9047,6 @@ graphene-98:
       ip: 172.18.64.98
       driver: mlx4_core
       mountable: true
-      switch_name: sgrapheneib
     ib1:
       mounted: false
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5e:9a
@@ -9845,8 +9068,6 @@ graphene-98:
       driver: e1000e
       mountable: true
       ip: 172.16.64.98
-      switch_name: sgraphene3
-      switch_port: Gi1/0/23
     eth1:
       mounted: false
       rate: 100000000
@@ -9867,8 +9088,6 @@ graphene-98:
     bmc:
       mac: 00:e0:81:d5:07:d7
       ip: 172.17.64.98
-      switch_name: sgraphene3-ipmi
-      switch_port: 1/0/14
   supported_job_types:
     virtual: ivt
   processor:
@@ -9892,9 +9111,6 @@ graphene-98:
     serial_number: 1009390100
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: graphene-pdu6.nancy.grid5000.fr
-    pdu_position: 17
 graphene-99:
   bios:
     version: V7.01e
@@ -9913,7 +9129,6 @@ graphene-99:
       ip: 172.18.64.99
       driver: mlx4_core
       mountable: true
-      switch_name: sgrapheneib
     ib1:
       mounted: false
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5e:b2
@@ -9935,8 +9150,6 @@ graphene-99:
       driver: e1000e
       mountable: true
       ip: 172.16.64.99
-      switch_name: sgraphene3
-      switch_port: Gi1/0/26
     eth1:
       mounted: false
       rate: 100000000
@@ -9957,8 +9170,6 @@ graphene-99:
     bmc:
       mac: 00:e0:81:d5:08:d7
       ip: 172.17.64.99
-      switch_name: sgraphene3-ipmi
-      switch_port: 1/0/15
   operating_system:
     kernel: 2.6.32-5-amd64
     name: debian
@@ -9993,9 +9204,6 @@ graphene-99:
     serial_number: 1009390101
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: graphene-pdu6.nancy.grid5000.fr
-    pdu_position: 18
 graphene-100:
   bios:
     version: V7.01e
@@ -10025,7 +9233,6 @@ graphene-100:
       ip: 172.18.64.100
       driver: mlx4_core
       mountable: true
-      switch_name: sgrapheneib
     ib1:
       mounted: false
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5d:0e
@@ -10047,8 +9254,6 @@ graphene-100:
       driver: e1000e
       mountable: true
       ip: 172.16.64.100
-      switch_name: sgraphene3
-      switch_port: Gi1/0/25
     eth1:
       mounted: false
       rate: 100000000
@@ -10069,8 +9274,6 @@ graphene-100:
     bmc:
       mac: 00:e0:81:d5:07:cf
       ip: 172.17.64.100
-      switch_name: sgraphene3-ipmi
-      switch_port: 1/0/16
   supported_job_types:
     virtual: ivt
   processor:
@@ -10094,9 +9297,6 @@ graphene-100:
     serial_number: 1009390102
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: graphene-pdu6.nancy.grid5000.fr
-    pdu_position: 19
 graphene-101:
   bios:
     version: V7.01e
@@ -10119,7 +9319,6 @@ graphene-101:
       ip: 172.18.64.101
       driver: mlx4_core
       mountable: true
-      switch_name: sgrapheneib
     ib1:
       mounted: false
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5c:da
@@ -10141,8 +9340,6 @@ graphene-101:
       driver: e1000e
       mountable: true
       ip: 172.16.64.101
-      switch_name: sgraphene3
-      switch_port: Gi1/0/28
     eth1:
       mounted: false
       rate: 100000000
@@ -10163,8 +9360,6 @@ graphene-101:
     bmc:
       mac: 00:e0:81:d5:06:a3
       ip: 172.17.64.101
-      switch_name: sgraphene3-ipmi
-      switch_port: 1/0/17
   block_devices:
     sda:
       model: Hitachi HDS72103
@@ -10195,9 +9390,6 @@ graphene-101:
     serial_number: 1009390103
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: graphene-pdu6.nancy.grid5000.fr
-    pdu_position: 20
 graphene-102:
   bios:
     version: V7.01e
@@ -10216,7 +9408,6 @@ graphene-102:
       ip: 172.18.64.102
       driver: mlx4_core
       mountable: true
-      switch_name: sgrapheneib
     ib1:
       mounted: false
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5e:72
@@ -10238,8 +9429,6 @@ graphene-102:
       driver: e1000e
       mountable: true
       ip: 172.16.64.102
-      switch_name: sgraphene3
-      switch_port: Gi1/0/27
     eth1:
       mounted: false
       rate: 100000000
@@ -10260,8 +9449,6 @@ graphene-102:
     bmc:
       mac: 00:e0:81:d5:08:bf
       ip: 172.17.64.102
-      switch_name: sgraphene3-ipmi
-      switch_port: 1/0/18
   operating_system:
     kernel: 2.6.32-5-amd64
     name: debian
@@ -10296,9 +9483,6 @@ graphene-102:
     serial_number: 1009390104
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: graphene-pdu6.nancy.grid5000.fr
-    pdu_position: 21
 graphene-103:
   bios:
     version: V7.01e
@@ -10328,7 +9512,6 @@ graphene-103:
       ip: 172.18.64.103
       driver: mlx4_core
       mountable: true
-      switch_name: sgrapheneib
     ib1:
       mounted: false
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5d:4a
@@ -10350,8 +9533,6 @@ graphene-103:
       driver: e1000e
       mountable: true
       ip: 172.16.64.103
-      switch_name: sgraphene3
-      switch_port: Gi1/0/30
     eth1:
       mounted: false
       rate: 100000000
@@ -10372,8 +9553,6 @@ graphene-103:
     bmc:
       mac: 00:e0:81:d5:08:cb
       ip: 172.17.64.103
-      switch_name: sgraphene3-ipmi
-      switch_port: 1/0/19
   supported_job_types:
     virtual: ivt
   main_memory:
@@ -10397,9 +9576,6 @@ graphene-103:
     serial_number: 1009390105
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: graphene-pdu6.nancy.grid5000.fr
-    pdu_position: 22
 graphene-104:
   bios:
     version: V7.01e
@@ -10422,7 +9598,6 @@ graphene-104:
       ip: 172.18.64.104
       driver: mlx4_core
       mountable: true
-      switch_name: sgrapheneib
     ib1:
       mounted: false
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5d:16
@@ -10444,8 +9619,6 @@ graphene-104:
       driver: e1000e
       mountable: true
       ip: 172.16.64.104
-      switch_name: sgraphene3
-      switch_port: Gi1/0/29
     eth1:
       mounted: false
       rate: 100000000
@@ -10466,8 +9639,6 @@ graphene-104:
     bmc:
       mac: 00:e0:81:d5:07:67
       ip: 172.17.64.104
-      switch_name: sgraphene3-ipmi
-      switch_port: 1/0/20
   block_devices:
     sda:
       model: Hitachi HDS72103
@@ -10498,9 +9669,6 @@ graphene-104:
     serial_number: 1009390106
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: graphene-pdu6.nancy.grid5000.fr
-    pdu_position: 23
 graphene-105:
   bios:
     version: V7.01e
@@ -10530,7 +9698,6 @@ graphene-105:
       ip: 172.18.64.105
       driver: mlx4_core
       mountable: true
-      switch_name: sgrapheneib
     ib1:
       mounted: false
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5d:1a
@@ -10552,8 +9719,6 @@ graphene-105:
       driver: e1000e
       mountable: true
       ip: 172.16.64.105
-      switch_name: sgraphene4
-      switch_port: Gi1/0/1
     eth1:
       mounted: false
       rate: 100000000
@@ -10574,8 +9739,6 @@ graphene-105:
     bmc:
       mac: 00:e0:81:d5:06:bf
       ip: 172.17.64.105
-      switch_name: sgraphene4-ipmi
-      switch_port: 1/0/25
   supported_job_types:
     virtual: ivt
   main_memory:
@@ -10599,9 +9762,6 @@ graphene-105:
     serial_number: 1009390107
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: graphene-pdu7.nancy.grid5000.fr
-    pdu_position: 1
 graphene-106:
   bios:
     version: V7.01e
@@ -10627,7 +9787,6 @@ graphene-106:
       ip: 172.18.64.106
       driver: mlx4_core
       mountable: true
-      switch_name: sgrapheneib
     ib1:
       mounted: false
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5c:ae
@@ -10649,8 +9808,6 @@ graphene-106:
       driver: e1000e
       mountable: true
       ip: 172.16.64.106
-      switch_name: sgraphene4
-      switch_port: Gi1/0/2
     eth1:
       mounted: false
       rate: 100000000
@@ -10671,8 +9828,6 @@ graphene-106:
     bmc:
       mac: 00:e0:81:d5:07:f7
       ip: 172.17.64.106
-      switch_name: sgraphene4-ipmi
-      switch_port: 1/0/26
   operating_system:
     kernel: 2.6.32-5-amd64
     name: debian
@@ -10700,9 +9855,6 @@ graphene-106:
     serial_number: 1009390108
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: graphene-pdu7.nancy.grid5000.fr
-    pdu_position: 2
 graphene-107:
   bios:
     version: V7.01e
@@ -10732,7 +9884,6 @@ graphene-107:
       ip: 172.18.64.107
       driver: mlx4_core
       mountable: true
-      switch_name: sgrapheneib
     ib1:
       mounted: false
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5d:3e
@@ -10754,8 +9905,6 @@ graphene-107:
       driver: e1000e
       mountable: true
       ip: 172.16.64.107
-      switch_name: sgraphene4
-      switch_port: Gi1/0/3
     eth1:
       mounted: false
       rate: 100000000
@@ -10776,8 +9925,6 @@ graphene-107:
     bmc:
       mac: 00:e0:81:d5:07:cb
       ip: 172.17.64.107
-      switch_name: sgraphene4-ipmi
-      switch_port: 1/0/27
   supported_job_types:
     virtual: ivt
   processor:
@@ -10801,9 +9948,6 @@ graphene-107:
     serial_number: 1009390109
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: graphene-pdu7.nancy.grid5000.fr
-    pdu_position: 3
 graphene-108:
   bios:
     version: V7.01e
@@ -10822,7 +9966,6 @@ graphene-108:
       ip: 172.18.64.108
       driver: mlx4_core
       mountable: true
-      switch_name: sgrapheneib
     ib1:
       mounted: false
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5d:22
@@ -10844,8 +9987,6 @@ graphene-108:
       driver: e1000e
       mountable: true
       ip: 172.16.64.108
-      switch_name: sgraphene4
-      switch_port: Gi1/0/4
     eth1:
       mounted: false
       rate: 100000000
@@ -10866,8 +10007,6 @@ graphene-108:
     bmc:
       mac: 00:e0:81:d5:07:17
       ip: 172.17.64.108
-      switch_name: sgraphene4-ipmi
-      switch_port: 1/0/28
   block_devices:
     sda:
       model: Hitachi HDS72103
@@ -10902,9 +10041,6 @@ graphene-108:
     serial_number: 1009390110
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: graphene-pdu7.nancy.grid5000.fr
-    pdu_position: 4
 graphene-109:
   bios:
     version: V7.01e
@@ -10934,7 +10070,6 @@ graphene-109:
       ip: 172.18.64.109
       driver: mlx4_core
       mountable: true
-      switch_name: sgrapheneib
     ib1:
       mounted: false
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5d:26
@@ -10956,8 +10091,6 @@ graphene-109:
       driver: e1000e
       mountable: true
       ip: 172.16.64.109
-      switch_name: sgraphene4
-      switch_port: Gi1/0/5
     eth1:
       mounted: false
       rate: 100000000
@@ -10978,8 +10111,6 @@ graphene-109:
     bmc:
       mac: 00:e0:81:d5:08:33
       ip: 172.17.64.109
-      switch_name: sgraphene4-ipmi
-      switch_port: 1/0/29
   supported_job_types:
     virtual: ivt
   processor:
@@ -11003,9 +10134,6 @@ graphene-109:
     serial_number: 1009390111
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: graphene-pdu7.nancy.grid5000.fr
-    pdu_position: 5
 graphene-110:
   bios:
     version: V7.01e
@@ -11024,7 +10152,6 @@ graphene-110:
       ip: 172.18.64.110
       driver: mlx4_core
       mountable: true
-      switch_name: sgrapheneib
     ib1:
       mounted: false
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5c:aa
@@ -11046,8 +10173,6 @@ graphene-110:
       driver: e1000e
       mountable: true
       ip: 172.16.64.110
-      switch_name: sgraphene4
-      switch_port: Gi1/0/6
     eth1:
       mounted: false
       rate: 100000000
@@ -11068,8 +10193,6 @@ graphene-110:
     bmc:
       mac: 00:e0:81:d5:07:6f
       ip: 172.17.64.110
-      switch_name: sgraphene4-ipmi
-      switch_port: 1/0/30
   block_devices:
     sda:
       model: Hitachi HDS72103
@@ -11104,9 +10227,6 @@ graphene-110:
     serial_number: 1009390112
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: graphene-pdu8.nancy.grid5000.fr
-    pdu_position: 1
 graphene-111:
   bios:
     version: V7.01e
@@ -11136,7 +10256,6 @@ graphene-111:
       ip: 172.18.64.111
       driver: mlx4_core
       mountable: true
-      switch_name: sgrapheneib
     ib1:
       mounted: false
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:000c:559:2
@@ -11158,8 +10277,6 @@ graphene-111:
       driver: e1000e
       mountable: true
       ip: 172.16.64.111
-      switch_name: sgraphene4
-      switch_port: Gi1/0/7
     eth1:
       mounted: false
       rate: 100000000
@@ -11180,8 +10297,6 @@ graphene-111:
     bmc:
       mac: 00:e0:81:d5:08:5b
       ip: 172.17.64.111
-      switch_name: sgraphene4-ipmi
-      switch_port: 1/0/31
   supported_job_types:
     virtual: ivt
   processor:
@@ -11205,9 +10320,6 @@ graphene-111:
     serial_number: 1009390113b
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: graphene-pdu8.nancy.grid5000.fr
-    pdu_position: 2
 graphene-112:
   bios:
     version: V7.01e
@@ -11237,7 +10349,6 @@ graphene-112:
       ip: 172.18.64.112
       driver: mlx4_core
       mountable: true
-      switch_name: sgrapheneib
     ib1:
       mounted: false
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:7e:9e
@@ -11259,8 +10370,6 @@ graphene-112:
       driver: e1000e
       mountable: true
       ip: 172.16.64.112
-      switch_name: sgraphene4
-      switch_port: Gi1/0/8
     eth1:
       mounted: false
       rate: 100000000
@@ -11281,8 +10390,6 @@ graphene-112:
     bmc:
       mac: 00:e0:81:d5:08:13
       ip: 172.17.64.112
-      switch_name: sgraphene4-ipmi
-      switch_port: 1/0/32
   supported_job_types:
     virtual: ivt
   processor:
@@ -11306,9 +10413,6 @@ graphene-112:
     serial_number: 1009390114
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: graphene-pdu8.nancy.grid5000.fr
-    pdu_position: 3
 graphene-113:
   bios:
     version: V7.01e
@@ -11327,7 +10431,6 @@ graphene-113:
       ip: 172.18.64.113
       driver: mlx4_core
       mountable: true
-      switch_name: sgrapheneib
     ib1:
       mounted: false
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:b6
@@ -11349,8 +10452,6 @@ graphene-113:
       driver: e1000e
       mountable: true
       ip: 172.16.64.113
-      switch_name: sgraphene4
-      switch_port: Gi1/0/9
     eth1:
       mounted: false
       rate: 100000000
@@ -11371,8 +10472,6 @@ graphene-113:
     bmc:
       mac: 00:e0:81:d5:07:bf
       ip: 172.17.64.113
-      switch_name: sgraphene4-ipmi
-      switch_port: 1/0/33
   block_devices:
     sda:
       model: Hitachi HDS72103
@@ -11407,9 +10506,6 @@ graphene-113:
     serial_number: 1009390115
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: graphene-pdu8.nancy.grid5000.fr
-    pdu_position: 4
 graphene-114:
   bios:
     version: V7.01e
@@ -11432,7 +10528,6 @@ graphene-114:
       ip: 172.18.64.114
       driver: mlx4_core
       mountable: true
-      switch_name: sgrapheneib
     ib1:
       mounted: false
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:c6
@@ -11454,8 +10549,6 @@ graphene-114:
       driver: e1000e
       mountable: true
       ip: 172.16.64.114
-      switch_name: sgraphene4
-      switch_port: Gi1/0/10
     eth1:
       mounted: false
       rate: 100000000
@@ -11476,8 +10569,6 @@ graphene-114:
     bmc:
       mac: 00:e0:81:d5:06:b3
       ip: 172.17.64.114
-      switch_name: sgraphene4-ipmi
-      switch_port: 1/0/34
   block_devices:
     sda:
       model: Hitachi HDS72103
@@ -11508,9 +10599,6 @@ graphene-114:
     serial_number: 1009390116
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: graphene-pdu8.nancy.grid5000.fr
-    pdu_position: 5
 graphene-115:
   bios:
     version: V7.01e
@@ -11529,7 +10617,6 @@ graphene-115:
       ip: 172.18.64.115
       driver: mlx4_core
       mountable: true
-      switch_name: sgrapheneib
     ib1:
       mounted: false
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:06
@@ -11551,8 +10638,6 @@ graphene-115:
       driver: e1000e
       mountable: true
       ip: 172.16.64.115
-      switch_name: sgraphene4
-      switch_port: Gi1/0/11
     eth1:
       mounted: false
       rate: 100000000
@@ -11573,8 +10658,6 @@ graphene-115:
     bmc:
       mac: 00:e0:81:d5:08:07
       ip: 172.17.64.115
-      switch_name: sgraphene4-ipmi
-      switch_port: 1/0/35
   operating_system:
     kernel: 2.6.32-5-amd64
     name: debian
@@ -11609,9 +10692,6 @@ graphene-115:
     serial_number: 1009390117
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: graphene-pdu8.nancy.grid5000.fr
-    pdu_position: 6
 graphene-116:
   bios:
     version: V7.01e
@@ -11641,7 +10721,6 @@ graphene-116:
       ip: 172.18.64.116
       driver: mlx4_core
       mountable: true
-      switch_name: sgrapheneib
     ib1:
       mounted: false
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:1e
@@ -11663,8 +10742,6 @@ graphene-116:
       driver: e1000e
       mountable: true
       ip: 172.16.64.116
-      switch_name: sgraphene4
-      switch_port: Gi1/0/12
     eth1:
       mounted: false
       rate: 100000000
@@ -11685,8 +10762,6 @@ graphene-116:
     bmc:
       mac: 00:e0:81:d5:08:2b
       ip: 172.17.64.116
-      switch_name: sgraphene4-ipmi
-      switch_port: 1/0/36
   supported_job_types:
     virtual: ivt
   processor:
@@ -11710,9 +10785,6 @@ graphene-116:
     serial_number: 1009390118
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: graphene-pdu8.nancy.grid5000.fr
-    pdu_position: 7
 graphene-117:
   bios:
     version: V7.01e
@@ -11742,7 +10814,6 @@ graphene-117:
       ip: 172.18.64.117
       driver: mlx4_core
       mountable: true
-      switch_name: sgrapheneib
     ib1:
       mounted: false
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:26
@@ -11764,8 +10835,6 @@ graphene-117:
       driver: e1000e
       mountable: true
       ip: 172.16.64.117
-      switch_name: sgraphene4
-      switch_port: Gi1/0/13
     eth1:
       mounted: false
       rate: 100000000
@@ -11786,8 +10855,6 @@ graphene-117:
     bmc:
       mac: 00:e0:81:d5:06:e7
       ip: 172.17.64.117
-      switch_name: sgraphene4-ipmi
-      switch_port: 1/0/37
   supported_job_types:
     virtual: ivt
   main_memory:
@@ -11811,9 +10878,6 @@ graphene-117:
     serial_number: 1009390119
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: graphene-pdu7.nancy.grid5000.fr
-    pdu_position: 9
 graphene-118:
   bios:
     version: V7.01e
@@ -11843,7 +10907,6 @@ graphene-118:
       ip: 172.18.64.118
       driver: mlx4_core
       mountable: true
-      switch_name: sgrapheneib
     ib1:
       mounted: false
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:da
@@ -11865,8 +10928,6 @@ graphene-118:
       driver: e1000e
       mountable: true
       ip: 172.16.64.118
-      switch_name: sgraphene4
-      switch_port: Gi1/0/14
     eth1:
       mounted: false
       rate: 100000000
@@ -11887,8 +10948,6 @@ graphene-118:
     bmc:
       mac: 00:e0:81:d5:07:bb
       ip: 172.17.64.118
-      switch_name: sgraphene4-ipmi
-      switch_port: 1/0/38
   supported_job_types:
     virtual: ivt
   processor:
@@ -11912,9 +10971,6 @@ graphene-118:
     serial_number: 1009390120
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: graphene-pdu7.nancy.grid5000.fr
-    pdu_position: 10
 graphene-119:
   bios:
     version: V7.01e
@@ -11937,7 +10993,6 @@ graphene-119:
       ip: 172.18.64.119
       driver: mlx4_core
       mountable: true
-      switch_name: sgrapheneib
     ib1:
       mounted: false
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:1a
@@ -11959,8 +11014,6 @@ graphene-119:
       driver: e1000e
       mountable: true
       ip: 172.16.64.119
-      switch_name: sgraphene4
-      switch_port: Gi1/0/15
     eth1:
       mounted: false
       rate: 100000000
@@ -11981,8 +11034,6 @@ graphene-119:
     bmc:
       mac: 00:e0:81:d5:06:f3
       ip: 172.17.64.119
-      switch_name: sgraphene4-ipmi
-      switch_port: 1/0/39
   block_devices:
     sda:
       model: Hitachi HDS72103
@@ -12013,9 +11064,6 @@ graphene-119:
     serial_number: 1009390121
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: graphene-pdu7.nancy.grid5000.fr
-    pdu_position: 11
 graphene-120:
   bios:
     version: V7.01e
@@ -12034,7 +11082,6 @@ graphene-120:
       ip: 172.18.64.120
       driver: mlx4_core
       mountable: true
-      switch_name: sgrapheneib
     ib1:
       mounted: false
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:2a
@@ -12056,8 +11103,6 @@ graphene-120:
       driver: e1000e
       mountable: true
       ip: 172.16.64.120
-      switch_name: sgraphene4
-      switch_port: Gi1/0/16
     eth1:
       mounted: false
       rate: 100000000
@@ -12078,8 +11123,6 @@ graphene-120:
     bmc:
       mac: 00:e0:81:d5:08:af
       ip: 172.17.64.120
-      switch_name: sgraphene4-ipmi
-      switch_port: 1/0/40
   block_devices:
     sda:
       model: Hitachi HDS72103
@@ -12114,9 +11157,6 @@ graphene-120:
     serial_number: 1009390122
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: graphene-pdu7.nancy.grid5000.fr
-    pdu_position: 12
 graphene-121:
   bios:
     version: V7.01e
@@ -12135,7 +11175,6 @@ graphene-121:
       ip: 172.18.64.121
       driver: mlx4_core
       mountable: true
-      switch_name: sgrapheneib
     ib1:
       mounted: false
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:2e
@@ -12157,8 +11196,6 @@ graphene-121:
       driver: e1000e
       mountable: true
       ip: 172.16.64.121
-      switch_name: sgraphene4
-      switch_port: Gi1/0/17
     eth1:
       mounted: false
       rate: 100000000
@@ -12179,8 +11216,6 @@ graphene-121:
     bmc:
       mac: 00:e0:81:d5:07:3b
       ip: 172.17.64.121
-      switch_name: sgraphene4-ipmi
-      switch_port: 1/0/41
   block_devices:
     sda:
       model: Hitachi HDS72103
@@ -12215,9 +11250,6 @@ graphene-121:
     serial_number: 1009390123
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: graphene-pdu7.nancy.grid5000.fr
-    pdu_position: 13
 graphene-122:
   bios:
     version: V7.01e
@@ -12247,7 +11279,6 @@ graphene-122:
       ip: 172.18.64.122
       driver: mlx4_core
       mountable: true
-      switch_name: sgrapheneib
     ib1:
       mounted: false
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5d:86
@@ -12269,8 +11300,6 @@ graphene-122:
       driver: e1000e
       mountable: true
       ip: 172.16.64.122
-      switch_name: sgraphene4
-      switch_port: Gi1/0/18
     eth1:
       mounted: false
       rate: 100000000
@@ -12291,8 +11320,6 @@ graphene-122:
     bmc:
       mac: 00:e0:81:d5:08:3b
       ip: 172.17.64.122
-      switch_name: sgraphene4-ipmi
-      switch_port: 1/0/42
   supported_job_types:
     virtual: ivt
   main_memory:
@@ -12316,9 +11343,6 @@ graphene-122:
     serial_number: 1009390124
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: graphene-pdu7.nancy.grid5000.fr
-    pdu_position: 14
 graphene-123:
   bios:
     version: V7.01e
@@ -12348,7 +11372,6 @@ graphene-123:
       ip: 172.18.64.123
       driver: mlx4_core
       mountable: true
-      switch_name: sgrapheneib
     ib1:
       mounted: false
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:1a
@@ -12370,8 +11393,6 @@ graphene-123:
       driver: e1000e
       mountable: true
       ip: 172.16.64.123
-      switch_name: sgraphene4
-      switch_port: Gi1/0/19
     eth1:
       mounted: false
       rate: 100000000
@@ -12392,8 +11413,6 @@ graphene-123:
     bmc:
       mac: 00:e0:81:d5:06:af
       ip: 172.17.64.123
-      switch_name: sgraphene4-ipmi
-      switch_port: 1/0/43
   supported_job_types:
     virtual: ivt
   main_memory:
@@ -12417,9 +11436,6 @@ graphene-123:
     serial_number: 1009390125
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: graphene-pdu7.nancy.grid5000.fr
-    pdu_position: 15
 graphene-124:
   bios:
     version: V7.01e
@@ -12437,7 +11453,6 @@ graphene-124:
       ip: 172.18.64.124
       driver: mlx4_core
       mountable: true
-      switch_name: sgrapheneib
     ib1:
       mounted: false
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:be
@@ -12459,8 +11474,6 @@ graphene-124:
       driver: e1000e
       mountable: true
       ip: 172.16.64.124
-      switch_name: sgraphene4
-      switch_port: Gi1/0/20
     eth1:
       mounted: false
       rate: 100000000
@@ -12481,8 +11494,6 @@ graphene-124:
     bmc:
       mac: 00:e0:81:d5:06:a7
       ip: 172.17.64.124
-      switch_name: sgraphene4-ipmi
-      switch_port: 1/0/44
   operating_system:
     kernel: 2.6.32-5-amd64
     name: debian
@@ -12517,9 +11528,6 @@ graphene-124:
     serial_number: 1009390126
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: graphene-pdu8.nancy.grid5000.fr
-    pdu_position: 9
 graphene-125:
   bios:
     version: V7.01e
@@ -12549,7 +11557,6 @@ graphene-125:
       ip: 172.18.64.125
       driver: mlx4_core
       mountable: true
-      switch_name: sgrapheneib
     ib1:
       mounted: false
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:92
@@ -12571,8 +11578,6 @@ graphene-125:
       driver: e1000e
       mountable: true
       ip: 172.16.64.125
-      switch_name: sgraphene4
-      switch_port: Gi1/0/21
     eth1:
       mounted: false
       rate: 100000000
@@ -12593,8 +11598,6 @@ graphene-125:
     bmc:
       mac: 00:e0:81:d5:08:6b
       ip: 172.17.64.125
-      switch_name: sgraphene4-ipmi
-      switch_port: 1/0/1
   supported_job_types:
     virtual: ivt
   main_memory:
@@ -12618,9 +11621,6 @@ graphene-125:
     serial_number: 1009390127
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: graphene-pdu8.nancy.grid5000.fr
-    pdu_position: 10
 graphene-126:
   bios:
     version: V7.01e
@@ -12646,7 +11646,6 @@ graphene-126:
       ip: 172.18.64.126
       driver: mlx4_core
       mountable: true
-      switch_name: sgrapheneib
     ib1:
       mounted: false
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:52
@@ -12668,8 +11667,6 @@ graphene-126:
       driver: e1000e
       mountable: true
       ip: 172.16.64.126
-      switch_name: sgraphene4
-      switch_port: Gi1/0/22
     eth1:
       mounted: false
       rate: 100000000
@@ -12690,8 +11687,6 @@ graphene-126:
     bmc:
       mac: 00:e0:81:d5:08:d3
       ip: 172.17.64.126
-      switch_name: sgraphene4-ipmi
-      switch_port: 1/0/2
   operating_system:
     kernel: 2.6.32-5-amd64
     name: debian
@@ -12719,9 +11714,6 @@ graphene-126:
     serial_number: 1009390128
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: graphene-pdu8.nancy.grid5000.fr
-    pdu_position: 0
 graphene-127:
   bios:
     version: V7.01e
@@ -12740,7 +11732,6 @@ graphene-127:
       ip: 172.18.64.127
       driver: mlx4_core
       mountable: true
-      switch_name: sgrapheneib
     ib1:
       mounted: false
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:86
@@ -12762,8 +11753,6 @@ graphene-127:
       driver: e1000e
       mountable: true
       ip: 172.16.64.127
-      switch_name: sgraphene4
-      switch_port: Gi1/0/23
     eth1:
       mounted: false
       rate: 100000000
@@ -12784,8 +11773,6 @@ graphene-127:
     bmc:
       mac: 00:e0:81:d5:08:43
       ip: 172.17.64.127
-      switch_name: sgraphene4-ipmi
-      switch_port: 1/0/3
   block_devices:
     sda:
       model: Hitachi HDS72103
@@ -12820,9 +11807,6 @@ graphene-127:
     serial_number: 1009390129
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: graphene-pdu8.nancy.grid5000.fr
-    pdu_position: 12
 graphene-128:
   bios:
     version: V7.01e
@@ -12845,7 +11829,6 @@ graphene-128:
       ip: 172.18.64.128
       driver: mlx4_core
       mountable: true
-      switch_name: sgrapheneib
     ib1:
       mounted: false
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:16
@@ -12867,8 +11850,6 @@ graphene-128:
       driver: e1000e
       mountable: true
       ip: 172.16.64.128
-      switch_name: sgraphene4
-      switch_port: Gi1/0/24
     eth1:
       mounted: false
       rate: 100000000
@@ -12889,8 +11870,6 @@ graphene-128:
     bmc:
       mac: 00:e0:81:d5:08:e7
       ip: 172.17.64.128
-      switch_name: sgraphene4-ipmi
-      switch_port: 1/0/4
   block_devices:
     sda:
       model: Hitachi HDS72103
@@ -12921,9 +11900,6 @@ graphene-128:
     serial_number: 1009390130
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: graphene-pdu8.nancy.grid5000.fr
-    pdu_position: 13
 graphene-129:
   bios:
     version: V7.01e
@@ -12953,7 +11929,6 @@ graphene-129:
       ip: 172.18.64.129
       driver: mlx4_core
       mountable: true
-      switch_name: sgrapheneib
     ib1:
       mounted: false
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:06
@@ -12975,8 +11950,6 @@ graphene-129:
       driver: e1000e
       mountable: true
       ip: 172.16.64.129
-      switch_name: sgraphene4
-      switch_port: Gi1/0/25
     eth1:
       mounted: false
       rate: 100000000
@@ -12997,8 +11970,6 @@ graphene-129:
     bmc:
       mac: 00:e0:81:d5:07:1f
       ip: 172.17.64.129
-      switch_name: sgraphene4-ipmi
-      switch_port: 1/0/5
   supported_job_types:
     virtual: ivt
   main_memory:
@@ -13022,9 +11993,6 @@ graphene-129:
     serial_number: 1009390131
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: graphene-pdu8.nancy.grid5000.fr
-    pdu_position: 14
 graphene-130:
   bios:
     version: V7.01e
@@ -13050,7 +12018,6 @@ graphene-130:
       ip: 172.18.64.130
       driver: mlx4_core
       mountable: true
-      switch_name: sgrapheneib
     ib1:
       mounted: false
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:0a
@@ -13072,8 +12039,6 @@ graphene-130:
       driver: e1000e
       mountable: true
       ip: 172.16.64.130
-      switch_name: sgraphene4
-      switch_port: Gi1/0/26
     eth1:
       mounted: false
       rate: 100000000
@@ -13094,8 +12059,6 @@ graphene-130:
     bmc:
       mac: 00:e0:81:d2:5a:37
       ip: 172.17.64.130
-      switch_name: sgraphene4-ipmi
-      switch_port: 1/0/6
   operating_system:
     kernel: 2.6.32-5-amd64
     name: debian
@@ -13123,9 +12086,6 @@ graphene-130:
     serial_number: 1009390132b
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: graphene-pdu8.nancy.grid5000.fr
-    pdu_position: 15
 graphene-131:
   bios:
     version: V7.01e
@@ -13151,7 +12111,6 @@ graphene-131:
       ip: 172.18.64.131
       driver: mlx4_core
       mountable: true
-      switch_name: sgrapheneib
     ib1:
       mounted: false
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:00:02:c9:03:00:0b:91:4e
@@ -13173,8 +12132,6 @@ graphene-131:
       driver: e1000e
       mountable: true
       ip: 172.16.64.131
-      switch_name: sgraphene4
-      switch_port: Gi1/0/27
     eth1:
       mounted: false
       rate: 100000000
@@ -13195,8 +12152,6 @@ graphene-131:
     bmc:
       mac: 00:e0:81:d5:06:fb
       ip: 172.17.64.131
-      switch_name: sgraphene4-ipmi
-      switch_port: 1/0/7
   operating_system:
     kernel: 2.6.32-5-amd64
     name: debian
@@ -13224,9 +12179,6 @@ graphene-131:
     serial_number: 1009390133b
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: graphene-pdu7.nancy.grid5000.fr
-    pdu_position: 17
 graphene-132:
   bios:
     version: V7.01e
@@ -13256,7 +12208,6 @@ graphene-132:
       ip: 172.18.64.132
       driver: mlx4_core
       mountable: true
-      switch_name: sgrapheneib
     ib1:
       mounted: false
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:0e
@@ -13278,8 +12229,6 @@ graphene-132:
       driver: e1000e
       mountable: true
       ip: 172.16.64.132
-      switch_name: sgraphene4
-      switch_port: Gi1/0/28
     eth1:
       mounted: false
       rate: 100000000
@@ -13300,8 +12249,6 @@ graphene-132:
     bmc:
       mac: 00:e0:81:d5:08:8f
       ip: 172.17.64.132
-      switch_name: sgraphene4-ipmi
-      switch_port: 1/0/8
   supported_job_types:
     virtual: ivt
   main_memory:
@@ -13325,9 +12272,6 @@ graphene-132:
     serial_number: 1009390134
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: graphene-pdu7.nancy.grid5000.fr
-    pdu_position: 18
 graphene-133:
   bios:
     version: V7.01e
@@ -13353,7 +12297,6 @@ graphene-133:
       ip: 172.18.64.133
       driver: mlx4_core
       mountable: true
-      switch_name: sgrapheneib
     ib1:
       mounted: false
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:05:f7:b4
@@ -13375,8 +12318,6 @@ graphene-133:
       driver: e1000e
       mountable: true
       ip: 172.16.64.133
-      switch_name: sgraphene4
-      switch_port: Gi1/0/29
     eth1:
       mounted: false
       rate: 100000000
@@ -13397,8 +12338,6 @@ graphene-133:
     bmc:
       mac: 00:e0:81:d5:07:e3
       ip: 172.17.64.133
-      switch_name: sgraphene4-ipmi
-      switch_port: 1/0/9
   operating_system:
     kernel: 2.6.32-5-amd64
     name: debian
@@ -13426,9 +12365,6 @@ graphene-133:
     serial_number: 1009390135
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: graphene-pdu7.nancy.grid5000.fr
-    pdu_position: 19
 graphene-134:
   bios:
     version: V7.01e
@@ -13447,7 +12383,6 @@ graphene-134:
       ip: 172.18.64.134
       driver: mlx4_core
       mountable: true
-      switch_name: sgrapheneib
     ib1:
       mounted: false
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:05:f4:50
@@ -13469,8 +12404,6 @@ graphene-134:
       driver: e1000e
       mountable: true
       ip: 172.16.64.134
-      switch_name: sgraphene4
-      switch_port: Gi1/0/30
     eth1:
       mounted: false
       rate: 100000000
@@ -13491,8 +12424,6 @@ graphene-134:
     bmc:
       mac: 00:e0:81:d5:08:eb
       ip: 172.17.64.134
-      switch_name: sgraphene4-ipmi
-      switch_port: 1/0/10
   operating_system:
     kernel: 2.6.32-5-amd64
     name: debian
@@ -13527,9 +12458,6 @@ graphene-134:
     serial_number: 1009390136
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: graphene-pdu7.nancy.grid5000.fr
-    pdu_position: 20
 graphene-135:
   bios:
     version: V7.01e
@@ -13555,7 +12483,6 @@ graphene-135:
       ip: 172.18.64.135
       driver: mlx4_core
       mountable: true
-      switch_name: sgrapheneib
     ib1:
       mounted: false
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:05:f4:c8
@@ -13577,8 +12504,6 @@ graphene-135:
       driver: e1000e
       mountable: true
       ip: 172.16.64.135
-      switch_name: sgraphene4
-      switch_port: Gi1/0/31
     eth1:
       mounted: false
       rate: 100000000
@@ -13599,8 +12524,6 @@ graphene-135:
     bmc:
       mac: 00:e0:81:d5:06:73
       ip: 172.17.64.135
-      switch_name: sgraphene4-ipmi
-      switch_port: 1/0/11
   operating_system:
     kernel: 2.6.32-5-amd64
     name: debian
@@ -13628,9 +12551,6 @@ graphene-135:
     serial_number: 1009390137
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: graphene-pdu7.nancy.grid5000.fr
-    pdu_position: 21
 graphene-136:
   bios:
     version: V7.01e
@@ -13660,7 +12580,6 @@ graphene-136:
       ip: 172.18.64.136
       driver: mlx4_core
       mountable: true
-      switch_name: sgrapheneib
     ib1:
       mounted: false
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:05:f8:48
@@ -13682,8 +12601,6 @@ graphene-136:
       driver: e1000e
       mountable: true
       ip: 172.16.64.136
-      switch_name: sgraphene4
-      switch_port: Gi1/0/32
     eth1:
       mounted: false
       rate: 100000000
@@ -13704,8 +12621,6 @@ graphene-136:
     bmc:
       mac: 00:e0:81:d5:07:7f
       ip: 172.17.64.136
-      switch_name: sgraphene4-ipmi
-      switch_port: 1/0/12
   supported_job_types:
     virtual: ivt
   processor:
@@ -13729,9 +12644,6 @@ graphene-136:
     serial_number: 1009390138
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: graphene-pdu7.nancy.grid5000.fr
-    pdu_position: 22
 graphene-137:
   bios:
     version: V7.01e
@@ -13757,7 +12669,6 @@ graphene-137:
       ip: 172.18.64.137
       driver: mlx4_core
       mountable: true
-      switch_name: sgrapheneib
     ib1:
       mounted: false
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:05:f6:48
@@ -13779,8 +12690,6 @@ graphene-137:
       driver: e1000e
       mountable: true
       ip: 172.16.64.137
-      switch_name: sgraphene4
-      switch_port: Gi1/0/33
     eth1:
       mounted: false
       rate: 100000000
@@ -13801,8 +12710,6 @@ graphene-137:
     bmc:
       mac: 00:e0:81:d5:08:47
       ip: 172.17.64.137
-      switch_name: sgraphene4-ipmi
-      switch_port: 1/0/13
   operating_system:
     kernel: 2.6.32-5-amd64
     name: debian
@@ -13830,9 +12737,6 @@ graphene-137:
     serial_number: 1009390139
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: graphene-pdu7.nancy.grid5000.fr
-    pdu_position: 23
 graphene-138:
   bios:
     version: V7.01e
@@ -13851,7 +12755,6 @@ graphene-138:
       ip: 172.18.64.138
       driver: mlx4_core
       mountable: true
-      switch_name: sgrapheneib
     ib1:
       mounted: false
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:05:f4:c4
@@ -13873,8 +12776,6 @@ graphene-138:
       driver: e1000e
       mountable: true
       ip: 172.16.64.138
-      switch_name: sgraphene4
-      switch_port: Gi1/0/34
     eth1:
       mounted: false
       rate: 100000000
@@ -13895,8 +12796,6 @@ graphene-138:
     bmc:
       mac: 00:e0:81:d5:08:c7
       ip: 172.17.64.138
-      switch_name: sgraphene4-ipmi
-      switch_port: 1/0/14
   block_devices:
     sda:
       model: Hitachi HDS72103
@@ -13931,9 +12830,6 @@ graphene-138:
     serial_number: 1009390140b
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: graphene-pdu8.nancy.grid5000.fr
-    pdu_position: 17
 graphene-139:
   bios:
     version: V7.01e
@@ -13956,7 +12852,6 @@ graphene-139:
       ip: 172.18.64.139
       driver: mlx4_core
       mountable: true
-      switch_name: sgrapheneib
     ib1:
       mounted: false
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:05:f8:00
@@ -13978,8 +12873,6 @@ graphene-139:
       driver: e1000e
       mountable: true
       ip: 172.16.64.139
-      switch_name: sgraphene4
-      switch_port: Gi1/0/35
     eth1:
       mounted: false
       rate: 100000000
@@ -14000,8 +12893,6 @@ graphene-139:
     bmc:
       mac: 00:e0:81:d5:07:83
       ip: 172.17.64.139
-      switch_name: sgraphene4-ipmi
-      switch_port: 1/0/15
   block_devices:
     sda:
       model: Hitachi HDS72103
@@ -14032,9 +12923,6 @@ graphene-139:
     serial_number: 1009390141
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: graphene-pdu8.nancy.grid5000.fr
-    pdu_position: 18
 graphene-140:
   bios:
     version: V7.01e
@@ -14053,7 +12941,6 @@ graphene-140:
       ip: 172.18.64.140
       driver: mlx4_core
       mountable: true
-      switch_name: sgrapheneib
     ib1:
       mounted: false
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:05:f7:a0
@@ -14075,8 +12962,6 @@ graphene-140:
       driver: e1000e
       mountable: true
       ip: 172.16.64.140
-      switch_name: sgraphene4
-      switch_port: Gi1/0/36
     eth1:
       mounted: false
       rate: 100000000
@@ -14097,8 +12982,6 @@ graphene-140:
     bmc:
       mac: 00:e0:81:d5:07:7b
       ip: 172.17.64.140
-      switch_name: sgraphene4-ipmi
-      switch_port: 1/0/16
   operating_system:
     kernel: 2.6.32-5-amd64
     name: debian
@@ -14133,9 +13016,6 @@ graphene-140:
     serial_number: 1009390142
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: graphene-pdu8.nancy.grid5000.fr
-    pdu_position: 19
 graphene-141:
   bios:
     version: V7.01e
@@ -14165,7 +13045,6 @@ graphene-141:
       ip: 172.18.64.141
       driver: mlx4_core
       mountable: true
-      switch_name: sgrapheneib
     ib1:
       mounted: false
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:05:f7:94
@@ -14187,8 +13066,6 @@ graphene-141:
       driver: e1000e
       mountable: true
       ip: 172.16.64.141
-      switch_name: sgraphene4
-      switch_port: Gi1/0/37
     eth1:
       mounted: false
       rate: 100000000
@@ -14209,8 +13086,6 @@ graphene-141:
     bmc:
       mac: 00:e0:81:d5:08:77
       ip: 172.17.64.141
-      switch_name: sgraphene4-ipmi
-      switch_port: 1/0/17
   supported_job_types:
     virtual: ivt
   processor:
@@ -14234,9 +13109,6 @@ graphene-141:
     serial_number: 1009390143
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: graphene-pdu8.nancy.grid5000.fr
-    pdu_position: 20
 graphene-142:
   bios:
     version: V7.01e
@@ -14255,7 +13127,6 @@ graphene-142:
       ip: 172.18.64.142
       driver: mlx4_core
       mountable: true
-      switch_name: sgrapheneib
     ib1:
       mounted: false
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:05:f7:a8
@@ -14277,8 +13148,6 @@ graphene-142:
       driver: e1000e
       mountable: true
       ip: 172.16.64.142
-      switch_name: sgraphene4
-      switch_port: Gi1/0/38
     eth1:
       mounted: false
       rate: 100000000
@@ -14299,8 +13168,6 @@ graphene-142:
     bmc:
       mac: 00:e0:81:d5:06:8f
       ip: 172.17.64.142
-      switch_name: sgraphene4-ipmi
-      switch_port: 1/0/18
   operating_system:
     kernel: 2.6.32-5-amd64
     name: debian
@@ -14335,9 +13202,6 @@ graphene-142:
     serial_number: 1009390144
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: graphene-pdu8.nancy.grid5000.fr
-    pdu_position: 21
 graphene-143:
   bios:
     version: V7.01e
@@ -14360,7 +13224,6 @@ graphene-143:
       ip: 172.18.64.143
       driver: mlx4_core
       mountable: true
-      switch_name: sgrapheneib
     ib1:
       mounted: false
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:05:f4:98
@@ -14382,8 +13245,6 @@ graphene-143:
       driver: e1000e
       mountable: true
       ip: 172.16.64.143
-      switch_name: sgraphene4
-      switch_port: Gi1/0/39
     eth1:
       mounted: false
       rate: 100000000
@@ -14404,8 +13265,6 @@ graphene-143:
     bmc:
       mac: 00:e0:81:d5:07:97
       ip: 172.17.64.143
-      switch_name: sgraphene4-ipmi
-      switch_port: 1/0/19
   block_devices:
     sda:
       model: Hitachi HDS72103
@@ -14436,9 +13295,6 @@ graphene-143:
     serial_number: 1009390145
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: graphene-pdu8.nancy.grid5000.fr
-    pdu_position: 22
 graphene-144:
   bios:
     version: V7.01e
@@ -14468,7 +13324,6 @@ graphene-144:
       ip: 172.18.64.144
       driver: mlx4_core
       mountable: true
-      switch_name: sgriffonib
     ib1:
       mounted: false
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:05:f8:5c
@@ -14490,8 +13345,6 @@ graphene-144:
       driver: e1000e
       mountable: true
       ip: 172.16.64.144
-      switch_name: sgraphene4
-      switch_port: Gi1/0/40
     eth1:
       mounted: false
       rate: 100000000
@@ -14512,8 +13365,6 @@ graphene-144:
     bmc:
       mac: 00:e0:81:d5:06:bb
       ip: 172.17.64.144
-      switch_name: sgraphene4-ipmi
-      switch_port: 1/0/20
   supported_job_types:
     virtual: ivt
   main_memory:
@@ -14537,6 +13388,3 @@ graphene-144:
     serial_number: 1009390146
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: graphene-pdu8.nancy.grid5000.fr
-    pdu_position: 23
diff --git a/generators/input/sites/nancy/clusters/graphene_manual.yaml b/generators/input/sites/nancy/clusters/graphene_manual.yaml
new file mode 100644
index 00000000000..120bbf9ba91
--- /dev/null
+++ b/generators/input/sites/nancy/clusters/graphene_manual.yaml
@@ -0,0 +1,1873 @@
+---
+graphene-1:
+  network_interfaces:
+    eth0:
+      switch_name: sgraphene1
+      switch_port: Gi1/0/2
+    ib0:
+      switch_name: sgrapheneib
+    bmc:
+      switch_name: sgraphene1-ipmi
+      switch_port: 1/0/25
+  pdu:
+    pdu_name: graphene-pdu1.nancy.grid5000.fr
+    pdu_position: 2
+graphene-2:
+  network_interfaces:
+    eth0:
+      switch_name: sgraphene1
+      switch_port: Gi1/0/1
+    ib0:
+      switch_name: sgrapheneib
+    bmc:
+      switch_name: sgraphene1-ipmi
+      switch_port: 1/0/26
+  pdu:
+    pdu_name: graphene-pdu1.nancy.grid5000.fr
+    pdu_position: 3
+graphene-3:
+  network_interfaces:
+    eth0:
+      switch_name: sgraphene1
+      switch_port: Gi1/0/4
+    ib0:
+      switch_name: sgrapheneib
+    bmc:
+      switch_name: sgraphene1-ipmi
+      switch_port: 1/0/27
+  pdu:
+    pdu_name: graphene-pdu1.nancy.grid5000.fr
+    pdu_position: 4
+graphene-4:
+  network_interfaces:
+    eth0:
+      switch_name: sgraphene1
+      switch_port: Gi1/0/3
+    ib0:
+      switch_name: sgrapheneib
+    bmc:
+      switch_name: sgraphene1-ipmi
+      switch_port: 1/0/28
+  pdu:
+    pdu_name: graphene-pdu1.nancy.grid5000.fr
+    pdu_position: 5
+graphene-5:
+  network_interfaces:
+    eth0:
+      switch_name: sgraphene1
+      switch_port: Gi1/0/6
+    ib0:
+      switch_name: sgrapheneib
+    bmc:
+      switch_name: sgraphene1-ipmi
+      switch_port: 1/0/29
+  pdu:
+    pdu_name: graphene-pdu2.nancy.grid5000.fr
+    pdu_position: 1
+graphene-6:
+  network_interfaces:
+    eth0:
+      switch_name: sgraphene1
+      switch_port: Gi1/0/5
+    ib0:
+      switch_name: sgrapheneib
+    bmc:
+      switch_name: sgraphene1-ipmi
+      switch_port: 1/0/30
+  pdu:
+    pdu_name: graphene-pdu2.nancy.grid5000.fr
+    pdu_position: 2
+graphene-7:
+  network_interfaces:
+    eth0:
+      switch_name: sgraphene1
+      switch_port: Gi1/0/8
+    ib0:
+      switch_name: sgrapheneib
+    bmc:
+      switch_name: sgraphene1-ipmi
+      switch_port: 1/0/31
+  pdu:
+    pdu_name: graphene-pdu2.nancy.grid5000.fr
+    pdu_position: 3
+graphene-8:
+  network_interfaces:
+    eth0:
+      switch_name: sgraphene1
+      switch_port: Gi1/0/12
+    ib0:
+      switch_name: sgrapheneib
+    bmc:
+      switch_name: sgraphene1-ipmi
+      switch_port: 1/0/32
+  pdu:
+    pdu_name: graphene-pdu2.nancy.grid5000.fr
+    pdu_position: 4
+graphene-9:
+  network_interfaces:
+    eth0:
+      switch_name: sgraphene1
+      switch_port: Gi1/0/11
+    ib0:
+      switch_name: sgrapheneib
+    bmc:
+      switch_name: sgraphene1-ipmi
+      switch_port: 1/0/33
+  pdu:
+    pdu_name: graphene-pdu2.nancy.grid5000.fr
+    pdu_position: 5
+graphene-10:
+  network_interfaces:
+    eth0:
+      switch_name: sgraphene1
+      switch_port: Gi1/0/7
+    ib0:
+      switch_name: sgrapheneib
+    bmc:
+      switch_name: sgraphene1-ipmi
+      switch_port: 1/0/34
+  pdu:
+    pdu_name: graphene-pdu2.nancy.grid5000.fr
+    pdu_position: 6
+graphene-11:
+  network_interfaces:
+    eth0:
+      switch_name: sgraphene1
+      switch_port: Gi1/0/10
+    ib0:
+      switch_name: sgrapheneib
+    bmc:
+      switch_name: sgraphene1-ipmi
+      switch_port: 1/0/35
+  pdu:
+    pdu_name: graphene-pdu2.nancy.grid5000.fr
+    pdu_position: 7
+graphene-12:
+  network_interfaces:
+    eth0:
+      switch_name: sgraphene1
+      switch_port: Gi1/0/9
+    ib0:
+      switch_name: sgrapheneib
+    bmc:
+      switch_name: sgraphene1-ipmi
+      switch_port: 1/0/36
+  pdu:
+    pdu_name: graphene-pdu1.nancy.grid5000.fr
+    pdu_position: 9
+graphene-13:
+  network_interfaces:
+    eth0:
+      switch_name: sgraphene1
+      switch_port: Gi1/0/14
+    ib0:
+      switch_name: sgrapheneib
+    bmc:
+      switch_name: sgraphene1-ipmi
+      switch_port: 1/0/37
+  pdu:
+    pdu_name: graphene-pdu1.nancy.grid5000.fr
+    pdu_position: 10
+graphene-14:
+  network_interfaces:
+    eth0:
+      switch_name: sgraphene1
+      switch_port: Gi1/0/13
+    ib0:
+      switch_name: sgrapheneib
+    bmc:
+      switch_name: sgraphene1-ipmi
+      switch_port: 1/0/38
+  pdu:
+    pdu_name: graphene-pdu1.nancy.grid5000.fr
+    pdu_position: 11
+graphene-15:
+  network_interfaces:
+    eth0:
+      switch_name: sgraphene1
+      switch_port: Gi1/0/16
+    ib0:
+      switch_name: sgrapheneib
+    bmc:
+      switch_name: sgraphene1-ipmi
+      switch_port: 1/0/39
+  pdu:
+    pdu_name: graphene-pdu1.nancy.grid5000.fr
+    pdu_position: 12
+graphene-16:
+  network_interfaces:
+    eth0:
+      switch_name: sgraphene1
+      switch_port: Gi1/0/15
+    ib0:
+      switch_name: sgrapheneib
+    bmc:
+      switch_name: sgraphene1-ipmi
+      switch_port: 1/0/40
+  pdu:
+    pdu_name: graphene-pdu1.nancy.grid5000.fr
+    pdu_position: 13
+graphene-17:
+  network_interfaces:
+    eth0:
+      switch_name: sgraphene1
+      switch_port: Gi1/0/18
+    ib0:
+      switch_name: sgrapheneib
+    bmc:
+      switch_name: sgraphene1-ipmi
+      switch_port: 1/0/41
+  pdu:
+    pdu_name: graphene-pdu1.nancy.grid5000.fr
+    pdu_position: 14
+graphene-18:
+  network_interfaces:
+    eth0:
+      switch_name: sgraphene1
+      switch_port: Gi1/0/17
+    ib0:
+      switch_name: sgrapheneib
+    bmc:
+      switch_name: sgraphene1-ipmi
+      switch_port: 1/0/42
+  pdu:
+    pdu_name: graphene-pdu1.nancy.grid5000.fr
+    pdu_position: 15
+graphene-19:
+  network_interfaces:
+    eth0:
+      switch_name: sgraphene1
+      switch_port: Gi1/0/20
+    ib0:
+      switch_name: sgrapheneib
+    bmc:
+      switch_name: sgraphene1-ipmi
+      switch_port: 1/0/43
+  pdu:
+    pdu_name: graphene-pdu2.nancy.grid5000.fr
+    pdu_position: 9
+graphene-20:
+  network_interfaces:
+    eth0:
+      switch_name: sgraphene1
+      switch_port: Gi1/0/19
+    ib0:
+      switch_name: sgrapheneib
+    bmc:
+      switch_name: sgraphene1-ipmi
+      switch_port: 1/0/44
+  pdu:
+    pdu_name: graphene-pdu2.nancy.grid5000.fr
+    pdu_position: 10
+graphene-21:
+  network_interfaces:
+    eth0:
+      switch_name: sgraphene1
+      switch_port: Gi1/0/22
+    ib0:
+      switch_name: sgrapheneib
+    bmc:
+      switch_name: sgraphene1-ipmi
+      switch_port: 1/0/1
+  pdu:
+    pdu_name: graphene-pdu2.nancy.grid5000.fr
+    pdu_position: 11
+graphene-22:
+  network_interfaces:
+    eth0:
+      switch_name: sgraphene1
+      switch_port: Gi1/0/21
+    ib0:
+      switch_name: sgrapheneib
+    bmc:
+      switch_name: sgraphene1-ipmi
+      switch_port: 1/0/2
+  pdu:
+    pdu_name: graphene-pdu2.nancy.grid5000.fr
+    pdu_position: 12
+graphene-23:
+  network_interfaces:
+    eth0:
+      switch_name: sgraphene1
+      switch_port: Gi1/0/24
+    ib0:
+      switch_name: sgrapheneib
+    bmc:
+      switch_name: sgraphene1-ipmi
+      switch_port: 1/0/3
+  pdu:
+    pdu_name: graphene-pdu2.nancy.grid5000.fr
+    pdu_position: 13
+graphene-24:
+  network_interfaces:
+    eth0:
+      switch_name: sgraphene1
+      switch_port: Gi1/0/23
+    ib0:
+      switch_name: sgrapheneib
+    bmc:
+      switch_name: sgraphene1-ipmi
+      switch_port: 1/0/4
+  pdu:
+    pdu_name: graphene-pdu2.nancy.grid5000.fr
+    pdu_position: 14
+graphene-25:
+  network_interfaces:
+    eth0:
+      switch_name: sgraphene1
+      switch_port: Gi1/0/26
+    ib0:
+      switch_name: sgrapheneib
+    bmc:
+      switch_name: sgraphene1-ipmi
+      switch_port: 1/0/5
+  pdu:
+    pdu_name: graphene-pdu2.nancy.grid5000.fr
+    pdu_position: 15
+graphene-26:
+  network_interfaces:
+    eth0:
+      switch_name: sgraphene1
+      switch_port: Gi1/0/25
+    ib0:
+      switch_name: sgrapheneib
+    bmc:
+      switch_name: sgraphene1-ipmi
+      switch_port: 1/0/6
+  pdu:
+    pdu_name: graphene-pdu1.nancy.grid5000.fr
+    pdu_position: 17
+graphene-27:
+  network_interfaces:
+    eth0:
+      switch_name: sgraphene1
+      switch_port: Gi1/0/28
+    ib0:
+      switch_name: sgrapheneib
+    bmc:
+      switch_name: sgraphene1-ipmi
+      switch_port: 1/0/7
+  pdu:
+    pdu_name: graphene-pdu1.nancy.grid5000.fr
+    pdu_position: 18
+graphene-28:
+  network_interfaces:
+    eth0:
+      switch_name: sgraphene1
+      switch_port: Gi1/0/27
+    ib0:
+      switch_name: sgrapheneib
+    bmc:
+      switch_name: sgraphene1-ipmi
+      switch_port: 1/0/8
+  pdu:
+    pdu_name: graphene-pdu1.nancy.grid5000.fr
+    pdu_position: 19
+graphene-29:
+  network_interfaces:
+    eth0:
+      switch_name: sgraphene1
+      switch_port: Gi1/0/30
+    ib0:
+      switch_name: sgrapheneib
+    bmc:
+      switch_name: sgraphene1-ipmi
+      switch_port: 1/0/9
+  pdu:
+    pdu_name: graphene-pdu1.nancy.grid5000.fr
+    pdu_position: 20
+graphene-30:
+  network_interfaces:
+    eth0:
+      switch_name: sgraphene1
+      switch_port: Gi1/0/29
+    ib0:
+      switch_name: sgrapheneib
+    bmc:
+      switch_name: sgraphene1-ipmi
+      switch_port: 1/0/10
+  pdu:
+    pdu_name: graphene-pdu1.nancy.grid5000.fr
+    pdu_position: 21
+graphene-31:
+  network_interfaces:
+    eth0:
+      switch_name: sgraphene1
+      switch_port: Gi1/0/32
+    ib0:
+      switch_name: sgrapheneib
+    bmc:
+      switch_name: sgraphene1-ipmi
+      switch_port: 1/0/11
+  pdu:
+    pdu_name: graphene-pdu1.nancy.grid5000.fr
+    pdu_position: 22
+graphene-32:
+  network_interfaces:
+    eth0:
+      switch_name: sgraphene1
+      switch_port: Gi1/0/31
+    ib0:
+      switch_name: sgrapheneib
+    bmc:
+      switch_name: sgraphene1-ipmi
+      switch_port: 1/0/12
+  pdu:
+    pdu_name: graphene-pdu1.nancy.grid5000.fr
+    pdu_position: 23
+graphene-33:
+  network_interfaces:
+    eth0:
+      switch_name: sgraphene1
+      switch_port: Gi1/0/34
+    ib0:
+      switch_name: sgrapheneib
+    bmc:
+      switch_name: sgraphene1-ipmi
+      switch_port: 1/0/13
+  pdu:
+    pdu_name: graphene-pdu2.nancy.grid5000.fr
+    pdu_position: 17
+graphene-34:
+  network_interfaces:
+    eth0:
+      switch_name: sgraphene1
+      switch_port: Gi1/0/33
+    ib0:
+      switch_name: sgrapheneib
+    bmc:
+      switch_name: sgraphene1-ipmi
+      switch_port: 1/0/14
+  pdu:
+    pdu_name: graphene-pdu2.nancy.grid5000.fr
+    pdu_position: 18
+graphene-35:
+  network_interfaces:
+    eth0:
+      switch_name: sgraphene1
+      switch_port: Gi1/0/36
+    ib0:
+      switch_name: sgrapheneib
+    bmc:
+      switch_name: sgraphene1-ipmi
+      switch_port: 1/0/15
+  pdu:
+    pdu_name: graphene-pdu2.nancy.grid5000.fr
+    pdu_position: 19
+graphene-36:
+  network_interfaces:
+    eth0:
+      switch_name: sgraphene1
+      switch_port: Gi1/0/35
+    ib0:
+      switch_name: sgrapheneib
+    bmc:
+      switch_name: sgraphene1-ipmi
+      switch_port: 1/0/16
+  pdu:
+    pdu_name: graphene-pdu2.nancy.grid5000.fr
+    pdu_position: 20
+graphene-37:
+  network_interfaces:
+    eth0:
+      switch_name: sgraphene1
+      switch_port: Gi1/0/38
+    ib0:
+      switch_name: sgrapheneib
+    bmc:
+      switch_name: sgraphene1-ipmi
+      switch_port: 1/0/17
+  pdu:
+    pdu_name: graphene-pdu2.nancy.grid5000.fr
+    pdu_position: 21
+graphene-38:
+  network_interfaces:
+    eth0:
+      switch_name: sgraphene1
+      switch_port: Gi1/0/37
+    ib0:
+      switch_name: sgrapheneib
+    bmc:
+      switch_name: sgraphene1-ipmi
+      switch_port: 1/0/18
+  pdu:
+    pdu_name: graphene-pdu2.nancy.grid5000.fr
+    pdu_position: 22
+graphene-39:
+  network_interfaces:
+    eth0:
+      switch_name: sgraphene1
+      switch_port: Gi1/0/40
+    ib0:
+      switch_name: sgrapheneib
+    bmc:
+      switch_name: sgraphene1-ipmi
+      switch_port: 1/0/19
+  pdu:
+    pdu_name: graphene-pdu2.nancy.grid5000.fr
+    pdu_position: 23
+graphene-40:
+  network_interfaces:
+    eth0:
+      switch_name: sgraphene2
+      switch_port: Gi1/0/1
+    ib0:
+      switch_name: sgrapheneib
+    bmc:
+      switch_name: sgraphene2-ipmi
+      switch_port: 1/0/25
+  pdu:
+    pdu_name: graphene-pdu3.nancy.grid5000.fr
+    pdu_position: 3
+graphene-41:
+  network_interfaces:
+    eth0:
+      switch_name: sgraphene2
+      switch_port: Gi1/0/2
+    ib0:
+      switch_name: sgrapheneib
+    bmc:
+      switch_name: sgraphene2-ipmi
+      switch_port: 1/0/26
+  pdu:
+    pdu_name: graphene-pdu3.nancy.grid5000.fr
+    pdu_position: 4
+graphene-42:
+  network_interfaces:
+    eth0:
+      switch_name: sgraphene2
+      switch_port: Gi1/0/3
+    ib0:
+      switch_name: sgrapheneib
+    bmc:
+      switch_name: sgraphene2-ipmi
+      switch_port: 1/0/27
+  pdu:
+    pdu_name: graphene-pdu3.nancy.grid5000.fr
+    pdu_position: 5
+graphene-43:
+  network_interfaces:
+    eth0:
+      switch_name: sgraphene2
+      switch_port: Gi1/0/4
+    ib0:
+      switch_name: sgrapheneib
+    bmc:
+      switch_name: sgraphene2-ipmi
+      switch_port: 1/0/28
+  pdu:
+    pdu_name: graphene-pdu4.nancy.grid5000.fr
+    pdu_position: 1
+graphene-44:
+  network_interfaces:
+    eth0:
+      switch_name: sgraphene2
+      switch_port: Gi1/0/5
+    ib0:
+      switch_name: sgrapheneib
+    bmc:
+      switch_name: sgraphene2-ipmi
+      switch_port: 1/0/29
+  pdu:
+    pdu_name: graphene-pdu4.nancy.grid5000.fr
+    pdu_position: 2
+graphene-45:
+  network_interfaces:
+    eth0:
+      switch_name: sgraphene2
+      switch_port: Gi1/0/6
+    ib0:
+      switch_name: sgrapheneib
+    bmc:
+      switch_name: sgraphene2-ipmi
+      switch_port: 1/0/30
+  pdu:
+    pdu_name: graphene-pdu4.nancy.grid5000.fr
+    pdu_position: 3
+graphene-46:
+  network_interfaces:
+    eth0:
+      switch_name: sgraphene2
+      switch_port: Gi1/0/7
+    ib0:
+      switch_name: sgrapheneib
+    bmc:
+      switch_name: sgraphene2-ipmi
+      switch_port: 1/0/31
+  pdu:
+    pdu_name: graphene-pdu4.nancy.grid5000.fr
+    pdu_position: 4
+graphene-47:
+  network_interfaces:
+    eth0:
+      switch_name: sgraphene2
+      switch_port: Gi1/0/8
+    ib0:
+      switch_name: sgrapheneib
+    bmc:
+      switch_name: sgraphene2-ipmi
+      switch_port: 1/0/32
+  pdu:
+    pdu_name: graphene-pdu3.nancy.grid5000.fr
+    pdu_position: 9
+graphene-48:
+  network_interfaces:
+    eth0:
+      switch_name: sgraphene2
+      switch_port: Gi1/0/9
+    ib0:
+      switch_name: sgrapheneib
+    bmc:
+      switch_name: sgraphene2-ipmi
+      switch_port: 1/0/33
+  pdu:
+    pdu_name: graphene-pdu3.nancy.grid5000.fr
+    pdu_position: 10
+graphene-49:
+  network_interfaces:
+    eth0:
+      switch_name: sgraphene2
+      switch_port: Gi1/0/10
+    ib0:
+      switch_name: sgrapheneib
+    bmc:
+      switch_name: sgraphene2-ipmi
+      switch_port: 1/0/34
+  pdu:
+    pdu_name: graphene-pdu3.nancy.grid5000.fr
+    pdu_position: 11
+graphene-50:
+  network_interfaces:
+    eth0:
+      switch_name: sgraphene2
+      switch_port: Gi1/0/11
+    ib0:
+      switch_name: sgrapheneib
+    bmc:
+      switch_name: sgraphene2-ipmi
+      switch_port: 1/0/35
+  pdu:
+    pdu_name: graphene-pdu3.nancy.grid5000.fr
+    pdu_position: 12
+graphene-51:
+  network_interfaces:
+    eth0:
+      switch_name: sgraphene2
+      switch_port: Gi1/0/12
+    ib0:
+      switch_name: sgrapheneib
+    bmc:
+      switch_name: sgraphene2-ipmi
+      switch_port: 1/0/36
+  pdu:
+    pdu_name: graphene-pdu3.nancy.grid5000.fr
+    pdu_position: 13
+graphene-52:
+  network_interfaces:
+    eth0:
+      switch_name: sgraphene2
+      switch_port: Gi1/0/13
+    ib0:
+      switch_name: sgrapheneib
+    bmc:
+      switch_name: sgraphene2-ipmi
+      switch_port: 1/0/37
+  pdu:
+    pdu_name: graphene-pdu3.nancy.grid5000.fr
+    pdu_position: 14
+graphene-53:
+  network_interfaces:
+    eth0:
+      switch_name: sgraphene2
+      switch_port: Gi1/0/14
+    ib0:
+      switch_name: sgrapheneib
+    bmc:
+      switch_name: sgraphene2-ipmi
+      switch_port: 1/0/38
+  pdu:
+    pdu_name: graphene-pdu3.nancy.grid5000.fr
+    pdu_position: 15
+graphene-54:
+  network_interfaces:
+    eth0:
+      switch_name: sgraphene2
+      switch_port: Gi1/0/15
+    ib0:
+      switch_name: sgrapheneib
+    bmc:
+      switch_name: sgraphene2-ipmi
+      switch_port: 1/0/39
+  pdu:
+    pdu_name: graphene-pdu4.nancy.grid5000.fr
+    pdu_position: 5
+graphene-55:
+  network_interfaces:
+    eth0:
+      switch_name: sgraphene2
+      switch_port: Gi1/0/16
+    ib0:
+      switch_name: sgrapheneib
+    bmc:
+      switch_name: sgraphene2-ipmi
+      switch_port: 1/0/40
+  pdu:
+    pdu_name: graphene-pdu4.nancy.grid5000.fr
+    pdu_position: 6
+graphene-56:
+  network_interfaces:
+    eth0:
+      switch_name: sgraphene2
+      switch_port: Gi1/0/17
+    ib0:
+      switch_name: sgrapheneib
+    bmc:
+      switch_name: sgraphene2-ipmi
+      switch_port: 1/0/1
+  pdu:
+    pdu_name: graphene-pdu4.nancy.grid5000.fr
+    pdu_position: 11
+graphene-57:
+  network_interfaces:
+    eth0:
+      switch_name: sgraphene2
+      switch_port: Gi1/0/18
+    ib0:
+      switch_name: sgrapheneib
+    bmc:
+      switch_name: sgraphene2-ipmi
+      switch_port: 1/0/2
+  pdu:
+    pdu_name: graphene-pdu4.nancy.grid5000.fr
+    pdu_position: 12
+graphene-58:
+  network_interfaces:
+    eth0:
+      switch_name: sgraphene2
+      switch_port: Gi1/0/19
+    ib0:
+      switch_name: sgrapheneib
+    bmc:
+      switch_name: sgraphene2-ipmi
+      switch_port: 1/0/3
+  pdu:
+    pdu_name: graphene-pdu4.nancy.grid5000.fr
+    pdu_position: 13
+graphene-59:
+  network_interfaces:
+    eth0:
+      switch_name: sgraphene2
+      switch_port: Gi1/0/20
+    ib0:
+      switch_name: sgrapheneib
+    bmc:
+      switch_name: sgraphene2-ipmi
+      switch_port: 1/0/4
+  pdu:
+    pdu_name: graphene-pdu4.nancy.grid5000.fr
+    pdu_position: 14
+graphene-60:
+  network_interfaces:
+    eth0:
+      switch_name: sgraphene2
+      switch_port: Gi1/0/21
+    ib0:
+      switch_name: sgrapheneib
+    bmc:
+      switch_name: sgraphene2-ipmi
+      switch_port: 1/0/5
+  pdu:
+    pdu_name: graphene-pdu4.nancy.grid5000.fr
+    pdu_position: 15
+graphene-61:
+  network_interfaces:
+    eth0:
+      switch_name: sgraphene2
+      switch_port: Gi1/0/22
+    ib0:
+      switch_name: sgrapheneib
+    bmc:
+      switch_name: sgraphene2-ipmi
+      switch_port: 1/0/6
+  pdu:
+    pdu_name: graphene-pdu3.nancy.grid5000.fr
+    pdu_position: 17
+graphene-62:
+  network_interfaces:
+    eth0:
+      switch_name: sgraphene2
+      switch_port: Gi1/0/23
+    ib0:
+      switch_name: sgrapheneib
+    bmc:
+      switch_name: sgraphene2-ipmi
+      switch_port: 1/0/7
+  pdu:
+    pdu_name: graphene-pdu3.nancy.grid5000.fr
+    pdu_position: 18
+graphene-63:
+  network_interfaces:
+    eth0:
+      switch_name: sgraphene2
+      switch_port: Gi1/0/24
+    ib0:
+      switch_name: sgrapheneib
+    bmc:
+      switch_name: sgraphene2-ipmi
+      switch_port: 1/0/8
+  pdu:
+    pdu_name: graphene-pdu3.nancy.grid5000.fr
+    pdu_position: 19
+graphene-64:
+  network_interfaces:
+    eth0:
+      switch_name: sgraphene2
+      switch_port: Gi1/0/25
+    ib0:
+      switch_name: sgrapheneib
+    bmc:
+      switch_name: sgraphene2-ipmi
+      switch_port: 1/0/9
+  pdu:
+    pdu_name: graphene-pdu3.nancy.grid5000.fr
+    pdu_position: 20
+graphene-65:
+  network_interfaces:
+    eth0:
+      switch_name: sgraphene2
+      switch_port: Gi1/0/26
+    ib0:
+      switch_name: sgrapheneib
+    bmc:
+      switch_name: sgraphene2-ipmi
+      switch_port: 1/0/10
+  pdu:
+    pdu_name: graphene-pdu3.nancy.grid5000.fr
+    pdu_position: 21
+graphene-66:
+  network_interfaces:
+    eth0:
+      switch_name: sgraphene2
+      switch_port: Gi1/0/27
+    ib0:
+      switch_name: sgrapheneib
+    bmc:
+      switch_name: sgraphene2-ipmi
+      switch_port: 1/0/11
+  pdu:
+    pdu_name: graphene-pdu3.nancy.grid5000.fr
+    pdu_position: 22
+graphene-67:
+  network_interfaces:
+    eth0:
+      switch_name: sgraphene2
+      switch_port: Gi1/0/28
+    ib0:
+      switch_name: sgrapheneib
+    bmc:
+      switch_name: sgraphene2-ipmi
+      switch_port: 1/0/12
+  pdu:
+    pdu_name: graphene-pdu3.nancy.grid5000.fr
+    pdu_position: 23
+graphene-68:
+  network_interfaces:
+    eth0:
+      switch_name: sgraphene2
+      switch_port: Gi1/0/29
+    ib0:
+      switch_name: sgrapheneib
+    bmc:
+      switch_name: sgraphene2-ipmi
+      switch_port: 1/0/13
+  pdu:
+    pdu_name: graphene-pdu4.nancy.grid5000.fr
+    pdu_position: 17
+graphene-69:
+  network_interfaces:
+    eth0:
+      switch_name: sgraphene2
+      switch_port: Gi1/0/30
+    ib0:
+      switch_name: sgrapheneib
+    bmc:
+      switch_name: sgraphene2-ipmi
+      switch_port: 1/0/14
+  pdu:
+    pdu_name: graphene-pdu4.nancy.grid5000.fr
+    pdu_position: 18
+graphene-70:
+  network_interfaces:
+    eth0:
+      switch_name: sgraphene2
+      switch_port: Gi1/0/31
+    ib0:
+      switch_name: sgrapheneib
+    bmc:
+      switch_name: sgraphene2-ipmi
+      switch_port: 1/0/15
+  pdu:
+    pdu_name: graphene-pdu4.nancy.grid5000.fr
+    pdu_position: 19
+graphene-71:
+  network_interfaces:
+    eth0:
+      switch_name: sgraphene2
+      switch_port: Gi1/0/32
+    ib0:
+      switch_name: sgrapheneib
+    bmc:
+      switch_name: sgraphene2-ipmi
+      switch_port: 1/0/16
+  pdu:
+    pdu_name: graphene-pdu4.nancy.grid5000.fr
+    pdu_position: 20
+graphene-72:
+  network_interfaces:
+    eth0:
+      switch_name: sgraphene2
+      switch_port: Gi1/0/33
+    ib0:
+      switch_name: sgrapheneib
+    bmc:
+      switch_name: sgraphene2-ipmi
+      switch_port: 1/0/17
+  pdu:
+    pdu_name: graphene-pdu4.nancy.grid5000.fr
+    pdu_position: 21
+graphene-73:
+  network_interfaces:
+    eth0:
+      switch_name: sgraphene2
+      switch_port: Gi1/0/34
+    ib0:
+      switch_name: sgrapheneib
+    bmc:
+      switch_name: sgraphene2-ipmi
+      switch_port: 1/0/18
+  pdu:
+    pdu_name: graphene-pdu4.nancy.grid5000.fr
+    pdu_position: 22
+graphene-74:
+  network_interfaces:
+    eth0:
+      switch_name: sgraphene2
+      switch_port: Gi1/0/35
+    ib0:
+      switch_name: sgrapheneib
+    bmc:
+      switch_name: sgraphene2-ipmi
+      switch_port: 1/0/19
+  pdu:
+    pdu_name: graphene-pdu4.nancy.grid5000.fr
+    pdu_position: 23
+graphene-75:
+  network_interfaces:
+    eth0:
+      switch_name: sgraphene3
+      switch_port: Gi1/0/2
+    ib0:
+      switch_name: sgrapheneib
+    bmc:
+      switch_name: sgraphene3-ipmi
+      switch_port: 1/0/25
+  pdu:
+    pdu_name: graphene-pdu6.nancy.grid5000.fr
+    pdu_position: 6
+graphene-76:
+  network_interfaces:
+    eth0:
+      switch_name: sgraphene3
+      switch_port: Gi1/0/1
+    ib0:
+      switch_name: sgrapheneib
+    bmc:
+      switch_name: sgraphene3-ipmi
+      switch_port: 1/0/26
+  pdu:
+    pdu_name: graphene-pdu6.nancy.grid5000.fr
+    pdu_position: 7
+graphene-77:
+  network_interfaces:
+    eth0:
+      switch_name: sgraphene3
+      switch_port: Gi1/0/4
+    ib0:
+      switch_name: sgrapheneib
+    bmc:
+      switch_name: sgraphene3-ipmi
+      switch_port: 1/0/27
+  pdu:
+    pdu_name: graphene-pdu5.nancy.grid5000.fr
+    pdu_position: 9
+graphene-78:
+  network_interfaces:
+    eth0:
+      switch_name: sgraphene3
+      switch_port: Gi1/0/3
+    ib0:
+      switch_name: sgrapheneib
+    bmc:
+      switch_name: sgraphene3-ipmi
+      switch_port: 1/0/28
+  pdu:
+    pdu_name: graphene-pdu5.nancy.grid5000.fr
+    pdu_position: 10
+graphene-79:
+  network_interfaces:
+    eth0:
+      switch_name: sgraphene3
+      switch_port: Gi1/0/6
+    ib0:
+      switch_name: sgrapheneib
+    bmc:
+      switch_name: sgraphene3-ipmi
+      switch_port: 1/0/29
+  pdu:
+    pdu_name: graphene-pdu5.nancy.grid5000.fr
+    pdu_position: 11
+graphene-80:
+  network_interfaces:
+    eth0:
+      switch_name: sgraphene3
+      switch_port: Gi1/0/5
+    ib0:
+      switch_name: sgrapheneib
+    bmc:
+      switch_name: sgraphene3-ipmi
+      switch_port: 1/0/30
+  pdu:
+    pdu_name: graphene-pdu5.nancy.grid5000.fr
+    pdu_position: 12
+graphene-81:
+  network_interfaces:
+    eth0:
+      switch_name: sgraphene3
+      switch_port: Gi1/0/8
+    ib0:
+      switch_name: sgrapheneib
+    bmc:
+      switch_name: sgraphene3-ipmi
+      switch_port: 1/0/31
+  pdu:
+    pdu_name: graphene-pdu5.nancy.grid5000.fr
+    pdu_position: 13
+graphene-82:
+  network_interfaces:
+    eth0:
+      switch_name: sgraphene3
+      switch_port: Gi1/0/7
+    ib0:
+      switch_name: sgrapheneib
+    bmc:
+      switch_name: sgraphene3-ipmi
+      switch_port: 1/0/32
+  pdu:
+    pdu_name: graphene-pdu5.nancy.grid5000.fr
+    pdu_position: 14
+graphene-83:
+  network_interfaces:
+    eth0:
+      switch_name: sgraphene3
+      switch_port: Gi1/0/10
+    ib0:
+      switch_name: sgrapheneib
+    bmc:
+      switch_name: sgraphene3-ipmi
+      switch_port: 1/0/33
+  pdu:
+    pdu_name: graphene-pdu5.nancy.grid5000.fr
+    pdu_position: 15
+graphene-84:
+  network_interfaces:
+    eth0:
+      switch_name: sgraphene3
+      switch_port: Gi1/0/9
+    ib0:
+      switch_name: sgrapheneib
+    bmc:
+      switch_name: sgraphene3-ipmi
+      switch_port: 1/0/34
+  pdu:
+    pdu_name: graphene-pdu6.nancy.grid5000.fr
+    pdu_position: 9
+graphene-85:
+  network_interfaces:
+    eth0:
+      switch_name: sgraphene3
+      switch_port: Gi1/0/12
+    ib0:
+      switch_name: sgrapheneib
+    bmc:
+      switch_name: sgraphene3-ipmi
+      switch_port: 1/0/1
+  pdu:
+    pdu_name: graphene-pdu6.nancy.grid5000.fr
+    pdu_position: 10
+graphene-86:
+  network_interfaces:
+    eth0:
+      switch_name: sgraphene3
+      switch_port: Gi1/0/11
+    ib0:
+      switch_name: sgrapheneib
+    bmc:
+      switch_name: sgraphene3-ipmi
+      switch_port: 1/0/2
+  pdu:
+    pdu_name: graphene-pdu6.nancy.grid5000.fr
+    pdu_position: 11
+graphene-87:
+  network_interfaces:
+    eth0:
+      switch_name: sgraphene3
+      switch_port: Gi1/0/14
+    ib0:
+      switch_name: sgrapheneib
+    bmc:
+      switch_name: sgraphene3-ipmi
+      switch_port: 1/0/3
+  pdu:
+    pdu_name: graphene-pdu6.nancy.grid5000.fr
+    pdu_position: 12
+graphene-88:
+  network_interfaces:
+    eth0:
+      switch_name: sgraphene3
+      switch_port: Gi1/0/13
+    ib0:
+      switch_name: sgrapheneib
+    bmc:
+      switch_name: sgraphene3-ipmi
+      switch_port: 1/0/4
+  pdu:
+    pdu_name: graphene-pdu6.nancy.grid5000.fr
+    pdu_position: 13
+graphene-89:
+  network_interfaces:
+    eth0:
+      switch_name: sgraphene3
+      switch_port: Gi1/0/16
+    ib0:
+      switch_name: sgrapheneib
+    bmc:
+      switch_name: sgraphene3-ipmi
+      switch_port: 1/0/5
+  pdu:
+    pdu_name: graphene-pdu6.nancy.grid5000.fr
+    pdu_position: 14
+graphene-90:
+  network_interfaces:
+    eth0:
+      switch_name: sgraphene3
+      switch_port: Gi1/0/15
+    ib0:
+      switch_name: sgrapheneib
+    bmc:
+      switch_name: sgraphene3-ipmi
+      switch_port: 1/0/6
+  pdu:
+    pdu_name: graphene-pdu6.nancy.grid5000.fr
+    pdu_position: 15
+graphene-91:
+  network_interfaces:
+    eth0:
+      switch_name: sgraphene3
+      switch_port: Gi1/0/18
+    ib0:
+      switch_name: sgrapheneib
+    bmc:
+      switch_name: sgraphene3-ipmi
+      switch_port: 1/0/7
+  pdu:
+    pdu_name: graphene-pdu5.nancy.grid5000.fr
+    pdu_position: 17
+graphene-92:
+  network_interfaces:
+    eth0:
+      switch_name: sgraphene3
+      switch_port: Gi1/0/17
+    ib0:
+      switch_name: sgrapheneib
+    bmc:
+      switch_name: sgraphene3-ipmi
+      switch_port: 1/0/8
+  pdu:
+    pdu_name: graphene-pdu5.nancy.grid5000.fr
+    pdu_position: 18
+graphene-93:
+  network_interfaces:
+    eth0:
+      switch_name: sgraphene3
+      switch_port: Gi1/0/20
+    ib0:
+      switch_name: sgrapheneib
+    bmc:
+      switch_name: sgraphene3-ipmi
+      switch_port: 1/0/9
+  pdu:
+    pdu_name: graphene-pdu5.nancy.grid5000.fr
+    pdu_position: 19
+graphene-94:
+  network_interfaces:
+    eth0:
+      switch_name: sgraphene3
+      switch_port: Gi1/0/19
+    ib0:
+      switch_name: sgrapheneib
+    bmc:
+      switch_name: sgraphene3-ipmi
+      switch_port: 1/0/10
+  pdu:
+    pdu_name: graphene-pdu5.nancy.grid5000.fr
+    pdu_position: 20
+graphene-95:
+  network_interfaces:
+    eth0:
+      switch_name: sgraphene3
+      switch_port: Gi1/0/22
+    ib0:
+      switch_name: sgrapheneib
+    bmc:
+      switch_name: sgraphene3-ipmi
+      switch_port: 1/0/11
+  pdu:
+    pdu_name: graphene-pdu5.nancy.grid5000.fr
+    pdu_position: 21
+graphene-96:
+  network_interfaces:
+    eth0:
+      switch_name: sgraphene3
+      switch_port: Gi1/0/21
+    ib0:
+      switch_name: sgrapheneib
+    bmc:
+      switch_name: sgraphene3-ipmi
+      switch_port: 1/0/12
+  pdu:
+    pdu_name: graphene-pdu5.nancy.grid5000.fr
+    pdu_position: 22
+graphene-97:
+  network_interfaces:
+    eth0:
+      switch_name: sgraphene3
+      switch_port: Gi1/0/24
+    ib0:
+      switch_name: sgrapheneib
+    bmc:
+      switch_name: sgraphene3-ipmi
+      switch_port: 1/0/13
+  pdu:
+    pdu_name: graphene-pdu5.nancy.grid5000.fr
+    pdu_position: 23
+graphene-98:
+  network_interfaces:
+    eth0:
+      switch_name: sgraphene3
+      switch_port: Gi1/0/23
+    ib0:
+      switch_name: sgrapheneib
+    bmc:
+      switch_name: sgraphene3-ipmi
+      switch_port: 1/0/14
+  pdu:
+    pdu_name: graphene-pdu6.nancy.grid5000.fr
+    pdu_position: 17
+graphene-99:
+  network_interfaces:
+    eth0:
+      switch_name: sgraphene3
+      switch_port: Gi1/0/26
+    ib0:
+      switch_name: sgrapheneib
+    bmc:
+      switch_name: sgraphene3-ipmi
+      switch_port: 1/0/15
+  pdu:
+    pdu_name: graphene-pdu6.nancy.grid5000.fr
+    pdu_position: 18
+graphene-100:
+  network_interfaces:
+    eth0:
+      switch_name: sgraphene3
+      switch_port: Gi1/0/25
+    ib0:
+      switch_name: sgrapheneib
+    bmc:
+      switch_name: sgraphene3-ipmi
+      switch_port: 1/0/16
+  pdu:
+    pdu_name: graphene-pdu6.nancy.grid5000.fr
+    pdu_position: 19
+graphene-101:
+  network_interfaces:
+    eth0:
+      switch_name: sgraphene3
+      switch_port: Gi1/0/28
+    ib0:
+      switch_name: sgrapheneib
+    bmc:
+      switch_name: sgraphene3-ipmi
+      switch_port: 1/0/17
+  pdu:
+    pdu_name: graphene-pdu6.nancy.grid5000.fr
+    pdu_position: 20
+graphene-102:
+  network_interfaces:
+    eth0:
+      switch_name: sgraphene3
+      switch_port: Gi1/0/27
+    ib0:
+      switch_name: sgrapheneib
+    bmc:
+      switch_name: sgraphene3-ipmi
+      switch_port: 1/0/18
+  pdu:
+    pdu_name: graphene-pdu6.nancy.grid5000.fr
+    pdu_position: 21
+graphene-103:
+  network_interfaces:
+    eth0:
+      switch_name: sgraphene3
+      switch_port: Gi1/0/30
+    ib0:
+      switch_name: sgrapheneib
+    bmc:
+      switch_name: sgraphene3-ipmi
+      switch_port: 1/0/19
+  pdu:
+    pdu_name: graphene-pdu6.nancy.grid5000.fr
+    pdu_position: 22
+graphene-104:
+  network_interfaces:
+    eth0:
+      switch_name: sgraphene3
+      switch_port: Gi1/0/29
+    ib0:
+      switch_name: sgrapheneib
+    bmc:
+      switch_name: sgraphene3-ipmi
+      switch_port: 1/0/20
+  pdu:
+    pdu_name: graphene-pdu6.nancy.grid5000.fr
+    pdu_position: 23
+graphene-105:
+  network_interfaces:
+    eth0:
+      switch_name: sgraphene4
+      switch_port: Gi1/0/1
+    ib0:
+      switch_name: sgrapheneib
+    bmc:
+      switch_name: sgraphene4-ipmi
+      switch_port: 1/0/25
+  pdu:
+    pdu_name: graphene-pdu7.nancy.grid5000.fr
+    pdu_position: 1
+graphene-106:
+  network_interfaces:
+    eth0:
+      switch_name: sgraphene4
+      switch_port: Gi1/0/2
+    ib0:
+      switch_name: sgrapheneib
+    bmc:
+      switch_name: sgraphene4-ipmi
+      switch_port: 1/0/26
+  pdu:
+    pdu_name: graphene-pdu7.nancy.grid5000.fr
+    pdu_position: 2
+graphene-107:
+  network_interfaces:
+    eth0:
+      switch_name: sgraphene4
+      switch_port: Gi1/0/3
+    ib0:
+      switch_name: sgrapheneib
+    bmc:
+      switch_name: sgraphene4-ipmi
+      switch_port: 1/0/27
+  pdu:
+    pdu_name: graphene-pdu7.nancy.grid5000.fr
+    pdu_position: 3
+graphene-108:
+  network_interfaces:
+    eth0:
+      switch_name: sgraphene4
+      switch_port: Gi1/0/4
+    ib0:
+      switch_name: sgrapheneib
+    bmc:
+      switch_name: sgraphene4-ipmi
+      switch_port: 1/0/28
+  pdu:
+    pdu_name: graphene-pdu7.nancy.grid5000.fr
+    pdu_position: 4
+graphene-109:
+  network_interfaces:
+    eth0:
+      switch_name: sgraphene4
+      switch_port: Gi1/0/5
+    ib0:
+      switch_name: sgrapheneib
+    bmc:
+      switch_name: sgraphene4-ipmi
+      switch_port: 1/0/29
+  pdu:
+    pdu_name: graphene-pdu7.nancy.grid5000.fr
+    pdu_position: 5
+graphene-110:
+  network_interfaces:
+    eth0:
+      switch_name: sgraphene4
+      switch_port: Gi1/0/6
+    ib0:
+      switch_name: sgrapheneib
+    bmc:
+      switch_name: sgraphene4-ipmi
+      switch_port: 1/0/30
+  pdu:
+    pdu_name: graphene-pdu8.nancy.grid5000.fr
+    pdu_position: 1
+graphene-111:
+  network_interfaces:
+    eth0:
+      switch_name: sgraphene4
+      switch_port: Gi1/0/7
+    ib0:
+      switch_name: sgrapheneib
+    bmc:
+      switch_name: sgraphene4-ipmi
+      switch_port: 1/0/31
+  pdu:
+    pdu_name: graphene-pdu8.nancy.grid5000.fr
+    pdu_position: 2
+graphene-112:
+  network_interfaces:
+    eth0:
+      switch_name: sgraphene4
+      switch_port: Gi1/0/8
+    ib0:
+      switch_name: sgrapheneib
+    bmc:
+      switch_name: sgraphene4-ipmi
+      switch_port: 1/0/32
+  pdu:
+    pdu_name: graphene-pdu8.nancy.grid5000.fr
+    pdu_position: 3
+graphene-113:
+  network_interfaces:
+    eth0:
+      switch_name: sgraphene4
+      switch_port: Gi1/0/9
+    ib0:
+      switch_name: sgrapheneib
+    bmc:
+      switch_name: sgraphene4-ipmi
+      switch_port: 1/0/33
+  pdu:
+    pdu_name: graphene-pdu8.nancy.grid5000.fr
+    pdu_position: 4
+graphene-114:
+  network_interfaces:
+    eth0:
+      switch_name: sgraphene4
+      switch_port: Gi1/0/10
+    ib0:
+      switch_name: sgrapheneib
+    bmc:
+      switch_name: sgraphene4-ipmi
+      switch_port: 1/0/34
+  pdu:
+    pdu_name: graphene-pdu8.nancy.grid5000.fr
+    pdu_position: 5
+graphene-115:
+  network_interfaces:
+    eth0:
+      switch_name: sgraphene4
+      switch_port: Gi1/0/11
+    ib0:
+      switch_name: sgrapheneib
+    bmc:
+      switch_name: sgraphene4-ipmi
+      switch_port: 1/0/35
+  pdu:
+    pdu_name: graphene-pdu8.nancy.grid5000.fr
+    pdu_position: 6
+graphene-116:
+  network_interfaces:
+    eth0:
+      switch_name: sgraphene4
+      switch_port: Gi1/0/12
+    ib0:
+      switch_name: sgrapheneib
+    bmc:
+      switch_name: sgraphene4-ipmi
+      switch_port: 1/0/36
+  pdu:
+    pdu_name: graphene-pdu8.nancy.grid5000.fr
+    pdu_position: 7
+graphene-117:
+  network_interfaces:
+    eth0:
+      switch_name: sgraphene4
+      switch_port: Gi1/0/13
+    ib0:
+      switch_name: sgrapheneib
+    bmc:
+      switch_name: sgraphene4-ipmi
+      switch_port: 1/0/37
+  pdu:
+    pdu_name: graphene-pdu7.nancy.grid5000.fr
+    pdu_position: 9
+graphene-118:
+  network_interfaces:
+    eth0:
+      switch_name: sgraphene4
+      switch_port: Gi1/0/14
+    ib0:
+      switch_name: sgrapheneib
+    bmc:
+      switch_name: sgraphene4-ipmi
+      switch_port: 1/0/38
+  pdu:
+    pdu_name: graphene-pdu7.nancy.grid5000.fr
+    pdu_position: 10
+graphene-119:
+  network_interfaces:
+    eth0:
+      switch_name: sgraphene4
+      switch_port: Gi1/0/15
+    ib0:
+      switch_name: sgrapheneib
+    bmc:
+      switch_name: sgraphene4-ipmi
+      switch_port: 1/0/39
+  pdu:
+    pdu_name: graphene-pdu7.nancy.grid5000.fr
+    pdu_position: 11
+graphene-120:
+  network_interfaces:
+    eth0:
+      switch_name: sgraphene4
+      switch_port: Gi1/0/16
+    ib0:
+      switch_name: sgrapheneib
+    bmc:
+      switch_name: sgraphene4-ipmi
+      switch_port: 1/0/40
+  pdu:
+    pdu_name: graphene-pdu7.nancy.grid5000.fr
+    pdu_position: 12
+graphene-121:
+  network_interfaces:
+    eth0:
+      switch_name: sgraphene4
+      switch_port: Gi1/0/17
+    ib0:
+      switch_name: sgrapheneib
+    bmc:
+      switch_name: sgraphene4-ipmi
+      switch_port: 1/0/41
+  pdu:
+    pdu_name: graphene-pdu7.nancy.grid5000.fr
+    pdu_position: 13
+graphene-122:
+  network_interfaces:
+    eth0:
+      switch_name: sgraphene4
+      switch_port: Gi1/0/18
+    ib0:
+      switch_name: sgrapheneib
+    bmc:
+      switch_name: sgraphene4-ipmi
+      switch_port: 1/0/42
+  pdu:
+    pdu_name: graphene-pdu7.nancy.grid5000.fr
+    pdu_position: 14
+graphene-123:
+  network_interfaces:
+    eth0:
+      switch_name: sgraphene4
+      switch_port: Gi1/0/19
+    ib0:
+      switch_name: sgrapheneib
+    bmc:
+      switch_name: sgraphene4-ipmi
+      switch_port: 1/0/43
+  pdu:
+    pdu_name: graphene-pdu7.nancy.grid5000.fr
+    pdu_position: 15
+graphene-124:
+  network_interfaces:
+    eth0:
+      switch_name: sgraphene4
+      switch_port: Gi1/0/20
+    ib0:
+      switch_name: sgrapheneib
+    bmc:
+      switch_name: sgraphene4-ipmi
+      switch_port: 1/0/44
+  pdu:
+    pdu_name: graphene-pdu8.nancy.grid5000.fr
+    pdu_position: 9
+graphene-125:
+  network_interfaces:
+    eth0:
+      switch_name: sgraphene4
+      switch_port: Gi1/0/21
+    ib0:
+      switch_name: sgrapheneib
+    bmc:
+      switch_name: sgraphene4-ipmi
+      switch_port: 1/0/1
+  pdu:
+    pdu_name: graphene-pdu8.nancy.grid5000.fr
+    pdu_position: 10
+graphene-126:
+  network_interfaces:
+    eth0:
+      switch_name: sgraphene4
+      switch_port: Gi1/0/22
+    ib0:
+      switch_name: sgrapheneib
+    bmc:
+      switch_name: sgraphene4-ipmi
+      switch_port: 1/0/2
+  pdu:
+    pdu_name: graphene-pdu8.nancy.grid5000.fr
+    pdu_position: 0
+graphene-127:
+  network_interfaces:
+    eth0:
+      switch_name: sgraphene4
+      switch_port: Gi1/0/23
+    ib0:
+      switch_name: sgrapheneib
+    bmc:
+      switch_name: sgraphene4-ipmi
+      switch_port: 1/0/3
+  pdu:
+    pdu_name: graphene-pdu8.nancy.grid5000.fr
+    pdu_position: 12
+graphene-128:
+  network_interfaces:
+    eth0:
+      switch_name: sgraphene4
+      switch_port: Gi1/0/24
+    ib0:
+      switch_name: sgrapheneib
+    bmc:
+      switch_name: sgraphene4-ipmi
+      switch_port: 1/0/4
+  pdu:
+    pdu_name: graphene-pdu8.nancy.grid5000.fr
+    pdu_position: 13
+graphene-129:
+  network_interfaces:
+    eth0:
+      switch_name: sgraphene4
+      switch_port: Gi1/0/25
+    ib0:
+      switch_name: sgrapheneib
+    bmc:
+      switch_name: sgraphene4-ipmi
+      switch_port: 1/0/5
+  pdu:
+    pdu_name: graphene-pdu8.nancy.grid5000.fr
+    pdu_position: 14
+graphene-130:
+  network_interfaces:
+    eth0:
+      switch_name: sgraphene4
+      switch_port: Gi1/0/26
+    ib0:
+      switch_name: sgrapheneib
+    bmc:
+      switch_name: sgraphene4-ipmi
+      switch_port: 1/0/6
+  pdu:
+    pdu_name: graphene-pdu8.nancy.grid5000.fr
+    pdu_position: 15
+graphene-131:
+  network_interfaces:
+    eth0:
+      switch_name: sgraphene4
+      switch_port: Gi1/0/27
+    ib0:
+      switch_name: sgrapheneib
+    bmc:
+      switch_name: sgraphene4-ipmi
+      switch_port: 1/0/7
+  pdu:
+    pdu_name: graphene-pdu7.nancy.grid5000.fr
+    pdu_position: 17
+graphene-132:
+  network_interfaces:
+    eth0:
+      switch_name: sgraphene4
+      switch_port: Gi1/0/28
+    ib0:
+      switch_name: sgrapheneib
+    bmc:
+      switch_name: sgraphene4-ipmi
+      switch_port: 1/0/8
+  pdu:
+    pdu_name: graphene-pdu7.nancy.grid5000.fr
+    pdu_position: 18
+graphene-133:
+  network_interfaces:
+    eth0:
+      switch_name: sgraphene4
+      switch_port: Gi1/0/29
+    ib0:
+      switch_name: sgrapheneib
+    bmc:
+      switch_name: sgraphene4-ipmi
+      switch_port: 1/0/9
+  pdu:
+    pdu_name: graphene-pdu7.nancy.grid5000.fr
+    pdu_position: 19
+graphene-134:
+  network_interfaces:
+    eth0:
+      switch_name: sgraphene4
+      switch_port: Gi1/0/30
+    ib0:
+      switch_name: sgrapheneib
+    bmc:
+      switch_name: sgraphene4-ipmi
+      switch_port: 1/0/10
+  pdu:
+    pdu_name: graphene-pdu7.nancy.grid5000.fr
+    pdu_position: 20
+graphene-135:
+  network_interfaces:
+    eth0:
+      switch_name: sgraphene4
+      switch_port: Gi1/0/31
+    ib0:
+      switch_name: sgrapheneib
+    bmc:
+      switch_name: sgraphene4-ipmi
+      switch_port: 1/0/11
+  pdu:
+    pdu_name: graphene-pdu7.nancy.grid5000.fr
+    pdu_position: 21
+graphene-136:
+  network_interfaces:
+    eth0:
+      switch_name: sgraphene4
+      switch_port: Gi1/0/32
+    ib0:
+      switch_name: sgrapheneib
+    bmc:
+      switch_name: sgraphene4-ipmi
+      switch_port: 1/0/12
+  pdu:
+    pdu_name: graphene-pdu7.nancy.grid5000.fr
+    pdu_position: 22
+graphene-137:
+  network_interfaces:
+    eth0:
+      switch_name: sgraphene4
+      switch_port: Gi1/0/33
+    ib0:
+      switch_name: sgrapheneib
+    bmc:
+      switch_name: sgraphene4-ipmi
+      switch_port: 1/0/13
+  pdu:
+    pdu_name: graphene-pdu7.nancy.grid5000.fr
+    pdu_position: 23
+graphene-138:
+  network_interfaces:
+    eth0:
+      switch_name: sgraphene4
+      switch_port: Gi1/0/34
+    ib0:
+      switch_name: sgrapheneib
+    bmc:
+      switch_name: sgraphene4-ipmi
+      switch_port: 1/0/14
+  pdu:
+    pdu_name: graphene-pdu8.nancy.grid5000.fr
+    pdu_position: 17
+graphene-139:
+  network_interfaces:
+    eth0:
+      switch_name: sgraphene4
+      switch_port: Gi1/0/35
+    ib0:
+      switch_name: sgrapheneib
+    bmc:
+      switch_name: sgraphene4-ipmi
+      switch_port: 1/0/15
+  pdu:
+    pdu_name: graphene-pdu8.nancy.grid5000.fr
+    pdu_position: 18
+graphene-140:
+  network_interfaces:
+    eth0:
+      switch_name: sgraphene4
+      switch_port: Gi1/0/36
+    ib0:
+      switch_name: sgrapheneib
+    bmc:
+      switch_name: sgraphene4-ipmi
+      switch_port: 1/0/16
+  pdu:
+    pdu_name: graphene-pdu8.nancy.grid5000.fr
+    pdu_position: 19
+graphene-141:
+  network_interfaces:
+    eth0:
+      switch_name: sgraphene4
+      switch_port: Gi1/0/37
+    ib0:
+      switch_name: sgrapheneib
+    bmc:
+      switch_name: sgraphene4-ipmi
+      switch_port: 1/0/17
+  pdu:
+    pdu_name: graphene-pdu8.nancy.grid5000.fr
+    pdu_position: 20
+graphene-142:
+  network_interfaces:
+    eth0:
+      switch_name: sgraphene4
+      switch_port: Gi1/0/38
+    ib0:
+      switch_name: sgrapheneib
+    bmc:
+      switch_name: sgraphene4-ipmi
+      switch_port: 1/0/18
+  pdu:
+    pdu_name: graphene-pdu8.nancy.grid5000.fr
+    pdu_position: 21
+graphene-143:
+  network_interfaces:
+    eth0:
+      switch_name: sgraphene4
+      switch_port: Gi1/0/39
+    ib0:
+      switch_name: sgrapheneib
+    bmc:
+      switch_name: sgraphene4-ipmi
+      switch_port: 1/0/19
+  pdu:
+    pdu_name: graphene-pdu8.nancy.grid5000.fr
+    pdu_position: 22
+graphene-144:
+  network_interfaces:
+    eth0:
+      switch_name: sgraphene4
+      switch_port: Gi1/0/40
+    ib0:
+      switch_name: sgriffonib
+    bmc:
+      switch_name: sgraphene4-ipmi
+      switch_port: 1/0/20
+  pdu:
+    pdu_name: graphene-pdu8.nancy.grid5000.fr
+    pdu_position: 23
diff --git a/generators/input/sites/nancy/clusters/griffon.rb b/generators/input/sites/nancy/clusters/griffon.rb
index 118f29ebb50..81e7b7f9729 100644
--- a/generators/input/sites/nancy/clusters/griffon.rb
+++ b/generators/input/sites/nancy/clusters/griffon.rb
@@ -16,124 +16,124 @@ site :nancy do |site_uid|
         supported_job_types({
           :deploy       => true,
           :besteffort   => true,
-          :virtual      => lookup('griffon', node_uid, 'supported_job_types', 'virtual')
+          :virtual      => lookup('griffon_generated', node_uid, 'supported_job_types', 'virtual')
         })
 
         architecture({
-          :smp_size       => lookup('griffon', node_uid, 'architecture', 'smp_size'),
-          :smt_size       => lookup('griffon', node_uid, 'architecture', 'smt_size'),
-          :platform_type  => lookup('griffon', node_uid, 'architecture', 'platform_type')
+          :smp_size       => lookup('griffon_generated', node_uid, 'architecture', 'smp_size'),
+          :smt_size       => lookup('griffon_generated', node_uid, 'architecture', 'smt_size'),
+          :platform_type  => lookup('griffon_generated', node_uid, 'architecture', 'platform_type')
         })
 
         processor({
-          :vendor             => lookup('griffon', node_uid, 'processor', 'vendor'),
-          :model              => lookup('griffon', node_uid, 'processor', 'model'),
-          :version            => lookup('griffon', node_uid, 'processor', 'version'),
-          :clock_speed        => lookup('griffon', node_uid, 'processor', 'clock_speed'),
-          :instruction_set    => lookup('griffon', node_uid, 'processor', 'instruction_set'),
-          :other_description  => lookup('griffon', node_uid, 'processor', 'other_description'),
-          :cache_l1           => lookup('griffon', node_uid, 'processor', 'cache_l1'),
-          :cache_l1i          => lookup('griffon', node_uid, 'processor', 'cache_l1i'),
-          :cache_l1d          => lookup('griffon', node_uid, 'processor', 'cache_l1d'),
-          :cache_l2           => lookup('griffon', node_uid, 'processor', 'cache_l2'),
-          :cache_l3           => lookup('griffon', node_uid, 'processor', 'cache_l3')
+          :vendor             => lookup('griffon_generated', node_uid, 'processor', 'vendor'),
+          :model              => lookup('griffon_generated', node_uid, 'processor', 'model'),
+          :version            => lookup('griffon_generated', node_uid, 'processor', 'version'),
+          :clock_speed        => lookup('griffon_generated', node_uid, 'processor', 'clock_speed'),
+          :instruction_set    => lookup('griffon_generated', node_uid, 'processor', 'instruction_set'),
+          :other_description  => lookup('griffon_generated', node_uid, 'processor', 'other_description'),
+          :cache_l1           => lookup('griffon_generated', node_uid, 'processor', 'cache_l1'),
+          :cache_l1i          => lookup('griffon_generated', node_uid, 'processor', 'cache_l1i'),
+          :cache_l1d          => lookup('griffon_generated', node_uid, 'processor', 'cache_l1d'),
+          :cache_l2           => lookup('griffon_generated', node_uid, 'processor', 'cache_l2'),
+          :cache_l3           => lookup('griffon_generated', node_uid, 'processor', 'cache_l3')
         })
 
         main_memory({
-          :ram_size     => lookup('griffon', node_uid, 'main_memory', 'ram_size'),
+          :ram_size     => lookup('griffon_generated', node_uid, 'main_memory', 'ram_size'),
           :virtual_size => nil
         })
 
         operating_system({
-          :name     => lookup('griffon', node_uid, 'operating_system', 'name'),
+          :name     => lookup('griffon_generated', node_uid, 'operating_system', 'name'),
           :release  => "Squeeze",
-          :version  => lookup('griffon', node_uid, 'operating_system', 'version'),
-          :kernel   => lookup('griffon', node_uid, 'operating_system', 'kernel')
+          :version  => lookup('griffon_generated', node_uid, 'operating_system', 'version'),
+          :kernel   => lookup('griffon_generated', node_uid, 'operating_system', 'kernel')
         })
         storage_devices [{
           :interface  => 'SATA II',
-          :size       => lookup('griffon', node_uid, 'block_devices', 'sda', 'size'),
+          :size       => lookup('griffon_generated', node_uid, 'block_devices', 'sda', 'size'),
           :driver     => "ahci",
-          :device     => lookup('griffon', node_uid, 'block_devices', 'sda', 'device'),
-          :model      => lookup('griffon', node_uid, 'block_devices', 'sda', 'model'),
-          :vendor     => lookup('griffon', node_uid, 'block_devices', 'sda', 'vendor'),
-          :rev        => lookup('griffon', node_uid, 'block_devices', 'sda', 'rev')
+          :device     => lookup('griffon_generated', node_uid, 'block_devices', 'sda', 'device'),
+          :model      => lookup('griffon_generated', node_uid, 'block_devices', 'sda', 'model'),
+          :vendor     => lookup('griffon_generated', node_uid, 'block_devices', 'sda', 'vendor'),
+          :rev        => lookup('griffon_generated', node_uid, 'block_devices', 'sda', 'rev')
         }]
 
         network_adapters [{
-          :interface        => lookup('griffon', node_uid, 'network_interfaces', 'eth0', 'interface'),
-          :rate             => lookup('griffon', node_uid, 'network_interfaces', 'eth0', 'rate'),
-          :enabled          => lookup('griffon', node_uid, 'network_interfaces', 'eth0', 'enabled'),
-          :management       => lookup('griffon', node_uid, 'network_interfaces', 'eth0', 'management'),
-          :mountable        => lookup('griffon', node_uid, 'network_interfaces', 'eth0', 'mountable'),
-          :mounted          => lookup('griffon', node_uid, 'network_interfaces', 'eth0', 'mounted'),
+          :interface        => lookup('griffon_generated', node_uid, 'network_interfaces', 'eth0', 'interface'),
+          :rate             => lookup('griffon_generated', node_uid, 'network_interfaces', 'eth0', 'rate'),
+          :enabled          => lookup('griffon_generated', node_uid, 'network_interfaces', 'eth0', 'enabled'),
+          :management       => lookup('griffon_generated', node_uid, 'network_interfaces', 'eth0', 'management'),
+          :mountable        => lookup('griffon_generated', node_uid, 'network_interfaces', 'eth0', 'mountable'),
+          :mounted          => lookup('griffon_generated', node_uid, 'network_interfaces', 'eth0', 'mounted'),
           :bridged          => true,
           :device           => "eth0",
           :vendor           => "intel",
           :version          => "80003ES2LAN",
-          :driver           => lookup('griffon', node_uid, 'network_interfaces', 'eth0', 'driver'),
+          :driver           => lookup('griffon_generated', node_uid, 'network_interfaces', 'eth0', 'driver'),
           :network_address  => "#{node_uid}.#{site_uid}.grid5000.fr",
-          :ip               => lookup('griffon', node_uid, 'network_interfaces', 'eth0', 'ip'),
-          :ip6              => lookup('griffon', node_uid, 'network_interfaces', 'eth0', 'ip6'),
-          :switch           => lookup('griffon', node_uid, 'network_interfaces', 'eth0', 'switch_name'),
-          :switch_port      => lookup('griffon', node_uid, 'network_interfaces', 'eth0', 'switch_port'),
-          :mac              => lookup('griffon', node_uid, 'network_interfaces', 'eth0', 'mac')
+          :ip               => lookup('griffon_generated', node_uid, 'network_interfaces', 'eth0', 'ip'),
+          :ip6              => lookup('griffon_generated', node_uid, 'network_interfaces', 'eth0', 'ip6'),
+          :switch           => lookup('griffon_manual', node_uid, 'network_interfaces', 'eth0', 'switch_name'),
+          :switch_port      => lookup('griffon_manual', node_uid, 'network_interfaces', 'eth0', 'switch_port'),
+          :mac              => lookup('griffon_generated', node_uid, 'network_interfaces', 'eth0', 'mac')
         },
         {
-          :interface        => lookup('griffon', node_uid, 'network_interfaces', 'eth1', 'interface'),
+          :interface        => lookup('griffon_generated', node_uid, 'network_interfaces', 'eth1', 'interface'),
           :rate             => 1.G,
-          :enabled          => lookup('griffon', node_uid, 'network_interfaces', 'eth1', 'enabled'),
-          :management       => lookup('griffon', node_uid, 'network_interfaces', 'eth1', 'management'),
-          :mountable        => lookup('griffon', node_uid, 'network_interfaces', 'eth1', 'mountable'),
-          :mounted          => lookup('griffon', node_uid, 'network_interfaces', 'eth1', 'mounted'),
+          :enabled          => lookup('griffon_generated', node_uid, 'network_interfaces', 'eth1', 'enabled'),
+          :management       => lookup('griffon_generated', node_uid, 'network_interfaces', 'eth1', 'management'),
+          :mountable        => lookup('griffon_generated', node_uid, 'network_interfaces', 'eth1', 'mountable'),
+          :mounted          => lookup('griffon_generated', node_uid, 'network_interfaces', 'eth1', 'mounted'),
           :bridged          => false,
           :device           => "eth1",
           :vendor           => "intel",
           :version          => "BCM5721",
-          :driver           => lookup('griffon', node_uid, 'network_interfaces', 'eth1', 'driver'),
-          :mac              => lookup('griffon', node_uid, 'network_interfaces', 'eth1', 'mac')
+          :driver           => lookup('griffon_generated', node_uid, 'network_interfaces', 'eth1', 'driver'),
+          :mac              => lookup('griffon_generated', node_uid, 'network_interfaces', 'eth1', 'mac')
         },
         {
-          :interface        => lookup('griffon', node_uid, 'network_interfaces', 'ib0', 'interface'),
-          :rate             => lookup('griffon', node_uid, 'network_interfaces', 'ib0', 'rate'),
+          :interface        => lookup('griffon_generated', node_uid, 'network_interfaces', 'ib0', 'interface'),
+          :rate             => lookup('griffon_generated', node_uid, 'network_interfaces', 'ib0', 'rate'),
           :device           => "ib0",
-          :enabled          => lookup('griffon', node_uid, 'network_interfaces', 'ib0', 'enabled'),
-          :management       => lookup('griffon', node_uid, 'network_interfaces', 'ib0', 'management'),
-          :mountable        => lookup('griffon', node_uid, 'network_interfaces', 'ib0', 'mountable'),
-          :mounted          => lookup('griffon', node_uid, 'network_interfaces', 'ib0', 'mounted'),
+          :enabled          => lookup('griffon_generated', node_uid, 'network_interfaces', 'ib0', 'enabled'),
+          :management       => lookup('griffon_generated', node_uid, 'network_interfaces', 'ib0', 'management'),
+          :mountable        => lookup('griffon_generated', node_uid, 'network_interfaces', 'ib0', 'mountable'),
+          :mounted          => lookup('griffon_generated', node_uid, 'network_interfaces', 'ib0', 'mounted'),
           :vendor           => 'Mellanox',
           :version          => "MT26418",
-          :driver           => lookup('griffon', node_uid, 'network_interfaces', 'ib0', 'driver'),
+          :driver           => lookup('griffon_generated', node_uid, 'network_interfaces', 'ib0', 'driver'),
           :network_address  => "#{node_uid}-ib0.#{site_uid}.grid5000.fr",
-          :ip               => lookup('griffon', node_uid, 'network_interfaces', 'ib0', 'ip'),
-          :ip6               => lookup('griffon', node_uid, 'network_interfaces', 'ib0', 'ip6'),
-          :guid             => lookup('griffon', node_uid, 'network_interfaces', 'ib0', 'guid'),
+          :ip               => lookup('griffon_generated', node_uid, 'network_interfaces', 'ib0', 'ip'),
+          :ip6               => lookup('griffon_generated', node_uid, 'network_interfaces', 'ib0', 'ip6'),
+          :guid             => lookup('griffon_generated', node_uid, 'network_interfaces', 'ib0', 'guid'),
           :switch           => "sgriffonib",
-          :ib_switch_card   => lookup('griffon', node_uid, 'network_interfaces', 'ib0', 'line_card'),
-          :ib_switch_card_pos => lookup('griffon', node_uid, 'network_interfaces', 'ib0', 'position'),
-          :hwid             => lookup('griffon', node_uid, 'network_interfaces', 'ib0', 'hwid')
+          :ib_switch_card   => lookup('griffon_manual', node_uid, 'network_interfaces', 'ib0', 'line_card'),
+          :ib_switch_card_pos => lookup('griffon_manual', node_uid, 'network_interfaces', 'ib0', 'position'),
+          :hwid             => lookup('griffon_manual', node_uid, 'network_interfaces', 'ib0', 'hwid')
         },
         {
-          :interface        => lookup('griffon', node_uid, 'network_interfaces', 'ib1', 'interface'),
-          :rate             => lookup('griffon', node_uid, 'network_interfaces', 'ib1', 'rate'),
+          :interface        => lookup('griffon_generated', node_uid, 'network_interfaces', 'ib1', 'interface'),
+          :rate             => lookup('griffon_generated', node_uid, 'network_interfaces', 'ib1', 'rate'),
           :device           => "ib1",
-          :enabled          => lookup('griffon', node_uid, 'network_interfaces', 'ib1', 'enabled'),
-          :management       => lookup('griffon', node_uid, 'network_interfaces', 'ib1', 'management'),
-          :mountable        => lookup('griffon', node_uid, 'network_interfaces', 'ib1', 'mountable'),
-          :mounted          => lookup('griffon', node_uid, 'network_interfaces', 'ib1', 'mounted'),
+          :enabled          => lookup('griffon_generated', node_uid, 'network_interfaces', 'ib1', 'enabled'),
+          :management       => lookup('griffon_generated', node_uid, 'network_interfaces', 'ib1', 'management'),
+          :mountable        => lookup('griffon_generated', node_uid, 'network_interfaces', 'ib1', 'mountable'),
+          :mounted          => lookup('griffon_generated', node_uid, 'network_interfaces', 'ib1', 'mounted'),
           :vendor           => 'Mellanox',
           :version          => "MT26418",
-          :driver           => lookup('griffon', node_uid, 'network_interfaces', 'ib1', 'driver'),
-          :guid             => lookup('griffon', node_uid, 'network_interfaces', 'ib1', 'guid')
+          :driver           => lookup('griffon_generated', node_uid, 'network_interfaces', 'ib1', 'driver'),
+          :guid             => lookup('griffon_generated', node_uid, 'network_interfaces', 'ib1', 'guid')
         },
         {
           :interface            => 'Ethernet',
           :rate                 => 100.M,
           :network_address      => "#{node_uid}-bmc.#{site_uid}.grid5000.fr",
-          :ip                   => lookup('griffon', node_uid, 'network_interfaces', 'bmc', 'ip'),
-          :mac                  => lookup('griffon', node_uid, 'network_interfaces', 'bmc', 'mac'),
-          :switch               => lookup('griffon', node_uid, 'network_interfaces', 'bmc', 'switch_name'),
-          :switch_port          => lookup('griffon', node_uid, 'network_interfaces', 'bmc', 'switch_port'),
+          :ip                   => lookup('griffon_generated', node_uid, 'network_interfaces', 'bmc', 'ip'),
+          :mac                  => lookup('griffon_generated', node_uid, 'network_interfaces', 'bmc', 'mac'),
+          :switch               => lookup('griffon_manual', node_uid, 'network_interfaces', 'bmc', 'switch_name'),
+          :switch_port          => lookup('griffon_manual', node_uid, 'network_interfaces', 'bmc', 'switch_port'),
           :enabled              => true,
           :mounted              => false,
           :mountable            => false,
@@ -144,15 +144,15 @@ site :nancy do |site_uid|
         }]
 
         chassis({
-          :serial       => lookup('griffon', node_uid, 'chassis', 'serial_number'),
-          :name         => lookup('griffon', node_uid, 'chassis', 'product_name'),
-          :manufacturer => lookup('griffon', node_uid, 'chassis', 'manufacturer')
+          :serial       => lookup('griffon_generated', node_uid, 'chassis', 'serial_number'),
+          :name         => lookup('griffon_generated', node_uid, 'chassis', 'product_name'),
+          :manufacturer => lookup('griffon_generated', node_uid, 'chassis', 'manufacturer')
         })
 
         bios({
-          :version      => lookup('griffon', node_uid, 'bios', 'version'),
-          :vendor       => lookup('griffon', node_uid, 'bios', 'vendor'),
-          :release_date => lookup('griffon', node_uid, 'bios', 'release_date')
+          :version      => lookup('griffon_generated', node_uid, 'bios', 'version'),
+          :vendor       => lookup('griffon_generated', node_uid, 'bios', 'vendor'),
+          :release_date => lookup('griffon_generated', node_uid, 'bios', 'release_date')
         })
 
         gpu({
@@ -163,7 +163,7 @@ site :nancy do |site_uid|
           :power => {
             :available => false, # Set to true when pdu resources will be declared
             :via => {
-              :pdu => { :uid => lookup('griffon', node_uid, 'pdu', 'pdu_name') }
+              :pdu => { :uid => lookup('griffon_manual', node_uid, 'pdu', 'pdu_name') }
             }
           }
         })
diff --git a/generators/input/sites/nancy/clusters/griffon.yaml b/generators/input/sites/nancy/clusters/griffon_generated.yaml
similarity index 87%
rename from generators/input/sites/nancy/clusters/griffon.yaml
rename to generators/input/sites/nancy/clusters/griffon_generated.yaml
index 9b4d88c5a7d..2e91cb7c211 100644
--- a/generators/input/sites/nancy/clusters/griffon.yaml
+++ b/generators/input/sites/nancy/clusters/griffon_generated.yaml
@@ -4,8 +4,6 @@ griffon-1:
     bmc:
       ip: 172.17.65.1
       mac: 00:e0:81:4f:e3:13
-      switch_name: sgriffon1-ipmi
-      switch_port: 1/0/1
     eth0:
       interface: Ethernet
       ip: 172.16.65.1
@@ -17,8 +15,6 @@ griffon-1:
       mountable: true
       mounted: true
       management: false
-      switch_name: sgriffon1
-      switch_port: Gi1/0/1
     eth1:
       interface: Ethernet
       driver: e1000e
@@ -39,9 +35,6 @@ griffon-1:
       mountable: true
       mounted: true
       management: false
-      hwid: '0xC903000318F0'
-      line_card: '0x000b8cffff003106'
-      position: 1
     ib1:
       interface: InfiniBand
       driver: mlx4_core
@@ -90,9 +83,6 @@ griffon-1:
     serial_number: 812530006
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: griffon-pdu2.nancy.grid5000.fr
-    pdu_position: 4
 griffon-2:
   architecture:
     smp_size: 2
@@ -140,8 +130,6 @@ griffon-2:
       mountable: true
       mounted: true
       management: false
-      switch_name: sgriffon1
-      switch_port: Gi1/0/2
     eth1:
       interface: Ethernet
       driver: e1000e
@@ -162,9 +150,6 @@ griffon-2:
       mountable: true
       mounted: true
       management: false
-      hwid: '0xC90300028064'
-      line_card: '0x000b8cffff003106'
-      position: 2
     ib1:
       interface: InfiniBand
       driver: mlx4_core
@@ -178,15 +163,10 @@ griffon-2:
     bmc:
       ip: 172.17.65.2
       mac: 00:e0:81:4f:e2:fc
-      switch_name: sgriffon1-ipmi
-      switch_port: 1/0/2
   chassis:
     serial_number: 812530007
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: griffon-pdu2.nancy.grid5000.fr
-    pdu_position: 3
 griffon-3:
   processor:
     clock_speed: 2494000000
@@ -218,8 +198,6 @@ griffon-3:
     bmc:
       ip: 172.17.65.3
       mac: 00:e0:81:4f:cb:0a
-      switch_name: sgriffon1-ipmi
-      switch_port: 1/0/3
     eth0:
       interface: Ethernet
       ip: 172.16.65.3
@@ -231,8 +209,6 @@ griffon-3:
       mountable: true
       mounted: true
       management: false
-      switch_name: sgriffon1
-      switch_port: Gi1/0/3
     eth1:
       interface: Ethernet
       driver: e1000e
@@ -253,9 +229,6 @@ griffon-3:
       mountable: true
       mounted: true
       management: false
-      hwid: '0xC90300027F60'
-      line_card: '0x000b8cffff003106'
-      position: 3
     ib1:
       interface: InfiniBand
       driver: mlx4_core
@@ -278,16 +251,11 @@ griffon-3:
     serial_number: 812530008
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: griffon-pdu2.nancy.grid5000.fr
-    pdu_position: 2
 griffon-4:
   network_interfaces:
     bmc:
       ip: 172.17.65.4
       mac: 00:e0:81:4f:e3:7a
-      switch_name: sgriffon1-ipmi
-      switch_port: 1/0/4
     eth0:
       interface: Ethernet
       ip: 172.16.65.4
@@ -299,8 +267,6 @@ griffon-4:
       mountable: true
       mounted: true
       management: false
-      switch_name: sgriffon1
-      switch_port: Gi1/0/4
     eth1:
       interface: Ethernet
       driver: e1000e
@@ -321,9 +287,6 @@ griffon-4:
       mountable: true
       mounted: true
       management: false
-      hwid: '0xC90300028068'
-      line_card: '0x000b8cffff003106'
-      position: 4
     ib1:
       interface: InfiniBand
       driver: mlx4_core
@@ -372,16 +335,11 @@ griffon-4:
     serial_number: 812530009
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: griffon-pdu2.nancy.grid5000.fr
-    pdu_position: 1
 griffon-5:
   network_interfaces:
     bmc:
       ip: 172.17.65.5
       mac: 00:e0:81:4f:e3:8d
-      switch_name: sgriffon1-ipmi
-      switch_port: 1/0/5
     eth0:
       interface: Ethernet
       ip: 172.16.65.5
@@ -393,8 +351,6 @@ griffon-5:
       mountable: true
       mounted: true
       management: false
-      switch_name: sgriffon1
-      switch_port: Gi1/0/5
     eth1:
       interface: Ethernet
       driver: e1000e
@@ -415,9 +371,6 @@ griffon-5:
       mountable: true
       mounted: true
       management: false
-      hwid: '0xC903000280C0'
-      line_card: '0x000b8cffff003106'
-      position: 5
     ib1:
       interface: InfiniBand
       driver: mlx4_core
@@ -466,9 +419,6 @@ griffon-5:
     serial_number: 812530010
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: griffon-pdu1.nancy.grid5000.fr
-    pdu_position: 3
 griffon-6:
   main_memory:
     ram_size: 16867737600
@@ -496,8 +446,6 @@ griffon-6:
     bmc:
       ip: 172.17.65.6
       mac: 00:e0:81:4f:e3:74
-      switch_name: sgriffon1-ipmi
-      switch_port: 1/0/6
     eth0:
       interface: Ethernet
       ip: 172.16.65.6
@@ -509,8 +457,6 @@ griffon-6:
       mountable: true
       mounted: true
       management: false
-      switch_name: sgriffon1
-      switch_port: Gi1/O/6
     eth1:
       interface: Ethernet
       driver: e1000e
@@ -531,9 +477,6 @@ griffon-6:
       mountable: true
       mounted: true
       management: false
-      hwid: '0xC903000280AC'
-      line_card: '0x000b8cffff003106'
-      position: 6
     ib1:
       interface: InfiniBand
       driver: mlx4_core
@@ -560,9 +503,6 @@ griffon-6:
     serial_number: 812530011
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: griffon-pdu1.nancy.grid5000.fr
-    pdu_position: 4
 griffon-7:
   main_memory:
     ram_size: 16867737600
@@ -590,8 +530,6 @@ griffon-7:
     bmc:
       ip: 172.17.65.7
       mac: 00:e0:81:4f:ca:90
-      switch_name: sgriffon1-ipmi
-      switch_port: 1/0/7
     eth0:
       interface: Ethernet
       ip: 172.16.65.7
@@ -603,8 +541,6 @@ griffon-7:
       mountable: true
       mounted: true
       management: false
-      switch_name: sgriffon1
-      switch_port: Gi1/0/7
     eth1:
       interface: Ethernet
       driver: e1000e
@@ -625,9 +561,6 @@ griffon-7:
       mountable: true
       mounted: true
       management: false
-      hwid: '0xC90300028054'
-      line_card: '0x000b8cffff003106'
-      position: 7
     ib1:
       interface: InfiniBand
       driver: mlx4_core
@@ -654,9 +587,6 @@ griffon-7:
     serial_number: 812530012
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: griffon-pdu1.nancy.grid5000.fr
-    pdu_position: 5
 griffon-8:
   supported_job_types:
     virtual: ivt
@@ -664,8 +594,6 @@ griffon-8:
     bmc:
       ip: 172.17.65.8
       mac: 00:e0:81:4f:e3:c2
-      switch_name: sgriffon1-ipmi
-      switch_port: 1/0/8
     eth0:
       interface: Ethernet
       ip: 172.16.65.8
@@ -677,8 +605,6 @@ griffon-8:
       mountable: true
       mounted: true
       management: false
-      switch_name: sgriffon1
-      switch_port: Gi1/0/8
     eth1:
       interface: Ethernet
       driver: e1000e
@@ -699,9 +625,6 @@ griffon-8:
       mountable: true
       mounted: true
       management: false
-      hwid: '0xC903000280C8'
-      line_card: '0x000b8cffff003106'
-      position: 8
     ib1:
       interface: InfiniBand
       driver: mlx4_core
@@ -748,9 +671,6 @@ griffon-8:
     serial_number: 812530013
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: griffon-pdu1.nancy.grid5000.fr
-    pdu_position: 6
 griffon-9:
   main_memory:
     ram_size: 16867737600
@@ -775,8 +695,6 @@ griffon-9:
     bmc:
       ip: 172.17.65.9
       mac: 00:e0:81:4f:e2:fe
-      switch_name: sgriffon1-ipmi
-      switch_port: 1/0/9
     eth0:
       interface: Ethernet
       ip: 172.16.65.9
@@ -788,8 +706,6 @@ griffon-9:
       mountable: true
       mounted: true
       management: false
-      switch_name: sgriffon1
-      switch_port: Gi1/0/10
     eth1:
       interface: Ethernet
       driver: e1000e
@@ -810,9 +726,6 @@ griffon-9:
       mountable: true
       mounted: true
       management: false
-      hwid: '0xC9030002805C'
-      line_card: '0x000b8cffff003106'
-      position: 9
     ib1:
       interface: InfiniBand
       driver: mlx4_core
@@ -842,9 +755,6 @@ griffon-9:
     serial_number: 812530014
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: griffon-pdu1.nancy.grid5000.fr
-    pdu_position: 10
 griffon-10:
   supported_job_types:
     virtual: ivt
@@ -879,8 +789,6 @@ griffon-10:
       mountable: true
       mounted: true
       management: false
-      switch_name: sgriffon1
-      switch_port: Gi1/O/9
     eth1:
       interface: Ethernet
       driver: e1000e
@@ -894,20 +802,17 @@ griffon-10:
       ip: 172.18.65.10
       ip6: fe80::202:c903:2:7f59
       driver: mlx4_core
-      guid:
+      guid: 
       rate: 20000000000
       version: MT26418
       enabled: true
       mountable: true
       mounted: true
       management: false
-      hwid: '0xC90300027F58'
-      line_card: '0x000b8cffff003106'
-      position: 10
     ib1:
       interface: InfiniBand
       driver: mlx4_core
-      guid:
+      guid: 
       rate: 28000000000
       version: MT26418
       enabled: false
@@ -917,8 +822,6 @@ griffon-10:
     bmc:
       ip: 172.17.65.10
       mac: 00:e0:81:4f:ca:9e
-      switch_name: sgriffon1-ipmi
-      switch_port: 1/0/10
   block_devices:
     sda:
       device: sda
@@ -936,9 +839,6 @@ griffon-10:
     serial_number: 812530015
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: griffon-pdu1.nancy.grid5000.fr
-    pdu_position: 11
 griffon-11:
   bios:
     vendor: Phoenix Technologies LTD
@@ -967,8 +867,6 @@ griffon-11:
     bmc:
       ip: 172.17.65.11
       mac: 00:e0:81:4f:e3:70
-      switch_name: sgriffon1-ipmi
-      switch_port: 1/0/25
     eth0:
       interface: Ethernet
       ip: 172.16.65.11
@@ -980,8 +878,6 @@ griffon-11:
       mountable: true
       mounted: true
       management: false
-      switch_name: sgriffon1
-      switch_port: Gi1/0/25
     eth1:
       interface: Ethernet
       driver: e1000e
@@ -1002,9 +898,6 @@ griffon-11:
       mountable: true
       mounted: true
       management: false
-      hwid: '0xC90300028008'
-      line_card: '0x000b8cffff003106'
-      position: 11
     ib1:
       interface: InfiniBand
       driver: mlx4_core
@@ -1030,9 +923,6 @@ griffon-11:
     serial_number: 812530016
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: griffon-pdu1.nancy.grid5000.fr
-    pdu_position: 12
 griffon-12:
   block_devices:
     sda:
@@ -1072,8 +962,6 @@ griffon-12:
     bmc:
       ip: 172.17.65.12
       mac: 00:e0:81:4f:ca:8b
-      switch_name: sgriffon1-ipmi
-      switch_port: 1/0/26
     eth0:
       interface: Ethernet
       ip: 172.16.65.12
@@ -1085,8 +973,6 @@ griffon-12:
       mountable: true
       mounted: true
       management: false
-      switch_name: sgriffon1
-      switch_port: Gi1/0/26
     eth1:
       interface: Ethernet
       driver: e1000e
@@ -1107,9 +993,6 @@ griffon-12:
       mountable: true
       mounted: true
       management: false
-      hwid: '0xC903000280DC'
-      line_card: '0x000b8cffff003106'
-      position: 12
     ib1:
       interface: InfiniBand
       driver: mlx4_core
@@ -1124,9 +1007,6 @@ griffon-12:
     serial_number: 812530017
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: griffon-pdu1.nancy.grid5000.fr
-    pdu_position: 13
 griffon-13:
   operating_system:
     name: debian
@@ -1142,8 +1022,6 @@ griffon-13:
     bmc:
       ip: 172.17.65.13
       mac: 00:e0:81:4f:e2:d4
-      switch_name: sgriffon1-ipmi
-      switch_port: 1/0/27
     eth0:
       interface: Ethernet
       ip: 172.16.65.13
@@ -1155,8 +1033,6 @@ griffon-13:
       mountable: true
       mounted: true
       management: false
-      switch_name: sgriffon1
-      switch_port: Gi1/0/27
     eth1:
       interface: Ethernet
       driver: e1000e
@@ -1177,9 +1053,6 @@ griffon-13:
       mountable: true
       mounted: true
       management: false
-      hwid: '0xC903000280BC'
-      line_card: '0x000b8cffff003054'
-      position: 1
     ib1:
       interface: InfiniBand
       driver: mlx4_core
@@ -1218,9 +1091,6 @@ griffon-13:
     serial_number: 812530018
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: griffon-pdu1.nancy.grid5000.fr
-    pdu_position: 14
 griffon-14:
   operating_system:
     name: debian
@@ -1245,8 +1115,6 @@ griffon-14:
     bmc:
       ip: 172.17.65.14
       mac: 00:e0:81:4f:e2:c5
-      switch_name: sgriffon1-ipmi
-      switch_port: 1/0/28
     eth0:
       interface: Ethernet
       ip: 172.16.65.14
@@ -1258,8 +1126,6 @@ griffon-14:
       mountable: true
       mounted: true
       management: false
-      switch_name: sgriffon1
-      switch_port: Gi1/0/28
     eth1:
       interface: Ethernet
       driver: e1000e
@@ -1280,9 +1146,6 @@ griffon-14:
       mountable: true
       mounted: true
       management: false
-      hwid: '0xC903000280CC'
-      line_card: '0x000b8cffff003054'
-      position: 2
     ib1:
       interface: InfiniBand
       driver: mlx4_core
@@ -1312,9 +1175,6 @@ griffon-14:
     serial_number: 812530019
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: griffon-pdu1.nancy.grid5000.fr
-    pdu_position: 15
 griffon-15:
   supported_job_types:
     virtual: ivt
@@ -1349,8 +1209,6 @@ griffon-15:
       mountable: true
       mounted: true
       management: false
-      switch_name: sgriffon1
-      switch_port: Gi1/0/29
     eth1:
       interface: Ethernet
       driver: e1000e
@@ -1371,9 +1229,6 @@ griffon-15:
       mountable: true
       mounted: true
       management: false
-      hwid: '0xC903000280B4'
-      line_card: '0x000b8cffff003054'
-      position: 3
     ib1:
       interface: InfiniBand
       driver: mlx4_core
@@ -1387,8 +1242,6 @@ griffon-15:
     bmc:
       ip: 172.17.65.15
       mac: 00:e0:81:4f:e3:87
-      switch_name: sgriffon1-ipmi
-      switch_port: 1/0/29
   main_memory:
     ram_size: 16867737600
   processor:
@@ -1406,9 +1259,6 @@ griffon-15:
     serial_number: 812530020
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: griffon-pdu1.nancy.grid5000.fr
-    pdu_position: 17
 griffon-16:
   main_memory:
     ram_size: 16867737600
@@ -1427,8 +1277,6 @@ griffon-16:
     bmc:
       ip: 172.17.65.16
       mac: 00:e0:81:4f:e2:d8
-      switch_name: sgriffon1-ipmi
-      switch_port: 1/0/30
     eth0:
       interface: Ethernet
       ip: 172.16.65.16
@@ -1440,8 +1288,6 @@ griffon-16:
       mountable: true
       mounted: true
       management: false
-      switch_name: sgriffon1
-      switch_port: Gi1/0/30
     eth1:
       interface: Ethernet
       driver: e1000e
@@ -1462,9 +1308,6 @@ griffon-16:
       mountable: true
       mounted: true
       management: false
-      hwid: '0xC9030003303E'
-      line_card: '0x000b8cffff003054'
-      position: 4
     ib1:
       interface: InfiniBand
       driver: mlx4_core
@@ -1500,16 +1343,11 @@ griffon-16:
     serial_number: 812530021
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: griffon-pdu1.nancy.grid5000.fr
-    pdu_position: 18
 griffon-17:
   network_interfaces:
     bmc:
       ip: 172.17.65.17
       mac: 00:e0:81:4f:e3:6a
-      switch_name: sgriffon1-ipmi
-      switch_port: 1/0/31
     eth0:
       interface: Ethernet
       ip: 172.16.65.17
@@ -1521,8 +1359,6 @@ griffon-17:
       mountable: true
       mounted: true
       management: false
-      switch_name: sgriffon1
-      switch_port: Gi1/0/31
     eth1:
       interface: Ethernet
       driver: e1000e
@@ -1543,9 +1379,6 @@ griffon-17:
       mountable: true
       mounted: true
       management: false
-      hwid: '0xC90300033016'
-      line_card: '0x000b8cffff003054'
-      position: 5
     ib1:
       interface: InfiniBand
       driver: mlx4_core
@@ -1594,9 +1427,6 @@ griffon-17:
     serial_number: 812530022
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: griffon-pdu1.nancy.grid5000.fr
-    pdu_position: 19
 griffon-18:
   operating_system:
     name: debian
@@ -1616,8 +1446,6 @@ griffon-18:
       mountable: true
       mounted: true
       management: false
-      switch_name: sgriffon1
-      switch_port: Gi1/0/32
     eth1:
       interface: Ethernet
       driver: e1000e
@@ -1638,9 +1466,6 @@ griffon-18:
       mountable: true
       mounted: true
       management: false
-      hwid: '0xC9030003302A'
-      line_card: '0x000b8cffff003054'
-      position: 6
     ib1:
       interface: InfiniBand
       driver: mlx4_core
@@ -1654,8 +1479,6 @@ griffon-18:
     bmc:
       ip: 172.17.65.18
       mac: 00:e0:81:4f:cb:0e
-      switch_name: sgriffon1-ipmi
-      switch_port: 1/0/32
   bios:
     vendor: Phoenix Technologies LTD
     version: V1.05
@@ -1688,9 +1511,6 @@ griffon-18:
     serial_number: 812530023
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: griffon-pdu1.nancy.grid5000.fr
-    pdu_position: 20
 griffon-19:
   operating_system:
     name: debian
@@ -1700,8 +1520,6 @@ griffon-19:
     bmc:
       ip: 172.17.65.19
       mac: 00:e0:81:4f:e3:00
-      switch_name: sgriffon1-ipmi
-      switch_port: 1/0/33
     eth0:
       interface: Ethernet
       ip: 172.16.65.19
@@ -1713,8 +1531,6 @@ griffon-19:
       mountable: true
       mounted: true
       management: false
-      switch_name: sgriffon1
-      switch_port: Gi1/0/33
     eth1:
       interface: Ethernet
       driver: e1000e
@@ -1735,9 +1551,6 @@ griffon-19:
       mountable: true
       mounted: true
       management: false
-      hwid: '0xC90300033036'
-      line_card: '0x000b8cffff003054'
-      position: 7
     ib1:
       interface: InfiniBand
       driver: mlx4_core
@@ -1782,9 +1595,6 @@ griffon-19:
     serial_number: 812530024
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: griffon-pdu1.nancy.grid5000.fr
-    pdu_position: 21
 griffon-20:
   operating_system:
     name: debian
@@ -1811,8 +1621,6 @@ griffon-20:
     bmc:
       ip: 172.17.65.20
       mac: 00:e0:81:4f:ca:8e
-      switch_name: sgriffon1-ipmi
-      switch_port: 1/0/34
     eth0:
       interface: Ethernet
       ip: 172.16.65.20
@@ -1824,8 +1632,6 @@ griffon-20:
       mountable: true
       mounted: true
       management: false
-      switch_name: sgriffon1
-      switch_port: Gi1/0/34
     eth1:
       interface: Ethernet
       driver: e1000e
@@ -1846,9 +1652,6 @@ griffon-20:
       mountable: true
       mounted: true
       management: false
-      hwid: '0xC90300032FCA'
-      line_card: '0x000b8cffff003101'
-      position: 2
     ib1:
       interface: InfiniBand
       driver: mlx4_core
@@ -1876,9 +1679,6 @@ griffon-20:
     serial_number: 812530025
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: griffon-pdu1.nancy.grid5000.fr
-    pdu_position: 22
 griffon-21:
   operating_system:
     name: debian
@@ -1903,8 +1703,6 @@ griffon-21:
     bmc:
       ip: 172.17.65.21
       mac: 00:e0:81:4f:e2:fb
-      switch_name: sgriffon1-ipmi
-      switch_port: 1/0/35
     eth0:
       interface: Ethernet
       ip: 172.16.65.21
@@ -1916,8 +1714,6 @@ griffon-21:
       mountable: true
       mounted: true
       management: false
-      switch_name: sgriffon1
-      switch_port: Gi1/0/35
     eth1:
       interface: Ethernet
       driver: e1000e
@@ -1938,9 +1734,6 @@ griffon-21:
       mountable: true
       mounted: true
       management: false
-      hwid: '0xC9030003304E'
-      line_card: '0x000b8cffff003101'
-      position: 1
     ib1:
       interface: InfiniBand
       driver: mlx4_core
@@ -1970,9 +1763,6 @@ griffon-21:
     serial_number: 812530026
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: griffon-pdu1.nancy.grid5000.fr
-    pdu_position: 23
 griffon-22:
   architecture:
     smp_size: 2
@@ -1984,8 +1774,6 @@ griffon-22:
     bmc:
       ip: 172.17.65.22
       mac: 00:e0:81:4f:cb:02
-      switch_name: sgriffon1-ipmi
-      switch_port: 1/0/36
     eth0:
       interface: Ethernet
       ip: 172.16.65.22
@@ -1997,8 +1785,6 @@ griffon-22:
       mountable: true
       mounted: true
       management: false
-      switch_name: sgriffon1
-      switch_port: Gi1/0/36
     eth1:
       interface: Ethernet
       driver: e1000e
@@ -2019,9 +1805,6 @@ griffon-22:
       mountable: true
       mounted: true
       management: false
-      hwid: '0xC90300033032'
-      line_card: '0x000b8cffff003101'
-      position: 3
     ib1:
       interface: InfiniBand
       driver: mlx4_core
@@ -2064,9 +1847,6 @@ griffon-22:
     serial_number: 812530027
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: griffon-pdu2.nancy.grid5000.fr
-    pdu_position: 21
 griffon-23:
   block_devices:
     sda:
@@ -2079,8 +1859,6 @@ griffon-23:
     bmc:
       ip: 172.17.65.23
       mac: 00:e0:81:4f:ca:7e
-      switch_name: sgriffon1-ipmi
-      switch_port: 1/O/37
     eth0:
       interface: Ethernet
       ip: 172.16.65.23
@@ -2092,8 +1870,6 @@ griffon-23:
       mountable: true
       mounted: true
       management: false
-      switch_name: sgriffon1
-      switch_port: Gi1/0/37
     eth1:
       interface: Ethernet
       driver: e1000e
@@ -2114,9 +1890,6 @@ griffon-23:
       mountable: true
       mounted: true
       management: false
-      hwid: '0xC9030003302F'
-      line_card: '0x000b8cffff003101'
-      position: 4
     ib1:
       interface: InfiniBand
       driver: mlx4_core
@@ -2158,9 +1931,6 @@ griffon-23:
     serial_number: 812530028
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: griffon-pdu2.nancy.grid5000.fr
-    pdu_position: 20
 griffon-24:
   main_memory:
     ram_size: 16867737600
@@ -2188,8 +1958,6 @@ griffon-24:
     bmc:
       ip: 172.17.65.24
       mac: 00:e0:81:4f:ca:7f
-      switch_name: sgriffon1-ipmi
-      switch_port: 1/0/38
     eth0:
       interface: Ethernet
       ip: 172.16.65.24
@@ -2201,8 +1969,6 @@ griffon-24:
       mountable: true
       mounted: true
       management: false
-      switch_name: sgriffon1
-      switch_port: Gi1/0/38
     eth1:
       interface: Ethernet
       driver: e1000e
@@ -2223,9 +1989,6 @@ griffon-24:
       mountable: true
       mounted: true
       management: false
-      hwid: '0xC90300032FD6'
-      line_card: '0x000b8cffff003101'
-      position: 5
     ib1:
       interface: InfiniBand
       driver: mlx4_core
@@ -2252,16 +2015,11 @@ griffon-24:
     serial_number: 812530029
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: griffon-pdu2.nancy.grid5000.fr
-    pdu_position: 19
 griffon-25:
   network_interfaces:
     bmc:
       ip: 172.17.65.25
       mac: 00:e0:81:4f:e3:ba
-      switch_name: sgriffon1-ipmi
-      switch_port: 1/0/39
     eth0:
       interface: Ethernet
       ip: 172.16.65.25
@@ -2273,8 +2031,6 @@ griffon-25:
       mountable: true
       mounted: true
       management: false
-      switch_name: sgriffon1
-      switch_port: Gi1/0/39
     eth1:
       interface: Ethernet
       driver: e1000e
@@ -2295,9 +2051,6 @@ griffon-25:
       mountable: true
       mounted: true
       management: false
-      hwid: '0xC90300033022'
-      line_card: '0x000b8cffff003101'
-      position: 6
     ib1:
       interface: InfiniBand
       driver: mlx4_core
@@ -2346,16 +2099,11 @@ griffon-25:
     serial_number: 812530030
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: griffon-pdu2.nancy.grid5000.fr
-    pdu_position: 18
 griffon-26:
   network_interfaces:
     bmc:
       ip: 172.17.65.26
       mac: 00:e0:81:4f:b5:da
-      switch_name: sgriffon1-ipmi
-      switch_port: 1/0/40
     eth0:
       interface: Ethernet
       ip: 172.16.65.26
@@ -2367,8 +2115,6 @@ griffon-26:
       mountable: true
       mounted: true
       management: false
-      switch_name: sgriffon1
-      switch_port: Gi1/0/40
     eth1:
       interface: Ethernet
       driver: e1000e
@@ -2389,9 +2135,6 @@ griffon-26:
       mountable: true
       mounted: true
       management: false
-      hwid: '0xC90300032FD2'
-      line_card: '0x000b8cffff003101'
-      position: 7
     ib1:
       interface: InfiniBand
       driver: mlx4_core
@@ -2440,9 +2183,6 @@ griffon-26:
     serial_number: 812530031
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: griffon-pdu2.nancy.grid5000.fr
-    pdu_position: 17
 griffon-27:
   block_devices:
     sda:
@@ -2463,8 +2203,6 @@ griffon-27:
     bmc:
       ip: 172.17.65.27
       mac: 00:e0:81:4f:e2:cb
-      switch_name: sgriffon1-ipmi
-      switch_port: 1/0/41
     eth0:
       interface: Ethernet
       ip: 172.16.65.27
@@ -2476,8 +2214,6 @@ griffon-27:
       mountable: true
       mounted: true
       management: false
-      switch_name: sgriffon1
-      switch_port: Gi1/0/41
     eth1:
       interface: Ethernet
       driver: e1000e
@@ -2498,9 +2234,6 @@ griffon-27:
       mountable: true
       mounted: true
       management: false
-      hwid: '0xC9030003301E'
-      line_card: '0x000b8cffff003101'
-      position: 8
     ib1:
       interface: InfiniBand
       driver: mlx4_core
@@ -2534,9 +2267,6 @@ griffon-27:
     serial_number: 812530032
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: griffon-pdu2.nancy.grid5000.fr
-    pdu_position: 15
 griffon-28:
   processor:
     clock_speed: 2494000000
@@ -2555,8 +2285,6 @@ griffon-28:
     bmc:
       ip: 172.17.65.28
       mac: 00:e0:81:4f:ca:8d
-      switch_name: sgriffon1-ipmi
-      switch_port: 1/0/42
     eth0:
       interface: Ethernet
       ip: 172.16.65.28
@@ -2568,8 +2296,6 @@ griffon-28:
       mountable: true
       mounted: true
       management: false
-      switch_name: sgriffon1
-      switch_port: Gi1/0/42
     eth1:
       interface: Ethernet
       driver: e1000e
@@ -2590,9 +2316,6 @@ griffon-28:
       mountable: true
       mounted: true
       management: false
-      hwid: '0xC90300032FDA'
-      line_card: '0x000b8cffff003101'
-      position: 9
     ib1:
       interface: InfiniBand
       driver: mlx4_core
@@ -2628,9 +2351,6 @@ griffon-28:
     serial_number: 812530033
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: griffon-pdu2.nancy.grid5000.fr
-    pdu_position: 14
 griffon-29:
   main_memory:
     ram_size: 16867737600
@@ -2658,8 +2378,6 @@ griffon-29:
     bmc:
       ip: 172.17.65.29
       mac: 00:e0:81:4f:e3:71
-      switch_name: sgriffon1-ipmi
-      switch_port: 1/0/43
     eth0:
       interface: Ethernet
       ip: 172.16.65.29
@@ -2671,8 +2389,6 @@ griffon-29:
       mountable: true
       mounted: true
       management: false
-      switch_name: sgriffon1
-      switch_port: Gi1/0/43
     eth1:
       interface: Ethernet
       driver: e1000e
@@ -2693,9 +2409,6 @@ griffon-29:
       mountable: true
       mounted: true
       management: false
-      hwid: '0xC90300033042'
-      line_card: '0x000b8cffff003101'
-      position: 10
     ib1:
       interface: InfiniBand
       driver: mlx4_core
@@ -2722,9 +2435,6 @@ griffon-29:
     serial_number: 812530034
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: griffon-pdu2.nancy.grid5000.fr
-    pdu_position: 13
 griffon-30:
   block_devices:
     sda:
@@ -2747,8 +2457,6 @@ griffon-30:
     bmc:
       ip: 172.17.65.30
       mac: 00:e0:81:4f:e3:10
-      switch_name: sgriffon2-ipmi
-      switch_port: 1/0/1
     eth0:
       interface: Ethernet
       ip: 172.16.65.30
@@ -2760,8 +2468,6 @@ griffon-30:
       mountable: true
       mounted: true
       management: false
-      switch_name: sgriffon2
-      switch_port: Gi1/0/1
     eth1:
       interface: Ethernet
       driver: e1000e
@@ -2782,9 +2488,6 @@ griffon-30:
       mountable: true
       mounted: true
       management: false
-      hwid: '0xC9030003303A'
-      line_card: '0x000b8cffff003055'
-      position: 1
     ib1:
       interface: InfiniBand
       driver: mlx4_core
@@ -2816,9 +2519,6 @@ griffon-30:
     serial_number: 812530035
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: griffon-pdu4.nancy.grid5000.fr
-    pdu_position: 1
 griffon-31:
   bios:
     vendor: Phoenix Technologies LTD
@@ -2847,8 +2547,6 @@ griffon-31:
       mountable: true
       mounted: true
       management: false
-      switch_name: sgriffon2
-      switch_port: Gi1/0/2
     eth1:
       interface: Ethernet
       driver: e1000e
@@ -2869,9 +2567,6 @@ griffon-31:
       mountable: true
       mounted: true
       management: false
-      hwid: '0xC9030003305E'
-      line_card: '0x000b8cffff003055'
-      position: 2
     ib1:
       interface: InfiniBand
       driver: mlx4_core
@@ -2885,8 +2580,6 @@ griffon-31:
     bmc:
       ip: 172.17.65.31
       mac: 00:e0:81:4f:cb:03
-      switch_name: sgriffon2-ipmi
-      switch_port: 1/0/2
   block_devices:
     sda:
       device: sda
@@ -2910,9 +2603,6 @@ griffon-31:
     serial_number: 812530036
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: griffon-pdu4.nancy.grid5000.fr
-    pdu_position: 2
 griffon-32:
   processor:
     clock_speed: 2494000000
@@ -2939,8 +2629,6 @@ griffon-32:
     bmc:
       ip: 172.17.65.32
       mac: 00:e0:81:4f:e3:8b
-      switch_name: sgriffon2-ipmi
-      switch_port: 1/0/3
     eth0:
       interface: Ethernet
       ip: 172.16.65.32
@@ -2952,8 +2640,6 @@ griffon-32:
       mountable: true
       mounted: true
       management: false
-      switch_name: sgriffon2
-      switch_port: Gi1/0/3
     eth1:
       interface: Ethernet
       driver: e1000e
@@ -2974,9 +2660,6 @@ griffon-32:
       mountable: true
       mounted: true
       management: false
-      hwid: '0xC9030003305A'
-      line_card: '0x000b8cffff003055'
-      position: 3
     ib1:
       interface: InfiniBand
       driver: mlx4_core
@@ -3004,9 +2687,6 @@ griffon-32:
     serial_number: 812530037
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: griffon-pdu4.nancy.grid5000.fr
-    pdu_position: 3
 griffon-33:
   block_devices:
     sda:
@@ -3033,8 +2713,6 @@ griffon-33:
       mountable: true
       mounted: true
       management: false
-      switch_name: sgriffon2
-      switch_port: Gi1/0/4
     eth1:
       interface: Ethernet
       driver: e1000e
@@ -3055,9 +2733,6 @@ griffon-33:
       mountable: true
       mounted: true
       management: false
-      hwid: '0xC90300033056'
-      line_card: '0x000b8cffff003055'
-      position: 4
     ib1:
       interface: InfiniBand
       driver: mlx4_core
@@ -3071,8 +2746,6 @@ griffon-33:
     bmc:
       ip: 172.17.65.33
       mac: 00:e0:81:4f:ca:7a
-      switch_name: sgriffon2-ipmi
-      switch_port: 1/0/4
   processor:
     clock_speed: 2494000000
     instruction_set: x86-64
@@ -3098,9 +2771,6 @@ griffon-33:
     serial_number: 812530038
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: griffon-pdu4.nancy.grid5000.fr
-    pdu_position: 4
 griffon-34:
   processor:
     clock_speed: 2494000000
@@ -3125,8 +2795,6 @@ griffon-34:
     bmc:
       ip: 172.17.65.34
       mac: 00:e0:81:4f:cb:20
-      switch_name: sgriffon2-ipmi
-      switch_port: 1/0/5
     eth0:
       interface: Ethernet
       ip: 172.16.65.34
@@ -3138,8 +2806,6 @@ griffon-34:
       mountable: true
       mounted: true
       management: false
-      switch_name: sgriffon2
-      switch_port: Gi1/0/5
     eth1:
       interface: Ethernet
       driver: e1000e
@@ -3160,9 +2826,6 @@ griffon-34:
       mountable: true
       mounted: true
       management: false
-      hwid: '0xC90300033052'
-      line_card: '0x000b8cffff003055'
-      position: 5
     ib1:
       interface: InfiniBand
       driver: mlx4_core
@@ -3192,9 +2855,6 @@ griffon-34:
     serial_number: 812530039
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: griffon-pdu4.nancy.grid5000.fr
-    pdu_position: 5
 griffon-35:
   bios:
     vendor: Phoenix Technologies LTD
@@ -3234,8 +2894,6 @@ griffon-35:
       mountable: true
       mounted: true
       management: false
-      switch_name: sgriffon2
-      switch_port: Gi1/0/6
     eth1:
       interface: Ethernet
       driver: e1000e
@@ -3256,9 +2914,6 @@ griffon-35:
       mountable: true
       mounted: true
       management: false
-      hwid: '0xC9030003304A'
-      line_card: '0x000b8cffff003055'
-      position: 6
     ib1:
       interface: InfiniBand
       driver: mlx4_core
@@ -3272,8 +2927,6 @@ griffon-35:
     bmc:
       ip: 172.17.65.35
       mac: 00:e0:81:4f:b5:ea
-      switch_name: sgriffon2-ipmi
-      switch_port: 1/0/6
   operating_system:
     name: debian
     kernel: 2.6.32-5-amd64
@@ -3286,9 +2939,6 @@ griffon-35:
     serial_number: 812530040
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: griffon-pdu4.nancy.grid5000.fr
-    pdu_position: 6
 griffon-36:
   main_memory:
     ram_size: 16867737600
@@ -3316,8 +2966,6 @@ griffon-36:
     bmc:
       ip: 172.17.65.36
       mac: 00:e0:81:4f:b5:e8
-      switch_name: sgriffon2-ipmi
-      switch_port: 7
     eth0:
       interface: Ethernet
       ip: 172.16.65.36
@@ -3329,8 +2977,6 @@ griffon-36:
       mountable: true
       mounted: true
       management: false
-      switch_name: sgriffon2
-      switch_port: Gi1/0/7
     eth1:
       interface: Ethernet
       driver: e1000e
@@ -3351,9 +2997,6 @@ griffon-36:
       mountable: true
       mounted: true
       management: false
-      hwid: '0xC9030003301A'
-      line_card: '0x000b8cffff003055'
-      position: 1/0/7
     ib1:
       interface: InfiniBand
       driver: mlx4_core
@@ -3380,9 +3023,6 @@ griffon-36:
     serial_number: 812530041
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: griffon-pdu4.nancy.grid5000.fr
-    pdu_position: 7
 griffon-37:
   processor:
     clock_speed: 2494000000
@@ -3403,8 +3043,6 @@ griffon-37:
     bmc:
       ip: 172.17.65.37
       mac: 00:e0:81:4f:e2:d7
-      switch_name: sgriffon2-ipmi
-      switch_port: 1/0/8
     eth0:
       interface: Ethernet
       ip: 172.16.65.37
@@ -3416,8 +3054,6 @@ griffon-37:
       mountable: true
       mounted: true
       management: false
-      switch_name: sgriffon2
-      switch_port: Gi1/0/8
     eth1:
       interface: Ethernet
       driver: e1000e
@@ -3438,9 +3074,6 @@ griffon-37:
       mountable: true
       mounted: true
       management: false
-      hwid: '0xC90300028058'
-      line_card: '0x000b8cffff003055'
-      position: 8
     ib1:
       interface: InfiniBand
       driver: mlx4_core
@@ -3474,9 +3107,6 @@ griffon-37:
     serial_number: 812530042
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: griffon-pdu3.nancy.grid5000.fr
-    pdu_position: 8
 griffon-38:
   supported_job_types:
     virtual: ivt
@@ -3484,8 +3114,6 @@ griffon-38:
     bmc:
       ip: 172.17.65.38
       mac: 00:e0:81:4f:e3:68
-      switch_name: sgriffon2-ipmi
-      switch_port: 1/0/9
     eth0:
       interface: Ethernet
       ip: 172.16.65.38
@@ -3497,8 +3125,6 @@ griffon-38:
       mountable: true
       mounted: true
       management: false
-      switch_name: sgriffon2
-      switch_port: Gi1/0/9
     eth1:
       interface: Ethernet
       driver: e1000e
@@ -3519,9 +3145,6 @@ griffon-38:
       mountable: true
       mounted: true
       management: false
-      hwid: '0xC903000318DC'
-      line_card: '0x000b8cffff003055'
-      position: 9
     ib1:
       interface: InfiniBand
       driver: mlx4_core
@@ -3568,9 +3191,6 @@ griffon-38:
     serial_number: 812530043
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: griffon-pdu3.nancy.grid5000.fr
-    pdu_position: 2
 griffon-39:
   block_devices:
     sda:
@@ -3591,8 +3211,6 @@ griffon-39:
       mountable: true
       mounted: true
       management: false
-      switch_name: sgriffon2
-      switch_port: Gi1/0/25
     eth1:
       interface: Ethernet
       driver: e1000e
@@ -3613,9 +3231,6 @@ griffon-39:
       mountable: true
       mounted: true
       management: false
-      hwid: '0xC903000318E8'
-      line_card: '0x000b8cffff003055'
-      position: 10
     ib1:
       interface: InfiniBand
       driver: mlx4_core
@@ -3629,8 +3244,6 @@ griffon-39:
     bmc:
       ip: 172.17.65.39
       mac: 00:e0:81:4f:e2:bf
-      switch_name: sgriffon2-ipmi
-      switch_port: 1/0/25
   operating_system:
     name: debian
     kernel: 2.6.32-5-amd64
@@ -3662,16 +3275,11 @@ griffon-39:
     serial_number: 812530044
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: griffon-pdu3.nancy.grid5000.fr
-    pdu_position: 3
 griffon-40:
   network_interfaces:
     bmc:
       ip: 172.17.65.40
       mac: 00:e0:81:4f:e2:c6
-      switch_name: sgriffon2-ipmi
-      switch_port: 1/0/26
     eth0:
       interface: Ethernet
       ip: 172.16.65.40
@@ -3683,8 +3291,6 @@ griffon-40:
       mountable: true
       mounted: true
       management: false
-      switch_name: sgriffon2
-      switch_port: Gi1/0/26
     eth1:
       interface: Ethernet
       driver: e1000e
@@ -3705,9 +3311,6 @@ griffon-40:
       mountable: true
       mounted: true
       management: false
-      hwid: '0xC90300031780'
-      line_card: '0x000b8cffff003055'
-      position: 11
     ib1:
       interface: InfiniBand
       driver: mlx4_core
@@ -3756,9 +3359,6 @@ griffon-40:
     serial_number: 812530045
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: griffon-pdu3.nancy.grid5000.fr
-    pdu_position: 4
 griffon-41:
   operating_system:
     name: debian
@@ -3783,8 +3383,6 @@ griffon-41:
     bmc:
       ip: 172.17.65.41
       mac: 00:e0:81:4f:b5:e1
-      switch_name: sgriffon2-ipmi
-      switch_port: 1/0/27
     eth0:
       interface: Ethernet
       ip: 172.16.65.41
@@ -3796,8 +3394,6 @@ griffon-41:
       mountable: true
       mounted: true
       management: false
-      switch_name: sgriffon2
-      switch_port: Gi1/0/27
     eth1:
       interface: Ethernet
       driver: e1000e
@@ -3818,9 +3414,6 @@ griffon-41:
       mountable: true
       mounted: true
       management: false
-      hwid: '0xC903000317D4'
-      line_card: '0x000b8cffff003055'
-      position: 12
     ib1:
       interface: InfiniBand
       driver: mlx4_core
@@ -3850,9 +3443,6 @@ griffon-41:
     serial_number: 812530046
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: griffon-pdu3.nancy.grid5000.fr
-    pdu_position: 5
 griffon-42:
   bios:
     vendor: Phoenix Technologies LTD
@@ -3883,8 +3473,6 @@ griffon-42:
     bmc:
       ip: 172.17.65.42
       mac: 00:e0:81:4f:e3:65
-      switch_name: sgriffon2-ipmi
-      switch_port: 1/0/28
     eth0:
       interface: Ethernet
       ip: 172.16.65.42
@@ -3896,8 +3484,6 @@ griffon-42:
       mountable: true
       mounted: true
       management: false
-      switch_name: sgriffon2
-      switch_port: Gi1/0/28
     eth1:
       interface: Ethernet
       driver: e1000e
@@ -3918,9 +3504,6 @@ griffon-42:
       mountable: true
       mounted: true
       management: false
-      hwid: '0xC903000280D0'
-      line_card: '0x000b8cffff0030ff'
-      position: 1
     ib1:
       interface: InfiniBand
       driver: mlx4_core
@@ -3944,16 +3527,11 @@ griffon-42:
     serial_number: 812530047
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: griffon-pdu3.nancy.grid5000.fr
-    pdu_position: 6
 griffon-43:
   network_interfaces:
     bmc:
       ip: 172.17.65.43
       mac: 00:e0:81:4f:b5:e4
-      switch_name: sgriffon2-ipmi
-      switch_port: 1/0/29
     eth0:
       interface: Ethernet
       ip: 172.16.65.43
@@ -3965,8 +3543,6 @@ griffon-43:
       mountable: true
       mounted: true
       management: false
-      switch_name: sgriffon2
-      switch_port: Gi1/0/29
     eth1:
       interface: Ethernet
       driver: e1000e
@@ -3987,9 +3563,6 @@ griffon-43:
       mountable: true
       mounted: true
       management: false
-      hwid: '0xC903000280B8'
-      line_card: '0x000b8cffff0030ff'
-      position: 2
     ib1:
       interface: InfiniBand
       driver: mlx4_core
@@ -4038,9 +3611,6 @@ griffon-43:
     serial_number: 812530048
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: griffon-pdu3.nancy.grid5000.fr
-    pdu_position: 7
 griffon-44:
   main_memory:
     ram_size: 16867737600
@@ -4068,8 +3638,6 @@ griffon-44:
     bmc:
       ip: 172.17.65.44
       mac: 00:e0:81:4f:e2:b7
-      switch_name: sgriffon2-ipmi
-      switch_port: 1/0/30
     eth0:
       interface: Ethernet
       ip: 172.16.65.44
@@ -4081,8 +3649,6 @@ griffon-44:
       mountable: true
       mounted: true
       management: false
-      switch_name: sgriffon2
-      switch_port: Gi1/0/30
     eth1:
       interface: Ethernet
       driver: e1000e
@@ -4103,9 +3669,6 @@ griffon-44:
       mountable: true
       mounted: true
       management: false
-      hwid: '0xC903000280D4'
-      line_card: '0x000b8cffff0030ff'
-      position: 3
     ib1:
       interface: InfiniBand
       driver: mlx4_core
@@ -4132,16 +3695,11 @@ griffon-44:
     serial_number: 812530049
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: griffon-pdu3.nancy.grid5000.fr
-    pdu_position: 17
 griffon-45:
   network_interfaces:
     bmc:
       ip: 172.17.65.45
       mac: 00:e0:81:4f:e2:c4
-      switch_name: sgriffon2-ipmi
-      switch_port: 1/0/31
     eth0:
       interface: Ethernet
       ip: 172.16.65.45
@@ -4153,8 +3711,6 @@ griffon-45:
       mountable: true
       mounted: true
       management: false
-      switch_name: sgriffon2
-      switch_port: Gi1/0/31
     eth1:
       interface: Ethernet
       driver: e1000e
@@ -4175,9 +3731,6 @@ griffon-45:
       mountable: true
       mounted: true
       management: false
-      hwid: '0xC903000280B0'
-      line_card: '0x000b8cffff0030ff'
-      position: 4
     ib1:
       interface: InfiniBand
       driver: mlx4_core
@@ -4226,9 +3779,6 @@ griffon-45:
     serial_number: 812530050
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: griffon-pdu3.nancy.grid5000.fr
-    pdu_position: 18
 griffon-46:
   supported_job_types:
     virtual: ivt
@@ -4240,8 +3790,6 @@ griffon-46:
     bmc:
       ip: 172.17.65.46
       mac: 00:e0:81:4f:ca:79
-      switch_name: sgriffon2-ipmi
-      switch_port: 1/0/32
     eth0:
       interface: Ethernet
       ip: 172.16.65.46
@@ -4253,8 +3801,6 @@ griffon-46:
       mountable: true
       mounted: true
       management: false
-      switch_name: sgriffon2
-      switch_port: Gi1/0/32
     eth1:
       interface: Ethernet
       driver: e1000e
@@ -4275,9 +3821,6 @@ griffon-46:
       mountable: true
       mounted: true
       management: false
-      hwid: '0xC903000280A8'
-      line_card: '0x000b8cffff0030ff'
-      position: 5
     ib1:
       interface: InfiniBand
       driver: mlx4_core
@@ -4320,9 +3863,6 @@ griffon-46:
     serial_number: 812530051
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: griffon-pdu3.nancy.grid5000.fr
-    pdu_position: 19
 griffon-47:
   main_memory:
     ram_size: 16867737600
@@ -4338,8 +3878,6 @@ griffon-47:
       mountable: true
       mounted: true
       management: false
-      switch_name: sgriffon2
-      switch_port: Gi1/0/33
     eth1:
       interface: Ethernet
       driver: e1000e
@@ -4360,9 +3898,6 @@ griffon-47:
       mountable: true
       mounted: true
       management: false
-      hwid: '0xC903000318E0'
-      line_card:
-      position:
     ib1:
       interface: InfiniBand
       driver: mlx4_core
@@ -4376,8 +3911,6 @@ griffon-47:
     bmc:
       ip: 172.17.65.47
       mac: 00:e0:81:4f:e3:0a
-      switch_name: sgriffon2-ipmi
-      switch_port: 1/0/33
   operating_system:
     name: debian
     kernel: 2.6.32-5-amd64
@@ -4414,9 +3947,6 @@ griffon-47:
     serial_number: 812530052
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: griffon-pdu3.nancy.grid5000.fr
-    pdu_position: 20
 griffon-48:
   main_memory:
     ram_size: 16867737600
@@ -4444,8 +3974,6 @@ griffon-48:
     bmc:
       ip: 172.17.65.48
       mac: 00:e0:81:4f:ca:80
-      switch_name: sgriffon2-ipmi
-      switch_port: 1/0/34
     eth0:
       interface: Ethernet
       ip: 172.16.65.48
@@ -4457,8 +3985,6 @@ griffon-48:
       mountable: true
       mounted: true
       management: false
-      switch_name: sgriffon2
-      switch_port: Gi1/0/34
     eth1:
       interface: Ethernet
       driver: e1000e
@@ -4479,9 +4005,6 @@ griffon-48:
       mountable: true
       mounted: true
       management: false
-      hwid: '0xC903000317A4'
-      line_card: '0x000b8cffff0030ff'
-      position: 7
     ib1:
       interface: InfiniBand
       driver: mlx4_core
@@ -4508,16 +4031,11 @@ griffon-48:
     serial_number: 812530053
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: griffon-pdu3.nancy.grid5000.fr
-    pdu_position: 21
 griffon-49:
   network_interfaces:
     bmc:
       ip: 172.17.65.49
       mac: 00:e0:81:4f:e2:c9
-      switch_name: sgriffon2-ipmi
-      switch_port: 1/0/35
     eth0:
       interface: Ethernet
       ip: 172.16.65.49
@@ -4529,8 +4047,6 @@ griffon-49:
       mountable: true
       mounted: true
       management: false
-      switch_name: sgriffon2
-      switch_port: Gi1/0/35
     eth1:
       interface: Ethernet
       driver: e1000e
@@ -4551,9 +4067,6 @@ griffon-49:
       mountable: true
       mounted: true
       management: false
-      hwid: '0xC90300033026'
-      line_card: '0x000b8cffff0030ff'
-      position: 8
     ib1:
       interface: InfiniBand
       driver: mlx4_core
@@ -4602,9 +4115,6 @@ griffon-49:
     serial_number: 812530054
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: griffon-pdu3.nancy.grid5000.fr
-    pdu_position: 22
 griffon-50:
   main_memory:
     ram_size: 16867737600
@@ -4632,8 +4142,6 @@ griffon-50:
     bmc:
       ip: 172.17.65.50
       mac: 00:e0:81:4f:e2:fa
-      switch_name: sgriffon2-ipmi
-      switch_port: 1/0/36
     eth0:
       interface: Ethernet
       ip: 172.16.65.50
@@ -4645,8 +4153,6 @@ griffon-50:
       mountable: true
       mounted: true
       management: false
-      switch_name: sgriffon2
-      switch_port: Gi1/0/37
     eth1:
       interface: Ethernet
       driver: e1000e
@@ -4667,9 +4173,6 @@ griffon-50:
       mountable: true
       mounted: true
       management: false
-      hwid: '0xC903000318D0'
-      line_card: '0x000b8cffff0030ff'
-      position: 9
     ib1:
       interface: InfiniBand
       driver: mlx4_core
@@ -4696,9 +4199,6 @@ griffon-50:
     serial_number: 812530055
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: griffon-pdu3.nancy.grid5000.fr
-    pdu_position: 23
 griffon-51:
   operating_system:
     name: debian
@@ -4728,8 +4228,6 @@ griffon-51:
     bmc:
       ip: 172.17.65.51
       mac: 00:e0:81:4f:e3:92
-      switch_name: sgriffon2-ipmi
-      switch_port: 1/0/37
     eth0:
       interface: Ethernet
       ip: 172.16.65.51
@@ -4741,8 +4239,6 @@ griffon-51:
       mountable: true
       mounted: true
       management: false
-      switch_name: sgriffon2
-      switch_port: Gi1/0/36
     eth1:
       interface: Ethernet
       driver: e1000e
@@ -4763,9 +4259,6 @@ griffon-51:
       mountable: true
       mounted: true
       management: false
-      hwid: '0xC903000318EC'
-      line_card: '0x000b8cffff0030ff'
-      position: 10
     ib1:
       interface: InfiniBand
       driver: mlx4_core
@@ -4790,9 +4283,6 @@ griffon-51:
     serial_number: 812530056
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: griffon-pdu4.nancy.grid5000.fr
-    pdu_position: 21
 griffon-52:
   main_memory:
     ram_size: 16867737600
@@ -4800,8 +4290,6 @@ griffon-52:
     bmc:
       ip: 172.17.65.52
       mac: 00:e0:81:4f:e3:7e
-      switch_name: sgriffon2-ipmi
-      switch_port: 1/0/38
     eth0:
       interface: Ethernet
       ip: 172.16.65.52
@@ -4813,8 +4301,6 @@ griffon-52:
       mountable: true
       mounted: true
       management: false
-      switch_name: sgriffon2
-      switch_port: Gi1/0/38
     eth1:
       interface: Ethernet
       driver: e1000e
@@ -4835,9 +4321,6 @@ griffon-52:
       mountable: true
       mounted: true
       management: false
-      hwid: '0xC90300027F84'
-      line_card:
-      position:
     ib1:
       interface: InfiniBand
       driver: mlx4_core
@@ -4884,9 +4367,6 @@ griffon-52:
     serial_number: 812530057
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: griffon-pdu4.nancy.grid5000.fr
-    pdu_position: 20
 griffon-53:
   operating_system:
     name: debian
@@ -4904,8 +4384,6 @@ griffon-53:
       mountable: true
       mounted: true
       management: false
-      switch_name: sgriffon2
-      switch_port: Gi1/0/39
     eth1:
       interface: Ethernet
       driver: e1000e
@@ -4926,9 +4404,6 @@ griffon-53:
       mountable: true
       mounted: true
       management: false
-      hwid: '0xC903000280C4'
-      line_card:
-      position:
     ib1:
       interface: InfiniBand
       driver: mlx4_core
@@ -4942,8 +4417,6 @@ griffon-53:
     bmc:
       ip: 172.17.65.53
       mac: 00:e0:81:4f:e3:56
-      switch_name: sgriffon2-ipmi
-      switch_port: 1/0/39
   bios:
     vendor: Phoenix Technologies LTD
     version: V1.05
@@ -4978,9 +4451,6 @@ griffon-53:
     serial_number: 812530058
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: griffon-pdu4.nancy.grid5000.fr
-    pdu_position: 19
 griffon-54:
   main_memory:
     ram_size: 16867737600
@@ -4988,8 +4458,6 @@ griffon-54:
     bmc:
       ip: 172.17.65.54
       mac: 00:e0:81:4f:e2:cf
-      switch_name: sgriffon2-ipmi
-      switch_port: 1/0/40
     eth0:
       interface: Ethernet
       ip: 172.16.65.54
@@ -5001,8 +4469,6 @@ griffon-54:
       mountable: true
       mounted: true
       management: false
-      switch_name: sgriffon2
-      switch_port: Gi1/0/40
     eth1:
       interface: Ethernet
       driver: e1000e
@@ -5023,9 +4489,6 @@ griffon-54:
       mountable: true
       mounted: true
       management: false
-      hwid: '0xC903000318C4'
-      line_card:
-      position:
     ib1:
       interface: InfiniBand
       driver: mlx4_core
@@ -5072,9 +4535,6 @@ griffon-54:
     serial_number: 812530059c
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: griffon-pdu4.nancy.grid5000.fr
-    pdu_position: 18
 griffon-55:
   network_interfaces:
     eth0:
@@ -5088,8 +4548,6 @@ griffon-55:
       mountable: true
       mounted: true
       management: false
-      switch_name: sgriffon2
-      switch_port: Gi1/0/41
     eth1:
       interface: Ethernet
       driver: e1000e
@@ -5110,9 +4568,6 @@ griffon-55:
       mountable: true
       mounted: true
       management: false
-      hwid: '0xC90300031784'
-      line_card:
-      position:
     ib1:
       interface: InfiniBand
       driver: mlx4_core
@@ -5126,8 +4581,6 @@ griffon-55:
     bmc:
       ip: 172.17.65.55
       mac: 00:e0:81:4f:e2:f8
-      switch_name: sgriffon2-ipmi
-      switch_port: 1/0/41
   bios:
     vendor: Phoenix Technologies LTD
     version: V1.05
@@ -5166,9 +4619,6 @@ griffon-55:
     serial_number: 812530060
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: griffon-pdu4.nancy.grid5000.fr
-    pdu_position: 17
 griffon-56:
   block_devices:
     sda:
@@ -5185,8 +4635,6 @@ griffon-56:
     bmc:
       ip: 172.17.65.56
       mac: 00:e0:81:4f:ca:89
-      switch_name: sgriffon2-ipmi
-      switch_port: 1/0/42
     eth0:
       interface: Ethernet
       ip: 172.16.65.56
@@ -5198,8 +4646,6 @@ griffon-56:
       mountable: true
       mounted: true
       management: false
-      switch_name: sgriffon2
-      switch_port: Gi1/0/42
     eth1:
       interface: Ethernet
       driver: e1000e
@@ -5220,9 +4666,6 @@ griffon-56:
       mountable: true
       mounted: true
       management: false
-      hwid: '0xC9030003176C'
-      line_card:
-      position:
     ib1:
       interface: InfiniBand
       driver: mlx4_core
@@ -5260,9 +4703,6 @@ griffon-56:
     serial_number: 812530061
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: griffon-pdu4.nancy.grid5000.fr
-    pdu_position: 15
 griffon-57:
   main_memory:
     ram_size: 16867737600
@@ -5304,8 +4744,6 @@ griffon-57:
       mountable: true
       mounted: true
       management: false
-      switch_name: sgriffon2
-      switch_port: Gi1/0/43
     eth1:
       interface: Ethernet
       driver: e1000e
@@ -5326,9 +4764,6 @@ griffon-57:
       mountable: true
       mounted: true
       management: false
-      hwid: '0xC9030003173C'
-      line_card:
-      position:
     ib1:
       interface: InfiniBand
       driver: mlx4_core
@@ -5342,8 +4777,6 @@ griffon-57:
     bmc:
       ip: 172.17.65.57
       mac: 00:e0:81:4f:e2:de
-      switch_name: sgriffon2-ipmi
-      switch_port: 1/0/43
   supported_job_types:
     virtual: ivt
   operating_system:
@@ -5354,9 +4787,6 @@ griffon-57:
     serial_number: 812530062
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: griffon-pdu4.nancy.grid5000.fr
-    pdu_position: 14
 griffon-58:
   main_memory:
     ram_size: 16867737600
@@ -5384,8 +4814,6 @@ griffon-58:
     bmc:
       ip: 172.17.65.58
       mac: 00:e0:81:4f:e2:f3
-      switch_name: sgriffon1-ipmi
-      switch_port: 1/0/12
     eth0:
       interface: Ethernet
       ip: 172.16.65.58
@@ -5397,8 +4825,6 @@ griffon-58:
       mountable: true
       mounted: true
       management: false
-      switch_name: sgriffon1
-      switch_port: Gi1/0/11
     eth1:
       interface: Ethernet
       driver: e1000e
@@ -5419,9 +4845,6 @@ griffon-58:
       mountable: true
       mounted: true
       management: false
-      hwid: '0xC9030003179C'
-      line_card:
-      position:
     ib1:
       interface: InfiniBand
       driver: mlx4_core
@@ -5448,9 +4871,6 @@ griffon-58:
     serial_number: 812530063
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: griffon-pdu1.nancy.grid5000.fr
-    pdu_position: 1
 griffon-59:
   processor:
     clock_speed: 2494000000
@@ -5486,8 +4906,6 @@ griffon-59:
     bmc:
       ip: 172.17.65.59
       mac: 00:e0:81:4f:e3:05
-      switch_name: sgriffon1-ipmi
-      switch_port: 1/0/11
     eth0:
       interface: Ethernet
       ip: 172.16.65.59
@@ -5499,8 +4917,6 @@ griffon-59:
       mountable: true
       mounted: true
       management: false
-      switch_name: sgriffon1
-      switch_port: Gi1/0/12
     eth1:
       interface: Ethernet
       driver: e1000e
@@ -5521,9 +4937,6 @@ griffon-59:
       mountable: true
       mounted: true
       management: false
-      hwid: '0xC90300031730'
-      line_card: '0x000b8cffff00304d'
-      position: 5
     ib1:
       interface: InfiniBand
       driver: mlx4_core
@@ -5542,9 +4955,6 @@ griffon-59:
     serial_number: 812530064
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: griffon-pdu1.nancy.grid5000.fr
-    pdu_position: 2
 griffon-60:
   architecture:
     smp_size: 2
@@ -5590,8 +5000,6 @@ griffon-60:
       mountable: true
       mounted: true
       management: false
-      switch_name: sgriffon1
-      switch_port: Gi1/0/13
     eth1:
       interface: Ethernet
       driver: e1000e
@@ -5612,9 +5020,6 @@ griffon-60:
       mountable: true
       mounted: true
       management: false
-      hwid: '0xC90300031740'
-      line_card: '0x000b8cffff00304d'
-      position: 6
     ib1:
       interface: InfiniBand
       driver: mlx4_core
@@ -5628,17 +5033,12 @@ griffon-60:
     bmc:
       ip: 172.17.65.60
       mac: 00:e0:81:4f:e3:90
-      switch_name: sgriffon1-ipmi
-      switch_port: 1/0/13
   supported_job_types:
     virtual: ivt
   chassis:
     serial_number: 812530065
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: griffon-pdu2.nancy.grid5000.fr
-    pdu_position: 5
 griffon-61:
   architecture:
     smp_size: 2
@@ -5667,8 +5067,6 @@ griffon-61:
       mountable: true
       mounted: true
       management: false
-      switch_name: sgriffon3
-      switch_port: Gi1/0/4
     eth1:
       interface: Ethernet
       driver: e1000e
@@ -5689,9 +5087,6 @@ griffon-61:
       mountable: true
       mounted: true
       management: false
-      hwid: '0xC90300031804'
-      line_card: '0x000b8cffff00304d'
-      position: 7
     ib1:
       interface: InfiniBand
       driver: mlx4_core
@@ -5705,8 +5100,6 @@ griffon-61:
     bmc:
       ip: 172.17.65.61
       mac: 00:e0:81:4b:fc:d2
-      switch_name: sgriffon3-ipmi
-      switch_port: 1/0/4
   main_memory:
     ram_size: 16867737600
   supported_job_types:
@@ -5730,9 +5123,6 @@ griffon-61:
     serial_number: 812530066
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: griffon-pdu6.nancy.grid5000.fr
-    pdu_position: 3
 griffon-62:
   block_devices:
     sda:
@@ -5745,8 +5135,6 @@ griffon-62:
     bmc:
       ip: 172.17.65.62
       mac: 00:e0:81:4f:e2:b8
-      switch_name: sgriffon3-ipmi
-      switch_port: 1/0/5
     eth0:
       interface: Ethernet
       ip: 172.16.65.62
@@ -5758,8 +5146,6 @@ griffon-62:
       mountable: true
       mounted: true
       management: false
-      switch_name: sgriffon3
-      switch_port: Gi1/0/5
     eth1:
       interface: Ethernet
       driver: e1000e
@@ -5780,9 +5166,6 @@ griffon-62:
       mountable: true
       mounted: true
       management: false
-      hwid: '0xC9030003185C'
-      line_card: '0x000b8cffff00304d'
-      position: 8
     ib1:
       interface: InfiniBand
       driver: mlx4_core
@@ -5824,9 +5207,6 @@ griffon-62:
     serial_number: 812530067
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: griffon-pdu6.nancy.grid5000.fr
-    pdu_position: 2
 griffon-63:
   supported_job_types:
     virtual: ivt
@@ -5861,8 +5241,6 @@ griffon-63:
       mountable: true
       mounted: true
       management: false
-      switch_name: sgriffon3
-      switch_port: Gi1/0/6
     eth1:
       interface: Ethernet
       driver: e1000e
@@ -5883,9 +5261,6 @@ griffon-63:
       mountable: true
       mounted: true
       management: false
-      hwid: '0xC903000317B4'
-      line_card: '0x000b8cffff00304d'
-      position: 9
     ib1:
       interface: InfiniBand
       driver: mlx4_core
@@ -5899,8 +5274,6 @@ griffon-63:
     bmc:
       ip: 172.17.65.63
       mac: 00:e0:81:4f:e3:0b
-      switch_name: sgriffon3-ipmi
-      switch_port: 1/0/6
   main_memory:
     ram_size: 16867737600
   processor:
@@ -5918,9 +5291,6 @@ griffon-63:
     serial_number: 812530068
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: griffon-pdu6.nancy.grid5000.fr
-    pdu_position: 1
 griffon-64:
   processor:
     clock_speed: 2494000000
@@ -5939,8 +5309,6 @@ griffon-64:
     bmc:
       ip: 172.17.65.64
       mac: 00:e0:81:4f:e2:cd
-      switch_name: sgriffon3-ipmi
-      switch_port: 1/0/7
     eth0:
       interface: Ethernet
       ip: 172.16.65.64
@@ -5952,8 +5320,6 @@ griffon-64:
       mountable: true
       mounted: true
       management: false
-      switch_name: sgriffon3
-      switch_port: Gi1/0/7
     eth1:
       interface: Ethernet
       driver: e1000e
@@ -5974,9 +5340,6 @@ griffon-64:
       mountable: true
       mounted: true
       management: false
-      hwid: '0xC90300033012'
-      line_card: '0x000b8cffff00304d'
-      position: 10
     ib1:
       interface: InfiniBand
       driver: mlx4_core
@@ -6012,9 +5375,6 @@ griffon-64:
     serial_number: 812530069
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: griffon-pdu6.nancy.grid5000.fr
-    pdu_position: 8
 griffon-65:
   supported_job_types:
     virtual: ivt
@@ -6058,8 +5418,6 @@ griffon-65:
       mountable: true
       mounted: true
       management: false
-      switch_name: sgriffon3
-      switch_port: Gi1/0/8
     eth1:
       interface: Ethernet
       driver: e1000e
@@ -6080,9 +5438,6 @@ griffon-65:
       mountable: true
       mounted: true
       management: false
-      hwid: '0xC90300031750'
-      line_card: '0x000b8cffff00304d'
-      position: 11
     ib1:
       interface: InfiniBand
       driver: mlx4_core
@@ -6096,8 +5451,6 @@ griffon-65:
     bmc:
       ip: 172.17.65.65
       mac: 00:e0:81:4f:e2:bc
-      switch_name: sgriffon3-ipmi
-      switch_port: 1/0/8
   architecture:
     smp_size: 2
     smt_size: 8
@@ -6106,9 +5459,6 @@ griffon-65:
     serial_number: 812530070
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: griffon-pdu5.nancy.grid5000.fr
-    pdu_position: 2
 griffon-66:
   processor:
     clock_speed: 2494000000
@@ -6146,8 +5496,6 @@ griffon-66:
       mountable: true
       mounted: true
       management: false
-      switch_name: sgriffon3
-      switch_port: Gi1/0/9
     eth1:
       interface: Ethernet
       driver: e1000e
@@ -6168,9 +5516,6 @@ griffon-66:
       mountable: true
       mounted: true
       management: false
-      hwid: '0xC90300031968'
-      line_card: '0x000b8cffff00304d'
-      position: 12
     ib1:
       interface: InfiniBand
       driver: mlx4_core
@@ -6184,8 +5529,6 @@ griffon-66:
     bmc:
       ip: 172.17.65.66
       mac: 00:e0:81:4f:ca:78
-      switch_name: sgriffon3-ipmi
-      switch_port: 1/0/9
   operating_system:
     name: debian
     kernel: 2.6.32-5-amd64
@@ -6200,9 +5543,6 @@ griffon-66:
     serial_number: 812530071
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: griffon-pdu5.nancy.grid5000.fr
-    pdu_position: 3
 griffon-67:
   supported_job_types:
     virtual: ivt
@@ -6210,8 +5550,6 @@ griffon-67:
     bmc:
       ip: 172.17.65.67
       mac: 00:e0:81:4f:b5:f0
-      switch_name: sgriffon3-ipmi
-      switch_port: 1/0/10
     eth0:
       interface: Ethernet
       ip: 172.16.65.67
@@ -6223,8 +5561,6 @@ griffon-67:
       mountable: true
       mounted: true
       management: false
-      switch_name: sgriffon3
-      switch_port: Gi1/0/10
     eth1:
       interface: Ethernet
       driver: e1000e
@@ -6245,9 +5581,6 @@ griffon-67:
       mountable: true
       mounted: true
       management: false
-      hwid: '0xC903000317DC'
-      line_card: '0x000b8cffff003107'
-      position: 1
     ib1:
       interface: InfiniBand
       driver: mlx4_core
@@ -6294,9 +5627,6 @@ griffon-67:
     serial_number: 812530072
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: griffon-pdu5.nancy.grid5000.fr
-    pdu_position: 4
 griffon-68:
   supported_job_types:
     virtual: ivt
@@ -6312,8 +5642,6 @@ griffon-68:
       mountable: true
       mounted: true
       management: false
-      switch_name: sgriffon3
-      switch_port: Gi1/0/11
     eth1:
       interface: Ethernet
       driver: e1000e
@@ -6334,9 +5662,6 @@ griffon-68:
       mountable: true
       mounted: true
       management: false
-      hwid: '0xC90300031858'
-      line_card: '0x000b8cffff003107'
-      position: 2
     ib1:
       interface: InfiniBand
       driver: mlx4_core
@@ -6350,8 +5675,6 @@ griffon-68:
     bmc:
       ip: 172.17.65.68
       mac: 00:e0:81:4f:ca:8f
-      switch_name: sgriffon3-ipmi
-      switch_port: 1/0/11
   block_devices:
     sda:
       device: sda
@@ -6388,9 +5711,6 @@ griffon-68:
     serial_number: 812530073
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: griffon-pdu5.nancy.grid5000.fr
-    pdu_position: 5
 griffon-69:
   main_memory:
     ram_size: 16867737600
@@ -6418,8 +5738,6 @@ griffon-69:
     bmc:
       ip: 172.17.65.69
       mac: 00:e0:81:4f:b5:dc
-      switch_name: sgriffon3-ipmi
-      switch_port: 1/0/12
     eth0:
       interface: Ethernet
       ip: 172.16.65.69
@@ -6431,8 +5749,6 @@ griffon-69:
       mountable: true
       mounted: true
       management: false
-      switch_name: sgriffon3
-      switch_port: Gi1/0/12
     eth1:
       interface: Ethernet
       driver: e1000e
@@ -6453,9 +5769,6 @@ griffon-69:
       mountable: true
       mounted: false
       management: false
-      hwid: '0xC903000317B0'
-      line_card: '0x000b8cffff003107'
-      position: 3
     ib1:
       interface: InfiniBand
       driver: mlx4_core
@@ -6482,9 +5795,6 @@ griffon-69:
     serial_number: 812530074
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: griffon-pdu5.nancy.grid5000.fr
-    pdu_position: 6
 griffon-70:
   main_memory:
     ram_size: 16867737600
@@ -6509,8 +5819,6 @@ griffon-70:
       mountable: true
       mounted: true
       management: false
-      switch_name: sgriffon3
-      switch_port: Gi1/0/13
     eth1:
       interface: Ethernet
       driver: e1000e
@@ -6531,9 +5839,6 @@ griffon-70:
       mountable: true
       mounted: true
       management: false
-      hwid: '0xC90300031810'
-      line_card: '0x000b8cffff003107'
-      position: 4
     ib1:
       interface: InfiniBand
       driver: mlx4_core
@@ -6547,8 +5852,6 @@ griffon-70:
     bmc:
       ip: 172.17.65.70
       mac: 00:e0:81:4f:ca:77
-      switch_name: sgriffon3-ipmi
-      switch_port: 1/0/13
   bios:
     vendor: Phoenix Technologies LTD
     version: V1.05
@@ -6576,9 +5879,6 @@ griffon-70:
     serial_number: 812530075
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: griffon-pdu5.nancy.grid5000.fr
-    pdu_position: 7
 griffon-71:
   bios:
     vendor: Phoenix Technologies LTD
@@ -6596,8 +5896,6 @@ griffon-71:
       mountable: true
       mounted: true
       management: false
-      switch_name: sgriffon3
-      switch_port: Gi1/0/14
     eth1:
       interface: Ethernet
       driver: e1000e
@@ -6618,9 +5916,6 @@ griffon-71:
       mountable: true
       mounted: true
       management: false
-      hwid: '0xC90300031824'
-      line_card: '0x000b8cffff003107'
-      position: 5
     ib1:
       interface: InfiniBand
       driver: mlx4_core
@@ -6634,8 +5929,6 @@ griffon-71:
     bmc:
       ip: 172.17.65.71
       mac: 00:e0:81:4f:cb:05
-      switch_name: sgriffon3-ipmi
-      switch_port: 1/0/14
   main_memory:
     ram_size: 16867737600
   architecture:
@@ -6670,16 +5963,11 @@ griffon-71:
     serial_number: 812530076
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: griffon-pdu5.nancy.grid5000.fr
-    pdu_position: 8
 griffon-72:
   network_interfaces:
     bmc:
       ip: 172.17.65.72
       mac: 00:e0:81:4f:b5:f1
-      switch_name: sgriffon3-ipmi
-      switch_port: 1/0/15
     eth0:
       interface: Ethernet
       ip: 172.16.65.72
@@ -6691,8 +5979,6 @@ griffon-72:
       mountable: true
       mounted: true
       management: false
-      switch_name: sgriffon3
-      switch_port: Gi1/0/15
     eth1:
       interface: Ethernet
       driver: e1000e
@@ -6713,9 +5999,6 @@ griffon-72:
       mountable: true
       mounted: true
       management: false
-      hwid: '0xC90300032FCE'
-      line_card: '0x000b8cffff003107'
-      position: 6
     ib1:
       interface: InfiniBand
       driver: mlx4_core
@@ -6764,9 +6047,6 @@ griffon-72:
     serial_number: 812530077
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: griffon-pdu5.nancy.grid5000.fr
-    pdu_position: 9
 griffon-73:
   operating_system:
     name: debian
@@ -6778,8 +6058,6 @@ griffon-73:
     bmc:
       ip: 172.17.65.73
       mac: 00:e0:81:4f:cb:0d
-      switch_name: sgriffon3-ipmi
-      switch_port: 1/0/25
     eth0:
       interface: Ethernet
       ip: 172.16.65.73
@@ -6791,8 +6069,6 @@ griffon-73:
       mountable: true
       mounted: true
       management: false
-      switch_name: sgriffon3
-      switch_port: Gi1/0/25
     eth1:
       interface: Ethernet
       driver: e1000e
@@ -6813,9 +6089,6 @@ griffon-73:
       mountable: true
       mounted: true
       management: false
-      hwid: '0xC903000319FC'
-      line_card: '0x000b8cffff003107'
-      position: 7
     ib1:
       interface: InfiniBand
       driver: mlx4_core
@@ -6858,16 +6131,11 @@ griffon-73:
     serial_number: 812530078
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: griffon-pdu5.nancy.grid5000.fr
-    pdu_position: 10
 griffon-74:
   network_interfaces:
     bmc:
       ip: 172.17.65.74
       mac: 00:e0:81:4f:cb:00
-      switch_name: sgriffon3-ipmi
-      switch_port: 1/0/26
     eth0:
       interface: Ethernet
       ip: 172.16.65.74
@@ -6879,8 +6147,6 @@ griffon-74:
       mountable: true
       mounted: true
       management: false
-      switch_name: sgriffon3
-      switch_port: Gi1/0/26
     eth1:
       interface: Ethernet
       driver: e1000e
@@ -6901,9 +6167,6 @@ griffon-74:
       mountable: true
       mounted: true
       management: false
-      hwid: '0xC90300031890'
-      line_card: '0x000b8cffff003107'
-      position: 8
     ib1:
       interface: InfiniBand
       driver: mlx4_core
@@ -6952,9 +6215,6 @@ griffon-74:
     serial_number: 812530079
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: griffon-pdu5.nancy.grid5000.fr
-    pdu_position: 11
 griffon-75:
   main_memory:
     ram_size: 16867737600
@@ -6982,8 +6242,6 @@ griffon-75:
     bmc:
       ip: 172.17.65.75
       mac: 00:e0:81:4f:e3:75
-      switch_name: sgriffon3-ipmi
-      switch_port: 1/0/27
     eth0:
       interface: Ethernet
       ip: 172.16.65.75
@@ -6995,8 +6253,6 @@ griffon-75:
       mountable: true
       mounted: true
       management: false
-      switch_name: sgriffon3
-      switch_port: Gi1/0/27
     eth1:
       interface: Ethernet
       driver: e1000e
@@ -7017,9 +6273,6 @@ griffon-75:
       mountable: true
       mounted: true
       management: false
-      hwid: '0xC90300031874'
-      line_card: '0x000b8cffff003107'
-      position: 9
     ib1:
       interface: InfiniBand
       driver: mlx4_core
@@ -7046,9 +6299,6 @@ griffon-75:
     serial_number: 812530080
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: griffon-pdu5.nancy.grid5000.fr
-    pdu_position: 13
 griffon-76:
   bios:
     vendor: Phoenix Technologies LTD
@@ -7069,8 +6319,6 @@ griffon-76:
     bmc:
       ip: 172.17.65.76
       mac: 00:e0:81:4f:b5:e3
-      switch_name: sgriffon3-ipmi
-      switch_port: 1/0/28
     eth0:
       interface: Ethernet
       ip: 172.16.65.76
@@ -7082,8 +6330,6 @@ griffon-76:
       mountable: true
       mounted: true
       management: false
-      switch_name: sgriffon3
-      switch_port: Gi1/0/28
     eth1:
       interface: Ethernet
       driver: e1000e
@@ -7104,9 +6350,6 @@ griffon-76:
       mountable: true
       mounted: true
       management: false
-      hwid: '0xC90300031974'
-      line_card: '0x000b8cffff003107'
-      position: 10
     ib1:
       interface: InfiniBand
       driver: mlx4_core
@@ -7140,9 +6383,6 @@ griffon-76:
     serial_number: 812530081
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: griffon-pdu5.nancy.grid5000.fr
-    pdu_position: 14
 griffon-77:
   main_memory:
     ram_size: 16867737600
@@ -7169,8 +6409,6 @@ griffon-77:
       mountable: true
       mounted: true
       management: false
-      switch_name: sgriffon3
-      switch_port: Gi1/0/29
     eth1:
       interface: Ethernet
       driver: e1000e
@@ -7191,9 +6429,6 @@ griffon-77:
       mountable: true
       mounted: true
       management: false
-      hwid: '0xC903000318B8'
-      line_card: '0x000b8cffff003107'
-      position: 11
     ib1:
       interface: InfiniBand
       driver: mlx4_core
@@ -7207,8 +6442,6 @@ griffon-77:
     bmc:
       ip: 172.17.65.77
       mac: 00:e0:81:4f:e2:e0
-      switch_name: sgriffon3-ipmi
-      switch_port: 1/0/29
   processor:
     clock_speed: 2494000000
     instruction_set: x86-64
@@ -7234,9 +6467,6 @@ griffon-77:
     serial_number: 812530082
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: griffon-pdu5.nancy.grid5000.fr
-    pdu_position: 15
 griffon-78:
   architecture:
     smp_size: 2
@@ -7265,8 +6495,6 @@ griffon-78:
     bmc:
       ip: 172.17.65.78
       mac: 00:e0:81:4f:e2:e8
-      switch_name: sgriffon3-ipmi
-      switch_port: 1/0/30
     eth0:
       interface: Ethernet
       ip: 172.16.65.78
@@ -7278,8 +6506,6 @@ griffon-78:
       mountable: true
       mounted: true
       management: false
-      switch_name: sgriffon3
-      switch_port: Gi1/0/30
     eth1:
       interface: Ethernet
       driver: e1000e
@@ -7300,9 +6526,6 @@ griffon-78:
       mountable: true
       mounted: true
       management: false
-      hwid: '0xC903000317AC'
-      line_card: '0x000b8cffff003107'
-      position: 12
     ib1:
       interface: InfiniBand
       driver: mlx4_core
@@ -7328,9 +6551,6 @@ griffon-78:
     serial_number: 812530083
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: griffon-pdu5.nancy.grid5000.fr
-    pdu_position: 17
 griffon-79:
   network_interfaces:
     eth0:
@@ -7344,8 +6564,6 @@ griffon-79:
       mountable: true
       mounted: true
       management: false
-      switch_name: sgriffon3
-      switch_port: Gi1/0/31
     eth1:
       interface: Ethernet
       driver: e1000e
@@ -7366,9 +6584,6 @@ griffon-79:
       mountable: true
       mounted: true
       management: false
-      hwid: '0xC90300031808'
-      line_card:
-      position:
     ib1:
       interface: InfiniBand
       driver: mlx4_core
@@ -7382,8 +6597,6 @@ griffon-79:
     bmc:
       ip: 172.17.65.79
       mac: 00:e0:81:4f:e2:b2
-      switch_name: sgriffon3-ipmi
-      switch_port: 1/0/31
   main_memory:
     ram_size: 16867737600
   block_devices:
@@ -7422,9 +6635,6 @@ griffon-79:
     serial_number: 812530084
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: griffon-pdu5.nancy.grid5000.fr
-    pdu_position: 18
 griffon-80:
   supported_job_types:
     virtual: ivt
@@ -7440,8 +6650,6 @@ griffon-80:
       mountable: true
       mounted: true
       management: false
-      switch_name: sgriffon3
-      switch_port: Gi1/0/32
     eth1:
       interface: Ethernet
       driver: e1000e
@@ -7462,9 +6670,6 @@ griffon-80:
       mountable: true
       mounted: true
       management: false
-      hwid: '0xC90300031800'
-      line_card:
-      position:
     ib1:
       interface: InfiniBand
       driver: mlx4_core
@@ -7478,8 +6683,6 @@ griffon-80:
     bmc:
       ip: 172.17.65.80
       mac: 00:e0:81:4f:b5:af
-      switch_name: sgriffon3-ipmi
-      switch_port: 1/0/32
   operating_system:
     name: debian
     kernel: 2.6.32-5-amd64
@@ -7516,9 +6719,6 @@ griffon-80:
     serial_number: 812530085
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: griffon-pdu5.nancy.grid5000.fr
-    pdu_position: 19
 griffon-81:
   operating_system:
     name: debian
@@ -7528,8 +6728,6 @@ griffon-81:
     bmc:
       ip: 172.17.65.81
       mac: 00:e0:81:4f:ca:7d
-      switch_name: sgriffon3-ipmi
-      switch_port: 1/0/33
     eth0:
       interface: Ethernet
       ip: 172.16.65.81
@@ -7541,8 +6739,6 @@ griffon-81:
       mountable: true
       mounted: true
       management: false
-      switch_name: sgriffon3
-      switch_port: Gi1/0/33
     eth1:
       interface: Ethernet
       driver: e1000e
@@ -7563,9 +6759,6 @@ griffon-81:
       mountable: true
       mounted: true
       management: false
-      hwid: '0xC90300031860'
-      line_card:
-      position:
     ib1:
       interface: InfiniBand
       driver: mlx4_core
@@ -7610,9 +6803,6 @@ griffon-81:
     serial_number: 812530086
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: griffon-pdu5.nancy.grid5000.fr
-    pdu_position: 20
 griffon-82:
   main_memory:
     ram_size: 16867737600
@@ -7640,8 +6830,6 @@ griffon-82:
     bmc:
       ip: 172.17.65.82
       mac: 00:e0:81:4f:cb:08
-      switch_name: sgriffon3-ipmi
-      switch_port: 1/0/34
     eth0:
       interface: Ethernet
       ip: 172.16.65.82
@@ -7653,8 +6841,6 @@ griffon-82:
       mountable: true
       mounted: true
       management: false
-      switch_name: sgriffon3
-      switch_port: Gi1/0/34
     eth1:
       interface: Ethernet
       driver: e1000e
@@ -7675,9 +6861,6 @@ griffon-82:
       mountable: true
       mounted: true
       management: false
-      hwid: '0xC903000319F8'
-      line_card:
-      position:
     ib1:
       interface: InfiniBand
       driver: mlx4_core
@@ -7704,9 +6887,6 @@ griffon-82:
     serial_number: 812530087
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: griffon-pdu5.nancy.grid5000.fr
-    pdu_position: 21
 griffon-83:
   supported_job_types:
     virtual: ivt
@@ -7742,8 +6922,6 @@ griffon-83:
     bmc:
       ip: 172.17.65.83
       mac: 00:e0:81:4f:ca:9f
-      switch_name: sgriffon3-ipmi
-      switch_port: 1/0/35
     eth0:
       interface: Ethernet
       ip: 172.16.65.83
@@ -7755,8 +6933,6 @@ griffon-83:
       mountable: true
       mounted: true
       management: false
-      switch_name: sgriffon3
-      switch_port: Gi1/0/35
     eth1:
       interface: Ethernet
       driver: e1000e
@@ -7777,9 +6953,6 @@ griffon-83:
       mountable: true
       mounted: true
       management: false
-      hwid: '0xC903000319F4'
-      line_card: '0x000b8cffff003101'
-      position: 12
     ib1:
       interface: InfiniBand
       driver: mlx4_core
@@ -7798,9 +6971,6 @@ griffon-83:
     serial_number: 812530088
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: griffon-pdu5.nancy.grid5000.fr
-    pdu_position: 22
 griffon-84:
   main_memory:
     ram_size: 16867737600
@@ -7828,8 +6998,6 @@ griffon-84:
     bmc:
       ip: 172.17.65.84
       mac: 00:e0:81:4f:e2:d9
-      switch_name: sgriffon3-ipmi
-      switch_port: 1/0/36
     eth0:
       interface: Ethernet
       ip: 172.16.65.84
@@ -7841,8 +7009,6 @@ griffon-84:
       mountable: true
       mounted: true
       management: false
-      switch_name: sgriffon3
-      switch_port: Gi1/0/36
     eth1:
       interface: Ethernet
       driver: e1000e
@@ -7863,9 +7029,6 @@ griffon-84:
       mountable: true
       mounted: true
       management: false
-      hwid: '0xC9030003180C'
-      line_card:
-      position:
     ib1:
       interface: InfiniBand
       driver: mlx4_core
@@ -7892,9 +7055,6 @@ griffon-84:
     serial_number: 812530089
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: griffon-pdu5.nancy.grid5000.fr
-    pdu_position: 23
 griffon-85:
   supported_job_types:
     virtual: ivt
@@ -7925,8 +7085,6 @@ griffon-85:
       mountable: true
       mounted: true
       management: false
-      switch_name: sgriffon3
-      switch_port: Gi1/0/37
     eth1:
       interface: Ethernet
       driver: e1000e
@@ -7947,9 +7105,6 @@ griffon-85:
       mountable: true
       mounted: true
       management: false
-      hwid: '0xC903000319F0'
-      line_card:
-      position:
     ib1:
       interface: InfiniBand
       driver: mlx4_core
@@ -7963,8 +7118,6 @@ griffon-85:
     bmc:
       ip: 172.17.65.85
       mac: 00:e0:81:4f:b5:e7
-      switch_name: sgriffon3-ipmi
-      switch_port: 1/0/37
   bios:
     vendor: Phoenix Technologies LTD
     version: V1.05
@@ -7986,9 +7139,6 @@ griffon-85:
     serial_number: 812530090
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: griffon-pdu6.nancy.grid5000.fr
-    pdu_position: 21
 griffon-86:
   main_memory:
     ram_size: 16867737600
@@ -8016,8 +7166,6 @@ griffon-86:
     bmc:
       ip: 172.17.65.86
       mac: 00:e0:81:4f:cb:0f
-      switch_name: sgriffon3-ipmi
-      switch_port: 1/0/39
     eth0:
       interface: Ethernet
       ip: 172.16.65.86
@@ -8029,8 +7177,6 @@ griffon-86:
       mountable: true
       mounted: true
       management: false
-      switch_name: sgriffon3
-      switch_port: Gi1/0/38
     eth1:
       interface: Ethernet
       driver: e1000e
@@ -8051,9 +7197,6 @@ griffon-86:
       mountable: true
       mounted: true
       management: false
-      hwid: '0xC90300031A00'
-      line_card:
-      position:
     ib1:
       interface: InfiniBand
       driver: mlx4_core
@@ -8080,9 +7223,6 @@ griffon-86:
     serial_number: 812530091
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: griffon-pdu6.nancy.grid5000.fr
-    pdu_position: 20
 griffon-87:
   architecture:
     smp_size: 2
@@ -8113,8 +7253,6 @@ griffon-87:
       mountable: true
       mounted: true
       management: false
-      switch_name: sgriffon3
-      switch_port: Gi1/0/39
     eth1:
       interface: Ethernet
       driver: e1000e
@@ -8135,9 +7273,6 @@ griffon-87:
       mountable: true
       mounted: true
       management: false
-      hwid: '0xC90300031A04'
-      line_card:
-      position:
     ib1:
       interface: InfiniBand
       driver: mlx4_core
@@ -8151,8 +7286,6 @@ griffon-87:
     bmc:
       ip: 172.17.65.87
       mac: 00:e0:81:4f:e2:bd
-      switch_name: sgriffon3-ipmi
-      switch_port: 1/0/40
   main_memory:
     ram_size: 16867737600
   bios:
@@ -8174,9 +7307,6 @@ griffon-87:
     serial_number: 812530092
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: griffon-pdu6.nancy.grid5000.fr
-    pdu_position: 19
 griffon-88:
   processor:
     clock_speed: 2494000000
@@ -8208,8 +7338,6 @@ griffon-88:
       mountable: true
       mounted: true
       management: false
-      switch_name: sgriffon3
-      switch_port: Gi1/0/40
     eth1:
       interface: Ethernet
       driver: e1000e
@@ -8230,9 +7358,6 @@ griffon-88:
       mountable: true
       mounted: true
       management: false
-      hwid: '0xC90300031A18'
-      line_card:
-      position:
     ib1:
       interface: InfiniBand
       driver: mlx4_core
@@ -8246,8 +7371,6 @@ griffon-88:
     bmc:
       ip: 172.17.65.88
       mac: 00:e0:81:4f:e3:8c
-      switch_name: sgriffon3-ipmi
-      switch_port: 1/0/41
   bios:
     vendor: Phoenix Technologies LTD
     version: V1.05
@@ -8268,9 +7391,6 @@ griffon-88:
     serial_number: 812530093
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: griffon-pdu6.nancy.grid5000.fr
-    pdu_position: 18
 griffon-89:
   block_devices:
     sda:
@@ -8304,8 +7424,6 @@ griffon-89:
     bmc:
       ip: 172.17.65.89
       mac: 00:e0:81:4f:e3:81
-      switch_name: sgriffon3-ipmi
-      switch_port: 1/0/42
     eth0:
       interface: Ethernet
       ip: 172.16.65.89
@@ -8317,8 +7435,6 @@ griffon-89:
       mountable: true
       mounted: true
       management: false
-      switch_name: sgriffon3
-      switch_port: Gi1/0/41
     eth1:
       interface: Ethernet
       driver: e1000e
@@ -8339,9 +7455,6 @@ griffon-89:
       mountable: true
       mounted: true
       management: false
-      hwid: '0xC90300031A64'
-      line_card:
-      position:
     ib1:
       interface: InfiniBand
       driver: mlx4_core
@@ -8362,9 +7475,6 @@ griffon-89:
     serial_number: 812530094
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: griffon-pdu6.nancy.grid5000.fr
-    pdu_position: 17
 griffon-90:
   supported_job_types:
     virtual: ivt
@@ -8380,8 +7490,6 @@ griffon-90:
       mountable: true
       mounted: true
       management: false
-      switch_name: sgriffon3
-      switch_port: Gi1/0/42
     eth1:
       interface: Ethernet
       driver: e1000e
@@ -8402,9 +7510,6 @@ griffon-90:
       mountable: true
       mounted: true
       management: false
-      hwid: '0xC90300031A20'
-      line_card:
-      position:
     ib1:
       interface: InfiniBand
       driver: mlx4_core
@@ -8418,8 +7523,6 @@ griffon-90:
     bmc:
       ip: 172.17.65.90
       mac: 00:e0:81:4f:ca:fc
-      switch_name: sgriffon3-ipmi
-      switch_port: 1/0/43
   operating_system:
     name: debian
     kernel: 2.6.32-5-amd64
@@ -8456,9 +7559,6 @@ griffon-90:
     serial_number: 812530095
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: griffon-pdu6.nancy.grid5000.fr
-    pdu_position: 15
 griffon-91:
   network_interfaces:
     eth0:
@@ -8472,8 +7572,6 @@ griffon-91:
       mountable: true
       mounted: true
       management: false
-      switch_name: sgriffon3
-      switch_port: Gi1/0/43
     eth1:
       interface: Ethernet
       driver: e1000e
@@ -8494,9 +7592,6 @@ griffon-91:
       mountable: true
       mounted: true
       management: false
-      hwid: '0xC90300031A0C'
-      line_card:
-      position:
     ib1:
       interface: InfiniBand
       driver: mlx4_core
@@ -8510,8 +7605,6 @@ griffon-91:
     bmc:
       ip: 172.17.65.91
       mac: 00:e0:81:4f:28:b8
-      switch_name: sgriffon3-ipmi
-      switch_port: 1/0/44
   bios:
     vendor: Phoenix Technologies LTD
     version: V1.05
@@ -8550,9 +7643,6 @@ griffon-91:
     serial_number: 812530096
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: griffon-pdu6.nancy.grid5000.fr
-    pdu_position: 14
 griffon-92:
   supported_job_types:
     virtual: ivt
@@ -8566,8 +7656,6 @@ griffon-92:
     bmc:
       ip: 172.17.65.92
       mac: 00:e0:81:4f:e3:5d
-      switch_name: sgriffon3-ipmi
-      switch_port: 1/0/45
     eth0:
       interface: Ethernet
       ip: 172.16.65.92
@@ -8579,8 +7667,6 @@ griffon-92:
       mountable: true
       mounted: true
       management: false
-      switch_name: sgriffon3
-      switch_port: Gi1/0/44
     eth1:
       interface: Ethernet
       driver: e1000e
@@ -8601,9 +7687,6 @@ griffon-92:
       mountable: true
       mounted: true
       management: false
-      hwid: '0xC90300031A08'
-      line_card:
-      position:
     ib1:
       interface: InfiniBand
       driver: mlx4_core
@@ -8644,6 +7727,3 @@ griffon-92:
     serial_number: 812530097
     manufacturer: TYAN Computer Corporation
     product_name: S5393
-  pdu:
-    pdu_name: griffon-pdu6.nancy.grid5000.fr
-    pdu_position: 13
diff --git a/generators/input/sites/nancy/clusters/griffon_manual.yaml b/generators/input/sites/nancy/clusters/griffon_manual.yaml
new file mode 100644
index 00000000000..d73725b462c
--- /dev/null
+++ b/generators/input/sites/nancy/clusters/griffon_manual.yaml
@@ -0,0 +1,1339 @@
+---
+griffon-1:
+  network_interfaces:
+    eth0:
+      switch_name: sgriffon1
+      switch_port: Gi1/0/1
+    ib0:
+      hwid: '0xC903000318F0'
+      line_card: '0x000b8cffff003106'
+      position: 1
+    bmc:
+      switch_name: sgriffon1-ipmi
+      switch_port: 1/0/1
+  pdu:
+    pdu_name: griffon-pdu2.nancy.grid5000.fr
+    pdu_position: 4
+griffon-2:
+  network_interfaces:
+    eth0:
+      switch_name: sgriffon1
+      switch_port: Gi1/0/2
+    ib0:
+      hwid: '0xC90300028064'
+      line_card: '0x000b8cffff003106'
+      position: 2
+    bmc:
+      switch_name: sgriffon1-ipmi
+      switch_port: 1/0/2
+  pdu:
+    pdu_name: griffon-pdu2.nancy.grid5000.fr
+    pdu_position: 3
+griffon-3:
+  network_interfaces:
+    eth0:
+      switch_name: sgriffon1
+      switch_port: Gi1/0/3
+    ib0:
+      hwid: '0xC90300027F60'
+      line_card: '0x000b8cffff003106'
+      position: 3
+    bmc:
+      switch_name: sgriffon1-ipmi
+      switch_port: 1/0/3
+  pdu:
+    pdu_name: griffon-pdu2.nancy.grid5000.fr
+    pdu_position: 2
+griffon-4:
+  network_interfaces:
+    eth0:
+      switch_name: sgriffon1
+      switch_port: Gi1/0/4
+    ib0:
+      hwid: '0xC90300028068'
+      line_card: '0x000b8cffff003106'
+      position: 4
+    bmc:
+      switch_name: sgriffon1-ipmi
+      switch_port: 1/0/4
+  pdu:
+    pdu_name: griffon-pdu2.nancy.grid5000.fr
+    pdu_position: 1
+griffon-5:
+  network_interfaces:
+    eth0:
+      switch_name: sgriffon1
+      switch_port: Gi1/0/5
+    ib0:
+      hwid: '0xC903000280C0'
+      line_card: '0x000b8cffff003106'
+      position: 5
+    bmc:
+      switch_name: sgriffon1-ipmi
+      switch_port: 1/0/5
+  pdu:
+    pdu_name: griffon-pdu1.nancy.grid5000.fr
+    pdu_position: 3
+griffon-6:
+  network_interfaces:
+    eth0:
+      switch_name: sgriffon1
+      switch_port: Gi1/O/6
+    ib0:
+      hwid: '0xC903000280AC'
+      line_card: '0x000b8cffff003106'
+      position: 6
+    bmc:
+      switch_name: sgriffon1-ipmi
+      switch_port: 1/0/6
+  pdu:
+    pdu_name: griffon-pdu1.nancy.grid5000.fr
+    pdu_position: 4
+griffon-7:
+  network_interfaces:
+    eth0:
+      switch_name: sgriffon1
+      switch_port: Gi1/0/7
+    ib0:
+      hwid: '0xC90300028054'
+      line_card: '0x000b8cffff003106'
+      position: 7
+    bmc:
+      switch_name: sgriffon1-ipmi
+      switch_port: 1/0/7
+  pdu:
+    pdu_name: griffon-pdu1.nancy.grid5000.fr
+    pdu_position: 5
+griffon-8:
+  network_interfaces:
+    eth0:
+      switch_name: sgriffon1
+      switch_port: Gi1/0/8
+    ib0:
+      hwid: '0xC903000280C8'
+      line_card: '0x000b8cffff003106'
+      position: 8
+    bmc:
+      switch_name: sgriffon1-ipmi
+      switch_port: 1/0/8
+  pdu:
+    pdu_name: griffon-pdu1.nancy.grid5000.fr
+    pdu_position: 6
+griffon-9:
+  network_interfaces:
+    eth0:
+      switch_name: sgriffon1
+      switch_port: Gi1/0/10
+    ib0:
+      hwid: '0xC9030002805C'
+      line_card: '0x000b8cffff003106'
+      position: 9
+    bmc:
+      switch_name: sgriffon1-ipmi
+      switch_port: 1/0/9
+  pdu:
+    pdu_name: griffon-pdu1.nancy.grid5000.fr
+    pdu_position: 10
+griffon-10:
+  network_interfaces:
+    eth0:
+      switch_name: sgriffon1
+      switch_port: Gi1/O/9
+    ib0:
+      hwid: '0xC90300027F58'
+      line_card: '0x000b8cffff003106'
+      position: 10
+    bmc:
+      switch_name: sgriffon1-ipmi
+      switch_port: 1/0/10
+  pdu:
+    pdu_name: griffon-pdu1.nancy.grid5000.fr
+    pdu_position: 11
+griffon-11:
+  network_interfaces:
+    eth0:
+      switch_name: sgriffon1
+      switch_port: Gi1/0/25
+    ib0:
+      hwid: '0xC90300028008'
+      line_card: '0x000b8cffff003106'
+      position: 11
+    bmc:
+      switch_name: sgriffon1-ipmi
+      switch_port: 1/0/25
+  pdu:
+    pdu_name: griffon-pdu1.nancy.grid5000.fr
+    pdu_position: 12
+griffon-12:
+  network_interfaces:
+    eth0:
+      switch_name: sgriffon1
+      switch_port: Gi1/0/26
+    ib0:
+      hwid: '0xC903000280DC'
+      line_card: '0x000b8cffff003106'
+      position: 12
+    bmc:
+      switch_name: sgriffon1-ipmi
+      switch_port: 1/0/26
+  pdu:
+    pdu_name: griffon-pdu1.nancy.grid5000.fr
+    pdu_position: 13
+griffon-13:
+  network_interfaces:
+    eth0:
+      switch_name: sgriffon1
+      switch_port: Gi1/0/27
+    ib0:
+      hwid: '0xC903000280BC'
+      line_card: '0x000b8cffff003054'
+      position: 1
+    bmc:
+      switch_name: sgriffon1-ipmi
+      switch_port: 1/0/27
+  pdu:
+    pdu_name: griffon-pdu1.nancy.grid5000.fr
+    pdu_position: 14
+griffon-14:
+  network_interfaces:
+    eth0:
+      switch_name: sgriffon1
+      switch_port: Gi1/0/28
+    ib0:
+      hwid: '0xC903000280CC'
+      line_card: '0x000b8cffff003054'
+      position: 2
+    bmc:
+      switch_name: sgriffon1-ipmi
+      switch_port: 1/0/28
+  pdu:
+    pdu_name: griffon-pdu1.nancy.grid5000.fr
+    pdu_position: 15
+griffon-15:
+  network_interfaces:
+    eth0:
+      switch_name: sgriffon1
+      switch_port: Gi1/0/29
+    ib0:
+      hwid: '0xC903000280B4'
+      line_card: '0x000b8cffff003054'
+      position: 3
+    bmc:
+      switch_name: sgriffon1-ipmi
+      switch_port: 1/0/29
+  pdu:
+    pdu_name: griffon-pdu1.nancy.grid5000.fr
+    pdu_position: 17
+griffon-16:
+  network_interfaces:
+    eth0:
+      switch_name: sgriffon1
+      switch_port: Gi1/0/30
+    ib0:
+      hwid: '0xC9030003303E'
+      line_card: '0x000b8cffff003054'
+      position: 4
+    bmc:
+      switch_name: sgriffon1-ipmi
+      switch_port: 1/0/30
+  pdu:
+    pdu_name: griffon-pdu1.nancy.grid5000.fr
+    pdu_position: 18
+griffon-17:
+  network_interfaces:
+    eth0:
+      switch_name: sgriffon1
+      switch_port: Gi1/0/31
+    ib0:
+      hwid: '0xC90300033016'
+      line_card: '0x000b8cffff003054'
+      position: 5
+    bmc:
+      switch_name: sgriffon1-ipmi
+      switch_port: 1/0/31
+  pdu:
+    pdu_name: griffon-pdu1.nancy.grid5000.fr
+    pdu_position: 19
+griffon-18:
+  network_interfaces:
+    eth0:
+      switch_name: sgriffon1
+      switch_port: Gi1/0/32
+    ib0:
+      hwid: '0xC9030003302A'
+      line_card: '0x000b8cffff003054'
+      position: 6
+    bmc:
+      switch_name: sgriffon1-ipmi
+      switch_port: 1/0/32
+  pdu:
+    pdu_name: griffon-pdu1.nancy.grid5000.fr
+    pdu_position: 20
+griffon-19:
+  network_interfaces:
+    eth0:
+      switch_name: sgriffon1
+      switch_port: Gi1/0/33
+    ib0:
+      hwid: '0xC90300033036'
+      line_card: '0x000b8cffff003054'
+      position: 7
+    bmc:
+      switch_name: sgriffon1-ipmi
+      switch_port: 1/0/33
+  pdu:
+    pdu_name: griffon-pdu1.nancy.grid5000.fr
+    pdu_position: 21
+griffon-20:
+  network_interfaces:
+    eth0:
+      switch_name: sgriffon1
+      switch_port: Gi1/0/34
+    ib0:
+      hwid: '0xC90300032FCA'
+      line_card: '0x000b8cffff003101'
+      position: 2
+    bmc:
+      switch_name: sgriffon1-ipmi
+      switch_port: 1/0/34
+  pdu:
+    pdu_name: griffon-pdu1.nancy.grid5000.fr
+    pdu_position: 22
+griffon-21:
+  network_interfaces:
+    eth0:
+      switch_name: sgriffon1
+      switch_port: Gi1/0/35
+    ib0:
+      hwid: '0xC9030003304E'
+      line_card: '0x000b8cffff003101'
+      position: 1
+    bmc:
+      switch_name: sgriffon1-ipmi
+      switch_port: 1/0/35
+  pdu:
+    pdu_name: griffon-pdu1.nancy.grid5000.fr
+    pdu_position: 23
+griffon-22:
+  network_interfaces:
+    eth0:
+      switch_name: sgriffon1
+      switch_port: Gi1/0/36
+    ib0:
+      hwid: '0xC90300033032'
+      line_card: '0x000b8cffff003101'
+      position: 3
+    bmc:
+      switch_name: sgriffon1-ipmi
+      switch_port: 1/0/36
+  pdu:
+    pdu_name: griffon-pdu2.nancy.grid5000.fr
+    pdu_position: 21
+griffon-23:
+  network_interfaces:
+    eth0:
+      switch_name: sgriffon1
+      switch_port: Gi1/0/37
+    ib0:
+      hwid: '0xC9030003302F'
+      line_card: '0x000b8cffff003101'
+      position: 4
+    bmc:
+      switch_name: sgriffon1-ipmi
+      switch_port: 1/O/37
+  pdu:
+    pdu_name: griffon-pdu2.nancy.grid5000.fr
+    pdu_position: 20
+griffon-24:
+  network_interfaces:
+    eth0:
+      switch_name: sgriffon1
+      switch_port: Gi1/0/38
+    ib0:
+      hwid: '0xC90300032FD6'
+      line_card: '0x000b8cffff003101'
+      position: 5
+    bmc:
+      switch_name: sgriffon1-ipmi
+      switch_port: 1/0/38
+  pdu:
+    pdu_name: griffon-pdu2.nancy.grid5000.fr
+    pdu_position: 19
+griffon-25:
+  network_interfaces:
+    eth0:
+      switch_name: sgriffon1
+      switch_port: Gi1/0/39
+    ib0:
+      hwid: '0xC90300033022'
+      line_card: '0x000b8cffff003101'
+      position: 6
+    bmc:
+      switch_name: sgriffon1-ipmi
+      switch_port: 1/0/39
+  pdu:
+    pdu_name: griffon-pdu2.nancy.grid5000.fr
+    pdu_position: 18
+griffon-26:
+  network_interfaces:
+    eth0:
+      switch_name: sgriffon1
+      switch_port: Gi1/0/40
+    ib0:
+      hwid: '0xC90300032FD2'
+      line_card: '0x000b8cffff003101'
+      position: 7
+    bmc:
+      switch_name: sgriffon1-ipmi
+      switch_port: 1/0/40
+  pdu:
+    pdu_name: griffon-pdu2.nancy.grid5000.fr
+    pdu_position: 17
+griffon-27:
+  network_interfaces:
+    eth0:
+      switch_name: sgriffon1
+      switch_port: Gi1/0/41
+    ib0:
+      hwid: '0xC9030003301E'
+      line_card: '0x000b8cffff003101'
+      position: 8
+    bmc:
+      switch_name: sgriffon1-ipmi
+      switch_port: 1/0/41
+  pdu:
+    pdu_name: griffon-pdu2.nancy.grid5000.fr
+    pdu_position: 15
+griffon-28:
+  network_interfaces:
+    eth0:
+      switch_name: sgriffon1
+      switch_port: Gi1/0/42
+    ib0:
+      hwid: '0xC90300032FDA'
+      line_card: '0x000b8cffff003101'
+      position: 9
+    bmc:
+      switch_name: sgriffon1-ipmi
+      switch_port: 1/0/42
+  pdu:
+    pdu_name: griffon-pdu2.nancy.grid5000.fr
+    pdu_position: 14
+griffon-29:
+  network_interfaces:
+    eth0:
+      switch_name: sgriffon1
+      switch_port: Gi1/0/43
+    ib0:
+      hwid: '0xC90300033042'
+      line_card: '0x000b8cffff003101'
+      position: 10
+    bmc:
+      switch_name: sgriffon1-ipmi
+      switch_port: 1/0/43
+  pdu:
+    pdu_name: griffon-pdu2.nancy.grid5000.fr
+    pdu_position: 13
+griffon-30:
+  network_interfaces:
+    eth0:
+      switch_name: sgriffon2
+      switch_port: Gi1/0/1
+    ib0:
+      hwid: '0xC9030003303A'
+      line_card: '0x000b8cffff003055'
+      position: 1
+    bmc:
+      switch_name: sgriffon2-ipmi
+      switch_port: 1/0/1
+  pdu:
+    pdu_name: griffon-pdu4.nancy.grid5000.fr
+    pdu_position: 1
+griffon-31:
+  network_interfaces:
+    eth0:
+      switch_name: sgriffon2
+      switch_port: Gi1/0/2
+    ib0:
+      hwid: '0xC9030003305E'
+      line_card: '0x000b8cffff003055'
+      position: 2
+    bmc:
+      switch_name: sgriffon2-ipmi
+      switch_port: 1/0/2
+  pdu:
+    pdu_name: griffon-pdu4.nancy.grid5000.fr
+    pdu_position: 2
+griffon-32:
+  network_interfaces:
+    eth0:
+      switch_name: sgriffon2
+      switch_port: Gi1/0/3
+    ib0:
+      hwid: '0xC9030003305A'
+      line_card: '0x000b8cffff003055'
+      position: 3
+    bmc:
+      switch_name: sgriffon2-ipmi
+      switch_port: 1/0/3
+  pdu:
+    pdu_name: griffon-pdu4.nancy.grid5000.fr
+    pdu_position: 3
+griffon-33:
+  network_interfaces:
+    eth0:
+      switch_name: sgriffon2
+      switch_port: Gi1/0/4
+    ib0:
+      hwid: '0xC90300033056'
+      line_card: '0x000b8cffff003055'
+      position: 4
+    bmc:
+      switch_name: sgriffon2-ipmi
+      switch_port: 1/0/4
+  pdu:
+    pdu_name: griffon-pdu4.nancy.grid5000.fr
+    pdu_position: 4
+griffon-34:
+  network_interfaces:
+    eth0:
+      switch_name: sgriffon2
+      switch_port: Gi1/0/5
+    ib0:
+      hwid: '0xC90300033052'
+      line_card: '0x000b8cffff003055'
+      position: 5
+    bmc:
+      switch_name: sgriffon2-ipmi
+      switch_port: 1/0/5
+  pdu:
+    pdu_name: griffon-pdu4.nancy.grid5000.fr
+    pdu_position: 5
+griffon-35:
+  network_interfaces:
+    eth0:
+      switch_name: sgriffon2
+      switch_port: Gi1/0/6
+    ib0:
+      hwid: '0xC9030003304A'
+      line_card: '0x000b8cffff003055'
+      position: 6
+    bmc:
+      switch_name: sgriffon2-ipmi
+      switch_port: 1/0/6
+  pdu:
+    pdu_name: griffon-pdu4.nancy.grid5000.fr
+    pdu_position: 6
+griffon-36:
+  network_interfaces:
+    eth0:
+      switch_name: sgriffon2
+      switch_port: Gi1/0/7
+    ib0:
+      hwid: '0xC9030003301A'
+      line_card: '0x000b8cffff003055'
+      position: 1/0/7
+    bmc:
+      switch_name: sgriffon2-ipmi
+      switch_port: 7
+  pdu:
+    pdu_name: griffon-pdu4.nancy.grid5000.fr
+    pdu_position: 7
+griffon-37:
+  network_interfaces:
+    eth0:
+      switch_name: sgriffon2
+      switch_port: Gi1/0/8
+    ib0:
+      hwid: '0xC90300028058'
+      line_card: '0x000b8cffff003055'
+      position: 8
+    bmc:
+      switch_name: sgriffon2-ipmi
+      switch_port: 1/0/8
+  pdu:
+    pdu_name: griffon-pdu3.nancy.grid5000.fr
+    pdu_position: 8
+griffon-38:
+  network_interfaces:
+    eth0:
+      switch_name: sgriffon2
+      switch_port: Gi1/0/9
+    ib0:
+      hwid: '0xC903000318DC'
+      line_card: '0x000b8cffff003055'
+      position: 9
+    bmc:
+      switch_name: sgriffon2-ipmi
+      switch_port: 1/0/9
+  pdu:
+    pdu_name: griffon-pdu3.nancy.grid5000.fr
+    pdu_position: 2
+griffon-39:
+  network_interfaces:
+    eth0:
+      switch_name: sgriffon2
+      switch_port: Gi1/0/25
+    ib0:
+      hwid: '0xC903000318E8'
+      line_card: '0x000b8cffff003055'
+      position: 10
+    bmc:
+      switch_name: sgriffon2-ipmi
+      switch_port: 1/0/25
+  pdu:
+    pdu_name: griffon-pdu3.nancy.grid5000.fr
+    pdu_position: 3
+griffon-40:
+  network_interfaces:
+    eth0:
+      switch_name: sgriffon2
+      switch_port: Gi1/0/26
+    ib0:
+      hwid: '0xC90300031780'
+      line_card: '0x000b8cffff003055'
+      position: 11
+    bmc:
+      switch_name: sgriffon2-ipmi
+      switch_port: 1/0/26
+  pdu:
+    pdu_name: griffon-pdu3.nancy.grid5000.fr
+    pdu_position: 4
+griffon-41:
+  network_interfaces:
+    eth0:
+      switch_name: sgriffon2
+      switch_port: Gi1/0/27
+    ib0:
+      hwid: '0xC903000317D4'
+      line_card: '0x000b8cffff003055'
+      position: 12
+    bmc:
+      switch_name: sgriffon2-ipmi
+      switch_port: 1/0/27
+  pdu:
+    pdu_name: griffon-pdu3.nancy.grid5000.fr
+    pdu_position: 5
+griffon-42:
+  network_interfaces:
+    eth0:
+      switch_name: sgriffon2
+      switch_port: Gi1/0/28
+    ib0:
+      hwid: '0xC903000280D0'
+      line_card: '0x000b8cffff0030ff'
+      position: 1
+    bmc:
+      switch_name: sgriffon2-ipmi
+      switch_port: 1/0/28
+  pdu:
+    pdu_name: griffon-pdu3.nancy.grid5000.fr
+    pdu_position: 6
+griffon-43:
+  network_interfaces:
+    eth0:
+      switch_name: sgriffon2
+      switch_port: Gi1/0/29
+    ib0:
+      hwid: '0xC903000280B8'
+      line_card: '0x000b8cffff0030ff'
+      position: 2
+    bmc:
+      switch_name: sgriffon2-ipmi
+      switch_port: 1/0/29
+  pdu:
+    pdu_name: griffon-pdu3.nancy.grid5000.fr
+    pdu_position: 7
+griffon-44:
+  network_interfaces:
+    eth0:
+      switch_name: sgriffon2
+      switch_port: Gi1/0/30
+    ib0:
+      hwid: '0xC903000280D4'
+      line_card: '0x000b8cffff0030ff'
+      position: 3
+    bmc:
+      switch_name: sgriffon2-ipmi
+      switch_port: 1/0/30
+  pdu:
+    pdu_name: griffon-pdu3.nancy.grid5000.fr
+    pdu_position: 17
+griffon-45:
+  network_interfaces:
+    eth0:
+      switch_name: sgriffon2
+      switch_port: Gi1/0/31
+    ib0:
+      hwid: '0xC903000280B0'
+      line_card: '0x000b8cffff0030ff'
+      position: 4
+    bmc:
+      switch_name: sgriffon2-ipmi
+      switch_port: 1/0/31
+  pdu:
+    pdu_name: griffon-pdu3.nancy.grid5000.fr
+    pdu_position: 18
+griffon-46:
+  network_interfaces:
+    eth0:
+      switch_name: sgriffon2
+      switch_port: Gi1/0/32
+    ib0:
+      hwid: '0xC903000280A8'
+      line_card: '0x000b8cffff0030ff'
+      position: 5
+    bmc:
+      switch_name: sgriffon2-ipmi
+      switch_port: 1/0/32
+  pdu:
+    pdu_name: griffon-pdu3.nancy.grid5000.fr
+    pdu_position: 19
+griffon-47:
+  network_interfaces:
+    eth0:
+      switch_name: sgriffon2
+      switch_port: Gi1/0/33
+    ib0:
+      hwid: '0xC903000318E0'
+    bmc:
+      switch_name: sgriffon2-ipmi
+      switch_port: 1/0/33
+  pdu:
+    pdu_name: griffon-pdu3.nancy.grid5000.fr
+    pdu_position: 20
+griffon-48:
+  network_interfaces:
+    eth0:
+      switch_name: sgriffon2
+      switch_port: Gi1/0/34
+    ib0:
+      hwid: '0xC903000317A4'
+      line_card: '0x000b8cffff0030ff'
+      position: 7
+    bmc:
+      switch_name: sgriffon2-ipmi
+      switch_port: 1/0/34
+  pdu:
+    pdu_name: griffon-pdu3.nancy.grid5000.fr
+    pdu_position: 21
+griffon-49:
+  network_interfaces:
+    eth0:
+      switch_name: sgriffon2
+      switch_port: Gi1/0/35
+    ib0:
+      hwid: '0xC90300033026'
+      line_card: '0x000b8cffff0030ff'
+      position: 8
+    bmc:
+      switch_name: sgriffon2-ipmi
+      switch_port: 1/0/35
+  pdu:
+    pdu_name: griffon-pdu3.nancy.grid5000.fr
+    pdu_position: 22
+griffon-50:
+  network_interfaces:
+    eth0:
+      switch_name: sgriffon2
+      switch_port: Gi1/0/37
+    ib0:
+      hwid: '0xC903000318D0'
+      line_card: '0x000b8cffff0030ff'
+      position: 9
+    bmc:
+      switch_name: sgriffon2-ipmi
+      switch_port: 1/0/36
+  pdu:
+    pdu_name: griffon-pdu3.nancy.grid5000.fr
+    pdu_position: 23
+griffon-51:
+  network_interfaces:
+    eth0:
+      switch_name: sgriffon2
+      switch_port: Gi1/0/36
+    ib0:
+      hwid: '0xC903000318EC'
+      line_card: '0x000b8cffff0030ff'
+      position: 10
+    bmc:
+      switch_name: sgriffon2-ipmi
+      switch_port: 1/0/37
+  pdu:
+    pdu_name: griffon-pdu4.nancy.grid5000.fr
+    pdu_position: 21
+griffon-52:
+  network_interfaces:
+    eth0:
+      switch_name: sgriffon2
+      switch_port: Gi1/0/38
+    ib0:
+      hwid: '0xC90300027F84'
+    bmc:
+      switch_name: sgriffon2-ipmi
+      switch_port: 1/0/38
+  pdu:
+    pdu_name: griffon-pdu4.nancy.grid5000.fr
+    pdu_position: 20
+griffon-53:
+  network_interfaces:
+    eth0:
+      switch_name: sgriffon2
+      switch_port: Gi1/0/39
+    ib0:
+      hwid: '0xC903000280C4'
+    bmc:
+      switch_name: sgriffon2-ipmi
+      switch_port: 1/0/39
+  pdu:
+    pdu_name: griffon-pdu4.nancy.grid5000.fr
+    pdu_position: 19
+griffon-54:
+  network_interfaces:
+    eth0:
+      switch_name: sgriffon2
+      switch_port: Gi1/0/40
+    ib0:
+      hwid: '0xC903000318C4'
+    bmc:
+      switch_name: sgriffon2-ipmi
+      switch_port: 1/0/40
+  pdu:
+    pdu_name: griffon-pdu4.nancy.grid5000.fr
+    pdu_position: 18
+griffon-55:
+  network_interfaces:
+    eth0:
+      switch_name: sgriffon2
+      switch_port: Gi1/0/41
+    ib0:
+      hwid: '0xC90300031784'
+    bmc:
+      switch_name: sgriffon2-ipmi
+      switch_port: 1/0/41
+  pdu:
+    pdu_name: griffon-pdu4.nancy.grid5000.fr
+    pdu_position: 17
+griffon-56:
+  network_interfaces:
+    eth0:
+      switch_name: sgriffon2
+      switch_port: Gi1/0/42
+    ib0:
+      hwid: '0xC9030003176C'
+    bmc:
+      switch_name: sgriffon2-ipmi
+      switch_port: 1/0/42
+  pdu:
+    pdu_name: griffon-pdu4.nancy.grid5000.fr
+    pdu_position: 15
+griffon-57:
+  network_interfaces:
+    eth0:
+      switch_name: sgriffon2
+      switch_port: Gi1/0/43
+    ib0:
+      hwid: '0xC9030003173C'
+    bmc:
+      switch_name: sgriffon2-ipmi
+      switch_port: 1/0/43
+  pdu:
+    pdu_name: griffon-pdu4.nancy.grid5000.fr
+    pdu_position: 14
+griffon-58:
+  network_interfaces:
+    eth0:
+      switch_name: sgriffon1
+      switch_port: Gi1/0/11
+    ib0:
+      hwid: '0xC9030003179C'
+    bmc:
+      switch_name: sgriffon1-ipmi
+      switch_port: 1/0/12
+  pdu:
+    pdu_name: griffon-pdu1.nancy.grid5000.fr
+    pdu_position: 1
+griffon-59:
+  network_interfaces:
+    eth0:
+      switch_name: sgriffon1
+      switch_port: Gi1/0/12
+    ib0:
+      hwid: '0xC90300031730'
+      line_card: '0x000b8cffff00304d'
+      position: 5
+    bmc:
+      switch_name: sgriffon1-ipmi
+      switch_port: 1/0/11
+  pdu:
+    pdu_name: griffon-pdu1.nancy.grid5000.fr
+    pdu_position: 2
+griffon-60:
+  network_interfaces:
+    eth0:
+      switch_name: sgriffon1
+      switch_port: Gi1/0/13
+    ib0:
+      hwid: '0xC90300031740'
+      line_card: '0x000b8cffff00304d'
+      position: 6
+    bmc:
+      switch_name: sgriffon1-ipmi
+      switch_port: 1/0/13
+  pdu:
+    pdu_name: griffon-pdu2.nancy.grid5000.fr
+    pdu_position: 5
+griffon-61:
+  network_interfaces:
+    eth0:
+      switch_name: sgriffon3
+      switch_port: Gi1/0/4
+    ib0:
+      hwid: '0xC90300031804'
+      line_card: '0x000b8cffff00304d'
+      position: 7
+    bmc:
+      switch_name: sgriffon3-ipmi
+      switch_port: 1/0/4
+  pdu:
+    pdu_name: griffon-pdu6.nancy.grid5000.fr
+    pdu_position: 3
+griffon-62:
+  network_interfaces:
+    eth0:
+      switch_name: sgriffon3
+      switch_port: Gi1/0/5
+    ib0:
+      hwid: '0xC9030003185C'
+      line_card: '0x000b8cffff00304d'
+      position: 8
+    bmc:
+      switch_name: sgriffon3-ipmi
+      switch_port: 1/0/5
+  pdu:
+    pdu_name: griffon-pdu6.nancy.grid5000.fr
+    pdu_position: 2
+griffon-63:
+  network_interfaces:
+    eth0:
+      switch_name: sgriffon3
+      switch_port: Gi1/0/6
+    ib0:
+      hwid: '0xC903000317B4'
+      line_card: '0x000b8cffff00304d'
+      position: 9
+    bmc:
+      switch_name: sgriffon3-ipmi
+      switch_port: 1/0/6
+  pdu:
+    pdu_name: griffon-pdu6.nancy.grid5000.fr
+    pdu_position: 1
+griffon-64:
+  network_interfaces:
+    eth0:
+      switch_name: sgriffon3
+      switch_port: Gi1/0/7
+    ib0:
+      hwid: '0xC90300033012'
+      line_card: '0x000b8cffff00304d'
+      position: 10
+    bmc:
+      switch_name: sgriffon3-ipmi
+      switch_port: 1/0/7
+  pdu:
+    pdu_name: griffon-pdu6.nancy.grid5000.fr
+    pdu_position: 8
+griffon-65:
+  network_interfaces:
+    eth0:
+      switch_name: sgriffon3
+      switch_port: Gi1/0/8
+    ib0:
+      hwid: '0xC90300031750'
+      line_card: '0x000b8cffff00304d'
+      position: 11
+    bmc:
+      switch_name: sgriffon3-ipmi
+      switch_port: 1/0/8
+  pdu:
+    pdu_name: griffon-pdu5.nancy.grid5000.fr
+    pdu_position: 2
+griffon-66:
+  network_interfaces:
+    eth0:
+      switch_name: sgriffon3
+      switch_port: Gi1/0/9
+    ib0:
+      hwid: '0xC90300031968'
+      line_card: '0x000b8cffff00304d'
+      position: 12
+    bmc:
+      switch_name: sgriffon3-ipmi
+      switch_port: 1/0/9
+  pdu:
+    pdu_name: griffon-pdu5.nancy.grid5000.fr
+    pdu_position: 3
+griffon-67:
+  network_interfaces:
+    eth0:
+      switch_name: sgriffon3
+      switch_port: Gi1/0/10
+    ib0:
+      hwid: '0xC903000317DC'
+      line_card: '0x000b8cffff003107'
+      position: 1
+    bmc:
+      switch_name: sgriffon3-ipmi
+      switch_port: 1/0/10
+  pdu:
+    pdu_name: griffon-pdu5.nancy.grid5000.fr
+    pdu_position: 4
+griffon-68:
+  network_interfaces:
+    eth0:
+      switch_name: sgriffon3
+      switch_port: Gi1/0/11
+    ib0:
+      hwid: '0xC90300031858'
+      line_card: '0x000b8cffff003107'
+      position: 2
+    bmc:
+      switch_name: sgriffon3-ipmi
+      switch_port: 1/0/11
+  pdu:
+    pdu_name: griffon-pdu5.nancy.grid5000.fr
+    pdu_position: 5
+griffon-69:
+  network_interfaces:
+    eth0:
+      switch_name: sgriffon3
+      switch_port: Gi1/0/12
+    ib0:
+      hwid: '0xC903000317B0'
+      line_card: '0x000b8cffff003107'
+      position: 3
+    bmc:
+      switch_name: sgriffon3-ipmi
+      switch_port: 1/0/12
+  pdu:
+    pdu_name: griffon-pdu5.nancy.grid5000.fr
+    pdu_position: 6
+griffon-70:
+  network_interfaces:
+    eth0:
+      switch_name: sgriffon3
+      switch_port: Gi1/0/13
+    ib0:
+      hwid: '0xC90300031810'
+      line_card: '0x000b8cffff003107'
+      position: 4
+    bmc:
+      switch_name: sgriffon3-ipmi
+      switch_port: 1/0/13
+  pdu:
+    pdu_name: griffon-pdu5.nancy.grid5000.fr
+    pdu_position: 7
+griffon-71:
+  network_interfaces:
+    eth0:
+      switch_name: sgriffon3
+      switch_port: Gi1/0/14
+    ib0:
+      hwid: '0xC90300031824'
+      line_card: '0x000b8cffff003107'
+      position: 5
+    bmc:
+      switch_name: sgriffon3-ipmi
+      switch_port: 1/0/14
+  pdu:
+    pdu_name: griffon-pdu5.nancy.grid5000.fr
+    pdu_position: 8
+griffon-72:
+  network_interfaces:
+    eth0:
+      switch_name: sgriffon3
+      switch_port: Gi1/0/15
+    ib0:
+      hwid: '0xC90300032FCE'
+      line_card: '0x000b8cffff003107'
+      position: 6
+    bmc:
+      switch_name: sgriffon3-ipmi
+      switch_port: 1/0/15
+  pdu:
+    pdu_name: griffon-pdu5.nancy.grid5000.fr
+    pdu_position: 9
+griffon-73:
+  network_interfaces:
+    eth0:
+      switch_name: sgriffon3
+      switch_port: Gi1/0/25
+    ib0:
+      hwid: '0xC903000319FC'
+      line_card: '0x000b8cffff003107'
+      position: 7
+    bmc:
+      switch_name: sgriffon3-ipmi
+      switch_port: 1/0/25
+  pdu:
+    pdu_name: griffon-pdu5.nancy.grid5000.fr
+    pdu_position: 10
+griffon-74:
+  network_interfaces:
+    eth0:
+      switch_name: sgriffon3
+      switch_port: Gi1/0/26
+    ib0:
+      hwid: '0xC90300031890'
+      line_card: '0x000b8cffff003107'
+      position: 8
+    bmc:
+      switch_name: sgriffon3-ipmi
+      switch_port: 1/0/26
+  pdu:
+    pdu_name: griffon-pdu5.nancy.grid5000.fr
+    pdu_position: 11
+griffon-75:
+  network_interfaces:
+    eth0:
+      switch_name: sgriffon3
+      switch_port: Gi1/0/27
+    ib0:
+      hwid: '0xC90300031874'
+      line_card: '0x000b8cffff003107'
+      position: 9
+    bmc:
+      switch_name: sgriffon3-ipmi
+      switch_port: 1/0/27
+  pdu:
+    pdu_name: griffon-pdu5.nancy.grid5000.fr
+    pdu_position: 13
+griffon-76:
+  network_interfaces:
+    eth0:
+      switch_name: sgriffon3
+      switch_port: Gi1/0/28
+    ib0:
+      hwid: '0xC90300031974'
+      line_card: '0x000b8cffff003107'
+      position: 10
+    bmc:
+      switch_name: sgriffon3-ipmi
+      switch_port: 1/0/28
+  pdu:
+    pdu_name: griffon-pdu5.nancy.grid5000.fr
+    pdu_position: 14
+griffon-77:
+  network_interfaces:
+    eth0:
+      switch_name: sgriffon3
+      switch_port: Gi1/0/29
+    ib0:
+      hwid: '0xC903000318B8'
+      line_card: '0x000b8cffff003107'
+      position: 11
+    bmc:
+      switch_name: sgriffon3-ipmi
+      switch_port: 1/0/29
+  pdu:
+    pdu_name: griffon-pdu5.nancy.grid5000.fr
+    pdu_position: 15
+griffon-78:
+  network_interfaces:
+    eth0:
+      switch_name: sgriffon3
+      switch_port: Gi1/0/30
+    ib0:
+      hwid: '0xC903000317AC'
+      line_card: '0x000b8cffff003107'
+      position: 12
+    bmc:
+      switch_name: sgriffon3-ipmi
+      switch_port: 1/0/30
+  pdu:
+    pdu_name: griffon-pdu5.nancy.grid5000.fr
+    pdu_position: 17
+griffon-79:
+  network_interfaces:
+    eth0:
+      switch_name: sgriffon3
+      switch_port: Gi1/0/31
+    ib0:
+      hwid: '0xC90300031808'
+    bmc:
+      switch_name: sgriffon3-ipmi
+      switch_port: 1/0/31
+  pdu:
+    pdu_name: griffon-pdu5.nancy.grid5000.fr
+    pdu_position: 18
+griffon-80:
+  network_interfaces:
+    eth0:
+      switch_name: sgriffon3
+      switch_port: Gi1/0/32
+    ib0:
+      hwid: '0xC90300031800'
+    bmc:
+      switch_name: sgriffon3-ipmi
+      switch_port: 1/0/32
+  pdu:
+    pdu_name: griffon-pdu5.nancy.grid5000.fr
+    pdu_position: 19
+griffon-81:
+  network_interfaces:
+    eth0:
+      switch_name: sgriffon3
+      switch_port: Gi1/0/33
+    ib0:
+      hwid: '0xC90300031860'
+    bmc:
+      switch_name: sgriffon3-ipmi
+      switch_port: 1/0/33
+  pdu:
+    pdu_name: griffon-pdu5.nancy.grid5000.fr
+    pdu_position: 20
+griffon-82:
+  network_interfaces:
+    eth0:
+      switch_name: sgriffon3
+      switch_port: Gi1/0/34
+    ib0:
+      hwid: '0xC903000319F8'
+    bmc:
+      switch_name: sgriffon3-ipmi
+      switch_port: 1/0/34
+  pdu:
+    pdu_name: griffon-pdu5.nancy.grid5000.fr
+    pdu_position: 21
+griffon-83:
+  network_interfaces:
+    eth0:
+      switch_name: sgriffon3
+      switch_port: Gi1/0/35
+    ib0:
+      hwid: '0xC903000319F4'
+      line_card: '0x000b8cffff003101'
+      position: 12
+    bmc:
+      switch_name: sgriffon3-ipmi
+      switch_port: 1/0/35
+  pdu:
+    pdu_name: griffon-pdu5.nancy.grid5000.fr
+    pdu_position: 22
+griffon-84:
+  network_interfaces:
+    eth0:
+      switch_name: sgriffon3
+      switch_port: Gi1/0/36
+    ib0:
+      hwid: '0xC9030003180C'
+    bmc:
+      switch_name: sgriffon3-ipmi
+      switch_port: 1/0/36
+  pdu:
+    pdu_name: griffon-pdu5.nancy.grid5000.fr
+    pdu_position: 23
+griffon-85:
+  network_interfaces:
+    eth0:
+      switch_name: sgriffon3
+      switch_port: Gi1/0/37
+    ib0:
+      hwid: '0xC903000319F0'
+    bmc:
+      switch_name: sgriffon3-ipmi
+      switch_port: 1/0/37
+  pdu:
+    pdu_name: griffon-pdu6.nancy.grid5000.fr
+    pdu_position: 21
+griffon-86:
+  network_interfaces:
+    eth0:
+      switch_name: sgriffon3
+      switch_port: Gi1/0/38
+    ib0:
+      hwid: '0xC90300031A00'
+    bmc:
+      switch_name: sgriffon3-ipmi
+      switch_port: 1/0/39
+  pdu:
+    pdu_name: griffon-pdu6.nancy.grid5000.fr
+    pdu_position: 20
+griffon-87:
+  network_interfaces:
+    eth0:
+      switch_name: sgriffon3
+      switch_port: Gi1/0/39
+    ib0:
+      hwid: '0xC90300031A04'
+    bmc:
+      switch_name: sgriffon3-ipmi
+      switch_port: 1/0/40
+  pdu:
+    pdu_name: griffon-pdu6.nancy.grid5000.fr
+    pdu_position: 19
+griffon-88:
+  network_interfaces:
+    eth0:
+      switch_name: sgriffon3
+      switch_port: Gi1/0/40
+    ib0:
+      hwid: '0xC90300031A18'
+    bmc:
+      switch_name: sgriffon3-ipmi
+      switch_port: 1/0/41
+  pdu:
+    pdu_name: griffon-pdu6.nancy.grid5000.fr
+    pdu_position: 18
+griffon-89:
+  network_interfaces:
+    eth0:
+      switch_name: sgriffon3
+      switch_port: Gi1/0/41
+    ib0:
+      hwid: '0xC90300031A64'
+    bmc:
+      switch_name: sgriffon3-ipmi
+      switch_port: 1/0/42
+  pdu:
+    pdu_name: griffon-pdu6.nancy.grid5000.fr
+    pdu_position: 17
+griffon-90:
+  network_interfaces:
+    eth0:
+      switch_name: sgriffon3
+      switch_port: Gi1/0/42
+    ib0:
+      hwid: '0xC90300031A20'
+    bmc:
+      switch_name: sgriffon3-ipmi
+      switch_port: 1/0/43
+  pdu:
+    pdu_name: griffon-pdu6.nancy.grid5000.fr
+    pdu_position: 15
+griffon-91:
+  network_interfaces:
+    eth0:
+      switch_name: sgriffon3
+      switch_port: Gi1/0/43
+    ib0:
+      hwid: '0xC90300031A0C'
+    bmc:
+      switch_name: sgriffon3-ipmi
+      switch_port: 1/0/44
+  pdu:
+    pdu_name: griffon-pdu6.nancy.grid5000.fr
+    pdu_position: 14
+griffon-92:
+  network_interfaces:
+    eth0:
+      switch_name: sgriffon3
+      switch_port: Gi1/0/44
+    ib0:
+      hwid: '0xC90300031A08'
+    bmc:
+      switch_name: sgriffon3-ipmi
+      switch_port: 1/0/45
+  pdu:
+    pdu_name: griffon-pdu6.nancy.grid5000.fr
+    pdu_position: 13
diff --git a/generators/input/sites/reims/clusters/stremi.rb b/generators/input/sites/reims/clusters/stremi.rb
index 519342479ab..793ef96ac16 100644
--- a/generators/input/sites/reims/clusters/stremi.rb
+++ b/generators/input/sites/reims/clusters/stremi.rb
@@ -16,103 +16,103 @@ site :reims do |site_uid|
         supported_job_types({
           :deploy       => true,
           :besteffort   => true,
-          :virtual      => lookup('stremi', node_uid, 'supported_job_types', 'virtual')
+          :virtual      => lookup('stremi_generated', node_uid, 'supported_job_types', 'virtual')
         })
 
         architecture({
-          :smp_size       => lookup('stremi', node_uid, 'architecture', 'smp_size'),
-          :smt_size       => lookup('stremi', node_uid, 'architecture', 'smt_size'),
-          :platform_type  => lookup('stremi', node_uid, 'architecture', 'platform_type')
+          :smp_size       => lookup('stremi_generated', node_uid, 'architecture', 'smp_size'),
+          :smt_size       => lookup('stremi_generated', node_uid, 'architecture', 'smt_size'),
+          :platform_type  => lookup('stremi_generated', node_uid, 'architecture', 'platform_type')
         })
 
         processor({
-          :vendor             => lookup('stremi', node_uid, 'processor', 'vendor'),
-          :model              => lookup('stremi', node_uid, 'processor', 'model'),
-          :version            => lookup('stremi', node_uid, 'processor', 'version'),
-          :clock_speed        => lookup('stremi', node_uid, 'processor', 'clock_speed'),
-          :instruction_set    => lookup('stremi', node_uid, 'processor', 'instruction_set'),
-          :other_description  => lookup('stremi', node_uid, 'processor', 'other_description'),
-          :cache_l1           => lookup('stremi', node_uid, 'processor', 'cache_l1'),
-          :cache_l1i          => lookup('stremi', node_uid, 'processor', 'cache_l1i'),
-          :cache_l1d          => lookup('stremi', node_uid, 'processor', 'cache_l1d'),
-          :cache_l2           => lookup('stremi', node_uid, 'processor', 'cache_l2'),
-          :cache_l3           => lookup('stremi', node_uid, 'processor', 'cache_l3')
+          :vendor             => lookup('stremi_generated', node_uid, 'processor', 'vendor'),
+          :model              => lookup('stremi_generated', node_uid, 'processor', 'model'),
+          :version            => lookup('stremi_generated', node_uid, 'processor', 'version'),
+          :clock_speed        => lookup('stremi_generated', node_uid, 'processor', 'clock_speed'),
+          :instruction_set    => lookup('stremi_generated', node_uid, 'processor', 'instruction_set'),
+          :other_description  => lookup('stremi_generated', node_uid, 'processor', 'other_description'),
+          :cache_l1           => lookup('stremi_generated', node_uid, 'processor', 'cache_l1'),
+          :cache_l1i          => lookup('stremi_generated', node_uid, 'processor', 'cache_l1i'),
+          :cache_l1d          => lookup('stremi_generated', node_uid, 'processor', 'cache_l1d'),
+          :cache_l2           => lookup('stremi_generated', node_uid, 'processor', 'cache_l2'),
+          :cache_l3           => lookup('stremi_generated', node_uid, 'processor', 'cache_l3')
         })
 
         main_memory({
-          :ram_size     => lookup('stremi', node_uid, 'main_memory', 'ram_size'),
+          :ram_size     => lookup('stremi_generated', node_uid, 'main_memory', 'ram_size'),
           :virtual_size => nil
         })
 
         operating_system({
-          :name     => lookup('stremi', node_uid, 'operating_system', 'name'),
+          :name     => lookup('stremi_generated', node_uid, 'operating_system', 'name'),
           :release  => "Squeeze",
-          :version  => lookup('stremi', node_uid, 'operating_system', 'version'),
-          :kernel   => lookup('stremi', node_uid, 'operating_system', 'kernel')
+          :version  => lookup('stremi_generated', node_uid, 'operating_system', 'version'),
+          :kernel   => lookup('stremi_generated', node_uid, 'operating_system', 'kernel')
         })
 
         storage_devices [{
           :interface  => 'SATA',
-          :size       => lookup('stremi', node_uid, 'block_devices', 'sda', 'size'),
+          :size       => lookup('stremi_generated', node_uid, 'block_devices', 'sda', 'size'),
           :driver     => "ahci",
-          :device     => lookup('stremi', node_uid, 'block_devices', 'sda', 'device'),
-          :model      => lookup('stremi', node_uid, 'block_devices', 'sda', 'model'),
-          :vendor     => lookup('stremi', node_uid, 'block_devices', 'sda', 'vendor'),
-          :rev        => lookup('stremi', node_uid, 'block_devices', 'sda', 'rev')
+          :device     => lookup('stremi_generated', node_uid, 'block_devices', 'sda', 'device'),
+          :model      => lookup('stremi_generated', node_uid, 'block_devices', 'sda', 'model'),
+          :vendor     => lookup('stremi_generated', node_uid, 'block_devices', 'sda', 'vendor'),
+          :rev        => lookup('stremi_generated', node_uid, 'block_devices', 'sda', 'rev')
         }]
 
         network_adapters [{
-          :interface        => lookup('stremi', node_uid, 'network_interfaces', 'eth0', 'interface'),
-          :rate             => lookup('stremi', node_uid, 'network_interfaces', 'eth0', 'rate'),
-          :enabled          => lookup('stremi', node_uid, 'network_interfaces', 'eth0', 'enabled'),
-          :management       => lookup('stremi', node_uid, 'network_interfaces', 'eth0', 'management'),
-          :mountable        => lookup('stremi', node_uid, 'network_interfaces', 'eth0', 'mountable'),
-          :mounted          => lookup('stremi', node_uid, 'network_interfaces', 'eth0', 'mounted'),
+          :interface        => lookup('stremi_generated', node_uid, 'network_interfaces', 'eth0', 'interface'),
+          :rate             => lookup('stremi_generated', node_uid, 'network_interfaces', 'eth0', 'rate'),
+          :enabled          => lookup('stremi_generated', node_uid, 'network_interfaces', 'eth0', 'enabled'),
+          :management       => lookup('stremi_generated', node_uid, 'network_interfaces', 'eth0', 'management'),
+          :mountable        => lookup('stremi_generated', node_uid, 'network_interfaces', 'eth0', 'mountable'),
+          :mounted          => lookup('stremi_generated', node_uid, 'network_interfaces', 'eth0', 'mounted'),
           :bridged          => true,
           :device           => "eth0",
-          :driver           => lookup('stremi', node_uid, 'network_interfaces', 'eth0', 'driver'),
+          :driver           => lookup('stremi_generated', node_uid, 'network_interfaces', 'eth0', 'driver'),
           :network_address  => "#{node_uid}.#{site_uid}.grid5000.fr",
-          :ip               => lookup('stremi', node_uid, 'network_interfaces', 'eth0', 'ip'),
-          :ip6              => lookup('stremi', node_uid, 'network_interfaces', 'eth0', 'ip6'),
-          :switch           => lookup('stremi', node_uid, 'network_interfaces', 'eth0', 'switch_name'),
-          :switch_port      => lookup('stremi', node_uid, 'network_interfaces', 'eth0', 'switch_port'),
-          :mac              => lookup('stremi', node_uid, 'network_interfaces', 'eth0', 'mac')
+          :ip               => lookup('stremi_generated', node_uid, 'network_interfaces', 'eth0', 'ip'),
+          :ip6              => lookup('stremi_generated', node_uid, 'network_interfaces', 'eth0', 'ip6'),
+          :switch           => lookup('stremi_manual', node_uid, 'network_interfaces', 'eth0', 'switch_name'),
+          :switch_port      => lookup('stremi_manual', node_uid, 'network_interfaces', 'eth0', 'switch_port'),
+          :mac              => lookup('stremi_generated', node_uid, 'network_interfaces', 'eth0', 'mac')
         },
         {
-          :interface        => lookup('stremi', node_uid, 'network_interfaces', 'eth1', 'interface'),
+          :interface        => lookup('stremi_generated', node_uid, 'network_interfaces', 'eth1', 'interface'),
           :rate             => 1.G,
-          :enabled          => lookup('stremi', node_uid, 'network_interfaces', 'eth1', 'enabled'),
-          :management       => lookup('stremi', node_uid, 'network_interfaces', 'eth1', 'management'),
-          :mountable        => lookup('stremi', node_uid, 'network_interfaces', 'eth1', 'mountable'),
-          :mounted          => lookup('stremi', node_uid, 'network_interfaces', 'eth1', 'mounted'),
+          :enabled          => lookup('stremi_generated', node_uid, 'network_interfaces', 'eth1', 'enabled'),
+          :management       => lookup('stremi_generated', node_uid, 'network_interfaces', 'eth1', 'management'),
+          :mountable        => lookup('stremi_generated', node_uid, 'network_interfaces', 'eth1', 'mountable'),
+          :mounted          => lookup('stremi_generated', node_uid, 'network_interfaces', 'eth1', 'mounted'),
           :bridged          => false,
           :device           => "eth1",
-          :driver           => lookup('stremi', node_uid, 'network_interfaces', 'eth1', 'driver'),
-          :mac              => lookup('stremi', node_uid, 'network_interfaces', 'eth1', 'mac')
+          :driver           => lookup('stremi_generated', node_uid, 'network_interfaces', 'eth1', 'driver'),
+          :mac              => lookup('stremi_generated', node_uid, 'network_interfaces', 'eth1', 'mac')
         },
         {
-          :interface        => lookup('stremi', node_uid, 'network_interfaces', 'eth2', 'interface'),
-          :rate             => lookup('stremi', node_uid, 'network_interfaces', 'eth2', 'rate'),
-          :enabled          => lookup('stremi', node_uid, 'network_interfaces', 'eth2', 'enabled'),
-          :management       => lookup('stremi', node_uid, 'network_interfaces', 'eth2', 'management'),
-          :mountable        => lookup('stremi', node_uid, 'network_interfaces', 'eth2', 'mountable'),
-          :mounted          => lookup('stremi', node_uid, 'network_interfaces', 'eth2', 'mounted'),
+          :interface        => lookup('stremi_generated', node_uid, 'network_interfaces', 'eth2', 'interface'),
+          :rate             => lookup('stremi_generated', node_uid, 'network_interfaces', 'eth2', 'rate'),
+          :enabled          => lookup('stremi_generated', node_uid, 'network_interfaces', 'eth2', 'enabled'),
+          :management       => lookup('stremi_generated', node_uid, 'network_interfaces', 'eth2', 'management'),
+          :mountable        => lookup('stremi_generated', node_uid, 'network_interfaces', 'eth2', 'mountable'),
+          :mounted          => lookup('stremi_generated', node_uid, 'network_interfaces', 'eth2', 'mounted'),
           :bridged          => false,
           :device           => "eth2",
-          :driver           => lookup('stremi', node_uid, 'network_interfaces', 'eth2', 'driver'),
-          :mac              => lookup('stremi', node_uid, 'network_interfaces', 'eth2', 'mac')
+          :driver           => lookup('stremi_generated', node_uid, 'network_interfaces', 'eth2', 'driver'),
+          :mac              => lookup('stremi_generated', node_uid, 'network_interfaces', 'eth2', 'mac')
         },
         {
-          :interface        => lookup('stremi', node_uid, 'network_interfaces', 'eth3', 'interface'),
-          :rate             => lookup('stremi', node_uid, 'network_interfaces', 'eth3', 'rate'),
-          :enabled          => lookup('stremi', node_uid, 'network_interfaces', 'eth3', 'enabled'),
-          :management       => lookup('stremi', node_uid, 'network_interfaces', 'eth3', 'management'),
-          :mountable        => lookup('stremi', node_uid, 'network_interfaces', 'eth3', 'mountable'),
-          :mounted          => lookup('stremi', node_uid, 'network_interfaces', 'eth3', 'mounted'),
+          :interface        => lookup('stremi_generated', node_uid, 'network_interfaces', 'eth3', 'interface'),
+          :rate             => lookup('stremi_generated', node_uid, 'network_interfaces', 'eth3', 'rate'),
+          :enabled          => lookup('stremi_generated', node_uid, 'network_interfaces', 'eth3', 'enabled'),
+          :management       => lookup('stremi_generated', node_uid, 'network_interfaces', 'eth3', 'management'),
+          :mountable        => lookup('stremi_generated', node_uid, 'network_interfaces', 'eth3', 'mountable'),
+          :mounted          => lookup('stremi_generated', node_uid, 'network_interfaces', 'eth3', 'mounted'),
           :bridged          => false,
           :device           => "eth3",
-          :driver           => lookup('stremi', node_uid, 'network_interfaces', 'eth3', 'driver'),
-          :mac              => lookup('stremi', node_uid, 'network_interfaces', 'eth3', 'mac')
+          :driver           => lookup('stremi_generated', node_uid, 'network_interfaces', 'eth3', 'driver'),
+          :mac              => lookup('stremi_generated', node_uid, 'network_interfaces', 'eth3', 'mac')
         },
         {
           :interface        => 'Ethernet',
@@ -123,20 +123,20 @@ site :reims do |site_uid|
           :mounted          => false,
           :device           => "bmc",
           :network_address  => "#{node_uid}-bmc.#{site_uid}.grid5000.fr",
-          :ip               => lookup('stremi', node_uid, 'network_interfaces', 'bmc', 'ip'),
-          :mac              => lookup('stremi', node_uid, 'network_interfaces', 'bmc', 'mac'),
+          :ip               => lookup('stremi_generated', node_uid, 'network_interfaces', 'bmc', 'ip'),
+          :mac              => lookup('stremi_generated', node_uid, 'network_interfaces', 'bmc', 'mac'),
         }]
 
         chassis({
-          :serial       => lookup('stremi', node_uid, 'chassis', 'serial_number'),
-          :name         => lookup('stremi', node_uid, 'chassis', 'product_name'),
-          :manufacturer => lookup('stremi', node_uid, 'chassis', 'manufacturer')
+          :serial       => lookup('stremi_generated', node_uid, 'chassis', 'serial_number'),
+          :name         => lookup('stremi_generated', node_uid, 'chassis', 'product_name'),
+          :manufacturer => lookup('stremi_generated', node_uid, 'chassis', 'manufacturer')
         })
 
         bios({
-          :version      => lookup('stremi', node_uid, 'bios', 'version'),
-          :vendor       => lookup('stremi', node_uid, 'bios', 'vendor'),
-          :release_date => lookup('stremi', node_uid, 'bios', 'release_date')
+          :version      => lookup('stremi_generated', node_uid, 'bios', 'version'),
+          :vendor       => lookup('stremi_generated', node_uid, 'bios', 'vendor'),
+          :release_date => lookup('stremi_generated', node_uid, 'bios', 'release_date')
         })
 
         gpu({
@@ -153,8 +153,8 @@ site :reims do |site_uid|
             :via => {
               :api => { :metric => 'pdu' },
               :pdu => {
-                :uid  => lookup('stremi', node_uid, 'pdu', 'pdu_name'),
-                :port => lookup('stremi', node_uid, 'pdu', 'pdu_position'),
+                :uid  => lookup('stremi_manual', node_uid, 'pdu', 'pdu_name'),
+                :port => lookup('stremi_manual', node_uid, 'pdu', 'pdu_position'),
               }
             }
           }
diff --git a/generators/input/sites/reims/clusters/stremi.yaml b/generators/input/sites/reims/clusters/stremi_generated.yaml
similarity index 92%
rename from generators/input/sites/reims/clusters/stremi.yaml
rename to generators/input/sites/reims/clusters/stremi_generated.yaml
index 2f74d905f08..76e9459e69f 100644
--- a/generators/input/sites/reims/clusters/stremi.yaml
+++ b/generators/input/sites/reims/clusters/stremi_generated.yaml
@@ -25,8 +25,6 @@ stremi-1:
       interface: Ethernet
       driver: igb
       mountable: true
-      switch_name: gw-reims
-      switch_port: Gi0/1
       ip: 172.16.160.1
     eth1:
       mounted: false
@@ -78,9 +76,6 @@ stremi-1:
     smp_size: 2
     platform_type: x86_64
     smt_size: 24
-  pdu:
-    pdu_name: stremi-pdu2.reims.grid5000.fr
-    pdu_position: 1
 stremi-2:
   bios:
     version: O37
@@ -107,8 +102,6 @@ stremi-2:
       interface: Ethernet
       driver: igb
       mountable: true
-      switch_name: gw-reims
-      switch_port: Gi0/2
       ip: 172.16.160.2
     eth1:
       mounted: false
@@ -160,9 +153,6 @@ stremi-2:
     smp_size: 2
     platform_type: x86_64
     smt_size: 24
-  pdu:
-    pdu_name: stremi-pdu2.reims.grid5000.fr
-    pdu_position: 2
 stremi-3:
   bios:
     version: O37
@@ -189,8 +179,6 @@ stremi-3:
       interface: Ethernet
       driver: igb
       mountable: true
-      switch_name: gw-reims
-      switch_port: Gi0/3
       ip: 172.16.160.3
     eth1:
       mounted: false
@@ -242,9 +230,6 @@ stremi-3:
     smp_size: 2
     platform_type: x86_64
     smt_size: 24
-  pdu:
-    pdu_name: stremi-pdu2.reims.grid5000.fr
-    pdu_position: 3
 stremi-4:
   bios:
     version: O37
@@ -265,8 +250,6 @@ stremi-4:
       interface: Ethernet
       driver: igb
       mountable: true
-      switch_name: gw-reims
-      switch_port: Gi0/4
       ip: 172.16.160.4
     eth1:
       mounted: false
@@ -324,9 +307,6 @@ stremi-4:
     smp_size: 2
     platform_type: x86_64
     smt_size: 24
-  pdu:
-    pdu_name: stremi-pdu2.reims.grid5000.fr
-    pdu_position: 4
 stremi-5:
   bios:
     version: O37
@@ -353,8 +333,6 @@ stremi-5:
       interface: Ethernet
       driver: igb
       mountable: true
-      switch_name: gw-reims
-      switch_port: Gi0/5
       ip: 172.16.160.5
     eth1:
       mounted: false
@@ -406,9 +384,6 @@ stremi-5:
     smp_size: 2
     platform_type: x86_64
     smt_size: 24
-  pdu:
-    pdu_name: stremi-pdu2.reims.grid5000.fr
-    pdu_position: 5
 stremi-6:
   bios:
     version: O37
@@ -431,8 +406,6 @@ stremi-6:
       interface: Ethernet
       driver: igb
       mountable: true
-      switch_name: gw-reims
-      switch_port: Gi0/6
       ip: 172.16.160.6
     eth1:
       mounted: false
@@ -488,9 +461,6 @@ stremi-6:
     smp_size: 2
     platform_type: x86_64
     smt_size: 24
-  pdu:
-    pdu_name: stremi-pdu2.reims.grid5000.fr
-    pdu_position: 6
 stremi-7:
   bios:
     version: O37
@@ -513,8 +483,6 @@ stremi-7:
       interface: Ethernet
       driver: igb
       mountable: true
-      switch_name: gw-reims
-      switch_port: Gi0/7
       ip: 172.16.160.7
     eth1:
       mounted: false
@@ -570,9 +538,6 @@ stremi-7:
     smp_size: 2
     platform_type: x86_64
     smt_size: 24
-  pdu:
-    pdu_name: stremi-pdu2.reims.grid5000.fr
-    pdu_position: 7
 stremi-8:
   bios:
     version: O37
@@ -595,8 +560,6 @@ stremi-8:
       interface: Ethernet
       driver: igb
       mountable: true
-      switch_name: gw-reims
-      switch_port: Gi0/8
       ip: 172.16.160.8
     eth1:
       mounted: false
@@ -652,9 +615,6 @@ stremi-8:
     smp_size: 2
     platform_type: x86_64
     smt_size: 24
-  pdu:
-    pdu_name: stremi-pdu2.reims.grid5000.fr
-    pdu_position: 8
 stremi-9:
   bios:
     version: O37
@@ -671,8 +631,6 @@ stremi-9:
       interface: Ethernet
       driver: igb
       mountable: true
-      switch_name: gw-reims
-      switch_port: Gi0/9
       ip: 172.16.160.9
     eth1:
       mounted: false
@@ -734,9 +692,6 @@ stremi-9:
     smp_size: 2
     platform_type: x86_64
     smt_size: 24
-  pdu:
-    pdu_name: stremi-pdu2.reims.grid5000.fr
-    pdu_position: 9
 stremi-10:
   bios:
     version: O37
@@ -759,8 +714,6 @@ stremi-10:
       interface: Ethernet
       driver: igb
       mountable: true
-      switch_name: gw-reims
-      switch_port: Gi0/10
       ip: 172.16.160.10
     eth1:
       mounted: false
@@ -816,9 +769,6 @@ stremi-10:
     smp_size: 2
     platform_type: x86_64
     smt_size: 24
-  pdu:
-    pdu_name: stremi-pdu2.reims.grid5000.fr
-    pdu_position: 10
 stremi-11:
   bios:
     version: O37
@@ -845,8 +795,6 @@ stremi-11:
       interface: Ethernet
       driver: igb
       mountable: true
-      switch_name: gw-reims
-      switch_port: Gi0/11
       ip: 172.16.160.11
     eth1:
       mounted: false
@@ -898,9 +846,6 @@ stremi-11:
     smp_size: 2
     platform_type: x86_64
     smt_size: 24
-  pdu:
-    pdu_name: stremi-pdu2.reims.grid5000.fr
-    pdu_position: 11
 stremi-12:
   bios:
     version: O37
@@ -917,8 +862,6 @@ stremi-12:
       interface: Ethernet
       driver: igb
       mountable: true
-      switch_name: gw-reims
-      switch_port: Gi0/12
       ip: 172.16.160.12
     eth1:
       mounted: false
@@ -980,9 +923,6 @@ stremi-12:
     smp_size: 2
     platform_type: x86_64
     smt_size: 24
-  pdu:
-    pdu_name: stremi-pdu2.reims.grid5000.fr
-    pdu_position: 11
 stremi-13:
   bios:
     version: O37
@@ -1009,8 +949,6 @@ stremi-13:
       interface: Ethernet
       driver: igb
       mountable: true
-      switch_name: gw-reims
-      switch_port: Gi0/13
       ip: 172.16.160.13
     eth1:
       mounted: false
@@ -1062,9 +1000,6 @@ stremi-13:
     smp_size: 2
     platform_type: x86_64
     smt_size: 24
-  pdu:
-    pdu_name: stremi-pdu2.reims.grid5000.fr
-    pdu_position: 13
 stremi-14:
   bios:
     version: O37
@@ -1085,8 +1020,6 @@ stremi-14:
       interface: Ethernet
       driver: igb
       mountable: true
-      switch_name: gw-reims
-      switch_port: Gi0/14
       ip: 172.16.160.14
     eth1:
       mounted: false
@@ -1144,9 +1077,6 @@ stremi-14:
     smp_size: 2
     platform_type: x86_64
     smt_size: 24
-  pdu:
-    pdu_name: stremi-pdu2.reims.grid5000.fr
-    pdu_position: 14
 stremi-15:
   bios:
     version: O37
@@ -1169,8 +1099,6 @@ stremi-15:
       interface: Ethernet
       driver: igb
       mountable: true
-      switch_name: gw-reims
-      switch_port: Gi0/15
       ip: 172.16.160.15
     eth1:
       mounted: false
@@ -1226,9 +1154,6 @@ stremi-15:
     smp_size: 2
     platform_type: x86_64
     smt_size: 24
-  pdu:
-    pdu_name: stremi-pdu2.reims.grid5000.fr
-    pdu_position: 15
 stremi-16:
   bios:
     version: O37
@@ -1245,8 +1170,6 @@ stremi-16:
       interface: Ethernet
       driver: igb
       mountable: true
-      switch_name: gw-reims
-      switch_port: Gi0/16
       ip: 172.16.160.16
     eth1:
       mounted: false
@@ -1308,9 +1231,6 @@ stremi-16:
     smp_size: 2
     platform_type: x86_64
     smt_size: 24
-  pdu:
-    pdu_name: stremi-pdu2.reims.grid5000.fr
-    pdu_position: 16
 stremi-17:
   bios:
     version: O37
@@ -1337,8 +1257,6 @@ stremi-17:
       interface: Ethernet
       driver: igb
       mountable: true
-      switch_name: gw-reims
-      switch_port: Gi0/17
       ip: 172.16.160.17
     eth1:
       mounted: false
@@ -1390,9 +1308,6 @@ stremi-17:
     smp_size: 2
     platform_type: x86_64
     smt_size: 24
-  pdu:
-    pdu_name: stremi-pdu2.reims.grid5000.fr
-    pdu_position: 17
 stremi-18:
   bios:
     version: O37
@@ -1409,8 +1324,6 @@ stremi-18:
       interface: Ethernet
       driver: igb
       mountable: true
-      switch_name: gw-reims
-      switch_port: Gi0/18
       ip: 172.16.160.18
     eth1:
       mounted: false
@@ -1472,9 +1385,6 @@ stremi-18:
     smp_size: 2
     platform_type: x86_64
     smt_size: 24
-  pdu:
-    pdu_name: stremi-pdu1.reims.grid5000.fr
-    pdu_position: 1
 stremi-19:
   bios:
     version: O37
@@ -1495,8 +1405,6 @@ stremi-19:
       interface: Ethernet
       driver: igb
       mountable: true
-      switch_name: gw-reims
-      switch_port: Gi0/19
       ip: 172.16.160.19
     eth1:
       mounted: false
@@ -1554,9 +1462,6 @@ stremi-19:
     smp_size: 2
     platform_type: x86_64
     smt_size: 24
-  pdu:
-    pdu_name: stremi-pdu1.reims.grid5000.fr
-    pdu_position: 2
 stremi-20:
   bios:
     version: O37
@@ -1573,8 +1478,6 @@ stremi-20:
       interface: Ethernet
       driver: igb
       mountable: true
-      switch_name: gw-reims
-      switch_port: Gi0/20
       ip: 172.16.160.20
     eth1:
       mounted: false
@@ -1636,9 +1539,6 @@ stremi-20:
     smp_size: 2
     platform_type: x86_64
     smt_size: 24
-  pdu:
-    pdu_name: stremi-pdu1.reims.grid5000.fr
-    pdu_position: 3
 stremi-21:
   bios:
     version: O37
@@ -1665,8 +1565,6 @@ stremi-21:
       interface: Ethernet
       driver: igb
       mountable: true
-      switch_name: gw-reims
-      switch_port: Gi0/21
       ip: 172.16.160.21
     eth1:
       mounted: false
@@ -1718,9 +1616,6 @@ stremi-21:
     smp_size: 2
     platform_type: x86_64
     smt_size: 24
-  pdu:
-    pdu_name: stremi-pdu1.reims.grid5000.fr
-    pdu_position: 4
 stremi-22:
   bios:
     version: O37
@@ -1747,8 +1642,6 @@ stremi-22:
       interface: Ethernet
       driver: igb
       mountable: true
-      switch_name: gw-reims
-      switch_port: Gi0/22
       ip: 172.16.160.22
     eth1:
       mounted: false
@@ -1800,9 +1693,6 @@ stremi-22:
     smp_size: 2
     platform_type: x86_64
     smt_size: 24
-  pdu:
-    pdu_name: stremi-pdu1.reims.grid5000.fr
-    pdu_position: 5
 stremi-23:
   bios:
     version: O37
@@ -1823,8 +1713,6 @@ stremi-23:
       interface: Ethernet
       driver: igb
       mountable: true
-      switch_name: gw-reims
-      switch_port: Gi0/23
       ip: 172.16.160.23
     eth1:
       mounted: false
@@ -1882,9 +1770,6 @@ stremi-23:
     smp_size: 2
     platform_type: x86_64
     smt_size: 24
-  pdu:
-    pdu_name: stremi-pdu1.reims.grid5000.fr
-    pdu_position: 6
 stremi-24:
   bios:
     version: O37
@@ -1907,8 +1792,6 @@ stremi-24:
       interface: Ethernet
       driver: igb
       mountable: true
-      switch_name: gw-reims
-      switch_port: Gi0/24
       ip: 172.16.160.24
     eth1:
       mounted: false
@@ -1964,9 +1847,6 @@ stremi-24:
     smp_size: 2
     platform_type: x86_64
     smt_size: 24
-  pdu:
-    pdu_name: stremi-pdu1.reims.grid5000.fr
-    pdu_position: 7
 stremi-25:
   bios:
     version: O37
@@ -1989,8 +1869,6 @@ stremi-25:
       interface: Ethernet
       driver: igb
       mountable: true
-      switch_name: gw-reims
-      switch_port: Gi0/25
       ip: 172.16.160.25
     eth1:
       mounted: false
@@ -2046,9 +1924,6 @@ stremi-25:
     smp_size: 2
     platform_type: x86_64
     smt_size: 24
-  pdu:
-    pdu_name: stremi-pdu1.reims.grid5000.fr
-    pdu_position: 8
 stremi-26:
   bios:
     version: O37
@@ -2065,8 +1940,6 @@ stremi-26:
       interface: Ethernet
       driver: igb
       mountable: true
-      switch_name: gw-reims
-      switch_port: Gi0/26
       ip: 172.16.160.26
     eth1:
       mounted: false
@@ -2128,9 +2001,6 @@ stremi-26:
     smp_size: 2
     platform_type: x86_64
     smt_size: 24
-  pdu:
-    pdu_name: stremi-pdu1.reims.grid5000.fr
-    pdu_position: 9
 stremi-27:
   bios:
     version: O37
@@ -2157,8 +2027,6 @@ stremi-27:
       interface: Ethernet
       driver: igb
       mountable: true
-      switch_name: gw-reims
-      switch_port: Gi0/27
       ip: 172.16.160.27
     eth1:
       mounted: false
@@ -2185,7 +2053,7 @@ stremi-27:
       driver: igb
       mountable: false
     bmc:
-      mac:
+      mac: 
       ip: 172.17.160.27
   supported_job_types:
     virtual: amd-v
@@ -2210,9 +2078,6 @@ stremi-27:
     smp_size: 2
     platform_type: x86_64
     smt_size: 24
-  pdu:
-    pdu_name: stremi-pdu1.reims.grid5000.fr
-    pdu_position: 10
 stremi-28:
   bios:
     version: O37
@@ -2235,8 +2100,6 @@ stremi-28:
       interface: Ethernet
       driver: igb
       mountable: true
-      switch_name: gw-reims
-      switch_port: Gi0/28
       ip: 172.16.160.28
     eth1:
       mounted: false
@@ -2292,9 +2155,6 @@ stremi-28:
     smp_size: 2
     platform_type: x86_64
     smt_size: 24
-  pdu:
-    pdu_name: stremi-pdu1.reims.grid5000.fr
-    pdu_position: 11
 stremi-29:
   bios:
     version: O37
@@ -2311,8 +2171,6 @@ stremi-29:
       interface: Ethernet
       driver: igb
       mountable: true
-      switch_name: gw-reims
-      switch_port: Gi0/29
       ip: 172.16.160.29
     eth1:
       mounted: false
@@ -2374,9 +2232,6 @@ stremi-29:
     smp_size: 2
     platform_type: x86_64
     smt_size: 24
-  pdu:
-    pdu_name: stremi-pdu1.reims.grid5000.fr
-    pdu_position: 12
 stremi-30:
   bios:
     version: O37
@@ -2393,8 +2248,6 @@ stremi-30:
       interface: Ethernet
       driver: igb
       mountable: true
-      switch_name: gw-reims
-      switch_port: Gi0/30
       ip: 172.16.160.30
     eth1:
       mounted: false
@@ -2456,9 +2309,6 @@ stremi-30:
     smp_size: 2
     platform_type: x86_64
     smt_size: 24
-  pdu:
-    pdu_name: stremi-pdu1.reims.grid5000.fr
-    pdu_position: 13
 stremi-31:
   bios:
     version: O37
@@ -2479,8 +2329,6 @@ stremi-31:
       interface: Ethernet
       driver: igb
       mountable: true
-      switch_name: gw-reims
-      switch_port: Gi0/31
       ip: 172.16.160.31
     eth1:
       mounted: false
@@ -2538,9 +2386,6 @@ stremi-31:
     smp_size: 2
     platform_type: x86_64
     smt_size: 24
-  pdu:
-    pdu_name: stremi-pdu1.reims.grid5000.fr
-    pdu_position: 14
 stremi-32:
   bios:
     version: O37
@@ -2557,8 +2402,6 @@ stremi-32:
       interface: Ethernet
       driver: igb
       mountable: true
-      switch_name: gw-reims
-      switch_port: Gi0/32
       ip: 172.16.160.32
     eth1:
       mounted: false
@@ -2620,9 +2463,6 @@ stremi-32:
     smp_size: 2
     platform_type: x86_64
     smt_size: 24
-  pdu:
-    pdu_name: stremi-pdu1.reims.grid5000.fr
-    pdu_position: 15
 stremi-33:
   bios:
     version: O37
@@ -2649,8 +2489,6 @@ stremi-33:
       interface: Ethernet
       driver: igb
       mountable: true
-      switch_name: gw-reims
-      switch_port: Gi0/34
       ip: 172.16.160.33
     eth1:
       mounted: false
@@ -2702,9 +2540,6 @@ stremi-33:
     smp_size: 2
     platform_type: x86_64
     smt_size: 24
-  pdu:
-    pdu_name: stremi-pdu1.reims.grid5000.fr
-    pdu_position: 16
 stremi-34:
   bios:
     version: O37
@@ -2731,8 +2566,6 @@ stremi-34:
       interface: Ethernet
       driver: igb
       mountable: true
-      switch_name: gw-reims
-      switch_port: Gi0/33
       ip: 172.16.160.34
     eth1:
       mounted: false
@@ -2784,9 +2617,6 @@ stremi-34:
     smp_size: 2
     platform_type: x86_64
     smt_size: 24
-  pdu:
-    pdu_name: stremi-pdu1.reims.grid5000.fr
-    pdu_position: 17
 stremi-35:
   bios:
     version: O37
@@ -2803,8 +2633,6 @@ stremi-35:
       interface: Ethernet
       driver: igb
       mountable: true
-      switch_name: gw-reims
-      switch_port: Gi0/35
       ip: 172.16.160.35
     eth1:
       mounted: false
@@ -2866,9 +2694,6 @@ stremi-35:
     smp_size: 2
     platform_type: x86_64
     smt_size: 24
-  pdu:
-    pdu_name: stremi-pdu3.reims.grid5000.fr
-    pdu_position: 1
 stremi-36:
   bios:
     version: O37
@@ -2895,8 +2720,6 @@ stremi-36:
       interface: Ethernet
       driver: igb
       mountable: true
-      switch_name: gw-reims
-      switch_port: Gi0/36
       ip: 172.16.160.36
     eth1:
       mounted: false
@@ -2948,9 +2771,6 @@ stremi-36:
     smp_size: 2
     platform_type: x86_64
     smt_size: 24
-  pdu:
-    pdu_name: stremi-pdu3.reims.grid5000.fr
-    pdu_position: 2
 stremi-37:
   bios:
     version: O37
@@ -2967,8 +2787,6 @@ stremi-37:
       interface: Ethernet
       driver: igb
       mountable: true
-      switch_name: gw-reims
-      switch_port: Gi0/37
       ip: 172.16.160.37
     eth1:
       mounted: false
@@ -3030,9 +2848,6 @@ stremi-37:
     smp_size: 2
     platform_type: x86_64
     smt_size: 24
-  pdu:
-    pdu_name: stremi-pdu3.reims.grid5000.fr
-    pdu_position: 3
 stremi-38:
   bios:
     version: O37
@@ -3049,8 +2864,6 @@ stremi-38:
       interface: Ethernet
       driver: igb
       mountable: true
-      switch_name: gw-reims
-      switch_port: Gi0/38
       ip: 172.16.160.38
     eth1:
       mounted: false
@@ -3112,9 +2925,6 @@ stremi-38:
     smp_size: 2
     platform_type: x86_64
     smt_size: 24
-  pdu:
-    pdu_name: stremi-pdu3.reims.grid5000.fr
-    pdu_position: 4
 stremi-39:
   bios:
     version: O37
@@ -3131,8 +2941,6 @@ stremi-39:
       interface: Ethernet
       driver: igb
       mountable: true
-      switch_name: gw-reims
-      switch_port: Gi0/39
       ip: 172.16.160.39
     eth1:
       mounted: false
@@ -3194,9 +3002,6 @@ stremi-39:
     smp_size: 2
     platform_type: x86_64
     smt_size: 24
-  pdu:
-    pdu_name: stremi-pdu3.reims.grid5000.fr
-    pdu_position: 5
 stremi-40:
   bios:
     version: O37
@@ -3213,8 +3018,6 @@ stremi-40:
       interface: Ethernet
       driver: igb
       mountable: true
-      switch_name: gw-reims
-      switch_port: Gi0/40
       ip: 172.16.160.40
     eth1:
       mounted: false
@@ -3276,9 +3079,6 @@ stremi-40:
     smp_size: 2
     platform_type: x86_64
     smt_size: 24
-  pdu:
-    pdu_name: stremi-pdu3.reims.grid5000.fr
-    pdu_position: 6
 stremi-41:
   bios:
     version: O37
@@ -3295,8 +3095,6 @@ stremi-41:
       interface: Ethernet
       driver: igb
       mountable: true
-      switch_name: gw-reims
-      switch_port: Gi0/41
       ip: 172.16.160.41
     eth1:
       mounted: false
@@ -3358,9 +3156,6 @@ stremi-41:
     smp_size: 2
     platform_type: x86_64
     smt_size: 24
-  pdu:
-    pdu_name: stremi-pdu3.reims.grid5000.fr
-    pdu_position: 7
 stremi-42:
   bios:
     version: O37
@@ -3377,8 +3172,6 @@ stremi-42:
       interface: Ethernet
       driver: igb
       mountable: true
-      switch_name: gw-reims
-      switch_port: Gi0/42
       ip: 172.16.160.42
     eth1:
       mounted: false
@@ -3440,9 +3233,6 @@ stremi-42:
     smp_size: 2
     platform_type: x86_64
     smt_size: 24
-  pdu:
-    pdu_name: stremi-pdu3.reims.grid5000.fr
-    pdu_position: 8
 stremi-43:
   bios:
     version: O37
@@ -3459,8 +3249,6 @@ stremi-43:
       interface: Ethernet
       driver: igb
       mountable: true
-      switch_name: gw-reims
-      switch_port: Gi0/43
       ip: 172.16.160.43
     eth1:
       mounted: false
@@ -3522,9 +3310,6 @@ stremi-43:
     smp_size: 2
     platform_type: x86_64
     smt_size: 24
-  pdu:
-    pdu_name: stremi-pdu3.reims.grid5000.fr
-    pdu_position: 9
 stremi-44:
   bios:
     version: O37
@@ -3551,8 +3336,6 @@ stremi-44:
       interface: Ethernet
       driver: igb
       mountable: true
-      switch_name: gw-reims
-      switch_port: Gi0/44
       ip: 172.16.160.44
     eth1:
       mounted: false
@@ -3604,6 +3387,3 @@ stremi-44:
     smp_size: 2
     platform_type: x86_64
     smt_size: 24
-  pdu:
-    pdu_name: stremi-pdu3.reims.grid5000.fr
-    pdu_position: 10
diff --git a/generators/input/sites/reims/clusters/stremi_manual.yaml b/generators/input/sites/reims/clusters/stremi_manual.yaml
new file mode 100644
index 00000000000..ba7efac1866
--- /dev/null
+++ b/generators/input/sites/reims/clusters/stremi_manual.yaml
@@ -0,0 +1,353 @@
+---
+stremi-1:
+  network_interfaces:
+    eth0:
+      switch_name: gw-reims
+      switch_port: Gi0/1
+  pdu:
+    pdu_name: stremi-pdu2.reims.grid5000.fr
+    pdu_position: 1
+stremi-2:
+  network_interfaces:
+    eth0:
+      switch_name: gw-reims
+      switch_port: Gi0/2
+  pdu:
+    pdu_name: stremi-pdu2.reims.grid5000.fr
+    pdu_position: 2
+stremi-3:
+  network_interfaces:
+    eth0:
+      switch_name: gw-reims
+      switch_port: Gi0/3
+  pdu:
+    pdu_name: stremi-pdu2.reims.grid5000.fr
+    pdu_position: 3
+stremi-4:
+  network_interfaces:
+    eth0:
+      switch_name: gw-reims
+      switch_port: Gi0/4
+  pdu:
+    pdu_name: stremi-pdu2.reims.grid5000.fr
+    pdu_position: 4
+stremi-5:
+  network_interfaces:
+    eth0:
+      switch_name: gw-reims
+      switch_port: Gi0/5
+  pdu:
+    pdu_name: stremi-pdu2.reims.grid5000.fr
+    pdu_position: 5
+stremi-6:
+  network_interfaces:
+    eth0:
+      switch_name: gw-reims
+      switch_port: Gi0/6
+  pdu:
+    pdu_name: stremi-pdu2.reims.grid5000.fr
+    pdu_position: 6
+stremi-7:
+  network_interfaces:
+    eth0:
+      switch_name: gw-reims
+      switch_port: Gi0/7
+  pdu:
+    pdu_name: stremi-pdu2.reims.grid5000.fr
+    pdu_position: 7
+stremi-8:
+  network_interfaces:
+    eth0:
+      switch_name: gw-reims
+      switch_port: Gi0/8
+  pdu:
+    pdu_name: stremi-pdu2.reims.grid5000.fr
+    pdu_position: 8
+stremi-9:
+  network_interfaces:
+    eth0:
+      switch_name: gw-reims
+      switch_port: Gi0/9
+  pdu:
+    pdu_name: stremi-pdu2.reims.grid5000.fr
+    pdu_position: 9
+stremi-10:
+  network_interfaces:
+    eth0:
+      switch_name: gw-reims
+      switch_port: Gi0/10
+  pdu:
+    pdu_name: stremi-pdu2.reims.grid5000.fr
+    pdu_position: 10
+stremi-11:
+  network_interfaces:
+    eth0:
+      switch_name: gw-reims
+      switch_port: Gi0/11
+  pdu:
+    pdu_name: stremi-pdu2.reims.grid5000.fr
+    pdu_position: 11
+stremi-12:
+  network_interfaces:
+    eth0:
+      switch_name: gw-reims
+      switch_port: Gi0/12
+  pdu:
+    pdu_name: stremi-pdu2.reims.grid5000.fr
+    pdu_position: 11
+stremi-13:
+  network_interfaces:
+    eth0:
+      switch_name: gw-reims
+      switch_port: Gi0/13
+  pdu:
+    pdu_name: stremi-pdu2.reims.grid5000.fr
+    pdu_position: 13
+stremi-14:
+  network_interfaces:
+    eth0:
+      switch_name: gw-reims
+      switch_port: Gi0/14
+  pdu:
+    pdu_name: stremi-pdu2.reims.grid5000.fr
+    pdu_position: 14
+stremi-15:
+  network_interfaces:
+    eth0:
+      switch_name: gw-reims
+      switch_port: Gi0/15
+  pdu:
+    pdu_name: stremi-pdu2.reims.grid5000.fr
+    pdu_position: 15
+stremi-16:
+  network_interfaces:
+    eth0:
+      switch_name: gw-reims
+      switch_port: Gi0/16
+  pdu:
+    pdu_name: stremi-pdu2.reims.grid5000.fr
+    pdu_position: 16
+stremi-17:
+  network_interfaces:
+    eth0:
+      switch_name: gw-reims
+      switch_port: Gi0/17
+  pdu:
+    pdu_name: stremi-pdu2.reims.grid5000.fr
+    pdu_position: 17
+stremi-18:
+  network_interfaces:
+    eth0:
+      switch_name: gw-reims
+      switch_port: Gi0/18
+  pdu:
+    pdu_name: stremi-pdu1.reims.grid5000.fr
+    pdu_position: 1
+stremi-19:
+  network_interfaces:
+    eth0:
+      switch_name: gw-reims
+      switch_port: Gi0/19
+  pdu:
+    pdu_name: stremi-pdu1.reims.grid5000.fr
+    pdu_position: 2
+stremi-20:
+  network_interfaces:
+    eth0:
+      switch_name: gw-reims
+      switch_port: Gi0/20
+  pdu:
+    pdu_name: stremi-pdu1.reims.grid5000.fr
+    pdu_position: 3
+stremi-21:
+  network_interfaces:
+    eth0:
+      switch_name: gw-reims
+      switch_port: Gi0/21
+  pdu:
+    pdu_name: stremi-pdu1.reims.grid5000.fr
+    pdu_position: 4
+stremi-22:
+  network_interfaces:
+    eth0:
+      switch_name: gw-reims
+      switch_port: Gi0/22
+  pdu:
+    pdu_name: stremi-pdu1.reims.grid5000.fr
+    pdu_position: 5
+stremi-23:
+  network_interfaces:
+    eth0:
+      switch_name: gw-reims
+      switch_port: Gi0/23
+  pdu:
+    pdu_name: stremi-pdu1.reims.grid5000.fr
+    pdu_position: 6
+stremi-24:
+  network_interfaces:
+    eth0:
+      switch_name: gw-reims
+      switch_port: Gi0/24
+  pdu:
+    pdu_name: stremi-pdu1.reims.grid5000.fr
+    pdu_position: 7
+stremi-25:
+  network_interfaces:
+    eth0:
+      switch_name: gw-reims
+      switch_port: Gi0/25
+  pdu:
+    pdu_name: stremi-pdu1.reims.grid5000.fr
+    pdu_position: 8
+stremi-26:
+  network_interfaces:
+    eth0:
+      switch_name: gw-reims
+      switch_port: Gi0/26
+  pdu:
+    pdu_name: stremi-pdu1.reims.grid5000.fr
+    pdu_position: 9
+stremi-27:
+  network_interfaces:
+    eth0:
+      switch_name: gw-reims
+      switch_port: Gi0/27
+  pdu:
+    pdu_name: stremi-pdu1.reims.grid5000.fr
+    pdu_position: 10
+stremi-28:
+  network_interfaces:
+    eth0:
+      switch_name: gw-reims
+      switch_port: Gi0/28
+  pdu:
+    pdu_name: stremi-pdu1.reims.grid5000.fr
+    pdu_position: 11
+stremi-29:
+  network_interfaces:
+    eth0:
+      switch_name: gw-reims
+      switch_port: Gi0/29
+  pdu:
+    pdu_name: stremi-pdu1.reims.grid5000.fr
+    pdu_position: 12
+stremi-30:
+  network_interfaces:
+    eth0:
+      switch_name: gw-reims
+      switch_port: Gi0/30
+  pdu:
+    pdu_name: stremi-pdu1.reims.grid5000.fr
+    pdu_position: 13
+stremi-31:
+  network_interfaces:
+    eth0:
+      switch_name: gw-reims
+      switch_port: Gi0/31
+  pdu:
+    pdu_name: stremi-pdu1.reims.grid5000.fr
+    pdu_position: 14
+stremi-32:
+  network_interfaces:
+    eth0:
+      switch_name: gw-reims
+      switch_port: Gi0/32
+  pdu:
+    pdu_name: stremi-pdu1.reims.grid5000.fr
+    pdu_position: 15
+stremi-33:
+  network_interfaces:
+    eth0:
+      switch_name: gw-reims
+      switch_port: Gi0/34
+  pdu:
+    pdu_name: stremi-pdu1.reims.grid5000.fr
+    pdu_position: 16
+stremi-34:
+  network_interfaces:
+    eth0:
+      switch_name: gw-reims
+      switch_port: Gi0/33
+  pdu:
+    pdu_name: stremi-pdu1.reims.grid5000.fr
+    pdu_position: 17
+stremi-35:
+  network_interfaces:
+    eth0:
+      switch_name: gw-reims
+      switch_port: Gi0/35
+  pdu:
+    pdu_name: stremi-pdu3.reims.grid5000.fr
+    pdu_position: 1
+stremi-36:
+  network_interfaces:
+    eth0:
+      switch_name: gw-reims
+      switch_port: Gi0/36
+  pdu:
+    pdu_name: stremi-pdu3.reims.grid5000.fr
+    pdu_position: 2
+stremi-37:
+  network_interfaces:
+    eth0:
+      switch_name: gw-reims
+      switch_port: Gi0/37
+  pdu:
+    pdu_name: stremi-pdu3.reims.grid5000.fr
+    pdu_position: 3
+stremi-38:
+  network_interfaces:
+    eth0:
+      switch_name: gw-reims
+      switch_port: Gi0/38
+  pdu:
+    pdu_name: stremi-pdu3.reims.grid5000.fr
+    pdu_position: 4
+stremi-39:
+  network_interfaces:
+    eth0:
+      switch_name: gw-reims
+      switch_port: Gi0/39
+  pdu:
+    pdu_name: stremi-pdu3.reims.grid5000.fr
+    pdu_position: 5
+stremi-40:
+  network_interfaces:
+    eth0:
+      switch_name: gw-reims
+      switch_port: Gi0/40
+  pdu:
+    pdu_name: stremi-pdu3.reims.grid5000.fr
+    pdu_position: 6
+stremi-41:
+  network_interfaces:
+    eth0:
+      switch_name: gw-reims
+      switch_port: Gi0/41
+  pdu:
+    pdu_name: stremi-pdu3.reims.grid5000.fr
+    pdu_position: 7
+stremi-42:
+  network_interfaces:
+    eth0:
+      switch_name: gw-reims
+      switch_port: Gi0/42
+  pdu:
+    pdu_name: stremi-pdu3.reims.grid5000.fr
+    pdu_position: 8
+stremi-43:
+  network_interfaces:
+    eth0:
+      switch_name: gw-reims
+      switch_port: Gi0/43
+  pdu:
+    pdu_name: stremi-pdu3.reims.grid5000.fr
+    pdu_position: 9
+stremi-44:
+  network_interfaces:
+    eth0:
+      switch_name: gw-reims
+      switch_port: Gi0/44
+  pdu:
+    pdu_name: stremi-pdu3.reims.grid5000.fr
+    pdu_position: 10
diff --git a/generators/input/sites/rennes/clusters/<q b/generators/input/sites/rennes/clusters/<q
deleted file mode 100644
index d752733fbe0..00000000000
--- a/generators/input/sites/rennes/clusters/<q
+++ /dev/null
@@ -1,219 +0,0 @@
-site :rennes do |site_uid|
-
-  cluster :parapluie do |cluster_uid|
-    model "HP ProLiant DL165 G7"
-    created_at Time.parse("2010-11-02").httpdate
-    kavlan true
-
-    40.times do |i|
-      node "#{cluster_uid}-#{i+1}" do |node_uid|
-
-        performance({
-        :core_flops => 4932000000,
-        :node_flops => 121200000000
-      })
-
-        supported_job_types({
-          :deploy       => true,
-          :besteffort   => true,
-          :virtual      => lookup('parapluie', node_uid, 'supported_job_types', 'virtual')
-        })
-
-        architecture({
-          :smp_size       => lookup('parapluie', node_uid, 'architecture', 'smp_size'),
-          :smt_size       => lookup('parapluie', node_uid, 'architecture', 'smt_size'),
-          :platform_type  => lookup('parapluie', node_uid, 'architecture', 'platform_type')
-        })
-
-        processor({
-          :vendor             => lookup('parapluie', node_uid, 'processor', 'vendor'),
-          :model              => lookup('parapluie', node_uid, 'processor', 'model'),
-          :version            => lookup('parapluie', node_uid, 'processor', 'version'),
-          :clock_speed        => lookup('parapluie', node_uid, 'processor', 'clock_speed'),
-          :instruction_set    => lookup('parapluie', node_uid, 'processor', 'instruction_set'),
-          :other_description  => lookup('parapluie', node_uid, 'processor', 'other_description'),
-          :cache_l1           => lookup('parapluie', node_uid, 'processor', 'cache_l1'),
-          :cache_l1i          => lookup('parapluie', node_uid, 'processor', 'cache_l1i'),
-          :cache_l1d          => lookup('parapluie', node_uid, 'processor', 'cache_l1d'),
-          :cache_l2           => lookup('parapluie', node_uid, 'processor', 'cache_l2'),
-          :cache_l3           => lookup('parapluie', node_uid, 'processor', 'cache_l3')
-        })
-
-        main_memory({
-          :ram_size     => lookup('parapluie', node_uid, 'main_memory', 'ram_size'),
-          :virtual_size => nil
-        })
-
-        operating_system({
-          :name     => lookup('parapluie', node_uid, 'operating_system', 'name'),
-          :release  => "Squeeze",
-          :version  => lookup('parapluie', node_uid, 'operating_system', 'version'),
-          :kernel   => lookup('parapluie', node_uid, 'operating_system', 'kernel')
-        })
-
-        storage_devices [{
-          :interface  => 'SATA',
-          :size       => lookup('parapluie', node_uid, 'block_devices', 'sda', 'size'),
-          :driver     => "ahci",
-          :device     => lookup('parapluie', node_uid, 'block_devices', 'sda', 'device'),
-          :model      => lookup('parapluie', node_uid, 'block_devices', 'sda', 'model'),
-          :vendor     => lookup('parapluie', node_uid, 'block_devices', 'sda', 'vendor'),
-          :rev        => lookup('parapluie', node_uid, 'block_devices', 'sda', 'rev')
-        }]
-
-        network_adapters [{
-          :interface        => lookup('parapluie', node_uid, 'network_interfaces', 'eth0', 'interface'),
-          :rate             => lookup('parapluie', node_uid, 'network_interfaces', 'eth0', 'rate'),
-          :enabled          => lookup('parapluie', node_uid, 'network_interfaces', 'eth0', 'enabled'),
-          :management       => lookup('parapluie', node_uid, 'network_interfaces', 'eth0', 'management'),
-          :mountable        => lookup('parapluie', node_uid, 'network_interfaces', 'eth0', 'mountable'),
-          :mounted          => lookup('parapluie', node_uid, 'network_interfaces', 'eth0', 'mounted'),
-          :device           => "eth0",
-          :bridged          => false,
-          :vendor           => "Intel",
-          :version          => "82576",
-          :driver           => lookup('parapluie', node_uid, 'network_interfaces', 'eth0', 'driver'),
-          :mac              => lookup('parapluie', node_uid, 'network_interfaces', 'eth0', 'mac')
-        },
-        {
-          :interface        => lookup('parapluie', node_uid, 'network_interfaces', 'eth1', 'interface'),
-          :rate             => lookup('parapluie', node_uid, 'network_interfaces', 'eth1', 'rate'),
-          :enabled          => lookup('parapluie', node_uid, 'network_interfaces', 'eth1', 'enabled'),
-          :management       => lookup('parapluie', node_uid, 'network_interfaces', 'eth1', 'management'),
-          :mountable        => lookup('parapluie', node_uid, 'network_interfaces', 'eth1', 'mountable'),
-          :mounted          => lookup('parapluie', node_uid, 'network_interfaces', 'eth1', 'mounted'),
-          :bridged          => true,
-          :device           => "eth1",
-          :vendor           => "Intel",
-          :version          => "82576",
-          :driver           => lookup('parapluie', node_uid, 'network_interfaces', 'eth1', 'driver'),
-          :network_address  => "#{node_uid}.#{site_uid}.grid5000.fr",
-          :ip               => lookup('parapluie', node_uid, 'network_interfaces', 'eth1', 'ip'),
-          :ip6              => lookup('parapluie', node_uid, 'network_interfaces', 'eth1', 'ip6'),
-          :switch           => lookup('parapluie', node_uid, 'network_interfaces', 'eth1', 'switch_name'),
-          :switch_port      => lookup('parapluie', node_uid, 'network_interfaces', 'eth1', 'switch_port'),
-          :mac              => lookup('parapluie', node_uid, 'network_interfaces', 'eth1', 'mac')
-        },
-        {
-          :interface        => lookup('parapluie', node_uid, 'network_interfaces', 'eth2', 'interface'),
-          :rate             => 1.G,
-          :enabled          => lookup('parapluie', node_uid, 'network_interfaces', 'eth2', 'enabled'),
-          :management       => lookup('parapluie', node_uid, 'network_interfaces', 'eth2', 'management'),
-          :mountable        => lookup('parapluie', node_uid, 'network_interfaces', 'eth2', 'mountable'),
-          :mounted          => lookup('parapluie', node_uid, 'network_interfaces', 'eth2', 'mounted'),
-          :device           => "eth2",
-          :bridged          => false,
-          :vendor           => "Intel",
-          :version          => "82576",
-          :driver           => lookup('parapluie', node_uid, 'network_interfaces', 'eth2', 'driver'),
-          :mac              => lookup('parapluie', node_uid, 'network_interfaces', 'eth2', 'mac')
-        },
-        {
-          :interface        => lookup('parapluie', node_uid, 'network_interfaces', 'eth3', 'interface'),
-          :rate             => 1.G,
-          :enabled          => lookup('parapluie', node_uid, 'network_interfaces', 'eth3', 'enabled'),
-          :management       => lookup('parapluie', node_uid, 'network_interfaces', 'eth3', 'management'),
-          :mountable        => lookup('parapluie', node_uid, 'network_interfaces', 'eth3', 'mountable'),
-          :mounted          => lookup('parapluie', node_uid, 'network_interfaces', 'eth3', 'mounted'),
-          :device           => "eth3",
-          :bridged          => false,
-          :vendor           => "Intel",
-          :version          => "82576",
-          :driver           => lookup('parapluie', node_uid, 'network_interfaces', 'eth3', 'driver'),
-          :mac              => lookup('parapluie', node_uid, 'network_interfaces', 'eth3', 'mac')
-        },
-        {
-          :interface        => lookup('parapluie', node_uid, 'network_interfaces', 'ib0', 'interface'),
-          :rate             => lookup('parapluie', node_uid, 'network_interfaces', 'ib0', 'rate'),
-          :device           => "ib0",
-          :enabled          => lookup('parapluie', node_uid, 'network_interfaces', 'ib0', 'enabled'),
-          :management       => lookup('parapluie', node_uid, 'network_interfaces', 'ib0', 'management'),
-          :mountable        => lookup('parapluie', node_uid, 'network_interfaces', 'ib0', 'mountable'),
-          :mounted          => lookup('parapluie', node_uid, 'network_interfaces', 'ib0', 'mounted'),
-          :vendor           => 'Mellanox',
-          :version          => "MT25418",
-          :driver           => lookup('parapluie', node_uid, 'network_interfaces', 'ib0', 'driver'),
-          :network_address  => "#{node_uid}-ib0.#{site_uid}.grid5000.fr",
-          :ip               => lookup('parapluie', node_uid, 'network_interfaces', 'ib0', 'ip'),
-          :ip6               => lookup('parapluie', node_uid, 'network_interfaces', 'ib0', 'ip6'),
-          :guid             => lookup('parapluie', node_uid, 'network_interfaces', 'ib0', 'guid')
-        },
-        {
-          :interface        => lookup('parapluie', node_uid, 'network_interfaces', 'ib1', 'interface'),
-          :rate             => lookup('parapluie', node_uid, 'network_interfaces', 'ib1', 'rate'),
-          :device           => "ib1",
-          :enabled          => lookup('parapluie', node_uid, 'network_interfaces', 'ib1', 'enabled'),
-          :management       => lookup('parapluie', node_uid, 'network_interfaces', 'ib1', 'management'),
-          :mountable        => lookup('parapluie', node_uid, 'network_interfaces', 'ib1', 'mountable'),
-          :mounted          => lookup('parapluie', node_uid, 'network_interfaces', 'ib1', 'mounted'),
-          :vendor           => 'Mellanox',
-          :version          => "MT25418",
-          :driver           => lookup('parapluie', node_uid, 'network_interfaces', 'ib1', 'driver'),
-          :guid             => lookup('parapluie', node_uid, 'network_interfaces', 'ib1', 'guid')
-        },
-        {
-          :interface            => 'Ethernet',
-          :rate                 => 1.G,
-          :network_address      => "#{node_uid}-bmc.#{site_uid}.grid5000.fr",
-          :ip                   => lookup('parapluie', node_uid, 'network_interfaces', 'bmc', 'ip'),
-          :mac                  => lookup('parapluie', node_uid, 'network_interfaces', 'bmc', 'mac'),
-          :enabled              => true,
-          :mounted              => false,
-          :mountable            => false,
-          :management           => true,
-          :device               => "bmc"
-        }]
-
-        chassis({
-          :serial       => lookup('parapluie', node_uid, 'chassis', 'serial_number'),
-          :name         => lookup('parapluie', node_uid, 'chassis', 'product_name'),
-          :manufacturer => lookup('parapluie', node_uid, 'chassis', 'manufacturer')
-        })
-
-        bios({
-          :version      => lookup('parapluie', node_uid, 'bios', 'version'),
-          :vendor       => lookup('parapluie', node_uid, 'bios', 'vendor'),
-          :release_date => lookup('parapluie', node_uid, 'bios', 'release_date')
-        })
-
-        bios({
-          :version      => lookup('parapluie', node_uid, 'bios', 'version'),
-          :vendor       => lookup('parapluie', node_uid, 'bios', 'vendor'),
-          :release_date => lookup('parapluie', node_uid, 'bios', 'release_date')
-        })
-
-        gpu({
-          :gpu  => false
-        })
-
-        monitoring({
-          :wattmeter    => false,
-          :temperature  => true,
-        })
-
-        sensors({
-          :power => {
-            :available => true,
-            :via => {
-              :pdu      => {
-                :uid  => lookup('parapluie', node_uid, 'pdu', 'pdu_name'),
-                :port => lookup('parapluie', node_uid, 'pdu', 'pdu_position'),
-             },
-              :api      => { :metric => "pdu" }
-            }
-          },
-          :temperature => {
-            :available => true,
-            :via => {
-              :api      => { :metric => "ambient_temp" },
-              :ipmi     => { :sensors => { :ambient => "Inlet Ambient" } }
-            }
-          }
-        })
-
-        chassis({:serial_number => lookup('parapluie', node_uid, 'chassis', 'serial_number')})
-
-      end
-    end
-  end
-end
diff --git a/generators/input/sites/rennes/clusters/paradent.rb b/generators/input/sites/rennes/clusters/paradent.rb
index 4d47e41aed7..0264cc930c2 100644
--- a/generators/input/sites/rennes/clusters/paradent.rb
+++ b/generators/input/sites/rennes/clusters/paradent.rb
@@ -35,87 +35,87 @@ site :rennes do |site_uid|
         supported_job_types({
           :deploy       => true,
           :besteffort   => true,
-          :virtual      => lookup('paradent', node_uid, 'supported_job_types', 'virtual')
+          :virtual      => lookup('paradent_generated', node_uid, 'supported_job_types', 'virtual')
         })
 
         architecture({
-          :smp_size       => lookup('paradent', node_uid, 'architecture', 'smp_size'),
-          :smt_size       => lookup('paradent', node_uid, 'architecture', 'smt_size'),
-          :platform_type  => lookup('paradent', node_uid, 'architecture', 'platform_type')
+          :smp_size       => lookup('paradent_generated', node_uid, 'architecture', 'smp_size'),
+          :smt_size       => lookup('paradent_generated', node_uid, 'architecture', 'smt_size'),
+          :platform_type  => lookup('paradent_generated', node_uid, 'architecture', 'platform_type')
         })
 
         processor({
-          :vendor             => lookup('paradent', node_uid, 'processor', 'vendor'),
-          :model              => lookup('paradent', node_uid, 'processor', 'model'),
-          :version            => lookup('paradent', node_uid, 'processor', 'version'),
-          :clock_speed        => lookup('paradent', node_uid, 'processor', 'clock_speed'),
-          :instruction_set    => lookup('paradent', node_uid, 'processor', 'instruction_set'),
-          :other_description  => lookup('paradent', node_uid, 'processor', 'other_description'),
-          :cache_l1           => lookup('paradent', node_uid, 'processor', 'cache_l1'),
-          :cache_l1i          => lookup('paradent', node_uid, 'processor', 'cache_l1i'),
-          :cache_l1d          => lookup('paradent', node_uid, 'processor', 'cache_l1d'),
-          :cache_l2           => lookup('paradent', node_uid, 'processor', 'cache_l2'),
-          :cache_l3           => lookup('paradent', node_uid, 'processor', 'cache_l3')
+          :vendor             => lookup('paradent_generated', node_uid, 'processor', 'vendor'),
+          :model              => lookup('paradent_generated', node_uid, 'processor', 'model'),
+          :version            => lookup('paradent_generated', node_uid, 'processor', 'version'),
+          :clock_speed        => lookup('paradent_generated', node_uid, 'processor', 'clock_speed'),
+          :instruction_set    => lookup('paradent_generated', node_uid, 'processor', 'instruction_set'),
+          :other_description  => lookup('paradent_generated', node_uid, 'processor', 'other_description'),
+          :cache_l1           => lookup('paradent_generated', node_uid, 'processor', 'cache_l1'),
+          :cache_l1i          => lookup('paradent_generated', node_uid, 'processor', 'cache_l1i'),
+          :cache_l1d          => lookup('paradent_generated', node_uid, 'processor', 'cache_l1d'),
+          :cache_l2           => lookup('paradent_generated', node_uid, 'processor', 'cache_l2'),
+          :cache_l3           => lookup('paradent_generated', node_uid, 'processor', 'cache_l3')
         })
 
         main_memory({
-          :ram_size     => lookup('paradent', node_uid, 'main_memory', 'ram_size'),
+          :ram_size     => lookup('paradent_generated', node_uid, 'main_memory', 'ram_size'),
           :virtual_size => nil
         })
 
         operating_system({
-          :name     => lookup('paradent', node_uid, 'operating_system', 'name'),
+          :name     => lookup('paradent_generated', node_uid, 'operating_system', 'name'),
           :release  => "Squeeze",
-          :version  => lookup('paradent', node_uid, 'operating_system', 'version'),
-          :kernel   => lookup('paradent', node_uid, 'operating_system', 'kernel')
+          :version  => lookup('paradent_generated', node_uid, 'operating_system', 'version'),
+          :kernel   => lookup('paradent_generated', node_uid, 'operating_system', 'kernel')
         })
 
         storage_devices [{
           :interface  => 'SATA',
-          :size       => lookup('paradent', node_uid, 'block_devices', 'sda', 'size'),
+          :size       => lookup('paradent_generated', node_uid, 'block_devices', 'sda', 'size'),
           :driver     => "ata_piix",
-          :device     => lookup('paradent', node_uid, 'block_devices', 'sda', 'device'),
-          :model      => lookup('paradent', node_uid, 'block_devices', 'sda', 'model'),
-          :vendor     => lookup('paradent', node_uid, 'block_devices', 'sda', 'vendor'),
-          :rev        => lookup('paradent', node_uid, 'block_devices', 'sda', 'rev')
+          :device     => lookup('paradent_generated', node_uid, 'block_devices', 'sda', 'device'),
+          :model      => lookup('paradent_generated', node_uid, 'block_devices', 'sda', 'model'),
+          :vendor     => lookup('paradent_generated', node_uid, 'block_devices', 'sda', 'vendor'),
+          :rev        => lookup('paradent_generated', node_uid, 'block_devices', 'sda', 'rev')
         }]
 
         network_adapters [{
-          :interface        => lookup('paradent', node_uid, 'network_interfaces', 'eth0', 'interface'),
-          :rate             => lookup('paradent', node_uid, 'network_interfaces', 'eth0', 'rate'),
-          :enabled          => lookup('paradent', node_uid, 'network_interfaces', 'eth0', 'enabled'),
-          :management       => lookup('paradent', node_uid, 'network_interfaces', 'eth0', 'management'),
-          :mountable        => lookup('paradent', node_uid, 'network_interfaces', 'eth0', 'mountable'),
-          :mounted          => lookup('paradent', node_uid, 'network_interfaces', 'eth0', 'mounted'),
+          :interface        => lookup('paradent_generated', node_uid, 'network_interfaces', 'eth0', 'interface'),
+          :rate             => lookup('paradent_generated', node_uid, 'network_interfaces', 'eth0', 'rate'),
+          :enabled          => lookup('paradent_generated', node_uid, 'network_interfaces', 'eth0', 'enabled'),
+          :management       => lookup('paradent_generated', node_uid, 'network_interfaces', 'eth0', 'management'),
+          :mountable        => lookup('paradent_generated', node_uid, 'network_interfaces', 'eth0', 'mountable'),
+          :mounted          => lookup('paradent_generated', node_uid, 'network_interfaces', 'eth0', 'mounted'),
           :bridged          => true,
           :vendor           => "Intel",
           :version          => "80003ES2LAN",
           :device           => "eth0",
-          :driver           => lookup('paradent', node_uid, 'network_interfaces', 'eth0', 'driver'),
+          :driver           => lookup('paradent_generated', node_uid, 'network_interfaces', 'eth0', 'driver'),
           :network_address  => "#{node_uid}.#{site_uid}.grid5000.fr",
-          :ip               => lookup('paradent', node_uid, 'network_interfaces', 'eth0', 'ip'),
-          :ip6              => lookup('paradent', node_uid, 'network_interfaces', 'eth0', 'ip6'),
-          :switch           => lookup('paradent', node_uid, 'network_interfaces', 'eth0', 'switch_name'),
-          :switch_port      => lookup('paradent', node_uid, 'network_interfaces', 'eth0', 'switch_port'),
-          :mac              => lookup('paradent', node_uid, 'network_interfaces', 'eth0', 'mac')
+          :ip               => lookup('paradent_generated', node_uid, 'network_interfaces', 'eth0', 'ip'),
+          :ip6              => lookup('paradent_generated', node_uid, 'network_interfaces', 'eth0', 'ip6'),
+          :switch           => lookup('paradent_manual', node_uid, 'network_interfaces', 'eth0', 'switch_name'),
+          :switch_port      => lookup('paradent_manual', node_uid, 'network_interfaces', 'eth0', 'switch_port'),
+          :mac              => lookup('paradent_generated', node_uid, 'network_interfaces', 'eth0', 'mac')
         },
         {
-          :interface        => lookup('paradent', node_uid, 'network_interfaces', 'eth1', 'interface'),
+          :interface        => lookup('paradent_generated', node_uid, 'network_interfaces', 'eth1', 'interface'),
           :rate             => 1.G,
-          :enabled          => lookup('paradent', node_uid, 'network_interfaces', 'eth1', 'enabled'),
-          :management       => lookup('paradent', node_uid, 'network_interfaces', 'eth1', 'management'),
-          :mountable        => lookup('paradent', node_uid, 'network_interfaces', 'eth1', 'mountable'),
-          :mounted          => lookup('paradent', node_uid, 'network_interfaces', 'eth1', 'mounted'),
+          :enabled          => lookup('paradent_generated', node_uid, 'network_interfaces', 'eth1', 'enabled'),
+          :management       => lookup('paradent_generated', node_uid, 'network_interfaces', 'eth1', 'management'),
+          :mountable        => lookup('paradent_generated', node_uid, 'network_interfaces', 'eth1', 'mountable'),
+          :mounted          => lookup('paradent_generated', node_uid, 'network_interfaces', 'eth1', 'mounted'),
           :bridged          => false,
           :device           => "eth1",
           :vendor           => "Intel",
           :version          => "80003ES2LAN",
-          :driver           => lookup('paradent', node_uid, 'network_interfaces', 'eth1', 'driver'),
-          :mac              => lookup('paradent', node_uid, 'network_interfaces', 'eth1', 'mac')
+          :driver           => lookup('paradent_generated', node_uid, 'network_interfaces', 'eth1', 'driver'),
+          :mac              => lookup('paradent_generated', node_uid, 'network_interfaces', 'eth1', 'mac')
         },
         { :interface            => 'Ethernet',
           :rate                 => 100.M,
-          :mac                  => lookup('paradent', node_uid, 'network_interfaces','bmc','mac'),
+          :mac                  => lookup('paradent_generated', node_uid, 'network_interfaces','bmc','mac'),
           :vendor               => "Tyan",
           :version              => "M3296",
           :enabled              => true,
@@ -123,19 +123,19 @@ site :rennes do |site_uid|
           :mountable            => false,
           :mounted              => false,
           :network_address      => "#{node_uid}-bmc.#{site_uid}.grid5000.fr",
-          :ip                   => lookup('paradent', node_uid,'network_interfaces','bmc','ip'),
+          :ip                   => lookup('paradent_generated', node_uid,'network_interfaces','bmc','ip'),
         }]
 
         chassis({
-          :serial       => lookup('paradent', node_uid, 'chassis', 'serial_number'),
-          :name         => lookup('paradent', node_uid, 'chassis', 'product_name'),
-          :manufacturer => lookup('paradent', node_uid, 'chassis', 'manufacturer')
+          :serial       => lookup('paradent_generated', node_uid, 'chassis', 'serial_number'),
+          :name         => lookup('paradent_generated', node_uid, 'chassis', 'product_name'),
+          :manufacturer => lookup('paradent_generated', node_uid, 'chassis', 'manufacturer')
         })
 
         bios({
-          :version      => lookup('paradent', node_uid, 'bios', 'version'),
-          :vendor       => lookup('paradent', node_uid, 'bios', 'vendor'),
-          :release_date => lookup('paradent', node_uid, 'bios', 'release_date')
+          :version      => lookup('paradent_generated', node_uid, 'bios', 'version'),
+          :vendor       => lookup('paradent_generated', node_uid, 'bios', 'vendor'),
+          :release_date => lookup('paradent_generated', node_uid, 'bios', 'release_date')
         })
 
         gpu({
@@ -146,7 +146,7 @@ site :rennes do |site_uid|
           :power => {
             :available => true,
             :via => {
-              :pdu      => { :uid => lookup('paradent', node_uid, 'pdu', 'pdu_name') }
+              :pdu      => { :uid => lookup('paradent_manual', node_uid, 'pdu', 'pdu_name') }
             }
           },
           :temperature => {
diff --git a/generators/input/sites/rennes/clusters/paradent.yaml b/generators/input/sites/rennes/clusters/paradent_generated.yaml
similarity index 94%
rename from generators/input/sites/rennes/clusters/paradent.yaml
rename to generators/input/sites/rennes/clusters/paradent_generated.yaml
index eebf8ac4716..fc63db321cf 100644
--- a/generators/input/sites/rennes/clusters/paradent.yaml
+++ b/generators/input/sites/rennes/clusters/paradent_generated.yaml
@@ -24,8 +24,6 @@ paradent-1:
       interface: Ethernet
       driver: e1000e
       mountable: true
-      switch_name: gw-rennes
-      switch_port: Gi4/3
       ip: 172.16.97.1
     eth1:
       mounted: false
@@ -68,8 +66,6 @@ paradent-1:
       size: '625142448'
       rev: GM3O
       vendor: ATA
-  pdu:
-    pdu_name: paradent-pdu-1
 paradent-2:
   bios:
     version: V1.04B
@@ -89,8 +85,6 @@ paradent-2:
       interface: Ethernet
       driver: e1000e
       mountable: true
-      switch_name: gw-rennes
-      switch_port: Gi4/2
       ip: 172.16.97.2
     eth1:
       mounted: false
@@ -139,8 +133,6 @@ paradent-2:
       size: '625142448'
       rev: GM3O
       vendor: ATA
-  pdu:
-    pdu_name: paradent-pdu-1
 paradent-3:
   bios:
     version: V1.04B
@@ -170,8 +162,6 @@ paradent-3:
       interface: Ethernet
       driver: e1000e
       mountable: true
-      switch_name: gw-rennes
-      switch_port: Gi4/7
       ip: 172.16.97.3
     eth1:
       mounted: false
@@ -210,8 +200,6 @@ paradent-3:
       size: '625142448'
       rev: GM3O
       vendor: ATA
-  pdu:
-    pdu_name: paradent-pdu-1
 paradent-4:
   bios:
     version: V1.04B
@@ -235,8 +223,6 @@ paradent-4:
       interface: Ethernet
       driver: e1000e
       mountable: true
-      switch_name: gw-rennes
-      switch_port: Gi4/5
       ip: 172.16.97.4
     eth1:
       mounted: false
@@ -281,8 +267,6 @@ paradent-4:
       size: '625142448'
       rev: GM3O
       vendor: ATA
-  pdu:
-    pdu_name: paradent-pdu-1
 paradent-5:
   bios:
     version: V1.04B
@@ -306,8 +290,6 @@ paradent-5:
       interface: Ethernet
       driver: e1000e
       mountable: true
-      switch_name: gw-rennes
-      switch_port: Gi4/9
       ip: 172.16.97.5
     eth1:
       mounted: false
@@ -352,8 +334,6 @@ paradent-5:
       size: '625142448'
       rev: GM3O
       vendor: ATA
-  pdu:
-    pdu_name: paradent-pdu-1
 paradent-6:
   bios:
     version: V1.04B
@@ -383,8 +363,6 @@ paradent-6:
       interface: Ethernet
       driver: e1000e
       mountable: true
-      switch_name: gw-rennes
-      switch_port: Gi4/1
       ip: 172.16.97.6
     eth1:
       mounted: false
@@ -423,8 +401,6 @@ paradent-6:
       size: '625142448'
       rev: GM3O
       vendor: ATA
-  pdu:
-    pdu_name: paradent-pdu-1
 paradent-7:
   bios:
     version: V1.04B
@@ -454,8 +430,6 @@ paradent-7:
       interface: Ethernet
       driver: e1000e
       mountable: true
-      switch_name: gw-rennes
-      switch_port: Gi4/10
       ip: 172.16.97.7
     eth1:
       mounted: false
@@ -494,8 +468,6 @@ paradent-7:
       size: '625142448'
       rev: GM3O
       vendor: ATA
-  pdu:
-    pdu_name: paradent-pdu-1
 paradent-8:
   bios:
     version: V1.04B
@@ -525,8 +497,6 @@ paradent-8:
       interface: Ethernet
       driver: e1000e
       mountable: true
-      switch_name: gw-rennes
-      switch_port: Gi4/8
       ip: 172.16.97.8
     eth1:
       mounted: false
@@ -565,8 +535,6 @@ paradent-8:
       size: '625142448'
       rev: GM3O
       vendor: ATA
-  pdu:
-    pdu_name: paradent-pdu-1
 paradent-9:
   bios:
     version: V1.04B
@@ -586,8 +554,6 @@ paradent-9:
       interface: Ethernet
       driver: e1000e
       mountable: true
-      switch_name: gw-rennes
-      switch_port: Gi4/4
       ip: 172.16.97.9
     eth1:
       mounted: false
@@ -636,8 +602,6 @@ paradent-9:
       size: '625142448'
       rev: GM3O
       vendor: ATA
-  pdu:
-    pdu_name: paradent-pdu-1
 paradent-10:
   bios:
     version: V1.04B
@@ -667,8 +631,6 @@ paradent-10:
       interface: Ethernet
       driver: e1000e
       mountable: true
-      switch_name: gw-rennes
-      switch_port: Gi4/6
       ip: 172.16.97.10
     eth1:
       mounted: false
@@ -707,8 +669,6 @@ paradent-10:
       size: '625142448'
       rev: GM3O
       vendor: ATA
-  pdu:
-    pdu_name: paradent-pdu-1
 paradent-11:
   bios:
     version: V1.04B
@@ -732,8 +692,6 @@ paradent-11:
       interface: Ethernet
       driver: e1000e
       mountable: true
-      switch_name: gw-rennes
-      switch_port: Gi6/13
       ip: 172.16.97.11
     eth1:
       mounted: false
@@ -778,8 +736,6 @@ paradent-11:
       size: '625142448'
       rev: GM3O
       vendor: ATA
-  pdu:
-    pdu_name: paradent-pdu-1
 paradent-12:
   bios:
     version: V1.04B
@@ -805,8 +761,6 @@ paradent-12:
       interface: Ethernet
       driver: e1000e
       mountable: true
-      switch_name: gw-rennes
-      switch_port: Gi6/14
       ip: 172.16.97.12
     eth1:
       mounted: false
@@ -849,8 +803,6 @@ paradent-12:
       size: '625142448'
       rev: GM3O
       vendor: ATA
-  pdu:
-    pdu_name: paradent-pdu-3
 paradent-13:
   bios:
     version: V1.04B
@@ -880,8 +832,6 @@ paradent-13:
       interface: Ethernet
       driver: e1000e
       mountable: true
-      switch_name: gw-rennes
-      switch_port: Gi6/19
       ip: 172.16.97.13
     eth1:
       mounted: false
@@ -949,8 +899,6 @@ paradent-14:
       interface: Ethernet
       driver: e1000e
       mountable: true
-      switch_name: gw-rennes
-      switch_port: Gi6/11
       ip: 172.16.97.14
     eth1:
       mounted: false
@@ -989,8 +937,6 @@ paradent-14:
       size: '625142448'
       rev: JPFO
       vendor: ATA
-  pdu:
-    pdu_name: paradent-pdu-4
 paradent-15:
   bios:
     version: V1.04B
@@ -1020,8 +966,6 @@ paradent-15:
       interface: Ethernet
       driver: e1000e
       mountable: true
-      switch_name: gw-rennes
-      switch_port: Gi6/15
       ip: 172.16.97.15
     eth1:
       mounted: false
@@ -1060,8 +1004,6 @@ paradent-15:
       size: '625142448'
       rev: GM3O
       vendor: ATA
-  pdu:
-    pdu_name: paradent-pdu-3
 paradent-16:
   bios:
     version: V1.04B
@@ -1085,8 +1027,6 @@ paradent-16:
       interface: Ethernet
       driver: e1000e
       mountable: true
-      switch_name: gw-rennes
-      switch_port: Gi6/16
       ip: 172.16.97.16
     eth1:
       mounted: false
@@ -1131,8 +1071,6 @@ paradent-16:
       size: '625142448'
       rev: GM3O
       vendor: ATA
-  pdu:
-    pdu_name: paradent-pdu-3
 paradent-17:
   bios:
     version: V1.04B
@@ -1158,8 +1096,6 @@ paradent-17:
       interface: Ethernet
       driver: e1000e
       mountable: true
-      switch_name: gw-rennes
-      switch_port: Gi6/20
       ip: 172.16.97.17
     eth1:
       mounted: false
@@ -1202,8 +1138,6 @@ paradent-17:
       size: '625142448'
       rev: GM3O
       vendor: ATA
-  pdu:
-    pdu_name: paradent-pdu-3
 paradent-18:
   bios:
     version: V1.04B
@@ -1223,8 +1157,6 @@ paradent-18:
       interface: Ethernet
       driver: e1000e
       mountable: true
-      switch_name: gw-rennes
-      switch_port: Gi6/12
       ip: 172.16.97.18
     eth1:
       mounted: false
@@ -1273,8 +1205,6 @@ paradent-18:
       size: '625142448'
       rev: GM3O
       vendor: ATA
-  pdu:
-    pdu_name: paradent-pdu-3
 paradent-19:
   bios:
     version: V1.04B
@@ -1300,8 +1230,6 @@ paradent-19:
       interface: Ethernet
       driver: e1000e
       mountable: true
-      switch_name: gw-rennes
-      switch_port: Gi6/17
       ip: 172.16.97.19
     eth1:
       mounted: false
@@ -1344,8 +1272,6 @@ paradent-19:
       size: '625142448'
       rev: GM3O
       vendor: ATA
-  pdu:
-    pdu_name: paradent-pdu-3
 paradent-20:
   bios:
     version: V1.04B
@@ -1375,8 +1301,6 @@ paradent-20:
       interface: Ethernet
       driver: e1000e
       mountable: true
-      switch_name: gw-rennes
-      switch_port: Gi6/18
       ip: 172.16.97.20
     eth1:
       mounted: false
@@ -1415,8 +1339,6 @@ paradent-20:
       size: '625142448'
       rev: GM3O
       vendor: ATA
-  pdu:
-    pdu_name: paradent-pdu-3
 paradent-21:
   bios:
     version: V1.04B
@@ -1446,8 +1368,6 @@ paradent-21:
       interface: Ethernet
       driver: e1000e
       mountable: true
-      switch_name: gw-rennes
-      switch_port: Gi7/7
       ip: 172.16.97.21
     eth1:
       mounted: false
@@ -1486,8 +1406,6 @@ paradent-21:
       size: '625142448'
       rev: GM3O
       vendor: ATA
-  pdu:
-    pdu_name: paradent-pdu-2
 paradent-22:
   bios:
     version: V1.04B
@@ -1517,8 +1435,6 @@ paradent-22:
       interface: Ethernet
       driver: e1000e
       mountable: true
-      switch_name: gw-rennes
-      switch_port: Gi7/10
       ip: 172.16.97.22
     eth1:
       mounted: false
@@ -1557,8 +1473,6 @@ paradent-22:
       size: '625142448'
       rev: GM3O
       vendor: ATA
-  pdu:
-    pdu_name: paradent-pdu-2
 paradent-23:
   bios:
     version: V1.04B
@@ -1582,8 +1496,6 @@ paradent-23:
       interface: Ethernet
       driver: e1000e
       mountable: true
-      switch_name: gw-rennes
-      switch_port: Gi7/3
       ip: 172.16.97.23
     eth1:
       mounted: false
@@ -1628,8 +1540,6 @@ paradent-23:
       size: '625142448'
       rev: GM3O
       vendor: ATA
-  pdu:
-    pdu_name: paradent-pdu-2
 paradent-24:
   bios:
     version: V1.05
@@ -1655,8 +1565,6 @@ paradent-24:
       interface: Ethernet
       driver: e1000e
       mountable: true
-      switch_name: gw-rennes
-      switch_port: Gi7/6
       ip: 172.16.97.24
     eth1:
       mounted: false
@@ -1699,8 +1607,6 @@ paradent-24:
       size: '625142448'
       rev: GM3O
       vendor: ATA
-  pdu:
-    pdu_name: paradent-pdu-2
 paradent-25:
   bios:
     version: V1.04B
@@ -1730,8 +1636,6 @@ paradent-25:
       interface: Ethernet
       driver: e1000e
       mountable: true
-      switch_name: gw-rennes
-      switch_port: Gi7/4
       ip: 172.16.97.25
     eth1:
       mounted: false
@@ -1770,8 +1674,6 @@ paradent-25:
       size: '625142448'
       rev: GM3O
       vendor: ATA
-  pdu:
-    pdu_name: paradent-pdu-2
 paradent-26:
   bios:
     version: V1.04B
@@ -1801,8 +1703,6 @@ paradent-26:
       interface: Ethernet
       driver: e1000e
       mountable: true
-      switch_name: gw-rennes
-      switch_port: Gi7/1
       ip: 172.16.97.26
     eth1:
       mounted: false
@@ -1841,8 +1741,6 @@ paradent-26:
       size: '625142448'
       rev: GM3O
       vendor: ATA
-  pdu:
-    pdu_name: paradent-pdu-2
 paradent-27:
   bios:
     version: V1.04B
@@ -1872,8 +1770,6 @@ paradent-27:
       interface: Ethernet
       driver: e1000e
       mountable: true
-      switch_name: gw-rennes
-      switch_port: Gi7/9
       ip: 172.16.97.27
     eth1:
       mounted: false
@@ -1912,8 +1808,6 @@ paradent-27:
       size: '625142448'
       rev: GM3O
       vendor: ATA
-  pdu:
-    pdu_name: paradent-pdu-2
 paradent-28:
   bios:
     version: V1.04B
@@ -1937,8 +1831,6 @@ paradent-28:
       interface: Ethernet
       driver: e1000e
       mountable: true
-      switch_name: gw-rennes
-      switch_port: Gi7/5
       ip: 172.16.97.28
     eth1:
       mounted: false
@@ -1983,8 +1875,6 @@ paradent-28:
       size: '625142448'
       rev: GM3O
       vendor: ATA
-  pdu:
-    pdu_name: paradent-pdu-4
 paradent-29:
   bios:
     version: V1.04B
@@ -2014,8 +1904,6 @@ paradent-29:
       interface: Ethernet
       driver: e1000e
       mountable: true
-      switch_name: gw-rennes
-      switch_port: Gi7/2
       ip: 172.16.97.29
     eth1:
       mounted: false
@@ -2054,8 +1942,6 @@ paradent-29:
       size: '625142448'
       rev: GM3O
       vendor: ATA
-  pdu:
-    pdu_name: paradent-pdu-2
 paradent-30:
   bios:
     version: V1.04B
@@ -2085,8 +1971,6 @@ paradent-30:
       interface: Ethernet
       driver: e1000e
       mountable: true
-      switch_name: gw-rennes
-      switch_port: Gi7/8
       ip: 172.16.97.30
     eth1:
       mounted: false
@@ -2125,8 +2009,6 @@ paradent-30:
       size: '625142448'
       rev: GM3O
       vendor: ATA
-  pdu:
-    pdu_name: paradent-pdu-2
 paradent-31:
   bios:
     version: V1.04B
@@ -2156,8 +2038,6 @@ paradent-31:
       interface: Ethernet
       driver: e1000e
       mountable: true
-      switch_name: gw-rennes
-      switch_port: Gi7/15
       ip: 172.16.97.31
     eth1:
       mounted: false
@@ -2196,8 +2076,6 @@ paradent-31:
       size: '625142448'
       rev: GM3O
       vendor: ATA
-  pdu:
-    pdu_name: paradent-pdu-2
 paradent-32:
   bios:
     version: V1.04B
@@ -2221,8 +2099,6 @@ paradent-32:
       interface: Ethernet
       driver: e1000e
       mountable: true
-      switch_name: gw-rennes
-      switch_port: Gi7/16
       ip: 172.16.97.32
     eth1:
       mounted: false
@@ -2267,8 +2143,6 @@ paradent-32:
       size: '625142448'
       rev: GM3O
       vendor: ATA
-  pdu:
-    pdu_name: paradent-pdu-2
 paradent-33:
   bios:
     version: V1.04B
@@ -2292,8 +2166,6 @@ paradent-33:
       interface: Ethernet
       driver: e1000e
       mountable: true
-      switch_name: gw-rennes
-      switch_port: Gi7/20
       ip: 172.16.97.33
     eth1:
       mounted: false
@@ -2338,8 +2210,6 @@ paradent-33:
       size: '625142448'
       rev: GM3O
       vendor: ATA
-  pdu:
-    pdu_name: paradent-pdu-4
 paradent-34:
   bios:
     version: V1.04B
@@ -2359,8 +2229,6 @@ paradent-34:
       interface: Ethernet
       driver: e1000e
       mountable: true
-      switch_name: gw-rennes
-      switch_port: Gi7/19
       ip: 172.16.97.34
     eth1:
       mounted: false
@@ -2409,8 +2277,6 @@ paradent-34:
       size: '625142448'
       rev: GM3O
       vendor: ATA
-  pdu:
-    pdu_name: paradent-pdu-4
 paradent-35:
   bios:
     version: V1.04B
@@ -2436,8 +2302,6 @@ paradent-35:
       interface: Ethernet
       driver: e1000e
       mountable: true
-      switch_name: gw-rennes
-      switch_port: Gi7/17
       ip: 172.16.97.35
     eth1:
       mounted: false
@@ -2480,8 +2344,6 @@ paradent-35:
       size: '625142448'
       rev: GM3O
       vendor: ATA
-  pdu:
-    pdu_name: paradent-pdu-4
 paradent-36:
   bios:
     version: V1.04B
@@ -2511,8 +2373,6 @@ paradent-36:
       interface: Ethernet
       driver: e1000e
       mountable: true
-      switch_name: gw-rennes
-      switch_port: Gi7/11
       ip: 172.16.97.36
     eth1:
       mounted: false
@@ -2551,8 +2411,6 @@ paradent-36:
       size: '625142448'
       rev: GM3O
       vendor: ATA
-  pdu:
-    pdu_name: paradent-pdu-4
 paradent-37:
   bios:
     version: V1.04B
@@ -2582,8 +2440,6 @@ paradent-37:
       interface: Ethernet
       driver: e1000e
       mountable: true
-      switch_name: gw-rennes
-      switch_port: Gi7/18
       ip: 172.16.97.37
     eth1:
       mounted: false
@@ -2622,8 +2478,6 @@ paradent-37:
       size: '625142448'
       rev: GM3O
       vendor: ATA
-  pdu:
-    pdu_name: paradent-pdu-4
 paradent-38:
   bios:
     version: V1.04B
@@ -2653,8 +2507,6 @@ paradent-38:
       interface: Ethernet
       driver: e1000e
       mountable: true
-      switch_name: gw-rennes
-      switch_port: Gi7/13
       ip: 172.16.97.38
     eth1:
       mounted: false
@@ -2693,8 +2545,6 @@ paradent-38:
       size: '625142448'
       rev: GM3O
       vendor: ATA
-  pdu:
-    pdu_name: paradent-pdu-4
 paradent-39:
   bios:
     version: V1.04B
@@ -2724,8 +2574,6 @@ paradent-39:
       interface: Ethernet
       driver: e1000e
       mountable: true
-      switch_name: gw-rennes
-      switch_port: Gi7/12
       ip: 172.16.97.39
     eth1:
       mounted: false
@@ -2764,8 +2612,6 @@ paradent-39:
       size: '625142448'
       rev: GM3O
       vendor: ATA
-  pdu:
-    pdu_name: paradent-pdu-7
 paradent-40:
   bios:
     version: V1.04B
@@ -2789,8 +2635,6 @@ paradent-40:
       interface: Ethernet
       driver: e1000e
       mountable: true
-      switch_name: gw-rennes
-      switch_port: Gi7/14
       ip: 172.16.97.40
     eth1:
       mounted: false
@@ -2835,8 +2679,6 @@ paradent-40:
       size: '625142448'
       rev: GM3O
       vendor: ATA
-  pdu:
-    pdu_name: paradent-pdu-7
 paradent-41:
   bios:
     version: V1.04B
@@ -2856,8 +2698,6 @@ paradent-41:
       interface: Ethernet
       driver: e1000e
       mountable: true
-      switch_name: gw-rennes
-      switch_port: Gi8/16
       ip: 172.16.97.41
     eth1:
       mounted: false
@@ -2906,8 +2746,6 @@ paradent-41:
       size: '625142448'
       rev: GM3O
       vendor: ATA
-  pdu:
-    pdu_name: paradent-pdu-6
 paradent-42:
   bios:
     version: V1.04B
@@ -2937,8 +2775,6 @@ paradent-42:
       interface: Ethernet
       driver: e1000e
       mountable: true
-      switch_name: gw-rennes
-      switch_port: Gi3/15
       ip: 172.16.97.42
     eth1:
       mounted: false
@@ -2977,8 +2813,6 @@ paradent-42:
       size: '625142448'
       rev: GM3O
       vendor: ATA
-  pdu:
-    pdu_name: paradent-pdu-5
 paradent-43:
   bios:
     version: V1.04B
@@ -3002,8 +2836,6 @@ paradent-43:
       interface: Ethernet
       driver: e1000e
       mountable: true
-      switch_name: gw-rennes
-      switch_port: Gi4/22
       ip: 172.16.97.43
     eth1:
       mounted: false
@@ -3048,8 +2880,6 @@ paradent-43:
       size: '625142448'
       rev: GM3O
       vendor: ATA
-  pdu:
-    pdu_name: paradent-pdu-6
 paradent-44:
   bios:
     version: V1.04B
@@ -3069,8 +2899,6 @@ paradent-44:
       interface: Ethernet
       driver: e1000e
       mountable: true
-      switch_name: gw-rennes
-      switch_port: Gi6/1
       ip: 172.16.97.44
     eth1:
       mounted: false
@@ -3119,8 +2947,6 @@ paradent-44:
       size: '625142448'
       rev: GM3O
       vendor: ATA
-  pdu:
-    pdu_name: paradent-pdu-5
 paradent-45:
   bios:
     version: V1.04B
@@ -3150,8 +2976,6 @@ paradent-45:
       interface: Ethernet
       driver: e1000e
       mountable: true
-      switch_name: gw-rennes
-      switch_port: Gi6/6
       ip: 172.16.97.45
     eth1:
       mounted: false
@@ -3190,8 +3014,6 @@ paradent-45:
       size: '625142448'
       rev: GM3O
       vendor: ATA
-  pdu:
-    pdu_name: paradent-pdu-5
 paradent-46:
   bios:
     version: V1.04B
@@ -3215,8 +3037,6 @@ paradent-46:
       interface: Ethernet
       driver: e1000e
       mountable: true
-      switch_name: gw-rennes
-      switch_port: Gi2/11
       ip: 172.16.97.46
     eth1:
       mounted: false
@@ -3261,8 +3081,6 @@ paradent-46:
       size: '625142448'
       rev: GM3O
       vendor: ATA
-  pdu:
-    pdu_name: paradent-pdu-5
 paradent-47:
   bios:
     version: V1.04B
@@ -3288,8 +3106,6 @@ paradent-47:
       interface: Ethernet
       driver: e1000e
       mountable: true
-      switch_name: gw-rennes
-      switch_port: Gi6/5
       ip: 172.16.97.47
     eth1:
       mounted: false
@@ -3332,8 +3148,6 @@ paradent-47:
       size: '625142448'
       rev: GM3O
       vendor: ATA
-  pdu:
-    pdu_name: paradent-pdu-5
 paradent-48:
   bios:
     version: V1.04B
@@ -3357,8 +3171,6 @@ paradent-48:
       interface: Ethernet
       driver: e1000e
       mountable: true
-      switch_name: gw-rennes
-      switch_port: Gi6/4
       ip: 172.16.97.48
     eth1:
       mounted: false
@@ -3403,8 +3215,6 @@ paradent-48:
       size: '625142448'
       rev: GM3O
       vendor: ATA
-  pdu:
-    pdu_name: paradent-pdu-5
 paradent-49:
   bios:
     version: V1.04B
@@ -3434,8 +3244,6 @@ paradent-49:
       interface: Ethernet
       driver: e1000e
       mountable: true
-      switch_name: gw-rennes
-      switch_port: Gi6/3
       ip: 172.16.97.49
     eth1:
       mounted: false
@@ -3474,8 +3282,6 @@ paradent-49:
       size: '625142448'
       rev: GM3O
       vendor: ATA
-  pdu:
-    pdu_name: paradent-pdu-5
 paradent-50:
   bios:
     version: V1.04B
@@ -3495,8 +3301,6 @@ paradent-50:
       interface: Ethernet
       driver: e1000e
       mountable: true
-      switch_name: gw-rennes
-      switch_port: Gi6/2
       ip: 172.16.97.50
     eth1:
       mounted: false
@@ -3545,8 +3349,6 @@ paradent-50:
       size: '625142448'
       rev: GM3O
       vendor: ATA
-  pdu:
-    pdu_name: paradent-pdu-5
 paradent-51:
   bios:
     version: V1.04B
@@ -3570,8 +3372,6 @@ paradent-51:
       interface: Ethernet
       driver: e1000e
       mountable: true
-      switch_name: gw-rennes
-      switch_port: Gi6/10
       ip: 172.16.97.51
     eth1:
       mounted: false
@@ -3616,8 +3416,6 @@ paradent-51:
       size: '625142448'
       rev: GM3O
       vendor: ATA
-  pdu:
-    pdu_name: paradent-pdu-6
 paradent-52:
   bios:
     version: V1.04B
@@ -3647,8 +3445,6 @@ paradent-52:
       interface: Ethernet
       driver: e1000e
       mountable: true
-      switch_name: gw-rennes
-      switch_port: Gi6/9
       ip: 172.16.97.52
     eth1:
       mounted: false
@@ -3687,8 +3483,6 @@ paradent-52:
       size: '625142448'
       rev: GM3O
       vendor: ATA
-  pdu:
-    pdu_name: paradent-pdu-6
 paradent-53:
   bios:
     version: V1.04B
@@ -3718,8 +3512,6 @@ paradent-53:
       interface: Ethernet
       driver: e1000e
       mountable: true
-      switch_name: gw-rennes
-      switch_port: Gi6/7
       ip: 172.16.97.53
     eth1:
       mounted: false
@@ -3758,8 +3550,6 @@ paradent-53:
       size: '625142448'
       rev: GM3O
       vendor: ATA
-  pdu:
-    pdu_name: paradent-pdu-6
 paradent-54:
   bios:
     version: V1.04B
@@ -3779,8 +3569,6 @@ paradent-54:
       interface: Ethernet
       driver: e1000e
       mountable: true
-      switch_name: gw-rennes
-      switch_port: Gi4/18
       ip: 172.16.97.54
     eth1:
       mounted: false
@@ -3829,8 +3617,6 @@ paradent-54:
       size: '625142448'
       rev: GM3O
       vendor: ATA
-  pdu:
-    pdu_name: paradent-pdu-6
 paradent-55:
   bios:
     version: V1.04B
@@ -3856,8 +3642,6 @@ paradent-55:
       interface: Ethernet
       driver: e1000e
       mountable: true
-      switch_name: gw-rennes
-      switch_port: Gi4/19
       ip: 172.16.97.55
     eth1:
       mounted: false
@@ -3900,8 +3684,6 @@ paradent-55:
       size: '625142448'
       rev: GM3O
       vendor: ATA
-  pdu:
-    pdu_name: paradent-pdu-6
 paradent-56:
   bios:
     version: V1.04B
@@ -3927,8 +3709,6 @@ paradent-56:
       interface: Ethernet
       driver: e1000e
       mountable: true
-      switch_name: gw-rennes
-      switch_port: Gi4/17
       ip: 172.16.97.56
     eth1:
       mounted: false
@@ -3971,8 +3751,6 @@ paradent-56:
       size: '625142448'
       rev: GM3O
       vendor: ATA
-  pdu:
-    pdu_name: paradent-pdu-6
 paradent-57:
   bios:
     version: V1.04B
@@ -3996,8 +3774,6 @@ paradent-57:
       interface: Ethernet
       driver: e1000e
       mountable: true
-      switch_name: gw-rennes
-      switch_port: Gi4/14
       ip: 172.16.97.57
     eth1:
       mounted: false
@@ -4042,8 +3818,6 @@ paradent-57:
       size: '625142448'
       rev: GM3O
       vendor: ATA
-  pdu:
-    pdu_name: paradent-pdu-6
 paradent-58:
   bios:
     version: V1.04B
@@ -4073,8 +3847,6 @@ paradent-58:
       interface: Ethernet
       driver: e1000e
       mountable: true
-      switch_name: gw-rennes
-      switch_port: Gi4/15
       ip: 172.16.97.58
     eth1:
       mounted: false
@@ -4113,8 +3885,6 @@ paradent-58:
       size: '625142448'
       rev: GM3O
       vendor: ATA
-  pdu:
-    pdu_name: paradent-pdu-6
 paradent-59:
   bios:
     version: V1.04B
@@ -4144,8 +3914,6 @@ paradent-59:
       interface: Ethernet
       driver: e1000e
       mountable: true
-      switch_name: gw-rennes
-      switch_port: Gi4/13
       ip: 172.16.97.59
     eth1:
       mounted: false
@@ -4184,8 +3952,6 @@ paradent-59:
       size: '625142448'
       rev: GM3O
       vendor: ATA
-  pdu:
-    pdu_name: paradent-pdu-7
 paradent-60:
   bios:
     version: V1.04B
@@ -4215,8 +3981,6 @@ paradent-60:
       interface: Ethernet
       driver: e1000e
       mountable: true
-      switch_name: gw-rennes
-      switch_port: Gi4/20
       ip: 172.16.97.60
     eth1:
       mounted: false
@@ -4255,8 +4019,6 @@ paradent-60:
       size: '625142448'
       rev: GM3O
       vendor: ATA
-  pdu:
-    pdu_name: paradent-pdu-7
 paradent-61:
   bios:
     version: V1.04B
@@ -4286,8 +4048,6 @@ paradent-61:
       interface: Ethernet
       driver: e1000e
       mountable: true
-      switch_name: gw-rennes
-      switch_port: Gi4/11
       ip: 172.16.97.61
     eth1:
       mounted: false
@@ -4326,8 +4086,6 @@ paradent-61:
       size: '625142448'
       rev: GM3O
       vendor: ATA
-  pdu:
-    pdu_name: paradent-pdu-7
 paradent-62:
   bios:
     version: V1.04B
@@ -4357,8 +4115,6 @@ paradent-62:
       interface: Ethernet
       driver: e1000e
       mountable: true
-      switch_name: gw-rennes
-      switch_port: Gi4/16
       ip: 172.16.97.62
     eth1:
       mounted: false
@@ -4397,8 +4153,6 @@ paradent-62:
       size: '625142448'
       rev: GM3O
       vendor: ATA
-  pdu:
-    pdu_name: paradent-pdu-7
 paradent-63:
   operating_system:
     kernel: 2.6.32-5-amd64
@@ -4415,8 +4169,6 @@ paradent-63:
       mac: 00:e0:81:4f:e2:be
       ip: 172.17.97.63
     eth0:
-      switch_name: gw-rennes
-      switch_port: Gi6/21
       mac: 00:e0:81:b2:c1:da
       ip: 172.16.97.63
     eth1:
@@ -4431,8 +4183,6 @@ paradent-63:
       size: '625142448'
       rev: GM3O
       vendor: ATA
-  pdu:
-    pdu_name: paradent-pdu-7
 paradent-64:
   bios:
     version: V1.04B
@@ -4458,8 +4208,6 @@ paradent-64:
       interface: Ethernet
       driver: e1000e
       mountable: true
-      switch_name: gw-rennes
-      switch_port: Gi6/22
       ip: 172.16.97.64
     eth1:
       mounted: false
@@ -4502,5 +4250,3 @@ paradent-64:
       size: '625142448'
       rev: GM3O
       vendor: ATA
-  pdu:
-    pdu_name: paradent-pdu-7
diff --git a/generators/input/sites/rennes/clusters/paradent_manual.yaml b/generators/input/sites/rennes/clusters/paradent_manual.yaml
new file mode 100644
index 00000000000..fcb598d10b5
--- /dev/null
+++ b/generators/input/sites/rennes/clusters/paradent_manual.yaml
@@ -0,0 +1,447 @@
+---
+paradent-1:
+  network_interfaces:
+    eth0:
+      switch_name: gw-rennes
+      switch_port: Gi4/3
+  pdu:
+    pdu_name: paradent-pdu-1
+paradent-2:
+  network_interfaces:
+    eth0:
+      switch_name: gw-rennes
+      switch_port: Gi4/2
+  pdu:
+    pdu_name: paradent-pdu-1
+paradent-3:
+  network_interfaces:
+    eth0:
+      switch_name: gw-rennes
+      switch_port: Gi4/7
+  pdu:
+    pdu_name: paradent-pdu-1
+paradent-4:
+  network_interfaces:
+    eth0:
+      switch_name: gw-rennes
+      switch_port: Gi4/5
+  pdu:
+    pdu_name: paradent-pdu-1
+paradent-5:
+  network_interfaces:
+    eth0:
+      switch_name: gw-rennes
+      switch_port: Gi4/9
+  pdu:
+    pdu_name: paradent-pdu-1
+paradent-6:
+  network_interfaces:
+    eth0:
+      switch_name: gw-rennes
+      switch_port: Gi4/1
+  pdu:
+    pdu_name: paradent-pdu-1
+paradent-7:
+  network_interfaces:
+    eth0:
+      switch_name: gw-rennes
+      switch_port: Gi4/10
+  pdu:
+    pdu_name: paradent-pdu-1
+paradent-8:
+  network_interfaces:
+    eth0:
+      switch_name: gw-rennes
+      switch_port: Gi4/8
+  pdu:
+    pdu_name: paradent-pdu-1
+paradent-9:
+  network_interfaces:
+    eth0:
+      switch_name: gw-rennes
+      switch_port: Gi4/4
+  pdu:
+    pdu_name: paradent-pdu-1
+paradent-10:
+  network_interfaces:
+    eth0:
+      switch_name: gw-rennes
+      switch_port: Gi4/6
+  pdu:
+    pdu_name: paradent-pdu-1
+paradent-11:
+  network_interfaces:
+    eth0:
+      switch_name: gw-rennes
+      switch_port: Gi6/13
+  pdu:
+    pdu_name: paradent-pdu-1
+paradent-12:
+  network_interfaces:
+    eth0:
+      switch_name: gw-rennes
+      switch_port: Gi6/14
+  pdu:
+    pdu_name: paradent-pdu-3
+paradent-13:
+  network_interfaces:
+    eth0:
+      switch_name: gw-rennes
+      switch_port: Gi6/19
+paradent-14:
+  network_interfaces:
+    eth0:
+      switch_name: gw-rennes
+      switch_port: Gi6/11
+  pdu:
+    pdu_name: paradent-pdu-4
+paradent-15:
+  network_interfaces:
+    eth0:
+      switch_name: gw-rennes
+      switch_port: Gi6/15
+  pdu:
+    pdu_name: paradent-pdu-3
+paradent-16:
+  network_interfaces:
+    eth0:
+      switch_name: gw-rennes
+      switch_port: Gi6/16
+  pdu:
+    pdu_name: paradent-pdu-3
+paradent-17:
+  network_interfaces:
+    eth0:
+      switch_name: gw-rennes
+      switch_port: Gi6/20
+  pdu:
+    pdu_name: paradent-pdu-3
+paradent-18:
+  network_interfaces:
+    eth0:
+      switch_name: gw-rennes
+      switch_port: Gi6/12
+  pdu:
+    pdu_name: paradent-pdu-3
+paradent-19:
+  network_interfaces:
+    eth0:
+      switch_name: gw-rennes
+      switch_port: Gi6/17
+  pdu:
+    pdu_name: paradent-pdu-3
+paradent-20:
+  network_interfaces:
+    eth0:
+      switch_name: gw-rennes
+      switch_port: Gi6/18
+  pdu:
+    pdu_name: paradent-pdu-3
+paradent-21:
+  network_interfaces:
+    eth0:
+      switch_name: gw-rennes
+      switch_port: Gi7/7
+  pdu:
+    pdu_name: paradent-pdu-2
+paradent-22:
+  network_interfaces:
+    eth0:
+      switch_name: gw-rennes
+      switch_port: Gi7/10
+  pdu:
+    pdu_name: paradent-pdu-2
+paradent-23:
+  network_interfaces:
+    eth0:
+      switch_name: gw-rennes
+      switch_port: Gi7/3
+  pdu:
+    pdu_name: paradent-pdu-2
+paradent-24:
+  network_interfaces:
+    eth0:
+      switch_name: gw-rennes
+      switch_port: Gi7/6
+  pdu:
+    pdu_name: paradent-pdu-2
+paradent-25:
+  network_interfaces:
+    eth0:
+      switch_name: gw-rennes
+      switch_port: Gi7/4
+  pdu:
+    pdu_name: paradent-pdu-2
+paradent-26:
+  network_interfaces:
+    eth0:
+      switch_name: gw-rennes
+      switch_port: Gi7/1
+  pdu:
+    pdu_name: paradent-pdu-2
+paradent-27:
+  network_interfaces:
+    eth0:
+      switch_name: gw-rennes
+      switch_port: Gi7/9
+  pdu:
+    pdu_name: paradent-pdu-2
+paradent-28:
+  network_interfaces:
+    eth0:
+      switch_name: gw-rennes
+      switch_port: Gi7/5
+  pdu:
+    pdu_name: paradent-pdu-4
+paradent-29:
+  network_interfaces:
+    eth0:
+      switch_name: gw-rennes
+      switch_port: Gi7/2
+  pdu:
+    pdu_name: paradent-pdu-2
+paradent-30:
+  network_interfaces:
+    eth0:
+      switch_name: gw-rennes
+      switch_port: Gi7/8
+  pdu:
+    pdu_name: paradent-pdu-2
+paradent-31:
+  network_interfaces:
+    eth0:
+      switch_name: gw-rennes
+      switch_port: Gi7/15
+  pdu:
+    pdu_name: paradent-pdu-2
+paradent-32:
+  network_interfaces:
+    eth0:
+      switch_name: gw-rennes
+      switch_port: Gi7/16
+  pdu:
+    pdu_name: paradent-pdu-2
+paradent-33:
+  network_interfaces:
+    eth0:
+      switch_name: gw-rennes
+      switch_port: Gi7/20
+  pdu:
+    pdu_name: paradent-pdu-4
+paradent-34:
+  network_interfaces:
+    eth0:
+      switch_name: gw-rennes
+      switch_port: Gi7/19
+  pdu:
+    pdu_name: paradent-pdu-4
+paradent-35:
+  network_interfaces:
+    eth0:
+      switch_name: gw-rennes
+      switch_port: Gi7/17
+  pdu:
+    pdu_name: paradent-pdu-4
+paradent-36:
+  network_interfaces:
+    eth0:
+      switch_name: gw-rennes
+      switch_port: Gi7/11
+  pdu:
+    pdu_name: paradent-pdu-4
+paradent-37:
+  network_interfaces:
+    eth0:
+      switch_name: gw-rennes
+      switch_port: Gi7/18
+  pdu:
+    pdu_name: paradent-pdu-4
+paradent-38:
+  network_interfaces:
+    eth0:
+      switch_name: gw-rennes
+      switch_port: Gi7/13
+  pdu:
+    pdu_name: paradent-pdu-4
+paradent-39:
+  network_interfaces:
+    eth0:
+      switch_name: gw-rennes
+      switch_port: Gi7/12
+  pdu:
+    pdu_name: paradent-pdu-7
+paradent-40:
+  network_interfaces:
+    eth0:
+      switch_name: gw-rennes
+      switch_port: Gi7/14
+  pdu:
+    pdu_name: paradent-pdu-7
+paradent-41:
+  network_interfaces:
+    eth0:
+      switch_name: gw-rennes
+      switch_port: Gi8/16
+  pdu:
+    pdu_name: paradent-pdu-6
+paradent-42:
+  network_interfaces:
+    eth0:
+      switch_name: gw-rennes
+      switch_port: Gi3/15
+  pdu:
+    pdu_name: paradent-pdu-5
+paradent-43:
+  network_interfaces:
+    eth0:
+      switch_name: gw-rennes
+      switch_port: Gi4/22
+  pdu:
+    pdu_name: paradent-pdu-6
+paradent-44:
+  network_interfaces:
+    eth0:
+      switch_name: gw-rennes
+      switch_port: Gi6/1
+  pdu:
+    pdu_name: paradent-pdu-5
+paradent-45:
+  network_interfaces:
+    eth0:
+      switch_name: gw-rennes
+      switch_port: Gi6/6
+  pdu:
+    pdu_name: paradent-pdu-5
+paradent-46:
+  network_interfaces:
+    eth0:
+      switch_name: gw-rennes
+      switch_port: Gi2/11
+  pdu:
+    pdu_name: paradent-pdu-5
+paradent-47:
+  network_interfaces:
+    eth0:
+      switch_name: gw-rennes
+      switch_port: Gi6/5
+  pdu:
+    pdu_name: paradent-pdu-5
+paradent-48:
+  network_interfaces:
+    eth0:
+      switch_name: gw-rennes
+      switch_port: Gi6/4
+  pdu:
+    pdu_name: paradent-pdu-5
+paradent-49:
+  network_interfaces:
+    eth0:
+      switch_name: gw-rennes
+      switch_port: Gi6/3
+  pdu:
+    pdu_name: paradent-pdu-5
+paradent-50:
+  network_interfaces:
+    eth0:
+      switch_name: gw-rennes
+      switch_port: Gi6/2
+  pdu:
+    pdu_name: paradent-pdu-5
+paradent-51:
+  network_interfaces:
+    eth0:
+      switch_name: gw-rennes
+      switch_port: Gi6/10
+  pdu:
+    pdu_name: paradent-pdu-6
+paradent-52:
+  network_interfaces:
+    eth0:
+      switch_name: gw-rennes
+      switch_port: Gi6/9
+  pdu:
+    pdu_name: paradent-pdu-6
+paradent-53:
+  network_interfaces:
+    eth0:
+      switch_name: gw-rennes
+      switch_port: Gi6/7
+  pdu:
+    pdu_name: paradent-pdu-6
+paradent-54:
+  network_interfaces:
+    eth0:
+      switch_name: gw-rennes
+      switch_port: Gi4/18
+  pdu:
+    pdu_name: paradent-pdu-6
+paradent-55:
+  network_interfaces:
+    eth0:
+      switch_name: gw-rennes
+      switch_port: Gi4/19
+  pdu:
+    pdu_name: paradent-pdu-6
+paradent-56:
+  network_interfaces:
+    eth0:
+      switch_name: gw-rennes
+      switch_port: Gi4/17
+  pdu:
+    pdu_name: paradent-pdu-6
+paradent-57:
+  network_interfaces:
+    eth0:
+      switch_name: gw-rennes
+      switch_port: Gi4/14
+  pdu:
+    pdu_name: paradent-pdu-6
+paradent-58:
+  network_interfaces:
+    eth0:
+      switch_name: gw-rennes
+      switch_port: Gi4/15
+  pdu:
+    pdu_name: paradent-pdu-6
+paradent-59:
+  network_interfaces:
+    eth0:
+      switch_name: gw-rennes
+      switch_port: Gi4/13
+  pdu:
+    pdu_name: paradent-pdu-7
+paradent-60:
+  network_interfaces:
+    eth0:
+      switch_name: gw-rennes
+      switch_port: Gi4/20
+  pdu:
+    pdu_name: paradent-pdu-7
+paradent-61:
+  network_interfaces:
+    eth0:
+      switch_name: gw-rennes
+      switch_port: Gi4/11
+  pdu:
+    pdu_name: paradent-pdu-7
+paradent-62:
+  network_interfaces:
+    eth0:
+      switch_name: gw-rennes
+      switch_port: Gi4/16
+  pdu:
+    pdu_name: paradent-pdu-7
+paradent-63:
+  network_interfaces:
+    eth0:
+      switch_name: gw-rennes
+      switch_port: Gi6/21
+  pdu:
+    pdu_name: paradent-pdu-7
+paradent-64:
+  network_interfaces:
+    eth0:
+      switch_name: gw-rennes
+      switch_port: Gi6/22
+  pdu:
+    pdu_name: paradent-pdu-7
diff --git a/generators/input/sites/rennes/clusters/parapide.rb b/generators/input/sites/rennes/clusters/parapide.rb
index ccef152c78e..9b34864343d 100644
--- a/generators/input/sites/rennes/clusters/parapide.rb
+++ b/generators/input/sites/rennes/clusters/parapide.rb
@@ -16,119 +16,119 @@ site :rennes do |site_uid|
         supported_job_types({
           :deploy       => true,
           :besteffort   => true,
-          :virtual      => lookup('parapide', node_uid, 'supported_job_types', 'virtual')
+          :virtual      => lookup('parapide_generated', node_uid, 'supported_job_types', 'virtual')
         })
 
         architecture({
-          :smp_size       => lookup('parapide', node_uid, 'architecture', 'smp_size'),
-          :smt_size       => lookup('parapide', node_uid, 'architecture', 'smt_size'),
-          :platform_type  => lookup('parapide', node_uid, 'architecture', 'platform_type')
+          :smp_size       => lookup('parapide_generated', node_uid, 'architecture', 'smp_size'),
+          :smt_size       => lookup('parapide_generated', node_uid, 'architecture', 'smt_size'),
+          :platform_type  => lookup('parapide_generated', node_uid, 'architecture', 'platform_type')
         })
 
         processor({
-          :vendor             => lookup('parapide', node_uid, 'processor', 'vendor'),
-          :model              => lookup('parapide', node_uid, 'processor', 'model'),
-          :version            => lookup('parapide', node_uid, 'processor', 'version'),
-          :clock_speed        => lookup('parapide', node_uid, 'processor', 'clock_speed'),
-          :instruction_set    => lookup('parapide', node_uid, 'processor', 'instruction_set'),
-          :other_description  => lookup('parapide', node_uid, 'processor', 'other_description'),
-          :cache_l1           => lookup('parapide', node_uid, 'processor', 'cache_l1'),
-          :cache_l1i          => lookup('parapide', node_uid, 'processor', 'cache_l1i'),
-          :cache_l1d          => lookup('parapide', node_uid, 'processor', 'cache_l1d'),
-          :cache_l2           => lookup('parapide', node_uid, 'processor', 'cache_l2'),
-          :cache_l3           => lookup('parapide', node_uid, 'processor', 'cache_l3')
+          :vendor             => lookup('parapide_generated', node_uid, 'processor', 'vendor'),
+          :model              => lookup('parapide_generated', node_uid, 'processor', 'model'),
+          :version            => lookup('parapide_generated', node_uid, 'processor', 'version'),
+          :clock_speed        => lookup('parapide_generated', node_uid, 'processor', 'clock_speed'),
+          :instruction_set    => lookup('parapide_generated', node_uid, 'processor', 'instruction_set'),
+          :other_description  => lookup('parapide_generated', node_uid, 'processor', 'other_description'),
+          :cache_l1           => lookup('parapide_generated', node_uid, 'processor', 'cache_l1'),
+          :cache_l1i          => lookup('parapide_generated', node_uid, 'processor', 'cache_l1i'),
+          :cache_l1d          => lookup('parapide_generated', node_uid, 'processor', 'cache_l1d'),
+          :cache_l2           => lookup('parapide_generated', node_uid, 'processor', 'cache_l2'),
+          :cache_l3           => lookup('parapide_generated', node_uid, 'processor', 'cache_l3')
         })
 
         main_memory({
-          :ram_size     => lookup('parapide', node_uid, 'main_memory', 'ram_size'),
+          :ram_size     => lookup('parapide_generated', node_uid, 'main_memory', 'ram_size'),
           :virtual_size => nil
         })
 
         operating_system({
-          :name     => lookup('parapide', node_uid, 'operating_system', 'name'),
+          :name     => lookup('parapide_generated', node_uid, 'operating_system', 'name'),
           :release  => "Squeeze",
-          :version  => lookup('parapide', node_uid, 'operating_system', 'version'),
-          :kernel   => lookup('parapide', node_uid, 'operating_system', 'kernel')
+          :version  => lookup('parapide_generated', node_uid, 'operating_system', 'version'),
+          :kernel   => lookup('parapide_generated', node_uid, 'operating_system', 'kernel')
         })
 
         storage_devices [{
           :interface  => 'SATA',
-          :size       => lookup('parapide', node_uid, 'block_devices', 'sda', 'size'),
+          :size       => lookup('parapide_generated', node_uid, 'block_devices', 'sda', 'size'),
           :driver     => "ahci",
-          :device     => lookup('parapide', node_uid, 'block_devices', 'sda', 'device'),
-          :model      => lookup('parapide', node_uid, 'block_devices', 'sda', 'model'),
-          :vendor     => lookup('parapide', node_uid, 'block_devices', 'sda', 'vendor'),
-          :rev        => lookup('parapide', node_uid, 'block_devices', 'sda', 'rev')
+          :device     => lookup('parapide_generated', node_uid, 'block_devices', 'sda', 'device'),
+          :model      => lookup('parapide_generated', node_uid, 'block_devices', 'sda', 'model'),
+          :vendor     => lookup('parapide_generated', node_uid, 'block_devices', 'sda', 'vendor'),
+          :rev        => lookup('parapide_generated', node_uid, 'block_devices', 'sda', 'rev')
         }]
 
         network_adapters [{
-          :interface        => lookup('parapide', node_uid, 'network_interfaces', 'eth0', 'interface'),
-          :rate             => lookup('parapide', node_uid, 'network_interfaces', 'eth0', 'rate'),
-          :enabled          => lookup('parapide', node_uid, 'network_interfaces', 'eth0', 'enabled'),
-          :management       => lookup('parapide', node_uid, 'network_interfaces', 'eth0', 'management'),
-          :mountable        => lookup('parapide', node_uid, 'network_interfaces', 'eth0', 'mountable'),
-          :mounted          => lookup('parapide', node_uid, 'network_interfaces', 'eth0', 'mounted'),
+          :interface        => lookup('parapide_generated', node_uid, 'network_interfaces', 'eth0', 'interface'),
+          :rate             => lookup('parapide_generated', node_uid, 'network_interfaces', 'eth0', 'rate'),
+          :enabled          => lookup('parapide_generated', node_uid, 'network_interfaces', 'eth0', 'enabled'),
+          :management       => lookup('parapide_generated', node_uid, 'network_interfaces', 'eth0', 'management'),
+          :mountable        => lookup('parapide_generated', node_uid, 'network_interfaces', 'eth0', 'mountable'),
+          :mounted          => lookup('parapide_generated', node_uid, 'network_interfaces', 'eth0', 'mounted'),
           :bridged          => true,
           :device           => "eth0",
           :vendor           => "Intel",
           :version          => "82575EB",
-          :driver           => lookup('parapide', node_uid, 'network_interfaces', 'eth0', 'driver'),
+          :driver           => lookup('parapide_generated', node_uid, 'network_interfaces', 'eth0', 'driver'),
           :network_address  => "#{node_uid}.#{site_uid}.grid5000.fr",
-          :ip               => lookup('parapide', node_uid, 'network_interfaces', 'eth0', 'ip'),
-          :ip6              => lookup('parapide', node_uid, 'network_interfaces', 'eth0', 'ip6'),
-          :switch           => lookup('parapide', node_uid, 'network_interfaces', 'eth0', 'switch_name'),
-          :switch_port      => lookup('parapide', node_uid, 'network_interfaces', 'eth0', 'switch_port'),
-          :mac              => lookup('parapide', node_uid, 'network_interfaces', 'eth0', 'mac')
+          :ip               => lookup('parapide_generated', node_uid, 'network_interfaces', 'eth0', 'ip'),
+          :ip6              => lookup('parapide_generated', node_uid, 'network_interfaces', 'eth0', 'ip6'),
+          :switch           => lookup('parapide_manual', node_uid, 'network_interfaces', 'eth0', 'switch_name'),
+          :switch_port      => lookup('parapide_manual', node_uid, 'network_interfaces', 'eth0', 'switch_port'),
+          :mac              => lookup('parapide_generated', node_uid, 'network_interfaces', 'eth0', 'mac')
         },
         {
-          :interface        => lookup('parapide', node_uid, 'network_interfaces', 'eth1', 'interface'),
+          :interface        => lookup('parapide_generated', node_uid, 'network_interfaces', 'eth1', 'interface'),
           :rate             => 1.G,
-          :enabled          => lookup('parapide', node_uid, 'network_interfaces', 'eth1', 'enabled'),
-          :management       => lookup('parapide', node_uid, 'network_interfaces', 'eth1', 'management'),
-          :mountable        => lookup('parapide', node_uid, 'network_interfaces', 'eth1', 'mountable'),
-          :mounted          => lookup('parapide', node_uid, 'network_interfaces', 'eth1', 'mounted'),
+          :enabled          => lookup('parapide_generated', node_uid, 'network_interfaces', 'eth1', 'enabled'),
+          :management       => lookup('parapide_generated', node_uid, 'network_interfaces', 'eth1', 'management'),
+          :mountable        => lookup('parapide_generated', node_uid, 'network_interfaces', 'eth1', 'mountable'),
+          :mounted          => lookup('parapide_generated', node_uid, 'network_interfaces', 'eth1', 'mounted'),
           :bridged          => false,
           :device           => "eth1",
           :vendor           => "Intel",
           :version          => "82575EB",
-          :driver           => lookup('parapide', node_uid, 'network_interfaces', 'eth1', 'driver'),
-          :mac              => lookup('parapide', node_uid, 'network_interfaces', 'eth1', 'mac')
+          :driver           => lookup('parapide_generated', node_uid, 'network_interfaces', 'eth1', 'driver'),
+          :mac              => lookup('parapide_generated', node_uid, 'network_interfaces', 'eth1', 'mac')
         },
         {
-          :interface        => lookup('parapide', node_uid, 'network_interfaces', 'ib0', 'interface'),
-          :rate             => lookup('parapide', node_uid, 'network_interfaces', 'ib0', 'rate'),
+          :interface        => lookup('parapide_generated', node_uid, 'network_interfaces', 'ib0', 'interface'),
+          :rate             => lookup('parapide_generated', node_uid, 'network_interfaces', 'ib0', 'rate'),
           :device           => "ib0",
-          :enabled          => lookup('parapide', node_uid, 'network_interfaces', 'ib0', 'enabled'),
-          :management       => lookup('parapide', node_uid, 'network_interfaces', 'ib0', 'management'),
-          :mountable        => lookup('parapide', node_uid, 'network_interfaces', 'ib0', 'mountable'),
-          :mounted          => lookup('parapide', node_uid, 'network_interfaces', 'ib0', 'mounted'),
+          :enabled          => lookup('parapide_generated', node_uid, 'network_interfaces', 'ib0', 'enabled'),
+          :management       => lookup('parapide_generated', node_uid, 'network_interfaces', 'ib0', 'management'),
+          :mountable        => lookup('parapide_generated', node_uid, 'network_interfaces', 'ib0', 'mountable'),
+          :mounted          => lookup('parapide_generated', node_uid, 'network_interfaces', 'ib0', 'mounted'),
           :vendor           => 'Mellanox',
           :version          => "MT25418",
-          :driver           => lookup('parapide', node_uid, 'network_interfaces', 'ib0', 'driver'),
+          :driver           => lookup('parapide_generated', node_uid, 'network_interfaces', 'ib0', 'driver'),
           :network_address  => "#{node_uid}-ib0.#{site_uid}.grid5000.fr",
-          :ip               => lookup('parapide', node_uid, 'network_interfaces', 'ib0', 'ip'),
-          :ip6              => lookup('parapide', node_uid, 'network_interfaces', 'ib0', 'ip6'),
-          :guid             => lookup('parapide', node_uid, 'network_interfaces', 'ib0', 'guid')
+          :ip               => lookup('parapide_generated', node_uid, 'network_interfaces', 'ib0', 'ip'),
+          :ip6              => lookup('parapide_generated', node_uid, 'network_interfaces', 'ib0', 'ip6'),
+          :guid             => lookup('parapide_generated', node_uid, 'network_interfaces', 'ib0', 'guid')
         },
         {
-          :interface        => lookup('parapide', node_uid, 'network_interfaces', 'ib1', 'interface'),
-          :rate             => lookup('parapide', node_uid, 'network_interfaces', 'ib1', 'rate'),
+          :interface        => lookup('parapide_generated', node_uid, 'network_interfaces', 'ib1', 'interface'),
+          :rate             => lookup('parapide_generated', node_uid, 'network_interfaces', 'ib1', 'rate'),
           :device           => "ib1",
-          :enabled          => lookup('parapide', node_uid, 'network_interfaces', 'ib1', 'enabled'),
-          :management       => lookup('parapide', node_uid, 'network_interfaces', 'ib1', 'management'),
-          :mountable        => lookup('parapide', node_uid, 'network_interfaces', 'ib1', 'mountable'),
-          :mounted          => lookup('parapide', node_uid, 'network_interfaces', 'ib1', 'mounted'),
+          :enabled          => lookup('parapide_generated', node_uid, 'network_interfaces', 'ib1', 'enabled'),
+          :management       => lookup('parapide_generated', node_uid, 'network_interfaces', 'ib1', 'management'),
+          :mountable        => lookup('parapide_generated', node_uid, 'network_interfaces', 'ib1', 'mountable'),
+          :mounted          => lookup('parapide_generated', node_uid, 'network_interfaces', 'ib1', 'mounted'),
           :vendor           => 'Mellanox',
           :version          => "MT25418",
-          :driver           => lookup('parapide', node_uid, 'network_interfaces', 'ib1', 'driver'),
-          :guid             => lookup('parapide', node_uid, 'network_interfaces', 'ib1', 'guid')
+          :driver           => lookup('parapide_generated', node_uid, 'network_interfaces', 'ib1', 'driver'),
+          :guid             => lookup('parapide_generated', node_uid, 'network_interfaces', 'ib1', 'guid')
         },
         {
           :interface            => 'Ethernet',
           :rate                 => 1.G,
           :network_address      => "#{node_uid}-bmc.#{site_uid}.grid5000.fr",
-          :ip                   => lookup('parapide', node_uid, 'network_interfaces', 'bmc', 'ip'),
-          :mac                  => lookup('parapide', node_uid, 'network_interfaces', 'bmc', 'mac'),
+          :ip                   => lookup('parapide_generated', node_uid, 'network_interfaces', 'bmc', 'ip'),
+          :mac                  => lookup('parapide_generated', node_uid, 'network_interfaces', 'bmc', 'mac'),
           :enabled              => true,
           :mounted              => false,
           :mountable            => false,
@@ -137,21 +137,21 @@ site :rennes do |site_uid|
         }]
 
         chassis({
-          :serial       => lookup('parapide', node_uid, 'chassis', 'serial_number'),
-          :name         => lookup('parapide', node_uid, 'chassis', 'product_name'),
-          :manufacturer => lookup('parapide', node_uid, 'chassis', 'manufacturer')
+          :serial        => lookup('parapide_generated', node_uid, 'chassis', 'serial_number'),
+          :name          => lookup('parapide_generated', node_uid, 'chassis', 'product_name'),
+          :manufacturer  => lookup('parapide_generated', node_uid, 'chassis', 'manufacturer')
         })
 
         bios({
-          :version      => lookup('parapide', node_uid, 'bios', 'version'),
-          :vendor       => lookup('parapide', node_uid, 'bios', 'vendor'),
-          :release_date => lookup('parapide', node_uid, 'bios', 'release_date')
+          :version      => lookup('parapide_generated', node_uid, 'bios', 'version'),
+          :vendor       => lookup('parapide_generated', node_uid, 'bios', 'vendor'),
+          :release_date => lookup('parapide_generated', node_uid, 'bios', 'release_date')
         })
 
         bios({
-          :version      => lookup('parapide', node_uid, 'bios', 'version'),
-          :vendor       => lookup('parapide', node_uid, 'bios', 'vendor'),
-          :release_date => lookup('parapide', node_uid, 'bios', 'release_date')
+          :version      => lookup('parapide_generated', node_uid, 'bios', 'version'),
+          :vendor       => lookup('parapide_generated', node_uid, 'bios', 'vendor'),
+          :release_date => lookup('parapide_generated', node_uid, 'bios', 'release_date')
         })
 
         gpu({
@@ -167,7 +167,7 @@ site :rennes do |site_uid|
           :power => {
             :available => true,
             :via => {
-              :pdu      => { :uid => lookup('parapide', node_uid, 'pdu', 'pdu_name') },
+              :pdu      => { :uid => lookup('parapide_manual', node_uid, 'pdu', 'pdu_name') },
             }
           },
           :temperature => {
diff --git a/generators/input/sites/rennes/clusters/parapide.yaml b/generators/input/sites/rennes/clusters/parapide_generated.yaml
similarity index 95%
rename from generators/input/sites/rennes/clusters/parapide.yaml
rename to generators/input/sites/rennes/clusters/parapide_generated.yaml
index f4ce3f05006..a60d77c10be 100644
--- a/generators/input/sites/rennes/clusters/parapide.yaml
+++ b/generators/input/sites/rennes/clusters/parapide_generated.yaml
@@ -50,8 +50,6 @@ parapide-1:
       interface: Ethernet
       driver: igb
       mountable: true
-      switch_name: gw-rennes
-      switch_port: Gi7/47
       ip: 172.16.98.1
     eth1:
       mounted: false
@@ -90,8 +88,6 @@ parapide-1:
       size: '976773168'
       rev: GK6O
       vendor: ATA
-  pdu:
-    pdu_name: parapide-pdu-4
 parapide-2:
   bios:
     version: '1.14'
@@ -133,8 +129,6 @@ parapide-2:
       interface: Ethernet
       driver: igb
       mountable: true
-      switch_name: gw-rennes
-      switch_port: Gi7/48
       ip: 172.16.98.2
     eth1:
       mounted: false
@@ -183,8 +177,6 @@ parapide-2:
       size: '976773168'
       rev: GK6O
       vendor: ATA
-  pdu:
-    pdu_name: parapide-pdu-3
 parapide-3:
   bios:
     version: '1.14'
@@ -236,8 +228,6 @@ parapide-3:
       interface: Ethernet
       driver: igb
       mountable: true
-      switch_name: gw-rennes
-      switch_port: Gi7/34
       ip: 172.16.98.3
     eth1:
       mounted: false
@@ -276,8 +266,6 @@ parapide-3:
       size: '976773168'
       rev: GK6O
       vendor: ATA
-  pdu:
-    pdu_name: parapide-pdu-4
 parapide-4:
   bios:
     version: '1.14'
@@ -329,8 +317,6 @@ parapide-4:
       interface: Ethernet
       driver: igb
       mountable: true
-      switch_name: gw-rennes
-      switch_port: Gi7/46
       ip: 172.16.98.4
     eth1:
       mounted: false
@@ -369,8 +355,6 @@ parapide-4:
       size: '976773168'
       rev: GK6O
       vendor: ATA
-  pdu:
-    pdu_name: parapide-pdu-3
 parapide-5:
   bios:
     version: '1.14'
@@ -422,8 +406,6 @@ parapide-5:
       interface: Ethernet
       driver: igb
       mountable: true
-      switch_name: gw-rennes
-      switch_port: Gi7/44
       ip: 172.16.98.5
     eth1:
       mounted: false
@@ -462,8 +444,6 @@ parapide-5:
       size: '976773168'
       rev: GK6O
       vendor: ATA
-  pdu:
-    pdu_name: parapide-pdu-3
 parapide-6:
   bios:
     version: '1.14'
@@ -511,8 +491,6 @@ parapide-6:
       interface: Ethernet
       driver: igb
       mountable: true
-      switch_name: gw-rennes
-      switch_port: Gi7/39
       ip: 172.16.98.6
     eth1:
       mounted: false
@@ -555,8 +533,6 @@ parapide-6:
       size: '976773168'
       rev: GK6O
       vendor: ATA
-  pdu:
-    pdu_name: parapide-pdu-4
 parapide-7:
   bios:
     version: '1.14'
@@ -604,8 +580,6 @@ parapide-7:
       interface: Ethernet
       driver: igb
       mountable: true
-      switch_name: gw-rennes
-      switch_port: Gi7/40
       ip: 172.16.98.7
     eth1:
       mounted: false
@@ -648,8 +622,6 @@ parapide-7:
       size: '976773168'
       rev: GK6O
       vendor: ATA
-  pdu:
-    pdu_name: parapide-pdu-4
 parapide-8:
   bios:
     version: '1.14'
@@ -695,8 +667,6 @@ parapide-8:
       interface: Ethernet
       driver: igb
       mountable: true
-      switch_name: gw-rennes
-      switch_port: Gi7/42
       ip: 172.16.98.8
     eth1:
       mounted: false
@@ -741,8 +711,6 @@ parapide-8:
       size: '976773168'
       rev: GK6O
       vendor: ATA
-  pdu:
-    pdu_name: parapide-pdu-3
 parapide-9:
   bios:
     version: '1.14'
@@ -794,8 +762,6 @@ parapide-9:
       interface: Ethernet
       driver: igb
       mountable: true
-      switch_name: gw-rennes
-      switch_port: Gi7/41
       ip: 172.16.98.9
     eth1:
       mounted: false
@@ -834,8 +800,6 @@ parapide-9:
       size: '976773168'
       rev: GK6O
       vendor: ATA
-  pdu:
-    pdu_name: parapide-pdu-3
 parapide-10:
   bios:
     version: '1.14'
@@ -881,8 +845,6 @@ parapide-10:
       interface: Ethernet
       driver: igb
       mountable: true
-      switch_name: gw-rennes
-      switch_port: Gi7/43
       ip: 172.16.98.10
     eth1:
       mounted: false
@@ -927,8 +889,6 @@ parapide-10:
       size: '976773168'
       rev: GK6O
       vendor: ATA
-  pdu:
-    pdu_name: parapide-pdu-3
 parapide-11:
   bios:
     version: '1.14'
@@ -980,8 +940,6 @@ parapide-11:
       interface: Ethernet
       driver: igb
       mountable: true
-      switch_name: gw-rennes
-      switch_port: Gi6/45
       ip: 172.16.98.11
     eth1:
       mounted: false
@@ -1020,8 +978,6 @@ parapide-11:
       size: '976773168'
       rev: GK6O
       vendor: ATA
-  pdu:
-    pdu_name: parapide-pdu-4
 parapide-12:
   bios:
     version: '1.14'
@@ -1069,8 +1025,6 @@ parapide-12:
       interface: Ethernet
       driver: igb
       mountable: true
-      switch_name: gw-rennes
-      switch_port: Gi6/48
       ip: 172.16.98.12
     eth1:
       mounted: false
@@ -1113,8 +1067,6 @@ parapide-12:
       size: '976773168'
       rev: GK6O
       vendor: ATA
-  pdu:
-    pdu_name: parapide-pdu-4
 parapide-13:
   bios:
     version: '1.14'
@@ -1160,8 +1112,6 @@ parapide-13:
       interface: Ethernet
       driver: igb
       mountable: true
-      switch_name: gw-rennes
-      switch_port: Gi6/47
       ip: 172.16.98.13
     eth1:
       mounted: false
@@ -1206,8 +1156,6 @@ parapide-13:
       size: '976773168'
       rev: GK6O
       vendor: ATA
-  pdu:
-    pdu_name: parapide-pdu-4
 parapide-14:
   bios:
     version: '1.14'
@@ -1259,8 +1207,6 @@ parapide-14:
       interface: Ethernet
       driver: igb
       mountable: true
-      switch_name: gw-rennes
-      switch_port: Gi6/44
       ip: 172.16.98.14
     eth1:
       mounted: false
@@ -1299,8 +1245,6 @@ parapide-14:
       size: '976773168'
       rev: GK6O
       vendor: ATA
-  pdu:
-    pdu_name: parapide-pdu-1
 parapide-15:
   bios:
     version: '1.14'
@@ -1352,8 +1296,6 @@ parapide-15:
       interface: Ethernet
       driver: igb
       mountable: true
-      switch_name: gw-rennes
-      switch_port: Gi6/46
       ip: 172.16.98.15
     eth1:
       mounted: false
@@ -1392,8 +1334,6 @@ parapide-15:
       size: '976773168'
       rev: GK6O
       vendor: ATA
-  pdu:
-    pdu_name: parapide-pdu-2
 parapide-16:
   bios:
     version: '1.14'
@@ -1441,8 +1381,6 @@ parapide-16:
       interface: Ethernet
       driver: igb
       mountable: true
-      switch_name: gw-rennes
-      switch_port: Gi6/42
       ip: 172.16.98.16
     eth1:
       mounted: false
@@ -1485,8 +1423,6 @@ parapide-16:
       size: '976773168'
       rev: GK6O
       vendor: ATA
-  pdu:
-    pdu_name: parapide-pdu-1
 parapide-17:
   bios:
     version: '1.14'
@@ -1528,8 +1464,6 @@ parapide-17:
       interface: Ethernet
       driver: igb
       mountable: true
-      switch_name: gw-rennes
-      switch_port: Gi6/41
       ip: 172.16.98.17
     eth1:
       mounted: false
@@ -1578,8 +1512,6 @@ parapide-17:
       size: '976773168'
       rev: GK6O
       vendor: ATA
-  pdu:
-    pdu_name: parapide-pdu-2
 parapide-18:
   bios:
     version: '1.14'
@@ -1621,8 +1553,6 @@ parapide-18:
       interface: Ethernet
       driver: igb
       mountable: true
-      switch_name: gw-rennes
-      switch_port: Gi6/39
       ip: 172.16.98.18
     eth1:
       mounted: false
@@ -1671,8 +1601,6 @@ parapide-18:
       size: '976773168'
       rev: GK6O
       vendor: ATA
-  pdu:
-    pdu_name: parapide-pdu-1
 parapide-19:
   bios:
     version: '1.14'
@@ -1714,8 +1642,6 @@ parapide-19:
       interface: Ethernet
       driver: igb
       mountable: true
-      switch_name: gw-rennes
-      switch_port: Gi6/40
       ip: 172.16.98.19
     eth1:
       mounted: false
@@ -1764,8 +1690,6 @@ parapide-19:
       size: '976773168'
       rev: GK6O
       vendor: ATA
-  pdu:
-    pdu_name: parapide-pdu-2
 parapide-20:
   bios:
     version: '1.14'
@@ -1811,8 +1735,6 @@ parapide-20:
       interface: Ethernet
       driver: igb
       mountable: true
-      switch_name: gw-rennes
-      switch_port: Gi6/43
       ip: 172.16.98.20
     eth1:
       mounted: false
@@ -1857,8 +1779,6 @@ parapide-20:
       size: '976773168'
       rev: GK6O
       vendor: ATA
-  pdu:
-    pdu_name: parapide-pdu-1
 parapide-21:
   bios:
     version: '1.14'
@@ -1910,8 +1830,6 @@ parapide-21:
       interface: Ethernet
       driver: igb
       mountable: true
-      switch_name: gw-rennes
-      switch_port: Gi7/36
       ip: 172.16.98.21
     eth1:
       mounted: false
@@ -1950,8 +1868,6 @@ parapide-21:
       size: '976773168'
       rev: GK6O
       vendor: ATA
-  pdu:
-    pdu_name: parapide-pdu-2
 parapide-22:
   bios:
     version: '1.14'
@@ -1993,8 +1909,6 @@ parapide-22:
       interface: Ethernet
       driver: igb
       mountable: true
-      switch_name: gw-rennes
-      switch_port: Gi6/38
       ip: 172.16.98.22
     eth1:
       mounted: false
@@ -2043,8 +1957,6 @@ parapide-22:
       size: '976773168'
       rev: GK6O
       vendor: ATA
-  pdu:
-    pdu_name: parapide-pdu-1
 parapide-23:
   bios:
     version: '1.14'
@@ -2096,8 +2008,6 @@ parapide-23:
       interface: Ethernet
       driver: igb
       mountable: true
-      switch_name: gw-rennes
-      switch_port: Gi7/37
       ip: 172.16.98.23
     eth1:
       mounted: false
@@ -2136,8 +2046,6 @@ parapide-23:
       size: '976773168'
       rev: GK6O
       vendor: ATA
-  pdu:
-    pdu_name: parapide-pdu-2
 parapide-24:
   bios:
     version: '1.14'
@@ -2185,8 +2093,6 @@ parapide-24:
       interface: Ethernet
       driver: igb
       mountable: true
-      switch_name: gw-rennes
-      switch_port: Gi6/37
       ip: 172.16.98.24
     eth1:
       mounted: false
@@ -2229,8 +2135,6 @@ parapide-24:
       size: '976773168'
       rev: GK6O
       vendor: ATA
-  pdu:
-    pdu_name: parapide-pdu-1
 parapide-25:
   bios:
     version: '1.14'
@@ -2282,8 +2186,6 @@ parapide-25:
       interface: Ethernet
       driver: igb
       mountable: true
-      switch_name: gw-rennes
-      switch_port: Gi7/38
       ip: 172.16.98.25
     eth1:
       mounted: false
@@ -2322,5 +2224,3 @@ parapide-25:
       size: '976773168'
       rev: GK6O
       vendor: ATA
-  pdu:
-    pdu_name: parapide-pdu-2
diff --git a/generators/input/sites/rennes/clusters/parapide_manual.yaml b/generators/input/sites/rennes/clusters/parapide_manual.yaml
new file mode 100644
index 00000000000..aa69fe28290
--- /dev/null
+++ b/generators/input/sites/rennes/clusters/parapide_manual.yaml
@@ -0,0 +1,176 @@
+---
+parapide-1:
+  network_interfaces:
+    eth0:
+      switch_name: gw-rennes
+      switch_port: Gi7/47
+  pdu:
+    pdu_name: parapide-pdu-4
+parapide-2:
+  network_interfaces:
+    eth0:
+      switch_name: gw-rennes
+      switch_port: Gi7/48
+  pdu:
+    pdu_name: parapide-pdu-3
+parapide-3:
+  network_interfaces:
+    eth0:
+      switch_name: gw-rennes
+      switch_port: Gi7/34
+  pdu:
+    pdu_name: parapide-pdu-4
+parapide-4:
+  network_interfaces:
+    eth0:
+      switch_name: gw-rennes
+      switch_port: Gi7/46
+  pdu:
+    pdu_name: parapide-pdu-3
+parapide-5:
+  network_interfaces:
+    eth0:
+      switch_name: gw-rennes
+      switch_port: Gi7/44
+  pdu:
+    pdu_name: parapide-pdu-3
+parapide-6:
+  network_interfaces:
+    eth0:
+      switch_name: gw-rennes
+      switch_port: Gi7/39
+  pdu:
+    pdu_name: parapide-pdu-4
+parapide-7:
+  network_interfaces:
+    eth0:
+      switch_name: gw-rennes
+      switch_port: Gi7/40
+  pdu:
+    pdu_name: parapide-pdu-4
+parapide-8:
+  network_interfaces:
+    eth0:
+      switch_name: gw-rennes
+      switch_port: Gi7/42
+  pdu:
+    pdu_name: parapide-pdu-3
+parapide-9:
+  network_interfaces:
+    eth0:
+      switch_name: gw-rennes
+      switch_port: Gi7/41
+  pdu:
+    pdu_name: parapide-pdu-3
+parapide-10:
+  network_interfaces:
+    eth0:
+      switch_name: gw-rennes
+      switch_port: Gi7/43
+  pdu:
+    pdu_name: parapide-pdu-3
+parapide-11:
+  network_interfaces:
+    eth0:
+      switch_name: gw-rennes
+      switch_port: Gi6/45
+  pdu:
+    pdu_name: parapide-pdu-4
+parapide-12:
+  network_interfaces:
+    eth0:
+      switch_name: gw-rennes
+      switch_port: Gi6/48
+  pdu:
+    pdu_name: parapide-pdu-4
+parapide-13:
+  network_interfaces:
+    eth0:
+      switch_name: gw-rennes
+      switch_port: Gi6/47
+  pdu:
+    pdu_name: parapide-pdu-4
+parapide-14:
+  network_interfaces:
+    eth0:
+      switch_name: gw-rennes
+      switch_port: Gi6/44
+  pdu:
+    pdu_name: parapide-pdu-1
+parapide-15:
+  network_interfaces:
+    eth0:
+      switch_name: gw-rennes
+      switch_port: Gi6/46
+  pdu:
+    pdu_name: parapide-pdu-2
+parapide-16:
+  network_interfaces:
+    eth0:
+      switch_name: gw-rennes
+      switch_port: Gi6/42
+  pdu:
+    pdu_name: parapide-pdu-1
+parapide-17:
+  network_interfaces:
+    eth0:
+      switch_name: gw-rennes
+      switch_port: Gi6/41
+  pdu:
+    pdu_name: parapide-pdu-2
+parapide-18:
+  network_interfaces:
+    eth0:
+      switch_name: gw-rennes
+      switch_port: Gi6/39
+  pdu:
+    pdu_name: parapide-pdu-1
+parapide-19:
+  network_interfaces:
+    eth0:
+      switch_name: gw-rennes
+      switch_port: Gi6/40
+  pdu:
+    pdu_name: parapide-pdu-2
+parapide-20:
+  network_interfaces:
+    eth0:
+      switch_name: gw-rennes
+      switch_port: Gi6/43
+  pdu:
+    pdu_name: parapide-pdu-1
+parapide-21:
+  network_interfaces:
+    eth0:
+      switch_name: gw-rennes
+      switch_port: Gi7/36
+  pdu:
+    pdu_name: parapide-pdu-2
+parapide-22:
+  network_interfaces:
+    eth0:
+      switch_name: gw-rennes
+      switch_port: Gi6/38
+  pdu:
+    pdu_name: parapide-pdu-1
+parapide-23:
+  network_interfaces:
+    eth0:
+      switch_name: gw-rennes
+      switch_port: Gi7/37
+  pdu:
+    pdu_name: parapide-pdu-2
+parapide-24:
+  network_interfaces:
+    eth0:
+      switch_name: gw-rennes
+      switch_port: Gi6/37
+  pdu:
+    pdu_name: parapide-pdu-1
+parapide-25:
+  network_interfaces:
+    eth0:
+      switch_name: gw-rennes
+      switch_port: Gi7/38
+  pdu:
+    pdu_name: parapide-pdu-2
diff --git a/generators/input/sites/rennes/clusters/parapluie.rb b/generators/input/sites/rennes/clusters/parapluie.rb
index d752733fbe0..9f59d09993b 100644
--- a/generators/input/sites/rennes/clusters/parapluie.rb
+++ b/generators/input/sites/rennes/clusters/parapluie.rb
@@ -16,147 +16,147 @@ site :rennes do |site_uid|
         supported_job_types({
           :deploy       => true,
           :besteffort   => true,
-          :virtual      => lookup('parapluie', node_uid, 'supported_job_types', 'virtual')
+          :virtual      => lookup('parapluie_generated', node_uid, 'supported_job_types', 'virtual')
         })
 
         architecture({
-          :smp_size       => lookup('parapluie', node_uid, 'architecture', 'smp_size'),
-          :smt_size       => lookup('parapluie', node_uid, 'architecture', 'smt_size'),
-          :platform_type  => lookup('parapluie', node_uid, 'architecture', 'platform_type')
+          :smp_size       => lookup('parapluie_generated', node_uid, 'architecture', 'smp_size'),
+          :smt_size       => lookup('parapluie_generated', node_uid, 'architecture', 'smt_size'),
+          :platform_type  => lookup('parapluie_generated', node_uid, 'architecture', 'platform_type')
         })
 
         processor({
-          :vendor             => lookup('parapluie', node_uid, 'processor', 'vendor'),
-          :model              => lookup('parapluie', node_uid, 'processor', 'model'),
-          :version            => lookup('parapluie', node_uid, 'processor', 'version'),
-          :clock_speed        => lookup('parapluie', node_uid, 'processor', 'clock_speed'),
-          :instruction_set    => lookup('parapluie', node_uid, 'processor', 'instruction_set'),
-          :other_description  => lookup('parapluie', node_uid, 'processor', 'other_description'),
-          :cache_l1           => lookup('parapluie', node_uid, 'processor', 'cache_l1'),
-          :cache_l1i          => lookup('parapluie', node_uid, 'processor', 'cache_l1i'),
-          :cache_l1d          => lookup('parapluie', node_uid, 'processor', 'cache_l1d'),
-          :cache_l2           => lookup('parapluie', node_uid, 'processor', 'cache_l2'),
-          :cache_l3           => lookup('parapluie', node_uid, 'processor', 'cache_l3')
+          :vendor             => lookup('parapluie_generated', node_uid, 'processor', 'vendor'),
+          :model              => lookup('parapluie_generated', node_uid, 'processor', 'model'),
+          :version            => lookup('parapluie_generated', node_uid, 'processor', 'version'),
+          :clock_speed        => lookup('parapluie_generated', node_uid, 'processor', 'clock_speed'),
+          :instruction_set    => lookup('parapluie_generated', node_uid, 'processor', 'instruction_set'),
+          :other_description  => lookup('parapluie_generated', node_uid, 'processor', 'other_description'),
+          :cache_l1           => lookup('parapluie_generated', node_uid, 'processor', 'cache_l1'),
+          :cache_l1i          => lookup('parapluie_generated', node_uid, 'processor', 'cache_l1i'),
+          :cache_l1d          => lookup('parapluie_generated', node_uid, 'processor', 'cache_l1d'),
+          :cache_l2           => lookup('parapluie_generated', node_uid, 'processor', 'cache_l2'),
+          :cache_l3           => lookup('parapluie_generated', node_uid, 'processor', 'cache_l3')
         })
 
         main_memory({
-          :ram_size     => lookup('parapluie', node_uid, 'main_memory', 'ram_size'),
+          :ram_size     => lookup('parapluie_generated', node_uid, 'main_memory', 'ram_size'),
           :virtual_size => nil
         })
 
         operating_system({
-          :name     => lookup('parapluie', node_uid, 'operating_system', 'name'),
+          :name     => lookup('parapluie_generated', node_uid, 'operating_system', 'name'),
           :release  => "Squeeze",
-          :version  => lookup('parapluie', node_uid, 'operating_system', 'version'),
-          :kernel   => lookup('parapluie', node_uid, 'operating_system', 'kernel')
+          :version  => lookup('parapluie_generated', node_uid, 'operating_system', 'version'),
+          :kernel   => lookup('parapluie_generated', node_uid, 'operating_system', 'kernel')
         })
 
         storage_devices [{
           :interface  => 'SATA',
-          :size       => lookup('parapluie', node_uid, 'block_devices', 'sda', 'size'),
+          :size       => lookup('parapluie_generated', node_uid, 'block_devices', 'sda', 'size'),
           :driver     => "ahci",
-          :device     => lookup('parapluie', node_uid, 'block_devices', 'sda', 'device'),
-          :model      => lookup('parapluie', node_uid, 'block_devices', 'sda', 'model'),
-          :vendor     => lookup('parapluie', node_uid, 'block_devices', 'sda', 'vendor'),
-          :rev        => lookup('parapluie', node_uid, 'block_devices', 'sda', 'rev')
+          :device     => lookup('parapluie_generated', node_uid, 'block_devices', 'sda', 'device'),
+          :model      => lookup('parapluie_generated', node_uid, 'block_devices', 'sda', 'model'),
+          :vendor     => lookup('parapluie_generated', node_uid, 'block_devices', 'sda', 'vendor'),
+          :rev        => lookup('parapluie_generated', node_uid, 'block_devices', 'sda', 'rev')
         }]
 
         network_adapters [{
-          :interface        => lookup('parapluie', node_uid, 'network_interfaces', 'eth0', 'interface'),
-          :rate             => lookup('parapluie', node_uid, 'network_interfaces', 'eth0', 'rate'),
-          :enabled          => lookup('parapluie', node_uid, 'network_interfaces', 'eth0', 'enabled'),
-          :management       => lookup('parapluie', node_uid, 'network_interfaces', 'eth0', 'management'),
-          :mountable        => lookup('parapluie', node_uid, 'network_interfaces', 'eth0', 'mountable'),
-          :mounted          => lookup('parapluie', node_uid, 'network_interfaces', 'eth0', 'mounted'),
+          :interface        => lookup('parapluie_generated', node_uid, 'network_interfaces', 'eth0', 'interface'),
+          :rate             => lookup('parapluie_generated', node_uid, 'network_interfaces', 'eth0', 'rate'),
+          :enabled          => lookup('parapluie_generated', node_uid, 'network_interfaces', 'eth0', 'enabled'),
+          :management       => lookup('parapluie_generated', node_uid, 'network_interfaces', 'eth0', 'management'),
+          :mountable        => lookup('parapluie_generated', node_uid, 'network_interfaces', 'eth0', 'mountable'),
+          :mounted          => lookup('parapluie_generated', node_uid, 'network_interfaces', 'eth0', 'mounted'),
           :device           => "eth0",
           :bridged          => false,
           :vendor           => "Intel",
           :version          => "82576",
-          :driver           => lookup('parapluie', node_uid, 'network_interfaces', 'eth0', 'driver'),
-          :mac              => lookup('parapluie', node_uid, 'network_interfaces', 'eth0', 'mac')
+          :driver           => lookup('parapluie_generated', node_uid, 'network_interfaces', 'eth0', 'driver'),
+          :mac              => lookup('parapluie_generated', node_uid, 'network_interfaces', 'eth0', 'mac')
         },
         {
-          :interface        => lookup('parapluie', node_uid, 'network_interfaces', 'eth1', 'interface'),
-          :rate             => lookup('parapluie', node_uid, 'network_interfaces', 'eth1', 'rate'),
-          :enabled          => lookup('parapluie', node_uid, 'network_interfaces', 'eth1', 'enabled'),
-          :management       => lookup('parapluie', node_uid, 'network_interfaces', 'eth1', 'management'),
-          :mountable        => lookup('parapluie', node_uid, 'network_interfaces', 'eth1', 'mountable'),
-          :mounted          => lookup('parapluie', node_uid, 'network_interfaces', 'eth1', 'mounted'),
+          :interface        => lookup('parapluie_generated', node_uid, 'network_interfaces', 'eth1', 'interface'),
+          :rate             => lookup('parapluie_generated', node_uid, 'network_interfaces', 'eth1', 'rate'),
+          :enabled          => lookup('parapluie_generated', node_uid, 'network_interfaces', 'eth1', 'enabled'),
+          :management       => lookup('parapluie_generated', node_uid, 'network_interfaces', 'eth1', 'management'),
+          :mountable        => lookup('parapluie_generated', node_uid, 'network_interfaces', 'eth1', 'mountable'),
+          :mounted          => lookup('parapluie_generated', node_uid, 'network_interfaces', 'eth1', 'mounted'),
           :bridged          => true,
           :device           => "eth1",
           :vendor           => "Intel",
           :version          => "82576",
-          :driver           => lookup('parapluie', node_uid, 'network_interfaces', 'eth1', 'driver'),
+          :driver           => lookup('parapluie_generated', node_uid, 'network_interfaces', 'eth1', 'driver'),
           :network_address  => "#{node_uid}.#{site_uid}.grid5000.fr",
-          :ip               => lookup('parapluie', node_uid, 'network_interfaces', 'eth1', 'ip'),
-          :ip6              => lookup('parapluie', node_uid, 'network_interfaces', 'eth1', 'ip6'),
-          :switch           => lookup('parapluie', node_uid, 'network_interfaces', 'eth1', 'switch_name'),
-          :switch_port      => lookup('parapluie', node_uid, 'network_interfaces', 'eth1', 'switch_port'),
-          :mac              => lookup('parapluie', node_uid, 'network_interfaces', 'eth1', 'mac')
+          :ip               => lookup('parapluie_generated', node_uid, 'network_interfaces', 'eth1', 'ip'),
+          :ip6              => lookup('parapluie_generated', node_uid, 'network_interfaces', 'eth1', 'ip6'),
+          :switch           => lookup('parapluie_manual', node_uid, 'network_interfaces', 'eth1', 'switch_name'),
+          :switch_port      => lookup('parapluie_manual', node_uid, 'network_interfaces', 'eth1', 'switch_port'),
+          :mac              => lookup('parapluie_generated', node_uid, 'network_interfaces', 'eth1', 'mac')
         },
         {
-          :interface        => lookup('parapluie', node_uid, 'network_interfaces', 'eth2', 'interface'),
+          :interface        => lookup('parapluie_generated', node_uid, 'network_interfaces', 'eth2', 'interface'),
           :rate             => 1.G,
-          :enabled          => lookup('parapluie', node_uid, 'network_interfaces', 'eth2', 'enabled'),
-          :management       => lookup('parapluie', node_uid, 'network_interfaces', 'eth2', 'management'),
-          :mountable        => lookup('parapluie', node_uid, 'network_interfaces', 'eth2', 'mountable'),
-          :mounted          => lookup('parapluie', node_uid, 'network_interfaces', 'eth2', 'mounted'),
+          :enabled          => lookup('parapluie_generated', node_uid, 'network_interfaces', 'eth2', 'enabled'),
+          :management       => lookup('parapluie_generated', node_uid, 'network_interfaces', 'eth2', 'management'),
+          :mountable        => lookup('parapluie_generated', node_uid, 'network_interfaces', 'eth2', 'mountable'),
+          :mounted          => lookup('parapluie_generated', node_uid, 'network_interfaces', 'eth2', 'mounted'),
           :device           => "eth2",
           :bridged          => false,
           :vendor           => "Intel",
           :version          => "82576",
-          :driver           => lookup('parapluie', node_uid, 'network_interfaces', 'eth2', 'driver'),
-          :mac              => lookup('parapluie', node_uid, 'network_interfaces', 'eth2', 'mac')
+          :driver           => lookup('parapluie_generated', node_uid, 'network_interfaces', 'eth2', 'driver'),
+          :mac              => lookup('parapluie_generated', node_uid, 'network_interfaces', 'eth2', 'mac')
         },
         {
-          :interface        => lookup('parapluie', node_uid, 'network_interfaces', 'eth3', 'interface'),
+          :interface        => lookup('parapluie_generated', node_uid, 'network_interfaces', 'eth3', 'interface'),
           :rate             => 1.G,
-          :enabled          => lookup('parapluie', node_uid, 'network_interfaces', 'eth3', 'enabled'),
-          :management       => lookup('parapluie', node_uid, 'network_interfaces', 'eth3', 'management'),
-          :mountable        => lookup('parapluie', node_uid, 'network_interfaces', 'eth3', 'mountable'),
-          :mounted          => lookup('parapluie', node_uid, 'network_interfaces', 'eth3', 'mounted'),
+          :enabled          => lookup('parapluie_generated', node_uid, 'network_interfaces', 'eth3', 'enabled'),
+          :management       => lookup('parapluie_generated', node_uid, 'network_interfaces', 'eth3', 'management'),
+          :mountable        => lookup('parapluie_generated', node_uid, 'network_interfaces', 'eth3', 'mountable'),
+          :mounted          => lookup('parapluie_generated', node_uid, 'network_interfaces', 'eth3', 'mounted'),
           :device           => "eth3",
           :bridged          => false,
           :vendor           => "Intel",
           :version          => "82576",
-          :driver           => lookup('parapluie', node_uid, 'network_interfaces', 'eth3', 'driver'),
-          :mac              => lookup('parapluie', node_uid, 'network_interfaces', 'eth3', 'mac')
+          :driver           => lookup('parapluie_generated', node_uid, 'network_interfaces', 'eth3', 'driver'),
+          :mac              => lookup('parapluie_generated', node_uid, 'network_interfaces', 'eth3', 'mac')
         },
         {
-          :interface        => lookup('parapluie', node_uid, 'network_interfaces', 'ib0', 'interface'),
-          :rate             => lookup('parapluie', node_uid, 'network_interfaces', 'ib0', 'rate'),
+          :interface        => lookup('parapluie_generated', node_uid, 'network_interfaces', 'ib0', 'interface'),
+          :rate             => lookup('parapluie_generated', node_uid, 'network_interfaces', 'ib0', 'rate'),
           :device           => "ib0",
-          :enabled          => lookup('parapluie', node_uid, 'network_interfaces', 'ib0', 'enabled'),
-          :management       => lookup('parapluie', node_uid, 'network_interfaces', 'ib0', 'management'),
-          :mountable        => lookup('parapluie', node_uid, 'network_interfaces', 'ib0', 'mountable'),
-          :mounted          => lookup('parapluie', node_uid, 'network_interfaces', 'ib0', 'mounted'),
+          :enabled          => lookup('parapluie_generated', node_uid, 'network_interfaces', 'ib0', 'enabled'),
+          :management       => lookup('parapluie_generated', node_uid, 'network_interfaces', 'ib0', 'management'),
+          :mountable        => lookup('parapluie_generated', node_uid, 'network_interfaces', 'ib0', 'mountable'),
+          :mounted          => lookup('parapluie_generated', node_uid, 'network_interfaces', 'ib0', 'mounted'),
           :vendor           => 'Mellanox',
           :version          => "MT25418",
-          :driver           => lookup('parapluie', node_uid, 'network_interfaces', 'ib0', 'driver'),
+          :driver           => lookup('parapluie_generated', node_uid, 'network_interfaces', 'ib0', 'driver'),
           :network_address  => "#{node_uid}-ib0.#{site_uid}.grid5000.fr",
-          :ip               => lookup('parapluie', node_uid, 'network_interfaces', 'ib0', 'ip'),
-          :ip6               => lookup('parapluie', node_uid, 'network_interfaces', 'ib0', 'ip6'),
-          :guid             => lookup('parapluie', node_uid, 'network_interfaces', 'ib0', 'guid')
+          :ip               => lookup('parapluie_generated', node_uid, 'network_interfaces', 'ib0', 'ip'),
+          :ip6               => lookup('parapluie_generated', node_uid, 'network_interfaces', 'ib0', 'ip6'),
+          :guid             => lookup('parapluie_generated', node_uid, 'network_interfaces', 'ib0', 'guid')
         },
         {
-          :interface        => lookup('parapluie', node_uid, 'network_interfaces', 'ib1', 'interface'),
-          :rate             => lookup('parapluie', node_uid, 'network_interfaces', 'ib1', 'rate'),
+          :interface        => lookup('parapluie_generated', node_uid, 'network_interfaces', 'ib1', 'interface'),
+          :rate             => lookup('parapluie_generated', node_uid, 'network_interfaces', 'ib1', 'rate'),
           :device           => "ib1",
-          :enabled          => lookup('parapluie', node_uid, 'network_interfaces', 'ib1', 'enabled'),
-          :management       => lookup('parapluie', node_uid, 'network_interfaces', 'ib1', 'management'),
-          :mountable        => lookup('parapluie', node_uid, 'network_interfaces', 'ib1', 'mountable'),
-          :mounted          => lookup('parapluie', node_uid, 'network_interfaces', 'ib1', 'mounted'),
+          :enabled          => lookup('parapluie_generated', node_uid, 'network_interfaces', 'ib1', 'enabled'),
+          :management       => lookup('parapluie_generated', node_uid, 'network_interfaces', 'ib1', 'management'),
+          :mountable        => lookup('parapluie_generated', node_uid, 'network_interfaces', 'ib1', 'mountable'),
+          :mounted          => lookup('parapluie_generated', node_uid, 'network_interfaces', 'ib1', 'mounted'),
           :vendor           => 'Mellanox',
           :version          => "MT25418",
-          :driver           => lookup('parapluie', node_uid, 'network_interfaces', 'ib1', 'driver'),
-          :guid             => lookup('parapluie', node_uid, 'network_interfaces', 'ib1', 'guid')
+          :driver           => lookup('parapluie_generated', node_uid, 'network_interfaces', 'ib1', 'driver'),
+          :guid             => lookup('parapluie_generated', node_uid, 'network_interfaces', 'ib1', 'guid')
         },
         {
           :interface            => 'Ethernet',
           :rate                 => 1.G,
           :network_address      => "#{node_uid}-bmc.#{site_uid}.grid5000.fr",
-          :ip                   => lookup('parapluie', node_uid, 'network_interfaces', 'bmc', 'ip'),
-          :mac                  => lookup('parapluie', node_uid, 'network_interfaces', 'bmc', 'mac'),
+          :ip                   => lookup('parapluie_generated', node_uid, 'network_interfaces', 'bmc', 'ip'),
+          :mac                  => lookup('parapluie_generated', node_uid, 'network_interfaces', 'bmc', 'mac'),
           :enabled              => true,
           :mounted              => false,
           :mountable            => false,
@@ -165,21 +165,21 @@ site :rennes do |site_uid|
         }]
 
         chassis({
-          :serial       => lookup('parapluie', node_uid, 'chassis', 'serial_number'),
-          :name         => lookup('parapluie', node_uid, 'chassis', 'product_name'),
-          :manufacturer => lookup('parapluie', node_uid, 'chassis', 'manufacturer')
+          :serial       => lookup('parapluie_generated', node_uid, 'chassis', 'serial_number'),
+          :name         => lookup('parapluie_generated', node_uid, 'chassis', 'product_name'),
+          :manufacturer => lookup('parapluie_generated', node_uid, 'chassis', 'manufacturer')
         })
 
         bios({
-          :version      => lookup('parapluie', node_uid, 'bios', 'version'),
-          :vendor       => lookup('parapluie', node_uid, 'bios', 'vendor'),
-          :release_date => lookup('parapluie', node_uid, 'bios', 'release_date')
+          :version      => lookup('parapluie_generated', node_uid, 'bios', 'version'),
+          :vendor       => lookup('parapluie_generated', node_uid, 'bios', 'vendor'),
+          :release_date => lookup('parapluie_generated', node_uid, 'bios', 'release_date')
         })
 
         bios({
-          :version      => lookup('parapluie', node_uid, 'bios', 'version'),
-          :vendor       => lookup('parapluie', node_uid, 'bios', 'vendor'),
-          :release_date => lookup('parapluie', node_uid, 'bios', 'release_date')
+          :version      => lookup('parapluie_generated', node_uid, 'bios', 'version'),
+          :vendor       => lookup('parapluie_generated', node_uid, 'bios', 'vendor'),
+          :release_date => lookup('parapluie_generated', node_uid, 'bios', 'release_date')
         })
 
         gpu({
@@ -196,8 +196,8 @@ site :rennes do |site_uid|
             :available => true,
             :via => {
               :pdu      => {
-                :uid  => lookup('parapluie', node_uid, 'pdu', 'pdu_name'),
-                :port => lookup('parapluie', node_uid, 'pdu', 'pdu_position'),
+                :uid  => lookup('parapluie_manual', node_uid, 'pdu', 'pdu_name'),
+                :port => lookup('parapluie_manual', node_uid, 'pdu', 'pdu_position'),
              },
               :api      => { :metric => "pdu" }
             }
@@ -211,7 +211,7 @@ site :rennes do |site_uid|
           }
         })
 
-        chassis({:serial_number => lookup('parapluie', node_uid, 'chassis', 'serial_number')})
+        chassis({:serial_number => lookup('parapluie_generated', node_uid, 'chassis', 'serial_number')})
 
       end
     end
diff --git a/generators/input/sites/rennes/clusters/parapluie.yaml b/generators/input/sites/rennes/clusters/parapluie_generated.yaml
similarity index 95%
rename from generators/input/sites/rennes/clusters/parapluie.yaml
rename to generators/input/sites/rennes/clusters/parapluie_generated.yaml
index 7f74d092cc1..f5f442daa3d 100644
--- a/generators/input/sites/rennes/clusters/parapluie.yaml
+++ b/generators/input/sites/rennes/clusters/parapluie_generated.yaml
@@ -60,8 +60,6 @@ parapluie-1:
       interface: Ethernet
       driver: igb
       mountable: true
-      switch_name: gw-rennes
-      switch_port: Gi3/42
       ip: 172.16.99.1
     eth2:
       mounted: false
@@ -102,9 +100,6 @@ parapluie-1:
     smp_size: 2
     platform_type: x86_64
     smt_size: 24
-  pdu:
-    pdu_name: parapluie-pdu-1
-    pdu_position: 24
 parapluie-2:
   bios:
     version: O37
@@ -155,8 +150,6 @@ parapluie-2:
       interface: Ethernet
       driver: igb
       mountable: true
-      switch_name: gw-rennes
-      switch_port: Gi2/32
       ip: 172.16.99.2
     eth2:
       mounted: false
@@ -208,9 +201,6 @@ parapluie-2:
     smp_size: 2
     platform_type: x86_64
     smt_size: 24
-  pdu:
-    pdu_name: parapluie-pdu-1
-    pdu_position: 23
 parapluie-3:
   bios:
     version: O37
@@ -272,8 +262,6 @@ parapluie-3:
       interface: Ethernet
       driver: igb
       mountable: true
-      switch_name: gw-rennes
-      switch_port: Gi2/34
       ip: 172.16.99.3
     eth2:
       mounted: false
@@ -314,9 +302,6 @@ parapluie-3:
     smp_size: 2
     platform_type: x86_64
     smt_size: 24
-  pdu:
-    pdu_name: parapluie-pdu-1
-    pdu_position: 22
 parapluie-4:
   bios:
     version: O37
@@ -378,8 +363,6 @@ parapluie-4:
       interface: Ethernet
       driver: igb
       mountable: true
-      switch_name: gw-rennes
-      switch_port: Gi3/45
       ip: 172.16.99.4
     eth2:
       mounted: false
@@ -420,9 +403,6 @@ parapluie-4:
     smp_size: 2
     platform_type: x86_64
     smt_size: 24
-  pdu:
-    pdu_name: parapluie-pdu-1
-    pdu_position: 21
 parapluie-5:
   bios:
     version: O37
@@ -477,8 +457,6 @@ parapluie-5:
       interface: Ethernet
       driver: igb
       mountable: true
-      switch_name: gw-rennes
-      switch_port: Gi2/29
       ip: 172.16.99.5
     eth2:
       mounted: false
@@ -526,9 +504,6 @@ parapluie-5:
     smp_size: 2
     platform_type: x86_64
     smt_size: 24
-  pdu:
-    pdu_name: parapluie-pdu-1
-    pdu_position: 20
 parapluie-6:
   bios:
     version: O37
@@ -590,8 +565,6 @@ parapluie-6:
       interface: Ethernet
       driver: igb
       mountable: true
-      switch_name: gw-rennes
-      switch_port: Gi2/36
       ip: 172.16.99.6
     eth2:
       mounted: false
@@ -632,9 +605,6 @@ parapluie-6:
     smp_size: 2
     platform_type: x86_64
     smt_size: 24
-  pdu:
-    pdu_name: parapluie-pdu-1
-    pdu_position: 5
 parapluie-7:
   bios:
     version: O37
@@ -696,8 +666,6 @@ parapluie-7:
       interface: Ethernet
       driver: igb
       mountable: true
-      switch_name: gw-rennes
-      switch_port: Gi3/44
       ip: 172.16.99.7
     eth2:
       mounted: false
@@ -738,9 +706,6 @@ parapluie-7:
     smp_size: 2
     platform_type: x86_64
     smt_size: 24
-  pdu:
-    pdu_name: parapluie-pdu-1
-    pdu_position: 4
 parapluie-8:
   bios:
     version: O37
@@ -802,8 +767,6 @@ parapluie-8:
       interface: Ethernet
       driver: igb
       mountable: true
-      switch_name: gw-rennes
-      switch_port: Gi2/33
       ip: 172.16.99.8
     eth2:
       mounted: false
@@ -844,9 +807,6 @@ parapluie-8:
     smp_size: 2
     platform_type: x86_64
     smt_size: 24
-  pdu:
-    pdu_name: parapluie-pdu-1
-    pdu_position: 3
 parapluie-9:
   bios:
     version: O37
@@ -897,8 +857,6 @@ parapluie-9:
       interface: Ethernet
       driver: igb
       mountable: true
-      switch_name: gw-rennes
-      switch_port: Gi2/35
       ip: 172.16.99.9
     eth2:
       mounted: false
@@ -950,9 +908,6 @@ parapluie-9:
     smp_size: 2
     platform_type: x86_64
     smt_size: 24
-  pdu:
-    pdu_name: parapluie-pdu-1
-    pdu_position: 2
 parapluie-10:
   bios:
     version: O37
@@ -1003,8 +958,6 @@ parapluie-10:
       interface: Ethernet
       driver: igb
       mountable: true
-      switch_name: gw-rennes
-      switch_port: Gi2/31
       ip: 172.16.99.10
     eth2:
       mounted: false
@@ -1056,9 +1009,6 @@ parapluie-10:
     smp_size: 2
     platform_type: x86_64
     smt_size: 24
-  pdu:
-    pdu_name: parapluie-pdu-1
-    pdu_position: 1
 parapluie-11:
   bios:
     version: O37
@@ -1109,8 +1059,6 @@ parapluie-11:
       interface: Ethernet
       driver: igb
       mountable: true
-      switch_name: gw-rennes
-      switch_port: Gi2/40
       ip: 172.16.99.11
     eth2:
       mounted: false
@@ -1162,9 +1110,6 @@ parapluie-11:
     smp_size: 2
     platform_type: x86_64
     smt_size: 24
-  pdu:
-    pdu_name: parapluie-pdu-2
-    pdu_position: 24
 parapluie-12:
   bios:
     version: O37
@@ -1215,8 +1160,6 @@ parapluie-12:
       interface: Ethernet
       driver: igb
       mountable: true
-      switch_name: gw-rennes
-      switch_port: Gi2/41
       ip: 172.16.99.12
     eth2:
       mounted: false
@@ -1268,9 +1211,6 @@ parapluie-12:
     smp_size: 2
     platform_type: x86_64
     smt_size: 24
-  pdu:
-    pdu_name: parapluie-pdu-2
-    pdu_position: 23
 parapluie-13:
   bios:
     version: O37
@@ -1332,8 +1272,6 @@ parapluie-13:
       interface: Ethernet
       driver: igb
       mountable: true
-      switch_name: gw-rennes
-      switch_port: Gi2/37
       ip: 172.16.99.13
     eth2:
       mounted: false
@@ -1374,9 +1312,6 @@ parapluie-13:
     smp_size: 2
     platform_type: x86_64
     smt_size: 24
-  pdu:
-    pdu_name: parapluie-pdu-2
-    pdu_position: 22
 parapluie-14:
   bios:
     version: O37
@@ -1427,8 +1362,6 @@ parapluie-14:
       interface: Ethernet
       driver: igb
       mountable: true
-      switch_name: gw-rennes
-      switch_port: Gi2/38
       ip: 172.16.99.14
     eth2:
       mounted: false
@@ -1480,9 +1413,6 @@ parapluie-14:
     smp_size: 2
     platform_type: x86_64
     smt_size: 24
-  pdu:
-    pdu_name: parapluie-pdu-2
-    pdu_position: 21
 parapluie-15:
   bios:
     version: O37
@@ -1544,8 +1474,6 @@ parapluie-15:
       interface: Ethernet
       driver: igb
       mountable: true
-      switch_name: gw-rennes
-      switch_port: Gi2/39
       ip: 172.16.99.15
     eth2:
       mounted: false
@@ -1586,9 +1514,6 @@ parapluie-15:
     smp_size: 2
     platform_type: x86_64
     smt_size: 24
-  pdu:
-    pdu_name: parapluie-pdu-2
-    pdu_position: 20
 parapluie-16:
   bios:
     version: O37
@@ -1643,8 +1568,6 @@ parapluie-16:
       interface: Ethernet
       driver: igb
       mountable: true
-      switch_name: gw-rennes
-      switch_port: Gi2/44
       ip: 172.16.99.16
     eth2:
       mounted: false
@@ -1692,9 +1615,6 @@ parapluie-16:
     smp_size: 2
     platform_type: x86_64
     smt_size: 24
-  pdu:
-    pdu_name: parapluie-pdu-2
-    pdu_position: 5
 parapluie-17:
   bios:
     version: O37
@@ -1745,8 +1665,6 @@ parapluie-17:
       interface: Ethernet
       driver: igb
       mountable: true
-      switch_name: gw-rennes
-      switch_port: Gi2/46
       ip: 172.16.99.17
     eth2:
       mounted: false
@@ -1798,9 +1716,6 @@ parapluie-17:
     smp_size: 2
     platform_type: x86_64
     smt_size: 24
-  pdu:
-    pdu_name: parapluie-pdu-2
-    pdu_position: 4
 parapluie-18:
   bios:
     version: O37
@@ -1862,8 +1777,6 @@ parapluie-18:
       interface: Ethernet
       driver: igb
       mountable: true
-      switch_name: gw-rennes
-      switch_port: Gi2/45
       ip: 172.16.99.18
     eth2:
       mounted: false
@@ -1904,9 +1817,6 @@ parapluie-18:
     smp_size: 2
     platform_type: x86_64
     smt_size: 24
-  pdu:
-    pdu_name: parapluie-pdu-2
-    pdu_position: 3
 parapluie-19:
   bios:
     version: O37
@@ -1957,8 +1867,6 @@ parapluie-19:
       interface: Ethernet
       driver: igb
       mountable: true
-      switch_name: gw-rennes
-      switch_port: Gi2/42
       ip: 172.16.99.19
     eth2:
       mounted: false
@@ -2010,9 +1918,6 @@ parapluie-19:
     smp_size: 2
     platform_type: x86_64
     smt_size: 24
-  pdu:
-    pdu_name: parapluie-pdu-2
-    pdu_position: 2
 parapluie-20:
   bios:
     version: O37
@@ -2063,8 +1968,6 @@ parapluie-20:
       interface: Ethernet
       driver: igb
       mountable: true
-      switch_name: gw-rennes
-      switch_port: Gi2/43
       ip: 172.16.99.20
     eth2:
       mounted: false
@@ -2116,9 +2019,6 @@ parapluie-20:
     smp_size: 2
     platform_type: x86_64
     smt_size: 24
-  pdu:
-    pdu_name: parapluie-pdu-2
-    pdu_position: 1
 parapluie-21:
   bios:
     version: O37
@@ -2176,8 +2076,6 @@ parapluie-21:
       interface: Ethernet
       driver: igb
       mountable: true
-      switch_name: gw-rennes
-      switch_port: Gi3/47
       ip: 172.16.99.21
     eth2:
       mounted: false
@@ -2222,9 +2120,6 @@ parapluie-21:
     smp_size: 2
     platform_type: x86_64
     smt_size: 24
-  pdu:
-    pdu_name: parapluie-pdu-3
-    pdu_position: 24
 parapluie-22:
   bios:
     version: O37
@@ -2286,8 +2181,6 @@ parapluie-22:
       interface: Ethernet
       driver: igb
       mountable: true
-      switch_name: gw-rennes
-      switch_port: Gi3/48
       ip: 172.16.99.22
     eth2:
       mounted: false
@@ -2328,9 +2221,6 @@ parapluie-22:
     smp_size: 2
     platform_type: x86_64
     smt_size: 24
-  pdu:
-    pdu_name: parapluie-pdu-3
-    pdu_position: 23
 parapluie-23:
   bios:
     version: O37
@@ -2392,8 +2282,6 @@ parapluie-23:
       interface: Ethernet
       driver: igb
       mountable: true
-      switch_name: gw-rennes
-      switch_port: Gi3/46
       ip: 172.16.99.23
     eth2:
       mounted: false
@@ -2434,9 +2322,6 @@ parapluie-23:
     smp_size: 2
     platform_type: x86_64
     smt_size: 24
-  pdu:
-    pdu_name: parapluie-pdu-3
-    pdu_position: 22
 parapluie-24:
   bios:
     version: O37
@@ -2487,8 +2372,6 @@ parapluie-24:
       interface: Ethernet
       driver: igb
       mountable: true
-      switch_name: gw-rennes
-      switch_port: Gi2/48
       ip: 172.16.99.24
     eth2:
       mounted: false
@@ -2540,9 +2423,6 @@ parapluie-24:
     smp_size: 2
     platform_type: x86_64
     smt_size: 24
-  pdu:
-    pdu_name: parapluie-pdu-3
-    pdu_position: 21
 parapluie-25:
   bios:
     version: O37
@@ -2593,8 +2473,6 @@ parapluie-25:
       interface: Ethernet
       driver: igb
       mountable: true
-      switch_name: gw-rennes
-      switch_port: Gi2/47
       ip: 172.16.99.25
     eth2:
       mounted: false
@@ -2646,9 +2524,6 @@ parapluie-25:
     smp_size: 2
     platform_type: x86_64
     smt_size: 24
-  pdu:
-    pdu_name: parapluie-pdu-3
-    pdu_position: 20
 parapluie-26:
   bios:
     version: O37
@@ -2699,8 +2574,6 @@ parapluie-26:
       interface: Ethernet
       driver: igb
       mountable: true
-      switch_name: gw-rennes
-      switch_port: Gi4/46
       ip: 172.16.99.26
     eth2:
       mounted: false
@@ -2752,9 +2625,6 @@ parapluie-26:
     smp_size: 2
     platform_type: x86_64
     smt_size: 24
-  pdu:
-    pdu_name: parapluie-pdu-3
-    pdu_position: 5
 parapluie-27:
   bios:
     version: O37
@@ -2816,8 +2686,6 @@ parapluie-27:
       interface: Ethernet
       driver: igb
       mountable: true
-      switch_name: gw-rennes
-      switch_port: Gi4/32
       ip: 172.16.99.27
     eth2:
       mounted: false
@@ -2858,9 +2726,6 @@ parapluie-27:
     smp_size: 2
     platform_type: x86_64
     smt_size: 24
-  pdu:
-    pdu_name: parapluie-pdu-3
-    pdu_position: 4
 parapluie-28:
   bios:
     version: O37
@@ -2922,8 +2787,6 @@ parapluie-28:
       interface: Ethernet
       driver: igb
       mountable: true
-      switch_name: gw-rennes
-      switch_port: Gi4/31
       ip: 172.16.99.28
     eth2:
       mounted: false
@@ -2964,9 +2827,6 @@ parapluie-28:
     smp_size: 2
     platform_type: x86_64
     smt_size: 24
-  pdu:
-    pdu_name: parapluie-pdu-3
-    pdu_position: 3
 parapluie-29:
   bios:
     version: O37
@@ -3017,8 +2877,6 @@ parapluie-29:
       interface: Ethernet
       driver: igb
       mountable: true
-      switch_name: gw-rennes
-      switch_port: Gi4/48
       ip: 172.16.99.29
     eth2:
       mounted: false
@@ -3070,9 +2928,6 @@ parapluie-29:
     smp_size: 2
     platform_type: x86_64
     smt_size: 24
-  pdu:
-    pdu_name: parapluie-pdu-3
-    pdu_position: 2
 parapluie-30:
   bios:
     version: O37
@@ -3134,8 +2989,6 @@ parapluie-30:
       interface: Ethernet
       driver: igb
       mountable: true
-      switch_name: gw-rennes
-      switch_port: Gi4/42
       ip: 172.16.99.30
     eth2:
       mounted: false
@@ -3176,9 +3029,6 @@ parapluie-30:
     smp_size: 2
     platform_type: x86_64
     smt_size: 24
-  pdu:
-    pdu_name: parapluie-pdu-3
-    pdu_position: 1
 parapluie-31:
   bios:
     version: O37
@@ -3233,8 +3083,6 @@ parapluie-31:
       interface: Ethernet
       driver: igb
       mountable: true
-      switch_name: gw-rennes
-      switch_port: Gi4/41
       ip: 172.16.99.31
     eth2:
       mounted: false
@@ -3282,9 +3130,6 @@ parapluie-31:
     smp_size: 2
     platform_type: x86_64
     smt_size: 24
-  pdu:
-    pdu_name: parapluie-pdu-4
-    pdu_position: 24
 parapluie-32:
   bios:
     version: O37
@@ -3335,8 +3180,6 @@ parapluie-32:
       interface: Ethernet
       driver: igb
       mountable: true
-      switch_name: gw-rennes
-      switch_port: Gi4/40
       ip: 172.16.99.32
     eth2:
       mounted: false
@@ -3388,9 +3231,6 @@ parapluie-32:
     smp_size: 2
     platform_type: x86_64
     smt_size: 24
-  pdu:
-    pdu_name: parapluie-pdu-4
-    pdu_position: 23
 parapluie-33:
   bios:
     version: O37
@@ -3452,8 +3292,6 @@ parapluie-33:
       interface: Ethernet
       driver: igb
       mountable: true
-      switch_name: gw-rennes
-      switch_port: Gi6/33
       ip: 172.16.99.33
     eth2:
       mounted: false
@@ -3494,9 +3332,6 @@ parapluie-33:
     smp_size: 2
     platform_type: x86_64
     smt_size: 24
-  pdu:
-    pdu_name: parapluie-pdu-4
-    pdu_position: 22
 parapluie-34:
   bios:
     version: O37
@@ -3554,8 +3389,6 @@ parapluie-34:
       interface: Ethernet
       driver: igb
       mountable: true
-      switch_name: gw-rennes
-      switch_port: Gi4/39
       ip: 172.16.99.34
     eth2:
       mounted: false
@@ -3600,9 +3433,6 @@ parapluie-34:
     smp_size: 2
     platform_type: x86_64
     smt_size: 24
-  pdu:
-    pdu_name: parapluie-pdu-4
-    pdu_position: 21
 parapluie-35:
   bios:
     version: O37
@@ -3664,8 +3494,6 @@ parapluie-35:
       interface: Ethernet
       driver: igb
       mountable: true
-      switch_name: gw-rennes
-      switch_port: Gi4/33
       ip: 172.16.99.35
     eth2:
       mounted: false
@@ -3706,9 +3534,6 @@ parapluie-35:
     smp_size: 2
     platform_type: x86_64
     smt_size: 24
-  pdu:
-    pdu_name: parapluie-pdu-4
-    pdu_position: 20
 parapluie-36:
   bios:
     version: O37
@@ -3759,8 +3584,6 @@ parapluie-36:
       interface: Ethernet
       driver: igb
       mountable: true
-      switch_name: gw-rennes
-      switch_port: Gi4/35
       ip: 172.16.99.36
     eth2:
       mounted: false
@@ -3812,9 +3635,6 @@ parapluie-36:
     smp_size: 2
     platform_type: x86_64
     smt_size: 24
-  pdu:
-    pdu_name: parapluie-pdu-4
-    pdu_position: 5
 parapluie-37:
   bios:
     version: O37
@@ -3865,8 +3685,6 @@ parapluie-37:
       interface: Ethernet
       driver: igb
       mountable: true
-      switch_name: gw-rennes
-      switch_port: Gi4/38
       ip: 172.16.99.37
     eth2:
       mounted: false
@@ -3918,9 +3736,6 @@ parapluie-37:
     smp_size: 2
     platform_type: x86_64
     smt_size: 24
-  pdu:
-    pdu_name: parapluie-pdu-4
-    pdu_position: 4
 parapluie-38:
   bios:
     version: O37
@@ -3975,8 +3790,6 @@ parapluie-38:
       interface: Ethernet
       driver: igb
       mountable: true
-      switch_name: gw-rennes
-      switch_port: Gi4/34
       ip: 172.16.99.38
     eth2:
       mounted: false
@@ -4024,9 +3837,6 @@ parapluie-38:
     smp_size: 2
     platform_type: x86_64
     smt_size: 24
-  pdu:
-    pdu_name: parapluie-pdu-4
-    pdu_position: 3
 parapluie-39:
   bios:
     version: O37
@@ -4084,8 +3894,6 @@ parapluie-39:
       interface: Ethernet
       driver: igb
       mountable: true
-      switch_name: gw-rennes
-      switch_port: Gi4/36
       ip: 172.16.99.39
     eth2:
       mounted: false
@@ -4130,9 +3938,6 @@ parapluie-39:
     smp_size: 2
     platform_type: x86_64
     smt_size: 24
-  pdu:
-    pdu_name: parapluie-pdu-4
-    pdu_position: 2
 parapluie-40:
   bios:
     version: O37
@@ -4183,8 +3988,6 @@ parapluie-40:
       interface: Ethernet
       driver: igb
       mountable: true
-      switch_name: gw-rennes
-      switch_port: Gi4/37
       ip: 172.16.99.40
     eth2:
       mounted: false
@@ -4236,6 +4039,3 @@ parapluie-40:
     smp_size: 2
     platform_type: x86_64
     smt_size: 24
-  pdu:
-    pdu_name: parapluie-pdu-4
-    pdu_position: 1
diff --git a/generators/input/sites/rennes/clusters/parapluie_manual.yaml b/generators/input/sites/rennes/clusters/parapluie_manual.yaml
new file mode 100644
index 00000000000..d1b52232d43
--- /dev/null
+++ b/generators/input/sites/rennes/clusters/parapluie_manual.yaml
@@ -0,0 +1,321 @@
+---
+parapluie-1:
+  network_interfaces:
+    eth1:
+      switch_name: gw-rennes
+      switch_port: Gi3/42
+  pdu:
+    pdu_name: parapluie-pdu-1
+    pdu_position: 24
+parapluie-2:
+  network_interfaces:
+    eth1:
+      switch_name: gw-rennes
+      switch_port: Gi2/32
+  pdu:
+    pdu_name: parapluie-pdu-1
+    pdu_position: 23
+parapluie-3:
+  network_interfaces:
+    eth1:
+      switch_name: gw-rennes
+      switch_port: Gi2/34
+  pdu:
+    pdu_name: parapluie-pdu-1
+    pdu_position: 22
+parapluie-4:
+  network_interfaces:
+    eth1:
+      switch_name: gw-rennes
+      switch_port: Gi3/45
+  pdu:
+    pdu_name: parapluie-pdu-1
+    pdu_position: 21
+parapluie-5:
+  network_interfaces:
+    eth1:
+      switch_name: gw-rennes
+      switch_port: Gi2/29
+  pdu:
+    pdu_name: parapluie-pdu-1
+    pdu_position: 20
+parapluie-6:
+  network_interfaces:
+    eth1:
+      switch_name: gw-rennes
+      switch_port: Gi2/36
+  pdu:
+    pdu_name: parapluie-pdu-1
+    pdu_position: 5
+parapluie-7:
+  network_interfaces:
+    eth1:
+      switch_name: gw-rennes
+      switch_port: Gi3/44
+  pdu:
+    pdu_name: parapluie-pdu-1
+    pdu_position: 4
+parapluie-8:
+  network_interfaces:
+    eth1:
+      switch_name: gw-rennes
+      switch_port: Gi2/33
+  pdu:
+    pdu_name: parapluie-pdu-1
+    pdu_position: 3
+parapluie-9:
+  network_interfaces:
+    eth1:
+      switch_name: gw-rennes
+      switch_port: Gi2/35
+  pdu:
+    pdu_name: parapluie-pdu-1
+    pdu_position: 2
+parapluie-10:
+  network_interfaces:
+    eth1:
+      switch_name: gw-rennes
+      switch_port: Gi2/31
+  pdu:
+    pdu_name: parapluie-pdu-1
+    pdu_position: 1
+parapluie-11:
+  network_interfaces:
+    eth1:
+      switch_name: gw-rennes
+      switch_port: Gi2/40
+  pdu:
+    pdu_name: parapluie-pdu-2
+    pdu_position: 24
+parapluie-12:
+  network_interfaces:
+    eth1:
+      switch_name: gw-rennes
+      switch_port: Gi2/41
+  pdu:
+    pdu_name: parapluie-pdu-2
+    pdu_position: 23
+parapluie-13:
+  network_interfaces:
+    eth1:
+      switch_name: gw-rennes
+      switch_port: Gi2/37
+  pdu:
+    pdu_name: parapluie-pdu-2
+    pdu_position: 22
+parapluie-14:
+  network_interfaces:
+    eth1:
+      switch_name: gw-rennes
+      switch_port: Gi2/38
+  pdu:
+    pdu_name: parapluie-pdu-2
+    pdu_position: 21
+parapluie-15:
+  network_interfaces:
+    eth1:
+      switch_name: gw-rennes
+      switch_port: Gi2/39
+  pdu:
+    pdu_name: parapluie-pdu-2
+    pdu_position: 20
+parapluie-16:
+  network_interfaces:
+    eth1:
+      switch_name: gw-rennes
+      switch_port: Gi2/44
+  pdu:
+    pdu_name: parapluie-pdu-2
+    pdu_position: 5
+parapluie-17:
+  network_interfaces:
+    eth1:
+      switch_name: gw-rennes
+      switch_port: Gi2/46
+  pdu:
+    pdu_name: parapluie-pdu-2
+    pdu_position: 4
+parapluie-18:
+  network_interfaces:
+    eth1:
+      switch_name: gw-rennes
+      switch_port: Gi2/45
+  pdu:
+    pdu_name: parapluie-pdu-2
+    pdu_position: 3
+parapluie-19:
+  network_interfaces:
+    eth1:
+      switch_name: gw-rennes
+      switch_port: Gi2/42
+  pdu:
+    pdu_name: parapluie-pdu-2
+    pdu_position: 2
+parapluie-20:
+  network_interfaces:
+    eth1:
+      switch_name: gw-rennes
+      switch_port: Gi2/43
+  pdu:
+    pdu_name: parapluie-pdu-2
+    pdu_position: 1
+parapluie-21:
+  network_interfaces:
+    eth1:
+      switch_name: gw-rennes
+      switch_port: Gi3/47
+  pdu:
+    pdu_name: parapluie-pdu-3
+    pdu_position: 24
+parapluie-22:
+  network_interfaces:
+    eth1:
+      switch_name: gw-rennes
+      switch_port: Gi3/48
+  pdu:
+    pdu_name: parapluie-pdu-3
+    pdu_position: 23
+parapluie-23:
+  network_interfaces:
+    eth1:
+      switch_name: gw-rennes
+      switch_port: Gi3/46
+  pdu:
+    pdu_name: parapluie-pdu-3
+    pdu_position: 22
+parapluie-24:
+  network_interfaces:
+    eth1:
+      switch_name: gw-rennes
+      switch_port: Gi2/48
+  pdu:
+    pdu_name: parapluie-pdu-3
+    pdu_position: 21
+parapluie-25:
+  network_interfaces:
+    eth1:
+      switch_name: gw-rennes
+      switch_port: Gi2/47
+  pdu:
+    pdu_name: parapluie-pdu-3
+    pdu_position: 20
+parapluie-26:
+  network_interfaces:
+    eth1:
+      switch_name: gw-rennes
+      switch_port: Gi4/46
+  pdu:
+    pdu_name: parapluie-pdu-3
+    pdu_position: 5
+parapluie-27:
+  network_interfaces:
+    eth1:
+      switch_name: gw-rennes
+      switch_port: Gi4/32
+  pdu:
+    pdu_name: parapluie-pdu-3
+    pdu_position: 4
+parapluie-28:
+  network_interfaces:
+    eth1:
+      switch_name: gw-rennes
+      switch_port: Gi4/31
+  pdu:
+    pdu_name: parapluie-pdu-3
+    pdu_position: 3
+parapluie-29:
+  network_interfaces:
+    eth1:
+      switch_name: gw-rennes
+      switch_port: Gi4/48
+  pdu:
+    pdu_name: parapluie-pdu-3
+    pdu_position: 2
+parapluie-30:
+  network_interfaces:
+    eth1:
+      switch_name: gw-rennes
+      switch_port: Gi4/42
+  pdu:
+    pdu_name: parapluie-pdu-3
+    pdu_position: 1
+parapluie-31:
+  network_interfaces:
+    eth1:
+      switch_name: gw-rennes
+      switch_port: Gi4/41
+  pdu:
+    pdu_name: parapluie-pdu-4
+    pdu_position: 24
+parapluie-32:
+  network_interfaces:
+    eth1:
+      switch_name: gw-rennes
+      switch_port: Gi4/40
+  pdu:
+    pdu_name: parapluie-pdu-4
+    pdu_position: 23
+parapluie-33:
+  network_interfaces:
+    eth1:
+      switch_name: gw-rennes
+      switch_port: Gi6/33
+  pdu:
+    pdu_name: parapluie-pdu-4
+    pdu_position: 22
+parapluie-34:
+  network_interfaces:
+    eth1:
+      switch_name: gw-rennes
+      switch_port: Gi4/39
+  pdu:
+    pdu_name: parapluie-pdu-4
+    pdu_position: 21
+parapluie-35:
+  network_interfaces:
+    eth1:
+      switch_name: gw-rennes
+      switch_port: Gi4/33
+  pdu:
+    pdu_name: parapluie-pdu-4
+    pdu_position: 20
+parapluie-36:
+  network_interfaces:
+    eth1:
+      switch_name: gw-rennes
+      switch_port: Gi4/35
+  pdu:
+    pdu_name: parapluie-pdu-4
+    pdu_position: 5
+parapluie-37:
+  network_interfaces:
+    eth1:
+      switch_name: gw-rennes
+      switch_port: Gi4/38
+  pdu:
+    pdu_name: parapluie-pdu-4
+    pdu_position: 4
+parapluie-38:
+  network_interfaces:
+    eth1:
+      switch_name: gw-rennes
+      switch_port: Gi4/34
+  pdu:
+    pdu_name: parapluie-pdu-4
+    pdu_position: 3
+parapluie-39:
+  network_interfaces:
+    eth1:
+      switch_name: gw-rennes
+      switch_port: Gi4/36
+  pdu:
+    pdu_name: parapluie-pdu-4
+    pdu_position: 2
+parapluie-40:
+  network_interfaces:
+    eth1:
+      switch_name: gw-rennes
+      switch_port: Gi4/37
+  pdu:
+    pdu_name: parapluie-pdu-4
+    pdu_position: 1
diff --git a/generators/input/sites/sophia/clusters/helios.rb b/generators/input/sites/sophia/clusters/helios.rb
index bdd6a317628..9b003fe3990 100644
--- a/generators/input/sites/sophia/clusters/helios.rb
+++ b/generators/input/sites/sophia/clusters/helios.rb
@@ -22,126 +22,126 @@ site :sophia do |site_uid|
         supported_job_types({
           :deploy       => true,
           :besteffort   => true,
-          :virtual      => lookup('helios', node_uid, 'supported_job_types', 'virtual')
+          :virtual      => lookup('helios_generated', node_uid, 'supported_job_types', 'virtual')
         })
 
         architecture({
-          :smp_size       => lookup('helios', node_uid, 'architecture', 'smp_size'),
-          :smt_size       => lookup('helios', node_uid, 'architecture', 'smt_size'),
-          :platform_type  => lookup('helios', node_uid, 'architecture', 'platform_type')
+          :smp_size       => lookup('helios_generated', node_uid, 'architecture', 'smp_size'),
+          :smt_size       => lookup('helios_generated', node_uid, 'architecture', 'smt_size'),
+          :platform_type  => lookup('helios_generated', node_uid, 'architecture', 'platform_type')
         })
 
         processor({
-          :vendor             => lookup('helios', node_uid, 'processor', 'vendor'),
-          :model              => lookup('helios', node_uid, 'processor', 'model'),
-          :version            => lookup('helios', node_uid, 'processor', 'version'),
-          :clock_speed        => lookup('helios', node_uid, 'processor', 'clock_speed'),
-          :instruction_set    => lookup('helios', node_uid, 'processor', 'instruction_set'),
-          :other_description  => lookup('helios', node_uid, 'processor', 'other_description'),
-          :cache_l1           => lookup('helios', node_uid, 'processor', 'cache_l1'),
-          :cache_l1i          => lookup('helios', node_uid, 'processor', 'cache_l1i'),
-          :cache_l1d          => lookup('helios', node_uid, 'processor', 'cache_l1d'),
-          :cache_l2           => lookup('helios', node_uid, 'processor', 'cache_l2'),
-          :cache_l3           => lookup('helios', node_uid, 'processor', 'cache_l3')
+          :vendor             => lookup('helios_generated', node_uid, 'processor', 'vendor'),
+          :model              => lookup('helios_generated', node_uid, 'processor', 'model'),
+          :version            => lookup('helios_generated', node_uid, 'processor', 'version'),
+          :clock_speed        => lookup('helios_generated', node_uid, 'processor', 'clock_speed'),
+          :instruction_set    => lookup('helios_generated', node_uid, 'processor', 'instruction_set'),
+          :other_description  => lookup('helios_generated', node_uid, 'processor', 'other_description'),
+          :cache_l1           => lookup('helios_generated', node_uid, 'processor', 'cache_l1'),
+          :cache_l1i          => lookup('helios_generated', node_uid, 'processor', 'cache_l1i'),
+          :cache_l1d          => lookup('helios_generated', node_uid, 'processor', 'cache_l1d'),
+          :cache_l2           => lookup('helios_generated', node_uid, 'processor', 'cache_l2'),
+          :cache_l3           => lookup('helios_generated', node_uid, 'processor', 'cache_l3')
         })
 
         main_memory({
-          :ram_size     => lookup('helios', node_uid, 'main_memory', 'ram_size'),
+          :ram_size     => lookup('helios_generated', node_uid, 'main_memory', 'ram_size'),
           :virtual_size => nil
         })
 
         operating_system({
-          :name     => lookup('helios', node_uid, 'operating_system', 'name'),
+          :name     => lookup('helios_generated', node_uid, 'operating_system', 'name'),
           :release  => "Squeeze",
-          :version  => lookup('helios', node_uid, 'operating_system', 'version'),
-          :kernel   => lookup('helios', node_uid, 'operating_system', 'kernel')
+          :version  => lookup('helios_generated', node_uid, 'operating_system', 'version'),
+          :kernel   => lookup('helios_generated', node_uid, 'operating_system', 'kernel')
         })
 
         storage_devices [{
           :interface  => 'SAS',
-          :size       => lookup('helios', node_uid, 'block_devices', 'sda', 'size'),
+          :size       => lookup('helios_generated', node_uid, 'block_devices', 'sda', 'size'),
           :driver     => "mptsas",
-          :device     => lookup('helios', node_uid, 'block_devices', 'sda', 'device'),
-          :model      => lookup('helios', node_uid, 'block_devices', 'sda', 'model'),
-          :vendor     => lookup('helios', node_uid, 'block_devices', 'sda', 'vendor'),
-          :rev        => lookup('helios', node_uid, 'block_devices', 'sda', 'rev')
+          :device     => lookup('helios_generated', node_uid, 'block_devices', 'sda', 'device'),
+          :model      => lookup('helios_generated', node_uid, 'block_devices', 'sda', 'model'),
+          :vendor     => lookup('helios_generated', node_uid, 'block_devices', 'sda', 'vendor'),
+          :rev        => lookup('helios_generated', node_uid, 'block_devices', 'sda', 'rev')
         }]
 
         network_adapters [{
-          :interface        => lookup('helios', node_uid, 'network_interfaces', 'eth0', 'interface'),
-          :rate             => lookup('helios', node_uid, 'network_interfaces', 'eth0', 'rate'),
-          :enabled          => lookup('helios', node_uid, 'network_interfaces', 'eth0', 'enabled'),
-          :management       => lookup('helios', node_uid, 'network_interfaces', 'eth0', 'management'),
-          :mountable        => lookup('helios', node_uid, 'network_interfaces', 'eth0', 'mountable'),
-          :mounted          => lookup('helios', node_uid, 'network_interfaces', 'eth0', 'mounted'),
+          :interface        => lookup('helios_generated', node_uid, 'network_interfaces', 'eth0', 'interface'),
+          :rate             => lookup('helios_generated', node_uid, 'network_interfaces', 'eth0', 'rate'),
+          :enabled          => lookup('helios_generated', node_uid, 'network_interfaces', 'eth0', 'enabled'),
+          :management       => lookup('helios_generated', node_uid, 'network_interfaces', 'eth0', 'management'),
+          :mountable        => lookup('helios_generated', node_uid, 'network_interfaces', 'eth0', 'mountable'),
+          :mounted          => lookup('helios_generated', node_uid, 'network_interfaces', 'eth0', 'mounted'),
           :bridged          => true,
           :device           => "eth0",
           :vendor           => 'Intel',
           :version          => "82546EB",
-          :driver           => lookup('helios', node_uid, 'network_interfaces', 'eth0', 'driver'),
+          :driver           => lookup('helios_generated', node_uid, 'network_interfaces', 'eth0', 'driver'),
           :network_address  => "#{node_uid}.#{site_uid}.grid5000.fr",
-          :ip               => lookup('helios', node_uid, 'network_interfaces', 'eth0', 'ip'),
-            :ip6              => lookup('helios', node_uid, 'network_interfaces', 'eth0', 'ip6'),
-            :switch           => lookup('helios', node_uid, 'network_interfaces', 'eth0', 'switch_name'),
-            :switch_port      => lookup('helios', node_uid, 'network_interfaces', 'eth0', 'switch_port'),
-            :mac              => lookup('helios', node_uid, 'network_interfaces', 'eth0', 'mac')
+          :ip               => lookup('helios_generated', node_uid, 'network_interfaces', 'eth0', 'ip'),
+          :ip6              => lookup('helios_generated', node_uid, 'network_interfaces', 'eth0', 'ip6'),
+          :switch           => lookup('helios_manual', node_uid, 'network_interfaces', 'eth0', 'switch_name'),
+          :switch_port      => lookup('helios_manual', node_uid, 'network_interfaces', 'eth0', 'switch_port'),
+          :mac              => lookup('helios_generated', node_uid, 'network_interfaces', 'eth0', 'mac')
         },
         {
-          :interface        => lookup('helios', node_uid, 'network_interfaces', 'eth1', 'interface'),
+          :interface        => lookup('helios_generated', node_uid, 'network_interfaces', 'eth1', 'interface'),
           :rate             => 1.G,
-          :enabled          => lookup('helios', node_uid, 'network_interfaces', 'eth1', 'enabled'),
-          :management       => lookup('helios', node_uid, 'network_interfaces', 'eth1', 'management'),
-          :mountable        => lookup('helios', node_uid, 'network_interfaces', 'eth1', 'mountable'),
-          :mounted          => lookup('helios', node_uid, 'network_interfaces', 'eth1', 'mounted'),
+          :enabled          => lookup('helios_generated', node_uid, 'network_interfaces', 'eth1', 'enabled'),
+          :management       => lookup('helios_generated', node_uid, 'network_interfaces', 'eth1', 'management'),
+          :mountable        => lookup('helios_generated', node_uid, 'network_interfaces', 'eth1', 'mountable'),
+          :mounted          => lookup('helios_generated', node_uid, 'network_interfaces', 'eth1', 'mounted'),
           :bridged          => false,
           :device           => "eth1",
           :vendor           => 'Intel',
           :version          => "82546EB",
-          :driver           => lookup('helios', node_uid, 'network_interfaces', 'eth1', 'driver'),
-          :mac              => lookup('helios', node_uid, 'network_interfaces', 'eth1', 'mac')
+          :driver           => lookup('helios_generated', node_uid, 'network_interfaces', 'eth1', 'driver'),
+          :mac              => lookup('helios_generated', node_uid, 'network_interfaces', 'eth1', 'mac')
         },
         {
-          :interface        => lookup('helios', node_uid, 'network_interfaces', 'eth2', 'interface'),
+          :interface        => lookup('helios_generated', node_uid, 'network_interfaces', 'eth2', 'interface'),
           :rate             => 1.G,
-          :enabled          => lookup('helios', node_uid, 'network_interfaces', 'eth2', 'enabled'),
-          :management       => lookup('helios', node_uid, 'network_interfaces', 'eth2', 'management'),
-          :mountable        => lookup('helios', node_uid, 'network_interfaces', 'eth2', 'mountable'),
-          :mounted          => lookup('helios', node_uid, 'network_interfaces', 'eth2', 'mounted'),
+          :enabled          => lookup('helios_generated', node_uid, 'network_interfaces', 'eth2', 'enabled'),
+          :management       => lookup('helios_generated', node_uid, 'network_interfaces', 'eth2', 'management'),
+          :mountable        => lookup('helios_generated', node_uid, 'network_interfaces', 'eth2', 'mountable'),
+          :mounted          => lookup('helios_generated', node_uid, 'network_interfaces', 'eth2', 'mounted'),
           :bridged          => false,
           :device           => "eth2",
           :vendor           => 'Intel',
           :version          => "82546EB",
-          :driver           => lookup('helios', node_uid, 'network_interfaces', 'eth2', 'driver'),
-          :mac              => lookup('helios', node_uid, 'network_interfaces', 'eth2', 'mac')
+          :driver           => lookup('helios_generated', node_uid, 'network_interfaces', 'eth2', 'driver'),
+          :mac              => lookup('helios_generated', node_uid, 'network_interfaces', 'eth2', 'mac')
         },
         {
-          :interface        => lookup('helios', node_uid, 'network_interfaces', 'eth3', 'interface'),
+          :interface        => lookup('helios_generated', node_uid, 'network_interfaces', 'eth3', 'interface'),
           :rate             => 1.G,
-          :enabled          => lookup('helios', node_uid, 'network_interfaces', 'eth3', 'enabled'),
-          :management       => lookup('helios', node_uid, 'network_interfaces', 'eth3', 'management'),
-          :mountable        => lookup('helios', node_uid, 'network_interfaces', 'eth3', 'mountable'),
-          :mounted          => lookup('helios', node_uid, 'network_interfaces', 'eth3', 'mounted'),
+          :enabled          => lookup('helios_generated', node_uid, 'network_interfaces', 'eth3', 'enabled'),
+          :management       => lookup('helios_generated', node_uid, 'network_interfaces', 'eth3', 'management'),
+          :mountable        => lookup('helios_generated', node_uid, 'network_interfaces', 'eth3', 'mountable'),
+          :mounted          => lookup('helios_generated', node_uid, 'network_interfaces', 'eth3', 'mounted'),
           :bridged          => false,
           :device           => "eth3",
           :vendor           => 'Intel',
           :version          => "82546EB",
-          :driver           => lookup('helios', node_uid, 'network_interfaces', 'eth3', 'driver'),
-          :mac              => lookup('helios', node_uid, 'network_interfaces', 'eth3', 'mac')
+          :driver           => lookup('helios_generated', node_uid, 'network_interfaces', 'eth3', 'driver'),
+          :mac              => lookup('helios_generated', node_uid, 'network_interfaces', 'eth3', 'mac')
         },
         {
-          :interface            => lookup('helios', node_uid, 'network_interfaces', 'myri0', 'interface'),
-          :rate                 => lookup('helios', node_uid, 'network_interfaces', 'myri0', 'rate'),
+          :interface            => lookup('helios_generated', node_uid, 'network_interfaces', 'myri0', 'interface'),
+          :rate                 => lookup('helios_generated', node_uid, 'network_interfaces', 'myri0', 'rate'),
           :network_address      => "#{node_uid}-myri0.#{site_uid}.grid5000.fr",
-          :ip                   => lookup('helios', node_uid, 'network_interfaces', 'myri0', 'ip'),
-          :ip6                  => lookup('helios', node_uid, 'network_interfaces', 'myri0', 'ip6'),
-          :mac                  => lookup('helios', node_uid, 'network_interfaces', 'myri0', 'mac'),
+          :ip                   => lookup('helios_generated', node_uid, 'network_interfaces', 'myri0', 'ip'),
+          :ip6                  => lookup('helios_generated', node_uid, 'network_interfaces', 'myri0', 'ip6'),
+          :mac                  => lookup('helios_generated', node_uid, 'network_interfaces', 'myri0', 'mac'),
           :vendor               => 'Myricom',
           :version              => "M3F-PCIXF-2",
-          :driver               => lookup('helios', node_uid, 'network_interfaces', 'myri0', 'driver'),
-          :enabled              => lookup('helios', node_uid, 'network_interfaces', 'myri0', 'enabled'),
-          :management           => lookup('helios', node_uid, 'network_interfaces', 'myri0', 'management'),
-          :mountable            => lookup('helios', node_uid, 'network_interfaces', 'myri0', 'mountable'),
-          :mounted              => lookup('helios', node_uid, 'network_interfaces', 'myri0', 'mounted'),
+          :driver               => lookup('helios_generated', node_uid, 'network_interfaces', 'myri0', 'driver'),
+          :enabled              => lookup('helios_generated', node_uid, 'network_interfaces', 'myri0', 'enabled'),
+          :management           => lookup('helios_generated', node_uid, 'network_interfaces', 'myri0', 'management'),
+          :mountable            => lookup('helios_generated', node_uid, 'network_interfaces', 'myri0', 'mountable'),
+          :mounted              => lookup('helios_generated', node_uid, 'network_interfaces', 'myri0', 'mounted'),
           :management           => false,
           :device               => "myri0",
           :switch               => 'sw-myrinet'
@@ -150,25 +150,25 @@ site :sophia do |site_uid|
           :interface => 'Ethernet',
           :rate => 100.M,
           :network_address  => "#{node_uid}-bmc.#{site_uid}.grid5000.fr",
-          :ip => lookup('helios', node_uid, 'network_interfaces','bmc', 'ip'),
-            :mac => lookup('helios', node_uid, 'network_interfaces','bmc', 'mac'),
-            :enabled  => true,
-            :mounted => false,
-            :mountable => false,
-            :management => true,
-            :device => "bmc"
+          :ip => lookup('helios_generated', node_uid, 'network_interfaces','bmc', 'ip'),
+          :mac => lookup('helios_generated', node_uid, 'network_interfaces','bmc', 'mac'),
+          :enabled  => true,
+          :mounted => false,
+          :mountable => false,
+          :management => true,
+          :device => "bmc"
         }]
 
         chassis({
-          :serial       => lookup('helios', node_uid, 'chassis', 'serial_number'),
-          :name         => lookup('helios', node_uid, 'chassis', 'product_name'),
-          :manufacturer => lookup('helios', node_uid, 'chassis', 'manufacturer')
+          :serial       => lookup('helios_generated', node_uid, 'chassis', 'serial_number'),
+          :name         => lookup('helios_generated', node_uid, 'chassis', 'product_name'),
+          :manufacturer => lookup('helios_generated', node_uid, 'chassis', 'manufacturer')
         })
 
         bios({
-          :version      => lookup('helios', node_uid, 'bios', 'version'),
-          :vendor       => lookup('helios', node_uid, 'bios', 'vendor'),
-          :release_date => lookup('helios', node_uid, 'bios', 'release_date')
+          :version      => lookup('helios_generated', node_uid, 'bios', 'version'),
+          :vendor       => lookup('helios_generated', node_uid, 'bios', 'vendor'),
+          :release_date => lookup('helios_generated', node_uid, 'bios', 'release_date')
         })
 
         gpu({
diff --git a/generators/input/sites/sophia/clusters/helios.yaml b/generators/input/sites/sophia/clusters/helios_generated.yaml
similarity index 97%
rename from generators/input/sites/sophia/clusters/helios.yaml
rename to generators/input/sites/sophia/clusters/helios_generated.yaml
index c02e16d3f2a..ba07ee2cf1e 100644
--- a/generators/input/sites/sophia/clusters/helios.yaml
+++ b/generators/input/sites/sophia/clusters/helios_generated.yaml
@@ -27,8 +27,6 @@ helios-1:
       driver: e1000
       mountable: true
       ip: 172.16.128.1
-      switch_name: edgeiron
-      switch_port: 1/48
     eth1:
       mounted: false
       mac: 00:14:4f:20:90:19
@@ -137,8 +135,6 @@ helios-2:
       driver: e1000
       mountable: true
       ip: 172.16.128.2
-      switch_name: edgeiron
-      switch_port: 1/47
     eth1:
       mounted: false
       mac: 00:14:4f:20:89:61
@@ -232,8 +228,6 @@ helios-3:
       driver: e1000
       mountable: true
       ip: 172.16.128.3
-      switch_name: edgeiron
-      switch_port: 1/46
     eth1:
       mounted: false
       mac: 00:14:4f:20:8d:4d
@@ -312,8 +306,6 @@ helios-4:
       driver: e1000
       mountable: true
       ip: 172.16.128.4
-      switch_name: edgeiron
-      switch_port: 1/45
     eth1:
       mounted: false
       mac: 00:14:4f:20:c5:cb
@@ -407,8 +399,6 @@ helios-5:
       driver: e1000
       mountable: true
       ip: 172.16.128.5
-      switch_name: edgeiron
-      switch_port: 1/44
     eth1:
       mounted: false
       mac: 00:14:4f:45:a6:9b
@@ -502,8 +492,6 @@ helios-6:
       driver: e1000
       mountable: true
       ip: 172.16.128.6
-      switch_name: edgeiron
-      switch_port: 1/43
     eth1:
       mounted: false
       mac: 00:14:4f:1f:bd:25
@@ -597,8 +585,6 @@ helios-7:
       driver: e1000
       mountable: true
       ip: 172.16.128.7
-      switch_name: edgeiron
-      switch_port: 1/42
     eth1:
       mounted: false
       mac: 00:14:4f:20:89:75
@@ -703,8 +689,6 @@ helios-8:
       driver: e1000
       mountable: true
       ip: 172.16.128.8
-      switch_name: edgeiron
-      switch_port: 1/41
     eth1:
       mounted: false
       mac: 00:14:4f:20:a8:b1
@@ -791,8 +775,6 @@ helios-9:
       driver: e1000
       mountable: true
       ip: 172.16.128.9
-      switch_name: edgeiron
-      switch_port: 1/40
     eth1:
       mounted: false
       mac: 00:14:4f:1f:e8:81
@@ -882,8 +864,6 @@ helios-10:
       driver: e1000
       mountable: true
       ip: 172.16.128.10
-      switch_name: edgeiron
-      switch_port: 1/39
     eth1:
       mounted: false
       mac: 00:14:4f:20:8d:ad
@@ -977,8 +957,6 @@ helios-11:
       driver: e1000
       mountable: true
       ip: 172.16.128.11
-      switch_name: edgeiron
-      switch_port: 1/38
     eth1:
       mounted: false
       mac: 00:14:4f:8d:13:99
@@ -1072,8 +1050,6 @@ helios-12:
       driver: e1000
       mountable: true
       ip: 172.16.128.12
-      switch_name: edgeiron
-      switch_port: 1/37
     eth1:
       mounted: false
       mac: 00:14:4f:1f:cc:01
@@ -1178,8 +1154,6 @@ helios-13:
       driver: e1000
       mountable: true
       ip: 172.16.128.13
-      switch_name: edgeiron
-      switch_port: 1/36
     eth1:
       mounted: false
       mac: 00:14:4f:20:c9:69
@@ -1277,8 +1251,6 @@ helios-14:
       driver: e1000
       mountable: true
       ip: 172.16.128.14
-      switch_name: edgeiron
-      switch_port: 1/35
     eth1:
       mounted: false
       mac: 00:14:4f:20:c9:1d
@@ -1361,8 +1333,6 @@ helios-15:
       driver: e1000
       mountable: true
       ip: 172.16.128.15
-      switch_name: edgeiron
-      switch_port: 1/34
     eth1:
       mounted: false
       mac: 00:14:4f:20:8b:27
@@ -1463,8 +1433,6 @@ helios-16:
       driver: e1000
       mountable: true
       ip: 172.16.128.16
-      switch_name: edgeiron
-      switch_port: 1/33
     eth1:
       mounted: false
       mac: 00:14:4f:20:a8:eb
@@ -1547,8 +1515,6 @@ helios-17:
       driver: e1000
       mountable: true
       ip: 172.16.128.17
-      switch_name: edgeiron
-      switch_port: 1/32
     eth1:
       mounted: false
       mac: 00:14:4f:1f:fc:25
@@ -1646,8 +1612,6 @@ helios-18:
       driver: e1000
       mountable: true
       ip: 172.16.128.18
-      switch_name: edgeiron
-      switch_port: 1/31
     eth1:
       mounted: false
       mac: 00:14:4f:20:ca:79
@@ -1752,8 +1716,6 @@ helios-19:
       driver: e1000
       mountable: true
       ip: 172.16.128.19
-      switch_name: edgeiron
-      switch_port: 3/13
     eth1:
       mounted: false
       mac: 00:14:4f:20:b7:5d
@@ -1847,8 +1809,6 @@ helios-20:
       driver: e1000
       mountable: true
       ip: 172.16.128.20
-      switch_name: edgeiron
-      switch_port: 1/29
     eth1:
       mounted: false
       mac: 00:14:4f:20:8a:99
@@ -1942,8 +1902,6 @@ helios-21:
       driver: e1000
       mountable: true
       ip: 172.16.128.21
-      switch_name: edgeiron
-      switch_port: 1/28
     eth1:
       mounted: false
       mac: 00:14:4f:20:8c:01
@@ -2037,8 +1995,6 @@ helios-22:
       driver: e1000
       mountable: true
       ip: 172.16.128.22
-      switch_name: edgeiron
-      switch_port: 1/27
     eth1:
       mounted: false
       mac: 00:14:4f:20:b7:29
@@ -2128,8 +2084,6 @@ helios-23:
       driver: e1000
       mountable: true
       ip: 172.16.128.23
-      switch_name: edgeiron
-      switch_port: 1/26
     eth1:
       mounted: false
       mac: 00:14:4f:20:ac:ad
@@ -2212,8 +2166,6 @@ helios-24:
       driver: e1000
       mountable: true
       ip: 172.16.128.24
-      switch_name: edgeiron
-      switch_port: 1/25
     eth1:
       mounted: false
       mac: 00:14:4f:1f:fc:ed
@@ -2307,8 +2259,6 @@ helios-25:
       driver: e1000
       mountable: true
       ip: 172.16.128.25
-      switch_name: edgeiron
-      switch_port: 1/20
     eth1:
       mounted: false
       mac: 00:14:4f:20:89:e5
@@ -2417,8 +2367,6 @@ helios-26:
       driver: e1000
       mountable: true
       ip: 172.16.128.26
-      switch_name: edgeiron
-      switch_port: 1/17
     eth1:
       mounted: false
       mac: 00:14:4f:20:ad:f9
@@ -2501,8 +2449,6 @@ helios-27:
       driver: e1000
       mountable: true
       ip: 172.16.128.27
-      switch_name: edgeiron
-      switch_port: 1/8
     eth1:
       mounted: false
       mac: 00:14:4f:20:c0:89
@@ -2596,8 +2542,6 @@ helios-28:
       driver: e1000
       mountable: true
       ip: 172.16.128.28
-      switch_name: edgeiron
-      switch_port: 1/13
     eth1:
       mounted: false
       mac: 00:14:4f:20:c6:f5
@@ -2702,8 +2646,6 @@ helios-29:
       driver: e1000
       mountable: true
       ip: 172.16.128.29
-      switch_name: edgeiron
-      switch_port: 1/2
     eth1:
       mounted: false
       mac: 00:14:4f:20:ca:45
@@ -2782,8 +2724,6 @@ helios-30:
       driver: e1000
       mountable: true
       ip: 172.16.128.30
-      switch_name: edgeiron
-      switch_port: 1/7
     eth1:
       mounted: false
       mac: 00:14:4f:1f:c3:b9
@@ -2892,8 +2832,6 @@ helios-31:
       driver: e1000
       mountable: true
       ip: 172.16.128.31
-      switch_name: edgeiron
-      switch_port: 1/10
     eth1:
       mounted: false
       mac: 00:14:4f:20:8d:13
@@ -2983,8 +2921,6 @@ helios-32:
       driver: e1000
       mountable: true
       ip: 172.16.128.32
-      switch_name: edgeiron
-      switch_port: 1/9
     eth1:
       mounted: false
       mac: 00:14:4f:20:05:3d
@@ -3067,8 +3003,6 @@ helios-33:
       driver: e1000
       mountable: true
       ip: 172.16.128.33
-      switch_name: edgeiron
-      switch_port: 1/24
     eth1:
       mounted: false
       mac: 00:14:4f:20:ad:e1
@@ -3166,8 +3100,6 @@ helios-34:
       driver: e1000
       mountable: true
       ip: 172.16.128.34
-      switch_name: edgeiron
-      switch_port: 1/23
     eth1:
       mounted: false
       mac: 00:14:4f:20:af:1d
@@ -3257,8 +3189,6 @@ helios-35:
       driver: e1000
       mountable: true
       ip: 172.16.128.35
-      switch_name: edgeiron
-      switch_port: 1/22
     eth1:
       mounted: false
       mac: 00:14:4f:20:8a:8b
@@ -3367,8 +3297,6 @@ helios-36:
       driver: e1000
       mountable: true
       ip: 172.16.128.36
-      switch_name: edgeiron
-      switch_port: 1/11
     eth1:
       mounted: false
       mac: 00:14:4f:1f:ff:55
@@ -3447,8 +3375,6 @@ helios-37:
       driver: e1000
       mountable: true
       ip: 172.16.128.37
-      switch_name: edgeiron
-      switch_port: 3/1
     eth1:
       mounted: false
       mac: 00:14:4f:20:b0:5d
@@ -3557,8 +3483,6 @@ helios-38:
       driver: e1000
       mountable: true
       ip: 172.16.128.38
-      switch_name: edgeiron
-      switch_port: 1/14
     eth1:
       mounted: false
       mac: 00:14:4f:20:a9:75
@@ -3637,8 +3561,6 @@ helios-39:
       driver: e1000
       mountable: true
       ip: 172.16.128.39
-      switch_name: edgeiron
-      switch_port: 1/16
     eth1:
       mounted: false
       mac: 00:14:4f:20:af:ad
@@ -3747,8 +3669,6 @@ helios-40:
       driver: e1000
       mountable: true
       ip: 172.16.128.40
-      switch_name: edgeiron
-      switch_port: 1/15
     eth1:
       mounted: false
       mac: 00:14:4f:20:bc:23
@@ -3842,8 +3762,6 @@ helios-41:
       driver: e1000
       mountable: true
       ip: 172.16.128.41
-      switch_name: edgeiron
-      switch_port: 1/12
     eth1:
       mounted: false
       mac: 00:14:4f:1f:e7:e5
@@ -3922,8 +3840,6 @@ helios-42:
       driver: e1000
       mountable: true
       ip: 172.16.128.42
-      switch_name: edgeiron
-      switch_port: 1/5
     eth1:
       mounted: false
       mac: 00:14:4f:20:03:89
@@ -4017,8 +3933,6 @@ helios-43:
       driver: e1000
       mountable: true
       ip: 172.16.128.43
-      switch_name: edgeiron
-      switch_port: 1/1
     eth1:
       mounted: false
       mac: 00:14:4f:1f:ca:bb
@@ -4112,8 +4026,6 @@ helios-44:
       driver: e1000
       mountable: true
       ip: 172.16.128.44
-      switch_name: edgeiron
-      switch_port: 1/3
     eth1:
       mounted: false
       mac: 00:14:4f:20:bf:4d
@@ -4218,8 +4130,6 @@ helios-45:
       driver: e1000
       mountable: true
       ip: 172.16.128.45
-      switch_name: edgeiron
-      switch_port: 3/2
     eth1:
       mounted: false
       mac: 00:14:4f:20:05:81
@@ -4317,8 +4227,6 @@ helios-46:
       driver: e1000
       mountable: true
       ip: 172.16.128.46
-      switch_name: edgeiron
-      switch_port: 1/19
     eth1:
       mounted: false
       mac: 00:14:4f:20:8b:f5
@@ -4397,8 +4305,6 @@ helios-47:
       driver: e1000
       mountable: true
       ip: 172.16.128.47
-      switch_name: edgeiron
-      switch_port: 1/18
     eth1:
       mounted: false
       mac: 00:14:4f:20:bf:c9
@@ -4492,8 +4398,6 @@ helios-48:
       driver: e1000
       mountable: true
       ip: 172.16.128.48
-      switch_name: edgeiron
-      switch_port: 1/21
     eth1:
       mounted: false
       mac: 00:14:4f:20:89:5f
@@ -4587,8 +4491,6 @@ helios-49:
       driver: e1000
       mountable: true
       ip: 172.16.128.49
-      switch_name: edgeiron
-      switch_port: 3/12
     eth1:
       mounted: false
       mac: 00:14:4f:20:b5:05
@@ -4682,8 +4584,6 @@ helios-50:
       driver: e1000
       mountable: true
       ip: 172.16.128.50
-      switch_name: edgeiron
-      switch_port: 3/11
     eth1:
       mounted: false
       mac: 00:14:4f:20:88:ff
@@ -4781,8 +4681,6 @@ helios-51:
       driver: e1000
       mountable: true
       ip: 172.16.128.51
-      switch_name: edgeiron
-      switch_port: 3/10
     eth1:
       mounted: false
       mac: 00:14:4f:20:5f:e5
@@ -4879,8 +4777,6 @@ helios-52:
       driver: e1000
       mountable: true
       ip: 172.16.128.52
-      switch_name: edgeiron
-      switch_port: 3/9
     eth1:
       mounted: false
       mac: 00:14:4f:20:64:ff
@@ -4978,8 +4874,6 @@ helios-53:
       driver: e1000
       mountable: true
       ip: 172.16.128.53
-      switch_name: edgeiron
-      switch_port: 3/8
     eth1:
       mounted: false
       mac: 00:14:4f:1f:c8:49
@@ -5073,8 +4967,6 @@ helios-54:
       driver: e1000
       mountable: true
       ip: 172.16.128.54
-      switch_name: edgeiron
-      switch_port: 3/7
     eth1:
       mounted: false
       mac: 00:14:4f:20:5f:79
@@ -5157,8 +5049,6 @@ helios-55:
       driver: e1000
       mountable: true
       ip: 172.16.128.55
-      switch_name: edgeiron
-      switch_port: 3/6
     eth1:
       mounted: false
       mac: 00:14:4f:1f:c4:a5
@@ -5248,8 +5138,6 @@ helios-56:
       driver: e1000
       mountable: true
       ip: 172.16.128.56
-      switch_name: edgeiron
-      switch_port: 3/5
     eth1:
       mounted: false
       mac: 00:14:4f:20:89:2d
diff --git a/generators/input/sites/sophia/clusters/helios_manual.yaml b/generators/input/sites/sophia/clusters/helios_manual.yaml
new file mode 100644
index 00000000000..615fa6e0d51
--- /dev/null
+++ b/generators/input/sites/sophia/clusters/helios_manual.yaml
@@ -0,0 +1,281 @@
+---
+helios-1:
+  network_interfaces:
+    eth0:
+      switch_name: edgeiron
+      switch_port: 1/48
+helios-2:
+  network_interfaces:
+    eth0:
+      switch_name: edgeiron
+      switch_port: 1/47
+helios-3:
+  network_interfaces:
+    eth0:
+      switch_name: edgeiron
+      switch_port: 1/46
+helios-4:
+  network_interfaces:
+    eth0:
+      switch_name: edgeiron
+      switch_port: 1/45
+helios-5:
+  network_interfaces:
+    eth0:
+      switch_name: edgeiron
+      switch_port: 1/44
+helios-6:
+  network_interfaces:
+    eth0:
+      switch_name: edgeiron
+      switch_port: 1/43
+helios-7:
+  network_interfaces:
+    eth0:
+      switch_name: edgeiron
+      switch_port: 1/42
+helios-8:
+  network_interfaces:
+    eth0:
+      switch_name: edgeiron
+      switch_port: 1/41
+helios-9:
+  network_interfaces:
+    eth0:
+      switch_name: edgeiron
+      switch_port: 1/40
+helios-10:
+  network_interfaces:
+    eth0:
+      switch_name: edgeiron
+      switch_port: 1/39
+helios-11:
+  network_interfaces:
+    eth0:
+      switch_name: edgeiron
+      switch_port: 1/38
+helios-12:
+  network_interfaces:
+    eth0:
+      switch_name: edgeiron
+      switch_port: 1/37
+helios-13:
+  network_interfaces:
+    eth0:
+      switch_name: edgeiron
+      switch_port: 1/36
+helios-14:
+  network_interfaces:
+    eth0:
+      switch_name: edgeiron
+      switch_port: 1/35
+helios-15:
+  network_interfaces:
+    eth0:
+      switch_name: edgeiron
+      switch_port: 1/34
+helios-16:
+  network_interfaces:
+    eth0:
+      switch_name: edgeiron
+      switch_port: 1/33
+helios-17:
+  network_interfaces:
+    eth0:
+      switch_name: edgeiron
+      switch_port: 1/32
+helios-18:
+  network_interfaces:
+    eth0:
+      switch_name: edgeiron
+      switch_port: 1/31
+helios-19:
+  network_interfaces:
+    eth0:
+      switch_name: edgeiron
+      switch_port: 3/13
+helios-20:
+  network_interfaces:
+    eth0:
+      switch_name: edgeiron
+      switch_port: 1/29
+helios-21:
+  network_interfaces:
+    eth0:
+      switch_name: edgeiron
+      switch_port: 1/28
+helios-22:
+  network_interfaces:
+    eth0:
+      switch_name: edgeiron
+      switch_port: 1/27
+helios-23:
+  network_interfaces:
+    eth0:
+      switch_name: edgeiron
+      switch_port: 1/26
+helios-24:
+  network_interfaces:
+    eth0:
+      switch_name: edgeiron
+      switch_port: 1/25
+helios-25:
+  network_interfaces:
+    eth0:
+      switch_name: edgeiron
+      switch_port: 1/20
+helios-26:
+  network_interfaces:
+    eth0:
+      switch_name: edgeiron
+      switch_port: 1/17
+helios-27:
+  network_interfaces:
+    eth0:
+      switch_name: edgeiron
+      switch_port: 1/8
+helios-28:
+  network_interfaces:
+    eth0:
+      switch_name: edgeiron
+      switch_port: 1/13
+helios-29:
+  network_interfaces:
+    eth0:
+      switch_name: edgeiron
+      switch_port: 1/2
+helios-30:
+  network_interfaces:
+    eth0:
+      switch_name: edgeiron
+      switch_port: 1/7
+helios-31:
+  network_interfaces:
+    eth0:
+      switch_name: edgeiron
+      switch_port: 1/10
+helios-32:
+  network_interfaces:
+    eth0:
+      switch_name: edgeiron
+      switch_port: 1/9
+helios-33:
+  network_interfaces:
+    eth0:
+      switch_name: edgeiron
+      switch_port: 1/24
+helios-34:
+  network_interfaces:
+    eth0:
+      switch_name: edgeiron
+      switch_port: 1/23
+helios-35:
+  network_interfaces:
+    eth0:
+      switch_name: edgeiron
+      switch_port: 1/22
+helios-36:
+  network_interfaces:
+    eth0:
+      switch_name: edgeiron
+      switch_port: 1/11
+helios-37:
+  network_interfaces:
+    eth0:
+      switch_name: edgeiron
+      switch_port: 3/1
+helios-38:
+  network_interfaces:
+    eth0:
+      switch_name: edgeiron
+      switch_port: 1/14
+helios-39:
+  network_interfaces:
+    eth0:
+      switch_name: edgeiron
+      switch_port: 1/16
+helios-40:
+  network_interfaces:
+    eth0:
+      switch_name: edgeiron
+      switch_port: 1/15
+helios-41:
+  network_interfaces:
+    eth0:
+      switch_name: edgeiron
+      switch_port: 1/12
+helios-42:
+  network_interfaces:
+    eth0:
+      switch_name: edgeiron
+      switch_port: 1/5
+helios-43:
+  network_interfaces:
+    eth0:
+      switch_name: edgeiron
+      switch_port: 1/1
+helios-44:
+  network_interfaces:
+    eth0:
+      switch_name: edgeiron
+      switch_port: 1/3
+helios-45:
+  network_interfaces:
+    eth0:
+      switch_name: edgeiron
+      switch_port: 3/2
+helios-46:
+  network_interfaces:
+    eth0:
+      switch_name: edgeiron
+      switch_port: 1/19
+helios-47:
+  network_interfaces:
+    eth0:
+      switch_name: edgeiron
+      switch_port: 1/18
+helios-48:
+  network_interfaces:
+    eth0:
+      switch_name: edgeiron
+      switch_port: 1/21
+helios-49:
+  network_interfaces:
+    eth0:
+      switch_name: edgeiron
+      switch_port: 3/12
+helios-50:
+  network_interfaces:
+    eth0:
+      switch_name: edgeiron
+      switch_port: 3/11
+helios-51:
+  network_interfaces:
+    eth0:
+      switch_name: edgeiron
+      switch_port: 3/10
+helios-52:
+  network_interfaces:
+    eth0:
+      switch_name: edgeiron
+      switch_port: 3/9
+helios-53:
+  network_interfaces:
+    eth0:
+      switch_name: edgeiron
+      switch_port: 3/8
+helios-54:
+  network_interfaces:
+    eth0:
+      switch_name: edgeiron
+      switch_port: 3/7
+helios-55:
+  network_interfaces:
+    eth0:
+      switch_name: edgeiron
+      switch_port: 3/6
+helios-56:
+  network_interfaces:
+    eth0:
+      switch_name: edgeiron
+      switch_port: 3/5
diff --git a/generators/input/sites/sophia/clusters/sol.rb b/generators/input/sites/sophia/clusters/sol.rb
index c9dcc026f2d..a16a5fc510c 100644
--- a/generators/input/sites/sophia/clusters/sol.rb
+++ b/generators/input/sites/sophia/clusters/sol.rb
@@ -16,91 +16,91 @@ site :sophia do |site_uid|
         supported_job_types({
           :deploy       => true,
           :besteffort   => true,
-          :virtual      => lookup('sol', node_uid, 'supported_job_types', 'virtual')
+          :virtual      => lookup('sol_generated', node_uid, 'supported_job_types', 'virtual')
         })
 
         architecture({
-          :smp_size       => lookup('sol', node_uid, 'architecture', 'smp_size'),
-          :smt_size       => lookup('sol', node_uid, 'architecture', 'smt_size'),
-          :platform_type  => lookup('sol', node_uid, 'architecture', 'platform_type')
+          :smp_size       => lookup('sol_generated', node_uid, 'architecture', 'smp_size'),
+          :smt_size       => lookup('sol_generated', node_uid, 'architecture', 'smt_size'),
+          :platform_type  => lookup('sol_generated', node_uid, 'architecture', 'platform_type')
         })
 
         processor({
-          :vendor             => lookup('sol', node_uid, 'processor', 'vendor'),
-          :model              => lookup('sol', node_uid, 'processor', 'model'),
-          :version            => lookup('sol', node_uid, 'processor', 'version'),
-          :clock_speed        => lookup('sol', node_uid, 'processor', 'clock_speed'),
-          :instruction_set    => lookup('sol', node_uid, 'processor', 'instruction_set'),
-          :other_description  => lookup('sol', node_uid, 'processor', 'other_description'),
-          :cache_l1           => lookup('sol', node_uid, 'processor', 'cache_l1'),
-          :cache_l1i          => lookup('sol', node_uid, 'processor', 'cache_l1i'),
-          :cache_l1d          => lookup('sol', node_uid, 'processor', 'cache_l1d'),
-          :cache_l2           => lookup('sol', node_uid, 'processor', 'cache_l2'),
-          :cache_l3           => lookup('sol', node_uid, 'processor', 'cache_l3')
+          :vendor             => lookup('sol_generated', node_uid, 'processor', 'vendor'),
+          :model              => lookup('sol_generated', node_uid, 'processor', 'model'),
+          :version            => lookup('sol_generated', node_uid, 'processor', 'version'),
+          :clock_speed        => lookup('sol_generated', node_uid, 'processor', 'clock_speed'),
+          :instruction_set    => lookup('sol_generated', node_uid, 'processor', 'instruction_set'),
+          :other_description  => lookup('sol_generated', node_uid, 'processor', 'other_description'),
+          :cache_l1           => lookup('sol_generated', node_uid, 'processor', 'cache_l1'),
+          :cache_l1i          => lookup('sol_generated', node_uid, 'processor', 'cache_l1i'),
+          :cache_l1d          => lookup('sol_generated', node_uid, 'processor', 'cache_l1d'),
+          :cache_l2           => lookup('sol_generated', node_uid, 'processor', 'cache_l2'),
+          :cache_l3           => lookup('sol_generated', node_uid, 'processor', 'cache_l3')
         })
 
         main_memory({
-          :ram_size     => lookup('sol', node_uid, 'main_memory', 'ram_size'),
+          :ram_size     => lookup('sol_generated', node_uid, 'main_memory', 'ram_size'),
           :virtual_size => nil
         })
 
         operating_system({
-          :name     => lookup('sol', node_uid, 'operating_system', 'name'),
+          :name     => lookup('sol_generated', node_uid, 'operating_system', 'name'),
           :release  => "Squeeze",
-          :version  => lookup('sol', node_uid, 'operating_system', 'version'),
-          :kernel   => lookup('sol', node_uid, 'operating_system', 'kernel')
+          :version  => lookup('sol_generated', node_uid, 'operating_system', 'version'),
+          :kernel   => lookup('sol_generated', node_uid, 'operating_system', 'kernel')
         })
 
         storage_devices [{
           :interface  => 'SATA',
-          :size       => lookup('sol', node_uid, 'block_devices', 'sda', 'size'),
+          :size       => lookup('sol_generated', node_uid, 'block_devices', 'sda', 'size'),
           :driver     => "sata_nv",
-          :device     => lookup('sol', node_uid, 'block_devices', 'sda', 'device'),
-          :model      => lookup('sol', node_uid, 'block_devices', 'sda', 'model'),
-          :vendor     => lookup('sol', node_uid, 'block_devices', 'sda', 'vendor'),
-          :rev        => lookup('sol', node_uid, 'block_devices', 'sda', 'rev')
+          :device     => lookup('sol_generated', node_uid, 'block_devices', 'sda', 'device'),
+          :model      => lookup('sol_generated', node_uid, 'block_devices', 'sda', 'model'),
+          :vendor     => lookup('sol_generated', node_uid, 'block_devices', 'sda', 'vendor'),
+          :rev        => lookup('sol_generated', node_uid, 'block_devices', 'sda', 'rev')
         }]
 
         network_adapters [{
-          :interface        => lookup('sol', node_uid, 'network_interfaces', 'eth0', 'interface'),
-          :rate             => lookup('sol', node_uid, 'network_interfaces', 'eth0', 'rate'),
-          :enabled          => lookup('sol', node_uid, 'network_interfaces', 'eth0', 'enabled'),
-          :management       => lookup('sol', node_uid, 'network_interfaces', 'eth0', 'management'),
-          :mountable        => lookup('sol', node_uid, 'network_interfaces', 'eth0', 'mountable'),
-          :mounted          => lookup('sol', node_uid, 'network_interfaces', 'eth0', 'mounted'),
+          :interface        => lookup('sol_generated', node_uid, 'network_interfaces', 'eth0', 'interface'),
+          :rate             => lookup('sol_generated', node_uid, 'network_interfaces', 'eth0', 'rate'),
+          :enabled          => lookup('sol_generated', node_uid, 'network_interfaces', 'eth0', 'enabled'),
+          :management       => lookup('sol_generated', node_uid, 'network_interfaces', 'eth0', 'management'),
+          :mountable        => lookup('sol_generated', node_uid, 'network_interfaces', 'eth0', 'mountable'),
+          :mounted          => lookup('sol_generated', node_uid, 'network_interfaces', 'eth0', 'mounted'),
           :bridged          => true,
           :device           => "eth0",
           :vendor           => 'nVidia',
           :version          => "MCP55 Pro",
-          :driver           => lookup('sol', node_uid, 'network_interfaces', 'eth0', 'driver'),
+          :driver           => lookup('sol_generated', node_uid, 'network_interfaces', 'eth0', 'driver'),
           :network_address  => "#{node_uid}.#{site_uid}.grid5000.fr",
-          :ip               => lookup('sol', node_uid, 'network_interfaces', 'eth0', 'ip'),
-          :ip6              => lookup('sol', node_uid, 'network_interfaces', 'eth0', 'ip6'),
-          :switch           => "gw-sophia",
-          :switch_port      => lookup('sol', node_uid, 'network_interfaces', 'eth0', 'switch_port'),
-          :mac              => lookup('sol', node_uid, 'network_interfaces', 'eth0', 'mac')
+          :ip               => lookup('sol_generated', node_uid, 'network_interfaces', 'eth0', 'ip'),
+          :ip6              => lookup('sol_generated', node_uid, 'network_interfaces', 'eth0', 'ip6'),
+          :switch           => lookup('sol_manual', node_uid, 'network_interfaces', 'eth0', 'switch_name'),
+          :switch_port      => lookup('sol_manual', node_uid, 'network_interfaces', 'eth0', 'switch_port'),
+          :mac              => lookup('sol_generated', node_uid, 'network_interfaces', 'eth0', 'mac')
         },
         {
-          :interface        => lookup('sol', node_uid, 'network_interfaces', 'eth1', 'interface'),
+          :interface        => lookup('sol_generated', node_uid, 'network_interfaces', 'eth1', 'interface'),
           :rate             => 1.G,
-          :enabled          => lookup('sol', node_uid, 'network_interfaces', 'eth1', 'enabled'),
-          :management       => lookup('sol', node_uid, 'network_interfaces', 'eth1', 'management'),
-          :mountable        => lookup('sol', node_uid, 'network_interfaces', 'eth1', 'mountable'),
-          :mounted          => lookup('sol', node_uid, 'network_interfaces', 'eth1', 'mounted'),
+          :enabled          => lookup('sol_generated', node_uid, 'network_interfaces', 'eth1', 'enabled'),
+          :management       => lookup('sol_generated', node_uid, 'network_interfaces', 'eth1', 'management'),
+          :mountable        => lookup('sol_generated', node_uid, 'network_interfaces', 'eth1', 'mountable'),
+          :mounted          => lookup('sol_generated', node_uid, 'network_interfaces', 'eth1', 'mounted'),
           :bridged          => false,
           :device           => "eth1",
           :vendor           => 'nVidia',
           :version          => "MCP55 Pro",
-          :driver           => lookup('sol', node_uid, 'network_interfaces', 'eth1', 'driver'),
-          :ip               => lookup('sol', node_uid, 'network_interfaces', 'eth1', 'ip'),
-          :mac              => lookup('sol', node_uid, 'network_interfaces', 'eth1', 'mac')
+          :driver           => lookup('sol_generated', node_uid, 'network_interfaces', 'eth1', 'driver'),
+          :ip               => lookup('sol_generated', node_uid, 'network_interfaces', 'eth1', 'ip'),
+          :mac              => lookup('sol_generated', node_uid, 'network_interfaces', 'eth1', 'mac')
         },
         {
           :interface => 'Ethernet',
           :rate => 100.M,
           :network_address  => "#{node_uid}-bmc.#{site_uid}.grid5000.fr",
-          :ip => lookup('sol', node_uid, 'network_interfaces','bmc', 'ip'),
-          :mac => lookup('sol', node_uid, 'network_interfaces','bmc', 'mac'),
+          :ip => lookup('sol_generated', node_uid, 'network_interfaces','bmc', 'ip'),
+          :mac => lookup('sol_generated', node_uid, 'network_interfaces','bmc', 'mac'),
           :enabled  => true,
           :mounted => false,
           :mountable => false,
@@ -108,34 +108,34 @@ site :sophia do |site_uid|
           :device => "bmc"
         },
         {
-          :interface            => lookup('sol', node_uid, 'network_interfaces', 'myri0', 'interface'),
-          :rate                 => lookup('sol', node_uid, 'network_interfaces', 'myri0', 'rate'),
+          :interface            => lookup('sol_generated', node_uid, 'network_interfaces', 'myri0', 'interface'),
+          :rate                 => lookup('sol_generated', node_uid, 'network_interfaces', 'myri0', 'rate'),
           :network_address      => "#{node_uid}-myri0.#{site_uid}.grid5000.fr",
-          :ip                   => lookup('sol', node_uid, 'network_interfaces', 'myri0', 'ip'),
-          :ip6                  => lookup('sol', node_uid, 'network_interfaces', 'myri0', 'ip6'),
-          :mac                  => lookup('sol', node_uid, 'network_interfaces', 'myri0', 'mac'),
+          :ip                   => lookup('sol_generated', node_uid, 'network_interfaces', 'myri0', 'ip'),
+          :ip6                  => lookup('sol_generated', node_uid, 'network_interfaces', 'myri0', 'ip6'),
+          :mac                  => lookup('sol_generated', node_uid, 'network_interfaces', 'myri0', 'mac'),
           :vendor               => 'Myricom',
           :version              => "M3F-PCIXF-2",
-          :driver               => lookup('sol', node_uid, 'network_interfaces', 'myri0', 'driver'),
-          :enabled              => lookup('sol', node_uid, 'network_interfaces', 'myri0', 'enabled'),
-          :management           => lookup('sol', node_uid, 'network_interfaces', 'myri0', 'management'),
-          :mountable            => lookup('sol', node_uid, 'network_interfaces', 'myri0', 'mountable'),
-          :mounted              => lookup('sol', node_uid, 'network_interfaces', 'myri0', 'mounted'),
+          :driver               => lookup('sol_generated', node_uid, 'network_interfaces', 'myri0', 'driver'),
+          :enabled              => lookup('sol_generated', node_uid, 'network_interfaces', 'myri0', 'enabled'),
+          :management           => lookup('sol_generated', node_uid, 'network_interfaces', 'myri0', 'management'),
+          :mountable            => lookup('sol_generated', node_uid, 'network_interfaces', 'myri0', 'mountable'),
+          :mounted              => lookup('sol_generated', node_uid, 'network_interfaces', 'myri0', 'mounted'),
           :management           => false,
           :device               => "myri0",
           :switch               => 'sw-myrinet'
         }]
 
         chassis({
-          :serial       => lookup('sol', node_uid, 'chassis', 'serial_number'),
-          :name         => lookup('sol', node_uid, 'chassis', 'product_name'),
-          :manufacturer => lookup('sol', node_uid, 'chassis', 'manufacturer')
+          :serial       => lookup('sol_generated', node_uid, 'chassis', 'serial_number'),
+          :name         => lookup('sol_generated', node_uid, 'chassis', 'product_name'),
+          :manufacturer => lookup('sol_generated', node_uid, 'chassis', 'manufacturer')
         })
 
         bios({
-          :version      => lookup('sol', node_uid, 'bios', 'version'),
-          :vendor       => lookup('sol', node_uid, 'bios', 'vendor'),
-          :release_date => lookup('sol', node_uid, 'bios', 'release_date')
+          :version      => lookup('sol_generated', node_uid, 'bios', 'version'),
+          :vendor       => lookup('sol_generated', node_uid, 'bios', 'vendor'),
+          :release_date => lookup('sol_generated', node_uid, 'bios', 'release_date')
         })
 
         gpu({
diff --git a/generators/input/sites/sophia/clusters/sol.yaml b/generators/input/sites/sophia/clusters/sol_generated.yaml
similarity index 96%
rename from generators/input/sites/sophia/clusters/sol.yaml
rename to generators/input/sites/sophia/clusters/sol_generated.yaml
index 86a4bad8567..cbfc3335ac0 100644
--- a/generators/input/sites/sophia/clusters/sol.yaml
+++ b/generators/input/sites/sophia/clusters/sol_generated.yaml
@@ -27,8 +27,6 @@ sol-1:
       driver: forcedeth
       mountable: true
       ip: 172.16.129.1
-      switch_name: gw-sophia
-      switch_port: 3/1
     eth1:
       mounted: false
       mac: 00:16:36:91:e7:d1
@@ -84,8 +82,6 @@ sol-2:
       driver: forcedeth
       mountable: true
       ip: 172.16.129.2
-      switch_name: gw-sophia
-      switch_port: 3/3
     eth1:
       mounted: false
       mac: 00:16:36:91:eb:85
@@ -166,8 +162,6 @@ sol-3:
       driver: forcedeth
       mountable: true
       ip: 172.16.129.3
-      switch_name: gw-sophia
-      switch_port: 3/5
     eth1:
       mounted: false
       mac: 00:16:36:91:eb:25
@@ -230,8 +224,6 @@ sol-4:
       driver: forcedeth
       mountable: true
       ip: 172.16.129.4
-      switch_name: gw-sophia
-      switch_port: 3/7
     eth1:
       mounted: false
       mac: 00:16:36:91:e9:d5
@@ -287,8 +279,6 @@ sol-5:
       driver: forcedeth
       mountable: true
       ip: 172.16.129.5
-      switch_name: gw-sophia
-      switch_port: 3/9
     eth1:
       mounted: false
       mac: 00:16:36:91:e8:e9
@@ -358,8 +348,6 @@ sol-6:
       driver: forcedeth
       mountable: true
       ip: 172.16.129.6
-      switch_name: gw-sophia
-      switch_port: 3/11
     eth1:
       mounted: false
       mac: 00:16:36:91:e8:71
@@ -411,8 +399,6 @@ sol-7:
       driver: forcedeth
       mountable: true
       ip: 172.16.129.7
-      switch_name: gw-sophia
-      switch_port: 3/13
     eth1:
       mounted: false
       mac: 00:16:36:91:ea:d5
@@ -475,8 +461,6 @@ sol-8:
       driver: forcedeth
       mountable: true
       ip: 172.16.129.8
-      switch_name: gw-sophia
-      switch_port: 3/15
     eth1:
       mounted: false
       mac: 00:16:36:c5:8a:88
@@ -539,8 +523,6 @@ sol-9:
       driver: forcedeth
       mountable: true
       ip: 172.16.129.9
-      switch_name: gw-sophia
-      switch_port: 3/17
     eth1:
       mounted: false
       mac: 00:16:36:91:e9:91
@@ -610,8 +592,6 @@ sol-10:
       driver: forcedeth
       mountable: true
       ip: 172.16.129.10
-      switch_name: gw-sophia
-      switch_port: 3/19
     eth1:
       mounted: false
       mac: 00:16:36:91:eb:d1
@@ -667,8 +647,6 @@ sol-11:
       driver: forcedeth
       mountable: true
       ip: 172.16.129.11
-      switch_name: gw-sophia
-      switch_port: 3/21
     eth1:
       mounted: false
       mac: 00:16:36:91:e9:dd
@@ -731,8 +709,6 @@ sol-12:
       driver: forcedeth
       mountable: true
       ip: 172.16.129.12
-      switch_name: gw-sophia
-      switch_port: 3/23
     eth1:
       mounted: false
       mac: 00:16:36:91:eb:61
@@ -806,8 +782,6 @@ sol-13:
       driver: forcedeth
       mountable: true
       ip: 172.16.129.13
-      switch_name: gw-sophia
-      switch_port: 4/1
     eth1:
       mounted: false
       mac: 00:16:36:91:e8:5d
@@ -863,8 +837,6 @@ sol-14:
       driver: forcedeth
       mountable: true
       ip: 172.16.129.14
-      switch_name: gw-sophia
-      switch_port: 4/3
     eth1:
       mounted: false
       mac: 00:16:36:c9:fb:e5
@@ -923,8 +895,6 @@ sol-15:
       driver: forcedeth
       mountable: true
       ip: 172.16.129.15
-      switch_name: gw-sophia
-      switch_port: 4/5
     eth1:
       mounted: false
       mac: 00:16:36:c9:fb:35
@@ -998,8 +968,6 @@ sol-16:
       driver: forcedeth
       mountable: true
       ip: 172.16.129.16
-      switch_name: gw-sophia
-      switch_port: 4/7
     eth1:
       mounted: false
       mac: 00:16:36:c9:fb:95
@@ -1058,8 +1026,6 @@ sol-17:
       driver: forcedeth
       mountable: true
       ip: 172.16.129.17
-      switch_name: gw-sophia
-      switch_port: 4/9
     eth1:
       mounted: false
       mac: 00:16:36:c5:8a:84
@@ -1119,8 +1085,6 @@ sol-18:
       driver: forcedeth
       mountable: true
       ip: 172.16.129.18
-      switch_name: gw-sophia
-      switch_port: 4/11
     eth1:
       mounted: false
       mac: 00:16:36:91:ec:15
@@ -1190,8 +1154,6 @@ sol-19:
       driver: forcedeth
       mountable: true
       ip: 172.16.129.19
-      switch_name: gw-sophia
-      switch_port: 4/13
     eth1:
       mounted: false
       mac: 00:16:36:91:ea:c1
@@ -1254,8 +1216,6 @@ sol-20:
       driver: forcedeth
       mountable: true
       ip: 172.16.129.20
-      switch_name: gw-sophia
-      switch_port: 4/15
     eth1:
       mounted: false
       mac: 00:16:36:91:e9:75
@@ -1329,8 +1289,6 @@ sol-21:
       driver: forcedeth
       mountable: true
       ip: 172.16.129.21
-      switch_name: gw-sophia
-      switch_port: 4/17
     eth1:
       mounted: false
       mac: 00:16:36:91:ec:25
@@ -1340,7 +1298,7 @@ sol-21:
       driver: forcedeth
       mountable: false
     bmc:
-      mac:
+      mac: 
       ip: 172.17.129.21
   chassis:
     serial_number: 0650QBT10B
@@ -1393,8 +1351,6 @@ sol-22:
       driver: forcedeth
       mountable: true
       ip: 172.16.129.22
-      switch_name: gw-sophia
-      switch_port: 4/19
     eth1:
       mounted: false
       mac: 00:16:36:91:e9:d9
@@ -1457,8 +1413,6 @@ sol-23:
       driver: forcedeth
       mountable: true
       ip: 172.16.129.23
-      switch_name: gw-sophia
-      switch_port: 4/21
     eth1:
       mounted: false
       mac: 00:16:36:91:eb:1d
@@ -1468,7 +1422,7 @@ sol-23:
       driver: forcedeth
       mountable: false
     bmc:
-      mac:
+      mac: 
       ip: 172.17.129.23
   supported_job_types:
     virtual: amd-v
@@ -1521,8 +1475,6 @@ sol-24:
       driver: forcedeth
       mountable: true
       ip: 172.16.129.24
-      switch_name: gw-sophia
-      switch_port: 4/23
     eth1:
       mounted: false
       mac: 00:16:36:91:e9:ed
@@ -1574,8 +1526,6 @@ sol-25:
       driver: forcedeth
       mountable: true
       ip: 172.16.129.25
-      switch_name: gw-sophia
-      switch_port: 3/2
     eth1:
       mounted: false
       mac: 00:16:36:91:eb:2d
@@ -1645,8 +1595,6 @@ sol-26:
       driver: forcedeth
       mountable: true
       ip: 172.16.129.26
-      switch_name: gw-sophia
-      switch_port: 3/4
     eth1:
       mounted: false
       mac: 00:16:36:91:eb:d5
@@ -1706,8 +1654,6 @@ sol-27:
       driver: forcedeth
       mountable: true
       ip: 172.16.129.27
-      switch_name: gw-sophia
-      switch_port: 3/6
     eth1:
       mounted: false
       mac: 00:16:36:91:e9:f1
@@ -1766,8 +1712,6 @@ sol-28:
       driver: forcedeth
       mountable: true
       ip: 172.16.129.28
-      switch_name: gw-sophia
-      switch_port: 3/8
     eth1:
       mounted: false
       mac: 00:16:36:91:e8:2d
@@ -1841,8 +1785,6 @@ sol-29:
       driver: forcedeth
       mountable: true
       ip: 172.16.129.29
-      switch_name: gw-sophia
-      switch_port: 3/10
     eth1:
       mounted: false
       mac: 00:16:36:91:e8:dd
@@ -1916,8 +1858,6 @@ sol-30:
       driver: forcedeth
       mountable: true
       ip: 172.16.129.30
-      switch_name: gw-sophia
-      switch_port: 3/12
     eth1:
       mounted: false
       mac: 00:16:36:91:ea:95
@@ -1991,8 +1931,6 @@ sol-31:
       driver: forcedeth
       mountable: true
       ip: 172.16.129.31
-      switch_name: gw-sophia
-      switch_port: 3/14
     eth1:
       mounted: false
       mac: 00:16:36:c9:f9:81
@@ -2066,8 +2004,6 @@ sol-32:
       driver: forcedeth
       mountable: true
       ip: 172.16.129.32
-      switch_name: gw-sophia
-      switch_port: 3/16
     eth1:
       mounted: false
       mac: 00:16:36:91:e9:95
@@ -2148,8 +2084,6 @@ sol-33:
       driver: forcedeth
       mountable: true
       ip: 172.16.129.33
-      switch_name: gw-sophia
-      switch_port: 3/18
     eth1:
       mounted: false
       mac: 00:16:36:91:ea:85
@@ -2220,8 +2154,6 @@ sol-34:
       driver: forcedeth
       mountable: true
       ip: 172.16.129.34
-      switch_name: gw-sophia
-      switch_port: 3/20
     eth1:
       mounted: false
       mac: 00:16:36:91:eb:dd
@@ -2298,8 +2230,6 @@ sol-35:
       driver: forcedeth
       mountable: true
       ip: 172.16.129.35
-      switch_name: gw-sophia
-      switch_port: 3/22
     eth1:
       mounted: false
       mac: 00:16:36:91:ea:09
@@ -2377,8 +2307,6 @@ sol-36:
       driver: forcedeth
       mountable: true
       ip: 172.16.129.36
-      switch_name: gw-sophia
-      switch_port: 3/24
     eth1:
       mounted: false
       mac: 00:16:36:91:ea:09
@@ -2452,8 +2380,6 @@ sol-37:
       driver: forcedeth
       mountable: true
       ip: 172.16.129.37
-      switch_name: gw-sophia
-      switch_port: 4/2
     eth1:
       mounted: false
       mac: 00:16:36:91:e9:a5
@@ -2516,8 +2442,6 @@ sol-38:
       driver: forcedeth
       mountable: true
       ip: 172.16.129.38
-      switch_name: gw-sophia
-      switch_port: 4/4
     eth1:
       mounted: false
       mac: 00:16:36:91:e8:6d
@@ -2602,8 +2526,6 @@ sol-39:
       driver: forcedeth
       mountable: true
       ip: 172.16.129.39
-      switch_name: gw-sophia
-      switch_port: 4/6
     eth1:
       mounted: false
       mac: 00:16:36:91:ec:21
@@ -2673,8 +2595,6 @@ sol-40:
       driver: forcedeth
       mountable: true
       ip: 172.16.129.40
-      switch_name: gw-sophia
-      switch_port: 4/8
     eth1:
       mounted: false
       mac: 00:16:36:91:eb:09
@@ -2741,8 +2661,6 @@ sol-41:
       driver: forcedeth
       mountable: true
       ip: 172.16.129.41
-      switch_name: gw-sophia
-      switch_port: 4/10
     eth1:
       mounted: false
       mac: 00:16:36:91:ea:f9
@@ -2827,8 +2745,6 @@ sol-42:
       driver: forcedeth
       mountable: true
       ip: 172.16.129.42
-      switch_name: gw-sophia
-      switch_port: 4/14
     eth1:
       mounted: false
       mac: 00:16:36:91:ea:91
@@ -2898,8 +2814,6 @@ sol-43:
       driver: forcedeth
       mountable: true
       ip: 172.16.129.43
-      switch_name: gw-sophia
-      switch_port: 4/12
     eth1:
       mounted: false
       mac: 00:16:36:91:ea:fd
@@ -2977,8 +2891,6 @@ sol-44:
       driver: forcedeth
       mountable: true
       ip: 172.16.129.44
-      switch_name: gw-sophia
-      switch_port: 4/16
     eth1:
       mounted: false
       mac: 00:16:36:91:e9:19
@@ -3048,8 +2960,6 @@ sol-45:
       driver: forcedeth
       mountable: true
       ip: 172.16.129.45
-      switch_name: gw-sophia
-      switch_port: 4/18
     eth1:
       mounted: false
       mac: 00:16:36:91:e9:59
@@ -3116,8 +3026,6 @@ sol-46:
       driver: forcedeth
       mountable: true
       ip: 172.16.129.46
-      switch_name: gw-sophia
-      switch_port: 4/20
     eth1:
       mounted: false
       mac: 00:16:36:91:eb:81
@@ -3202,8 +3110,6 @@ sol-47:
       driver: forcedeth
       mountable: true
       ip: 172.16.129.47
-      switch_name: gw-sophia
-      switch_port: 4/22
     eth1:
       mounted: false
       mac: 00:16:36:e9:26:c7
@@ -3275,8 +3181,6 @@ sol-48:
       driver: forcedeth
       mountable: true
       ip: 172.16.129.48
-      switch_name: gw-sophia
-      switch_port: 4/24
     eth1:
       mounted: false
       mac: 00:16:36:91:eb:29
@@ -3346,8 +3250,6 @@ sol-49:
       driver: forcedeth
       mountable: true
       ip: 172.16.129.49
-      switch_name: gw-sophia
-      switch_port: 9/1
     eth1:
       mounted: false
       mac: 00:16:36:c5:89:18
@@ -3421,8 +3323,6 @@ sol-50:
       driver: forcedeth
       mountable: true
       ip: 172.16.129.50
-      switch_name: gw-sophia
-      switch_port: 9/3
     eth1:
       mounted: false
       mac: 00:16:36:91:e9:e1
diff --git a/generators/input/sites/sophia/clusters/sol_manual.yaml b/generators/input/sites/sophia/clusters/sol_manual.yaml
new file mode 100644
index 00000000000..67bb79fc87d
--- /dev/null
+++ b/generators/input/sites/sophia/clusters/sol_manual.yaml
@@ -0,0 +1,251 @@
+---
+sol-1:
+  network_interfaces:
+    eth0:
+      switch_name: gw-sophia
+      switch_port: 3/1
+sol-2:
+  network_interfaces:
+    eth0:
+      switch_name: gw-sophia
+      switch_port: 3/3
+sol-3:
+  network_interfaces:
+    eth0:
+      switch_name: gw-sophia
+      switch_port: 3/5
+sol-4:
+  network_interfaces:
+    eth0:
+      switch_name: gw-sophia
+      switch_port: 3/7
+sol-5:
+  network_interfaces:
+    eth0:
+      switch_name: gw-sophia
+      switch_port: 3/9
+sol-6:
+  network_interfaces:
+    eth0:
+      switch_name: gw-sophia
+      switch_port: 3/11
+sol-7:
+  network_interfaces:
+    eth0:
+      switch_name: gw-sophia
+      switch_port: 3/13
+sol-8:
+  network_interfaces:
+    eth0:
+      switch_name: gw-sophia
+      switch_port: 3/15
+sol-9:
+  network_interfaces:
+    eth0:
+      switch_name: gw-sophia
+      switch_port: 3/17
+sol-10:
+  network_interfaces:
+    eth0:
+      switch_name: gw-sophia
+      switch_port: 3/19
+sol-11:
+  network_interfaces:
+    eth0:
+      switch_name: gw-sophia
+      switch_port: 3/21
+sol-12:
+  network_interfaces:
+    eth0:
+      switch_name: gw-sophia
+      switch_port: 3/23
+sol-13:
+  network_interfaces:
+    eth0:
+      switch_name: gw-sophia
+      switch_port: 4/1
+sol-14:
+  network_interfaces:
+    eth0:
+      switch_name: gw-sophia
+      switch_port: 4/3
+sol-15:
+  network_interfaces:
+    eth0:
+      switch_name: gw-sophia
+      switch_port: 4/5
+sol-16:
+  network_interfaces:
+    eth0:
+      switch_name: gw-sophia
+      switch_port: 4/7
+sol-17:
+  network_interfaces:
+    eth0:
+      switch_name: gw-sophia
+      switch_port: 4/9
+sol-18:
+  network_interfaces:
+    eth0:
+      switch_name: gw-sophia
+      switch_port: 4/11
+sol-19:
+  network_interfaces:
+    eth0:
+      switch_name: gw-sophia
+      switch_port: 4/13
+sol-20:
+  network_interfaces:
+    eth0:
+      switch_name: gw-sophia
+      switch_port: 4/15
+sol-21:
+  network_interfaces:
+    eth0:
+      switch_name: gw-sophia
+      switch_port: 4/17
+sol-22:
+  network_interfaces:
+    eth0:
+      switch_name: gw-sophia
+      switch_port: 4/19
+sol-23:
+  network_interfaces:
+    eth0:
+      switch_name: gw-sophia
+      switch_port: 4/21
+sol-24:
+  network_interfaces:
+    eth0:
+      switch_name: gw-sophia
+      switch_port: 4/23
+sol-25:
+  network_interfaces:
+    eth0:
+      switch_name: gw-sophia
+      switch_port: 3/2
+sol-26:
+  network_interfaces:
+    eth0:
+      switch_name: gw-sophia
+      switch_port: 3/4
+sol-27:
+  network_interfaces:
+    eth0:
+      switch_name: gw-sophia
+      switch_port: 3/6
+sol-28:
+  network_interfaces:
+    eth0:
+      switch_name: gw-sophia
+      switch_port: 3/8
+sol-29:
+  network_interfaces:
+    eth0:
+      switch_name: gw-sophia
+      switch_port: 3/10
+sol-30:
+  network_interfaces:
+    eth0:
+      switch_name: gw-sophia
+      switch_port: 3/12
+sol-31:
+  network_interfaces:
+    eth0:
+      switch_name: gw-sophia
+      switch_port: 3/14
+sol-32:
+  network_interfaces:
+    eth0:
+      switch_name: gw-sophia
+      switch_port: 3/16
+sol-33:
+  network_interfaces:
+    eth0:
+      switch_name: gw-sophia
+      switch_port: 3/18
+sol-34:
+  network_interfaces:
+    eth0:
+      switch_name: gw-sophia
+      switch_port: 3/20
+sol-35:
+  network_interfaces:
+    eth0:
+      switch_name: gw-sophia
+      switch_port: 3/22
+sol-36:
+  network_interfaces:
+    eth0:
+      switch_name: gw-sophia
+      switch_port: 3/24
+sol-37:
+  network_interfaces:
+    eth0:
+      switch_name: gw-sophia
+      switch_port: 4/2
+sol-38:
+  network_interfaces:
+    eth0:
+      switch_name: gw-sophia
+      switch_port: 4/4
+sol-39:
+  network_interfaces:
+    eth0:
+      switch_name: gw-sophia
+      switch_port: 4/6
+sol-40:
+  network_interfaces:
+    eth0:
+      switch_name: gw-sophia
+      switch_port: 4/8
+sol-41:
+  network_interfaces:
+    eth0:
+      switch_name: gw-sophia
+      switch_port: 4/10
+sol-42:
+  network_interfaces:
+    eth0:
+      switch_name: gw-sophia
+      switch_port: 4/14
+sol-43:
+  network_interfaces:
+    eth0:
+      switch_name: gw-sophia
+      switch_port: 4/12
+sol-44:
+  network_interfaces:
+    eth0:
+      switch_name: gw-sophia
+      switch_port: 4/16
+sol-45:
+  network_interfaces:
+    eth0:
+      switch_name: gw-sophia
+      switch_port: 4/18
+sol-46:
+  network_interfaces:
+    eth0:
+      switch_name: gw-sophia
+      switch_port: 4/20
+sol-47:
+  network_interfaces:
+    eth0:
+      switch_name: gw-sophia
+      switch_port: 4/22
+sol-48:
+  network_interfaces:
+    eth0:
+      switch_name: gw-sophia
+      switch_port: 4/24
+sol-49:
+  network_interfaces:
+    eth0:
+      switch_name: gw-sophia
+      switch_port: 9/1
+sol-50:
+  network_interfaces:
+    eth0:
+      switch_name: gw-sophia
+      switch_port: 9/3
diff --git a/generators/input/sites/sophia/clusters/suno.rb b/generators/input/sites/sophia/clusters/suno.rb
index 16ae43f3577..be7cfb2cca3 100644
--- a/generators/input/sites/sophia/clusters/suno.rb
+++ b/generators/input/sites/sophia/clusters/suno.rb
@@ -18,84 +18,84 @@ site :sophia do |site_uid|
         supported_job_types({
           :deploy       => true,
           :besteffort   => true,
-          :virtual      => lookup('suno', node_uid, 'supported_job_types', 'virtual')
+          :virtual      => lookup('suno_generated', node_uid, 'supported_job_types', 'virtual')
         })
 
         architecture({
-          :smp_size       => lookup('suno', node_uid, 'architecture', 'smp_size'),
-          :smt_size       => lookup('suno', node_uid, 'architecture', 'smt_size'),
-          :platform_type  => lookup('suno', node_uid, 'architecture', 'platform_type')
+          :smp_size       => lookup('suno_generated', node_uid, 'architecture', 'smp_size'),
+          :smt_size       => lookup('suno_generated', node_uid, 'architecture', 'smt_size'),
+          :platform_type  => lookup('suno_generated', node_uid, 'architecture', 'platform_type')
         })
 
         processor({
-          :vendor             => lookup('suno', node_uid, 'processor', 'vendor'),
-          :model              => lookup('suno', node_uid, 'processor', 'model'),
-          :version            => lookup('suno', node_uid, 'processor', 'version'),
-          :clock_speed        => lookup('suno', node_uid, 'processor', 'clock_speed'),
-          :instruction_set    => lookup('suno', node_uid, 'processor', 'instruction_set'),
-          :other_description  => lookup('suno', node_uid, 'processor', 'other_description'),
-          :cache_l1           => lookup('suno', node_uid, 'processor', 'cache_l1'),
-          :cache_l1i          => lookup('suno', node_uid, 'processor', 'cache_l1i'),
-          :cache_l1d          => lookup('suno', node_uid, 'processor', 'cache_l1d'),
-          :cache_l2           => lookup('suno', node_uid, 'processor', 'cache_l2'),
-          :cache_l3           => lookup('suno', node_uid, 'processor', 'cache_l3')
+          :vendor             => lookup('suno_generated', node_uid, 'processor', 'vendor'),
+          :model              => lookup('suno_generated', node_uid, 'processor', 'model'),
+          :version            => lookup('suno_generated', node_uid, 'processor', 'version'),
+          :clock_speed        => lookup('suno_generated', node_uid, 'processor', 'clock_speed'),
+          :instruction_set    => lookup('suno_generated', node_uid, 'processor', 'instruction_set'),
+          :other_description  => lookup('suno_generated', node_uid, 'processor', 'other_description'),
+          :cache_l1           => lookup('suno_generated', node_uid, 'processor', 'cache_l1'),
+          :cache_l1i          => lookup('suno_generated', node_uid, 'processor', 'cache_l1i'),
+          :cache_l1d          => lookup('suno_generated', node_uid, 'processor', 'cache_l1d'),
+          :cache_l2           => lookup('suno_generated', node_uid, 'processor', 'cache_l2'),
+          :cache_l3           => lookup('suno_generated', node_uid, 'processor', 'cache_l3')
         })
 
         main_memory({
-          :ram_size     => lookup('suno', node_uid, 'main_memory', 'ram_size'),
+          :ram_size     => lookup('suno_generated', node_uid, 'main_memory', 'ram_size'),
           :virtual_size => nil
         })
 
         operating_system({
-          :name     => lookup('suno', node_uid, 'operating_system', 'name'),
+          :name     => lookup('suno_generated', node_uid, 'operating_system', 'name'),
           :release  => "Squeeze",
-          :version  => lookup('suno', node_uid, 'operating_system', 'version'),
-          :kernel   => lookup('suno', node_uid, 'operating_system', 'kernel')
+          :version  => lookup('suno_generated', node_uid, 'operating_system', 'version'),
+          :kernel   => lookup('suno_generated', node_uid, 'operating_system', 'kernel')
         })
 
         storage_devices [{
           :interface  => 'SATA',
-          :size       => lookup('suno', node_uid, 'block_devices', 'sda', 'size'),
+          :size       => lookup('suno_generated', node_uid, 'block_devices', 'sda', 'size'),
           :driver     => "megaraid_sas",
-          :device     => lookup('suno', node_uid, 'block_devices', 'sda', 'device'),
-          :model      => lookup('suno', node_uid, 'block_devices', 'sda', 'model'),
-          :vendor     => lookup('suno', node_uid, 'block_devices', 'sda', 'vendor'),
-          :rev        => lookup('suno', node_uid, 'block_devices', 'sda', 'rev'),
+          :device     => lookup('suno_generated', node_uid, 'block_devices', 'sda', 'device'),
+          :model      => lookup('suno_generated', node_uid, 'block_devices', 'sda', 'model'),
+          :vendor     => lookup('suno_generated', node_uid, 'block_devices', 'sda', 'vendor'),
+          :rev        => lookup('suno_generated', node_uid, 'block_devices', 'sda', 'rev'),
           :raid => "0"
         }]
         network_adapters [{
-          :interface        => lookup('suno', node_uid, 'network_interfaces', 'eth0', 'interface'),
-          :rate             => lookup('suno', node_uid, 'network_interfaces', 'eth0', 'rate'),
-          :enabled          => lookup('suno', node_uid, 'network_interfaces', 'eth0', 'enabled'),
-          :management       => lookup('suno', node_uid, 'network_interfaces', 'eth0', 'management'),
-          :mountable        => lookup('suno', node_uid, 'network_interfaces', 'eth0', 'mountable'),
-          :mounted          => lookup('suno', node_uid, 'network_interfaces', 'eth0', 'mounted'),
+          :interface        => lookup('suno_generated', node_uid, 'network_interfaces', 'eth0', 'interface'),
+          :rate             => lookup('suno_generated', node_uid, 'network_interfaces', 'eth0', 'rate'),
+          :enabled          => lookup('suno_generated', node_uid, 'network_interfaces', 'eth0', 'enabled'),
+          :management       => lookup('suno_generated', node_uid, 'network_interfaces', 'eth0', 'management'),
+          :mountable        => lookup('suno_generated', node_uid, 'network_interfaces', 'eth0', 'mountable'),
+          :mounted          => lookup('suno_generated', node_uid, 'network_interfaces', 'eth0', 'mounted'),
           :bridged          => true,
           :device           => "eth0",
           :vendor           => 'Broadcom',
           :version          => 'NetXtremeII BCM5716',
-          :driver           => lookup('suno', node_uid, 'network_interfaces', 'eth0', 'driver'),
+          :driver           => lookup('suno_generated', node_uid, 'network_interfaces', 'eth0', 'driver'),
           :network_address  => "#{node_uid}.#{site_uid}.grid5000.fr",
-          :ip               => lookup('suno', node_uid, 'network_interfaces', 'eth0', 'ip'),
-          :ip6              => lookup('suno', node_uid, 'network_interfaces', 'eth0', 'ip6'),
-          :switch           => lookup('suno', node_uid, 'network_interfaces', 'eth0', 'switch_name'),
-          :switch_port      => lookup('suno', node_uid, 'network_interfaces', 'eth0', 'switch_port'),
-          :mac              => lookup('suno', node_uid, 'network_interfaces', 'eth0', 'mac')
+          :ip               => lookup('suno_generated', node_uid, 'network_interfaces', 'eth0', 'ip'),
+          :ip6              => lookup('suno_generated', node_uid, 'network_interfaces', 'eth0', 'ip6'),
+          :switch           => lookup('suno_manual', node_uid, 'network_interfaces', 'eth0', 'switch_name'),
+          :switch_port      => lookup('suno_manual', node_uid, 'network_interfaces', 'eth0', 'switch_port'),
+          :mac              => lookup('suno_generated', node_uid, 'network_interfaces', 'eth0', 'mac')
         },
         {
-          :interface        => lookup('suno', node_uid, 'network_interfaces', 'eth1', 'interface'),
+          :interface        => lookup('suno_generated', node_uid, 'network_interfaces', 'eth1', 'interface'),
           :rate             => 1.G,
-          :enabled          => lookup('suno', node_uid, 'network_interfaces', 'eth1', 'enabled'),
-          :management       => lookup('suno', node_uid, 'network_interfaces', 'eth1', 'management'),
-          :mountable        => lookup('suno', node_uid, 'network_interfaces', 'eth1', 'mountable'),
-          :mounted          => lookup('suno', node_uid, 'network_interfaces', 'eth1', 'mounted'),
+          :enabled          => lookup('suno_generated', node_uid, 'network_interfaces', 'eth1', 'enabled'),
+          :management       => lookup('suno_generated', node_uid, 'network_interfaces', 'eth1', 'management'),
+          :mountable        => lookup('suno_generated', node_uid, 'network_interfaces', 'eth1', 'mountable'),
+          :mounted          => lookup('suno_generated', node_uid, 'network_interfaces', 'eth1', 'mounted'),
           :bridged          => false,
           :device           => "eth1",
           :vendor           => 'Broadcom',
           :version          => 'NetXtremeII BCM5716',
-          :driver           => lookup('suno', node_uid, 'network_interfaces', 'eth1', 'driver'),
-          :ip               => lookup('suno', node_uid, 'network_interfaces', 'eth1', 'ip'),
-          :mac              => lookup('suno', node_uid, 'network_interfaces', 'eth1', 'mac')
+          :driver           => lookup('suno_generated', node_uid, 'network_interfaces', 'eth1', 'driver'),
+          :ip               => lookup('suno_generated', node_uid, 'network_interfaces', 'eth1', 'ip'),
+          :mac              => lookup('suno_generated', node_uid, 'network_interfaces', 'eth1', 'mac')
         },
         {
           :interface        => 'Ethernet',
@@ -106,22 +106,22 @@ site :sophia do |site_uid|
           :mounted          => false,
           :device           => "bmc",
           :network_address  => "#{node_uid}-bmc.#{site_uid}.grid5000.fr",
-          :ip               => lookup('suno', node_uid, 'network_interfaces', 'bmc', 'ip'),
+          :ip               => lookup('suno_generated', node_uid, 'network_interfaces', 'bmc', 'ip'),
           :vendor           => "Unknown",
           :version          => "1.7",
-          :mac              => lookup('suno', node_uid, 'network_interfaces', 'bmc', 'mac')
+          :mac              => lookup('suno_generated', node_uid, 'network_interfaces', 'bmc', 'mac')
         }]
 
         chassis({
-          :serial       => lookup('suno', node_uid, 'chassis', 'serial_number'),
-          :name         => lookup('suno', node_uid, 'chassis', 'product_name'),
-          :manufacturer => lookup('suno', node_uid, 'chassis', 'manufacturer')
+          :serial       => lookup('suno_generated', node_uid, 'chassis', 'serial_number'),
+          :name         => lookup('suno_generated', node_uid, 'chassis', 'product_name'),
+          :manufacturer => lookup('suno_generated', node_uid, 'chassis', 'manufacturer')
         })
 
         bios({
-          :version      => lookup('suno', node_uid, 'bios', 'version'),
-          :vendor       => lookup('suno', node_uid, 'bios', 'vendor'),
-          :release_date => lookup('suno', node_uid, 'bios', 'release_date')
+          :version      => lookup('suno_generated', node_uid, 'bios', 'version'),
+          :vendor       => lookup('suno_generated', node_uid, 'bios', 'vendor'),
+          :release_date => lookup('suno_generated', node_uid, 'bios', 'release_date')
         })
 
         gpu({
diff --git a/generators/input/sites/sophia/clusters/suno.yaml b/generators/input/sites/sophia/clusters/suno_generated.yaml
similarity index 96%
rename from generators/input/sites/sophia/clusters/suno.yaml
rename to generators/input/sites/sophia/clusters/suno_generated.yaml
index 897b7174a61..e18837f1233 100644
--- a/generators/input/sites/sophia/clusters/suno.yaml
+++ b/generators/input/sites/sophia/clusters/suno_generated.yaml
@@ -16,8 +16,6 @@ suno-1:
       driver: bnx2
       mountable: true
       ip: 172.16.130.1
-      switch_name: gw-sophia
-      switch_port: 5/10
     eth1:
       mounted: false
       mac: 00:26:b9:58:e6:83
@@ -91,8 +89,6 @@ suno-2:
       driver: bnx2
       mountable: true
       ip: 172.16.130.2
-      switch_name: gw-sophia
-      switch_port: 5/11
     eth1:
       mounted: false
       mac: 00:26:b9:3f:49:39
@@ -155,8 +151,6 @@ suno-3:
       driver: bnx2
       mountable: true
       ip: 172.16.130.3
-      switch_name: gw-sophia
-      switch_port: 5/1
     eth1:
       mounted: false
       mac: 00:26:b9:3f:4a:5f
@@ -215,8 +209,6 @@ suno-4:
       driver: bnx2
       mountable: true
       ip: 172.16.130.4
-      switch_name: gw-sophia
-      switch_port: 5/5
     eth1:
       mounted: false
       mac: 00:26:b9:3f:4a:6e
@@ -279,8 +271,6 @@ suno-5:
       driver: bnx2
       mountable: true
       ip: 172.16.130.5
-      switch_name: gw-sophia
-      switch_port: 5/4
     eth1:
       mounted: false
       mac: 00:26:b9:3e:e8:59
@@ -336,8 +326,6 @@ suno-6:
       driver: bnx2
       mountable: true
       ip: 172.16.130.6
-      switch_name: gw-sophia
-      switch_port: 5/7
     eth1:
       mounted: false
       mac: 00:26:b9:3f:40:b0
@@ -411,8 +399,6 @@ suno-7:
       driver: bnx2
       mountable: true
       ip: 172.16.130.7
-      switch_name: gw-sophia
-      switch_port: 5/8
     eth1:
       mounted: false
       mac: 00:26:b9:3f:43:a2
@@ -471,8 +457,6 @@ suno-8:
       driver: bnx2
       mountable: true
       ip: 172.16.130.8
-      switch_name: gw-sophia
-      switch_port: 5/12
     eth1:
       mounted: false
       mac: 00:26:b9:3f:4a:3e
@@ -535,8 +519,6 @@ suno-9:
       driver: bnx2
       mountable: true
       ip: 172.16.130.9
-      switch_name: gw-sophia
-      switch_port: 5/9
     eth1:
       mounted: false
       mac: 00:26:b9:3f:41:28
@@ -603,8 +585,6 @@ suno-10:
       driver: bnx2
       mountable: true
       ip: 172.16.130.10
-      switch_name: gw-sophia
-      switch_port: 5/3
     eth1:
       mounted: false
       mac: 00:26:b9:3f:49:66
@@ -667,8 +647,6 @@ suno-11:
       driver: bnx2
       mountable: true
       ip: 172.16.130.11
-      switch_name: gw-sophia
-      switch_port: 5/2
     eth1:
       mounted: false
       mac: 00:26:b9:3f:47:0d
@@ -727,8 +705,6 @@ suno-12:
       driver: bnx2
       mountable: true
       ip: 172.16.130.12
-      switch_name: gw-sophia
-      switch_port: 5/6
     eth1:
       mounted: false
       mac: 00:26:b9:3f:49:5d
@@ -791,8 +767,6 @@ suno-13:
       driver: bnx2
       mountable: true
       ip: 172.16.130.13
-      switch_name: gw-sophia
-      switch_port: 5/13
     eth1:
       mounted: false
       mac: 00:26:b9:3f:4c:79
@@ -855,8 +829,6 @@ suno-14:
       driver: bnx2
       mountable: true
       ip: 172.16.130.14
-      switch_name: gw-sophia
-      switch_port: 5/19
     eth1:
       mounted: false
       mac: 00:26:b9:3f:4a:62
@@ -923,8 +895,6 @@ suno-15:
       driver: bnx2
       mountable: true
       ip: 172.16.130.15
-      switch_name: gw-sophia
-      switch_port: 5/17
     eth1:
       mounted: false
       mac: 00:26:b9:3f:44:8a
@@ -987,8 +957,6 @@ suno-16:
       driver: bnx2
       mountable: true
       ip: 172.16.130.16
-      switch_name: gw-sophia
-      switch_port: 5/21
     eth1:
       mounted: false
       mac: 00:26:b9:3f:41:0d
@@ -1051,8 +1019,6 @@ suno-17:
       driver: bnx2
       mountable: true
       ip: 172.16.130.17
-      switch_name: gw-sophia
-      switch_port: 5/15
     eth1:
       mounted: false
       mac: 00:26:b9:3f:47:dc
@@ -1104,8 +1070,6 @@ suno-18:
       driver: bnx2
       mountable: true
       ip: 172.16.130.18
-      switch_name: gw-sophia
-      switch_port: 6/1
     eth1:
       mounted: false
       mac: 00:26:b9:35:c4:84
@@ -1172,8 +1136,6 @@ suno-19:
       driver: bnx2
       mountable: true
       ip: 172.16.130.19
-      switch_name: gw-sophia
-      switch_port: 6/2
     eth1:
       mounted: false
       mac: 00:26:b9:3f:40:68
@@ -1243,8 +1205,6 @@ suno-20:
       driver: bnx2
       mountable: true
       ip: 172.16.130.20
-      switch_name: gw-sophia
-      switch_port: 6/3
     eth1:
       mounted: false
       mac: 00:26:b9:3f:46:13
@@ -1307,8 +1267,6 @@ suno-21:
       driver: bnx2
       mountable: true
       ip: 172.16.130.21
-      switch_name: gw-sophia
-      switch_port: 6/4
     eth1:
       mounted: false
       mac: 00:26:b9:3f:3f:fc
@@ -1367,8 +1325,6 @@ suno-22:
       driver: bnx2
       mountable: true
       ip: 172.16.130.22
-      switch_name: gw-sophia
-      switch_port: 6/5
     eth1:
       mounted: false
       mac: 00:26:b9:3f:47:67
@@ -1435,8 +1391,6 @@ suno-23:
       driver: bnx2
       mountable: true
       ip: 172.16.130.23
-      switch_name: gw-sophia
-      switch_port: 6/6
     eth1:
       mounted: false
       mac: 00:26:b9:3f:4a:dd
@@ -1488,8 +1442,6 @@ suno-24:
       driver: bnx2
       mountable: true
       ip: 172.16.130.24
-      switch_name: gw-sophia
-      switch_port: 6/7
     eth1:
       mounted: false
       mac: 00:26:b9:3f:47:b5
@@ -1552,8 +1504,6 @@ suno-25:
       driver: bnx2
       mountable: true
       ip: 172.16.130.25
-      switch_name: gw-sophia
-      switch_port: 6/8
     eth1:
       mounted: false
       mac: 00:26:b9:3f:47:a3
@@ -1627,8 +1577,6 @@ suno-26:
       driver: bnx2
       mountable: true
       ip: 172.16.130.26
-      switch_name: gw-sophia
-      switch_port: 6/9
     eth1:
       mounted: false
       mac: 00:26:b9:3f:4b:4e
@@ -1691,8 +1639,6 @@ suno-27:
       driver: bnx2
       mountable: true
       ip: 172.16.130.27
-      switch_name: gw-sophia
-      switch_port: 6/10
     eth1:
       mounted: false
       mac: 00:26:b9:3f:4b:63
@@ -1751,8 +1697,6 @@ suno-28:
       driver: bnx2
       mountable: true
       ip: 172.16.130.28
-      switch_name: gw-sophia
-      switch_port: 6/11
     eth1:
       mounted: false
       mac: 00:26:b9:3f:49:57
@@ -1808,8 +1752,6 @@ suno-29:
       driver: bnx2
       mountable: true
       ip: 172.16.130.29
-      switch_name: gw-sophia
-      switch_port: 6/12
     eth1:
       mounted: false
       mac: 00:26:b9:3f:47:bb
@@ -1879,8 +1821,6 @@ suno-30:
       driver: bnx2
       mountable: true
       ip: 172.16.130.30
-      switch_name: gw-sophia
-      switch_port: 6/13
     eth1:
       mounted: false
       mac: 00:26:b9:3f:41:31
@@ -1936,8 +1876,6 @@ suno-31:
       driver: bnx2
       mountable: true
       ip: 172.16.130.31
-      switch_name: gw-sophia
-      switch_port: 6/14
     eth1:
       mounted: false
       mac: 00:26:b9:3f:4b:57
@@ -2011,8 +1949,6 @@ suno-32:
       driver: bnx2
       mountable: true
       ip: 172.16.130.32
-      switch_name: gw-sophia
-      switch_port: 6/15
     eth1:
       mounted: false
       mac: 00:26:b9:3f:44:69
@@ -2075,8 +2011,6 @@ suno-33:
       driver: bnx2
       mountable: true
       ip: 172.16.130.33
-      switch_name: gw-sophia
-      switch_port: 6/16
     eth1:
       mounted: false
       mac: 00:26:b9:3f:3f:68
@@ -2135,8 +2069,6 @@ suno-34:
       driver: bnx2
       mountable: true
       ip: 172.16.130.34
-      switch_name: gw-sophia
-      switch_port: 6/17
     eth1:
       mounted: false
       mac: 00:26:b9:3f:49:60
@@ -2192,8 +2124,6 @@ suno-35:
       driver: bnx2
       mountable: true
       ip: 172.16.130.35
-      switch_name: gw-sophia
-      switch_port: 6/18
     eth1:
       mounted: false
       mac: 00:26:b9:3f:3f:1d
@@ -2267,8 +2197,6 @@ suno-36:
       driver: bnx2
       mountable: true
       ip: 172.16.130.36
-      switch_name: gw-sophia
-      switch_port: 7/1
     eth1:
       mounted: false
       mac: 00:26:b9:3f:4a:95
@@ -2331,8 +2259,6 @@ suno-37:
       driver: bnx2
       mountable: true
       ip: 172.16.130.37
-      switch_name: gw-sophia
-      switch_port: 7/2
     eth1:
       mounted: false
       mac: 00:26:b9:3f:4b:2d
@@ -2395,8 +2321,6 @@ suno-38:
       driver: bnx2
       mountable: true
       ip: 172.16.130.38
-      switch_name: gw-sophia
-      switch_port: 7/3
     eth1:
       mounted: false
       mac: 00:26:b9:3f:44:b4
@@ -2448,8 +2372,6 @@ suno-39:
       driver: bnx2
       mountable: true
       ip: 172.16.130.39
-      switch_name: gw-sophia
-      switch_port: 7/4
     eth1:
       mounted: false
       mac: 00:26:b9:3f:4b:30
@@ -2516,8 +2438,6 @@ suno-40:
       driver: bnx2
       mountable: true
       ip: 172.16.130.40
-      switch_name: gw-sophia
-      switch_port: 7/5
     eth1:
       mounted: false
       mac: 00:26:b9:3f:49:45
@@ -2576,8 +2496,6 @@ suno-41:
       driver: bnx2
       mountable: true
       ip: 172.16.130.41
-      switch_name: gw-sophia
-      switch_port: 7/6
     eth1:
       mounted: false
       mac: 00:26:b9:3f:45:3b
@@ -2651,8 +2569,6 @@ suno-42:
       driver: bnx2
       mountable: true
       ip: 172.16.130.42
-      switch_name: gw-sophia
-      switch_port: 7/7
     eth1:
       mounted: false
       mac: 00:26:b9:3f:41:22
@@ -2704,8 +2620,6 @@ suno-43:
       driver: bnx2
       mountable: true
       ip: 172.16.130.43
-      switch_name: gw-sophia
-      switch_port: 7/8
     eth1:
       mounted: false
       mac: 00:26:b9:3f:3e:96
@@ -2768,8 +2682,6 @@ suno-44:
       driver: bnx2
       mountable: true
       ip: 172.16.130.44
-      switch_name: gw-sophia
-      switch_port: 7/9
     eth1:
       mounted: false
       mac: 00:26:b9:3f:45:2f
@@ -2843,8 +2755,6 @@ suno-45:
       driver: bnx2
       mountable: true
       ip: 172.16.130.45
-      switch_name: gw-sophia
-      switch_port: 7/10
     eth1:
       mounted: false
       mac: 00:26:b9:3f:47:7c
diff --git a/generators/input/sites/sophia/clusters/suno_manual.yaml b/generators/input/sites/sophia/clusters/suno_manual.yaml
new file mode 100644
index 00000000000..3de2e405bf7
--- /dev/null
+++ b/generators/input/sites/sophia/clusters/suno_manual.yaml
@@ -0,0 +1,226 @@
+---
+suno-1:
+  network_interfaces:
+    eth0:
+      switch_name: gw-sophia
+      switch_port: 5/10
+suno-2:
+  network_interfaces:
+    eth0:
+      switch_name: gw-sophia
+      switch_port: 5/11
+suno-3:
+  network_interfaces:
+    eth0:
+      switch_name: gw-sophia
+      switch_port: 5/1
+suno-4:
+  network_interfaces:
+    eth0:
+      switch_name: gw-sophia
+      switch_port: 5/5
+suno-5:
+  network_interfaces:
+    eth0:
+      switch_name: gw-sophia
+      switch_port: 5/4
+suno-6:
+  network_interfaces:
+    eth0:
+      switch_name: gw-sophia
+      switch_port: 5/7
+suno-7:
+  network_interfaces:
+    eth0:
+      switch_name: gw-sophia
+      switch_port: 5/8
+suno-8:
+  network_interfaces:
+    eth0:
+      switch_name: gw-sophia
+      switch_port: 5/12
+suno-9:
+  network_interfaces:
+    eth0:
+      switch_name: gw-sophia
+      switch_port: 5/9
+suno-10:
+  network_interfaces:
+    eth0:
+      switch_name: gw-sophia
+      switch_port: 5/3
+suno-11:
+  network_interfaces:
+    eth0:
+      switch_name: gw-sophia
+      switch_port: 5/2
+suno-12:
+  network_interfaces:
+    eth0:
+      switch_name: gw-sophia
+      switch_port: 5/6
+suno-13:
+  network_interfaces:
+    eth0:
+      switch_name: gw-sophia
+      switch_port: 5/13
+suno-14:
+  network_interfaces:
+    eth0:
+      switch_name: gw-sophia
+      switch_port: 5/19
+suno-15:
+  network_interfaces:
+    eth0:
+      switch_name: gw-sophia
+      switch_port: 5/17
+suno-16:
+  network_interfaces:
+    eth0:
+      switch_name: gw-sophia
+      switch_port: 5/21
+suno-17:
+  network_interfaces:
+    eth0:
+      switch_name: gw-sophia
+      switch_port: 5/15
+suno-18:
+  network_interfaces:
+    eth0:
+      switch_name: gw-sophia
+      switch_port: 6/1
+suno-19:
+  network_interfaces:
+    eth0:
+      switch_name: gw-sophia
+      switch_port: 6/2
+suno-20:
+  network_interfaces:
+    eth0:
+      switch_name: gw-sophia
+      switch_port: 6/3
+suno-21:
+  network_interfaces:
+    eth0:
+      switch_name: gw-sophia
+      switch_port: 6/4
+suno-22:
+  network_interfaces:
+    eth0:
+      switch_name: gw-sophia
+      switch_port: 6/5
+suno-23:
+  network_interfaces:
+    eth0:
+      switch_name: gw-sophia
+      switch_port: 6/6
+suno-24:
+  network_interfaces:
+    eth0:
+      switch_name: gw-sophia
+      switch_port: 6/7
+suno-25:
+  network_interfaces:
+    eth0:
+      switch_name: gw-sophia
+      switch_port: 6/8
+suno-26:
+  network_interfaces:
+    eth0:
+      switch_name: gw-sophia
+      switch_port: 6/9
+suno-27:
+  network_interfaces:
+    eth0:
+      switch_name: gw-sophia
+      switch_port: 6/10
+suno-28:
+  network_interfaces:
+    eth0:
+      switch_name: gw-sophia
+      switch_port: 6/11
+suno-29:
+  network_interfaces:
+    eth0:
+      switch_name: gw-sophia
+      switch_port: 6/12
+suno-30:
+  network_interfaces:
+    eth0:
+      switch_name: gw-sophia
+      switch_port: 6/13
+suno-31:
+  network_interfaces:
+    eth0:
+      switch_name: gw-sophia
+      switch_port: 6/14
+suno-32:
+  network_interfaces:
+    eth0:
+      switch_name: gw-sophia
+      switch_port: 6/15
+suno-33:
+  network_interfaces:
+    eth0:
+      switch_name: gw-sophia
+      switch_port: 6/16
+suno-34:
+  network_interfaces:
+    eth0:
+      switch_name: gw-sophia
+      switch_port: 6/17
+suno-35:
+  network_interfaces:
+    eth0:
+      switch_name: gw-sophia
+      switch_port: 6/18
+suno-36:
+  network_interfaces:
+    eth0:
+      switch_name: gw-sophia
+      switch_port: 7/1
+suno-37:
+  network_interfaces:
+    eth0:
+      switch_name: gw-sophia
+      switch_port: 7/2
+suno-38:
+  network_interfaces:
+    eth0:
+      switch_name: gw-sophia
+      switch_port: 7/3
+suno-39:
+  network_interfaces:
+    eth0:
+      switch_name: gw-sophia
+      switch_port: 7/4
+suno-40:
+  network_interfaces:
+    eth0:
+      switch_name: gw-sophia
+      switch_port: 7/5
+suno-41:
+  network_interfaces:
+    eth0:
+      switch_name: gw-sophia
+      switch_port: 7/6
+suno-42:
+  network_interfaces:
+    eth0:
+      switch_name: gw-sophia
+      switch_port: 7/7
+suno-43:
+  network_interfaces:
+    eth0:
+      switch_name: gw-sophia
+      switch_port: 7/8
+suno-44:
+  network_interfaces:
+    eth0:
+      switch_name: gw-sophia
+      switch_port: 7/9
+suno-45:
+  network_interfaces:
+    eth0:
+      switch_name: gw-sophia
+      switch_port: 7/10
diff --git a/generators/input/sites/toulouse/clusters/pastel.rb b/generators/input/sites/toulouse/clusters/pastel.rb
index 57d4f522ca1..3e61033b886 100644
--- a/generators/input/sites/toulouse/clusters/pastel.rb
+++ b/generators/input/sites/toulouse/clusters/pastel.rb
@@ -16,89 +16,89 @@ site :toulouse do |site_uid|
         supported_job_types({
           :deploy       => true,
           :besteffort   => true,
-          :virtual      => lookup('pastel', node_uid, 'supported_job_types', 'virtual')
+          :virtual      => lookup('pastel_generated', node_uid, 'supported_job_types', 'virtual')
         })
 
         architecture({
-          :smp_size       => lookup('pastel', node_uid, 'architecture', 'smp_size'),
-          :smt_size       => lookup('pastel', node_uid, 'architecture', 'smt_size'),
-          :platform_type  => lookup('pastel', node_uid, 'architecture', 'platform_type')
+          :smp_size       => lookup('pastel_generated', node_uid, 'architecture', 'smp_size'),
+          :smt_size       => lookup('pastel_generated', node_uid, 'architecture', 'smt_size'),
+          :platform_type  => lookup('pastel_generated', node_uid, 'architecture', 'platform_type')
         })
 
         processor({
-          :vendor             => lookup('pastel', node_uid, 'processor', 'vendor'),
-          :model              => lookup('pastel', node_uid, 'processor', 'model'),
-          :version            => lookup('pastel', node_uid, 'processor', 'version'),
-          :clock_speed        => lookup('pastel', node_uid, 'processor', 'clock_speed'),
-          :instruction_set    => lookup('pastel', node_uid, 'processor', 'instruction_set'),
-          :other_description  => lookup('pastel', node_uid, 'processor', 'other_description'),
-          :cache_l1           => lookup('pastel', node_uid, 'processor', 'cache_l1'),
-          :cache_l1i          => lookup('pastel', node_uid, 'processor', 'cache_l1i'),
-          :cache_l1d          => lookup('pastel', node_uid, 'processor', 'cache_l1d'),
-          :cache_l2           => lookup('pastel', node_uid, 'processor', 'cache_l2'),
-          :cache_l3           => lookup('pastel', node_uid, 'processor', 'cache_l3')
+          :vendor             => lookup('pastel_generated', node_uid, 'processor', 'vendor'),
+          :model              => lookup('pastel_generated', node_uid, 'processor', 'model'),
+          :version            => lookup('pastel_generated', node_uid, 'processor', 'version'),
+          :clock_speed        => lookup('pastel_generated', node_uid, 'processor', 'clock_speed'),
+          :instruction_set    => lookup('pastel_generated', node_uid, 'processor', 'instruction_set'),
+          :other_description  => lookup('pastel_generated', node_uid, 'processor', 'other_description'),
+          :cache_l1           => lookup('pastel_generated', node_uid, 'processor', 'cache_l1'),
+          :cache_l1i          => lookup('pastel_generated', node_uid, 'processor', 'cache_l1i'),
+          :cache_l1d          => lookup('pastel_generated', node_uid, 'processor', 'cache_l1d'),
+          :cache_l2           => lookup('pastel_generated', node_uid, 'processor', 'cache_l2'),
+          :cache_l3           => lookup('pastel_generated', node_uid, 'processor', 'cache_l3')
         })
 
         main_memory({
-          :ram_size     => lookup('pastel', node_uid, 'main_memory', 'ram_size'),
+          :ram_size     => lookup('pastel_generated', node_uid, 'main_memory', 'ram_size'),
           :virtual_size => nil
         })
 
         operating_system({
-          :name     => lookup('pastel', node_uid, 'operating_system', 'name'),
+          :name     => lookup('pastel_generated', node_uid, 'operating_system', 'name'),
           :release  => "Squeeze",
-          :version  => lookup('pastel', node_uid, 'operating_system', 'version'),
-          :kernel   => lookup('pastel', node_uid, 'operating_system', 'kernel')
+          :version  => lookup('pastel_generated', node_uid, 'operating_system', 'version'),
+          :kernel   => lookup('pastel_generated', node_uid, 'operating_system', 'kernel')
         })
 
         storage_devices [{
           :interface  => 'SATA',
-          :size       => lookup('pastel', node_uid, 'block_devices', 'sda', 'size'),
+          :size       => lookup('pastel_generated', node_uid, 'block_devices', 'sda', 'size'),
           :driver     => "sata_nv",
-          :device     => lookup('pastel', node_uid, 'block_devices', 'sda', 'device'),
-          :model      => lookup('pastel', node_uid, 'block_devices', 'sda', 'model'),
-          :vendor     => lookup('pastel', node_uid, 'block_devices', 'sda', 'vendor'),
-          :rev        => lookup('pastel', node_uid, 'block_devices', 'sda', 'rev')
+          :device     => lookup('pastel_generated', node_uid, 'block_devices', 'sda', 'device'),
+          :model      => lookup('pastel_generated', node_uid, 'block_devices', 'sda', 'model'),
+          :vendor     => lookup('pastel_generated', node_uid, 'block_devices', 'sda', 'vendor'),
+          :rev        => lookup('pastel_generated', node_uid, 'block_devices', 'sda', 'rev')
         }]
 
         network_adapters [{
-          :interface        => lookup('pastel', node_uid, 'network_interfaces', 'eth0', 'interface'),
-          :rate             => lookup('pastel', node_uid, 'network_interfaces', 'eth0', 'rate'),
-          :enabled          => lookup('pastel', node_uid, 'network_interfaces', 'eth0', 'enabled'),
-          :management       => lookup('pastel', node_uid, 'network_interfaces', 'eth0', 'management'),
-          :mountable        => lookup('pastel', node_uid, 'network_interfaces', 'eth0', 'mountable'),
-          :mounted          => lookup('pastel', node_uid, 'network_interfaces', 'eth0', 'mounted'),
+          :interface        => lookup('pastel_generated', node_uid, 'network_interfaces', 'eth0', 'interface'),
+          :rate             => lookup('pastel_generated', node_uid, 'network_interfaces', 'eth0', 'rate'),
+          :enabled          => lookup('pastel_generated', node_uid, 'network_interfaces', 'eth0', 'enabled'),
+          :management       => lookup('pastel_generated', node_uid, 'network_interfaces', 'eth0', 'management'),
+          :mountable        => lookup('pastel_generated', node_uid, 'network_interfaces', 'eth0', 'mountable'),
+          :mounted          => lookup('pastel_generated', node_uid, 'network_interfaces', 'eth0', 'mounted'),
           :bridged          => true,
           :vendor           => "NVIDIA",
           :version          => "MCP55 Pro",
           :device           => "eth0",
-          :driver           => lookup('pastel', node_uid, 'network_interfaces', 'eth0', 'driver'),
+          :driver           => lookup('pastel_generated', node_uid, 'network_interfaces', 'eth0', 'driver'),
           :network_address  => "#{node_uid}.#{site_uid}.grid5000.fr",
-          :ip               => lookup('pastel', node_uid, 'network_interfaces', 'eth0', 'ip'),
-          :ip6              => lookup('pastel', node_uid, 'network_interfaces', 'eth0', 'ip6'),
-          :switch           => lookup('pastel', node_uid, 'network_interfaces', 'eth0', 'switch_name'),
-          :switch_port      => lookup('pastel', node_uid, 'network_interfaces', 'eth0', 'switch_port'),
-          :mac              => lookup('pastel', node_uid, 'network_interfaces', 'eth0', 'mac')
+          :ip               => lookup('pastel_generated', node_uid, 'network_interfaces', 'eth0', 'ip'),
+          :ip6              => lookup('pastel_generated', node_uid, 'network_interfaces', 'eth0', 'ip6'),
+          :switch           => lookup('pastel_manual', node_uid, 'network_interfaces', 'eth0', 'switch_name'),
+          :switch_port      => lookup('pastel_manual', node_uid, 'network_interfaces', 'eth0', 'switch_port'),
+          :mac              => lookup('pastel_generated', node_uid, 'network_interfaces', 'eth0', 'mac')
         },
         {
-          :interface        => lookup('pastel', node_uid, 'network_interfaces', 'eth1', 'interface'),
+          :interface        => lookup('pastel_generated', node_uid, 'network_interfaces', 'eth1', 'interface'),
           :rate             => 1.G,
-          :enabled          => lookup('pastel', node_uid, 'network_interfaces', 'eth1', 'enabled'),
-          :management       => lookup('pastel', node_uid, 'network_interfaces', 'eth1', 'management'),
-          :mountable        => lookup('pastel', node_uid, 'network_interfaces', 'eth1', 'mountable'),
-          :mounted          => lookup('pastel', node_uid, 'network_interfaces', 'eth1', 'mounted'),
+          :enabled          => lookup('pastel_generated', node_uid, 'network_interfaces', 'eth1', 'enabled'),
+          :management       => lookup('pastel_generated', node_uid, 'network_interfaces', 'eth1', 'management'),
+          :mountable        => lookup('pastel_generated', node_uid, 'network_interfaces', 'eth1', 'mountable'),
+          :mounted          => lookup('pastel_generated', node_uid, 'network_interfaces', 'eth1', 'mounted'),
           :bridged          => false,
           :device           => "eth1",
           :vendor           => "NVIDIA",
           :version          => "MCP55 Pro",
           :switch           => nil,
-          :driver           => lookup('pastel', node_uid, 'network_interfaces', 'eth1', 'driver'),
+          :driver           => lookup('pastel_generated', node_uid, 'network_interfaces', 'eth1', 'driver'),
           :network_address  => "#{node_uid}-eth1.#{site_uid}.grid5000.fr",
-          :mac              => lookup('pastel', node_uid, 'network_interfaces', 'eth1', 'mac')
+          :mac              => lookup('pastel_generated', node_uid, 'network_interfaces', 'eth1', 'mac')
         },
         { :interface => 'Ethernet',
           :rate => 1.G,
-          :mac => lookup('pastel', node_uid, 'network_interfaces','bmc','mac'),
+          :mac => lookup('pastel_generated', node_uid, 'network_interfaces','bmc','mac'),
           :vendor => "Broadcom",
           :version => "BCM5715c",
           :enabled => true,
@@ -106,21 +106,21 @@ site :toulouse do |site_uid|
           :mountable => false,
           :mounted => false,
           :network_address => "#{node_uid}-bmc.#{site_uid}.grid5000.fr",
-          :ip => lookup('pastel', node_uid,'network_interfaces','bmc','ip'),
+          :ip => lookup('pastel_generated', node_uid,'network_interfaces','bmc','ip'),
           :ip6 => nil,
           :switch => '<unknown>'
         }]
 
         chassis({
-          :serial       => lookup('pastel', node_uid, 'chassis', 'serial_number'),
-          :name         => lookup('pastel', node_uid, 'chassis', 'product_name'),
-          :manufacturer => lookup('pastel', node_uid, 'chassis', 'manufacturer')
+          :serial       => lookup('pastel_generated', node_uid, 'chassis', 'serial_number'),
+          :name         => lookup('pastel_generated', node_uid, 'chassis', 'product_name'),
+          :manufacturer => lookup('pastel_generated', node_uid, 'chassis', 'manufacturer')
         })
 
         bios({
-          :version	=> lookup('pastel', node_uid, 'bios', 'version'),
-          :vendor	=> lookup('pastel', node_uid, 'bios', 'vendor'),
-          :release_date	=> lookup('pastel', node_uid, 'bios', 'release_date')
+          :version	=> lookup('pastel_generated', node_uid, 'bios', 'version'),
+          :vendor	=> lookup('pastel_generated', node_uid, 'bios', 'vendor'),
+          :release_date	=> lookup('pastel_generated', node_uid, 'bios', 'release_date')
         })
 
         gpu({
diff --git a/generators/input/sites/toulouse/clusters/pastel.yaml b/generators/input/sites/toulouse/clusters/pastel_generated.yaml
similarity index 96%
rename from generators/input/sites/toulouse/clusters/pastel.yaml
rename to generators/input/sites/toulouse/clusters/pastel_generated.yaml
index 9f5cd739982..2951caec1fa 100644
--- a/generators/input/sites/toulouse/clusters/pastel.yaml
+++ b/generators/input/sites/toulouse/clusters/pastel_generated.yaml
@@ -26,8 +26,6 @@ pastel-1:
       ip: 172.16.112.1
       driver: forcedeth
       mountable: true
-      switch_name: r4
-      switch_port: Gi1/1
     eth1:
       mounted: false
       mac: 00:16:36:e0:82:93
@@ -94,8 +92,6 @@ pastel-2:
       ip: 172.16.112.2
       driver: forcedeth
       mountable: true
-      switch_name: r4
-      switch_port: Gi1/2
     eth1:
       mounted: false
       mac: 00:1b:24:2d:f8:84
@@ -158,8 +154,6 @@ pastel-3:
       ip: 172.16.112.3
       driver: forcedeth
       mountable: true
-      switch_name: r4
-      switch_port: Gi1/3
     eth1:
       mounted: false
       mac: 00:16:36:df:09:13
@@ -211,8 +205,6 @@ pastel-4:
       ip: 172.16.112.4
       driver: forcedeth
       mountable: true
-      switch_name: r4
-      switch_port: Gi1/4
     eth1:
       mounted: false
       mac: 00:16:36:e0:7e:d7
@@ -275,8 +267,6 @@ pastel-5:
       ip: 172.16.112.5
       driver: forcedeth
       mountable: true
-      switch_name: r4
-      switch_port: Gi1/5
     eth1:
       mounted: false
       mac: 00:16:36:e0:78:2f
@@ -339,8 +329,6 @@ pastel-6:
       ip: 172.16.112.6
       driver: forcedeth
       mountable: true
-      switch_name: r4
-      switch_port: Gi1/6
     eth1:
       mounted: false
       mac: 00:16:36:d2:ee:f9
@@ -403,8 +391,6 @@ pastel-7:
       ip: 172.16.112.7
       driver: forcedeth
       mountable: true
-      switch_name: r4
-      switch_port: Gi1/7
     eth1:
       mounted: false
       mac: 00:16:36:d2:ef:39
@@ -478,8 +464,6 @@ pastel-8:
       ip: 172.16.112.8
       driver: forcedeth
       mountable: true
-      switch_name: r4
-      switch_port: Gi1/8
     eth1:
       mounted: false
       mac: 00:16:36:e0:78:b3
@@ -535,8 +519,6 @@ pastel-9:
       ip: 172.16.112.9
       driver: forcedeth
       mountable: true
-      switch_name: r4
-      switch_port: Gi1/9
     eth1:
       mounted: false
       mac: 00:16:36:76:52:ac
@@ -606,8 +588,6 @@ pastel-10:
       ip: 172.16.112.10
       driver: forcedeth
       mountable: true
-      switch_name: r4
-      switch_port: Gi1/10
     eth1:
       mounted: false
       mac: 00:16:36:e0:80:1b
@@ -659,8 +639,6 @@ pastel-11:
       ip: 172.16.112.11
       driver: forcedeth
       mountable: true
-      switch_name: r4
-      switch_port: Gi1/11
     eth1:
       mounted: false
       mac: 00:16:36:d2:ef:49
@@ -723,8 +701,6 @@ pastel-12:
       ip: 172.16.112.12
       driver: forcedeth
       mountable: true
-      switch_name: r4
-      switch_port: Gi1/12
     eth1:
       mounted: false
       mac: 00:1b:24:2d:f7:14
@@ -798,8 +774,6 @@ pastel-13:
       ip: 172.16.112.13
       driver: forcedeth
       mountable: true
-      switch_name: r4
-      switch_port: Gi1/13
     eth1:
       mounted: false
       mac: 00:16:36:e0:79:c3
@@ -862,8 +836,6 @@ pastel-14:
       ip: 172.16.112.14
       driver: forcedeth
       mountable: true
-      switch_name: r4
-      switch_port: Gi1/14
     eth1:
       mounted: false
       mac: 00:16:36:d2:f1:c5
@@ -919,8 +891,6 @@ pastel-15:
       ip: 172.16.112.15
       driver: forcedeth
       mountable: true
-      switch_name: r4
-      switch_port: Gi1/15
     eth1:
       mounted: false
       mac: 00:16:36:7b:46:52
@@ -979,8 +949,6 @@ pastel-16:
       ip: 172.16.112.16
       driver: forcedeth
       mountable: true
-      switch_name: r4
-      switch_port: Gi1/16
     eth1:
       mounted: false
       mac: 00:16:36:df:09:0f
@@ -1054,8 +1022,6 @@ pastel-17:
       ip: 172.16.112.17
       driver: forcedeth
       mountable: true
-      switch_name: r4
-      switch_port: Gi1/17
     eth1:
       mounted: false
       mac: 00:1b:24:2d:f5:c4
@@ -1118,8 +1084,6 @@ pastel-18:
       ip: 172.16.112.18
       driver: forcedeth
       mountable: true
-      switch_name: r4
-      switch_port: Gi1/18
     eth1:
       mounted: false
       mac: 00:16:36:d2:f0:41
@@ -1175,8 +1139,6 @@ pastel-19:
       ip: 172.16.112.19
       driver: forcedeth
       mountable: true
-      switch_name: r4
-      switch_port: Gi1/19
     eth1:
       mounted: false
       mac: 00:16:36:d7:4d:41
@@ -1235,8 +1197,6 @@ pastel-20:
       ip: 172.16.112.20
       driver: forcedeth
       mountable: true
-      switch_name: r4
-      switch_port: Gi1/20
     eth1:
       mounted: false
       mac: 00:16:36:d7:4e:f5
@@ -1299,8 +1259,6 @@ pastel-21:
       ip: 172.16.112.21
       driver: forcedeth
       mountable: true
-      switch_name: r4
-      switch_port: Gi1/21
     eth1:
       mounted: false
       mac: 00:1b:24:3d:ca:9e
@@ -1374,8 +1332,6 @@ pastel-22:
       ip: 172.16.112.22
       driver: forcedeth
       mountable: true
-      switch_name: r4
-      switch_port: Gi1/22
     eth1:
       mounted: false
       mac: 00:1b:24:2d:f8:64
@@ -1434,8 +1390,6 @@ pastel-23:
       ip: 172.16.112.23
       driver: forcedeth
       mountable: true
-      switch_name: r4
-      switch_port: Gi1/23
     eth1:
       mounted: false
       mac: 00:1b:24:2d:f6:e8
@@ -1502,8 +1456,6 @@ pastel-24:
       ip: 172.16.112.24
       driver: forcedeth
       mountable: true
-      switch_name: r4
-      switch_port: Gi1/24
     eth1:
       mounted: false
       mac: 00:1b:24:2d:fa:80
@@ -1555,8 +1507,6 @@ pastel-25:
       ip: 172.16.112.25
       driver: forcedeth
       mountable: true
-      switch_name: r4
-      switch_port: Gi1/25
     eth1:
       mounted: false
       mac: 00:1b:24:2d:fa:44
@@ -1619,8 +1569,6 @@ pastel-26:
       ip: 172.16.112.26
       driver: forcedeth
       mountable: true
-      switch_name: r4
-      switch_port: Gi1/26
     eth1:
       mounted: false
       mac: 00:1b:24:2d:f7:b4
@@ -1683,8 +1631,6 @@ pastel-27:
       ip: 172.16.112.27
       driver: forcedeth
       mountable: true
-      switch_name: r4
-      switch_port: Gi1/27
     eth1:
       mounted: false
       mac: 00:1b:24:2d:f8:38
@@ -1747,8 +1693,6 @@ pastel-28:
       ip: 172.16.112.28
       driver: forcedeth
       mountable: true
-      switch_name: r4
-      switch_port: Gi1/28
     eth1:
       mounted: false
       mac: 00:16:36:d2:ec:d1
@@ -1811,8 +1755,6 @@ pastel-29:
       ip: 172.16.112.29
       driver: forcedeth
       mountable: true
-      switch_name: r4
-      switch_port: Gi1/29
     eth1:
       mounted: false
       mac: 00:1b:24:2d:f5:c0
@@ -1886,8 +1828,6 @@ pastel-30:
       ip: 172.16.112.30
       driver: forcedeth
       mountable: true
-      switch_name: r4
-      switch_port: Gi1/30
     eth1:
       mounted: false
       mac: 00:16:36:df:08:c3
@@ -1946,8 +1886,6 @@ pastel-31:
       ip: 172.16.112.31
       driver: forcedeth
       mountable: true
-      switch_name: r4
-      switch_port: Gi1/31
     eth1:
       mounted: false
       mac: 00:16:36:d2:f3:59
@@ -2003,8 +1941,6 @@ pastel-32:
       ip: 172.16.112.32
       driver: forcedeth
       mountable: true
-      switch_name: r4
-      switch_port: Gi1/32
     eth1:
       mounted: false
       mac: 00:16:36:e0:78:93
@@ -2067,8 +2003,6 @@ pastel-33:
       ip: 172.16.112.33
       driver: forcedeth
       mountable: true
-      switch_name: r4
-      switch_port: Gi1/33
     eth1:
       mounted: false
       mac: 00:16:36:e0:79:5f
@@ -2135,8 +2069,6 @@ pastel-34:
       ip: 172.16.112.34
       driver: forcedeth
       mountable: true
-      switch_name: r4
-      switch_port: Gi1/34
     eth1:
       mounted: false
       mac: 00:16:36:e0:81:d7
@@ -2195,8 +2127,6 @@ pastel-35:
       ip: 172.16.112.35
       driver: forcedeth
       mountable: true
-      switch_name: r4
-      switch_port: Gi1/37
     eth1:
       mounted: false
       mac: 00:1b:24:2d:f6:84
@@ -2263,8 +2193,6 @@ pastel-36:
       ip: 172.16.112.36
       driver: forcedeth
       mountable: true
-      switch_name: r4
-      switch_port: Gi1/35
     eth1:
       mounted: false
       mac: 00:1b:24:2d:f7:18
@@ -2323,8 +2251,6 @@ pastel-37:
       ip: 172.16.112.37
       driver: forcedeth
       mountable: true
-      switch_name: r4
-      switch_port: Gi1/36
     eth1:
       mounted: false
       mac: 00:1b:24:2d:f6:48
@@ -2398,8 +2324,6 @@ pastel-38:
       ip: 172.16.112.38
       driver: forcedeth
       mountable: true
-      switch_name: r4
-      switch_port: Gi1/38
     eth1:
       mounted: false
       mac: 00:16:36:df:09:0b
@@ -2451,8 +2375,6 @@ pastel-39:
       ip: 172.16.112.39
       driver: forcedeth
       mountable: true
-      switch_name: r4
-      switch_port: Gi1/39
     eth1:
       mounted: false
       mac: 00:16:36:d2:f0:3d
@@ -2515,8 +2437,6 @@ pastel-40:
       ip: 172.16.112.40
       driver: forcedeth
       mountable: true
-      switch_name: r4
-      switch_port: Gi1/40
     eth1:
       mounted: false
       mac: 00:16:36:d2:ef:45
@@ -2579,8 +2499,6 @@ pastel-41:
       ip: 172.16.112.41
       driver: forcedeth
       mountable: true
-      switch_name: r4
-      switch_port: Gi4/1
     eth1:
       mounted: false
       mac: 00:16:36:e0:78:37
@@ -2647,8 +2565,6 @@ pastel-42:
       ip: 172.16.112.42
       driver: forcedeth
       mountable: true
-      switch_name: r4
-      switch_port: Gi4/2
     eth1:
       mounted: false
       mac: 00:16:36:e0:79:6b
@@ -2707,8 +2623,6 @@ pastel-43:
       ip: 172.16.112.43
       driver: forcedeth
       mountable: true
-      switch_name: r4
-      switch_port: Gi4/3
     eth1:
       mounted: false
       mac: 00:16:36:d2:f3:9d
@@ -2771,8 +2685,6 @@ pastel-44:
       ip: 172.16.112.44
       driver: forcedeth
       mountable: true
-      switch_name: r4
-      switch_port: Gi4/4
     eth1:
       mounted: false
       mac: 00:1b:24:2d:f8:f4
@@ -2835,8 +2747,6 @@ pastel-45:
       ip: 172.16.112.45
       driver: forcedeth
       mountable: true
-      switch_name: r4
-      switch_port: Gi4/5
     eth1:
       mounted: false
       mac: 00:1b:24:2d:f6:a0
@@ -2899,8 +2809,6 @@ pastel-46:
       ip: 172.16.112.46
       driver: forcedeth
       mountable: true
-      switch_name: r4
-      switch_port: Gi4/6
     eth1:
       mounted: false
       mac: 00:1b:24:2d:fa:a4
@@ -2963,8 +2871,6 @@ pastel-47:
       ip: 172.16.112.47
       driver: forcedeth
       mountable: true
-      switch_name: r4
-      switch_port: Gi4/7
     eth1:
       mounted: false
       mac: 00:1b:24:2d:fa:40
@@ -3027,8 +2933,6 @@ pastel-48:
       ip: 172.16.112.48
       driver: forcedeth
       mountable: true
-      switch_name: r4
-      switch_port: Gi4/8
     eth1:
       mounted: false
       mac: 00:1b:24:2d:f6:ac
@@ -3102,8 +3006,6 @@ pastel-49:
       ip: 172.16.112.49
       driver: forcedeth
       mountable: true
-      switch_name: r4
-      switch_port: Gi4/9
     eth1:
       mounted: false
       mac: 00:1b:24:2d:f6:4c
@@ -3166,8 +3068,6 @@ pastel-50:
       ip: 172.16.112.50
       driver: forcedeth
       mountable: true
-      switch_name: r4
-      switch_port: Gi4/10
     eth1:
       mounted: false
       mac: 00:16:36:e7:78:06
@@ -3230,8 +3130,6 @@ pastel-51:
       ip: 172.16.112.51
       driver: forcedeth
       mountable: true
-      switch_name: r4
-      switch_port: Gi4/11
     eth1:
       mounted: false
       mac: 00:1b:24:2d:f9:c0
@@ -3290,8 +3188,6 @@ pastel-52:
       ip: 172.16.112.52
       driver: forcedeth
       mountable: true
-      switch_name: r4
-      switch_port: Gi4/12
     eth1:
       mounted: false
       mac: 00:1b:24:2d:f8:cc
@@ -3358,8 +3254,6 @@ pastel-53:
       ip: 172.16.112.53
       driver: forcedeth
       mountable: true
-      switch_name: r4
-      switch_port: Gi4/13
     eth1:
       mounted: false
       mac: 00:1b:24:2d:f6:64
@@ -3411,8 +3305,6 @@ pastel-54:
       ip: 172.16.112.54
       driver: forcedeth
       mountable: true
-      switch_name: r4
-      switch_port: Gi4/14
     eth1:
       mounted: false
       mac: 00:1b:24:2d:f8:8c
@@ -3475,8 +3367,6 @@ pastel-55:
       ip: 172.16.112.55
       driver: forcedeth
       mountable: true
-      switch_name: r4
-      switch_port: Gi4/15
     eth1:
       mounted: false
       mac: 00:1b:24:2d:f9:d8
@@ -3546,8 +3436,6 @@ pastel-56:
       ip: 172.16.112.56
       driver: forcedeth
       mountable: true
-      switch_name: r4
-      switch_port: Gi4/16
     eth1:
       mounted: false
       mac: 00:1b:24:2d:b9:dc
@@ -3607,8 +3495,6 @@ pastel-57:
       ip: 172.16.112.57
       driver: forcedeth
       mountable: true
-      switch_name: r4
-      switch_port: Gi4/17
     eth1:
       mounted: false
       mac: 00:1b:24:2d:b9:0c
@@ -3667,8 +3553,6 @@ pastel-58:
       ip: 172.16.112.58
       driver: forcedeth
       mountable: true
-      switch_name: r4
-      switch_port: Gi4/18
     eth1:
       mounted: false
       mac: 00:1b:24:2d:b9:14
@@ -3731,8 +3615,6 @@ pastel-59:
       ip: 172.16.112.59
       driver: forcedeth
       mountable: true
-      switch_name: r4
-      switch_port: Gi4/19
     eth1:
       mounted: false
       mac: 00:1b:24:2d:f7:08
@@ -3795,8 +3677,6 @@ pastel-60:
       ip: 172.16.112.60
       driver: forcedeth
       mountable: true
-      switch_name: r4
-      switch_port: Gi4/20
     eth1:
       mounted: false
       mac: 00:1b:24:2d:f6:3c
@@ -3859,8 +3739,6 @@ pastel-61:
       ip: 172.16.112.61
       driver: forcedeth
       mountable: true
-      switch_name: r4
-      switch_port: Gi4/21
     eth1:
       mounted: false
       mac: 00:1b:24:2d:f7:c8
@@ -3927,8 +3805,6 @@ pastel-62:
       ip: 172.16.112.62
       driver: forcedeth
       mountable: true
-      switch_name: r4
-      switch_port: Gi4/22
     eth1:
       mounted: false
       mac: 00:1b:24:2d:f7:9c
@@ -3998,8 +3874,6 @@ pastel-63:
       ip: 172.16.112.63
       driver: forcedeth
       mountable: true
-      switch_name: r4
-      switch_port: Gi4/23
     eth1:
       mounted: false
       mac: 00:1b:24:2d:b7:18
@@ -4051,8 +3925,6 @@ pastel-64:
       ip: 172.16.112.64
       driver: forcedeth
       mountable: true
-      switch_name: r4
-      switch_port: Gi4/24
     eth1:
       mounted: false
       mac: 00:23:8b:8a:36:6a
@@ -4115,8 +3987,6 @@ pastel-65:
       ip: 172.16.112.65
       driver: forcedeth
       mountable: true
-      switch_name: r4
-      switch_port: Gi4/25
     eth1:
       mounted: false
       mac: 00:1b:24:2d:fa:a4
@@ -4190,8 +4060,6 @@ pastel-66:
       ip: 172.16.112.66
       driver: forcedeth
       mountable: true
-      switch_name: r4
-      switch_port: Gi4/26
     eth1:
       mounted: false
       mac: 00:1b:24:2d:f7:a0
@@ -4243,8 +4111,6 @@ pastel-67:
       ip: 172.16.112.67
       driver: forcedeth
       mountable: true
-      switch_name: r4
-      switch_port: Gi4/27
     eth1:
       mounted: false
       mac: 00:1b:24:2d:f8:d4
@@ -4307,8 +4173,6 @@ pastel-68:
       ip: 172.16.112.68
       driver: forcedeth
       mountable: true
-      switch_name: r4
-      switch_port: Gi4/28
     eth1:
       mounted: false
       mac: 00:1b:24:e0:56:d8
@@ -4371,8 +4235,6 @@ pastel-69:
       ip: 172.16.112.69
       driver: forcedeth
       mountable: true
-      switch_name: r4
-      switch_port: Gi4/29
     eth1:
       mounted: false
       mac: 00:1b:24:2d:f9:f8
@@ -4435,8 +4297,6 @@ pastel-70:
       ip: 172.16.112.70
       driver: forcedeth
       mountable: true
-      switch_name: r4
-      switch_port: Gi4/30
     eth1:
       mounted: false
       mac: 00:1b:24:2d:b6:24
@@ -4503,8 +4363,6 @@ pastel-71:
       ip: 172.16.112.71
       driver: forcedeth
       mountable: true
-      switch_name: r4
-      switch_port: Gi4/31
     eth1:
       mounted: false
       mac: 00:1b:24:2d:f8:a8
@@ -4563,8 +4421,6 @@ pastel-72:
       ip: 172.16.112.72
       driver: forcedeth
       mountable: true
-      switch_name: r4
-      switch_port: Gi4/32
     eth1:
       mounted: false
       mac: 00:1b:24:2d:b8:98
@@ -4638,8 +4494,6 @@ pastel-73:
       ip: 172.16.112.73
       driver: forcedeth
       mountable: true
-      switch_name: r4
-      switch_port: Gi4/33
     eth1:
       mounted: false
       mac: 00:1b:24:2d:b7:00
@@ -4702,8 +4556,6 @@ pastel-74:
       ip: 172.16.112.74
       driver: forcedeth
       mountable: true
-      switch_name: r4
-      switch_port: Gi4/34
     eth1:
       mounted: false
       mac: 00:16:36:ff:d6:03
@@ -4755,8 +4607,6 @@ pastel-75:
       ip: 172.16.112.75
       driver: forcedeth
       mountable: true
-      switch_name: r4
-      switch_port: Gi4/35
     eth1:
       mounted: false
       mac: 00:1b:24:2d:f6:ec
@@ -4819,8 +4669,6 @@ pastel-76:
       ip: 172.16.112.76
       driver: forcedeth
       mountable: true
-      switch_name: r4
-      switch_port: Gi4/36
     eth1:
       mounted: false
       mac: 00:1b:24:2d:b9:18
@@ -4883,8 +4731,6 @@ pastel-77:
       ip: 172.16.112.77
       driver: forcedeth
       mountable: true
-      switch_name: r4
-      switch_port: Gi4/37
     eth1:
       mounted: false
       mac: 00:1b:24:2d:b7:1c
@@ -4947,8 +4793,6 @@ pastel-78:
       ip: 172.16.112.78
       driver: forcedeth
       mountable: true
-      switch_name: r4
-      switch_port: Gi4/38
     eth1:
       mounted: false
       mac: 00:1b:24:2d:f6:b4
@@ -5022,8 +4866,6 @@ pastel-79:
       ip: 172.16.112.79
       driver: forcedeth
       mountable: true
-      switch_name: r4
-      switch_port: Gi4/39
     eth1:
       mounted: false
       mac: 00:16:36:d2:ee:2d
@@ -5075,8 +4917,6 @@ pastel-80:
       ip: 172.16.112.80
       driver: forcedeth
       mountable: true
-      switch_name: r4
-      switch_port: Gi4/40
     eth1:
       mounted: false
       mac: 00:16:36:e7:77:6e
@@ -5139,8 +4979,6 @@ pastel-81:
       ip: 172.16.112.81
       driver: forcedeth
       mountable: true
-      switch_name: gw-toulouse
-      switch_port: Gi2/1
     eth1:
       mounted: false
       mac: 00:1b:24:2d:fa:a4
@@ -5203,8 +5041,6 @@ pastel-82:
       ip: 172.16.112.82
       driver: forcedeth
       mountable: true
-      switch_name: gw-toulouse
-      switch_port: Gi2/2
     eth1:
       mounted: false
       mac: 00:1b:24:2d:fa:a4
@@ -5278,8 +5114,6 @@ pastel-83:
       ip: 172.16.112.83
       driver: forcedeth
       mountable: true
-      switch_name: gw-toulouse
-      switch_port: Gi2/3
     eth1:
       mounted: false
       mac: 00:1b:24:2d:f8:a4
@@ -5331,8 +5165,6 @@ pastel-84:
       ip: 172.16.112.84
       driver: forcedeth
       mountable: true
-      switch_name: gw-toulouse
-      switch_port: Gi2/4
     eth1:
       mounted: false
       mac: 00:1b:24:2d:fa:a4
@@ -5395,8 +5227,6 @@ pastel-85:
       ip: 172.16.112.85
       driver: forcedeth
       mountable: true
-      switch_name: gw-toulouse
-      switch_port: Gi2/5
     eth1:
       mounted: false
       mac: 00:1b:24:2d:fa:a4
@@ -5459,8 +5289,6 @@ pastel-86:
       ip: 172.16.112.86
       driver: forcedeth
       mountable: true
-      switch_name: gw-toulouse
-      switch_port: Gi2/6
     eth1:
       mounted: false
       mac: 00:1b:24:2d:fa:a4
@@ -5523,8 +5351,6 @@ pastel-87:
       ip: 172.16.112.87
       driver: forcedeth
       mountable: true
-      switch_name: gw-toulouse
-      switch_port: Gi2/7
     eth1:
       mounted: false
       mac: 00:1b:24:2d:fa:a4
@@ -5598,8 +5424,6 @@ pastel-88:
       ip: 172.16.112.88
       driver: forcedeth
       mountable: true
-      switch_name: gw-toulouse
-      switch_port: Gi2/8
     eth1:
       mounted: false
       mac: 00:1b:24:2d:b7:d4
@@ -5651,8 +5475,6 @@ pastel-89:
       ip: 172.16.112.89
       driver: forcedeth
       mountable: true
-      switch_name: gw-toulouse
-      switch_port: Gi2/9
     eth1:
       mounted: false
       mac: 00:1b:24:2d:fa:a4
@@ -5715,8 +5537,6 @@ pastel-90:
       ip: 172.16.112.90
       driver: forcedeth
       mountable: true
-      switch_name: gw-toulouse
-      switch_port: Gi2/10
     eth1:
       mounted: false
       mac: 00:1b:24:2d:fa:a4
@@ -5779,8 +5599,6 @@ pastel-91:
       ip: 172.16.112.91
       driver: forcedeth
       mountable: true
-      switch_name: gw-toulouse
-      switch_port: Gi2/11
     eth1:
       mounted: false
       mac: 00:1b:24:2d:f5:f4
@@ -5843,8 +5661,6 @@ pastel-92:
       ip: 172.16.112.92
       driver: forcedeth
       mountable: true
-      switch_name: gw-toulouse
-      switch_port: Gi2/12
     eth1:
       mounted: false
       mac: 00:1b:24:2d:fa:a4
@@ -5911,8 +5727,6 @@ pastel-93:
       ip: 172.16.112.93
       driver: forcedeth
       mountable: true
-      switch_name: gw-toulouse
-      switch_port: Gi2/13
     eth1:
       mounted: false
       mac: 00:16:36:d2:f3:f1
@@ -5971,8 +5785,6 @@ pastel-94:
       ip: 172.16.112.94
       driver: forcedeth
       mountable: true
-      switch_name: gw-toulouse
-      switch_port: Gi2/14
     eth1:
       mounted: false
       mac: 00:1b:24:2d:fa:a4
@@ -6035,8 +5847,6 @@ pastel-95:
       ip: 172.16.112.95
       driver: forcedeth
       mountable: true
-      switch_name: gw-toulouse
-      switch_port: Gi2/15
     eth1:
       mounted: false
       mac: 00:1b:24:2d:fa:a4
@@ -6099,8 +5909,6 @@ pastel-96:
       ip: 172.16.112.96
       driver: forcedeth
       mountable: true
-      switch_name: gw-toulouse
-      switch_port: Gi2/16
     eth1:
       mounted: false
       mac: 00:1b:24:2d:fa:a4
@@ -6163,8 +5971,6 @@ pastel-97:
       ip: 172.16.112.97
       driver: forcedeth
       mountable: true
-      switch_name: gw-toulouse
-      switch_port: Gi2/17
     eth1:
       mounted: false
       mac: 00:1b:24:2d:fa:a4
@@ -6227,8 +6033,6 @@ pastel-98:
       ip: 172.16.112.98
       driver: forcedeth
       mountable: true
-      switch_name: gw-toulouse
-      switch_port: Gi2/18
     eth1:
       mounted: false
       mac: 00:1b:24:2d:fa:a4
@@ -6302,8 +6106,6 @@ pastel-99:
       ip: 172.16.112.99
       driver: forcedeth
       mountable: true
-      switch_name: gw-toulouse
-      switch_port: Gi2/19
     eth1:
       mounted: false
       mac: 00:1b:24:2d:f8:a0
@@ -6355,8 +6157,6 @@ pastel-100:
       ip: 172.16.112.100
       driver: forcedeth
       mountable: true
-      switch_name: gw-toulouse
-      switch_port: Gi2/20
     eth1:
       mounted: false
       mac: 00:1b:24:2d:f7:00
@@ -6430,8 +6230,6 @@ pastel-101:
       ip: 172.16.112.101
       driver: forcedeth
       mountable: true
-      switch_name: gw-toulouse
-      switch_port: Gi2/30
     eth1:
       mounted: false
       mac: 00:1b:24:2d:f8:9c
@@ -6487,8 +6285,6 @@ pastel-102:
       ip: 172.16.112.102
       driver: forcedeth
       mountable: true
-      switch_name: gw-toulouse
-      switch_port: Gi2/31
     eth1:
       mounted: false
       mac: 00:1b:24:2d:b7:20
@@ -6547,8 +6343,6 @@ pastel-103:
       ip: 172.16.112.103
       driver: forcedeth
       mountable: true
-      switch_name: gw-toulouse
-      switch_port: Gi2/32
     eth1:
       mounted: false
       mac: 00:1b:24:2d:b6:10
@@ -6622,8 +6416,6 @@ pastel-104:
       ip: 172.16.112.104
       driver: forcedeth
       mountable: true
-      switch_name: gw-toulouse
-      switch_port: Gi2/33
     eth1:
       mounted: false
       mac: 00:16:36:e0:79:03
@@ -6682,8 +6474,6 @@ pastel-105:
       ip: 172.16.112.105
       driver: forcedeth
       mountable: true
-      switch_name: gw-toulouse
-      switch_port: Gi2/34
     eth1:
       mounted: false
       mac: 00:1b:24:2d:f9:7c
@@ -6750,8 +6540,6 @@ pastel-106:
       ip: 172.16.112.106
       driver: forcedeth
       mountable: true
-      switch_name: gw-toulouse
-      switch_port: Gi2/35
     eth1:
       mounted: false
       mac: 00:1b:24:2d:f7:b8
@@ -6803,8 +6591,6 @@ pastel-107:
       ip: 172.16.112.107
       driver: forcedeth
       mountable: true
-      switch_name: gw-toulouse
-      switch_port: Gi2/36
     eth1:
       mounted: false
       mac: 00:1b:24:2d:f8:34
@@ -6878,8 +6664,6 @@ pastel-108:
       ip: 172.16.112.108
       driver: forcedeth
       mountable: true
-      switch_name: gw-toulouse
-      switch_port: Gi2/37
     eth1:
       mounted: false
       mac: 00:1b:24:2d:f5:ec
@@ -6942,8 +6726,6 @@ pastel-109:
       ip: 172.16.112.109
       driver: forcedeth
       mountable: true
-      switch_name: gw-toulouse
-      switch_port: Gi2/38
     eth1:
       mounted: false
       mac: 00:1b:24:2d:f7:f8
@@ -7006,8 +6788,6 @@ pastel-110:
       ip: 172.16.112.110
       driver: forcedeth
       mountable: true
-      switch_name: gw-toulouse
-      switch_port: Gi2/39
     eth1:
       mounted: false
       mac: 00:16:36:e0:84:8f
@@ -7070,8 +6850,6 @@ pastel-111:
       ip: 172.16.112.111
       driver: forcedeth
       mountable: true
-      switch_name: gw-toulouse
-      switch_port: Gi2/40
     eth1:
       mounted: false
       mac: 00:1b:24:2d:f5:bc
@@ -7127,8 +6905,6 @@ pastel-112:
       ip: 172.16.112.112
       driver: forcedeth
       mountable: true
-      switch_name: gw-toulouse
-      switch_port: Gi2/41
     eth1:
       mounted: false
       mac: 00:16:36:d2:f3:e5
@@ -7198,8 +6974,6 @@ pastel-113:
       ip: 172.16.112.113
       driver: forcedeth
       mountable: true
-      switch_name: gw-toulouse
-      switch_port: Gi2/42
     eth1:
       mounted: false
       mac: 00:16:36:d2:f3:d5
@@ -7251,8 +7025,6 @@ pastel-114:
       ip: 172.16.112.114
       driver: forcedeth
       mountable: true
-      switch_name: gw-toulouse
-      switch_port: Gi2/43
     eth1:
       mounted: false
       mac: 00:1b:24:2d:f8:6c
@@ -7315,8 +7087,6 @@ pastel-115:
       ip: 172.16.112.115
       driver: forcedeth
       mountable: true
-      switch_name: gw-toulouse
-      switch_port: Gi2/44
     eth1:
       mounted: false
       mac: 00:1b:24:2d:fa:a4
@@ -7379,8 +7149,6 @@ pastel-116:
       ip: 172.16.112.116
       driver: forcedeth
       mountable: true
-      switch_name: gw-toulouse
-      switch_port: Gi2/45
     eth1:
       mounted: false
       mac: 00:1b:24:2d:fa:a4
@@ -7443,8 +7211,6 @@ pastel-117:
       ip: 172.16.112.117
       driver: forcedeth
       mountable: true
-      switch_name: gw-toulouse
-      switch_port: Gi2/46
     eth1:
       mounted: false
       mac: 00:1b:24:2d:fa:a4
@@ -7507,8 +7273,6 @@ pastel-118:
       ip: 172.16.112.118
       driver: forcedeth
       mountable: true
-      switch_name: gw-toulouse
-      switch_port: Gi2/47
     eth1:
       mounted: false
       mac: 00:1b:24:2d:fa:a4
@@ -7575,8 +7339,6 @@ pastel-119:
       ip: 172.16.112.119
       driver: forcedeth
       mountable: true
-      switch_name: gw-toulouse
-      switch_port: Gi2/48
     eth1:
       mounted: false
       mac: 00:1b:24:2d:fa:84
@@ -7646,8 +7408,6 @@ pastel-120:
       ip: 172.16.112.120
       driver: forcedeth
       mountable: true
-      switch_name: gw-toulouse
-      switch_port: Gi3/1
     eth1:
       mounted: false
       mac: 00:1b:24:2d:f6:88
@@ -7699,8 +7459,6 @@ pastel-121:
       ip: 172.16.112.121
       driver: forcedeth
       mountable: true
-      switch_name: gw-toulouse
-      switch_port: Gi2/21
     eth1:
       mounted: false
       mac: 00:1b:24:2d:fa:a4
@@ -7770,8 +7528,6 @@ pastel-122:
       ip: 172.16.112.122
       driver: forcedeth
       mountable: true
-      switch_name: gw-toulouse
-      switch_port: Gi2/22
     eth1:
       mounted: false
       mac: 00:1b:24:2d:f8:3c
@@ -7827,8 +7583,6 @@ pastel-123:
       ip: 172.16.112.123
       driver: forcedeth
       mountable: true
-      switch_name: gw-toulouse
-      switch_port: Gi2/23
     eth1:
       mounted: false
       mac: 00:1b:24:2d:fa:a4
@@ -7891,8 +7645,6 @@ pastel-124:
       ip: 172.16.112.124
       driver: forcedeth
       mountable: true
-      switch_name: gw-toulouse
-      switch_port: Gi2/24
     eth1:
       mounted: false
       mac: 00:1b:24:2d:fa:a4
@@ -7959,8 +7711,6 @@ pastel-125:
       ip: 172.16.112.125
       driver: forcedeth
       mountable: true
-      switch_name: gw-toulouse
-      switch_port: Gi2/25
     eth1:
       mounted: false
       mac: 00:16:36:ff:d4:8b
@@ -8019,8 +7769,6 @@ pastel-126:
       ip: 172.16.112.126
       driver: forcedeth
       mountable: true
-      switch_name: gw-toulouse
-      switch_port: Gi2/26
     eth1:
       mounted: false
       mac: 00:1b:24:2d:fa:a4
@@ -8083,8 +7831,6 @@ pastel-127:
       ip: 172.16.112.127
       driver: forcedeth
       mountable: true
-      switch_name: gw-toulouse
-      switch_port: Gi2/27
     eth1:
       mounted: false
       mac: 00:1b:24:3d:e5:42
@@ -8147,8 +7893,6 @@ pastel-128:
       ip: 172.16.112.128
       driver: forcedeth
       mountable: true
-      switch_name: gw-toulouse
-      switch_port: Gi2/28
     eth1:
       mounted: false
       mac: 00:1b:24:2d:fa:a4
@@ -8211,8 +7955,6 @@ pastel-129:
       ip: 172.16.112.129
       driver: forcedeth
       mountable: true
-      switch_name: gw-toulouse
-      switch_port: Gi2/29
     eth1:
       mounted: false
       mac: 00:1b:24:2d:fa:a4
@@ -8286,8 +8028,6 @@ pastel-130:
       ip: 172.16.112.130
       driver: forcedeth
       mountable: true
-      switch_name: gw-toulouse
-      switch_port: Gi3/2
     eth1:
       mounted: false
       mac: 00:1b:24:2d:f7:1c
@@ -8343,8 +8083,6 @@ pastel-131:
       ip: 172.16.112.131
       driver: forcedeth
       mountable: true
-      switch_name: gw-toulouse
-      switch_port: Gi3/3
     eth1:
       mounted: false
       mac: 00:16:36:e0:87:9b
@@ -8414,8 +8152,6 @@ pastel-132:
       ip: 172.16.112.132
       driver: forcedeth
       mountable: true
-      switch_name: gw-toulouse
-      switch_port: Gi3/4
     eth1:
       mounted: false
       mac: 00:16:36:d2:f2:55
@@ -8474,8 +8210,6 @@ pastel-133:
       ip: 172.16.112.133
       driver: forcedeth
       mountable: true
-      switch_name: gw-toulouse
-      switch_port: Gi3/5
     eth1:
       mounted: false
       mac: 00:1b:24:2d:f6:f4
@@ -8535,8 +8269,6 @@ pastel-134:
       ip: 172.16.112.134
       driver: forcedeth
       mountable: true
-      switch_name: gw-toulouse
-      switch_port: Gi3/6
     eth1:
       mounted: false
       mac: 00:16:36:df:08:c7
@@ -8602,8 +8334,6 @@ pastel-135:
       ip: 172.16.112.135
       driver: forcedeth
       mountable: true
-      switch_name: gw-toulouse
-      switch_port: Gi3/7
     eth1:
       mounted: false
       mac: 00:1b:24:2d:f9:10
@@ -8659,8 +8389,6 @@ pastel-136:
       ip: 172.16.112.136
       driver: forcedeth
       mountable: true
-      switch_name: gw-toulouse
-      switch_port: Gi3/8
     eth1:
       mounted: false
       mac: 00:16:36:d2:f3:55
@@ -8734,8 +8462,6 @@ pastel-137:
       ip: 172.16.112.137
       driver: forcedeth
       mountable: true
-      switch_name: gw-toulouse
-      switch_port: Gi3/9
     eth1:
       mounted: false
       mac: 00:16:36:e0:79:67
@@ -8794,8 +8520,6 @@ pastel-138:
       ip: 172.16.112.138
       driver: forcedeth
       mountable: true
-      switch_name: gw-toulouse
-      switch_port: Gi3/10
     eth1:
       mounted: false
       mac: 00:1b:24:2d:f6:e0
@@ -8855,8 +8579,6 @@ pastel-139:
       ip: 172.16.112.139
       driver: forcedeth
       mountable: true
-      switch_name: gw-toulouse
-      switch_port: Gi3/11
     eth1:
       mounted: false
       mac: 00:16:36:e0:85:b3
@@ -8926,8 +8648,6 @@ pastel-140:
       ip: 172.16.112.140
       driver: forcedeth
       mountable: true
-      switch_name: gw-toulouse
-      switch_port: Gi3/12
     eth1:
       mounted: false
       mac: 00:1b:24:2d:f8:04
diff --git a/generators/input/sites/toulouse/clusters/pastel_manual.yaml b/generators/input/sites/toulouse/clusters/pastel_manual.yaml
new file mode 100644
index 00000000000..c0ae7b5e5c7
--- /dev/null
+++ b/generators/input/sites/toulouse/clusters/pastel_manual.yaml
@@ -0,0 +1,701 @@
+---
+pastel-1:
+  network_interfaces:
+    eth0:
+      switch_name: r4
+      switch_port: Gi1/1
+pastel-2:
+  network_interfaces:
+    eth0:
+      switch_name: r4
+      switch_port: Gi1/2
+pastel-3:
+  network_interfaces:
+    eth0:
+      switch_name: r4
+      switch_port: Gi1/3
+pastel-4:
+  network_interfaces:
+    eth0:
+      switch_name: r4
+      switch_port: Gi1/4
+pastel-5:
+  network_interfaces:
+    eth0:
+      switch_name: r4
+      switch_port: Gi1/5
+pastel-6:
+  network_interfaces:
+    eth0:
+      switch_name: r4
+      switch_port: Gi1/6
+pastel-7:
+  network_interfaces:
+    eth0:
+      switch_name: r4
+      switch_port: Gi1/7
+pastel-8:
+  network_interfaces:
+    eth0:
+      switch_name: r4
+      switch_port: Gi1/8
+pastel-9:
+  network_interfaces:
+    eth0:
+      switch_name: r4
+      switch_port: Gi1/9
+pastel-10:
+  network_interfaces:
+    eth0:
+      switch_name: r4
+      switch_port: Gi1/10
+pastel-11:
+  network_interfaces:
+    eth0:
+      switch_name: r4
+      switch_port: Gi1/11
+pastel-12:
+  network_interfaces:
+    eth0:
+      switch_name: r4
+      switch_port: Gi1/12
+pastel-13:
+  network_interfaces:
+    eth0:
+      switch_name: r4
+      switch_port: Gi1/13
+pastel-14:
+  network_interfaces:
+    eth0:
+      switch_name: r4
+      switch_port: Gi1/14
+pastel-15:
+  network_interfaces:
+    eth0:
+      switch_name: r4
+      switch_port: Gi1/15
+pastel-16:
+  network_interfaces:
+    eth0:
+      switch_name: r4
+      switch_port: Gi1/16
+pastel-17:
+  network_interfaces:
+    eth0:
+      switch_name: r4
+      switch_port: Gi1/17
+pastel-18:
+  network_interfaces:
+    eth0:
+      switch_name: r4
+      switch_port: Gi1/18
+pastel-19:
+  network_interfaces:
+    eth0:
+      switch_name: r4
+      switch_port: Gi1/19
+pastel-20:
+  network_interfaces:
+    eth0:
+      switch_name: r4
+      switch_port: Gi1/20
+pastel-21:
+  network_interfaces:
+    eth0:
+      switch_name: r4
+      switch_port: Gi1/21
+pastel-22:
+  network_interfaces:
+    eth0:
+      switch_name: r4
+      switch_port: Gi1/22
+pastel-23:
+  network_interfaces:
+    eth0:
+      switch_name: r4
+      switch_port: Gi1/23
+pastel-24:
+  network_interfaces:
+    eth0:
+      switch_name: r4
+      switch_port: Gi1/24
+pastel-25:
+  network_interfaces:
+    eth0:
+      switch_name: r4
+      switch_port: Gi1/25
+pastel-26:
+  network_interfaces:
+    eth0:
+      switch_name: r4
+      switch_port: Gi1/26
+pastel-27:
+  network_interfaces:
+    eth0:
+      switch_name: r4
+      switch_port: Gi1/27
+pastel-28:
+  network_interfaces:
+    eth0:
+      switch_name: r4
+      switch_port: Gi1/28
+pastel-29:
+  network_interfaces:
+    eth0:
+      switch_name: r4
+      switch_port: Gi1/29
+pastel-30:
+  network_interfaces:
+    eth0:
+      switch_name: r4
+      switch_port: Gi1/30
+pastel-31:
+  network_interfaces:
+    eth0:
+      switch_name: r4
+      switch_port: Gi1/31
+pastel-32:
+  network_interfaces:
+    eth0:
+      switch_name: r4
+      switch_port: Gi1/32
+pastel-33:
+  network_interfaces:
+    eth0:
+      switch_name: r4
+      switch_port: Gi1/33
+pastel-34:
+  network_interfaces:
+    eth0:
+      switch_name: r4
+      switch_port: Gi1/34
+pastel-35:
+  network_interfaces:
+    eth0:
+      switch_name: r4
+      switch_port: Gi1/37
+pastel-36:
+  network_interfaces:
+    eth0:
+      switch_name: r4
+      switch_port: Gi1/35
+pastel-37:
+  network_interfaces:
+    eth0:
+      switch_name: r4
+      switch_port: Gi1/36
+pastel-38:
+  network_interfaces:
+    eth0:
+      switch_name: r4
+      switch_port: Gi1/38
+pastel-39:
+  network_interfaces:
+    eth0:
+      switch_name: r4
+      switch_port: Gi1/39
+pastel-40:
+  network_interfaces:
+    eth0:
+      switch_name: r4
+      switch_port: Gi1/40
+pastel-41:
+  network_interfaces:
+    eth0:
+      switch_name: r4
+      switch_port: Gi4/1
+pastel-42:
+  network_interfaces:
+    eth0:
+      switch_name: r4
+      switch_port: Gi4/2
+pastel-43:
+  network_interfaces:
+    eth0:
+      switch_name: r4
+      switch_port: Gi4/3
+pastel-44:
+  network_interfaces:
+    eth0:
+      switch_name: r4
+      switch_port: Gi4/4
+pastel-45:
+  network_interfaces:
+    eth0:
+      switch_name: r4
+      switch_port: Gi4/5
+pastel-46:
+  network_interfaces:
+    eth0:
+      switch_name: r4
+      switch_port: Gi4/6
+pastel-47:
+  network_interfaces:
+    eth0:
+      switch_name: r4
+      switch_port: Gi4/7
+pastel-48:
+  network_interfaces:
+    eth0:
+      switch_name: r4
+      switch_port: Gi4/8
+pastel-49:
+  network_interfaces:
+    eth0:
+      switch_name: r4
+      switch_port: Gi4/9
+pastel-50:
+  network_interfaces:
+    eth0:
+      switch_name: r4
+      switch_port: Gi4/10
+pastel-51:
+  network_interfaces:
+    eth0:
+      switch_name: r4
+      switch_port: Gi4/11
+pastel-52:
+  network_interfaces:
+    eth0:
+      switch_name: r4
+      switch_port: Gi4/12
+pastel-53:
+  network_interfaces:
+    eth0:
+      switch_name: r4
+      switch_port: Gi4/13
+pastel-54:
+  network_interfaces:
+    eth0:
+      switch_name: r4
+      switch_port: Gi4/14
+pastel-55:
+  network_interfaces:
+    eth0:
+      switch_name: r4
+      switch_port: Gi4/15
+pastel-56:
+  network_interfaces:
+    eth0:
+      switch_name: r4
+      switch_port: Gi4/16
+pastel-57:
+  network_interfaces:
+    eth0:
+      switch_name: r4
+      switch_port: Gi4/17
+pastel-58:
+  network_interfaces:
+    eth0:
+      switch_name: r4
+      switch_port: Gi4/18
+pastel-59:
+  network_interfaces:
+    eth0:
+      switch_name: r4
+      switch_port: Gi4/19
+pastel-60:
+  network_interfaces:
+    eth0:
+      switch_name: r4
+      switch_port: Gi4/20
+pastel-61:
+  network_interfaces:
+    eth0:
+      switch_name: r4
+      switch_port: Gi4/21
+pastel-62:
+  network_interfaces:
+    eth0:
+      switch_name: r4
+      switch_port: Gi4/22
+pastel-63:
+  network_interfaces:
+    eth0:
+      switch_name: r4
+      switch_port: Gi4/23
+pastel-64:
+  network_interfaces:
+    eth0:
+      switch_name: r4
+      switch_port: Gi4/24
+pastel-65:
+  network_interfaces:
+    eth0:
+      switch_name: r4
+      switch_port: Gi4/25
+pastel-66:
+  network_interfaces:
+    eth0:
+      switch_name: r4
+      switch_port: Gi4/26
+pastel-67:
+  network_interfaces:
+    eth0:
+      switch_name: r4
+      switch_port: Gi4/27
+pastel-68:
+  network_interfaces:
+    eth0:
+      switch_name: r4
+      switch_port: Gi4/28
+pastel-69:
+  network_interfaces:
+    eth0:
+      switch_name: r4
+      switch_port: Gi4/29
+pastel-70:
+  network_interfaces:
+    eth0:
+      switch_name: r4
+      switch_port: Gi4/30
+pastel-71:
+  network_interfaces:
+    eth0:
+      switch_name: r4
+      switch_port: Gi4/31
+pastel-72:
+  network_interfaces:
+    eth0:
+      switch_name: r4
+      switch_port: Gi4/32
+pastel-73:
+  network_interfaces:
+    eth0:
+      switch_name: r4
+      switch_port: Gi4/33
+pastel-74:
+  network_interfaces:
+    eth0:
+      switch_name: r4
+      switch_port: Gi4/34
+pastel-75:
+  network_interfaces:
+    eth0:
+      switch_name: r4
+      switch_port: Gi4/35
+pastel-76:
+  network_interfaces:
+    eth0:
+      switch_name: r4
+      switch_port: Gi4/36
+pastel-77:
+  network_interfaces:
+    eth0:
+      switch_name: r4
+      switch_port: Gi4/37
+pastel-78:
+  network_interfaces:
+    eth0:
+      switch_name: r4
+      switch_port: Gi4/38
+pastel-79:
+  network_interfaces:
+    eth0:
+      switch_name: r4
+      switch_port: Gi4/39
+pastel-80:
+  network_interfaces:
+    eth0:
+      switch_name: r4
+      switch_port: Gi4/40
+pastel-81:
+  network_interfaces:
+    eth0:
+      switch_name: gw-toulouse
+      switch_port: Gi2/1
+pastel-82:
+  network_interfaces:
+    eth0:
+      switch_name: gw-toulouse
+      switch_port: Gi2/2
+pastel-83:
+  network_interfaces:
+    eth0:
+      switch_name: gw-toulouse
+      switch_port: Gi2/3
+pastel-84:
+  network_interfaces:
+    eth0:
+      switch_name: gw-toulouse
+      switch_port: Gi2/4
+pastel-85:
+  network_interfaces:
+    eth0:
+      switch_name: gw-toulouse
+      switch_port: Gi2/5
+pastel-86:
+  network_interfaces:
+    eth0:
+      switch_name: gw-toulouse
+      switch_port: Gi2/6
+pastel-87:
+  network_interfaces:
+    eth0:
+      switch_name: gw-toulouse
+      switch_port: Gi2/7
+pastel-88:
+  network_interfaces:
+    eth0:
+      switch_name: gw-toulouse
+      switch_port: Gi2/8
+pastel-89:
+  network_interfaces:
+    eth0:
+      switch_name: gw-toulouse
+      switch_port: Gi2/9
+pastel-90:
+  network_interfaces:
+    eth0:
+      switch_name: gw-toulouse
+      switch_port: Gi2/10
+pastel-91:
+  network_interfaces:
+    eth0:
+      switch_name: gw-toulouse
+      switch_port: Gi2/11
+pastel-92:
+  network_interfaces:
+    eth0:
+      switch_name: gw-toulouse
+      switch_port: Gi2/12
+pastel-93:
+  network_interfaces:
+    eth0:
+      switch_name: gw-toulouse
+      switch_port: Gi2/13
+pastel-94:
+  network_interfaces:
+    eth0:
+      switch_name: gw-toulouse
+      switch_port: Gi2/14
+pastel-95:
+  network_interfaces:
+    eth0:
+      switch_name: gw-toulouse
+      switch_port: Gi2/15
+pastel-96:
+  network_interfaces:
+    eth0:
+      switch_name: gw-toulouse
+      switch_port: Gi2/16
+pastel-97:
+  network_interfaces:
+    eth0:
+      switch_name: gw-toulouse
+      switch_port: Gi2/17
+pastel-98:
+  network_interfaces:
+    eth0:
+      switch_name: gw-toulouse
+      switch_port: Gi2/18
+pastel-99:
+  network_interfaces:
+    eth0:
+      switch_name: gw-toulouse
+      switch_port: Gi2/19
+pastel-100:
+  network_interfaces:
+    eth0:
+      switch_name: gw-toulouse
+      switch_port: Gi2/20
+pastel-101:
+  network_interfaces:
+    eth0:
+      switch_name: gw-toulouse
+      switch_port: Gi2/30
+pastel-102:
+  network_interfaces:
+    eth0:
+      switch_name: gw-toulouse
+      switch_port: Gi2/31
+pastel-103:
+  network_interfaces:
+    eth0:
+      switch_name: gw-toulouse
+      switch_port: Gi2/32
+pastel-104:
+  network_interfaces:
+    eth0:
+      switch_name: gw-toulouse
+      switch_port: Gi2/33
+pastel-105:
+  network_interfaces:
+    eth0:
+      switch_name: gw-toulouse
+      switch_port: Gi2/34
+pastel-106:
+  network_interfaces:
+    eth0:
+      switch_name: gw-toulouse
+      switch_port: Gi2/35
+pastel-107:
+  network_interfaces:
+    eth0:
+      switch_name: gw-toulouse
+      switch_port: Gi2/36
+pastel-108:
+  network_interfaces:
+    eth0:
+      switch_name: gw-toulouse
+      switch_port: Gi2/37
+pastel-109:
+  network_interfaces:
+    eth0:
+      switch_name: gw-toulouse
+      switch_port: Gi2/38
+pastel-110:
+  network_interfaces:
+    eth0:
+      switch_name: gw-toulouse
+      switch_port: Gi2/39
+pastel-111:
+  network_interfaces:
+    eth0:
+      switch_name: gw-toulouse
+      switch_port: Gi2/40
+pastel-112:
+  network_interfaces:
+    eth0:
+      switch_name: gw-toulouse
+      switch_port: Gi2/41
+pastel-113:
+  network_interfaces:
+    eth0:
+      switch_name: gw-toulouse
+      switch_port: Gi2/42
+pastel-114:
+  network_interfaces:
+    eth0:
+      switch_name: gw-toulouse
+      switch_port: Gi2/43
+pastel-115:
+  network_interfaces:
+    eth0:
+      switch_name: gw-toulouse
+      switch_port: Gi2/44
+pastel-116:
+  network_interfaces:
+    eth0:
+      switch_name: gw-toulouse
+      switch_port: Gi2/45
+pastel-117:
+  network_interfaces:
+    eth0:
+      switch_name: gw-toulouse
+      switch_port: Gi2/46
+pastel-118:
+  network_interfaces:
+    eth0:
+      switch_name: gw-toulouse
+      switch_port: Gi2/47
+pastel-119:
+  network_interfaces:
+    eth0:
+      switch_name: gw-toulouse
+      switch_port: Gi2/48
+pastel-120:
+  network_interfaces:
+    eth0:
+      switch_name: gw-toulouse
+      switch_port: Gi3/1
+pastel-121:
+  network_interfaces:
+    eth0:
+      switch_name: gw-toulouse
+      switch_port: Gi2/21
+pastel-122:
+  network_interfaces:
+    eth0:
+      switch_name: gw-toulouse
+      switch_port: Gi2/22
+pastel-123:
+  network_interfaces:
+    eth0:
+      switch_name: gw-toulouse
+      switch_port: Gi2/23
+pastel-124:
+  network_interfaces:
+    eth0:
+      switch_name: gw-toulouse
+      switch_port: Gi2/24
+pastel-125:
+  network_interfaces:
+    eth0:
+      switch_name: gw-toulouse
+      switch_port: Gi2/25
+pastel-126:
+  network_interfaces:
+    eth0:
+      switch_name: gw-toulouse
+      switch_port: Gi2/26
+pastel-127:
+  network_interfaces:
+    eth0:
+      switch_name: gw-toulouse
+      switch_port: Gi2/27
+pastel-128:
+  network_interfaces:
+    eth0:
+      switch_name: gw-toulouse
+      switch_port: Gi2/28
+pastel-129:
+  network_interfaces:
+    eth0:
+      switch_name: gw-toulouse
+      switch_port: Gi2/29
+pastel-130:
+  network_interfaces:
+    eth0:
+      switch_name: gw-toulouse
+      switch_port: Gi3/2
+pastel-131:
+  network_interfaces:
+    eth0:
+      switch_name: gw-toulouse
+      switch_port: Gi3/3
+pastel-132:
+  network_interfaces:
+    eth0:
+      switch_name: gw-toulouse
+      switch_port: Gi3/4
+pastel-133:
+  network_interfaces:
+    eth0:
+      switch_name: gw-toulouse
+      switch_port: Gi3/5
+pastel-134:
+  network_interfaces:
+    eth0:
+      switch_name: gw-toulouse
+      switch_port: Gi3/6
+pastel-135:
+  network_interfaces:
+    eth0:
+      switch_name: gw-toulouse
+      switch_port: Gi3/7
+pastel-136:
+  network_interfaces:
+    eth0:
+      switch_name: gw-toulouse
+      switch_port: Gi3/8
+pastel-137:
+  network_interfaces:
+    eth0:
+      switch_name: gw-toulouse
+      switch_port: Gi3/9
+pastel-138:
+  network_interfaces:
+    eth0:
+      switch_name: gw-toulouse
+      switch_port: Gi3/10
+pastel-139:
+  network_interfaces:
+    eth0:
+      switch_name: gw-toulouse
+      switch_port: Gi3/11
+pastel-140:
+  network_interfaces:
+    eth0:
+      switch_name: gw-toulouse
+      switch_port: Gi3/12
-- 
GitLab