diff --git a/data/grid5000/sites/lyon/clusters/hercule/hercule.json b/data/grid5000/sites/lyon/clusters/hercule/hercule.json
index 4028dda5e9481ed8f059671a64ffae8c0cdf2f25..74454b161df6221e3c7fa4468c316a441c87e5b5 100644
--- a/data/grid5000/sites/lyon/clusters/hercule/hercule.json
+++ b/data/grid5000/sites/lyon/clusters/hercule/hercule.json
@@ -1,7 +1,7 @@
{
"created_at": "Tue, 02 Oct 2012 12:00:00 GMT",
"kavlan": true,
- "model": "Dell C6220",
+ "model": "Dell PowerEdge C6220",
"priority": "201299",
"queues": [
"default",
diff --git a/data/grid5000/sites/lyon/clusters/nova/nova.json b/data/grid5000/sites/lyon/clusters/nova/nova.json
index 2f170e2997d49bfe70c4b9058e75c6179cc6f42a..ea9783c9976825d634c915e76542fcb1174ac7b6 100644
--- a/data/grid5000/sites/lyon/clusters/nova/nova.json
+++ b/data/grid5000/sites/lyon/clusters/nova/nova.json
@@ -1,7 +1,7 @@
{
"created_at": "Thu, 01 Dec 2016 12:00:00 GMT",
"kavlan": true,
- "model": "Dell R430",
+ "model": "Dell PowerEdge R430",
"priority": "201700",
"queues": [
"default",
diff --git a/data/grid5000/sites/lyon/clusters/taurus/taurus.json b/data/grid5000/sites/lyon/clusters/taurus/taurus.json
index 76424004e899f4cbd4ec575e538451270d0c67d9..0d159f7f56454adb8c38cda80be40ffe4436e2d0 100644
--- a/data/grid5000/sites/lyon/clusters/taurus/taurus.json
+++ b/data/grid5000/sites/lyon/clusters/taurus/taurus.json
@@ -1,7 +1,7 @@
{
"created_at": "Fri, 14 Sep 2012 12:00:00 GMT",
"kavlan": true,
- "model": "Dell R720",
+ "model": "Dell PowerEdge R720",
"queues": [
"default",
"admin"
diff --git a/grid5000-all.json b/grid5000-all.json
index 155eefc1e34a0f74b294c954a157326d796c53a5..762764f783768217c6e522258a4938d7463864aa 100644
--- a/grid5000-all.json
+++ b/grid5000-all.json
@@ -37613,7 +37613,7 @@
"hercule": {
"created_at": "Tue, 02 Oct 2012 12:00:00 GMT",
"kavlan": true,
- "model": "Dell C6220",
+ "model": "Dell PowerEdge C6220",
"nodes": {
"hercule-1": {
"architecture": {
@@ -38531,7 +38531,7 @@
"nova": {
"created_at": "Thu, 01 Dec 2016 12:00:00 GMT",
"kavlan": true,
- "model": "Dell R430",
+ "model": "Dell PowerEdge R430",
"nodes": {
"nova-1": {
"architecture": {
@@ -58142,7 +58142,7 @@
"taurus": {
"created_at": "Fri, 14 Sep 2012 12:00:00 GMT",
"kavlan": true,
- "model": "Dell R720",
+ "model": "Dell PowerEdge R720",
"nodes": {
"taurus-1": {
"architecture": {
@@ -108752,10 +108752,6 @@
"gpu": {
"gpu": false
},
- "monitoring": {
- "metric": "power",
- "wattmeter": "shared"
- },
"network_adapters": {
"bmc": {
"enabled": true,
@@ -108854,10 +108850,6 @@
"gpu": {
"gpu": false
},
- "monitoring": {
- "metric": "power",
- "wattmeter": "shared"
- },
"network_adapters": {
"bmc": {
"enabled": true,
@@ -108956,10 +108948,6 @@
"gpu": {
"gpu": false
},
- "monitoring": {
- "metric": "power",
- "wattmeter": "shared"
- },
"network_adapters": {
"bmc": {
"enabled": true,
@@ -109058,10 +109046,6 @@
"gpu": {
"gpu": false
},
- "monitoring": {
- "metric": "power",
- "wattmeter": "shared"
- },
"network_adapters": {
"bmc": {
"enabled": true,
@@ -109160,10 +109144,6 @@
"gpu": {
"gpu": false
},
- "monitoring": {
- "metric": "power",
- "wattmeter": "shared"
- },
"network_adapters": {
"bmc": {
"enabled": true,
@@ -109262,10 +109242,6 @@
"gpu": {
"gpu": false
},
- "monitoring": {
- "metric": "power",
- "wattmeter": "shared"
- },
"network_adapters": {
"bmc": {
"enabled": true,
@@ -109364,10 +109340,6 @@
"gpu": {
"gpu": false
},
- "monitoring": {
- "metric": "power",
- "wattmeter": "shared"
- },
"network_adapters": {
"bmc": {
"enabled": true,
@@ -109466,10 +109438,6 @@
"gpu": {
"gpu": false
},
- "monitoring": {
- "metric": "power",
- "wattmeter": "shared"
- },
"network_adapters": {
"bmc": {
"enabled": true,
@@ -109568,10 +109536,6 @@
"gpu": {
"gpu": false
},
- "monitoring": {
- "metric": "power",
- "wattmeter": "shared"
- },
"network_adapters": {
"bmc": {
"enabled": true,
@@ -109670,10 +109634,6 @@
"gpu": {
"gpu": false
},
- "monitoring": {
- "metric": "power",
- "wattmeter": "shared"
- },
"network_adapters": {
"bmc": {
"enabled": true,
@@ -109967,10 +109927,6 @@
"gpu": {
"gpu": false
},
- "monitoring": {
- "metric": "power",
- "wattmeter": "shared"
- },
"network_adapters": {
"bmc": {
"enabled": true,
@@ -110069,10 +110025,6 @@
"gpu": {
"gpu": false
},
- "monitoring": {
- "metric": "power",
- "wattmeter": "shared"
- },
"network_adapters": {
"bmc": {
"enabled": true,
@@ -110171,10 +110123,6 @@
"gpu": {
"gpu": false
},
- "monitoring": {
- "metric": "power",
- "wattmeter": "shared"
- },
"network_adapters": {
"bmc": {
"enabled": true,
@@ -110273,10 +110221,6 @@
"gpu": {
"gpu": false
},
- "monitoring": {
- "metric": "power",
- "wattmeter": "shared"
- },
"network_adapters": {
"bmc": {
"enabled": true,
@@ -110375,10 +110319,6 @@
"gpu": {
"gpu": false
},
- "monitoring": {
- "metric": "power",
- "wattmeter": "shared"
- },
"network_adapters": {
"bmc": {
"enabled": true,
@@ -110477,10 +110417,6 @@
"gpu": {
"gpu": false
},
- "monitoring": {
- "metric": "power",
- "wattmeter": "shared"
- },
"network_adapters": {
"bmc": {
"enabled": true,
@@ -110579,10 +110515,6 @@
"gpu": {
"gpu": false
},
- "monitoring": {
- "metric": "power",
- "wattmeter": "shared"
- },
"network_adapters": {
"bmc": {
"enabled": true,
@@ -110681,10 +110613,6 @@
"gpu": {
"gpu": false
},
- "monitoring": {
- "metric": "power",
- "wattmeter": "shared"
- },
"network_adapters": {
"bmc": {
"enabled": true,
@@ -110783,10 +110711,6 @@
"gpu": {
"gpu": false
},
- "monitoring": {
- "metric": "power",
- "wattmeter": "shared"
- },
"network_adapters": {
"bmc": {
"enabled": true,
@@ -110885,10 +110809,6 @@
"gpu": {
"gpu": false
},
- "monitoring": {
- "metric": "power",
- "wattmeter": "shared"
- },
"network_adapters": {
"bmc": {
"enabled": true,
@@ -111189,10 +111109,6 @@
"gpu": {
"gpu": false
},
- "monitoring": {
- "metric": "power",
- "wattmeter": "shared"
- },
"network_adapters": {
"bmc": {
"enabled": true,
@@ -111291,10 +111207,6 @@
"gpu": {
"gpu": false
},
- "monitoring": {
- "metric": "power",
- "wattmeter": "shared"
- },
"network_adapters": {
"bmc": {
"enabled": true,
@@ -111393,10 +111305,6 @@
"gpu": {
"gpu": false
},
- "monitoring": {
- "metric": "power",
- "wattmeter": "shared"
- },
"network_adapters": {
"bmc": {
"enabled": true,
@@ -111495,10 +111403,6 @@
"gpu": {
"gpu": false
},
- "monitoring": {
- "metric": "power",
- "wattmeter": "shared"
- },
"network_adapters": {
"bmc": {
"enabled": true,
@@ -111597,10 +111501,6 @@
"gpu": {
"gpu": false
},
- "monitoring": {
- "metric": "power",
- "wattmeter": "shared"
- },
"network_adapters": {
"bmc": {
"enabled": true,
@@ -111699,10 +111599,6 @@
"gpu": {
"gpu": false
},
- "monitoring": {
- "metric": "power",
- "wattmeter": "shared"
- },
"network_adapters": {
"bmc": {
"enabled": true,
@@ -111801,10 +111697,6 @@
"gpu": {
"gpu": false
},
- "monitoring": {
- "metric": "power",
- "wattmeter": "shared"
- },
"network_adapters": {
"bmc": {
"enabled": true,
@@ -111903,10 +111795,6 @@
"gpu": {
"gpu": false
},
- "monitoring": {
- "metric": "power",
- "wattmeter": "shared"
- },
"network_adapters": {
"bmc": {
"enabled": true,
@@ -112802,10 +112690,6 @@
"gpu": {
"gpu": false
},
- "monitoring": {
- "metric": "power",
- "wattmeter": "shared"
- },
"network_adapters": {
"bmc": {
"enabled": true,
@@ -112904,10 +112788,6 @@
"gpu": {
"gpu": false
},
- "monitoring": {
- "metric": "power",
- "wattmeter": "shared"
- },
"network_adapters": {
"bmc": {
"enabled": true,
@@ -113006,10 +112886,6 @@
"gpu": {
"gpu": false
},
- "monitoring": {
- "metric": "power",
- "wattmeter": "shared"
- },
"network_adapters": {
"bmc": {
"enabled": true,
@@ -113108,10 +112984,6 @@
"gpu": {
"gpu": false
},
- "monitoring": {
- "metric": "power",
- "wattmeter": "shared"
- },
"network_adapters": {
"bmc": {
"enabled": true,
@@ -113210,10 +113082,6 @@
"gpu": {
"gpu": false
},
- "monitoring": {
- "metric": "power",
- "wattmeter": "shared"
- },
"network_adapters": {
"bmc": {
"enabled": true,
@@ -113312,10 +113180,6 @@
"gpu": {
"gpu": false
},
- "monitoring": {
- "metric": "power",
- "wattmeter": "shared"
- },
"network_adapters": {
"bmc": {
"enabled": true,
@@ -113414,10 +113278,6 @@
"gpu": {
"gpu": false
},
- "monitoring": {
- "metric": "power",
- "wattmeter": "shared"
- },
"network_adapters": {
"bmc": {
"enabled": true,
@@ -113516,10 +113376,6 @@
"gpu": {
"gpu": false
},
- "monitoring": {
- "metric": "power",
- "wattmeter": "shared"
- },
"network_adapters": {
"bmc": {
"enabled": true,
@@ -113618,10 +113474,6 @@
"gpu": {
"gpu": false
},
- "monitoring": {
- "metric": "power",
- "wattmeter": "shared"
- },
"network_adapters": {
"bmc": {
"enabled": true,
@@ -113922,10 +113774,6 @@
"gpu": {
"gpu": false
},
- "monitoring": {
- "metric": "power",
- "wattmeter": "shared"
- },
"network_adapters": {
"bmc": {
"enabled": true,
@@ -114024,10 +113872,6 @@
"gpu": {
"gpu": false
},
- "monitoring": {
- "metric": "power",
- "wattmeter": "shared"
- },
"network_adapters": {
"bmc": {
"enabled": true,
@@ -114126,10 +113970,6 @@
"gpu": {
"gpu": false
},
- "monitoring": {
- "metric": "power",
- "wattmeter": "shared"
- },
"network_adapters": {
"bmc": {
"enabled": true,
@@ -114228,10 +114068,6 @@
"gpu": {
"gpu": false
},
- "monitoring": {
- "metric": "power",
- "wattmeter": "shared"
- },
"network_adapters": {
"bmc": {
"enabled": true,
@@ -114330,10 +114166,6 @@
"gpu": {
"gpu": false
},
- "monitoring": {
- "metric": "power",
- "wattmeter": "shared"
- },
"network_adapters": {
"bmc": {
"enabled": true,
@@ -114432,10 +114264,6 @@
"gpu": {
"gpu": false
},
- "monitoring": {
- "metric": "power",
- "wattmeter": "shared"
- },
"network_adapters": {
"bmc": {
"enabled": true,
@@ -114534,10 +114362,6 @@
"gpu": {
"gpu": false
},
- "monitoring": {
- "metric": "power",
- "wattmeter": "shared"
- },
"network_adapters": {
"bmc": {
"enabled": true,
@@ -114636,10 +114460,6 @@
"gpu": {
"gpu": false
},
- "monitoring": {
- "metric": "power",
- "wattmeter": "shared"
- },
"network_adapters": {
"bmc": {
"enabled": true,
@@ -114738,10 +114558,6 @@
"gpu": {
"gpu": false
},
- "monitoring": {
- "metric": "power",
- "wattmeter": "shared"
- },
"network_adapters": {
"bmc": {
"enabled": true,
@@ -114840,10 +114656,6 @@
"gpu": {
"gpu": false
},
- "monitoring": {
- "metric": "power",
- "wattmeter": "shared"
- },
"network_adapters": {
"bmc": {
"enabled": true,
@@ -115144,10 +114956,6 @@
"gpu": {
"gpu": false
},
- "monitoring": {
- "metric": "power",
- "wattmeter": "shared"
- },
"network_adapters": {
"bmc": {
"enabled": true,
@@ -115246,10 +115054,6 @@
"gpu": {
"gpu": false
},
- "monitoring": {
- "metric": "power",
- "wattmeter": "shared"
- },
"network_adapters": {
"bmc": {
"enabled": true,
@@ -115348,10 +115152,6 @@
"gpu": {
"gpu": false
},
- "monitoring": {
- "metric": "power",
- "wattmeter": "shared"
- },
"network_adapters": {
"bmc": {
"enabled": true,
@@ -115450,10 +115250,6 @@
"gpu": {
"gpu": false
},
- "monitoring": {
- "metric": "power",
- "wattmeter": "shared"
- },
"network_adapters": {
"bmc": {
"enabled": true,
@@ -115552,10 +115348,6 @@
"gpu": {
"gpu": false
},
- "monitoring": {
- "metric": "power",
- "wattmeter": "shared"
- },
"network_adapters": {
"bmc": {
"enabled": true,
@@ -115654,10 +115446,6 @@
"gpu": {
"gpu": false
},
- "monitoring": {
- "metric": "power",
- "wattmeter": "shared"
- },
"network_adapters": {
"bmc": {
"enabled": true,
@@ -115756,10 +115544,6 @@
"gpu": {
"gpu": false
},
- "monitoring": {
- "metric": "power",
- "wattmeter": "shared"
- },
"network_adapters": {
"bmc": {
"enabled": true,
@@ -115858,10 +115642,6 @@
"gpu": {
"gpu": false
},
- "monitoring": {
- "metric": "power",
- "wattmeter": "shared"
- },
"network_adapters": {
"bmc": {
"enabled": true,
@@ -115960,10 +115740,6 @@
"gpu": {
"gpu": false
},
- "monitoring": {
- "metric": "power",
- "wattmeter": "shared"
- },
"network_adapters": {
"bmc": {
"enabled": true,
@@ -116062,10 +115838,6 @@
"gpu": {
"gpu": false
},
- "monitoring": {
- "metric": "power",
- "wattmeter": "shared"
- },
"network_adapters": {
"bmc": {
"enabled": true,
@@ -116359,10 +116131,6 @@
"gpu": {
"gpu": false
},
- "monitoring": {
- "metric": "power",
- "wattmeter": "shared"
- },
"network_adapters": {
"bmc": {
"enabled": true,
@@ -116461,10 +116229,6 @@
"gpu": {
"gpu": false
},
- "monitoring": {
- "metric": "power",
- "wattmeter": "shared"
- },
"network_adapters": {
"bmc": {
"enabled": true,
@@ -116563,10 +116327,6 @@
"gpu": {
"gpu": false
},
- "monitoring": {
- "metric": "power",
- "wattmeter": "shared"
- },
"network_adapters": {
"bmc": {
"enabled": true,
diff --git a/input/grid5000/sites/lyon/clusters/hercule/hercule.yaml b/input/grid5000/sites/lyon/clusters/hercule/hercule.yaml
index c30a12b645667c3173425ba41d49abdbba64d45e..28ba8fca8c57c398b7755a8ea30298e75157a152 100644
--- a/input/grid5000/sites/lyon/clusters/hercule/hercule.yaml
+++ b/input/grid5000/sites/lyon/clusters/hercule/hercule.yaml
@@ -1,5 +1,5 @@
---
-model: Dell C6220
+model: Dell PowerEdge C6220
created_at: 2012-10-02 12:00 GMT
priority: '201299'
kavlan: true
diff --git a/input/grid5000/sites/lyon/clusters/nova/nova.yml b/input/grid5000/sites/lyon/clusters/nova/nova.yml
index 8a02ba46a375a8cd52cd5fc48035cedff2aef26d..6b5c7b5447e7b2e022dfc99c4a23b9915397046b 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nova.yml
+++ b/input/grid5000/sites/lyon/clusters/nova/nova.yml
@@ -1,5 +1,5 @@
---
-model: Dell R430
+model: Dell PowerEdge R430
created_at: 2016-12-01 12:00:00 GMT
priority: '201700'
kavlan: true
diff --git a/input/grid5000/sites/lyon/clusters/taurus/taurus.yaml b/input/grid5000/sites/lyon/clusters/taurus/taurus.yaml
index 2743a2b6ffee1e8b7e8754a35c81d8839c051d26..f46d4c1fc6f2d561846c5d3d02b00189c48d5f5b 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/taurus.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/taurus.yaml
@@ -1,5 +1,5 @@
---
-model: Dell R720
+model: Dell PowerEdge R720
created_at: 2012-09-14 12:00:00 GMT
kavlan: true
queues: