diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-1.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-1.json
index 8c596bf9d23749ceeaa672e6a1cf8f4103388edc..1029f2208dba34c211da473d259c82b245a442b4 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-1.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-1.json
@@ -146,7 +146,7 @@
"cache_l1i": 65536,
"cache_l2": 524288,
"cache_l3": 5240832,
- "clock_speed": 800000000,
+ "clock_speed": 1700000000,
"instruction_set": "x86-64",
"model": "AMD Opteron",
"other_description": "AMD Opteron(tm) Processor 6164 HE",
@@ -158,9 +158,10 @@
"available": true,
"via": {
"api": {
- "metric": "pdu_shared"
+ "metric": "pdu"
},
"pdu": {
+ "port": 24,
"uid": "parapluie-pdu-1"
}
}
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-10.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-10.json
index 5f32294c46c4592088954356c46b61ec38aca9a6..e3f05818890eb1cbec1816efc760fa5630c8aba3 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-10.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-10.json
@@ -146,7 +146,7 @@
"cache_l1i": 65536,
"cache_l2": 524288,
"cache_l3": 5240832,
- "clock_speed": 800000000,
+ "clock_speed": 1700000000,
"instruction_set": "x86-64",
"model": "AMD Opteron",
"other_description": "AMD Opteron(tm) Processor 6164 HE",
@@ -158,10 +158,11 @@
"available": true,
"via": {
"api": {
- "metric": "pdu_shared"
+ "metric": "pdu"
},
"pdu": {
- "uid": "parapluie-pdu-3"
+ "port": 1,
+ "uid": "parapluie-pdu-1"
}
}
},
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-11.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-11.json
index 5d1f645aa9840f8c0411c7547a3d162793f0ba01..50204955c46eda4a6b2f474d5130a243630e56c2 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-11.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-11.json
@@ -146,7 +146,7 @@
"cache_l1i": 65536,
"cache_l2": 524288,
"cache_l3": 5240832,
- "clock_speed": 800000000,
+ "clock_speed": 1700000000,
"instruction_set": "x86-64",
"model": "AMD Opteron",
"other_description": "AMD Opteron(tm) Processor 6164 HE",
@@ -158,10 +158,11 @@
"available": true,
"via": {
"api": {
- "metric": "pdu_shared"
+ "metric": "pdu"
},
"pdu": {
- "uid": "parapluie-pdu-3"
+ "port": 24,
+ "uid": "parapluie-pdu-2"
}
}
},
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-12.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-12.json
index 5177bb3fb335d82546daa4e5a4734d974ff293ff..dc4b74e88b729c86acacaaf2062fe6df2f294b86 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-12.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-12.json
@@ -146,7 +146,7 @@
"cache_l1i": 65536,
"cache_l2": 524288,
"cache_l3": 5240832,
- "clock_speed": 800000000,
+ "clock_speed": 1700000000,
"instruction_set": "x86-64",
"model": "AMD Opteron",
"other_description": "AMD Opteron(tm) Processor 6164 HE",
@@ -158,10 +158,11 @@
"available": true,
"via": {
"api": {
- "metric": "pdu_shared"
+ "metric": "pdu"
},
"pdu": {
- "uid": "parapluie-pdu-3"
+ "port": 23,
+ "uid": "parapluie-pdu-2"
}
}
},
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-13.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-13.json
index d36f381510953b7dd2a971609682ff7b3c45c141..5b46ea4231bc403512773416dc23e8957351188a 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-13.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-13.json
@@ -146,7 +146,7 @@
"cache_l1i": 65536,
"cache_l2": 524288,
"cache_l3": 5240832,
- "clock_speed": 800000000,
+ "clock_speed": 1700000000,
"instruction_set": "x86-64",
"model": "AMD Opteron",
"other_description": "AMD Opteron(tm) Processor 6164 HE",
@@ -158,10 +158,11 @@
"available": true,
"via": {
"api": {
- "metric": "pdu_shared"
+ "metric": "pdu"
},
"pdu": {
- "uid": "parapluie-pdu-3"
+ "port": 22,
+ "uid": "parapluie-pdu-2"
}
}
},
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-14.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-14.json
index 5ef9b7bab08564e83fe7d35ff2a7d31f445223b4..5db094365bd755a7b317b8ef7dc6f9e55d612fc4 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-14.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-14.json
@@ -146,7 +146,7 @@
"cache_l1i": 65536,
"cache_l2": 524288,
"cache_l3": 5240832,
- "clock_speed": 800000000,
+ "clock_speed": 1700000000,
"instruction_set": "x86-64",
"model": "AMD Opteron",
"other_description": "AMD Opteron(tm) Processor 6164 HE",
@@ -158,10 +158,11 @@
"available": true,
"via": {
"api": {
- "metric": "pdu_shared"
+ "metric": "pdu"
},
"pdu": {
- "uid": "parapluie-pdu-3"
+ "port": 21,
+ "uid": "parapluie-pdu-2"
}
}
},
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-15.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-15.json
index d5847b9e739d578ae7934b64bb290c11a7b93387..d248811bcc50f660d0d2f5065feed499c0b31485 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-15.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-15.json
@@ -146,7 +146,7 @@
"cache_l1i": 65536,
"cache_l2": 524288,
"cache_l3": 5240832,
- "clock_speed": 800000000,
+ "clock_speed": 1700000000,
"instruction_set": "x86-64",
"model": "AMD Opteron",
"other_description": "AMD Opteron(tm) Processor 6164 HE",
@@ -158,9 +158,10 @@
"available": true,
"via": {
"api": {
- "metric": "pdu_shared"
+ "metric": "pdu"
},
"pdu": {
+ "port": 20,
"uid": "parapluie-pdu-2"
}
}
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-16.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-16.json
index c77dba2829aa1bbcc1b835ff8dc1df870a00571c..4fe8c4ed03f6646e131ebc5e10fee22fdc1fe285 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-16.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-16.json
@@ -146,7 +146,7 @@
"cache_l1i": 65536,
"cache_l2": 524288,
"cache_l3": 5240832,
- "clock_speed": 800000000,
+ "clock_speed": 1700000000,
"instruction_set": "x86-64",
"model": "AMD Opteron",
"other_description": "AMD Opteron(tm) Processor 6164 HE",
@@ -158,9 +158,10 @@
"available": true,
"via": {
"api": {
- "metric": "pdu_shared"
+ "metric": "pdu"
},
"pdu": {
+ "port": 5,
"uid": "parapluie-pdu-2"
}
}
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-17.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-17.json
index b64767a32bee6aeb66670b8acf73fcc1c2187ce5..375948c40bb045f4167e1122dac34466f7adde48 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-17.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-17.json
@@ -146,7 +146,7 @@
"cache_l1i": 65536,
"cache_l2": 524288,
"cache_l3": 5240832,
- "clock_speed": 800000000,
+ "clock_speed": 1700000000,
"instruction_set": "x86-64",
"model": "AMD Opteron",
"other_description": "AMD Opteron(tm) Processor 6164 HE",
@@ -158,9 +158,10 @@
"available": true,
"via": {
"api": {
- "metric": "pdu_shared"
+ "metric": "pdu"
},
"pdu": {
+ "port": 4,
"uid": "parapluie-pdu-2"
}
}
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-18.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-18.json
index 88263548b05088bfccf122942158fff148286f95..effd5b2b9e18f7e031c64f3aabb0ecb574707a16 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-18.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-18.json
@@ -146,7 +146,7 @@
"cache_l1i": 65536,
"cache_l2": 524288,
"cache_l3": 5240832,
- "clock_speed": 800000000,
+ "clock_speed": 1700000000,
"instruction_set": "x86-64",
"model": "AMD Opteron",
"other_description": "AMD Opteron(tm) Processor 6164 HE",
@@ -158,9 +158,10 @@
"available": true,
"via": {
"api": {
- "metric": "pdu_shared"
+ "metric": "pdu"
},
"pdu": {
+ "port": 3,
"uid": "parapluie-pdu-2"
}
}
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-19.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-19.json
index 50298a992a54d6ec77515be525a791cd0ef93490..31c0edc5658be225dce69e4ece0eccaf66aeac32 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-19.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-19.json
@@ -146,7 +146,7 @@
"cache_l1i": 65536,
"cache_l2": 524288,
"cache_l3": 5240832,
- "clock_speed": 800000000,
+ "clock_speed": 1700000000,
"instruction_set": "x86-64",
"model": "AMD Opteron",
"other_description": "AMD Opteron(tm) Processor 6164 HE",
@@ -158,9 +158,10 @@
"available": true,
"via": {
"api": {
- "metric": "pdu_shared"
+ "metric": "pdu"
},
"pdu": {
+ "port": 2,
"uid": "parapluie-pdu-2"
}
}
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-2.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-2.json
index 9d55a8c3925374a1c979282e0c14e31ed51537f5..48534776068da398b0407b921a7dc0362a57fe02 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-2.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-2.json
@@ -146,7 +146,7 @@
"cache_l1i": 65536,
"cache_l2": 524288,
"cache_l3": 5240832,
- "clock_speed": 800000000,
+ "clock_speed": 1700000000,
"instruction_set": "x86-64",
"model": "AMD Opteron",
"other_description": "AMD Opteron(tm) Processor 6164 HE",
@@ -158,9 +158,10 @@
"available": true,
"via": {
"api": {
- "metric": "pdu_shared"
+ "metric": "pdu"
},
"pdu": {
+ "port": 23,
"uid": "parapluie-pdu-1"
}
}
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-20.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-20.json
index 7ddb8419c28eb03dafcbc3ed3233ad06ac765c3c..6b0d6282c1e6b1034cd72d392fd20b614bda2082 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-20.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-20.json
@@ -146,7 +146,7 @@
"cache_l1i": 65536,
"cache_l2": 524288,
"cache_l3": 5240832,
- "clock_speed": 800000000,
+ "clock_speed": 1700000000,
"instruction_set": "x86-64",
"model": "AMD Opteron",
"other_description": "AMD Opteron(tm) Processor 6164 HE",
@@ -158,9 +158,10 @@
"available": true,
"via": {
"api": {
- "metric": "pdu_shared"
+ "metric": "pdu"
},
"pdu": {
+ "port": 1,
"uid": "parapluie-pdu-2"
}
}
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-21.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-21.json
index 1f572d708c9f35f08afd8f0396b72e23dc6a17af..53eb98954b234413dc6a03d6162c05ad8beb4a7b 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-21.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-21.json
@@ -146,7 +146,7 @@
"cache_l1i": 65536,
"cache_l2": 524288,
"cache_l3": 5240832,
- "clock_speed": 800000000,
+ "clock_speed": 1700000000,
"instruction_set": "x86-64",
"model": "AMD Opteron",
"other_description": "AMD Opteron(tm) Processor 6164 HE",
@@ -158,10 +158,11 @@
"available": true,
"via": {
"api": {
- "metric": "pdu_shared"
+ "metric": "pdu"
},
"pdu": {
- "uid": "parapluie-pdu-6"
+ "port": 24,
+ "uid": "parapluie-pdu-3"
}
}
},
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-22.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-22.json
index 57643070206738d3ea8e37af8646965f87cf07b1..18863fe1a496f2691efaa21a4c5dc9c391617429 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-22.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-22.json
@@ -146,7 +146,7 @@
"cache_l1i": 65536,
"cache_l2": 524288,
"cache_l3": 5240832,
- "clock_speed": 800000000,
+ "clock_speed": 1700000000,
"instruction_set": "x86-64",
"model": "AMD Opteron",
"other_description": "AMD Opteron(tm) Processor 6164 HE",
@@ -158,10 +158,11 @@
"available": true,
"via": {
"api": {
- "metric": "pdu_shared"
+ "metric": "pdu"
},
"pdu": {
- "uid": "parapluie-pdu-6"
+ "port": 23,
+ "uid": "parapluie-pdu-3"
}
}
},
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-23.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-23.json
index 194716d7c0afbdf96ae62248357dc3482435cf99..744caa27f06870000ffdf09e6d341eaf306c1808 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-23.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-23.json
@@ -158,10 +158,11 @@
"available": true,
"via": {
"api": {
- "metric": "pdu_shared"
+ "metric": "pdu"
},
"pdu": {
- "uid": "parapluie-pdu-6"
+ "port": 22,
+ "uid": "parapluie-pdu-3"
}
}
},
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-24.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-24.json
index 0d65be53cbc0bf3a404048e656f8e51f077eb816..3ebd191ab5d78d4f2ceaed81d4f736077375562d 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-24.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-24.json
@@ -146,7 +146,7 @@
"cache_l1i": 65536,
"cache_l2": 524288,
"cache_l3": 5240832,
- "clock_speed": 800000000,
+ "clock_speed": 1700000000,
"instruction_set": "x86-64",
"model": "AMD Opteron",
"other_description": "AMD Opteron(tm) Processor 6164 HE",
@@ -158,10 +158,11 @@
"available": true,
"via": {
"api": {
- "metric": "pdu_shared"
+ "metric": "pdu"
},
"pdu": {
- "uid": "parapluie-pdu-6"
+ "port": 21,
+ "uid": "parapluie-pdu-3"
}
}
},
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-25.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-25.json
index efa199311f4f677e78dc352342d5fa3c5d03ae4f..c8e02d2f93ca77f87c55cbe2de9ab02d51662a99 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-25.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-25.json
@@ -146,7 +146,7 @@
"cache_l1i": 65536,
"cache_l2": 524288,
"cache_l3": 5240832,
- "clock_speed": 800000000,
+ "clock_speed": 1700000000,
"instruction_set": "x86-64",
"model": "AMD Opteron",
"other_description": "AMD Opteron(tm) Processor 6164 HE",
@@ -158,10 +158,11 @@
"available": true,
"via": {
"api": {
- "metric": "pdu_shared"
+ "metric": "pdu"
},
"pdu": {
- "uid": "parapluie-pdu-6"
+ "port": 20,
+ "uid": "parapluie-pdu-3"
}
}
},
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-26.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-26.json
index ce69e7ce7fb9067955122595dc4ade1f5eac2e9b..9bbc6e93bb6177f4a94d0e65a7e626aa2e581f80 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-26.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-26.json
@@ -146,7 +146,7 @@
"cache_l1i": 65536,
"cache_l2": 524288,
"cache_l3": 5240832,
- "clock_speed": 800000000,
+ "clock_speed": 1700000000,
"instruction_set": "x86-64",
"model": "AMD Opteron",
"other_description": "AMD Opteron(tm) Processor 6164 HE",
@@ -158,10 +158,11 @@
"available": true,
"via": {
"api": {
- "metric": "pdu_shared"
+ "metric": "pdu"
},
"pdu": {
- "uid": "parapluie-pdu-6"
+ "port": 5,
+ "uid": "parapluie-pdu-3"
}
}
},
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-27.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-27.json
index 7d307252335940884fc12856585f027baeb79a4e..5fdf2ecb905c8ef04ba8745a8134596372d7e145 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-27.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-27.json
@@ -146,7 +146,7 @@
"cache_l1i": 65536,
"cache_l2": 524288,
"cache_l3": 5240832,
- "clock_speed": 800000000,
+ "clock_speed": 1700000000,
"instruction_set": "x86-64",
"model": "AMD Opteron",
"other_description": "AMD Opteron(tm) Processor 6164 HE",
@@ -158,10 +158,11 @@
"available": true,
"via": {
"api": {
- "metric": "pdu_shared"
+ "metric": "pdu"
},
"pdu": {
- "uid": "parapluie-pdu-5"
+ "port": 4,
+ "uid": "parapluie-pdu-3"
}
}
},
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-28.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-28.json
index 3a9c15e8673c8ad4dc0329c2062e5cd59eb04def..3ba22fca66dfb2b986768f1d3ddee30f12ef3879 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-28.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-28.json
@@ -146,7 +146,7 @@
"cache_l1i": 65536,
"cache_l2": 524288,
"cache_l3": 5240832,
- "clock_speed": 800000000,
+ "clock_speed": 1700000000,
"instruction_set": "x86-64",
"model": "AMD Opteron",
"other_description": "AMD Opteron(tm) Processor 6164 HE",
@@ -158,10 +158,11 @@
"available": true,
"via": {
"api": {
- "metric": "pdu_shared"
+ "metric": "pdu"
},
"pdu": {
- "uid": "parapluie-pdu-5"
+ "port": 3,
+ "uid": "parapluie-pdu-3"
}
}
},
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-29.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-29.json
index 5bc7dd2eadf9ada18074054cdbf0d0c49ce345fb..df84b34242b149acd74a8129dc0ec2178c969755 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-29.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-29.json
@@ -146,7 +146,7 @@
"cache_l1i": 65536,
"cache_l2": 524288,
"cache_l3": 5240832,
- "clock_speed": 800000000,
+ "clock_speed": 1700000000,
"instruction_set": "x86-64",
"model": "AMD Opteron",
"other_description": "AMD Opteron(tm) Processor 6164 HE",
@@ -158,10 +158,11 @@
"available": true,
"via": {
"api": {
- "metric": "pdu_shared"
+ "metric": "pdu"
},
"pdu": {
- "uid": "parapluie-pdu-5"
+ "port": 2,
+ "uid": "parapluie-pdu-3"
}
}
},
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-3.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-3.json
index eb6d0449df502bd68c99faef56420bc30a95134d..49fd41c72caf98b6a23e19fb09c8b825c421d9a0 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-3.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-3.json
@@ -146,7 +146,7 @@
"cache_l1i": 65536,
"cache_l2": 524288,
"cache_l3": 5240832,
- "clock_speed": 800000000,
+ "clock_speed": 1700000000,
"instruction_set": "x86-64",
"model": "AMD Opteron",
"other_description": "AMD Opteron(tm) Processor 6164 HE",
@@ -158,9 +158,10 @@
"available": true,
"via": {
"api": {
- "metric": "pdu_shared"
+ "metric": "pdu"
},
"pdu": {
+ "port": 22,
"uid": "parapluie-pdu-1"
}
}
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-30.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-30.json
index 4c5b0d3e5be974e60fb6b385753def4a3bf7a0c4..ef351bfbc20325db743c9e97440e345788919a1a 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-30.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-30.json
@@ -146,7 +146,7 @@
"cache_l1i": 65536,
"cache_l2": 524288,
"cache_l3": 5240832,
- "clock_speed": 800000000,
+ "clock_speed": 1700000000,
"instruction_set": "x86-64",
"model": "AMD Opteron",
"other_description": "AMD Opteron(tm) Processor 6164 HE",
@@ -158,10 +158,11 @@
"available": true,
"via": {
"api": {
- "metric": "pdu_shared"
+ "metric": "pdu"
},
"pdu": {
- "uid": "parapluie-pdu-5"
+ "port": 1,
+ "uid": "parapluie-pdu-3"
}
}
},
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-31.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-31.json
index c68335386f86dbdf7d10177aacf17e51e4702677..91db3bab303869c365b3be518a358ccb364c2fc1 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-31.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-31.json
@@ -146,7 +146,7 @@
"cache_l1i": 65536,
"cache_l2": 524288,
"cache_l3": 5240832,
- "clock_speed": 800000000,
+ "clock_speed": 1700000000,
"instruction_set": "x86-64",
"model": "AMD Opteron",
"other_description": "AMD Opteron(tm) Processor 6164 HE",
@@ -158,10 +158,11 @@
"available": true,
"via": {
"api": {
- "metric": "pdu_shared"
+ "metric": "pdu"
},
"pdu": {
- "uid": "parapluie-pdu-5"
+ "port": 24,
+ "uid": "parapluie-pdu-4"
}
}
},
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-32.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-32.json
index 9304b405ed95336f959578a46b7fd0120c71a7d1..5c1b8a83ee620f601d2f61da56a497fd4f810979 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-32.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-32.json
@@ -146,7 +146,7 @@
"cache_l1i": 65536,
"cache_l2": 524288,
"cache_l3": 5240832,
- "clock_speed": 800000000,
+ "clock_speed": 1700000000,
"instruction_set": "x86-64",
"model": "AMD Opteron",
"other_description": "AMD Opteron(tm) Processor 6164 HE",
@@ -158,10 +158,11 @@
"available": true,
"via": {
"api": {
- "metric": "pdu_shared"
+ "metric": "pdu"
},
"pdu": {
- "uid": "parapluie-pdu-5"
+ "port": 23,
+ "uid": "parapluie-pdu-4"
}
}
},
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-33.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-33.json
index 6f53be0ada5810fd91e1717663de1f24f7486918..84853851fc875eea82b06e1b6d4dd0d1fe03847b 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-33.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-33.json
@@ -146,7 +146,7 @@
"cache_l1i": 65536,
"cache_l2": 524288,
"cache_l3": 5240832,
- "clock_speed": 800000000,
+ "clock_speed": 1700000000,
"instruction_set": "x86-64",
"model": "AMD Opteron",
"other_description": "AMD Opteron(tm) Processor 6164 HE",
@@ -158,10 +158,11 @@
"available": true,
"via": {
"api": {
- "metric": "pdu_shared"
+ "metric": "pdu"
},
"pdu": {
- "uid": "parapluie-pdu-5"
+ "port": 22,
+ "uid": "parapluie-pdu-4"
}
}
},
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-34.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-34.json
index 09bb67b5f67c56add847e0120c18548ff56e05a5..13a9c2c64a227ce0e3750c400282539abe39d9b5 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-34.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-34.json
@@ -146,7 +146,7 @@
"cache_l1i": 65536,
"cache_l2": 524288,
"cache_l3": 5240832,
- "clock_speed": 800000000,
+ "clock_speed": 1700000000,
"instruction_set": "x86-64",
"model": "AMD Opteron",
"other_description": "AMD Opteron(tm) Processor 6164 HE",
@@ -158,9 +158,10 @@
"available": true,
"via": {
"api": {
- "metric": "pdu_shared"
+ "metric": "pdu"
},
"pdu": {
+ "port": 21,
"uid": "parapluie-pdu-4"
}
}
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-35.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-35.json
index f083346b066f41d995102324287ef3a89da84ec5..c2e92eb66cc8ff136dec178acd6069285876439b 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-35.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-35.json
@@ -146,7 +146,7 @@
"cache_l1i": 65536,
"cache_l2": 524288,
"cache_l3": 5240832,
- "clock_speed": 800000000,
+ "clock_speed": 1700000000,
"instruction_set": "x86-64",
"model": "AMD Opteron",
"other_description": "AMD Opteron(tm) Processor 6164 HE",
@@ -158,9 +158,10 @@
"available": true,
"via": {
"api": {
- "metric": "pdu_shared"
+ "metric": "pdu"
},
"pdu": {
+ "port": 20,
"uid": "parapluie-pdu-4"
}
}
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-36.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-36.json
index 1bc069ff0695eec98d083bb5d262ee3b0f0020a2..c10014af3d493f461726022af096193993b4a9d4 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-36.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-36.json
@@ -146,7 +146,7 @@
"cache_l1i": 65536,
"cache_l2": 524288,
"cache_l3": 5240832,
- "clock_speed": 800000000,
+ "clock_speed": 1700000000,
"instruction_set": "x86-64",
"model": "AMD Opteron",
"other_description": "AMD Opteron(tm) Processor 6164 HE",
@@ -158,9 +158,10 @@
"available": true,
"via": {
"api": {
- "metric": "pdu_shared"
+ "metric": "pdu"
},
"pdu": {
+ "port": 5,
"uid": "parapluie-pdu-4"
}
}
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-37.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-37.json
index 6b59435f2e3f601e4bd8dcd1ad0d7d8f1ad75ef6..58d90f7f131f30cfa72645d2e3ec706c1716da92 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-37.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-37.json
@@ -146,7 +146,7 @@
"cache_l1i": 65536,
"cache_l2": 524288,
"cache_l3": 5240832,
- "clock_speed": 800000000,
+ "clock_speed": 1700000000,
"instruction_set": "x86-64",
"model": "AMD Opteron",
"other_description": "AMD Opteron(tm) Processor 6164 HE",
@@ -158,9 +158,10 @@
"available": true,
"via": {
"api": {
- "metric": "pdu_shared"
+ "metric": "pdu"
},
"pdu": {
+ "port": 4,
"uid": "parapluie-pdu-4"
}
}
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-38.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-38.json
index 521e17288595b4b8c9f0603b64df714c81238274..81a0d4b849650162e087628d02fa54a8ee90c397 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-38.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-38.json
@@ -146,7 +146,7 @@
"cache_l1i": 65536,
"cache_l2": 524288,
"cache_l3": 5240832,
- "clock_speed": 800000000,
+ "clock_speed": 1700000000,
"instruction_set": "x86-64",
"model": "AMD Opteron",
"other_description": "AMD Opteron(tm) Processor 6164 HE",
@@ -158,9 +158,10 @@
"available": true,
"via": {
"api": {
- "metric": "pdu_shared"
+ "metric": "pdu"
},
"pdu": {
+ "port": 3,
"uid": "parapluie-pdu-4"
}
}
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-39.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-39.json
index b7032b35c2aab2610f08039618d30c6268b46753..2c7b5815e0df1a2e04f760fc0219b65fb0f41d56 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-39.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-39.json
@@ -146,7 +146,7 @@
"cache_l1i": 65536,
"cache_l2": 524288,
"cache_l3": 5240832,
- "clock_speed": 800000000,
+ "clock_speed": 1700000000,
"instruction_set": "x86-64",
"model": "AMD Opteron",
"other_description": "AMD Opteron(tm) Processor 6164 HE",
@@ -158,9 +158,10 @@
"available": true,
"via": {
"api": {
- "metric": "pdu_shared"
+ "metric": "pdu"
},
"pdu": {
+ "port": 2,
"uid": "parapluie-pdu-4"
}
}
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-4.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-4.json
index 6289602faeb9ea507f6a02ca5966df4618c5f23d..ae9c43062952b480f4e903f24337104733a7a557 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-4.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-4.json
@@ -146,7 +146,7 @@
"cache_l1i": 65536,
"cache_l2": 524288,
"cache_l3": 5240832,
- "clock_speed": 800000000,
+ "clock_speed": 1700000000,
"instruction_set": "x86-64",
"model": "AMD Opteron",
"other_description": "AMD Opteron(tm) Processor 6164 HE",
@@ -158,9 +158,10 @@
"available": true,
"via": {
"api": {
- "metric": "pdu_shared"
+ "metric": "pdu"
},
"pdu": {
+ "port": 21,
"uid": "parapluie-pdu-1"
}
}
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-40.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-40.json
index 82df7e954f86a4d8f4b5978a3e99c1859cd5ea06..8398b33dc65248b0106f1728278c1e73a5bacb6e 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-40.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-40.json
@@ -146,7 +146,7 @@
"cache_l1i": 65536,
"cache_l2": 524288,
"cache_l3": 5240832,
- "clock_speed": 800000000,
+ "clock_speed": 1700000000,
"instruction_set": "x86-64",
"model": "AMD Opteron",
"other_description": "AMD Opteron(tm) Processor 6164 HE",
@@ -158,9 +158,10 @@
"available": true,
"via": {
"api": {
- "metric": "pdu_shared"
+ "metric": "pdu"
},
"pdu": {
+ "port": 1,
"uid": "parapluie-pdu-4"
}
}
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-5.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-5.json
index 0ded84f19d43a498260f80e15c4d82f89f6a8545..ce8fb0b1535708448bbb422baf663dcb7223bcfa 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-5.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-5.json
@@ -146,7 +146,7 @@
"cache_l1i": 65536,
"cache_l2": 524288,
"cache_l3": 5240832,
- "clock_speed": 800000000,
+ "clock_speed": 1700000000,
"instruction_set": "x86-64",
"model": "AMD Opteron",
"other_description": "AMD Opteron(tm) Processor 6164 HE",
@@ -158,9 +158,10 @@
"available": true,
"via": {
"api": {
- "metric": "pdu_shared"
+ "metric": "pdu"
},
"pdu": {
+ "port": 20,
"uid": "parapluie-pdu-1"
}
}
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-6.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-6.json
index fbdffeac58c306db801ad6e94d2f57a20bd7b3f6..4cb1ee220d03aeaa96037e41a45d00071c229b03 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-6.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-6.json
@@ -146,7 +146,7 @@
"cache_l1i": 65536,
"cache_l2": 524288,
"cache_l3": 5240832,
- "clock_speed": 800000000,
+ "clock_speed": 1700000000,
"instruction_set": "x86-64",
"model": "AMD Opteron",
"other_description": "AMD Opteron(tm) Processor 6164 HE",
@@ -158,9 +158,10 @@
"available": true,
"via": {
"api": {
- "metric": "pdu_shared"
+ "metric": "pdu"
},
"pdu": {
+ "port": 5,
"uid": "parapluie-pdu-1"
}
}
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-7.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-7.json
index 5a62bd4d355c235e2b680e62a0d3b7958c0827a1..ca9e6acd54fcd6d2853d2aa3e3b362043b32cc0a 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-7.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-7.json
@@ -146,7 +146,7 @@
"cache_l1i": 65536,
"cache_l2": 524288,
"cache_l3": 5240832,
- "clock_speed": 800000000,
+ "clock_speed": 1700000000,
"instruction_set": "x86-64",
"model": "AMD Opteron",
"other_description": "AMD Opteron(tm) Processor 6164 HE",
@@ -158,9 +158,10 @@
"available": true,
"via": {
"api": {
- "metric": "pdu_shared"
+ "metric": "pdu"
},
"pdu": {
+ "port": 4,
"uid": "parapluie-pdu-1"
}
}
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-8.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-8.json
index 58f9b60d97181bacbf7b3d072fca0b00f16c695b..ab1d74e27ceac9a90619a3485aeda682698e1c64 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-8.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-8.json
@@ -146,7 +146,7 @@
"cache_l1i": 65536,
"cache_l2": 524288,
"cache_l3": 5240832,
- "clock_speed": 800000000,
+ "clock_speed": 1700000000,
"instruction_set": "x86-64",
"model": "AMD Opteron",
"other_description": "AMD Opteron(tm) Processor 6164 HE",
@@ -158,10 +158,11 @@
"available": true,
"via": {
"api": {
- "metric": "pdu_shared"
+ "metric": "pdu"
},
"pdu": {
- "uid": "parapluie-pdu-3"
+ "port": 3,
+ "uid": "parapluie-pdu-1"
}
}
},
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-9.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-9.json
index f5c08d55e3a654f0e953f258acf3c299c3efc722..031cb50ef529900a620d4287c17496ad90f150c7 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-9.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-9.json
@@ -146,7 +146,7 @@
"cache_l1i": 65536,
"cache_l2": 524288,
"cache_l3": 5240832,
- "clock_speed": 800000000,
+ "clock_speed": 1700000000,
"instruction_set": "x86-64",
"model": "AMD Opteron",
"other_description": "AMD Opteron(tm) Processor 6164 HE",
@@ -158,10 +158,11 @@
"available": true,
"via": {
"api": {
- "metric": "pdu_shared"
+ "metric": "pdu"
},
"pdu": {
- "uid": "parapluie-pdu-3"
+ "port": 2,
+ "uid": "parapluie-pdu-1"
}
}
},
diff --git a/data/grid5000/sites/rennes/pdus/parapluie-pdu-1.json b/data/grid5000/sites/rennes/pdus/parapluie-pdu-1.json
index 700728ed9d48927855b0fc23e7de56e3255ac2a4..6a6b6ca2f6c614472df265773fb8684007b9dc12 100644
--- a/data/grid5000/sites/rennes/pdus/parapluie-pdu-1.json
+++ b/data/grid5000/sites/rennes/pdus/parapluie-pdu-1.json
@@ -1,15 +1,13 @@
{
- "model": "eMAA12",
+ "model": "AP7921",
"sensors": [
{
"power": {
- "per_outlets": true,
+ "per_outlets": false,
"snmp": {
"available": true,
- "outlet_prefix_oid": "iso.3.6.1.4.1.534.6.6.7.6.5.1.3.0",
"total_oids": [
- "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.1",
- "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.2"
+ "iso.3.6.1.4.1.318.1.1.12.1.16.0"
],
"unit": "W"
}
@@ -18,5 +16,5 @@
],
"type": "pdu",
"uid": "parapluie-pdu-1",
- "vendor": "Eaton Corporation"
-}
+ "vendor": "APC"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/pdus/parapluie-pdu-2.json b/data/grid5000/sites/rennes/pdus/parapluie-pdu-2.json
index 39f26263340092baaa8bdb7b3d0827459d2072b9..32aac6cb0e7caea40160ca445ccf0250c496735a 100644
--- a/data/grid5000/sites/rennes/pdus/parapluie-pdu-2.json
+++ b/data/grid5000/sites/rennes/pdus/parapluie-pdu-2.json
@@ -1,15 +1,13 @@
{
- "model": "eMAA12",
+ "model": "AP7921",
"sensors": [
{
"power": {
- "per_outlets": true,
+ "per_outlets": false,
"snmp": {
"available": true,
- "outlet_prefix_oid": "iso.3.6.1.4.1.534.6.6.7.6.5.1.3.0",
"total_oids": [
- "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.1",
- "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.2"
+ "iso.3.6.1.4.1.318.1.1.12.1.16.0"
],
"unit": "W"
}
@@ -18,5 +16,5 @@
],
"type": "pdu",
"uid": "parapluie-pdu-2",
- "vendor": "Eaton Corporation"
-}
+ "vendor": "APC"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/pdus/parapluie-pdu-3.json b/data/grid5000/sites/rennes/pdus/parapluie-pdu-3.json
index a386a04625daf6825cf3c7de2a51f3455223176f..d1d99dc0037a3df8e88b90c09abcc4f14fd71dd2 100644
--- a/data/grid5000/sites/rennes/pdus/parapluie-pdu-3.json
+++ b/data/grid5000/sites/rennes/pdus/parapluie-pdu-3.json
@@ -1,15 +1,13 @@
{
- "model": "eMAA12",
+ "model": "AP7921",
"sensors": [
{
"power": {
- "per_outlets": true,
+ "per_outlets": false,
"snmp": {
"available": true,
- "outlet_prefix_oid": "iso.3.6.1.4.1.534.6.6.7.6.5.1.3.0",
"total_oids": [
- "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.1",
- "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.2"
+ "iso.3.6.1.4.1.318.1.1.12.1.16.0"
],
"unit": "W"
}
@@ -18,5 +16,5 @@
],
"type": "pdu",
"uid": "parapluie-pdu-3",
- "vendor": "Eaton Corporation"
-}
+ "vendor": "APC"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/pdus/parapluie-pdu-4.json b/data/grid5000/sites/rennes/pdus/parapluie-pdu-4.json
index 16055a1c2c0d9fd9f2f0fb86537a9cb6987c8cb5..725feb882f3b0fe654b681d8ad30206619cba2b1 100644
--- a/data/grid5000/sites/rennes/pdus/parapluie-pdu-4.json
+++ b/data/grid5000/sites/rennes/pdus/parapluie-pdu-4.json
@@ -1,15 +1,13 @@
{
- "model": "eMAA12",
+ "model": "AP7921",
"sensors": [
{
"power": {
- "per_outlets": true,
+ "per_outlets": false,
"snmp": {
"available": true,
- "outlet_prefix_oid": "iso.3.6.1.4.1.534.6.6.7.6.5.1.3.0",
"total_oids": [
- "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.1",
- "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.2"
+ "iso.3.6.1.4.1.318.1.1.12.1.16.0"
],
"unit": "W"
}
@@ -18,5 +16,5 @@
],
"type": "pdu",
"uid": "parapluie-pdu-4",
- "vendor": "Eaton Corporation"
-}
+ "vendor": "APC"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/pdus/parapluie-pdu-5.json b/data/grid5000/sites/rennes/pdus/parapluie-pdu-5.json
new file mode 100644
index 0000000000000000000000000000000000000000..f91901ee2aa77eab6e87ea1916f9a0a2706358bc
--- /dev/null
+++ b/data/grid5000/sites/rennes/pdus/parapluie-pdu-5.json
@@ -0,0 +1,20 @@
+{
+ "model": "AP7921",
+ "sensors": [
+ {
+ "power": {
+ "per_outlets": false,
+ "snmp": {
+ "available": true,
+ "total_oids": [
+ "iso.3.6.1.4.1.318.1.1.12.1.16.0"
+ ],
+ "unit": "W"
+ }
+ }
+ }
+ ],
+ "type": "pdu",
+ "uid": "parapluie-pdu-5",
+ "vendor": "APC"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/pdus/parapluie-pdu-6.json b/data/grid5000/sites/rennes/pdus/parapluie-pdu-6.json
new file mode 100644
index 0000000000000000000000000000000000000000..2c1851368cd8fbfcd61d5f5860b0b3a8e5b81493
--- /dev/null
+++ b/data/grid5000/sites/rennes/pdus/parapluie-pdu-6.json
@@ -0,0 +1,20 @@
+{
+ "model": "AP7921",
+ "sensors": [
+ {
+ "power": {
+ "per_outlets": false,
+ "snmp": {
+ "available": true,
+ "total_oids": [
+ "iso.3.6.1.4.1.318.1.1.12.1.16.0"
+ ],
+ "unit": "W"
+ }
+ }
+ }
+ ],
+ "type": "pdu",
+ "uid": "parapluie-pdu-6",
+ "vendor": "APC"
+}
\ No newline at end of file
diff --git a/generators/input/sites/rennes/clusters/parapluie.yaml b/generators/input/sites/rennes/clusters/parapluie.yaml
index b9b78b19967bdd9ad0c8d1bad13bf8bb57e3778c..e46a73cca87dfd89c560bf58a1db350f22b1aa43 100644
--- a/generators/input/sites/rennes/clusters/parapluie.yaml
+++ b/generators/input/sites/rennes/clusters/parapluie.yaml
@@ -88,7 +88,7 @@ parapluie-1:
processor:
model: AMD Opteron
cache_l1d: 65536
- clock_speed: 800000000
+ clock_speed: 1700000000
other_description: AMD Opteron(tm) Processor 6164 HE
version: 6164
cache_l2: 524288
@@ -196,7 +196,7 @@ parapluie-2:
processor:
model: AMD Opteron
cache_l1d: 65536
- clock_speed: 800000000
+ clock_speed: 1700000000
other_description: AMD Opteron(tm) Processor 6164 HE
version: 6164
cache_l2: 524288
@@ -300,7 +300,7 @@ parapluie-3:
processor:
model: AMD Opteron
cache_l1d: 65536
- clock_speed: 800000000
+ clock_speed: 1700000000
other_description: AMD Opteron(tm) Processor 6164 HE
version: 6164
cache_l2: 524288
@@ -406,7 +406,7 @@ parapluie-4:
processor:
model: AMD Opteron
cache_l1d: 65536
- clock_speed: 800000000
+ clock_speed: 1700000000
other_description: AMD Opteron(tm) Processor 6164 HE
version: 6164
cache_l2: 524288
@@ -514,7 +514,7 @@ parapluie-5:
processor:
model: AMD Opteron
cache_l1d: 65536
- clock_speed: 800000000
+ clock_speed: 1700000000
other_description: AMD Opteron(tm) Processor 6164 HE
version: 6164
cache_l2: 524288
@@ -618,7 +618,7 @@ parapluie-6:
processor:
model: AMD Opteron
cache_l1d: 65536
- clock_speed: 800000000
+ clock_speed: 1700000000
other_description: AMD Opteron(tm) Processor 6164 HE
version: 6164
cache_l2: 524288
@@ -724,7 +724,7 @@ parapluie-7:
processor:
model: AMD Opteron
cache_l1d: 65536
- clock_speed: 800000000
+ clock_speed: 1700000000
other_description: AMD Opteron(tm) Processor 6164 HE
version: 6164
cache_l2: 524288
@@ -830,7 +830,7 @@ parapluie-8:
processor:
model: AMD Opteron
cache_l1d: 65536
- clock_speed: 800000000
+ clock_speed: 1700000000
other_description: AMD Opteron(tm) Processor 6164 HE
version: 6164
cache_l2: 524288
@@ -936,7 +936,7 @@ parapluie-9:
processor:
model: AMD Opteron
cache_l1d: 65536
- clock_speed: 800000000
+ clock_speed: 1700000000
other_description: AMD Opteron(tm) Processor 6164 HE
version: 6164
cache_l2: 524288
@@ -1044,7 +1044,7 @@ parapluie-10:
processor:
model: AMD Opteron
cache_l1d: 65536
- clock_speed: 800000000
+ clock_speed: 1700000000
other_description: AMD Opteron(tm) Processor 6164 HE
version: 6164
cache_l2: 524288
@@ -1150,7 +1150,7 @@ parapluie-11:
processor:
model: AMD Opteron
cache_l1d: 65536
- clock_speed: 800000000
+ clock_speed: 1700000000
other_description: AMD Opteron(tm) Processor 6164 HE
version: 6164
cache_l2: 524288
@@ -1256,7 +1256,7 @@ parapluie-12:
processor:
model: AMD Opteron
cache_l1d: 65536
- clock_speed: 800000000
+ clock_speed: 1700000000
other_description: AMD Opteron(tm) Processor 6164 HE
version: 6164
cache_l2: 524288
@@ -1360,7 +1360,7 @@ parapluie-13:
processor:
model: AMD Opteron
cache_l1d: 65536
- clock_speed: 800000000
+ clock_speed: 1700000000
other_description: AMD Opteron(tm) Processor 6164 HE
version: 6164
cache_l2: 524288
@@ -1466,7 +1466,7 @@ parapluie-14:
processor:
model: AMD Opteron
cache_l1d: 65536
- clock_speed: 800000000
+ clock_speed: 1700000000
other_description: AMD Opteron(tm) Processor 6164 HE
version: 6164
cache_l2: 524288
@@ -1572,7 +1572,7 @@ parapluie-15:
processor:
model: AMD Opteron
cache_l1d: 65536
- clock_speed: 800000000
+ clock_speed: 1700000000
other_description: AMD Opteron(tm) Processor 6164 HE
version: 6164
cache_l2: 524288
@@ -1680,7 +1680,7 @@ parapluie-16:
processor:
model: AMD Opteron
cache_l1d: 65536
- clock_speed: 800000000
+ clock_speed: 1700000000
other_description: AMD Opteron(tm) Processor 6164 HE
version: 6164
cache_l2: 524288
@@ -1786,7 +1786,7 @@ parapluie-17:
processor:
model: AMD Opteron
cache_l1d: 65536
- clock_speed: 800000000
+ clock_speed: 1700000000
other_description: AMD Opteron(tm) Processor 6164 HE
version: 6164
cache_l2: 524288
@@ -1890,7 +1890,7 @@ parapluie-18:
processor:
model: AMD Opteron
cache_l1d: 65536
- clock_speed: 800000000
+ clock_speed: 1700000000
other_description: AMD Opteron(tm) Processor 6164 HE
version: 6164
cache_l2: 524288
@@ -1996,7 +1996,7 @@ parapluie-19:
processor:
model: AMD Opteron
cache_l1d: 65536
- clock_speed: 800000000
+ clock_speed: 1700000000
other_description: AMD Opteron(tm) Processor 6164 HE
version: 6164
cache_l2: 524288
@@ -2104,7 +2104,7 @@ parapluie-20:
processor:
model: AMD Opteron
cache_l1d: 65536
- clock_speed: 800000000
+ clock_speed: 1700000000
other_description: AMD Opteron(tm) Processor 6164 HE
version: 6164
cache_l2: 524288
@@ -2208,7 +2208,7 @@ parapluie-21:
processor:
model: AMD Opteron
cache_l1d: 65536
- clock_speed: 800000000
+ clock_speed: 1700000000
other_description: AMD Opteron(tm) Processor 6164 HE
version: 6164
cache_l2: 524288
@@ -2316,7 +2316,7 @@ parapluie-22:
processor:
model: AMD Opteron
cache_l1d: 65536
- clock_speed: 800000000
+ clock_speed: 1700000000
other_description: AMD Opteron(tm) Processor 6164 HE
version: 6164
cache_l2: 524288
@@ -2528,7 +2528,7 @@ parapluie-24:
processor:
model: AMD Opteron
cache_l1d: 65536
- clock_speed: 800000000
+ clock_speed: 1700000000
other_description: AMD Opteron(tm) Processor 6164 HE
version: 6164
cache_l2: 524288
@@ -2634,7 +2634,7 @@ parapluie-25:
processor:
model: AMD Opteron
cache_l1d: 65536
- clock_speed: 800000000
+ clock_speed: 1700000000
other_description: AMD Opteron(tm) Processor 6164 HE
version: 6164
cache_l2: 524288
@@ -2738,7 +2738,7 @@ parapluie-26:
processor:
model: AMD Opteron
cache_l1d: 65536
- clock_speed: 800000000
+ clock_speed: 1700000000
other_description: AMD Opteron(tm) Processor 6164 HE
version: 6164
cache_l2: 524288
@@ -2846,7 +2846,7 @@ parapluie-27:
processor:
model: AMD Opteron
cache_l1d: 65536
- clock_speed: 800000000
+ clock_speed: 1700000000
other_description: AMD Opteron(tm) Processor 6164 HE
version: 6164
cache_l2: 524288
@@ -2950,7 +2950,7 @@ parapluie-28:
processor:
model: AMD Opteron
cache_l1d: 65536
- clock_speed: 800000000
+ clock_speed: 1700000000
other_description: AMD Opteron(tm) Processor 6164 HE
version: 6164
cache_l2: 524288
@@ -3058,7 +3058,7 @@ parapluie-29:
processor:
model: AMD Opteron
cache_l1d: 65536
- clock_speed: 800000000
+ clock_speed: 1700000000
other_description: AMD Opteron(tm) Processor 6164 HE
version: 6164
cache_l2: 524288
@@ -3162,7 +3162,7 @@ parapluie-30:
processor:
model: AMD Opteron
cache_l1d: 65536
- clock_speed: 800000000
+ clock_speed: 1700000000
other_description: AMD Opteron(tm) Processor 6164 HE
version: 6164
cache_l2: 524288
@@ -3268,7 +3268,7 @@ parapluie-31:
processor:
model: AMD Opteron
cache_l1d: 65536
- clock_speed: 800000000
+ clock_speed: 1700000000
other_description: AMD Opteron(tm) Processor 6164 HE
version: 6164
cache_l2: 524288
@@ -3376,7 +3376,7 @@ parapluie-32:
processor:
model: AMD Opteron
cache_l1d: 65536
- clock_speed: 800000000
+ clock_speed: 1700000000
other_description: AMD Opteron(tm) Processor 6164 HE
version: 6164
cache_l2: 524288
@@ -3480,7 +3480,7 @@ parapluie-33:
processor:
model: AMD Opteron
cache_l1d: 65536
- clock_speed: 800000000
+ clock_speed: 1700000000
other_description: AMD Opteron(tm) Processor 6164 HE
version: 6164
cache_l2: 524288
@@ -3586,7 +3586,7 @@ parapluie-34:
processor:
model: AMD Opteron
cache_l1d: 65536
- clock_speed: 800000000
+ clock_speed: 1700000000
other_description: AMD Opteron(tm) Processor 6164 HE
version: 6164
cache_l2: 524288
@@ -3694,7 +3694,7 @@ parapluie-35:
processor:
model: AMD Opteron
cache_l1d: 65536
- clock_speed: 800000000
+ clock_speed: 1700000000
other_description: AMD Opteron(tm) Processor 6164 HE
version: 6164
cache_l2: 524288
@@ -3798,7 +3798,7 @@ parapluie-36:
processor:
model: AMD Opteron
cache_l1d: 65536
- clock_speed: 800000000
+ clock_speed: 1700000000
other_description: AMD Opteron(tm) Processor 6164 HE
version: 6164
cache_l2: 524288
@@ -3906,7 +3906,7 @@ parapluie-37:
processor:
model: AMD Opteron
cache_l1d: 65536
- clock_speed: 800000000
+ clock_speed: 1700000000
other_description: AMD Opteron(tm) Processor 6164 HE
version: 6164
cache_l2: 524288
@@ -4012,7 +4012,7 @@ parapluie-38:
processor:
model: AMD Opteron
cache_l1d: 65536
- clock_speed: 800000000
+ clock_speed: 1700000000
other_description: AMD Opteron(tm) Processor 6164 HE
version: 6164
cache_l2: 524288
@@ -4118,7 +4118,7 @@ parapluie-39:
processor:
model: AMD Opteron
cache_l1d: 65536
- clock_speed: 800000000
+ clock_speed: 1700000000
other_description: AMD Opteron(tm) Processor 6164 HE
version: 6164
cache_l2: 524288
@@ -4224,7 +4224,7 @@ parapluie-40:
processor:
model: AMD Opteron
cache_l1d: 65536
- clock_speed: 800000000
+ clock_speed: 1700000000
other_description: AMD Opteron(tm) Processor 6164 HE
version: 6164
cache_l2: 524288