diff --git a/data/grid5000/sites/nancy/clusters/gruss/nodes/gruss-1.json b/data/grid5000/sites/nancy/clusters/gruss/nodes/gruss-1.json
index 4eea5e8075ec2fad85f64e311a4d54a612a1516d..39348a74f789af04619abd58c4ed3776c90e1f7e 100644
--- a/data/grid5000/sites/nancy/clusters/gruss/nodes/gruss-1.json
+++ b/data/grid5000/sites/nancy/clusters/gruss/nodes/gruss-1.json
@@ -288,16 +288,6 @@
"pstate_governor": "performance",
"turboboost_enabled": true
},
- "pdu": [
- {
- "port": 24,
- "uid": "gruss-pdu1"
- },
- {
- "port": 24,
- "uid": "gruss-pdu2"
- }
- ],
"performance": {
"core_flops": 38400000000,
"node_flops": 1843200000000
diff --git a/data/grid5000/sites/nancy/clusters/gruss/nodes/gruss-2.json b/data/grid5000/sites/nancy/clusters/gruss/nodes/gruss-2.json
index b7b24c423561ae4ca683c956e4330eb486afefb9..f6730ec2258a066c4719eeda8957ad9de83b9017 100644
--- a/data/grid5000/sites/nancy/clusters/gruss/nodes/gruss-2.json
+++ b/data/grid5000/sites/nancy/clusters/gruss/nodes/gruss-2.json
@@ -288,16 +288,6 @@
"pstate_governor": "performance",
"turboboost_enabled": true
},
- "pdu": [
- {
- "port": 16,
- "uid": "gruss-pdu1"
- },
- {
- "port": 16,
- "uid": "gruss-pdu2"
- }
- ],
"performance": {
"core_flops": 38400000000,
"node_flops": 1843200000000
diff --git a/data/grid5000/sites/nancy/clusters/gruss/nodes/gruss-3.json b/data/grid5000/sites/nancy/clusters/gruss/nodes/gruss-3.json
index 60f3896554cb50c4d0bbff5ac8c2e05333da1aac..bc1f56a556c21fc39854674567204ce83a90fc82 100644
--- a/data/grid5000/sites/nancy/clusters/gruss/nodes/gruss-3.json
+++ b/data/grid5000/sites/nancy/clusters/gruss/nodes/gruss-3.json
@@ -288,16 +288,6 @@
"pstate_governor": "performance",
"turboboost_enabled": true
},
- "pdu": [
- {
- "port": 8,
- "uid": "gruss-pdu1"
- },
- {
- "port": 8,
- "uid": "gruss-pdu2"
- }
- ],
"performance": {
"core_flops": 38400000000,
"node_flops": 1843200000000
diff --git a/data/grid5000/sites/nancy/clusters/gruss/nodes/gruss-4.json b/data/grid5000/sites/nancy/clusters/gruss/nodes/gruss-4.json
index 36cd81e4f0c049051df271962a57a789388475a3..8fd5341f8630ea11a50cf5a1facbe86f87558a89 100644
--- a/data/grid5000/sites/nancy/clusters/gruss/nodes/gruss-4.json
+++ b/data/grid5000/sites/nancy/clusters/gruss/nodes/gruss-4.json
@@ -288,16 +288,6 @@
"pstate_governor": "performance",
"turboboost_enabled": true
},
- "pdu": [
- {
- "port": 1,
- "uid": "gruss-pdu1"
- },
- {
- "port": 1,
- "uid": "gruss-pdu2"
- }
- ],
"performance": {
"core_flops": 38400000000,
"node_flops": 1843200000000
diff --git a/data/grid5000/sites/nancy/pdus/graffiti-pdu1.json b/data/grid5000/sites/nancy/pdus/graffiti-pdu1.json
deleted file mode 100644
index a94af2400f88393669b33a163d3ed7dd21721893..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/pdus/graffiti-pdu1.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
- "ip": "172.17.79.226",
- "mac": "28:29:86:0B:3B:06",
- "metrics": [
- {
- "description": "Power consumption per outlet reported by PDU, in watt",
- "name": "pdu_outlet_power_watt",
- "period": 1000,
- "source": {
- "id": "1.3.6.1.4.1.318.1.1.26.9.4.3.1.7.%PORT%",
- "protocol": "snmp"
- }
- }
- ],
- "model": "AP8653",
- "type": "pdu",
- "uid": "graffiti-pdu1",
- "vendor": "APC"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/pdus/graffiti-pdu2.json b/data/grid5000/sites/nancy/pdus/graffiti-pdu2.json
deleted file mode 100644
index adde229e239a1cb282ad8728ea05b8ae6855bd2c..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/pdus/graffiti-pdu2.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
- "ip": "172.17.79.227",
- "mac": "28:29:86:10:0E:8C",
- "metrics": [
- {
- "description": "Power consumption per outlet reported by PDU, in watt",
- "name": "pdu_outlet_power_watt",
- "period": 1000,
- "source": {
- "id": "1.3.6.1.4.1.318.1.1.26.9.4.3.1.7.%PORT%",
- "protocol": "snmp"
- }
- }
- ],
- "model": "AP8653",
- "type": "pdu",
- "uid": "graffiti-pdu2",
- "vendor": "APC"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/pdus/graffiti-pdu3.json b/data/grid5000/sites/nancy/pdus/graffiti-pdu3.json
deleted file mode 100644
index ef6174c50c635ff1e5d2743593d39192564b8b66..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/pdus/graffiti-pdu3.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
- "ip": "172.17.79.231",
- "mac": "28:29:86:12:27:FF",
- "metrics": [
- {
- "description": "Power consumption per outlet reported by PDU, in watt",
- "name": "pdu_outlet_power_watt",
- "period": 1000,
- "source": {
- "id": "1.3.6.1.4.1.318.1.1.26.9.4.3.1.7.%PORT%",
- "protocol": "snmp"
- }
- }
- ],
- "model": "AP8653",
- "type": "pdu",
- "uid": "graffiti-pdu3",
- "vendor": "APC"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/pdus/graffiti-pdu4.json b/data/grid5000/sites/nancy/pdus/graffiti-pdu4.json
deleted file mode 100644
index 4f4c85d6abda01b3ca367e81fd91043adddcaa25..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/pdus/graffiti-pdu4.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
- "ip": "172.17.79.232",
- "mac": "28:29:86:10:0E:B4",
- "metrics": [
- {
- "description": "Power consumption per outlet reported by PDU, in watt",
- "name": "pdu_outlet_power_watt",
- "period": 1000,
- "source": {
- "id": "1.3.6.1.4.1.318.1.1.26.9.4.3.1.7.%PORT%",
- "protocol": "snmp"
- }
- }
- ],
- "model": "AP8653",
- "type": "pdu",
- "uid": "graffiti-pdu4",
- "vendor": "APC"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/pdus/graoully-pdu1.json b/data/grid5000/sites/nancy/pdus/graoully-pdu1.json
deleted file mode 100644
index 46705ed7f9145a8e5423bb0208cc9a81b91a990e..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/pdus/graoully-pdu1.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
- "ip": "172.17.79.243",
- "mac": "00:C0:B7:ED:63:AE",
- "metrics": [
- {
- "description": "Power consumption per outlet reported by PDU, in watt",
- "name": "pdu_outlet_power_watt",
- "period": 1000,
- "source": {
- "id": "1.3.6.1.4.1.318.1.1.26.9.4.3.1.7.%PORT%",
- "protocol": "snmp"
- }
- }
- ],
- "model": "AP8653",
- "type": "pdu",
- "uid": "graoully-pdu1",
- "vendor": "APC"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/pdus/graoully-pdu2.json b/data/grid5000/sites/nancy/pdus/graoully-pdu2.json
deleted file mode 100644
index c091b6218ae7de69f5f80f74cb44723bd1f7cfea..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/pdus/graoully-pdu2.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
- "ip": "172.17.79.244",
- "mac": "00:C0:B7:85:13:9C",
- "metrics": [
- {
- "description": "Power consumption per outlet reported by PDU, in watt",
- "name": "pdu_outlet_power_watt",
- "period": 1000,
- "source": {
- "id": "1.3.6.1.4.1.318.1.1.26.9.4.3.1.7.%PORT%",
- "protocol": "snmp"
- }
- }
- ],
- "model": "AP8653",
- "type": "pdu",
- "uid": "graoully-pdu2",
- "vendor": "APC"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/pdus/grappe-pdu1.json b/data/grid5000/sites/nancy/pdus/grappe-pdu1.json
deleted file mode 100644
index 25aa9380a95bff76093740d34dfce70dbd209f85..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/pdus/grappe-pdu1.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
- "ip": "172.17.79.210",
- "mac": "28:29:86:2d:dd:3f",
- "metrics": [
- {
- "description": "Power consumption per outlet reported by PDU, in watt",
- "name": "pdu_outlet_power_watt",
- "period": 1000,
- "source": {
- "id": "1.3.6.1.4.1.318.1.1.26.9.4.3.1.7.%PORT%",
- "protocol": "snmp"
- }
- }
- ],
- "model": "AP8653",
- "type": "pdu",
- "uid": "grappe-pdu1",
- "vendor": "APC"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/pdus/grappe-pdu2.json b/data/grid5000/sites/nancy/pdus/grappe-pdu2.json
deleted file mode 100644
index 100a19dd37378147d645238cfc73b59b15938ed3..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/pdus/grappe-pdu2.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "ip": "172.17.79.250",
- "mac": "00:20:85:F9:12:C4",
- "model": "eMAA13",
- "type": "pdu",
- "uid": "grappe-pdu2",
- "vendor": "Eaton"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/pdus/grisou-pdu2.json b/data/grid5000/sites/nancy/pdus/grisou-pdu2.json
deleted file mode 100644
index a2b9b7413581c47567d246de804d51279ad2c687..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/pdus/grisou-pdu2.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "ip": "172.17.79.248",
- "mac": "28:29:86:2D:DF:60",
- "model": "AP8653",
- "type": "pdu",
- "uid": "grisou-pdu2",
- "vendor": "APC"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/pdus/gruss-pdu1.json b/data/grid5000/sites/nancy/pdus/gruss-pdu1.json
deleted file mode 100644
index e41b991ec005a2dfb066425e27e213322803205c..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/pdus/gruss-pdu1.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
- "ip": "172.17.79.213",
- "mac": "28:29:86:48:77:a8",
- "metrics": [
- {
- "description": "Power consumption per outlet reported by PDU, in watt",
- "name": "pdu_outlet_power_watt",
- "period": 1000,
- "source": {
- "id": "1.3.6.1.4.1.318.1.1.26.9.4.3.1.7.%PORT%",
- "protocol": "snmp"
- }
- }
- ],
- "model": "AP8653",
- "ports": {
- "1": "gruss-4",
- "16": "gruss-2",
- "24": "gruss-1",
- "8": "gruss-3"
- },
- "type": "pdu",
- "uid": "gruss-pdu1",
- "vendor": "APC"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/pdus/gruss-pdu2.json b/data/grid5000/sites/nancy/pdus/gruss-pdu2.json
deleted file mode 100644
index b64f3abda60197802c6af31c41eedd49bb4ab2cb..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/pdus/gruss-pdu2.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
- "ip": "172.17.79.214",
- "mac": "28:29:86:48:77:a1",
- "metrics": [
- {
- "description": "Power consumption per outlet reported by PDU, in watt",
- "name": "pdu_outlet_power_watt",
- "period": 1000,
- "source": {
- "id": "1.3.6.1.4.1.318.1.1.26.9.4.3.1.7.%PORT%",
- "protocol": "snmp"
- }
- }
- ],
- "model": "AP8653",
- "ports": {
- "1": "gruss-4",
- "16": "gruss-2",
- "24": "gruss-1",
- "8": "gruss-3"
- },
- "type": "pdu",
- "uid": "gruss-pdu2",
- "vendor": "APC"
-}
\ No newline at end of file
diff --git a/input/grid5000/sites/nancy/clusters/gruss/gruss_pdu.yaml b/input/grid5000/sites/nancy/clusters/gruss/gruss_pdu.yaml
deleted file mode 100644
index abca4a96f7763748b2f7b2c47047de541252498d..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/clusters/gruss/gruss_pdu.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-nodes:
- gruss-1:
- pdu:
- - uid: gruss-pdu1
- port: 24
- - uid: gruss-pdu2
- port: 24
- gruss-2:
- pdu:
- - uid: gruss-pdu1
- port: 16
- - uid: gruss-pdu2
- port: 16
- gruss-3:
- pdu:
- - uid: gruss-pdu1
- port: 8
- - uid: gruss-pdu2
- port: 8
- gruss-4:
- pdu:
- - uid: gruss-pdu1
- port: 1
- - uid: gruss-pdu2
- port: 1
\ No newline at end of file
diff --git a/input/grid5000/sites/nancy/pdus.yaml b/input/grid5000/sites/nancy/pdus.yaml
index 74dff979f9b157fda03328e7d77e637c70b2d54f..c47902a19d42f1215fd8f830f3a1d1e6088721ae 100644
--- a/input/grid5000/sites/nancy/pdus.yaml
+++ b/input/grid5000/sites/nancy/pdus.yaml
@@ -1,16 +1,5 @@
---
pdus:
- graoully-pdu[1-2]:
- vendor: APC
- model: AP8653
- metrics:
- - name: pdu_outlet_power_watt
- description: Power consumption per outlet reported by PDU, in watt
- period: 1000
- source:
- protocol: snmp
- id: 1.3.6.1.4.1.318.1.1.26.9.4.3.1.7.%PORT%
-
grimoire-pdu[1-2]:
vendor: APC
model: AP8653
@@ -33,31 +22,6 @@ pdus:
protocol: snmp
id: 1.3.6.1.4.1.318.1.1.26.9.4.3.1.7.%PORT%
- grisou-pdu2:
- vendor: APC
- model: AP8653
- ip: 172.17.79.248
- mac: 28:29:86:2D:DF:60
-
- graffiti-pdu[1-4]:
- vendor: APC
- model: AP8653
- metrics:
- - name: pdu_outlet_power_watt
- description: Power consumption per outlet reported by PDU, in watt
- period: 1000
- source:
- protocol: snmp
- id: 1.3.6.1.4.1.318.1.1.26.9.4.3.1.7.%PORT%
-
- graoully-pdu1:
- ip: 172.17.79.243
- mac: 00:C0:B7:ED:63:AE
-
- graoully-pdu2:
- ip: 172.17.79.244
- mac: 00:C0:B7:85:13:9C
-
grimoire-pdu1:
ip: 172.17.79.245
mac: 00:C0:B7:85:13:93
@@ -74,22 +38,6 @@ pdus:
ip: 172.17.79.219
mac: 00:C0:B7:F2:27:DE
- graffiti-pdu1:
- ip: 172.17.79.226
- mac: 28:29:86:0B:3B:06
-
- graffiti-pdu2:
- ip: 172.17.79.227
- mac: 28:29:86:10:0E:8C
-
- graffiti-pdu3:
- ip: 172.17.79.231
- mac: 28:29:86:12:27:FF
-
- graffiti-pdu4:
- ip: 172.17.79.232
- mac: 28:29:86:10:0E:B4
-
gros-pdu[1-8]:
vendor: APC
model: AP8653
@@ -125,23 +73,6 @@ pdus:
gros-pdu8:
ip: 172.17.79.249
mac: 28:29:86:12:28:60
- grappe-pdu1:
- ip: 172.17.79.210
- mac: 28:29:86:2d:dd:3f
- vendor: APC
- model: AP8653
- metrics:
- - name: pdu_outlet_power_watt
- description: Power consumption per outlet reported by PDU, in watt
- period: 1000
- source:
- protocol: snmp
- id: 1.3.6.1.4.1.318.1.1.26.9.4.3.1.7.%PORT%
- grappe-pdu2:
- ip: 172.17.79.250
- mac: 00:20:85:F9:12:C4
- vendor: Eaton
- model: eMAA13
gros-wattmetre2:
vendor: OmegaWatt
@@ -155,20 +86,3 @@ pdus:
optional_period: 20
source:
protocol: wattmetre
-
- gruss-pdu1:
- ip: 172.17.79.213
- mac: 28:29:86:48:77:a8
- gruss-pdu2:
- ip: 172.17.79.214
- mac: 28:29:86:48:77:a1
- gruss-pdu[1-2]:
- vendor: APC
- model: AP8653
- metrics:
- - name: pdu_outlet_power_watt
- description: Power consumption per outlet reported by PDU, in watt
- period: 1000
- source:
- protocol: snmp
- id: 1.3.6.1.4.1.318.1.1.26.9.4.3.1.7.%PORT%