diff --git a/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-1.json b/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-1.json
index 2ee6b32f92b2cd7ca8445e1571ecd558ee1f61f4..52062b9589fc36eaeac162f33befa3fe601cdc96 100644
--- a/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-1.json
+++ b/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-1.json
@@ -107,6 +107,7 @@
       "management": false,
       "mountable": true,
       "mounted": false,
+      "network_address": "petitprince-1-eth1.luxembourg.grid5000.fr",
       "rate": 10000000000,
       "switch": "mxl2",
       "switch_port": "TenGigabitEthernet 0/1"
diff --git a/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-10.json b/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-10.json
index f333aa50786af2ae941e3a6f203afde6bc0aad2b..131b334a0c142992aed9480b37e794b9e83276d0 100644
--- a/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-10.json
+++ b/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-10.json
@@ -107,6 +107,7 @@
       "management": false,
       "mountable": true,
       "mounted": false,
+      "network_address": "petitprince-10-eth1.luxembourg.grid5000.fr",
       "rate": 10000000000,
       "switch": "mxl2",
       "switch_port": "TenGigabitEthernet 0/10"
diff --git a/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-11.json b/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-11.json
index 1b58f587b862ec720a4419630e417a8e42148586..9e325c16d95554912d43ae049bba0351b8916383 100644
--- a/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-11.json
+++ b/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-11.json
@@ -107,6 +107,7 @@
       "management": false,
       "mountable": true,
       "mounted": false,
+      "network_address": "petitprince-11-eth1.luxembourg.grid5000.fr",
       "rate": 10000000000,
       "switch": "mxl2",
       "switch_port": "TenGigabitEthernet 0/11"
diff --git a/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-12.json b/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-12.json
index bd4e1ec1a4531c8c2a81f311c60cd8c1eddb9330..5e8da010be513a1dbe1bc2241ffefcba0ba62692 100644
--- a/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-12.json
+++ b/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-12.json
@@ -107,6 +107,7 @@
       "management": false,
       "mountable": true,
       "mounted": false,
+      "network_address": "petitprince-12-eth1.luxembourg.grid5000.fr",
       "rate": 10000000000,
       "switch": "mxl2",
       "switch_port": "TenGigabitEthernet 0/12"
diff --git a/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-13.json b/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-13.json
index 88c38342c9a060c0c02f0c0b9c5e8b6643fd0f0c..345418c5b5dcdaf01d58540ed71fd6ee5ab3b7e9 100644
--- a/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-13.json
+++ b/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-13.json
@@ -107,6 +107,7 @@
       "management": false,
       "mountable": true,
       "mounted": false,
+      "network_address": "petitprince-13-eth1.luxembourg.grid5000.fr",
       "rate": 10000000000,
       "switch": "mxl2",
       "switch_port": "TenGigabitEthernet 0/13"
diff --git a/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-14.json b/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-14.json
index 9e27faf4f9dbaaf183fc1dfabaf83880e717e581..76fe4c1adce3bce6d6028116fae3353f75aab5bf 100644
--- a/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-14.json
+++ b/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-14.json
@@ -107,6 +107,7 @@
       "management": false,
       "mountable": true,
       "mounted": false,
+      "network_address": "petitprince-14-eth1.luxembourg.grid5000.fr",
       "rate": 10000000000,
       "switch": "mxl2",
       "switch_port": "TenGigabitEthernet 0/14"
diff --git a/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-15.json b/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-15.json
index 951269b1cbcfb02973e32f1e6577a1b47a2e8441..27170e5c6d18ff7ebefddbb7b35b95dc14749ed4 100644
--- a/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-15.json
+++ b/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-15.json
@@ -107,6 +107,7 @@
       "management": false,
       "mountable": true,
       "mounted": false,
+      "network_address": "petitprince-15-eth1.luxembourg.grid5000.fr",
       "rate": 10000000000,
       "switch": "mxl2",
       "switch_port": "TenGigabitEthernet 0/15"
diff --git a/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-16.json b/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-16.json
index c9337cb51f715bf489119af2a62bda96a435c433..dd54bdf62fb5fbc4dcb2251b69e0810d7c9cf153 100644
--- a/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-16.json
+++ b/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-16.json
@@ -107,6 +107,7 @@
       "management": false,
       "mountable": true,
       "mounted": false,
+      "network_address": "petitprince-16-eth1.luxembourg.grid5000.fr",
       "rate": 10000000000,
       "switch": "mxl2",
       "switch_port": "TenGigabitEthernet 0/16"
diff --git a/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-2.json b/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-2.json
index 92e1954e3bb2d0de5462f1e96d43ff5b52d7b2b0..0c8884a781698c5c42c85e051d210d257abb4998 100644
--- a/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-2.json
+++ b/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-2.json
@@ -107,6 +107,7 @@
       "management": false,
       "mountable": true,
       "mounted": false,
+      "network_address": "petitprince-2-eth1.luxembourg.grid5000.fr",
       "rate": 10000000000,
       "switch": "mxl2",
       "switch_port": "TenGigabitEthernet 0/2"
diff --git a/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-3.json b/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-3.json
index b49836ab576376d28ebd76496cc6d6c27dcc184e..bb9458a3a615e9aef3ab5fef7e20be0d3766154f 100644
--- a/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-3.json
+++ b/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-3.json
@@ -107,6 +107,7 @@
       "management": false,
       "mountable": true,
       "mounted": false,
+      "network_address": "petitprince-3-eth1.luxembourg.grid5000.fr",
       "rate": 10000000000,
       "switch": "mxl2",
       "switch_port": "TenGigabitEthernet 0/3"
diff --git a/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-4.json b/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-4.json
index 0bcffd93afb0c3334821f5fd2679f49308ca8afc..5d27c2c16008094de1e5d08becd190d1dc8a780e 100644
--- a/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-4.json
+++ b/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-4.json
@@ -107,6 +107,7 @@
       "management": false,
       "mountable": true,
       "mounted": false,
+      "network_address": "petitprince-4-eth1.luxembourg.grid5000.fr",
       "rate": 10000000000,
       "switch": "mxl2",
       "switch_port": "TenGigabitEthernet 0/4"
diff --git a/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-5.json b/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-5.json
index d21877ba309e555a8f2c802c1d816e93496f4ab0..44840fbf88dbcd406cabe6f5b6bb68ac9c692cf7 100644
--- a/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-5.json
+++ b/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-5.json
@@ -107,6 +107,7 @@
       "management": false,
       "mountable": true,
       "mounted": false,
+      "network_address": "petitprince-5-eth1.luxembourg.grid5000.fr",
       "rate": 10000000000,
       "switch": "mxl2",
       "switch_port": "TenGigabitEthernet 0/5"
diff --git a/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-6.json b/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-6.json
index 4e59e97c7632035c431af1acfd7f6445ef6b1966..3c9be466beba3aa431a572aaca8d933fc81ea5bb 100644
--- a/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-6.json
+++ b/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-6.json
@@ -107,6 +107,7 @@
       "management": false,
       "mountable": true,
       "mounted": false,
+      "network_address": "petitprince-6-eth1.luxembourg.grid5000.fr",
       "rate": 10000000000,
       "switch": "mxl2",
       "switch_port": "TenGigabitEthernet 0/6"
diff --git a/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-7.json b/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-7.json
index 0b7cb84ed5b56458724c4a54af21e6aae2add921..5e115d22700eb3de2adab6dfeefcdb441c1101b9 100644
--- a/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-7.json
+++ b/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-7.json
@@ -107,6 +107,7 @@
       "management": false,
       "mountable": true,
       "mounted": false,
+      "network_address": "petitprince-7-eth1.luxembourg.grid5000.fr",
       "rate": 10000000000,
       "switch": "mxl2",
       "switch_port": "TenGigabitEthernet 0/7"
diff --git a/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-8.json b/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-8.json
index 8f744748068087d3e43d6912133d480577761c4d..13195643b1fd510617a4ae7c7d90a20b05e08460 100644
--- a/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-8.json
+++ b/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-8.json
@@ -107,6 +107,7 @@
       "management": false,
       "mountable": true,
       "mounted": false,
+      "network_address": "petitprince-8-eth1.luxembourg.grid5000.fr",
       "rate": 10000000000,
       "switch": "mxl2",
       "switch_port": "TenGigabitEthernet 0/8"
diff --git a/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-9.json b/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-9.json
index 29ff5e5cb393501d33316135f91b053c22de8e95..f27277c28d638648f91923cd42719d7233b4c7db 100644
--- a/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-9.json
+++ b/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-9.json
@@ -107,6 +107,7 @@
       "management": false,
       "mountable": true,
       "mounted": false,
+      "network_address": "petitprince-9-eth1.luxembourg.grid5000.fr",
       "rate": 10000000000,
       "switch": "mxl2",
       "switch_port": "TenGigabitEthernet 0/9"
diff --git a/grid5000-all.json b/grid5000-all.json
index d2dc8fe5631c003bfb645d5536a168bc9d9e94a1..11788046549454dcc6856185f7f4ed791145007a 100644
--- a/grid5000-all.json
+++ b/grid5000-all.json
@@ -33546,6 +33546,7 @@
                   "management": false,
                   "mountable": true,
                   "mounted": false,
+                  "network_address": "petitprince-1-eth1.luxembourg.grid5000.fr",
                   "rate": 10000000000,
                   "switch": "mxl2",
                   "switch_port": "TenGigabitEthernet 0/1"
@@ -33735,6 +33736,7 @@
                   "management": false,
                   "mountable": true,
                   "mounted": false,
+                  "network_address": "petitprince-10-eth1.luxembourg.grid5000.fr",
                   "rate": 10000000000,
                   "switch": "mxl2",
                   "switch_port": "TenGigabitEthernet 0/10"
@@ -33924,6 +33926,7 @@
                   "management": false,
                   "mountable": true,
                   "mounted": false,
+                  "network_address": "petitprince-11-eth1.luxembourg.grid5000.fr",
                   "rate": 10000000000,
                   "switch": "mxl2",
                   "switch_port": "TenGigabitEthernet 0/11"
@@ -34113,6 +34116,7 @@
                   "management": false,
                   "mountable": true,
                   "mounted": false,
+                  "network_address": "petitprince-12-eth1.luxembourg.grid5000.fr",
                   "rate": 10000000000,
                   "switch": "mxl2",
                   "switch_port": "TenGigabitEthernet 0/12"
@@ -34302,6 +34306,7 @@
                   "management": false,
                   "mountable": true,
                   "mounted": false,
+                  "network_address": "petitprince-13-eth1.luxembourg.grid5000.fr",
                   "rate": 10000000000,
                   "switch": "mxl2",
                   "switch_port": "TenGigabitEthernet 0/13"
@@ -34491,6 +34496,7 @@
                   "management": false,
                   "mountable": true,
                   "mounted": false,
+                  "network_address": "petitprince-14-eth1.luxembourg.grid5000.fr",
                   "rate": 10000000000,
                   "switch": "mxl2",
                   "switch_port": "TenGigabitEthernet 0/14"
@@ -34680,6 +34686,7 @@
                   "management": false,
                   "mountable": true,
                   "mounted": false,
+                  "network_address": "petitprince-15-eth1.luxembourg.grid5000.fr",
                   "rate": 10000000000,
                   "switch": "mxl2",
                   "switch_port": "TenGigabitEthernet 0/15"
@@ -34869,6 +34876,7 @@
                   "management": false,
                   "mountable": true,
                   "mounted": false,
+                  "network_address": "petitprince-16-eth1.luxembourg.grid5000.fr",
                   "rate": 10000000000,
                   "switch": "mxl2",
                   "switch_port": "TenGigabitEthernet 0/16"
@@ -35058,6 +35066,7 @@
                   "management": false,
                   "mountable": true,
                   "mounted": false,
+                  "network_address": "petitprince-2-eth1.luxembourg.grid5000.fr",
                   "rate": 10000000000,
                   "switch": "mxl2",
                   "switch_port": "TenGigabitEthernet 0/2"
@@ -35247,6 +35256,7 @@
                   "management": false,
                   "mountable": true,
                   "mounted": false,
+                  "network_address": "petitprince-3-eth1.luxembourg.grid5000.fr",
                   "rate": 10000000000,
                   "switch": "mxl2",
                   "switch_port": "TenGigabitEthernet 0/3"
@@ -35436,6 +35446,7 @@
                   "management": false,
                   "mountable": true,
                   "mounted": false,
+                  "network_address": "petitprince-4-eth1.luxembourg.grid5000.fr",
                   "rate": 10000000000,
                   "switch": "mxl2",
                   "switch_port": "TenGigabitEthernet 0/4"
@@ -35625,6 +35636,7 @@
                   "management": false,
                   "mountable": true,
                   "mounted": false,
+                  "network_address": "petitprince-5-eth1.luxembourg.grid5000.fr",
                   "rate": 10000000000,
                   "switch": "mxl2",
                   "switch_port": "TenGigabitEthernet 0/5"
@@ -35814,6 +35826,7 @@
                   "management": false,
                   "mountable": true,
                   "mounted": false,
+                  "network_address": "petitprince-6-eth1.luxembourg.grid5000.fr",
                   "rate": 10000000000,
                   "switch": "mxl2",
                   "switch_port": "TenGigabitEthernet 0/6"
@@ -36003,6 +36016,7 @@
                   "management": false,
                   "mountable": true,
                   "mounted": false,
+                  "network_address": "petitprince-7-eth1.luxembourg.grid5000.fr",
                   "rate": 10000000000,
                   "switch": "mxl2",
                   "switch_port": "TenGigabitEthernet 0/7"
@@ -36192,6 +36206,7 @@
                   "management": false,
                   "mountable": true,
                   "mounted": false,
+                  "network_address": "petitprince-8-eth1.luxembourg.grid5000.fr",
                   "rate": 10000000000,
                   "switch": "mxl2",
                   "switch_port": "TenGigabitEthernet 0/8"
@@ -36381,6 +36396,7 @@
                   "management": false,
                   "mountable": true,
                   "mounted": false,
+                  "network_address": "petitprince-9-eth1.luxembourg.grid5000.fr",
                   "rate": 10000000000,
                   "switch": "mxl2",
                   "switch_port": "TenGigabitEthernet 0/9"
@@ -110432,33 +110448,73 @@
               "uid": "griffon-3"
             },
             "griffon-30": {
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "status": "retired"
             },
             "griffon-31": {
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "status": "retired"
             },
             "griffon-32": {
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "status": "retired"
             },
             "griffon-33": {
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "status": "retired"
             },
             "griffon-34": {
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "status": "retired"
             },
             "griffon-35": {
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "status": "retired"
             },
             "griffon-36": {
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "status": "retired"
             },
             "griffon-37": {
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "status": "retired"
             },
             "griffon-38": {
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "status": "retired"
             },
             "griffon-39": {
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "status": "retired"
             },
             "griffon-4": {
@@ -110664,33 +110720,73 @@
               "uid": "griffon-4"
             },
             "griffon-40": {
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "status": "retired"
             },
             "griffon-41": {
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "status": "retired"
             },
             "griffon-42": {
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "status": "retired"
             },
             "griffon-43": {
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "status": "retired"
             },
             "griffon-44": {
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "status": "retired"
             },
             "griffon-45": {
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "status": "retired"
             },
             "griffon-46": {
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "status": "retired"
             },
             "griffon-47": {
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "status": "retired"
             },
             "griffon-48": {
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "status": "retired"
             },
             "griffon-49": {
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "status": "retired"
             },
             "griffon-5": {
@@ -110896,27 +110992,59 @@
               "uid": "griffon-5"
             },
             "griffon-50": {
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "status": "retired"
             },
             "griffon-51": {
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "status": "retired"
             },
             "griffon-52": {
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "status": "retired"
             },
             "griffon-53": {
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "status": "retired"
             },
             "griffon-54": {
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "status": "retired"
             },
             "griffon-55": {
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "status": "retired"
             },
             "griffon-56": {
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "status": "retired"
             },
             "griffon-57": {
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "status": "retired"
             },
             "griffon-58": {
@@ -111728,30 +111856,66 @@
               "uid": "griffon-60"
             },
             "griffon-61": {
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "status": "retired"
             },
             "griffon-62": {
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "status": "retired"
             },
             "griffon-63": {
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "status": "retired"
             },
             "griffon-64": {
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "status": "retired"
             },
             "griffon-65": {
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "status": "retired"
             },
             "griffon-66": {
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "status": "retired"
             },
             "griffon-67": {
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "status": "retired"
             },
             "griffon-68": {
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "status": "retired"
             },
             "griffon-69": {
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "status": "retired"
             },
             "griffon-7": {
@@ -111957,33 +112121,73 @@
               "uid": "griffon-7"
             },
             "griffon-70": {
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "status": "retired"
             },
             "griffon-71": {
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "status": "retired"
             },
             "griffon-72": {
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "status": "retired"
             },
             "griffon-73": {
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "status": "retired"
             },
             "griffon-74": {
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "status": "retired"
             },
             "griffon-75": {
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "status": "retired"
             },
             "griffon-76": {
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "status": "retired"
             },
             "griffon-77": {
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "status": "retired"
             },
             "griffon-78": {
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "status": "retired"
             },
             "griffon-79": {
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "status": "retired"
             },
             "griffon-8": {
@@ -112189,33 +112393,73 @@
               "uid": "griffon-8"
             },
             "griffon-80": {
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "status": "retired"
             },
             "griffon-81": {
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "status": "retired"
             },
             "griffon-82": {
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "status": "retired"
             },
             "griffon-83": {
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "status": "retired"
             },
             "griffon-84": {
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "status": "retired"
             },
             "griffon-85": {
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "status": "retired"
             },
             "griffon-86": {
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "status": "retired"
             },
             "griffon-87": {
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "status": "retired"
             },
             "griffon-88": {
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "status": "retired"
             },
             "griffon-89": {
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "status": "retired"
             },
             "griffon-9": {
@@ -112421,12 +112665,24 @@
               "uid": "griffon-9"
             },
             "griffon-90": {
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "status": "retired"
             },
             "griffon-91": {
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "status": "retired"
             },
             "griffon-92": {
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "status": "retired"
             }
           },
diff --git a/input/grid5000/sites/luxembourg/clusters/petitprince/petitprince.yaml b/input/grid5000/sites/luxembourg/clusters/petitprince/petitprince.yaml
index 0a67deb29f80404e6fb2384d23f00de625d67184..0ad4ffa315b4c1ae176fdbfa86afd6b868da577a 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/petitprince.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/petitprince.yaml
@@ -59,7 +59,6 @@ nodes:
         mountable: true
         mounted: false
         bridged: false
-        network_address: none
         rate: 10.0e+9
       bmc:
         interface: Ethernet