From 81b5ca8f3645b1f4a15f481384e6b63a49320088 Mon Sep 17 00:00:00 2001
From: Sebastien Philippot <sebastien.philippot@inria.fr>
Date: Mon, 26 Mar 2018 15:19:14 +0200
Subject: [PATCH] [rennes] fix new ports for parapide in parapide_extra.yaml
and generate reference-api
---
.../clusters/parapide/nodes/parapide-15.json | 2 +-
.../clusters/parapide/nodes/parapide-16.json | 2 +-
.../clusters/parapide/nodes/parapide-25.json | 2 +-
grid5000-all.json | 38 +-----
.../clusters/parapide/parapide_extra.yaml | 120 +++++++-----------
5 files changed, 50 insertions(+), 114 deletions(-)
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-15.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-15.json
index b982ac34a1c..123b4ac7697 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-15.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-15.json
@@ -170,7 +170,7 @@
},
"pdu": [
{
- "uid": "parapide-pdu-2"
+ "uid": "parapide-pdu-1"
}
]
}
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-16.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-16.json
index e6df82f5671..b3018b8d551 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-16.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-16.json
@@ -170,7 +170,7 @@
},
"pdu": [
{
- "uid": "parapide-pdu-1"
+ "uid": "parapide-pdu-2"
}
]
}
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-25.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-25.json
index 29dafb9973e..355968e21da 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-25.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-25.json
@@ -170,7 +170,7 @@
},
"pdu": [
{
- "uid": "parapide-pdu-2"
+ "uid": "parapide-pdu-1"
}
]
}
diff --git a/grid5000-all.json b/grid5000-all.json
index 510ab84c7f9..0e78380c226 100644
--- a/grid5000-all.json
+++ b/grid5000-all.json
@@ -159094,8 +159094,6 @@
"mountable": true,
"mounted": true,
"rate": 1000000000,
- "switch": "gw-rennes",
- "switch_port": "Gi6/44",
"vendor": "Intel",
"version": "82575EB"
},
@@ -159147,12 +159145,6 @@
"pstate_governor": "performance",
"turboboost_enabled": true
},
- "pdu": [
- {
- "port": "disabled",
- "uid": "parapide-pdu-1"
- }
- ],
"performance": {
"core_flops": 9170000000,
"node_flops": 71150000000
@@ -159382,7 +159374,7 @@
},
"pdu": [
{
- "uid": "parapide-pdu-2"
+ "uid": "parapide-pdu-1"
}
]
}
@@ -159600,7 +159592,7 @@
},
"pdu": [
{
- "uid": "parapide-pdu-1"
+ "uid": "parapide-pdu-2"
}
]
}
@@ -159717,8 +159709,6 @@
"mountable": true,
"mounted": true,
"rate": 1000000000,
- "switch": "gw-rennes",
- "switch_port": "Gi6/41",
"vendor": "Intel",
"version": "82575EB"
},
@@ -159770,12 +159760,6 @@
"pstate_governor": "performance",
"turboboost_enabled": true
},
- "pdu": [
- {
- "port": "disabled",
- "uid": "parapide-pdu-2"
- }
- ],
"performance": {
"core_flops": 9170000000,
"node_flops": 71150000000
@@ -160995,8 +160979,6 @@
"mountable": true,
"mounted": true,
"rate": 1000000000,
- "switch": "gw-rennes",
- "switch_port": "Gi6/38",
"vendor": "Intel",
"version": "82575EB"
},
@@ -161048,12 +161030,6 @@
"pstate_governor": "performance",
"turboboost_enabled": true
},
- "pdu": [
- {
- "port": "disabled",
- "uid": "parapide-pdu-1"
- }
- ],
"performance": {
"core_flops": 9170000000,
"node_flops": 71150000000
@@ -161182,8 +161158,6 @@
"mountable": true,
"mounted": true,
"rate": 1000000000,
- "switch": "gw-rennes",
- "switch_port": "Gi7/37",
"vendor": "Intel",
"version": "82575EB"
},
@@ -161235,12 +161209,6 @@
"pstate_governor": "performance",
"turboboost_enabled": true
},
- "pdu": [
- {
- "port": "disabled",
- "uid": "parapide-pdu-2"
- }
- ],
"performance": {
"core_flops": 9170000000,
"node_flops": 71150000000
@@ -161688,7 +161656,7 @@
},
"pdu": [
{
- "uid": "parapide-pdu-2"
+ "uid": "parapide-pdu-1"
}
]
}
diff --git a/input/grid5000/sites/rennes/clusters/parapide/parapide_extra.yaml b/input/grid5000/sites/rennes/clusters/parapide/parapide_extra.yaml
index d5560d73757..3d6657cd578 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/parapide_extra.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/parapide_extra.yaml
@@ -3,200 +3,168 @@ nodes:
parapide-1:
network_adapters:
eth0:
- switch: gw-rennes
- switch_port: Gi7/47
+ switch: c6509
+ switch_port: Gi3/1
pdu:
- uid: parapide-pdu-4
port: disabled
parapide-2:
network_adapters:
eth0:
- switch: gw-rennes
- switch_port: Gi7/48
+ switch: c6509
+ switch_port: Gi3/2
pdu:
- uid: parapide-pdu-3
port: disabled
parapide-3:
network_adapters:
eth0:
- switch: gw-rennes
- switch_port: Gi7/34
+ switch: c6509
+ switch_port: Gi3/3
pdu:
- uid: parapide-pdu-4
port: disabled
parapide-4:
network_adapters:
eth0:
- switch: gw-rennes
- switch_port: Gi7/46
+ switch: c6509
+ switch_port: Gi3/4
pdu:
- uid: parapide-pdu-3
port: disabled
parapide-5:
network_adapters:
eth0:
- switch: gw-rennes
- switch_port: Gi7/44
+ switch: c6509
+ switch_port: Gi3/5
pdu:
- uid: parapide-pdu-3
port: disabled
parapide-6:
network_adapters:
eth0:
- switch: gw-rennes
- switch_port: Gi7/39
+ switch: c6509
+ switch_port: Gi3/6
pdu:
- uid: parapide-pdu-4
port: disabled
parapide-7:
network_adapters:
eth0:
- switch: gw-rennes
- switch_port: Gi7/40
+ switch: c6509
+ switch_port: Gi3/7
pdu:
- uid: parapide-pdu-4
port: disabled
parapide-8:
network_adapters:
eth0:
- switch: gw-rennes
- switch_port: Gi7/42
+ switch: c6509
+ switch_port: Gi3/8
pdu:
- uid: parapide-pdu-3
port: disabled
parapide-9:
network_adapters:
eth0:
- switch: gw-rennes
- switch_port: Gi7/41
+ switch: c6509
+ switch_port: Gi3/9
pdu:
- uid: parapide-pdu-3
port: disabled
parapide-10:
network_adapters:
eth0:
- switch: gw-rennes
- switch_port: Gi7/43
+ switch: c6509
+ switch_port: Gi3/10
pdu:
- uid: parapide-pdu-3
port: disabled
parapide-11:
network_adapters:
eth0:
- switch: gw-rennes
- switch_port: Gi6/45
+ switch: c6509
+ switch_port: Gi3/11
pdu:
- uid: parapide-pdu-4
port: disabled
parapide-12:
network_adapters:
eth0:
- switch: gw-rennes
- switch_port: Gi6/48
+ switch: c6509
+ switch_port: Gi3/12
pdu:
- uid: parapide-pdu-4
port: disabled
parapide-13:
network_adapters:
eth0:
- switch: gw-rennes
- switch_port: Gi6/47
+ switch: c6509
+ switch_port: Gi3/13
pdu:
- uid: parapide-pdu-4
port: disabled
- parapide-14:
- network_adapters:
- eth0:
- switch: gw-rennes
- switch_port: Gi6/44
- pdu:
- - uid: parapide-pdu-1
- port: disabled
parapide-15:
network_adapters:
eth0:
- switch: gw-rennes
- switch_port: Gi6/46
- pdu:
- - uid: parapide-pdu-2
- port: disabled
- parapide-16:
- network_adapters:
- eth0:
- switch: gw-rennes
- switch_port: Gi6/42
+ switch: c6509
+ switch_port: Gi3/14
pdu:
- uid: parapide-pdu-1
port: disabled
- parapide-17:
+ parapide-16:
network_adapters:
eth0:
- switch: gw-rennes
- switch_port: Gi6/41
+ switch: c6509
+ switch_port: Gi3/15
pdu:
- uid: parapide-pdu-2
port: disabled
parapide-18:
network_adapters:
eth0:
- switch: gw-rennes
- switch_port: Gi6/39
+ switch: c6509
+ switch_port: Gi3/16
pdu:
- uid: parapide-pdu-1
port: disabled
parapide-19:
network_adapters:
eth0:
- switch: gw-rennes
- switch_port: Gi6/40
+ switch: c6509
+ switch_port: Gi3/17
pdu:
- uid: parapide-pdu-2
port: disabled
parapide-20:
network_adapters:
eth0:
- switch: gw-rennes
- switch_port: Gi6/43
+ switch: c6509
+ switch_port: Gi3/18
pdu:
- uid: parapide-pdu-1
port: disabled
parapide-21:
network_adapters:
eth0:
- switch: gw-rennes
- switch_port: Gi7/36
- pdu:
- - uid: parapide-pdu-2
- port: disabled
- parapide-22:
- network_adapters:
- eth0:
- switch: gw-rennes
- switch_port: Gi6/38
- pdu:
- - uid: parapide-pdu-1
- port: disabled
- parapide-23:
- network_adapters:
- eth0:
- switch: gw-rennes
- switch_port: Gi7/37
+ switch: c6509
+ switch_port: Gi3/19
pdu:
- uid: parapide-pdu-2
port: disabled
parapide-24:
network_adapters:
eth0:
- switch: gw-rennes
- switch_port: Gi6/37
+ switch: c6509
+ switch_port: Gi3/20
pdu:
- uid: parapide-pdu-1
port: disabled
parapide-25:
network_adapters:
eth0:
- switch: gw-rennes
- switch_port: Gi7/38
+ switch: c6509
+ switch_port: Gi3/21
pdu:
- - uid: parapide-pdu-2
+ - uid: parapide-pdu-1
port: disabled
--
GitLab