From e6fc99e8269da4b74877792bea0e0a7417e403ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89mile=20Morel?= <emile.morel@inria.fr>
Date: Wed, 10 Jul 2013 16:50:18 +0200
Subject: [PATCH] [rennes] parapluie - change cpu frequency
---
.../clusters/parapluie/nodes/parapluie-1.json | 5 +-
.../parapluie/nodes/parapluie-10.json | 7 +-
.../parapluie/nodes/parapluie-11.json | 7 +-
.../parapluie/nodes/parapluie-12.json | 7 +-
.../parapluie/nodes/parapluie-13.json | 7 +-
.../parapluie/nodes/parapluie-14.json | 7 +-
.../parapluie/nodes/parapluie-15.json | 5 +-
.../parapluie/nodes/parapluie-16.json | 5 +-
.../parapluie/nodes/parapluie-17.json | 5 +-
.../parapluie/nodes/parapluie-18.json | 5 +-
.../parapluie/nodes/parapluie-19.json | 5 +-
.../clusters/parapluie/nodes/parapluie-2.json | 5 +-
.../parapluie/nodes/parapluie-20.json | 5 +-
.../parapluie/nodes/parapluie-21.json | 7 +-
.../parapluie/nodes/parapluie-22.json | 7 +-
.../parapluie/nodes/parapluie-23.json | 5 +-
.../parapluie/nodes/parapluie-24.json | 7 +-
.../parapluie/nodes/parapluie-25.json | 7 +-
.../parapluie/nodes/parapluie-26.json | 7 +-
.../parapluie/nodes/parapluie-27.json | 7 +-
.../parapluie/nodes/parapluie-28.json | 7 +-
.../parapluie/nodes/parapluie-29.json | 7 +-
.../clusters/parapluie/nodes/parapluie-3.json | 5 +-
.../parapluie/nodes/parapluie-30.json | 7 +-
.../parapluie/nodes/parapluie-31.json | 7 +-
.../parapluie/nodes/parapluie-32.json | 7 +-
.../parapluie/nodes/parapluie-33.json | 7 +-
.../parapluie/nodes/parapluie-34.json | 5 +-
.../parapluie/nodes/parapluie-35.json | 5 +-
.../parapluie/nodes/parapluie-36.json | 5 +-
.../parapluie/nodes/parapluie-37.json | 5 +-
.../parapluie/nodes/parapluie-38.json | 5 +-
.../parapluie/nodes/parapluie-39.json | 5 +-
.../clusters/parapluie/nodes/parapluie-4.json | 5 +-
.../parapluie/nodes/parapluie-40.json | 5 +-
.../clusters/parapluie/nodes/parapluie-5.json | 5 +-
.../clusters/parapluie/nodes/parapluie-6.json | 5 +-
.../clusters/parapluie/nodes/parapluie-7.json | 5 +-
.../clusters/parapluie/nodes/parapluie-8.json | 7 +-
.../clusters/parapluie/nodes/parapluie-9.json | 7 +-
.../sites/rennes/pdus/parapluie-pdu-1.json | 12 ++-
.../sites/rennes/pdus/parapluie-pdu-2.json | 12 ++-
.../sites/rennes/pdus/parapluie-pdu-3.json | 12 ++-
.../sites/rennes/pdus/parapluie-pdu-4.json | 12 ++-
.../sites/rennes/pdus/parapluie-pdu-5.json | 20 +++++
.../sites/rennes/pdus/parapluie-pdu-6.json | 20 +++++
.../sites/rennes/clusters/parapluie.yaml | 78 +++++++++----------
47 files changed, 238 insertions(+), 166 deletions(-)
create mode 100644 data/grid5000/sites/rennes/pdus/parapluie-pdu-5.json
create mode 100644 data/grid5000/sites/rennes/pdus/parapluie-pdu-6.json
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 8c596bf9d23..1029f2208db 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 5f32294c46c..e3f05818890 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 5d1f645aa98..50204955c46 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 5177bb3fb33..dc4b74e88b7 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 d36f3815109..5b46ea4231b 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 5ef9b7bab08..5db094365bd 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 d5847b9e739..d248811bcc5 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 c77dba2829a..4fe8c4ed03f 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 b64767a32be..375948c40bb 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 88263548b05..effd5b2b9e1 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 50298a992a5..31c0edc5658 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 9d55a8c3925..48534776068 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 7ddb8419c28..6b0d6282c1e 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 1f572d708c9..53eb98954b2 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 57643070206..18863fe1a49 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 194716d7c0a..744caa27f06 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 0d65be53cbc..3ebd191ab5d 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 efa199311f4..c8e02d2f93c 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 ce69e7ce7fb..9bbc6e93bb6 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 7d307252335..5fdf2ecb905 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 3a9c15e8673..3ba22fca66d 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 5bc7dd2eadf..df84b34242b 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 eb6d0449df5..49fd41c72ca 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 4c5b0d3e5be..ef351bfbc20 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 c68335386f8..91db3bab303 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 9304b405ed9..5c1b8a83ee6 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 6f53be0ada5..84853851fc8 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 09bb67b5f67..13a9c2c64a2 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 f083346b066..c2e92eb66cc 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 1bc069ff069..c10014af3d4 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 6b59435f2e3..58d90f7f131 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 521e1728859..81a0d4b8496 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 b7032b35c2a..2c7b5815e0d 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 6289602faeb..ae9c4306295 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 82df7e954f8..8398b33dc65 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 0ded84f19d4..ce8fb0b1535 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 fbdffeac58c..4cb1ee220d0 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 5a62bd4d355..ca9e6acd54f 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 58f9b60d971..ab1d74e27ce 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 f5c08d55e3a..031cb50ef52 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 700728ed9d4..6a6b6ca2f6c 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 39f26263340..32aac6cb0e7 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 a386a04625d..d1d99dc0037 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 16055a1c2c0..725feb882f3 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 00000000000..f91901ee2aa
--- /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 00000000000..2c1851368cd
--- /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 b9b78b19967..e46a73cca87 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
--
GitLab