diff --git a/dev/input/grid5000/sites/nancy/clusters/graoully/graoully_pdu.yaml b/dev/input/grid5000/sites/nancy/clusters/graoully/graoully_pdu.yaml
index 15717d1ea764bafe75d8b26eb00bd8dbaccf9b7a..2df22ce0cd6f6c8249eb74ef2accaabd36c6bf13 100644
--- a/dev/input/grid5000/sites/nancy/clusters/graoully/graoully_pdu.yaml
+++ b/dev/input/grid5000/sites/nancy/clusters/graoully/graoully_pdu.yaml
@@ -5,66 +5,66 @@ nodes:
       wattmeter: true
   graoully-1:
     pdu:
-      pdu_name: graoully-pdu1
-      pdu_position: 11
+      uid: graoully-pdu1
+      port: 11
   graoully-2:
     pdu:
-      pdu_name: graoully-pdu2
-      pdu_position: 11
+      uid: graoully-pdu2
+      port: 11
   graoully-3:
     pdu:
-      pdu_name: graoully-pdu2
-      pdu_position: 12
+      uid: graoully-pdu2
+      port: 12
   graoully-4:
     pdu:
-      pdu_name: graoully-pdu1
-      pdu_position: 14
+      uid: graoully-pdu1
+      port: 14
   graoully-5:
     pdu:
-      pdu_name: graoully-pdu2
-      pdu_position: 13
+      uid: graoully-pdu2
+      port: 13
   graoully-6:
     pdu:
-      pdu_name: graoully-pdu1
-      pdu_position: 13
+      uid: graoully-pdu1
+      port: 13
   graoully-7:
     pdu:
-      pdu_name: graoully-pdu1
-      pdu_position: 10
+      uid: graoully-pdu1
+      port: 10
   graoully-8:
     pdu:
-      pdu_name: graoully-pdu2
-      pdu_position: 10
+      uid: graoully-pdu2
+      port: 10
   graoully-9:
     pdu:
-      pdu_name: graoully-pdu2
-      pdu_position: 14
+      uid: graoully-pdu2
+      port: 14
   graoully-10:
     pdu:
-      pdu_name: graoully-pdu1
-      pdu_position: 12
+      uid: graoully-pdu1
+      port: 12
   graoully-11:
     pdu:
-      pdu_name: graoully-pdu1
-      pdu_position: 20
+      uid: graoully-pdu1
+      port: 20
   graoully-12:
     pdu:
-      pdu_name: graoully-pdu1
-      pdu_position: 19
+      uid: graoully-pdu1
+      port: 19
   graoully-13:
     pdu:
-      pdu_name: graoully-pdu2
-      pdu_position: 19
+      uid: graoully-pdu2
+      port: 19
   graoully-14:
     pdu:
-      pdu_name: graoully-pdu2
-      pdu_position: 20
+      uid: graoully-pdu2
+      port: 20
   graoully-15:
     pdu:
-      pdu_name: graoully-pdu1
-      pdu_position: 21
+      uid: graoully-pdu1
+      port: 21
   graoully-16:
     pdu:
-      pdu_name: graoully-pdu2
-      pdu_position: 21
+      uid: graoully-pdu2
+      port: 21
   
diff --git a/dev/input/grid5000/sites/nancy/clusters/graphene/graphene_manual.yaml b/dev/input/grid5000/sites/nancy/clusters/graphene/graphene_manual.yaml
index 96144c9a785455145c2ce4c732dee78bbf357634..4dc95c4dffb062f1127fc7665bf5c905cc49cce3 100644
--- a/dev/input/grid5000/sites/nancy/clusters/graphene/graphene_manual.yaml
+++ b/dev/input/grid5000/sites/nancy/clusters/graphene/graphene_manual.yaml
@@ -19,8 +19,8 @@ nodes:
         switch: sgraphene1-ipmi
         switch_port: 1/0/25
     pdu:
-      pdu_name: graphene-pdu1
-      pdu_position: 2
+      uid: graphene-pdu1
+      port: 2
   graphene-2:
     network_adapters:
       eth0:
@@ -32,8 +32,8 @@ nodes:
         switch: sgraphene1-ipmi
         switch_port: 1/0/26
     pdu:
-      pdu_name: graphene-pdu1
-      pdu_position: 3
+      uid: graphene-pdu1
+      port: 3
   graphene-3:
     network_adapters:
       eth0:
@@ -45,8 +45,8 @@ nodes:
         switch: sgraphene1-ipmi
         switch_port: 1/0/27
     pdu:
-      pdu_name: graphene-pdu1
-      pdu_position: 4
+      uid: graphene-pdu1
+      port: 4
   graphene-4:
     network_adapters:
       eth0:
@@ -58,8 +58,8 @@ nodes:
         switch: sgraphene1-ipmi
         switch_port: 1/0/28
     pdu:
-      pdu_name: graphene-pdu1
-      pdu_position: 5
+      uid: graphene-pdu1
+      port: 5
   graphene-5:
     network_adapters:
       eth0:
@@ -71,8 +71,8 @@ nodes:
         switch: sgraphene1-ipmi
         switch_port: 1/0/29
     pdu:
-      pdu_name: graphene-pdu2
-      pdu_position: 1
+      uid: graphene-pdu2
+      port: 1
   graphene-6:
     network_adapters:
       eth0:
@@ -84,8 +84,8 @@ nodes:
         switch: sgraphene1-ipmi
         switch_port: 1/0/30
     pdu:
-      pdu_name: graphene-pdu2
-      pdu_position: 2
+      uid: graphene-pdu2
+      port: 2
   graphene-7:
     network_adapters:
       eth0:
@@ -97,8 +97,8 @@ nodes:
         switch: sgraphene1-ipmi
         switch_port: 1/0/31
     pdu:
-      pdu_name: graphene-pdu2
-      pdu_position: 3
+      uid: graphene-pdu2
+      port: 3
   graphene-8:
     network_adapters:
       eth0:
@@ -110,8 +110,8 @@ nodes:
         switch: sgraphene1-ipmi
         switch_port: 1/0/32
     pdu:
-      pdu_name: graphene-pdu2
-      pdu_position: 4
+      uid: graphene-pdu2
+      port: 4
   graphene-9:
     network_adapters:
       eth0:
@@ -123,8 +123,8 @@ nodes:
         switch: sgraphene1-ipmi
         switch_port: 1/0/33
     pdu:
-      pdu_name: graphene-pdu2
-      pdu_position: 5
+      uid: graphene-pdu2
+      port: 5
   graphene-10:
     network_adapters:
       eth0:
@@ -136,8 +136,8 @@ nodes:
         switch: sgraphene1-ipmi
         switch_port: 1/0/34
     pdu:
-      pdu_name: graphene-pdu2
-      pdu_position: 6
+      uid: graphene-pdu2
+      port: 6
   graphene-11:
     network_adapters:
       eth0:
@@ -149,8 +149,8 @@ nodes:
         switch: sgraphene1-ipmi
         switch_port: 1/0/35
     pdu:
-      pdu_name: graphene-pdu2
-      pdu_position: 7
+      uid: graphene-pdu2
+      port: 7
   graphene-12:
     network_adapters:
       eth0:
@@ -162,8 +162,8 @@ nodes:
         switch: sgraphene1-ipmi
         switch_port: 1/0/36
     pdu:
-      pdu_name: graphene-pdu1
-      pdu_position: 9
+      uid: graphene-pdu1
+      port: 9
   graphene-13:
     network_adapters:
       eth0:
@@ -175,8 +175,8 @@ nodes:
         switch: sgraphene1-ipmi
         switch_port: 1/0/37
     pdu:
-      pdu_name: graphene-pdu1
-      pdu_position: 10
+      uid: graphene-pdu1
+      port: 10
   graphene-14:
     network_adapters:
       eth0:
@@ -188,8 +188,8 @@ nodes:
         switch: sgraphene1-ipmi
         switch_port: 1/0/38
     pdu:
-      pdu_name: graphene-pdu1
-      pdu_position: 11
+      uid: graphene-pdu1
+      port: 11
   graphene-15:
     network_adapters:
       eth0:
@@ -201,8 +201,8 @@ nodes:
         switch: sgraphene1-ipmi
         switch_port: 1/0/39
     pdu:
-      pdu_name: graphene-pdu1
-      pdu_position: 12
+      uid: graphene-pdu1
+      port: 12
   graphene-16:
     network_adapters:
       eth0:
@@ -214,8 +214,8 @@ nodes:
         switch: sgraphene1-ipmi
         switch_port: 1/0/40
     pdu:
-      pdu_name: graphene-pdu1
-      pdu_position: 13
+      uid: graphene-pdu1
+      port: 13
   graphene-17:
     network_adapters:
       eth0:
@@ -227,8 +227,8 @@ nodes:
         switch: sgraphene1-ipmi
         switch_port: 1/0/41
     pdu:
-      pdu_name: graphene-pdu1
-      pdu_position: 14
+      uid: graphene-pdu1
+      port: 14
   graphene-18:
     network_adapters:
       eth0:
@@ -240,8 +240,8 @@ nodes:
         switch: sgraphene1-ipmi
         switch_port: 1/0/42
     pdu:
-      pdu_name: graphene-pdu1
-      pdu_position: 15
+      uid: graphene-pdu1
+      port: 15
   graphene-19:
     network_adapters:
       eth0:
@@ -253,8 +253,8 @@ nodes:
         switch: sgraphene1-ipmi
         switch_port: 1/0/43
     pdu:
-      pdu_name: graphene-pdu2
-      pdu_position: 9
+      uid: graphene-pdu2
+      port: 9
   graphene-20:
     network_adapters:
       eth0:
@@ -266,8 +266,8 @@ nodes:
         switch: sgraphene1-ipmi
         switch_port: 1/0/44
     pdu:
-      pdu_name: graphene-pdu2
-      pdu_position: 10
+      uid: graphene-pdu2
+      port: 10
   graphene-21:
     network_adapters:
       eth0:
@@ -279,8 +279,8 @@ nodes:
         switch: sgraphene1-ipmi
         switch_port: 1/0/1
     pdu:
-      pdu_name: graphene-pdu2
-      pdu_position: 11
+      uid: graphene-pdu2
+      port: 11
   graphene-22:
     network_adapters:
       eth0:
@@ -292,8 +292,8 @@ nodes:
         switch: sgraphene1-ipmi
         switch_port: 1/0/2
     pdu:
-      pdu_name: graphene-pdu2
-      pdu_position: 12
+      uid: graphene-pdu2
+      port: 12
   graphene-23:
     network_adapters:
       eth0:
@@ -305,8 +305,8 @@ nodes:
         switch: sgraphene1-ipmi
         switch_port: 1/0/3
     pdu:
-      pdu_name: graphene-pdu2
-      pdu_position: 13
+      uid: graphene-pdu2
+      port: 13
   graphene-24:
     network_adapters:
       eth0:
@@ -318,8 +318,8 @@ nodes:
         switch: sgraphene1-ipmi
         switch_port: 1/0/4
     pdu:
-      pdu_name: graphene-pdu2
-      pdu_position: 14
+      uid: graphene-pdu2
+      port: 14
   graphene-25:
     network_adapters:
       eth0:
@@ -331,8 +331,8 @@ nodes:
         switch: sgraphene1-ipmi
         switch_port: 1/0/5
     pdu:
-      pdu_name: graphene-pdu2
-      pdu_position: 15
+      uid: graphene-pdu2
+      port: 15
   graphene-26:
     network_adapters:
       eth0:
@@ -344,8 +344,8 @@ nodes:
         switch: sgraphene1-ipmi
         switch_port: 1/0/6
     pdu:
-      pdu_name: graphene-pdu1
-      pdu_position: 17
+      uid: graphene-pdu1
+      port: 17
   graphene-27:
     network_adapters:
       eth0:
@@ -357,8 +357,8 @@ nodes:
         switch: sgraphene1-ipmi
         switch_port: 1/0/7
     pdu:
-      pdu_name: graphene-pdu1
-      pdu_position: 18
+      uid: graphene-pdu1
+      port: 18
   graphene-28:
     network_adapters:
       eth0:
@@ -370,8 +370,8 @@ nodes:
         switch: sgraphene1-ipmi
         switch_port: 1/0/8
     pdu:
-      pdu_name: graphene-pdu1
-      pdu_position: 19
+      uid: graphene-pdu1
+      port: 19
   graphene-29:
     network_adapters:
       eth0:
@@ -383,8 +383,8 @@ nodes:
         switch: sgraphene1-ipmi
         switch_port: 1/0/9
     pdu:
-      pdu_name: graphene-pdu1
-      pdu_position: 20
+      uid: graphene-pdu1
+      port: 20
   graphene-30:
     network_adapters:
       eth0:
@@ -396,8 +396,8 @@ nodes:
         switch: sgraphene1-ipmi
         switch_port: 1/0/10
     pdu:
-      pdu_name: graphene-pdu1
-      pdu_position: 21
+      uid: graphene-pdu1
+      port: 21
   graphene-31:
     network_adapters:
       eth0:
@@ -409,8 +409,8 @@ nodes:
         switch: sgraphene1-ipmi
         switch_port: 1/0/11
     pdu:
-      pdu_name: graphene-pdu1
-      pdu_position: 22
+      uid: graphene-pdu1
+      port: 22
   graphene-32:
     network_adapters:
       eth0:
@@ -422,8 +422,8 @@ nodes:
         switch: sgraphene1-ipmi
         switch_port: 1/0/12
     pdu:
-      pdu_name: graphene-pdu1
-      pdu_position: 23
+      uid: graphene-pdu1
+      port: 23
   graphene-33:
     network_adapters:
       eth0:
@@ -435,8 +435,8 @@ nodes:
         switch: sgraphene1-ipmi
         switch_port: 1/0/13
     pdu:
-      pdu_name: graphene-pdu2
-      pdu_position: 17
+      uid: graphene-pdu2
+      port: 17
   graphene-34:
     network_adapters:
       eth0:
@@ -448,8 +448,8 @@ nodes:
         switch: sgraphene1-ipmi
         switch_port: 1/0/14
     pdu:
-      pdu_name: graphene-pdu2
-      pdu_position: 18
+      uid: graphene-pdu2
+      port: 18
   graphene-35:
     network_adapters:
       eth0:
@@ -461,8 +461,8 @@ nodes:
         switch: sgraphene1-ipmi
         switch_port: 1/0/15
     pdu:
-      pdu_name: graphene-pdu2
-      pdu_position: 19
+      uid: graphene-pdu2
+      port: 19
   graphene-36:
     network_adapters:
       eth0:
@@ -474,8 +474,8 @@ nodes:
         switch: sgraphene1-ipmi
         switch_port: 1/0/16
     pdu:
-      pdu_name: graphene-pdu2
-      pdu_position: 20
+      uid: graphene-pdu2
+      port: 20
   graphene-37:
     network_adapters:
       eth0:
@@ -487,8 +487,8 @@ nodes:
         switch: sgraphene1-ipmi
         switch_port: 1/0/17
     pdu:
-      pdu_name: graphene-pdu2
-      pdu_position: 21
+      uid: graphene-pdu2
+      port: 21
   graphene-38:
     network_adapters:
       eth0:
@@ -500,8 +500,8 @@ nodes:
         switch: sgraphene1-ipmi
         switch_port: 1/0/18
     pdu:
-      pdu_name: graphene-pdu2
-      pdu_position: 22
+      uid: graphene-pdu2
+      port: 22
   graphene-39:
     network_adapters:
       eth0:
@@ -513,8 +513,8 @@ nodes:
         switch: sgraphene1-ipmi
         switch_port: 1/0/19
     pdu:
-      pdu_name: graphene-pdu2
-      pdu_position: 23
+      uid: graphene-pdu2
+      port: 23
   graphene-40:
     network_adapters:
       eth0:
@@ -526,8 +526,8 @@ nodes:
         switch: sgraphene2-ipmi
         switch_port: 1/0/25
     pdu:
-      pdu_name: graphene-pdu3
-      pdu_position: 3
+      uid: graphene-pdu3
+      port: 3
   graphene-41:
     network_adapters:
       eth0:
@@ -539,8 +539,8 @@ nodes:
         switch: sgraphene2-ipmi
         switch_port: 1/0/26
     pdu:
-      pdu_name: graphene-pdu3
-      pdu_position: 4
+      uid: graphene-pdu3
+      port: 4
   graphene-42:
     network_adapters:
       eth0:
@@ -552,8 +552,8 @@ nodes:
         switch: sgraphene2-ipmi
         switch_port: 1/0/27
     pdu:
-      pdu_name: graphene-pdu3
-      pdu_position: 5
+      uid: graphene-pdu3
+      port: 5
   graphene-43:
     network_adapters:
       eth0:
@@ -565,8 +565,8 @@ nodes:
         switch: sgraphene2-ipmi
         switch_port: 1/0/28
     pdu:
-      pdu_name: graphene-pdu4
-      pdu_position: 1
+      uid: graphene-pdu4
+      port: 1
   graphene-44:
     network_adapters:
       eth0:
@@ -578,8 +578,8 @@ nodes:
         switch: sgraphene2-ipmi
         switch_port: 1/0/29
     pdu:
-      pdu_name: graphene-pdu4
-      pdu_position: 2
+      uid: graphene-pdu4
+      port: 2
   graphene-45:
     network_adapters:
       eth0:
@@ -591,8 +591,8 @@ nodes:
         switch: sgraphene2-ipmi
         switch_port: 1/0/30
     pdu:
-      pdu_name: graphene-pdu4
-      pdu_position: 3
+      uid: graphene-pdu4
+      port: 3
   graphene-46:
     network_adapters:
       eth0:
@@ -604,8 +604,8 @@ nodes:
         switch: sgraphene2-ipmi
         switch_port: 1/0/31
     pdu:
-      pdu_name: graphene-pdu4
-      pdu_position: 4
+      uid: graphene-pdu4
+      port: 4
   graphene-47:
     network_adapters:
       eth0:
@@ -617,8 +617,8 @@ nodes:
         switch: sgraphene2-ipmi
         switch_port: 1/0/32
     pdu:
-      pdu_name: graphene-pdu3
-      pdu_position: 9
+      uid: graphene-pdu3
+      port: 9
   graphene-48:
     network_adapters:
       eth0:
@@ -630,8 +630,8 @@ nodes:
         switch: sgraphene2-ipmi
         switch_port: 1/0/33
     pdu:
-      pdu_name: graphene-pdu3
-      pdu_position: 10
+      uid: graphene-pdu3
+      port: 10
   graphene-49:
     network_adapters:
       eth0:
@@ -643,8 +643,8 @@ nodes:
         switch: sgraphene2-ipmi
         switch_port: 1/0/34
     pdu:
-      pdu_name: graphene-pdu3
-      pdu_position: 11
+      uid: graphene-pdu3
+      port: 11
   graphene-50:
     network_adapters:
       eth0:
@@ -656,8 +656,8 @@ nodes:
         switch: sgraphene2-ipmi
         switch_port: 1/0/35
     pdu:
-      pdu_name: graphene-pdu3
-      pdu_position: 12
+      uid: graphene-pdu3
+      port: 12
   graphene-51:
     network_adapters:
       eth0:
@@ -669,8 +669,8 @@ nodes:
         switch: sgraphene2-ipmi
         switch_port: 1/0/36
     pdu:
-      pdu_name: graphene-pdu3
-      pdu_position: 13
+      uid: graphene-pdu3
+      port: 13
   graphene-52:
     network_adapters:
       eth0:
@@ -682,8 +682,8 @@ nodes:
         switch: sgraphene2-ipmi
         switch_port: 1/0/37
     pdu:
-      pdu_name: graphene-pdu3
-      pdu_position: 14
+      uid: graphene-pdu3
+      port: 14
   graphene-53:
     network_adapters:
       eth0:
@@ -695,8 +695,8 @@ nodes:
         switch: sgraphene2-ipmi
         switch_port: 1/0/38
     pdu:
-      pdu_name: graphene-pdu3
-      pdu_position: 15
+      uid: graphene-pdu3
+      port: 15
   graphene-54:
     network_adapters:
       eth0:
@@ -708,8 +708,8 @@ nodes:
         switch: sgraphene2-ipmi
         switch_port: 1/0/39
     pdu:
-      pdu_name: graphene-pdu4
-      pdu_position: 5
+      uid: graphene-pdu4
+      port: 5
   graphene-55:
     network_adapters:
       eth0:
@@ -721,8 +721,8 @@ nodes:
         switch: sgraphene2-ipmi
         switch_port: 1/0/40
     pdu:
-      pdu_name: graphene-pdu4
-      pdu_position: 6
+      uid: graphene-pdu4
+      port: 6
   graphene-56:
     network_adapters:
       eth0:
@@ -734,8 +734,8 @@ nodes:
         switch: sgraphene2-ipmi
         switch_port: 1/0/1
     pdu:
-      pdu_name: graphene-pdu4
-      pdu_position: 11
+      uid: graphene-pdu4
+      port: 11
   graphene-57:
     network_adapters:
       eth0:
@@ -747,8 +747,8 @@ nodes:
         switch: sgraphene2-ipmi
         switch_port: 1/0/2
     pdu:
-      pdu_name: graphene-pdu4
-      pdu_position: 12
+      uid: graphene-pdu4
+      port: 12
   graphene-58:
     network_adapters:
       eth0:
@@ -760,8 +760,8 @@ nodes:
         switch: sgraphene2-ipmi
         switch_port: 1/0/3
     pdu:
-      pdu_name: graphene-pdu4
-      pdu_position: 13
+      uid: graphene-pdu4
+      port: 13
   graphene-59:
     network_adapters:
       eth0:
@@ -773,8 +773,8 @@ nodes:
         switch: sgraphene2-ipmi
         switch_port: 1/0/4
     pdu:
-      pdu_name: graphene-pdu4
-      pdu_position: 14
+      uid: graphene-pdu4
+      port: 14
   graphene-60:
     network_adapters:
       eth0:
@@ -786,8 +786,8 @@ nodes:
         switch: sgraphene2-ipmi
         switch_port: 1/0/5
     pdu:
-      pdu_name: graphene-pdu4
-      pdu_position: 15
+      uid: graphene-pdu4
+      port: 15
   graphene-61:
     network_adapters:
       eth0:
@@ -799,8 +799,8 @@ nodes:
         switch: sgraphene2-ipmi
         switch_port: 1/0/6
     pdu:
-      pdu_name: graphene-pdu3
-      pdu_position: 17
+      uid: graphene-pdu3
+      port: 17
   graphene-62:
     network_adapters:
       eth0:
@@ -812,8 +812,8 @@ nodes:
         switch: sgraphene2-ipmi
         switch_port: 1/0/7
     pdu:
-      pdu_name: graphene-pdu3
-      pdu_position: 18
+      uid: graphene-pdu3
+      port: 18
   graphene-63:
     network_adapters:
       eth0:
@@ -825,8 +825,8 @@ nodes:
         switch: sgraphene2-ipmi
         switch_port: 1/0/8
     pdu:
-      pdu_name: graphene-pdu3
-      pdu_position: 19
+      uid: graphene-pdu3
+      port: 19
   graphene-64:
     network_adapters:
       eth0:
@@ -838,8 +838,8 @@ nodes:
         switch: sgraphene2-ipmi
         switch_port: 1/0/9
     pdu:
-      pdu_name: graphene-pdu3
-      pdu_position: 20
+      uid: graphene-pdu3
+      port: 20
   graphene-65:
     network_adapters:
       eth0:
@@ -851,8 +851,8 @@ nodes:
         switch: sgraphene2-ipmi
         switch_port: 1/0/10
     pdu:
-      pdu_name: graphene-pdu3
-      pdu_position: 21
+      uid: graphene-pdu3
+      port: 21
   graphene-66:
     network_adapters:
       eth0:
@@ -864,8 +864,8 @@ nodes:
         switch: sgraphene2-ipmi
         switch_port: 1/0/11
     pdu:
-      pdu_name: graphene-pdu3
-      pdu_position: 22
+      uid: graphene-pdu3
+      port: 22
   graphene-67:
     network_adapters:
       eth0:
@@ -877,8 +877,8 @@ nodes:
         switch: sgraphene2-ipmi
         switch_port: 1/0/12
     pdu:
-      pdu_name: graphene-pdu3
-      pdu_position: 23
+      uid: graphene-pdu3
+      port: 23
   graphene-68:
     network_adapters:
       eth0:
@@ -890,8 +890,8 @@ nodes:
         switch: sgraphene2-ipmi
         switch_port: 1/0/13
     pdu:
-      pdu_name: graphene-pdu4
-      pdu_position: 17
+      uid: graphene-pdu4
+      port: 17
   graphene-69:
     network_adapters:
       eth0:
@@ -903,8 +903,8 @@ nodes:
         switch: sgraphene2-ipmi
         switch_port: 1/0/14
     pdu:
-      pdu_name: graphene-pdu4
-      pdu_position: 18
+      uid: graphene-pdu4
+      port: 18
   graphene-70:
     network_adapters:
       eth0:
@@ -916,8 +916,8 @@ nodes:
         switch: sgraphene2-ipmi
         switch_port: 1/0/15
     pdu:
-      pdu_name: graphene-pdu4
-      pdu_position: 19
+      uid: graphene-pdu4
+      port: 19
   graphene-71:
     network_adapters:
       eth0:
@@ -929,8 +929,8 @@ nodes:
         switch: sgraphene2-ipmi
         switch_port: 1/0/16
     pdu:
-      pdu_name: graphene-pdu4
-      pdu_position: 20
+      uid: graphene-pdu4
+      port: 20
   graphene-72:
     network_adapters:
       eth0:
@@ -942,8 +942,8 @@ nodes:
         switch: sgraphene2-ipmi
         switch_port: 1/0/17
     pdu:
-      pdu_name: graphene-pdu4
-      pdu_position: 21
+      uid: graphene-pdu4
+      port: 21
   graphene-73:
     network_adapters:
       eth0:
@@ -955,8 +955,8 @@ nodes:
         switch: sgraphene2-ipmi
         switch_port: 1/0/18
     pdu:
-      pdu_name: graphene-pdu4
-      pdu_position: 22
+      uid: graphene-pdu4
+      port: 22
   graphene-74:
     network_adapters:
       eth0:
@@ -968,8 +968,8 @@ nodes:
         switch: sgraphene2-ipmi
         switch_port: 1/0/19
     pdu:
-      pdu_name: graphene-pdu4
-      pdu_position: 23
+      uid: graphene-pdu4
+      port: 23
   graphene-75:
     network_adapters:
       eth0:
@@ -981,8 +981,8 @@ nodes:
         switch: sgraphene3-ipmi
         switch_port: 1/0/25
     pdu:
-      pdu_name: graphene-pdu6
-      pdu_position: 6
+      uid: graphene-pdu6
+      port: 6
   graphene-76:
     network_adapters:
       eth0:
@@ -994,8 +994,8 @@ nodes:
         switch: sgraphene3-ipmi
         switch_port: 1/0/26
     pdu:
-      pdu_name: graphene-pdu6
-      pdu_position: 7
+      uid: graphene-pdu6
+      port: 7
   graphene-77:
     network_adapters:
       eth0:
@@ -1007,8 +1007,8 @@ nodes:
         switch: sgraphene3-ipmi
         switch_port: 1/0/27
     pdu:
-      pdu_name: graphene-pdu5
-      pdu_position: 9
+      uid: graphene-pdu5
+      port: 9
   graphene-78:
     network_adapters:
       eth0:
@@ -1020,8 +1020,8 @@ nodes:
         switch: sgraphene3-ipmi
         switch_port: 1/0/28
     pdu:
-      pdu_name: graphene-pdu5
-      pdu_position: 10
+      uid: graphene-pdu5
+      port: 10
   graphene-79:
     network_adapters:
       eth0:
@@ -1033,8 +1033,8 @@ nodes:
         switch: sgraphene3-ipmi
         switch_port: 1/0/29
     pdu:
-      pdu_name: graphene-pdu5
-      pdu_position: 11
+      uid: graphene-pdu5
+      port: 11
   graphene-80:
     network_adapters:
       eth0:
@@ -1046,8 +1046,8 @@ nodes:
         switch: sgraphene3-ipmi
         switch_port: 1/0/30
     pdu:
-      pdu_name: graphene-pdu5
-      pdu_position: 12
+      uid: graphene-pdu5
+      port: 12
   graphene-81:
     network_adapters:
       eth0:
@@ -1059,8 +1059,8 @@ nodes:
         switch: sgraphene3-ipmi
         switch_port: 1/0/31
     pdu:
-      pdu_name: graphene-pdu5
-      pdu_position: 13
+      uid: graphene-pdu5
+      port: 13
   graphene-82:
     network_adapters:
       eth0:
@@ -1072,8 +1072,8 @@ nodes:
         switch: sgraphene3-ipmi
         switch_port: 1/0/32
     pdu:
-      pdu_name: graphene-pdu5
-      pdu_position: 14
+      uid: graphene-pdu5
+      port: 14
   graphene-83:
     network_adapters:
       eth0:
@@ -1085,8 +1085,8 @@ nodes:
         switch: sgraphene3-ipmi
         switch_port: 1/0/33
     pdu:
-      pdu_name: graphene-pdu5
-      pdu_position: 15
+      uid: graphene-pdu5
+      port: 15
   graphene-84:
     network_adapters:
       eth0:
@@ -1098,8 +1098,8 @@ nodes:
         switch: sgraphene3-ipmi
         switch_port: 1/0/34
     pdu:
-      pdu_name: graphene-pdu6
-      pdu_position: 9
+      uid: graphene-pdu6
+      port: 9
   graphene-85:
     network_adapters:
       eth0:
@@ -1111,8 +1111,8 @@ nodes:
         switch: sgraphene3-ipmi
         switch_port: 1/0/1
     pdu:
-      pdu_name: graphene-pdu6
-      pdu_position: 10
+      uid: graphene-pdu6
+      port: 10
   graphene-86:
     network_adapters:
       eth0:
@@ -1124,8 +1124,8 @@ nodes:
         switch: sgraphene3-ipmi
         switch_port: 1/0/2
     pdu:
-      pdu_name: graphene-pdu6
-      pdu_position: 11
+      uid: graphene-pdu6
+      port: 11
   graphene-87:
     network_adapters:
       eth0:
@@ -1137,8 +1137,8 @@ nodes:
         switch: sgraphene3-ipmi
         switch_port: 1/0/3
     pdu:
-      pdu_name: graphene-pdu6
-      pdu_position: 12
+      uid: graphene-pdu6
+      port: 12
   graphene-88:
     network_adapters:
       eth0:
@@ -1150,8 +1150,8 @@ nodes:
         switch: sgraphene3-ipmi
         switch_port: 1/0/4
     pdu:
-      pdu_name: graphene-pdu6
-      pdu_position: 13
+      uid: graphene-pdu6
+      port: 13
   graphene-89:
     network_adapters:
       eth0:
@@ -1163,8 +1163,8 @@ nodes:
         switch: sgraphene3-ipmi
         switch_port: 1/0/5
     pdu:
-      pdu_name: graphene-pdu6
-      pdu_position: 14
+      uid: graphene-pdu6
+      port: 14
   graphene-90:
     network_adapters:
       eth0:
@@ -1176,8 +1176,8 @@ nodes:
         switch: sgraphene3-ipmi
         switch_port: 1/0/6
     pdu:
-      pdu_name: graphene-pdu6
-      pdu_position: 15
+      uid: graphene-pdu6
+      port: 15
   graphene-91:
     network_adapters:
       eth0:
@@ -1189,8 +1189,8 @@ nodes:
         switch: sgraphene3-ipmi
         switch_port: 1/0/7
     pdu:
-      pdu_name: graphene-pdu5
-      pdu_position: 17
+      uid: graphene-pdu5
+      port: 17
   graphene-92:
     network_adapters:
       eth0:
@@ -1202,8 +1202,8 @@ nodes:
         switch: sgraphene3-ipmi
         switch_port: 1/0/8
     pdu:
-      pdu_name: graphene-pdu5
-      pdu_position: 18
+      uid: graphene-pdu5
+      port: 18
   graphene-93:
     network_adapters:
       eth0:
@@ -1215,8 +1215,8 @@ nodes:
         switch: sgraphene3-ipmi
         switch_port: 1/0/9
     pdu:
-      pdu_name: graphene-pdu5
-      pdu_position: 19
+      uid: graphene-pdu5
+      port: 19
   graphene-94:
     network_adapters:
       eth0:
@@ -1228,8 +1228,8 @@ nodes:
         switch: sgraphene3-ipmi
         switch_port: 1/0/10
     pdu:
-      pdu_name: graphene-pdu5
-      pdu_position: 20
+      uid: graphene-pdu5
+      port: 20
   graphene-95:
     network_adapters:
       eth0:
@@ -1241,8 +1241,8 @@ nodes:
         switch: sgraphene3-ipmi
         switch_port: 1/0/11
     pdu:
-      pdu_name: graphene-pdu5
-      pdu_position: 21
+      uid: graphene-pdu5
+      port: 21
   graphene-96:
     network_adapters:
       eth0:
@@ -1254,8 +1254,8 @@ nodes:
         switch: sgraphene3-ipmi
         switch_port: 1/0/12
     pdu:
-      pdu_name: graphene-pdu5
-      pdu_position: 22
+      uid: graphene-pdu5
+      port: 22
   graphene-97:
     network_adapters:
       eth0:
@@ -1267,8 +1267,8 @@ nodes:
         switch: sgraphene3-ipmi
         switch_port: 1/0/13
     pdu:
-      pdu_name: graphene-pdu5
-      pdu_position: 23
+      uid: graphene-pdu5
+      port: 23
   graphene-98:
     network_adapters:
       eth0:
@@ -1280,8 +1280,8 @@ nodes:
         switch: sgraphene3-ipmi
         switch_port: 1/0/14
     pdu:
-      pdu_name: graphene-pdu6
-      pdu_position: 17
+      uid: graphene-pdu6
+      port: 17
   graphene-99:
     network_adapters:
       eth0:
@@ -1293,8 +1293,8 @@ nodes:
         switch: sgraphene3-ipmi
         switch_port: 1/0/15
     pdu:
-      pdu_name: graphene-pdu6
-      pdu_position: 18
+      uid: graphene-pdu6
+      port: 18
   graphene-100:
     network_adapters:
       eth0:
@@ -1306,8 +1306,8 @@ nodes:
         switch: sgraphene3-ipmi
         switch_port: 1/0/16
     pdu:
-      pdu_name: graphene-pdu6
-      pdu_position: 19
+      uid: graphene-pdu6
+      port: 19
   graphene-101:
     network_adapters:
       eth0:
@@ -1319,8 +1319,8 @@ nodes:
         switch: sgraphene3-ipmi
         switch_port: 1/0/17
     pdu:
-      pdu_name: graphene-pdu6
-      pdu_position: 20
+      uid: graphene-pdu6
+      port: 20
   graphene-102:
     network_adapters:
       eth0:
@@ -1332,8 +1332,8 @@ nodes:
         switch: sgraphene3-ipmi
         switch_port: 1/0/18
     pdu:
-      pdu_name: graphene-pdu6
-      pdu_position: 21
+      uid: graphene-pdu6
+      port: 21
   graphene-103:
     network_adapters:
       eth0:
@@ -1345,8 +1345,8 @@ nodes:
         switch: sgraphene3-ipmi
         switch_port: 1/0/19
     pdu:
-      pdu_name: graphene-pdu6
-      pdu_position: 22
+      uid: graphene-pdu6
+      port: 22
   graphene-104:
     network_adapters:
       eth0:
@@ -1358,8 +1358,8 @@ nodes:
         switch: sgraphene3-ipmi
         switch_port: 1/0/20
     pdu:
-      pdu_name: graphene-pdu6
-      pdu_position: 23
+      uid: graphene-pdu6
+      port: 23
   graphene-105:
     network_adapters:
       eth0:
@@ -1371,8 +1371,8 @@ nodes:
         switch: sgraphene4-ipmi
         switch_port: 1/0/25
     pdu:
-      pdu_name: graphene-pdu7
-      pdu_position: 1
+      uid: graphene-pdu7
+      port: 1
   graphene-106:
     network_adapters:
       eth0:
@@ -1384,8 +1384,8 @@ nodes:
         switch: sgraphene4-ipmi
         switch_port: 1/0/26
     pdu:
-      pdu_name: graphene-pdu7
-      pdu_position: 2
+      uid: graphene-pdu7
+      port: 2
   graphene-107:
     network_adapters:
       eth0:
@@ -1397,8 +1397,8 @@ nodes:
         switch: sgraphene4-ipmi
         switch_port: 1/0/27
     pdu:
-      pdu_name: graphene-pdu7
-      pdu_position: 3
+      uid: graphene-pdu7
+      port: 3
   graphene-108:
     network_adapters:
       eth0:
@@ -1410,8 +1410,8 @@ nodes:
         switch: sgraphene4-ipmi
         switch_port: 1/0/28
     pdu:
-      pdu_name: graphene-pdu7
-      pdu_position: 4
+      uid: graphene-pdu7
+      port: 4
   graphene-109:
     network_adapters:
       eth0:
@@ -1423,8 +1423,8 @@ nodes:
         switch: sgraphene4-ipmi
         switch_port: 1/0/29
     pdu:
-      pdu_name: graphene-pdu7
-      pdu_position: 5
+      uid: graphene-pdu7
+      port: 5
   graphene-110:
     network_adapters:
       eth0:
@@ -1436,8 +1436,8 @@ nodes:
         switch: sgraphene4-ipmi
         switch_port: 1/0/30
     pdu:
-      pdu_name: graphene-pdu7
-      pdu_position: 6
+      uid: graphene-pdu7
+      port: 6
   graphene-111:
     network_adapters:
       eth0:
@@ -1449,8 +1449,8 @@ nodes:
         switch: sgraphene4-ipmi
         switch_port: 1/0/31
     pdu:
-      pdu_name: graphene-pdu7
-      pdu_position: 7
+      uid: graphene-pdu7
+      port: 7
   graphene-112:
     network_adapters:
       eth0:
@@ -1462,8 +1462,8 @@ nodes:
         switch: sgraphene4-ipmi
         switch_port: 1/0/32
     pdu:
-      pdu_name: graphene-pdu7
-      pdu_position: 8
+      uid: graphene-pdu7
+      port: 8
   graphene-113:
     network_adapters:
       eth0:
@@ -1475,8 +1475,8 @@ nodes:
         switch: sgraphene4-ipmi
         switch_port: 1/0/33
     pdu:
-      pdu_name: graphene-pdu7
-      pdu_position: 11
+      uid: graphene-pdu7
+      port: 11
   graphene-114:
     network_adapters:
       eth0:
@@ -1488,8 +1488,8 @@ nodes:
         switch: sgraphene4-ipmi
         switch_port: 1/0/34
     pdu:
-      pdu_name: graphene-pdu7
-      pdu_position: 12
+      uid: graphene-pdu7
+      port: 12
   graphene-115:
     network_adapters:
       eth0:
@@ -1501,8 +1501,8 @@ nodes:
         switch: sgraphene4-ipmi
         switch_port: 1/0/35
     pdu:
-      pdu_name: graphene-pdu7
-      pdu_position: 13
+      uid: graphene-pdu7
+      port: 13
   graphene-116:
     network_adapters:
       eth0:
@@ -1514,8 +1514,8 @@ nodes:
         switch: sgraphene4-ipmi
         switch_port: 1/0/36
     pdu:
-      pdu_name: graphene-pdu7
-      pdu_position: 14
+      uid: graphene-pdu7
+      port: 14
   graphene-117:
     network_adapters:
       eth0:
@@ -1527,8 +1527,8 @@ nodes:
         switch: sgraphene4-ipmi
         switch_port: 1/0/37
     pdu:
-      pdu_name: graphene-pdu7
-      pdu_position: 17
+      uid: graphene-pdu7
+      port: 17
   graphene-118:
     network_adapters:
       eth0:
@@ -1540,8 +1540,8 @@ nodes:
         switch: sgraphene4-ipmi
         switch_port: 1/0/38
     pdu:
-      pdu_name: graphene-pdu7
-      pdu_position: 18
+      uid: graphene-pdu7
+      port: 18
   graphene-119:
     network_adapters:
       eth0:
@@ -1553,8 +1553,8 @@ nodes:
         switch: sgraphene4-ipmi
         switch_port: 1/0/39
     pdu:
-      pdu_name: graphene-pdu7
-      pdu_position: 19
+      uid: graphene-pdu7
+      port: 19
   graphene-120:
     network_adapters:
       eth0:
@@ -1566,8 +1566,8 @@ nodes:
         switch: sgraphene4-ipmi
         switch_port: 1/0/40
     pdu:
-      pdu_name: graphene-pdu7
-      pdu_position: 20
+      uid: graphene-pdu7
+      port: 20
   graphene-121:
     network_adapters:
       eth0:
@@ -1579,8 +1579,8 @@ nodes:
         switch: sgraphene4-ipmi
         switch_port: 1/0/41
     pdu:
-      pdu_name: graphene-pdu7
-      pdu_position: 21
+      uid: graphene-pdu7
+      port: 21
   graphene-122:
     network_adapters:
       eth0:
@@ -1592,8 +1592,8 @@ nodes:
         switch: sgraphene4-ipmi
         switch_port: 1/0/42
     pdu:
-      pdu_name: graphene-pdu7
-      pdu_position: 22
+      uid: graphene-pdu7
+      port: 22
   graphene-123:
     network_adapters:
       eth0:
@@ -1605,8 +1605,8 @@ nodes:
         switch: sgraphene4-ipmi
         switch_port: 1/0/43
     pdu:
-      pdu_name: graphene-pdu7
-      pdu_position: 23
+      uid: graphene-pdu7
+      port: 23
   graphene-124:
     network_adapters:
       eth0:
@@ -1618,8 +1618,8 @@ nodes:
         switch: sgraphene4-ipmi
         switch_port: 1/0/44
     pdu:
-      pdu_name: graphene-pdu7
-      pdu_position: 24
+      uid: graphene-pdu7
+      port: 24
   graphene-125:
     network_adapters:
       eth0:
@@ -1631,8 +1631,8 @@ nodes:
         switch: sgraphene4-ipmi
         switch_port: 1/0/1
     pdu:
-      pdu_name: graphene-pdu8
-      pdu_position: 1
+      uid: graphene-pdu8
+      port: 1
   graphene-126:
     network_adapters:
       eth0:
@@ -1644,8 +1644,8 @@ nodes:
         switch: sgraphene4-ipmi
         switch_port: 1/0/2
     pdu:
-      pdu_name: graphene-pdu8
-      pdu_position: 2
+      uid: graphene-pdu8
+      port: 2
   graphene-127:
     network_adapters:
       eth0:
@@ -1657,8 +1657,8 @@ nodes:
         switch: sgraphene4-ipmi
         switch_port: 1/0/3
     pdu:
-      pdu_name: graphene-pdu8
-      pdu_position: 3
+      uid: graphene-pdu8
+      port: 3
   graphene-128:
     network_adapters:
       eth0:
@@ -1670,8 +1670,8 @@ nodes:
         switch: sgraphene4-ipmi
         switch_port: 1/0/4
     pdu:
-      pdu_name: graphene-pdu8
-      pdu_position: 4
+      uid: graphene-pdu8
+      port: 4
   graphene-129:
     network_adapters:
       eth0:
@@ -1683,8 +1683,8 @@ nodes:
         switch: sgraphene4-ipmi
         switch_port: 1/0/5
     pdu:
-      pdu_name: graphene-pdu8
-      pdu_position: 5
+      uid: graphene-pdu8
+      port: 5
   graphene-130:
     network_adapters:
       eth0:
@@ -1696,8 +1696,8 @@ nodes:
         switch: sgraphene4-ipmi
         switch_port: 1/0/6
     pdu:
-      pdu_name: graphene-pdu8
-      pdu_position: 6
+      uid: graphene-pdu8
+      port: 6
   graphene-131:
     network_adapters:
       eth0:
@@ -1709,8 +1709,8 @@ nodes:
         switch: sgraphene4-ipmi
         switch_port: 1/0/7
     pdu:
-      pdu_name: graphene-pdu8
-      pdu_position: 7
+      uid: graphene-pdu8
+      port: 7
   graphene-132:
     network_adapters:
       eth0:
@@ -1722,8 +1722,8 @@ nodes:
         switch: sgraphene4-ipmi
         switch_port: 1/0/8
     pdu:
-      pdu_name: graphene-pdu8
-      pdu_position: 8
+      uid: graphene-pdu8
+      port: 8
   graphene-133:
     network_adapters:
       eth0:
@@ -1735,8 +1735,8 @@ nodes:
         switch: sgraphene4-ipmi
         switch_port: 1/0/9
     pdu:
-      pdu_name: graphene-pdu8
-      pdu_position: 11
+      uid: graphene-pdu8
+      port: 11
   graphene-134:
     network_adapters:
       eth0:
@@ -1748,8 +1748,8 @@ nodes:
         switch: sgraphene4-ipmi
         switch_port: 1/0/10
     pdu:
-      pdu_name: graphene-pdu8
-      pdu_position: 12
+      uid: graphene-pdu8
+      port: 12
   graphene-135:
     network_adapters:
       eth0:
@@ -1761,8 +1761,8 @@ nodes:
         switch: sgraphene4-ipmi
         switch_port: 1/0/11
     pdu:
-      pdu_name: graphene-pdu8
-      pdu_position: 13 
+      uid: graphene-pdu8
+      port: 13 
   graphene-136:
     network_adapters:
       eth0:
@@ -1774,8 +1774,8 @@ nodes:
         switch: sgraphene4-ipmi
         switch_port: 1/0/12
     pdu:
-      pdu_name: graphene-pdu8
-      pdu_position: 14 
+      uid: graphene-pdu8
+      port: 14 
   graphene-137:
     network_adapters:
       eth0:
@@ -1787,8 +1787,8 @@ nodes:
         switch: sgraphene4-ipmi
         switch_port: 1/0/13
     pdu:
-      pdu_name: graphene-pdu8
-      pdu_position: 15 
+      uid: graphene-pdu8
+      port: 15 
   graphene-138:
     network_adapters:
       eth0:
@@ -1800,8 +1800,8 @@ nodes:
         switch: sgraphene4-ipmi
         switch_port: 1/0/14
     pdu:
-      pdu_name: graphene-pdu8
-      pdu_position: 18
+      uid: graphene-pdu8
+      port: 18
   graphene-139:
     network_adapters:
       eth0:
@@ -1813,8 +1813,8 @@ nodes:
         switch: sgraphene4-ipmi
         switch_port: 1/0/15
     pdu:
-      pdu_name: graphene-pdu8
-      pdu_position: 19
+      uid: graphene-pdu8
+      port: 19
   graphene-140:
     network_adapters:
       eth0:
@@ -1826,8 +1826,8 @@ nodes:
         switch: sgraphene4-ipmi
         switch_port: 1/0/16
     pdu:
-      pdu_name: graphene-pdu8
-      pdu_position: 20
+      uid: graphene-pdu8
+      port: 20
   graphene-141:
     network_adapters:
       eth0:
@@ -1839,8 +1839,8 @@ nodes:
         switch: sgraphene4-ipmi
         switch_port: 1/0/17
     pdu:
-      pdu_name: graphene-pdu8
-      pdu_position: 21
+      uid: graphene-pdu8
+      port: 21
   graphene-142:
     network_adapters:
       eth0:
@@ -1852,8 +1852,8 @@ nodes:
         switch: sgraphene4-ipmi
         switch_port: 1/0/18
     pdu:
-      pdu_name: graphene-pdu8
-      pdu_position: 22
+      uid: graphene-pdu8
+      port: 22
   graphene-143:
     network_adapters:
       eth0:
@@ -1865,8 +1865,8 @@ nodes:
         switch: sgraphene4-ipmi
         switch_port: 1/0/19
     pdu:
-      pdu_name: graphene-pdu8
-      pdu_position: 23
+      uid: graphene-pdu8
+      port: 23
   graphene-144:
     network_adapters:
       eth0:
@@ -1878,6 +1878,6 @@ nodes:
         switch: sgraphene4-ipmi
         switch_port: 1/0/20
     pdu:
-      pdu_name: graphene-pdu8
-      pdu_position: 24
+      uid: graphene-pdu8
+      port: 24
   
diff --git a/dev/input/grid5000/sites/nancy/clusters/graphite/graphite_manual.yaml b/dev/input/grid5000/sites/nancy/clusters/graphite/graphite_manual.yaml
index 0f4a4aeb2b3f9e7f25d39188db9c3a934995300f..9d4eb9cb911e21b3601b123aee4b70c848912ab0 100644
--- a/dev/input/grid5000/sites/nancy/clusters/graphite/graphite_manual.yaml
+++ b/dev/input/grid5000/sites/nancy/clusters/graphite/graphite_manual.yaml
@@ -8,12 +8,11 @@ nodes:
       bmc:
         switch: sgraphene3-ipmi
         switch_port: 1/0/41
-    pdu1:
-      pdu_name: graphene-pdu9
-      pdu_position: 23
-    pdu2:
-      pdu_name: graphene-pdu9
-      pdu_position: 24
+    pdu:
+      - uid: graphene-pdu9
+        port: 23
+      - uid: graphene-pdu9
+        port: 24
     mic:
       mic_count: 1
       mic_model: 7120P
@@ -22,12 +21,11 @@ nodes:
       bmc:
         switch: sgraphene3-ipmi
         switch_port: 1/0/43
-    pdu1:
-      pdu_name: graphene-pdu9
-      pdu_position: 21
-    pdu2:
-      pdu_name: graphene-pdu9
-      pdu_position: 22
+    pdu:
+      - uid: graphene-pdu9
+        port: 21
+      - uid: graphene-pdu9
+        port: 22
     mic:
       mic_count: 1
       mic_model: 7120P
@@ -36,12 +34,11 @@ nodes:
       bmc:
         switch: sgraphene3-ipmi
         switch_port: 1/0/45
-    pdu1:
-      pdu_name: graphene-pdu9
-      pdu_position: 19
-    pdu2:
-      pdu_name: graphene-pdu9
-      pdu_position: 20 
+    pdu:
+      - uid: graphene-pdu9
+        port: 19
+      - uid: graphene-pdu9
+        port: 20 
     mic:
       mic_count: 1
       mic_model: 7120P
@@ -50,12 +47,11 @@ nodes:
       bmc:
         switch: sgraphene3-ipmi
         switch_port: 1/0/47
-    pdu1:
-      pdu_name: graphene-pdu9
-      pdu_position: 5
-    pdu2:
-      pdu_name: graphene-pdu9
-      pdu_position: 6
+    pdu:
+      - uid: graphene-pdu9
+        port: 5
+      - uid: graphene-pdu9
+        port: 6
     mic:
       mic_count: 1
       mic_model: 7120P
diff --git a/dev/input/grid5000/sites/nancy/clusters/griffon/griffon_manual.yaml b/dev/input/grid5000/sites/nancy/clusters/griffon/griffon_manual.yaml
index 41422663c8d87c9aa8290190c079530f8b1d5709..07c4b617a0837a2569b34f0b86b03f9fea1f2d8c 100644
--- a/dev/input/grid5000/sites/nancy/clusters/griffon/griffon_manual.yaml
+++ b/dev/input/grid5000/sites/nancy/clusters/griffon/griffon_manual.yaml
@@ -13,8 +13,8 @@ nodes:
         switch: sgriffon1-ipmi
         switch_port: 1/0/1
     pdu:
-      pdu_name: griffon-pdu2
-      pdu_position: 4
+      uid: griffon-pdu2
+      port: 4
   griffon-2:
     network_adapters:
       ib0:
@@ -25,8 +25,8 @@ nodes:
         switch: sgriffon1-ipmi
         switch_port: 1/0/2
     pdu:
-      pdu_name: griffon-pdu2
-      pdu_position: 3
+      uid: griffon-pdu2
+      port: 3
   griffon-3:
     network_adapters:
       ib0:
@@ -37,8 +37,8 @@ nodes:
         switch: sgriffon1-ipmi
         switch_port: 1/0/3
     pdu:
-      pdu_name: griffon-pdu2
-      pdu_position: 2
+      uid: griffon-pdu2
+      port: 2
   griffon-4:
     network_adapters:
       ib0:
@@ -49,8 +49,8 @@ nodes:
         switch: sgriffon1-ipmi
         switch_port: 1/0/4
     pdu:
-      pdu_name: griffon-pdu2
-      pdu_position: 1
+      uid: griffon-pdu2
+      port: 1
   griffon-5:
     network_adapters:
       ib0:
@@ -61,8 +61,8 @@ nodes:
         switch: sgriffon1-ipmi
         switch_port: 1/0/5
     pdu:
-      pdu_name: griffon-pdu1
-      pdu_position: 3
+      uid: griffon-pdu1
+      port: 3
   griffon-6:
     network_adapters:
       ib0:
@@ -73,8 +73,8 @@ nodes:
         switch: sgriffon1-ipmi
         switch_port: 1/0/6
     pdu:
-      pdu_name: griffon-pdu1
-      pdu_position: 4
+      uid: griffon-pdu1
+      port: 4
   griffon-7:
     network_adapters:
       ib0:
@@ -85,8 +85,8 @@ nodes:
         switch: sgriffon1-ipmi
         switch_port: 1/0/7
     pdu:
-      pdu_name: griffon-pdu1
-      pdu_position: 5
+      uid: griffon-pdu1
+      port: 5
   griffon-8:
     network_adapters:
       ib0:
@@ -97,8 +97,8 @@ nodes:
         switch: sgriffon1-ipmi
         switch_port: 1/0/8
     pdu:
-      pdu_name: griffon-pdu1
-      pdu_position: 6
+      uid: griffon-pdu1
+      port: 6
   griffon-9:
     network_adapters:
       ib0:
@@ -109,8 +109,8 @@ nodes:
         switch: sgriffon1-ipmi
         switch_port: 1/0/9
     pdu:
-      pdu_name: griffon-pdu1
-      pdu_position: 10
+      uid: griffon-pdu1
+      port: 10
   griffon-10:
     network_adapters:
       ib0:
@@ -121,8 +121,8 @@ nodes:
         switch: sgriffon1-ipmi
         switch_port: 1/0/10
     pdu:
-      pdu_name: griffon-pdu1
-      pdu_position: 11
+      uid: griffon-pdu1
+      port: 11
   griffon-11:
     network_adapters:
       eth2:
@@ -137,8 +137,8 @@ nodes:
         switch: sgriffon1-ipmi
         switch_port: 1/0/25
     pdu:
-      pdu_name: griffon-pdu1
-      pdu_position: 12
+      uid: griffon-pdu1
+      port: 12
   griffon-12:
     network_adapters:
       eth2:
@@ -153,8 +153,8 @@ nodes:
         switch: sgriffon1-ipmi
         switch_port: 1/0/26
     pdu:
-      pdu_name: griffon-pdu1
-      pdu_position: 13
+      uid: griffon-pdu1
+      port: 13
   griffon-13:
     network_adapters:
       eth2:
@@ -169,8 +169,8 @@ nodes:
         switch: sgriffon1-ipmi
         switch_port: 1/0/27
     pdu:
-      pdu_name: griffon-pdu1
-      pdu_position: 14
+      uid: griffon-pdu1
+      port: 14
   griffon-14:
     network_adapters:
       eth2:
@@ -185,8 +185,8 @@ nodes:
         switch: sgriffon1-ipmi
         switch_port: 1/0/28
     pdu:
-      pdu_name: griffon-pdu1
-      pdu_position: 15
+      uid: griffon-pdu1
+      port: 15
   griffon-15:
     network_adapters:
       ib0:
@@ -197,8 +197,8 @@ nodes:
         switch: sgriffon1-ipmi
         switch_port: 1/0/29
     pdu:
-      pdu_name: griffon-pdu1
-      pdu_position: 17
+      uid: griffon-pdu1
+      port: 17
   griffon-16:
     network_adapters:
       ib0:
@@ -209,8 +209,8 @@ nodes:
         switch: sgriffon1-ipmi
         switch_port: 1/0/30
     pdu:
-      pdu_name: griffon-pdu1
-      pdu_position: 18
+      uid: griffon-pdu1
+      port: 18
   griffon-17:
     network_adapters:
       ib0:
@@ -221,8 +221,8 @@ nodes:
         switch: sgriffon1-ipmi
         switch_port: 1/0/31
     pdu:
-      pdu_name: griffon-pdu1
-      pdu_position: 19
+      uid: griffon-pdu1
+      port: 19
   griffon-18:
     network_adapters:
       ib0:
@@ -233,8 +233,8 @@ nodes:
         switch: sgriffon1-ipmi
         switch_port: 1/0/32
     pdu:
-      pdu_name: griffon-pdu1
-      pdu_position: 20
+      uid: griffon-pdu1
+      port: 20
   griffon-19:
     network_adapters:
       ib0:
@@ -245,8 +245,8 @@ nodes:
         switch: sgriffon1-ipmi
         switch_port: 1/0/33
     pdu:
-      pdu_name: griffon-pdu1
-      pdu_position: 21
+      uid: griffon-pdu1
+      port: 21
   griffon-20:
     network_adapters:
       ib0:
@@ -257,8 +257,8 @@ nodes:
         switch: sgriffon1-ipmi
         switch_port: 1/0/34
     pdu:
-      pdu_name: griffon-pdu1
-      pdu_position: 22
+      uid: griffon-pdu1
+      port: 22
   griffon-21:
     network_adapters:
       ib0:
@@ -269,8 +269,8 @@ nodes:
         switch: sgriffon1-ipmi
         switch_port: 1/0/35
     pdu:
-      pdu_name: griffon-pdu1
-      pdu_position: 23
+      uid: griffon-pdu1
+      port: 23
   griffon-22:
     network_adapters:
       ib0:
@@ -281,8 +281,8 @@ nodes:
         switch: sgriffon1-ipmi
         switch_port: 1/0/36
     pdu:
-      pdu_name: griffon-pdu2
-      pdu_position: 21
+      uid: griffon-pdu2
+      port: 21
   griffon-23:
     network_adapters:
       ib0:
@@ -293,8 +293,8 @@ nodes:
         switch: sgriffon1-ipmi
         switch_port: 1/O/37
     pdu:
-      pdu_name: griffon-pdu2
-      pdu_position: 20
+      uid: griffon-pdu2
+      port: 20
   griffon-24:
     network_adapters:
       ib0:
@@ -305,8 +305,8 @@ nodes:
         switch: sgriffon1-ipmi
         switch_port: 1/0/38
     pdu:
-      pdu_name: griffon-pdu2
-      pdu_position: 19
+      uid: griffon-pdu2
+      port: 19
   griffon-25:
     network_adapters:
       ib0:
@@ -317,8 +317,8 @@ nodes:
         switch: sgriffon1-ipmi
         switch_port: 1/0/39
     pdu:
-      pdu_name: griffon-pdu2
-      pdu_position: 18
+      uid: griffon-pdu2
+      port: 18
   griffon-26:
     network_adapters:
       ib0:
@@ -329,8 +329,8 @@ nodes:
         switch: sgriffon1-ipmi
         switch_port: 1/0/40
     pdu:
-      pdu_name: griffon-pdu2
-      pdu_position: 17
+      uid: griffon-pdu2
+      port: 17
   griffon-27:
     network_adapters:
       ib0:
@@ -341,8 +341,8 @@ nodes:
         switch: sgriffon1-ipmi
         switch_port: 1/0/41
     pdu:
-      pdu_name: griffon-pdu2
-      pdu_position: 15
+      uid: griffon-pdu2
+      port: 15
   griffon-28:
     network_adapters:
       ib0:
@@ -353,8 +353,8 @@ nodes:
         switch: sgriffon1-ipmi
         switch_port: 1/0/42
     pdu:
-      pdu_name: griffon-pdu2
-      pdu_position: 14
+      uid: griffon-pdu2
+      port: 14
   griffon-29:
     network_adapters:
       ib0:
@@ -365,8 +365,8 @@ nodes:
         switch: sgriffon1-ipmi
         switch_port: 1/0/43
     pdu:
-      pdu_name: griffon-pdu2
-      pdu_position: 13
+      uid: griffon-pdu2
+      port: 13
   # griffon-30:
   #   network_adapters:
   #     ib0:
@@ -377,8 +377,8 @@ nodes:
   #       switch: sgriffon2-ipmi
   #       switch_port: 1/0/1
   #   pdu:
-  #     pdu_name: griffon-pdu4
-  #     pdu_position: 1
+  #     uid: griffon-pdu4
+  #     port: 1
   # griffon-31:
   #   network_adapters:
   #     ib0:
@@ -389,8 +389,8 @@ nodes:
   #       switch: sgriffon2-ipmi
   #       switch_port: 1/0/2
   #   pdu:
-  #     pdu_name: griffon-pdu4
-  #     pdu_position: 2
+  #     uid: griffon-pdu4
+  #     port: 2
   # griffon-32:
   #   network_adapters:
   #     ib0:
@@ -401,8 +401,8 @@ nodes:
   #       switch: sgriffon2-ipmi
   #       switch_port: 1/0/3
   #   pdu:
-  #     pdu_name: griffon-pdu4
-  #     pdu_position: 3
+  #     uid: griffon-pdu4
+  #     port: 3
   # griffon-33:
   #   network_adapters:
   #     ib0:
@@ -413,8 +413,8 @@ nodes:
   #       switch: sgriffon2-ipmi
   #       switch_port: 1/0/4
   #   pdu:
-  #     pdu_name: griffon-pdu4
-  #     pdu_position: 4
+  #     uid: griffon-pdu4
+  #     port: 4
   # griffon-34:
   #   network_adapters:
   #     ib0:
@@ -425,8 +425,8 @@ nodes:
   #       switch: sgriffon2-ipmi
   #       switch_port: 1/0/5
   #   pdu:
-  #     pdu_name: griffon-pdu4
-  #     pdu_position: 5
+  #     uid: griffon-pdu4
+  #     port: 5
   # griffon-35:
   #   network_adapters:
   #     ib0:
@@ -437,8 +437,8 @@ nodes:
   #       switch: sgriffon2-ipmi
   #       switch_port: 1/0/6
   #   pdu:
-  #     pdu_name: griffon-pdu4
-  #     pdu_position: 6
+  #     uid: griffon-pdu4
+  #     port: 6
   # griffon-36:
   #   network_adapters:
   #     ib0:
@@ -449,8 +449,8 @@ nodes:
   #       switch: sgriffon2-ipmi
   #       switch_port: 7
   #   pdu:
-  #     pdu_name: griffon-pdu4
-  #     pdu_position: 7
+  #     uid: griffon-pdu4
+  #     port: 7
   # griffon-37:
   #   network_adapters:
   #     ib0:
@@ -461,8 +461,8 @@ nodes:
   #       switch: sgriffon2-ipmi
   #       switch_port: 1/0/8
   #   pdu:
-  #     pdu_name: griffon-pdu3
-  #     pdu_position: 8
+  #     uid: griffon-pdu3
+  #     port: 8
   # griffon-38:
   #   network_adapters:
   #     ib0:
@@ -473,8 +473,8 @@ nodes:
   #       switch: sgriffon2-ipmi
   #       switch_port: 1/0/9
   #   pdu:
-  #     pdu_name: griffon-pdu3
-  #     pdu_position: 2
+  #     uid: griffon-pdu3
+  #     port: 2
   # griffon-39:
   #   network_adapters:
   #     ib0:
@@ -485,8 +485,8 @@ nodes:
   #       switch: sgriffon2-ipmi
   #       switch_port: 1/0/25
   #   pdu:
-  #     pdu_name: griffon-pdu3
-  #     pdu_position: 3
+  #     uid: griffon-pdu3
+  #     port: 3
   # griffon-40:
   #   network_adapters:
   #     ib0:
@@ -497,8 +497,8 @@ nodes:
   #       switch: sgriffon2-ipmi
   #       switch_port: 1/0/26
   #   pdu:
-  #     pdu_name: griffon-pdu3
-  #     pdu_position: 4
+  #     uid: griffon-pdu3
+  #     port: 4
   # griffon-41:
   #   network_adapters:
   #     ib0:
@@ -509,8 +509,8 @@ nodes:
   #       switch: sgriffon2-ipmi
   #       switch_port: 1/0/27
   #   pdu:
-  #     pdu_name: griffon-pdu3
-  #     pdu_position: 5
+  #     uid: griffon-pdu3
+  #     port: 5
   # griffon-42:
   #   network_adapters:
   #     ib0:
@@ -521,8 +521,8 @@ nodes:
   #       switch: sgriffon2-ipmi
   #       switch_port: 1/0/28
   #   pdu:
-  #     pdu_name: griffon-pdu3
-  #     pdu_position: 6
+  #     uid: griffon-pdu3
+  #     port: 6
   # griffon-43:
   #   network_adapters:
   #     ib0:
@@ -533,8 +533,8 @@ nodes:
   #       switch: sgriffon2-ipmi
   #       switch_port: 1/0/29
   #   pdu:
-  #     pdu_name: griffon-pdu3
-  #     pdu_position: 7
+  #     uid: griffon-pdu3
+  #     port: 7
   # griffon-44:
   #   network_adapters:
   #     ib0:
@@ -545,8 +545,8 @@ nodes:
   #       switch: sgriffon2-ipmi
   #       switch_port: 1/0/30
   #   pdu:
-  #     pdu_name: griffon-pdu3
-  #     pdu_position: 17
+  #     uid: griffon-pdu3
+  #     port: 17
   # griffon-45:
   #   network_adapters:
   #     ib0:
@@ -557,8 +557,8 @@ nodes:
   #       switch: sgriffon2-ipmi
   #       switch_port: 1/0/31
   #   pdu:
-  #     pdu_name: griffon-pdu3
-  #     pdu_position: 18
+  #     uid: griffon-pdu3
+  #     port: 18
   # griffon-46:
   #   network_adapters:
   #     ib0:
@@ -569,8 +569,8 @@ nodes:
   #       switch: sgriffon2-ipmi
   #       switch_port: 1/0/32
   #   pdu:
-  #     pdu_name: griffon-pdu3
-  #     pdu_position: 19
+  #     uid: griffon-pdu3
+  #     port: 19
   # griffon-47:
   #   network_adapters:
   #     ib0:
@@ -579,8 +579,8 @@ nodes:
   #       switch: sgriffon2-ipmi
   #       switch_port: 1/0/33
   #   pdu:
-  #     pdu_name: griffon-pdu3
-  #     pdu_position: 20
+  #     uid: griffon-pdu3
+  #     port: 20
   # griffon-48:
   #   network_adapters:
   #     ib0:
@@ -591,8 +591,8 @@ nodes:
   #       switch: sgriffon2-ipmi
   #       switch_port: 1/0/34
   #   pdu:
-  #     pdu_name: griffon-pdu3
-  #     pdu_position: 21
+  #     uid: griffon-pdu3
+  #     port: 21
   # griffon-49:
   #   network_adapters:
   #     ib0:
@@ -603,8 +603,8 @@ nodes:
   #       switch: sgriffon2-ipmi
   #       switch_port: 1/0/35
   #   pdu:
-  #     pdu_name: griffon-pdu3
-  #     pdu_position: 22
+  #     uid: griffon-pdu3
+  #     port: 22
   # griffon-50:
   #   network_adapters:
   #     ib0:
@@ -615,8 +615,8 @@ nodes:
   #       switch: sgriffon2-ipmi
   #       switch_port: 1/0/36
   #   pdu:
-  #     pdu_name: griffon-pdu3
-  #     pdu_position: 23
+  #     uid: griffon-pdu3
+  #     port: 23
   # griffon-51:
   #   network_adapters:
   #     ib0:
@@ -627,8 +627,8 @@ nodes:
   #       switch: sgriffon2-ipmi
   #       switch_port: 1/0/37
   #   pdu:
-  #     pdu_name: griffon-pdu4
-  #     pdu_position: 21
+  #     uid: griffon-pdu4
+  #     port: 21
   # griffon-52:
   #   network_adapters:
   #     ib0:
@@ -637,8 +637,8 @@ nodes:
   #       switch: sgriffon2-ipmi
   #       switch_port: 1/0/38
   #   pdu:
-  #     pdu_name: griffon-pdu4
-  #     pdu_position: 20
+  #     uid: griffon-pdu4
+  #     port: 20
   # griffon-53:
   #   network_adapters:
   #     ib0:
@@ -647,8 +647,8 @@ nodes:
   #       switch: sgriffon2-ipmi
   #       switch_port: 1/0/39
   #   pdu:
-  #     pdu_name: griffon-pdu4
-  #     pdu_position: 19
+  #     uid: griffon-pdu4
+  #     port: 19
   # griffon-54:
   #   network_adapters:
   #     ib0:
@@ -657,8 +657,8 @@ nodes:
   #       switch: sgriffon2-ipmi
   #       switch_port: 1/0/40
   #   pdu:
-  #     pdu_name: griffon-pdu4
-  #     pdu_position: 18
+  #     uid: griffon-pdu4
+  #     port: 18
   # griffon-55:
   #   network_adapters:
   #     ib0:
@@ -667,8 +667,8 @@ nodes:
   #       switch: sgriffon2-ipmi
   #       switch_port: 1/0/41
   #   pdu:
-  #     pdu_name: griffon-pdu4
-  #     pdu_position: 17
+  #     uid: griffon-pdu4
+  #     port: 17
   # griffon-56:
   #   network_adapters:
   #     ib0:
@@ -677,8 +677,8 @@ nodes:
   #       switch: sgriffon2-ipmi
   #       switch_port: 1/0/42
   #   pdu:
-  #     pdu_name: griffon-pdu4
-  #     pdu_position: 15
+  #     uid: griffon-pdu4
+  #     port: 15
   # griffon-57:
   #   network_adapters:
   #     ib0:
@@ -687,8 +687,8 @@ nodes:
   #       switch: sgriffon2-ipmi
   #       switch_port: 1/0/43
   #   pdu:
-  #     pdu_name: griffon-pdu4
-  #     pdu_position: 14
+  #     uid: griffon-pdu4
+  #     port: 14
   griffon-58:
     network_adapters:
       ib0:
@@ -697,8 +697,8 @@ nodes:
         switch: sgriffon1-ipmi
         switch_port: 1/0/12
     pdu:
-      pdu_name: griffon-pdu1
-      pdu_position: 1
+      uid: griffon-pdu1
+      port: 1
   griffon-59:
     network_adapters:
       ib0:
@@ -709,8 +709,8 @@ nodes:
         switch: sgriffon1-ipmi
         switch_port: 1/0/11
     pdu:
-      pdu_name: griffon-pdu1
-      pdu_position: 2
+      uid: griffon-pdu1
+      port: 2
   griffon-60:
     network_adapters:
       ib0:
@@ -721,8 +721,8 @@ nodes:
         switch: sgriffon1-ipmi
         switch_port: 1/0/13
     pdu:
-      pdu_name: griffon-pdu2
-      pdu_position: 5
+      uid: griffon-pdu2
+      port: 5
   # griffon-61:
   #   network_adapters:
   #     ib0:
@@ -733,8 +733,8 @@ nodes:
   #       switch: sgriffon3-ipmi
   #       switch_port: 1/0/4
   #   pdu:
-  #     pdu_name: griffon-pdu6
-  #     pdu_position: 3
+  #     uid: griffon-pdu6
+  #     port: 3
   # griffon-62:
   #   network_adapters:
   #     ib0:
@@ -745,8 +745,8 @@ nodes:
   #       switch: sgriffon3-ipmi
   #       switch_port: 1/0/5
   #   pdu:
-  #     pdu_name: griffon-pdu6
-  #     pdu_position: 2
+  #     uid: griffon-pdu6
+  #     port: 2
   # griffon-63:
   #   network_adapters:
   #     ib0:
@@ -757,8 +757,8 @@ nodes:
   #       switch: sgriffon3-ipmi
   #       switch_port: 1/0/6
   #   pdu:
-  #     pdu_name: griffon-pdu6
-  #     pdu_position: 1
+  #     uid: griffon-pdu6
+  #     port: 1
   # griffon-64:
   #   network_adapters:
   #     ib0:
@@ -769,8 +769,8 @@ nodes:
   #       switch: sgriffon3-ipmi
   #       switch_port: 1/0/7
   #   pdu:
-  #     pdu_name: griffon-pdu6
-  #     pdu_position: 8
+  #     uid: griffon-pdu6
+  #     port: 8
   # griffon-65:
   #   network_adapters:
   #     ib0:
@@ -781,8 +781,8 @@ nodes:
   #       switch: sgriffon3-ipmi
   #       switch_port: 1/0/8
   #   pdu:
-  #     pdu_name: griffon-pdu5
-  #     pdu_position: 2
+  #     uid: griffon-pdu5
+  #     port: 2
   # griffon-66:
   #   network_adapters:
   #     ib0:
@@ -793,8 +793,8 @@ nodes:
   #       switch: sgriffon3-ipmi
   #       switch_port: 1/0/9
   #   pdu:
-  #     pdu_name: griffon-pdu5
-  #     pdu_position: 3
+  #     uid: griffon-pdu5
+  #     port: 3
   # griffon-67:
   #   network_adapters:
   #     ib0:
@@ -805,8 +805,8 @@ nodes:
   #       switch: sgriffon3-ipmi
   #       switch_port: 1/0/10
   #   pdu:
-  #     pdu_name: griffon-pdu5
-  #     pdu_position: 4
+  #     uid: griffon-pdu5
+  #     port: 4
   # griffon-68:
   #   network_adapters:
   #     ib0:
@@ -817,8 +817,8 @@ nodes:
   #       switch: sgriffon3-ipmi
   #       switch_port: 1/0/11
   #   pdu:
-  #     pdu_name: griffon-pdu5
-  #     pdu_position: 5
+  #     uid: griffon-pdu5
+  #     port: 5
   # griffon-69:
   #   network_adapters:
   #     ib0:
@@ -829,8 +829,8 @@ nodes:
   #       switch: sgriffon3-ipmi
   #       switch_port: 1/0/12
   #   pdu:
-  #     pdu_name: griffon-pdu5
-  #     pdu_position: 6
+  #     uid: griffon-pdu5
+  #     port: 6
   # griffon-70:
   #   network_adapters:
   #     ib0:
@@ -841,8 +841,8 @@ nodes:
   #       switch: sgriffon3-ipmi
   #       switch_port: 1/0/13
   #   pdu:
-  #     pdu_name: griffon-pdu5
-  #     pdu_position: 7
+  #     uid: griffon-pdu5
+  #     port: 7
   # griffon-71:
   #   network_adapters:
   #     ib0:
@@ -853,8 +853,8 @@ nodes:
   #       switch: sgriffon3-ipmi
   #       switch_port: 1/0/14
   #   pdu:
-  #     pdu_name: griffon-pdu5
-  #     pdu_position: 8
+  #     uid: griffon-pdu5
+  #     port: 8
   # griffon-72:
   #   network_adapters:
   #     ib0:
@@ -865,8 +865,8 @@ nodes:
   #       switch: sgriffon3-ipmi
   #       switch_port: 1/0/15
   #   pdu:
-  #     pdu_name: griffon-pdu5
-  #     pdu_position: 9
+  #     uid: griffon-pdu5
+  #     port: 9
   # griffon-73:
   #   network_adapters:
   #     ib0:
@@ -877,8 +877,8 @@ nodes:
   #       switch: sgriffon3-ipmi
   #       switch_port: 1/0/25
   #   pdu:
-  #     pdu_name: griffon-pdu5
-  #     pdu_position: 10
+  #     uid: griffon-pdu5
+  #     port: 10
   # griffon-74:
   #   network_adapters:
   #     ib0:
@@ -889,8 +889,8 @@ nodes:
   #       switch: sgriffon3-ipmi
   #       switch_port: 1/0/26
   #   pdu:
-  #     pdu_name: griffon-pdu5
-  #     pdu_position: 11
+  #     uid: griffon-pdu5
+  #     port: 11
   # griffon-75:
   #   network_adapters:
   #     ib0:
@@ -901,8 +901,8 @@ nodes:
   #       switch: sgriffon3-ipmi
   #       switch_port: 1/0/27
   #   pdu:
-  #     pdu_name: griffon-pdu5
-  #     pdu_position: 13
+  #     uid: griffon-pdu5
+  #     port: 13
   # griffon-76:
   #   network_adapters:
   #     ib0:
@@ -913,8 +913,8 @@ nodes:
   #       switch: sgriffon3-ipmi
   #       switch_port: 1/0/28
   #   pdu:
-  #     pdu_name: griffon-pdu5
-  #     pdu_position: 14
+  #     uid: griffon-pdu5
+  #     port: 14
   # griffon-77:
   #   network_adapters:
   #     ib0:
@@ -925,8 +925,8 @@ nodes:
   #       switch: sgriffon3-ipmi
   #       switch_port: 1/0/29
   #   pdu:
-  #     pdu_name: griffon-pdu5
-  #     pdu_position: 15
+  #     uid: griffon-pdu5
+  #     port: 15
   # griffon-78:
   #   network_adapters:
   #     ib0:
@@ -937,8 +937,8 @@ nodes:
   #       switch: sgriffon3-ipmi
   #       switch_port: 1/0/30
   #   pdu:
-  #     pdu_name: griffon-pdu5
-  #     pdu_position: 17
+  #     uid: griffon-pdu5
+  #     port: 17
   # griffon-79:
   #   network_adapters:
   #     ib0:
@@ -947,8 +947,8 @@ nodes:
   #       switch: sgriffon3-ipmi
   #       switch_port: 1/0/31
   #   pdu:
-  #     pdu_name: griffon-pdu5
-  #     pdu_position: 18
+  #     uid: griffon-pdu5
+  #     port: 18
   # griffon-80:
   #   network_adapters:
   #     ib0:
@@ -957,8 +957,8 @@ nodes:
   #       switch: sgriffon3-ipmi
   #       switch_port: 1/0/32
   #   pdu:
-  #     pdu_name: griffon-pdu5
-  #     pdu_position: 19
+  #     uid: griffon-pdu5
+  #     port: 19
   # griffon-81:
   #   network_adapters:
   #     ib0:
@@ -967,8 +967,8 @@ nodes:
   #       switch: sgriffon3-ipmi
   #       switch_port: 1/0/33
   #   pdu:
-  #     pdu_name: griffon-pdu5
-  #     pdu_position: 20
+  #     uid: griffon-pdu5
+  #     port: 20
   # griffon-82:
   #   network_adapters:
   #     ib0:
@@ -977,8 +977,8 @@ nodes:
   #       switch: sgriffon3-ipmi
   #       switch_port: 1/0/34
   #   pdu:
-  #     pdu_name: griffon-pdu5
-  #     pdu_position: 21
+  #     uid: griffon-pdu5
+  #     port: 21
   # griffon-83:
   #   network_adapters:
   #     ib0:
@@ -989,8 +989,8 @@ nodes:
   #       switch: sgriffon3-ipmi
   #       switch_port: 1/0/35
   #   pdu:
-  #     pdu_name: griffon-pdu5
-  #     pdu_position: 22
+  #     uid: griffon-pdu5
+  #     port: 22
   # griffon-84:
   #   network_adapters:
   #     ib0:
@@ -999,8 +999,8 @@ nodes:
   #       switch: sgriffon3-ipmi
   #       switch_port: 1/0/36
   #   pdu:
-  #     pdu_name: griffon-pdu5
-  #     pdu_position: 23
+  #     uid: griffon-pdu5
+  #     port: 23
   # griffon-85:
   #   network_adapters:
   #     ib0:
@@ -1009,8 +1009,8 @@ nodes:
   #       switch: sgriffon3-ipmi
   #       switch_port: 1/0/37
   #   pdu:
-  #     pdu_name: griffon-pdu6
-  #     pdu_position: 21
+  #     uid: griffon-pdu6
+  #     port: 21
   # griffon-86:
   #   network_adapters:
   #     ib0:
@@ -1019,8 +1019,8 @@ nodes:
   #       switch: sgriffon3-ipmi
   #       switch_port: 1/0/39
   #   pdu:
-  #     pdu_name: griffon-pdu6
-  #     pdu_position: 20
+  #     uid: griffon-pdu6
+  #     port: 20
   # griffon-87:
   #   network_adapters:
   #     ib0:
@@ -1029,8 +1029,8 @@ nodes:
   #       switch: sgriffon3-ipmi
   #       switch_port: 1/0/40
   #   pdu:
-  #     pdu_name: griffon-pdu6
-  #     pdu_position: 19
+  #     uid: griffon-pdu6
+  #     port: 19
   # griffon-88:
   #   network_adapters:
   #     ib0:
@@ -1039,8 +1039,8 @@ nodes:
   #       switch: sgriffon3-ipmi
   #       switch_port: 1/0/41
   #   pdu:
-  #     pdu_name: griffon-pdu6
-  #     pdu_position: 18
+  #     uid: griffon-pdu6
+  #     port: 18
   # griffon-89:
   #   network_adapters:
   #     ib0:
@@ -1049,8 +1049,8 @@ nodes:
   #       switch: sgriffon3-ipmi
   #       switch_port: 1/0/42
   #   pdu:
-  #     pdu_name: griffon-pdu6
-  #     pdu_position: 17
+  #     uid: griffon-pdu6
+  #     port: 17
   # griffon-90:
   #   network_adapters:
   #     ib0:
@@ -1059,8 +1059,8 @@ nodes:
   #       switch: sgriffon3-ipmi
   #       switch_port: 1/0/43
   #   pdu:
-  #     pdu_name: griffon-pdu6
-  #     pdu_position: 15
+  #     uid: griffon-pdu6
+  #     port: 15
   # griffon-91:
   #   network_adapters:
   #     ib0:
@@ -1069,8 +1069,8 @@ nodes:
   #       switch: sgriffon3-ipmi
   #       switch_port: 1/0/44
   #   pdu:
-  #     pdu_name: griffon-pdu6
-  #     pdu_position: 14
+  #     uid: griffon-pdu6
+  #     port: 14
   # griffon-92:
   #   network_adapters:
   #     ib0:
@@ -1079,6 +1079,6 @@ nodes:
   #       switch: sgriffon3-ipmi
   #       switch_port: 1/0/45
   #   pdu:
-  #     pdu_name: griffon-pdu6
-  #     pdu_position: 13
+  #     uid: griffon-pdu6
+  #     port: 13
   
diff --git a/dev/input/grid5000/sites/nancy/clusters/grimoire/grimoire_manual.yaml b/dev/input/grid5000/sites/nancy/clusters/grimoire/grimoire_manual.yaml
index cf3ba2a950fc4fd8e152be24c69a3d48a6df6068..cf9378b1005a9164ee7da3e922dd8487a026dff2 100644
--- a/dev/input/grid5000/sites/nancy/clusters/grimoire/grimoire_manual.yaml
+++ b/dev/input/grid5000/sites/nancy/clusters/grimoire/grimoire_manual.yaml
@@ -6,34 +6,34 @@ nodes:
 
   grimoire-1:
     pdu:
-      pdu_name: grimoire-pdu2
-      pdu_position: 17
+      uid: grimoire-pdu2
+      port: 17
   grimoire-2:
     pdu:
-      pdu_name: grimoire-pdu1
-      pdu_position: 17
+      uid: grimoire-pdu1
+      port: 17
   grimoire-3:
     pdu:
-      pdu_name: grimoire-pdu2
-      pdu_position: 18
+      uid: grimoire-pdu2
+      port: 18
   grimoire-4:
     pdu:
-      pdu_name: grimoire-pdu1
-      pdu_position: 18
+      uid: grimoire-pdu1
+      port: 18
   grimoire-5:
     pdu:
-      pdu_name: grimoire-pdu2
-      pdu_position: 19
+      uid: grimoire-pdu2
+      port: 19
   grimoire-6:
     pdu:
-      pdu_name: grimoire-pdu1
-      pdu_position: 19
+      uid: grimoire-pdu1
+      port: 19
   grimoire-7:
     pdu:
-      pdu_name: grimoire-pdu1
-      pdu_position: 20
+      uid: grimoire-pdu1
+      port: 20
   grimoire-8:
     pdu:
-      pdu_name: grimoire-pdu2
-      pdu_position: 20
+      uid: grimoire-pdu2
+      port: 20
   
diff --git a/dev/input/grid5000/sites/nancy/clusters/grisou/grisou_manual.yaml b/dev/input/grid5000/sites/nancy/clusters/grisou/grisou_manual.yaml
index 53cf0a1a3e3eb952752802fba5ee820741066c71..09b337ce744ac750c9502bdc495036cf0ce9f20e 100644
--- a/dev/input/grid5000/sites/nancy/clusters/grisou/grisou_manual.yaml
+++ b/dev/input/grid5000/sites/nancy/clusters/grisou/grisou_manual.yaml
@@ -6,206 +6,206 @@ nodes:
       wattmeter: true
   grisou-1:
     pdu:
-      pdu_name: grisou-pdu1
-      pdu_position: 1
+      uid: grisou-pdu1
+      port: 1
   grisou-2:
     pdu:
-      pdu_name: grisou-pdu2
-      pdu_position: 1
+      uid: grisou-pdu2
+      port: 1
   grisou-3:
     pdu:
-      pdu_name: grisou-pdu1
-      pdu_position: 2
+      uid: grisou-pdu1
+      port: 2
   grisou-4:
     pdu:
-      pdu_name: grisou-pdu2
-      pdu_position: 2
+      uid: grisou-pdu2
+      port: 2
   grisou-5:
     pdu:
-      pdu_name: grisou-pdu2
-      pdu_position: 3
+      uid: grisou-pdu2
+      port: 3
   grisou-6:
     pdu:
-      pdu_name: grisou-pdu1
-      pdu_position: 3
+      uid: grisou-pdu1
+      port: 3
   grisou-7:
     pdu:
-      pdu_name: grisou-pdu1
-      pdu_position: 5
+      uid: grisou-pdu1
+      port: 5
   grisou-8:
     pdu:
-      pdu_name: grisou-pdu2
-      pdu_position: 4
+      uid: grisou-pdu2
+      port: 4
   grisou-9:
     pdu:
-      pdu_name: grisou-pdu1
-      pdu_position: 4
+      uid: grisou-pdu1
+      port: 4
   grisou-10:
     pdu:
-      pdu_name: grisou-pdu2
-      pdu_position: 5
+      uid: grisou-pdu2
+      port: 5
   grisou-11:
     pdu:
-      pdu_name: grisou-pdu1
-      pdu_position: 6
+      uid: grisou-pdu1
+      port: 6
   grisou-12:
     pdu:
-      pdu_name: grisou-pdu2
-      pdu_position: 6
+      uid: grisou-pdu2
+      port: 6
   grisou-13:
     pdu:
-      pdu_name: grisou-pdu1
-      pdu_position: 7
+      uid: grisou-pdu1
+      port: 7
   grisou-14:
     pdu:
-      pdu_name: grisou-pdu2
-      pdu_position: 7
+      uid: grisou-pdu2
+      port: 7
   grisou-15:
     pdu:
-      pdu_name: grisou-pdu1
-      pdu_position: 9
+      uid: grisou-pdu1
+      port: 9
   grisou-16:
     pdu:
-      pdu_name: grisou-pdu1
-      pdu_position: 10
+      uid: grisou-pdu1
+      port: 10
   grisou-17:
     pdu:
-      pdu_name: grisou-pdu2
-      pdu_position: 10
+      uid: grisou-pdu2
+      port: 10
   grisou-18:
     pdu:
-      pdu_name: grisou-pdu2
-      pdu_position: 11
+      uid: grisou-pdu2
+      port: 11
   grisou-19:
     pdu:
-      pdu_name: grisou-pdu1
-      pdu_position: 11
+      uid: grisou-pdu1
+      port: 11
   grisou-20:
     pdu:
-      pdu_name: grisou-pdu1
-      pdu_position: 12
+      uid: grisou-pdu1
+      port: 12
   grisou-21:
     pdu:
-      pdu_name: grisou-pdu1
-      pdu_position: 13
+      uid: grisou-pdu1
+      port: 13
   grisou-22:
     pdu:
-      pdu_name: grisou-pdu2
-      pdu_position: 12
+      uid: grisou-pdu2
+      port: 12
   grisou-23:
     pdu:
-      pdu_name: grisou-pdu1
-      pdu_position: 14
+      uid: grisou-pdu1
+      port: 14
   grisou-24:
     pdu:
-      pdu_name: grisou-pdu2
-      pdu_position: 13
+      uid: grisou-pdu2
+      port: 13
   grisou-25:
     pdu:
-      pdu_name: grisou-pdu1
-      pdu_position: 19
+      uid: grisou-pdu1
+      port: 19
   grisou-26:
     pdu:
-      pdu_name: grisou-pdu2
-      pdu_position: 14
+      uid: grisou-pdu2
+      port: 14
   grisou-27:
     pdu:
-      pdu_name: grisou-pdu1
-      pdu_position: 15
+      uid: grisou-pdu1
+      port: 15
   grisou-28:
     pdu:
-      pdu_name: grisou-pdu2
-      pdu_position: 15
+      uid: grisou-pdu2
+      port: 15
   grisou-29:
     pdu:
-      pdu_name: grisou-pdu1
-      pdu_position: 17
+      uid: grisou-pdu1
+      port: 17
   grisou-30:
     pdu:
-      pdu_name: grisou-pdu2
-      pdu_position: 17
+      uid: grisou-pdu2
+      port: 17
   grisou-31:
     pdu:
-      pdu_name: grimoire-pdu1
-      pdu_position: 1
+      uid: grimoire-pdu1
+      port: 1
   grisou-32:
     pdu:
-      pdu_name: grimoire-pdu2
-      pdu_position: 1
+      uid: grimoire-pdu2
+      port: 1
   grisou-33:
     pdu:
-      pdu_name: grimoire-pdu2
-      pdu_position: 2
+      uid: grimoire-pdu2
+      port: 2
   grisou-34:
     pdu:
-      pdu_name: grimoire-pdu2
-      pdu_position: 3
+      uid: grimoire-pdu2
+      port: 3
   grisou-35:
     pdu:
-      pdu_name: grimoire-pdu2
-      pdu_position: 4
+      uid: grimoire-pdu2
+      port: 4
   grisou-36:
     pdu:
-      pdu_name: grimoire-pdu2
-      pdu_position: 5
+      uid: grimoire-pdu2
+      port: 5
   grisou-37:
     pdu:
-      pdu_name: grimoire-pdu1
-      pdu_position: 2
+      uid: grimoire-pdu1
+      port: 2
   grisou-38:
     pdu:
-      pdu_name: grimoire-pdu1
-      pdu_position: 3
+      uid: grimoire-pdu1
+      port: 3
   grisou-39:
     pdu:
-      pdu_name: grimoire-pdu1
-      pdu_position: 4
+      uid: grimoire-pdu1
+      port: 4
   grisou-40:
     pdu:
-      pdu_name: grimoire-pdu1
-      pdu_position: 5
+      uid: grimoire-pdu1
+      port: 5
   grisou-41:
     pdu:
-      pdu_name: grimoire-pdu2
-      pdu_position: 6
+      uid: grimoire-pdu2
+      port: 6
   grisou-42:
     pdu:
-      pdu_name: grimoire-pdu2
-      pdu_position: 7
+      uid: grimoire-pdu2
+      port: 7
   grisou-43:
     pdu:
-      pdu_name: grimoire-pdu1
-      pdu_position: 6
+      uid: grimoire-pdu1
+      port: 6
   grisou-44:
     pdu:
-      pdu_name: grimoire-pdu1
-      pdu_position: 7
+      uid: grimoire-pdu1
+      port: 7
   grisou-45:
     pdu:
-      pdu_name: grimoire-pdu2
-      pdu_position: 15
+      uid: grimoire-pdu2
+      port: 15
   grisou-46:
     pdu:
-      pdu_name: grimoire-pdu2
-      pdu_position: 21
+      uid: grimoire-pdu2
+      port: 21
   grisou-47:
     pdu:
-      pdu_name: grimoire-pdu1
-      pdu_position: 21
+      uid: grimoire-pdu1
+      port: 21
   grisou-48:
     pdu:
-      pdu_name: grimoire-pdu2
-      pdu_position: 22
+      uid: grimoire-pdu2
+      port: 22
   grisou-49:
     pdu:
-      pdu_name: grimoire-pdu1
-      pdu_position: 22
+      uid: grimoire-pdu1
+      port: 22
   grisou-50:
     pdu:
-      pdu_name: graoully-pdu2
-      pdu_position: 22
+      uid: graoully-pdu2
+      port: 22
   grisou-51:
     pdu:
-      pdu_name: graoully-pdu1
-      pdu_position: 22
+      uid: graoully-pdu1
+      port: 22
   
diff --git a/dev/input/grid5000/sites/reims/clusters/stremi/stremi_manual.yaml b/dev/input/grid5000/sites/reims/clusters/stremi/stremi_manual.yaml
index 923d9536f70b804c59489c56a6f77ee0e03e22a6..f252a02667c19ccfc6140da97c682bb3e403b7f4 100644
--- a/dev/input/grid5000/sites/reims/clusters/stremi/stremi_manual.yaml
+++ b/dev/input/grid5000/sites/reims/clusters/stremi/stremi_manual.yaml
@@ -6,350 +6,350 @@ nodes:
         switch: gw-reims
         switch_port: Gi0/1
     pdu:
-      pdu_name: stremi-pdu2
-      pdu_position: 1
+      uid: stremi-pdu2
+      port: 1
   stremi-2:
     network_adapters:
       eth0:
         switch: gw-reims
         switch_port: Gi0/2
     pdu:
-      pdu_name: stremi-pdu2
-      pdu_position: 2
+      uid: stremi-pdu2
+      port: 2
   stremi-3:
     network_adapters:
       eth0:
         switch: gw-reims
         switch_port: Gi0/3
     pdu:
-      pdu_name: stremi-pdu2
-      pdu_position: 3
+      uid: stremi-pdu2
+      port: 3
   stremi-4:
     network_adapters:
       eth0:
         switch: gw-reims
         switch_port: Gi0/4
     pdu:
-      pdu_name: stremi-pdu2
-      pdu_position: 4
+      uid: stremi-pdu2
+      port: 4
   stremi-5:
     network_adapters:
       eth0:
         switch: gw-reims
         switch_port: Gi0/5
     pdu:
-      pdu_name: stremi-pdu2
-      pdu_position: 5
+      uid: stremi-pdu2
+      port: 5
   stremi-6:
     network_adapters:
       eth0:
         switch: gw-reims
         switch_port: Gi0/6
     pdu:
-      pdu_name: stremi-pdu2
-      pdu_position: 6
+      uid: stremi-pdu2
+      port: 6
   stremi-7:
     network_adapters:
       eth0:
         switch: gw-reims
         switch_port: Gi0/7
     pdu:
-      pdu_name: stremi-pdu2
-      pdu_position: 7
+      uid: stremi-pdu2
+      port: 7
   stremi-8:
     network_adapters:
       eth0:
         switch: gw-reims
         switch_port: Gi0/8
     pdu:
-      pdu_name: stremi-pdu2
-      pdu_position: 8
+      uid: stremi-pdu2
+      port: 8
   stremi-9:
     network_adapters:
       eth0:
         switch: gw-reims
         switch_port: Gi0/9
     pdu:
-      pdu_name: stremi-pdu2
-      pdu_position: 9
+      uid: stremi-pdu2
+      port: 9
   stremi-10:
     network_adapters:
       eth0:
         switch: gw-reims
         switch_port: Gi0/10
     pdu:
-      pdu_name: stremi-pdu2
-      pdu_position: 10
+      uid: stremi-pdu2
+      port: 10
   stremi-11:
     network_adapters:
       eth0:
         switch: gw-reims
         switch_port: Gi0/11
     pdu:
-      pdu_name: stremi-pdu2
-      pdu_position: 11
+      uid: stremi-pdu2
+      port: 11
   stremi-12:
     network_adapters:
       eth0:
         switch: gw-reims
         switch_port: Gi0/12
     pdu:
-      pdu_name: stremi-pdu2
-      pdu_position: 12
+      uid: stremi-pdu2
+      port: 12
   stremi-13:
     network_adapters:
       eth0:
         switch: gw-reims
         switch_port: Gi0/13
     pdu:
-      pdu_name: stremi-pdu2
-      pdu_position: 13
+      uid: stremi-pdu2
+      port: 13
   stremi-14:
     network_adapters:
       eth0:
         switch: gw-reims
         switch_port: Gi0/14
     pdu:
-      pdu_name: stremi-pdu2
-      pdu_position: 14
+      uid: stremi-pdu2
+      port: 14
   stremi-15:
     network_adapters:
       eth0:
         switch: gw-reims
         switch_port: Gi0/15
     pdu:
-      pdu_name: stremi-pdu2
-      pdu_position: 15
+      uid: stremi-pdu2
+      port: 15
   stremi-16:
     network_adapters:
       eth0:
         switch: gw-reims
         switch_port: Gi0/16
     pdu:
-      pdu_name: stremi-pdu2
-      pdu_position: 16
+      uid: stremi-pdu2
+      port: 16
   stremi-17:
     network_adapters:
       eth0:
         switch: gw-reims
         switch_port: Gi0/17
     pdu:
-      pdu_name: stremi-pdu2
-      pdu_position: 17
+      uid: stremi-pdu2
+      port: 17
   stremi-18:
     network_adapters:
       eth0:
         switch: gw-reims
         switch_port: Gi0/18
     pdu:
-      pdu_name: stremi-pdu1
-      pdu_position: 1
+      uid: stremi-pdu1
+      port: 1
   stremi-19:
     network_adapters:
       eth0:
         switch: gw-reims
         switch_port: Gi0/19
     pdu:
-      pdu_name: stremi-pdu1
-      pdu_position: 2
+      uid: stremi-pdu1
+      port: 2
   stremi-20:
     network_adapters:
       eth0:
         switch: gw-reims
         switch_port: Gi0/20
     pdu:
-      pdu_name: stremi-pdu1
-      pdu_position: 3
+      uid: stremi-pdu1
+      port: 3
   stremi-21:
     network_adapters:
       eth0:
         switch: gw-reims
         switch_port: Gi0/21
     pdu:
-      pdu_name: stremi-pdu1
-      pdu_position: 4
+      uid: stremi-pdu1
+      port: 4
   stremi-22:
     network_adapters:
       eth0:
         switch: gw-reims
         switch_port: Gi0/22
     pdu:
-      pdu_name: stremi-pdu1
-      pdu_position: 5
+      uid: stremi-pdu1
+      port: 5
   stremi-23:
     network_adapters:
       eth0:
         switch: gw-reims
         switch_port: Gi0/23
     pdu:
-      pdu_name: stremi-pdu1
-      pdu_position: 6
+      uid: stremi-pdu1
+      port: 6
   stremi-24:
     network_adapters:
       eth0:
         switch: gw-reims
         switch_port: Gi0/24
     pdu:
-      pdu_name: stremi-pdu1
-      pdu_position: 7
+      uid: stremi-pdu1
+      port: 7
   stremi-25:
     network_adapters:
       eth0:
         switch: gw-reims
         switch_port: Gi0/25
     pdu:
-      pdu_name: stremi-pdu1
-      pdu_position: 8
+      uid: stremi-pdu1
+      port: 8
   stremi-26:
     network_adapters:
       eth0:
         switch: gw-reims
         switch_port: Gi0/26
     pdu:
-      pdu_name: stremi-pdu1
-      pdu_position: 9
+      uid: stremi-pdu1
+      port: 9
   stremi-27:
     network_adapters:
       eth0:
         switch: gw-reims
         switch_port: Gi0/27
     pdu:
-      pdu_name: stremi-pdu1
-      pdu_position: 10
+      uid: stremi-pdu1
+      port: 10
   stremi-28:
     network_adapters:
       eth0:
         switch: gw-reims
         switch_port: Gi0/28
     pdu:
-      pdu_name: stremi-pdu1
-      pdu_position: 11
+      uid: stremi-pdu1
+      port: 11
   stremi-29:
     network_adapters:
       eth0:
         switch: gw-reims
         switch_port: Gi0/29
     pdu:
-      pdu_name: stremi-pdu1
-      pdu_position: 12
+      uid: stremi-pdu1
+      port: 12
   stremi-30:
     network_adapters:
       eth0:
         switch: gw-reims
         switch_port: Gi0/30
     pdu:
-      pdu_name: stremi-pdu1
-      pdu_position: 13
+      uid: stremi-pdu1
+      port: 13
   stremi-31:
     network_adapters:
       eth0:
         switch: gw-reims
         switch_port: Gi0/31
     pdu:
-      pdu_name: stremi-pdu1
-      pdu_position: 14
+      uid: stremi-pdu1
+      port: 14
   stremi-32:
     network_adapters:
       eth0:
         switch: gw-reims
         switch_port: Gi0/32
     pdu:
-      pdu_name: stremi-pdu1
-      pdu_position: 15
+      uid: stremi-pdu1
+      port: 15
   stremi-33:
     network_adapters:
       eth0:
         switch: gw-reims
         switch_port: Gi0/34
     pdu:
-      pdu_name: stremi-pdu1
-      pdu_position: 16
+      uid: stremi-pdu1
+      port: 16
   stremi-34:
     network_adapters:
       eth0:
         switch: gw-reims
         switch_port: Gi0/33
     pdu:
-      pdu_name: stremi-pdu1
-      pdu_position: 17
+      uid: stremi-pdu1
+      port: 17
   stremi-35:
     network_adapters:
       eth0:
         switch: gw-reims
         switch_port: Gi0/35
     pdu:
-      pdu_name: stremi-pdu3
-      pdu_position: 1
+      uid: stremi-pdu3
+      port: 1
   stremi-36:
     network_adapters:
       eth0:
         switch: gw-reims
         switch_port: Gi0/36
     pdu:
-      pdu_name: stremi-pdu3
-      pdu_position: 2
+      uid: stremi-pdu3
+      port: 2
   stremi-37:
     network_adapters:
       eth0:
         switch: gw-reims
         switch_port: Gi0/37
     pdu:
-      pdu_name: stremi-pdu3
-      pdu_position: 3
+      uid: stremi-pdu3
+      port: 3
   stremi-38:
     network_adapters:
       eth0:
         switch: gw-reims
         switch_port: Gi0/38
     pdu:
-      pdu_name: stremi-pdu3
-      pdu_position: 4
+      uid: stremi-pdu3
+      port: 4
   stremi-39:
     network_adapters:
       eth0:
         switch: gw-reims
         switch_port: Gi0/39
     pdu:
-      pdu_name: stremi-pdu3
-      pdu_position: 5
+      uid: stremi-pdu3
+      port: 5
   stremi-40:
     network_adapters:
       eth0:
         switch: gw-reims
         switch_port: Gi0/40
     pdu:
-      pdu_name: stremi-pdu3
-      pdu_position: 6
+      uid: stremi-pdu3
+      port: 6
   stremi-41:
     network_adapters:
       eth0:
         switch: gw-reims
         switch_port: Gi0/41
     pdu:
-      pdu_name: stremi-pdu3
-      pdu_position: 7
+      uid: stremi-pdu3
+      port: 7
   stremi-42:
     network_adapters:
       eth0:
         switch: gw-reims
         switch_port: Gi0/42
     pdu:
-      pdu_name: stremi-pdu3
-      pdu_position: 8
+      uid: stremi-pdu3
+      port: 8
   stremi-43:
     network_adapters:
       eth0:
         switch: gw-reims
         switch_port: Gi0/43
     pdu:
-      pdu_name: stremi-pdu3
-      pdu_position: 9
+      uid: stremi-pdu3
+      port: 9
   stremi-44:
     network_adapters:
       eth0:
         switch: gw-reims
         switch_port: Gi0/44
     pdu:
-      pdu_name: stremi-pdu3
-      pdu_position: 10
+      uid: stremi-pdu3
+      port: 10
   
diff --git a/dev/input/grid5000/sites/rennes/clusters/parapide/parapide_manual.yaml b/dev/input/grid5000/sites/rennes/clusters/parapide/parapide_manual.yaml
index 517cb72d629d4d593d0997053159ecdde30dba37..93a05baefe40f2c99f15946ef19f535ba0862b86 100644
--- a/dev/input/grid5000/sites/rennes/clusters/parapide/parapide_manual.yaml
+++ b/dev/input/grid5000/sites/rennes/clusters/parapide/parapide_manual.yaml
@@ -6,173 +6,173 @@ nodes:
         switch: gw-rennes
         switch_port: Gi7/47
     pdu:
-      pdu_name: parapide-pdu-4
+      uid: parapide-pdu-4
   parapide-2:
     network_adapters:
       eth0:
         switch: gw-rennes
         switch_port: Gi7/48
     pdu:
-      pdu_name: parapide-pdu-3
+      uid: parapide-pdu-3
   parapide-3:
     network_adapters:
       eth0:
         switch: gw-rennes
         switch_port: Gi7/34
     pdu:
-      pdu_name: parapide-pdu-4
+      uid: parapide-pdu-4
   parapide-4:
     network_adapters:
       eth0:
         switch: gw-rennes
         switch_port: Gi7/46
     pdu:
-      pdu_name: parapide-pdu-3
+      uid: parapide-pdu-3
   parapide-5:
     network_adapters:
       eth0:
         switch: gw-rennes
         switch_port: Gi7/44
     pdu:
-      pdu_name: parapide-pdu-3
+      uid: parapide-pdu-3
   parapide-6:
     network_adapters:
       eth0:
         switch: gw-rennes
         switch_port: Gi7/39
     pdu:
-      pdu_name: parapide-pdu-4
+      uid: parapide-pdu-4
   parapide-7:
     network_adapters:
       eth0:
         switch: gw-rennes
         switch_port: Gi7/40
     pdu:
-      pdu_name: parapide-pdu-4
+      uid: parapide-pdu-4
   parapide-8:
     network_adapters:
       eth0:
         switch: gw-rennes
         switch_port: Gi7/42
     pdu:
-      pdu_name: parapide-pdu-3
+      uid: parapide-pdu-3
   parapide-9:
     network_adapters:
       eth0:
         switch: gw-rennes
         switch_port: Gi7/41
     pdu:
-      pdu_name: parapide-pdu-3
+      uid: parapide-pdu-3
   parapide-10:
     network_adapters:
       eth0:
         switch: gw-rennes
         switch_port: Gi7/43
     pdu:
-      pdu_name: parapide-pdu-3
+      uid: parapide-pdu-3
   parapide-11:
     network_adapters:
       eth0:
         switch: gw-rennes
         switch_port: Gi6/45
     pdu:
-      pdu_name: parapide-pdu-4
+      uid: parapide-pdu-4
   parapide-12:
     network_adapters:
       eth0:
         switch: gw-rennes
         switch_port: Gi6/48
     pdu:
-      pdu_name: parapide-pdu-4
+      uid: parapide-pdu-4
   parapide-13:
     network_adapters:
       eth0:
         switch: gw-rennes
         switch_port: Gi6/47
     pdu:
-      pdu_name: parapide-pdu-4
+      uid: parapide-pdu-4
   parapide-14:
     network_adapters:
       eth0:
         switch: gw-rennes
         switch_port: Gi6/44
     pdu:
-      pdu_name: parapide-pdu-1
+      uid: parapide-pdu-1
   parapide-15:
     network_adapters:
       eth0:
         switch: gw-rennes
         switch_port: Gi6/46
     pdu:
-      pdu_name: parapide-pdu-2
+      uid: parapide-pdu-2
   parapide-16:
     network_adapters:
       eth0:
         switch: gw-rennes
         switch_port: Gi6/42
     pdu:
-      pdu_name: parapide-pdu-1
+      uid: parapide-pdu-1
   parapide-17:
     network_adapters:
       eth0:
         switch: gw-rennes
         switch_port: Gi6/41
     pdu:
-      pdu_name: parapide-pdu-2
+      uid: parapide-pdu-2
   parapide-18:
     network_adapters:
       eth0:
         switch: gw-rennes
         switch_port: Gi6/39
     pdu:
-      pdu_name: parapide-pdu-1
+      uid: parapide-pdu-1
   parapide-19:
     network_adapters:
       eth0:
         switch: gw-rennes
         switch_port: Gi6/40
     pdu:
-      pdu_name: parapide-pdu-2
+      uid: parapide-pdu-2
   parapide-20:
     network_adapters:
       eth0:
         switch: gw-rennes
         switch_port: Gi6/43
     pdu:
-      pdu_name: parapide-pdu-1
+      uid: parapide-pdu-1
   parapide-21:
     network_adapters:
       eth0:
         switch: gw-rennes
         switch_port: Gi7/36
     pdu:
-      pdu_name: parapide-pdu-2
+      uid: parapide-pdu-2
   parapide-22:
     network_adapters:
       eth0:
         switch: gw-rennes
         switch_port: Gi6/38
     pdu:
-      pdu_name: parapide-pdu-1
+      uid: parapide-pdu-1
   parapide-23:
     network_adapters:
       eth0:
         switch: gw-rennes
         switch_port: Gi7/37
     pdu:
-      pdu_name: parapide-pdu-2
+      uid: parapide-pdu-2
   parapide-24:
     network_adapters:
       eth0:
         switch: gw-rennes
         switch_port: Gi6/37
     pdu:
-      pdu_name: parapide-pdu-1
+      uid: parapide-pdu-1
   parapide-25:
     network_adapters:
       eth0:
         switch: gw-rennes
         switch_port: Gi7/38
     pdu:
-      pdu_name: parapide-pdu-2
+      uid: parapide-pdu-2
   
diff --git a/dev/input/grid5000/sites/rennes/clusters/parapluie/parapluie_manual.yaml b/dev/input/grid5000/sites/rennes/clusters/parapluie/parapluie_manual.yaml
index 29399fc360763a0674650eb4d3afa51ca328dc32..e5dd7856a4cd82bdb668f8a76d5894fe5a959686 100644
--- a/dev/input/grid5000/sites/rennes/clusters/parapluie/parapluie_manual.yaml
+++ b/dev/input/grid5000/sites/rennes/clusters/parapluie/parapluie_manual.yaml
@@ -6,318 +6,318 @@ nodes:
         switch: gw-rennes
         switch_port: Gi3/42
     pdu:
-      pdu_name: parapluie-pdu-1
-      pdu_position: 24
+      uid: parapluie-pdu-1
+      port: 24
   parapluie-2:
     network_adapters:
       eth1:
         switch: gw-rennes
         switch_port: Gi2/32
     pdu:
-      pdu_name: parapluie-pdu-1
-      pdu_position: 23
+      uid: parapluie-pdu-1
+      port: 23
   parapluie-3:
     network_adapters:
       eth1:
         switch: gw-rennes
         switch_port: Gi2/34
     pdu:
-      pdu_name: parapluie-pdu-1
-      pdu_position: 22
+      uid: parapluie-pdu-1
+      port: 22
   parapluie-4:
     network_adapters:
       eth1:
         switch: gw-rennes
         switch_port: Gi3/45
     pdu:
-      pdu_name: parapluie-pdu-1
-      pdu_position: 21
+      uid: parapluie-pdu-1
+      port: 21
   parapluie-5:
     network_adapters:
       eth1:
         switch: gw-rennes
         switch_port: Gi2/29
     pdu:
-      pdu_name: parapluie-pdu-1
-      pdu_position: 20
+      uid: parapluie-pdu-1
+      port: 20
   parapluie-6:
     network_adapters:
       eth1:
         switch: gw-rennes
         switch_port: Gi2/36
     pdu:
-      pdu_name: parapluie-pdu-1
-      pdu_position: 5
+      uid: parapluie-pdu-1
+      port: 5
   parapluie-7:
     network_adapters:
       eth1:
         switch: gw-rennes
         switch_port: Gi3/44
     pdu:
-      pdu_name: parapluie-pdu-1
-      pdu_position: 4
+      uid: parapluie-pdu-1
+      port: 4
   parapluie-8:
     network_adapters:
       eth1:
         switch: gw-rennes
         switch_port: Gi2/33
     pdu:
-      pdu_name: parapluie-pdu-1
-      pdu_position: 3
+      uid: parapluie-pdu-1
+      port: 3
   parapluie-9:
     network_adapters:
       eth1:
         switch: gw-rennes
         switch_port: Gi2/35
     pdu:
-      pdu_name: parapluie-pdu-1
-      pdu_position: 2
+      uid: parapluie-pdu-1
+      port: 2
   parapluie-10:
     network_adapters:
       eth1:
         switch: gw-rennes
         switch_port: Gi2/31
     pdu:
-      pdu_name: parapluie-pdu-1
-      pdu_position: 1
+      uid: parapluie-pdu-1
+      port: 1
   parapluie-11:
     network_adapters:
       eth1:
         switch: gw-rennes
         switch_port: Gi2/40
     pdu:
-      pdu_name: parapluie-pdu-2
-      pdu_position: 24
+      uid: parapluie-pdu-2
+      port: 24
   parapluie-12:
     network_adapters:
       eth1:
         switch: gw-rennes
         switch_port: Gi2/41
     pdu:
-      pdu_name: parapluie-pdu-2
-      pdu_position: 23
+      uid: parapluie-pdu-2
+      port: 23
   parapluie-13:
     network_adapters:
       eth1:
         switch: gw-rennes
         switch_port: Gi2/37
     pdu:
-      pdu_name: parapluie-pdu-2
-      pdu_position: 22
+      uid: parapluie-pdu-2
+      port: 22
   parapluie-14:
     network_adapters:
       eth1:
         switch: gw-rennes
         switch_port: Gi2/38
     pdu:
-      pdu_name: parapluie-pdu-2
-      pdu_position: 21
+      uid: parapluie-pdu-2
+      port: 21
   parapluie-15:
     network_adapters:
       eth1:
         switch: gw-rennes
         switch_port: Gi2/39
     pdu:
-      pdu_name: parapluie-pdu-2
-      pdu_position: 20
+      uid: parapluie-pdu-2
+      port: 20
   parapluie-16:
     network_adapters:
       eth1:
         switch: gw-rennes
         switch_port: Gi2/44
     pdu:
-      pdu_name: parapluie-pdu-2
-      pdu_position: 5
+      uid: parapluie-pdu-2
+      port: 5
   parapluie-17:
     network_adapters:
       eth1:
         switch: gw-rennes
         switch_port: Gi2/46
     pdu:
-      pdu_name: parapluie-pdu-2
-      pdu_position: 4
+      uid: parapluie-pdu-2
+      port: 4
   parapluie-18:
     network_adapters:
       eth1:
         switch: gw-rennes
         switch_port: Gi2/45
     pdu:
-      pdu_name: parapluie-pdu-2
-      pdu_position: 3
+      uid: parapluie-pdu-2
+      port: 3
   parapluie-19:
     network_adapters:
       eth1:
         switch: gw-rennes
         switch_port: Gi2/42
     pdu:
-      pdu_name: parapluie-pdu-2
-      pdu_position: 2
+      uid: parapluie-pdu-2
+      port: 2
   parapluie-20:
     network_adapters:
       eth1:
         switch: gw-rennes
         switch_port: Gi2/43
     pdu:
-      pdu_name: parapluie-pdu-2
-      pdu_position: 1
+      uid: parapluie-pdu-2
+      port: 1
   parapluie-21:
     network_adapters:
       eth1:
         switch: gw-rennes
         switch_port: Gi3/47
     pdu:
-      pdu_name: parapluie-pdu-3
-      pdu_position: 24
+      uid: parapluie-pdu-3
+      port: 24
   parapluie-22:
     network_adapters:
       eth1:
         switch: gw-rennes
         switch_port: Gi3/48
     pdu:
-      pdu_name: parapluie-pdu-3
-      pdu_position: 23
+      uid: parapluie-pdu-3
+      port: 23
   parapluie-23:
     network_adapters:
       eth1:
         switch: gw-rennes
         switch_port: Gi3/46
     pdu:
-      pdu_name: parapluie-pdu-3
-      pdu_position: 22
+      uid: parapluie-pdu-3
+      port: 22
   parapluie-24:
     network_adapters:
       eth1:
         switch: gw-rennes
         switch_port: Gi2/48
     pdu:
-      pdu_name: parapluie-pdu-3
-      pdu_position: 21
+      uid: parapluie-pdu-3
+      port: 21
   parapluie-25:
     network_adapters:
       eth1:
         switch: gw-rennes
         switch_port: Gi2/47
     pdu:
-      pdu_name: parapluie-pdu-3
-      pdu_position: 20
+      uid: parapluie-pdu-3
+      port: 20
   parapluie-26:
     network_adapters:
       eth1:
         switch: gw-rennes
         switch_port: Gi4/46
     pdu:
-      pdu_name: parapluie-pdu-3
-      pdu_position: 5
+      uid: parapluie-pdu-3
+      port: 5
   parapluie-27:
     network_adapters:
       eth1:
         switch: gw-rennes
         switch_port: Gi4/32
     pdu:
-      pdu_name: parapluie-pdu-3
-      pdu_position: 4
+      uid: parapluie-pdu-3
+      port: 4
   parapluie-28:
     network_adapters:
       eth1:
         switch: gw-rennes
         switch_port: Gi4/31
     pdu:
-      pdu_name: parapluie-pdu-3
-      pdu_position: 3
+      uid: parapluie-pdu-3
+      port: 3
   parapluie-29:
     network_adapters:
       eth1:
         switch: gw-rennes
         switch_port: Gi4/48
     pdu:
-      pdu_name: parapluie-pdu-3
-      pdu_position: 2
+      uid: parapluie-pdu-3
+      port: 2
   parapluie-30:
     network_adapters:
       eth1:
         switch: gw-rennes
         switch_port: Gi4/42
     pdu:
-      pdu_name: parapluie-pdu-3
-      pdu_position: 1
+      uid: parapluie-pdu-3
+      port: 1
   parapluie-31:
     network_adapters:
       eth1:
         switch: gw-rennes
         switch_port: Gi4/41
     pdu:
-      pdu_name: parapluie-pdu-4
-      pdu_position: 24
+      uid: parapluie-pdu-4
+      port: 24
   parapluie-32:
     network_adapters:
       eth1:
         switch: gw-rennes
         switch_port: Gi4/40
     pdu:
-      pdu_name: parapluie-pdu-4
-      pdu_position: 23
+      uid: parapluie-pdu-4
+      port: 23
   parapluie-33:
     network_adapters:
       eth1:
         switch: gw-rennes
         switch_port: Gi6/33
     pdu:
-      pdu_name: parapluie-pdu-4
-      pdu_position: 22
+      uid: parapluie-pdu-4
+      port: 22
   parapluie-34:
     network_adapters:
       eth1:
         switch: gw-rennes
         switch_port: Gi4/39
     pdu:
-      pdu_name: parapluie-pdu-4
-      pdu_position: 21
+      uid: parapluie-pdu-4
+      port: 21
   parapluie-35:
     network_adapters:
       eth1:
         switch: gw-rennes
         switch_port: Gi4/33
     pdu:
-      pdu_name: parapluie-pdu-4
-      pdu_position: 20
+      uid: parapluie-pdu-4
+      port: 20
   parapluie-36:
     network_adapters:
       eth1:
         switch: gw-rennes
         switch_port: Gi4/35
     pdu:
-      pdu_name: parapluie-pdu-4
-      pdu_position: 5
+      uid: parapluie-pdu-4
+      port: 5
   parapluie-37:
     network_adapters:
       eth1:
         switch: gw-rennes
         switch_port: Gi4/38
     pdu:
-      pdu_name: parapluie-pdu-4
-      pdu_position: 4
+      uid: parapluie-pdu-4
+      port: 4
   parapluie-38:
     network_adapters:
       eth1:
         switch: gw-rennes
         switch_port: Gi4/34
     pdu:
-      pdu_name: parapluie-pdu-4
-      pdu_position: 3
+      uid: parapluie-pdu-4
+      port: 3
   parapluie-39:
     network_adapters:
       eth1:
         switch: gw-rennes
         switch_port: Gi4/36
     pdu:
-      pdu_name: parapluie-pdu-4
-      pdu_position: 2
+      uid: parapluie-pdu-4
+      port: 2
   parapluie-40:
     network_adapters:
       eth1:
         switch: gw-rennes
         switch_port: Gi4/37
     pdu:
-      pdu_name: parapluie-pdu-4
-      pdu_position: 1
+      uid: parapluie-pdu-4
+      port: 1
   
diff --git a/dev/input/grid5000/sites/rennes/clusters/parasilo/parasilo_manual.yaml b/dev/input/grid5000/sites/rennes/clusters/parasilo/parasilo_manual.yaml
index f6368cb4d7353fbcaf3c89a560d1bb6af04e00a9..72fbec2f3aa4b5af7c3a8dd874b904c0082c2dc4 100644
--- a/dev/input/grid5000/sites/rennes/clusters/parasilo/parasilo_manual.yaml
+++ b/dev/input/grid5000/sites/rennes/clusters/parasilo/parasilo_manual.yaml
@@ -2,114 +2,114 @@
 nodes:
   parasilo-1:
     pdu:
-      pdu_name: parasilo-pdu-2
-      pdu_position: 7
+      uid: parasilo-pdu-2
+      port: 7
   parasilo-2:
     pdu:
-      pdu_name: parasilo-pdu-2
-      pdu_position: 9
+      uid: parasilo-pdu-2
+      port: 9
   parasilo-3:
     pdu:
-      pdu_name: parasilo-pdu-2
-      pdu_position: 16
+      uid: parasilo-pdu-2
+      port: 16
   parasilo-4:
     pdu:
-      pdu_name: parasilo-pdu-2
-      pdu_position: 6
+      uid: parasilo-pdu-2
+      port: 6
   parasilo-5:
     pdu:
-      pdu_name: parasilo-pdu-2
-      pdu_position: 5
+      uid: parasilo-pdu-2
+      port: 5
   parasilo-6:
     pdu:
-      pdu_name: parasilo-pdu-4
-      pdu_position: 9
+      uid: parasilo-pdu-4
+      port: 9
   parasilo-7:
     pdu:
-      pdu_name: parasilo-pdu-2
-      pdu_position: 4
+      uid: parasilo-pdu-2
+      port: 4
   parasilo-8:
     pdu:
-      pdu_name: parasilo-pdu-3
-      pdu_position: 9
+      uid: parasilo-pdu-3
+      port: 9
   parasilo-9:
     pdu:
-      pdu_name: parasilo-pdu-2
-      pdu_position: 3
+      uid: parasilo-pdu-2
+      port: 3
   parasilo-10:
     pdu:
-      pdu_name: parasilo-pdu-2
-      pdu_position: 11
+      uid: parasilo-pdu-2
+      port: 11
   parasilo-11:
     pdu:
-      pdu_name: parasilo-pdu-2
-      pdu_position: 2
+      uid: parasilo-pdu-2
+      port: 2
   parasilo-12:
     pdu:
-      pdu_name: parasilo-pdu-4
-      pdu_position: 7
+      uid: parasilo-pdu-4
+      port: 7
   parasilo-13:
     pdu:
-      pdu_name: parasilo-pdu-3
-      pdu_position: 7
+      uid: parasilo-pdu-3
+      port: 7
   parasilo-14:
     pdu:
-      pdu_name: parasilo-pdu-3
-      pdu_position: 6
+      uid: parasilo-pdu-3
+      port: 6
   parasilo-15:
     pdu:
-      pdu_name: parasilo-pdu-4
-      pdu_position: 6
+      uid: parasilo-pdu-4
+      port: 6
   parasilo-16:
     pdu:
-      pdu_name: parasilo-pdu-3
-      pdu_position: 5
+      uid: parasilo-pdu-3
+      port: 5
   parasilo-17:
     pdu:
-      pdu_name: parasilo-pdu-4
-      pdu_position: 5
+      uid: parasilo-pdu-4
+      port: 5
   parasilo-18:
     pdu:
-      pdu_name: parasilo-pdu-3
-      pdu_position: 4
+      uid: parasilo-pdu-3
+      port: 4
   parasilo-19:
     pdu:
-      pdu_name: parasilo-pdu-4
-      pdu_position: 4
+      uid: parasilo-pdu-4
+      port: 4
   parasilo-20:
     pdu:
-      pdu_name: parasilo-pdu-3
-      pdu_position: 3
+      uid: parasilo-pdu-3
+      port: 3
   parasilo-21:
     pdu:
-      pdu_name: parasilo-pdu-4
-      pdu_position: 3
+      uid: parasilo-pdu-4
+      port: 3
   parasilo-22:
     pdu:
-      pdu_name: parasilo-pdu-3
-      pdu_position: 2
+      uid: parasilo-pdu-3
+      port: 2
   parasilo-23:
     pdu:
-      pdu_name: parasilo-pdu-4
-      pdu_position: 2
+      uid: parasilo-pdu-4
+      port: 2
   parasilo-24:
     pdu:
-      pdu_name: parasilo-pdu-4
-      pdu_position: 1
+      uid: parasilo-pdu-4
+      port: 1
   parasilo-25:
     pdu:
-      pdu_name: parasilo-pdu-2
-      pdu_position: 17
+      uid: parasilo-pdu-2
+      port: 17
   parasilo-26:
     pdu:
-      pdu_name: parasilo-pdu-2
-      pdu_position: 22
+      uid: parasilo-pdu-2
+      port: 22
   parasilo-27:
     pdu:
-      pdu_name: parasilo-pdu-2
-      pdu_position: 16
+      uid: parasilo-pdu-2
+      port: 16
   parasilo-28:
     pdu:
-      pdu_name: parasilo-pdu-2
-      pdu_position: 21
+      uid: parasilo-pdu-2
+      port: 21
   
diff --git a/dev/input/grid5000/sites/rennes/clusters/paravance/paravance_manual.yaml b/dev/input/grid5000/sites/rennes/clusters/paravance/paravance_manual.yaml
index 14d2eb78f6f3e3ec295720032a4e83ac9bd54a7e..b7b4b238ad0a64c42a0287a9c67aa5367c3f4704 100644
--- a/dev/input/grid5000/sites/rennes/clusters/paravance/paravance_manual.yaml
+++ b/dev/input/grid5000/sites/rennes/clusters/paravance/paravance_manual.yaml
@@ -2,290 +2,290 @@
 nodes:
   paravance-1:
     pdu:
-      pdu_name: paravance-pdu-1
-      pdu_position: 6
+      uid: paravance-pdu-1
+      port: 6
   paravance-2:
     pdu:
-      pdu_name: paravance-pdu-1
-      pdu_position: 5
+      uid: paravance-pdu-1
+      port: 5
   paravance-3:
     pdu:
-      pdu_name: paravance-pdu-2
-      pdu_position: 5
+      uid: paravance-pdu-2
+      port: 5
   paravance-4:
     pdu:
-      pdu_name: paravance-pdu-1
-      pdu_position: 4
+      uid: paravance-pdu-1
+      port: 4
   paravance-5:
     pdu:
-      pdu_name: paravance-pdu-2
-      pdu_position: 4
+      uid: paravance-pdu-2
+      port: 4
   paravance-6:
     pdu:
-      pdu_name: paravance-pdu-1
-      pdu_position: 3
+      uid: paravance-pdu-1
+      port: 3
   paravance-7:
     pdu:
-      pdu_name: paravance-pdu-3
-      pdu_position: 10
+      uid: paravance-pdu-3
+      port: 10
   paravance-8:
     pdu:
-      pdu_name: paravance-pdu-4
-      pdu_position: 10
+      uid: paravance-pdu-4
+      port: 10
   paravance-9:
     pdu:
-      pdu_name: paravance-pdu-3
-      pdu_position: 9
+      uid: paravance-pdu-3
+      port: 9
   paravance-10:
     pdu:
-      pdu_name: paravance-pdu-4
-      pdu_position: 9
+      uid: paravance-pdu-4
+      port: 9
   paravance-11:
     pdu:
-      pdu_name: paravance-pdu-4
-      pdu_position: 7
+      uid: paravance-pdu-4
+      port: 7
   paravance-12:
     pdu:
-      pdu_name: paravance-pdu-3
-      pdu_position: 7
+      uid: paravance-pdu-3
+      port: 7
   paravance-13:
     pdu:
-      pdu_name: paravance-pdu-4
-      pdu_position: 6
+      uid: paravance-pdu-4
+      port: 6
   paravance-14:
     pdu:
-      pdu_name: paravance-pdu-3
-      pdu_position: 6
+      uid: paravance-pdu-3
+      port: 6
   paravance-15:
     pdu:
-      pdu_name: paravance-pdu-4
-      pdu_position: 5
+      uid: paravance-pdu-4
+      port: 5
   paravance-16:
     pdu:
-      pdu_name: paravance-pdu-3
-      pdu_position: 5
+      uid: paravance-pdu-3
+      port: 5
   paravance-17:
     pdu:
-      pdu_name: paravance-pdu-4
-      pdu_position: 4
+      uid: paravance-pdu-4
+      port: 4
   paravance-18:
     pdu:
-      pdu_name: paravance-pdu-3
-      pdu_position: 4
+      uid: paravance-pdu-3
+      port: 4
   paravance-19:
     pdu:
-      pdu_name: paravance-pdu-4
-      pdu_position: 3
+      uid: paravance-pdu-4
+      port: 3
   paravance-20:
     pdu:
-      pdu_name: paravance-pdu-3
-      pdu_position: 3
+      uid: paravance-pdu-3
+      port: 3
   paravance-21:
     pdu:
-      pdu_name: paravance-pdu-4
-      pdu_position: 2
+      uid: paravance-pdu-4
+      port: 2
   paravance-22:
     pdu:
-      pdu_name: paravance-pdu-3
-      pdu_position: 2
+      uid: paravance-pdu-3
+      port: 2
   paravance-23:
     pdu:
-      pdu_name: paravance-pdu-3
-      pdu_position: 1
+      uid: paravance-pdu-3
+      port: 1
   paravance-24:
     pdu:
-      pdu_name: paravance-pdu-4
-      pdu_position: 1
+      uid: paravance-pdu-4
+      port: 1
   paravance-25:
     pdu:
-      pdu_name: paravance-pdu-2
-      pdu_position: 22
+      uid: paravance-pdu-2
+      port: 22
   paravance-26:
     pdu:
-      pdu_name: paravance-pdu-2
-      pdu_position: 21
+      uid: paravance-pdu-2
+      port: 21
   paravance-27:
     pdu:
-      pdu_name: paravance-pdu-1
-      pdu_position: 18
+      uid: paravance-pdu-1
+      port: 18
   paravance-28:
     pdu:
-      pdu_name: paravance-pdu-2
-      pdu_position: 17
+      uid: paravance-pdu-2
+      port: 17
   paravance-29:
     pdu:
-      pdu_name: paravance-pdu-1
-      pdu_position: 17
+      uid: paravance-pdu-1
+      port: 17
   paravance-30:
     pdu:
-      pdu_name: paravance-pdu-1
-      pdu_position: 15
+      uid: paravance-pdu-1
+      port: 15
   paravance-31:
     pdu:
-      pdu_name: paravance-pdu-2
-      pdu_position: 13
+      uid: paravance-pdu-2
+      port: 13
   paravance-32:
     pdu:
-      pdu_name: paravance-pdu-1
-      pdu_position: 13
+      uid: paravance-pdu-1
+      port: 13
   paravance-33:
     pdu:
-      pdu_name: paravance-pdu-2
-      pdu_position: 11
+      uid: paravance-pdu-2
+      port: 11
   paravance-34:
     pdu:
-      pdu_name: paravance-pdu-1
-      pdu_position: 11
+      uid: paravance-pdu-1
+      port: 11
   paravance-35:
     pdu:
-      pdu_name: paravance-pdu-2
-      pdu_position: 10
+      uid: paravance-pdu-2
+      port: 10
   paravance-36:
     pdu:
-      pdu_name: paravance-pdu-1
-      pdu_position: 10
+      uid: paravance-pdu-1
+      port: 10
   paravance-37:
     pdu:
-      pdu_name: paravance-pdu-7
-      pdu_position: 9
+      uid: paravance-pdu-7
+      port: 9
   paravance-38:
     pdu:
-      pdu_name: paravance-pdu-8
-      pdu_position: 9
+      uid: paravance-pdu-8
+      port: 9
   paravance-39:
     pdu:
-      pdu_name: paravance-pdu-7
-      pdu_position: 10
+      uid: paravance-pdu-7
+      port: 10
   paravance-40:
     pdu:
-      pdu_name: paravance-pdu-8
-      pdu_position: 10
+      uid: paravance-pdu-8
+      port: 10
   paravance-41:
     pdu:
-      pdu_name: paravance-pdu-8
-      pdu_position: 11
+      uid: paravance-pdu-8
+      port: 11
   paravance-42:
     pdu:
-      pdu_name: paravance-pdu-6
-      pdu_position: 3
+      uid: paravance-pdu-6
+      port: 3
   paravance-43:
     pdu:
-      pdu_name: paravance-pdu-6
-      pdu_position: 2
+      uid: paravance-pdu-6
+      port: 2
   paravance-44:
     pdu:
-      pdu_name: paravance-pdu-5
-      pdu_position: 2
+      uid: paravance-pdu-5
+      port: 2
   paravance-45:
     pdu:
-      pdu_name: paravance-pdu-5
-      pdu_position: 1
+      uid: paravance-pdu-5
+      port: 1
   paravance-46:
     pdu:
-      pdu_name: paravance-pdu-6
-      pdu_position: 1
+      uid: paravance-pdu-6
+      port: 1
   paravance-47:
     pdu:
-      pdu_name: paravance-pdu-7
-      pdu_position: 7
+      uid: paravance-pdu-7
+      port: 7
   paravance-48:
     pdu:
-      pdu_name: paravance-pdu-8
-      pdu_position: 7
+      uid: paravance-pdu-8
+      port: 7
   paravance-49:
     pdu:
-      pdu_name: paravance-pdu-7
-      pdu_position: 6
+      uid: paravance-pdu-7
+      port: 6
   paravance-50:
     pdu:
-      pdu_name: paravance-pdu-7
-      pdu_position: 5
+      uid: paravance-pdu-7
+      port: 5
   paravance-51:
     pdu:
-      pdu_name: paravance-pdu-8
-      pdu_position: 5
+      uid: paravance-pdu-8
+      port: 5
   paravance-52:
     pdu:
-      pdu_name: paravance-pdu-8
-      pdu_position: 3
+      uid: paravance-pdu-8
+      port: 3
   paravance-53:
     pdu:
-      pdu_name: paravance-pdu-7
-      pdu_position: 4
+      uid: paravance-pdu-7
+      port: 4
   paravance-54:
     pdu:
-      pdu_name: paravance-pdu-7
-      pdu_position: 3
+      uid: paravance-pdu-7
+      port: 3
   paravance-55:
     pdu:
-      pdu_name: paravance-pdu-8
-      pdu_position: 4
+      uid: paravance-pdu-8
+      port: 4
   paravance-56:
     pdu:
-      pdu_name: paravance-pdu-7
-      pdu_position: 2
+      uid: paravance-pdu-7
+      port: 2
   paravance-57:
     pdu:
-      pdu_name: paravance-pdu-8
-      pdu_position: 2
+      uid: paravance-pdu-8
+      port: 2
   paravance-58:
     pdu:
-      pdu_name: paravance-pdu-7
-      pdu_position: 1
+      uid: paravance-pdu-7
+      port: 1
   paravance-59:
     pdu:
-      pdu_name: paravance-pdu-8
-      pdu_position: 1
+      uid: paravance-pdu-8
+      port: 1
   paravance-60:
     pdu:
-      pdu_name: paravance-pdu-6
-      pdu_position: 21
+      uid: paravance-pdu-6
+      port: 21
   paravance-61:
     pdu:
-      pdu_name: paravance-pdu-5
-      pdu_position: 21
+      uid: paravance-pdu-5
+      port: 21
   paravance-62:
     pdu:
-      pdu_name: paravance-pdu-6
-      pdu_position: 19
+      uid: paravance-pdu-6
+      port: 19
   paravance-63:
     pdu:
-      pdu_name: paravance-pdu-5
-      pdu_position: 19
+      uid: paravance-pdu-5
+      port: 19
   paravance-64:
     pdu:
-      pdu_name: paravance-pdu-6
-      pdu_position: 17
+      uid: paravance-pdu-6
+      port: 17
   paravance-65:
     pdu:
-      pdu_name: paravance-pdu-5
-      pdu_position: 17
+      uid: paravance-pdu-5
+      port: 17
   paravance-66:
     pdu:
-      pdu_name: paravance-pdu-5
-      pdu_position: 15
+      uid: paravance-pdu-5
+      port: 15
   paravance-67:
     pdu:
-      pdu_name: paravance-pdu-6
-      pdu_position: 14
+      uid: paravance-pdu-6
+      port: 14
   paravance-68:
     pdu:
-      pdu_name: paravance-pdu-5
-      pdu_position: 12
+      uid: paravance-pdu-5
+      port: 12
   paravance-69:
     pdu:
-      pdu_name: paravance-pdu-6
-      pdu_position: 10
+      uid: paravance-pdu-6
+      port: 10
   paravance-70:
     pdu:
-      pdu_name: paravance-pdu-5
-      pdu_position: 10
+      uid: paravance-pdu-5
+      port: 10
   paravance-71:
     pdu:
-      pdu_name: paravance-pdu-6
-      pdu_position: 9
+      uid: paravance-pdu-6
+      port: 9
   paravance-72:
     pdu:
-      pdu_name: paravance-pdu-5
-      pdu_position: 9
+      uid: paravance-pdu-5
+      port: 9
   
diff --git a/dev/reference-api/reference-api.rb b/dev/reference-api/reference-api.rb
index f700ce36bed42f56758392e4f38d17e7b86c92b3..acdae47dfe83bce6c66914badb5af71b028c7938 100755
--- a/dev/reference-api/reference-api.rb
+++ b/dev/reference-api/reference-api.rb
@@ -136,43 +136,24 @@ global_hash["sites"].each do |site_uid, site|
       node["monitoring"]["wattmeter"] ||= false
       node["monitoring"]["wattmeter"] = "true"  if node["monitoring"]["wattmeter"] == true
       node["monitoring"]["wattmeter"] = "false" if node["monitoring"]["wattmeter"] == false
-      if (node.key?("pdu") && node["pdu"].key?("pdu_name")) ||
-          (node.key?("pdu1") && node["pdu1"].key?("pdu_name"))
-
-        #if cluster_uid == "graphene"
-        #  pp "#{pdu_name} #{pdu_position} : #{pdu_info[pdu_name][pdu_position]}"
-        #end
-
-#       if pdu_info[pdu_name][pdu_position] == 1
-#         node["monitoring"]["wattmeter"] = "true"
-#       else
-#         node["monitoring"]["wattmeter"] = "shared"
-#       end
-
+      if node.key?("pdu")
+        node["pdu"] = [ node["pdu"] ] if node["pdu"].is_a?(Hash) # only one PDU : put the PDU entry in an array
+        
         node["sensors"]["power"] ||= {}
+        node["sensors"]["power"]["via"] ||= {}
+        node["sensors"]["power"]["via"]["api"] ||= {}
+
         node["sensors"]["power"]["available"] = true if node["monitoring"]["wattmeter"] != "false"
+        node["sensors"]["power"]["via"]["pdu"] = node.delete("pdu")
 
-        node["sensors"]["power"]["via"] ||= {}
-        node["sensors"]["power"]["via"]["pdu"] ||= []
-        i=0
-        ['pdu', 'pdu1', 'pdu2'].each { |key|
-          if (node.key?(key) and node[key].key?("pdu_name"))
-            node["sensors"]["power"]["via"]["pdu"][i] ||= {}            
-            node["sensors"]["power"]["via"]["pdu"][i]["uid"]  = node[key]["pdu_name"]
-            node["sensors"]["power"]["via"]["pdu"][i]["port"] = node[key]["pdu_position"] unless node["monitoring"]["wattmeter"] == "shared"
-            node["sensors"]["power"]["via"]["pdu"][i].delete("port") if node["monitoring"]["wattmeter"] == "shared"
-            node.delete(key)
-            i = i+1
-          end
+        # Remove 'port' info if PDU are shared
+        node["sensors"]["power"]["via"]["pdu"].each { |p|
+          p.delete("port") if node["monitoring"]["wattmeter"] == "shared"
         }
-       
-        #pp node["monitoring"]["wattmeter"]
 
         if node["monitoring"]["wattmeter"] == "yes"
-          node["sensors"]["power"]["via"]["api"] ||= {}
           node["sensors"]["power"]["via"]["api"]["metric"] = "pdu"
         elsif node["monitoring"]["wattmeter"] != "false"
-          node["sensors"]["power"]["via"]["api"] ||= {}
           node["sensors"]["power"]["via"]["api"]["metric"] = "power"
         end