From 62572ec6e1d7e2e8c75c006286fae5684a250b56 Mon Sep 17 00:00:00 2001
From: Gaetan SIMO <gaetan.simo@inria.fr>
Date: Mon, 6 Jun 2011 20:35:48 +0200
Subject: [PATCH] [orsay] updating network caracteristics.
---
.../orsay/clusters/gdx/nodes/gdx-108.json | 18 +++---
.../orsay/clusters/gdx/nodes/gdx-126.json | 6 +-
.../orsay/clusters/gdx/nodes/gdx-144.json | 20 +++----
.../orsay/clusters/gdx/nodes/gdx-162.json | 4 +-
.../orsay/clusters/gdx/nodes/gdx-18.json | 6 +-
.../orsay/clusters/gdx/nodes/gdx-180.json | 20 +++----
.../orsay/clusters/gdx/nodes/gdx-181.json | 6 +-
.../orsay/clusters/gdx/nodes/gdx-182.json | 6 +-
.../orsay/clusters/gdx/nodes/gdx-183.json | 6 +-
.../orsay/clusters/gdx/nodes/gdx-184.json | 6 +-
.../orsay/clusters/gdx/nodes/gdx-185.json | 6 +-
.../orsay/clusters/gdx/nodes/gdx-186.json | 6 +-
.../orsay/clusters/gdx/nodes/gdx-187.json | 6 +-
.../orsay/clusters/gdx/nodes/gdx-188.json | 6 +-
.../orsay/clusters/gdx/nodes/gdx-189.json | 6 +-
.../orsay/clusters/gdx/nodes/gdx-190.json | 6 +-
.../orsay/clusters/gdx/nodes/gdx-191.json | 6 +-
.../orsay/clusters/gdx/nodes/gdx-192.json | 6 +-
.../orsay/clusters/gdx/nodes/gdx-198.json | 6 +-
.../orsay/clusters/gdx/nodes/gdx-216.json | 16 +++---
.../orsay/clusters/gdx/nodes/gdx-234.json | 2 +-
.../orsay/clusters/gdx/nodes/gdx-252.json | 16 +++---
.../orsay/clusters/gdx/nodes/gdx-270.json | 6 +-
.../orsay/clusters/gdx/nodes/gdx-288.json | 20 +++----
.../orsay/clusters/gdx/nodes/gdx-306.json | 6 +-
.../orsay/clusters/gdx/nodes/gdx-36.json | 18 +++---
.../orsay/clusters/gdx/nodes/gdx-54.json | 6 +-
.../orsay/clusters/gdx/nodes/gdx-72.json | 18 +++---
.../orsay/clusters/gdx/nodes/gdx-90.json | 6 +-
generators/input/orsay-gdx.rb | 52 ++++++++++++------
generators/input/orsay-links.yaml | 55 +++++++++++++++++++
generators/input/orsay-network.yaml | 7 +++
32 files changed, 230 insertions(+), 150 deletions(-)
create mode 100644 generators/input/orsay-links.yaml
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-108.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-108.json
index f81eff3828..412a996ff5 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-108.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-108.json
@@ -20,12 +20,12 @@
"mounted": false,
"network_address": "gdx-108-bmc.orsay.grid5000.fr",
"rate": 1000000000,
- "switch": "netgear04.orsay.grid5000.fr",
- "switch_console": "mrv04.orsay.grid5000.fr",
- "switch_console_ip": "172.26.120.204",
- "switch_console_mac": "00:a0:9c:00:12:e4",
- "switch_ip": "172.26.120.154",
- "switch_mac": "00:0f:b5:f5:79:2a",
+ "switch": "netgear03.orsay.grid5000.fr",
+ "switch_console": "mrv03.orsay.grid5000.fr",
+ "switch_console_ip": "172.26.120.203",
+ "switch_console_mac": "00:a0:9c:00:12:dd",
+ "switch_ip": "172.26.120.153",
+ "switch_mac": "00:0f:b5:fb:70:89",
"vendor": "Broadcom",
"version": "NetXtreme BCM5780"
},
@@ -59,9 +59,9 @@
"mounted": true,
"network_address": "gdx-108.orsay.grid5000.fr",
"rate": 1000000000,
- "switch": "switch03.orsay.grid5000.fr",
- "switch_ip": "172.26.120.103",
- "switch_mac": "00:24:f9:3e:a7:42",
+ "switch": "switch05.orsay.grid5000.fr",
+ "switch_ip": "172.26.120.105",
+ "switch_mac": 155681622,
"vendor": "Broadcom",
"version": "NetXtreme BCM5780"
},
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-126.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-126.json
index 7f743d4263..8988e84d6a 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-126.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-126.json
@@ -59,9 +59,9 @@
"mounted": true,
"network_address": "gdx-126.orsay.grid5000.fr",
"rate": 1000000000,
- "switch": "switch02.orsay.grid5000.fr",
- "switch_ip": "172.26.120.102",
- "switch_mac": "00:12:00:4c:f5:c2",
+ "switch": "switch03.orsay.grid5000.fr",
+ "switch_ip": "172.26.120.103",
+ "switch_mac": "00:24:f9:3e:a7:42",
"vendor": "Broadcom",
"version": "NetXtreme BCM5780"
},
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-144.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-144.json
index 3d1841f574..c1b328280d 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-144.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-144.json
@@ -20,12 +20,12 @@
"mounted": false,
"network_address": "gdx-144-bmc.orsay.grid5000.fr",
"rate": 1000000000,
- "switch": "netgear05.orsay.grid5000.fr",
- "switch_console": "mrv05.orsay.grid5000.fr",
- "switch_console_ip": "172.26.120.205",
- "switch_console_mac": "00:a0:9c:00:10:ae",
- "switch_ip": "172.26.120.155",
- "switch_mac": "00:0f:b5:fb:70:a5",
+ "switch": "netgear04.orsay.grid5000.fr",
+ "switch_console": "mrv04.orsay.grid5000.fr",
+ "switch_console_ip": "172.26.120.204",
+ "switch_console_mac": "00:a0:9c:00:12:e4",
+ "switch_ip": "172.26.120.154",
+ "switch_mac": "00:0f:b5:f5:79:2a",
"vendor": "Broadcom",
"version": "NetXtreme BCM5780"
},
@@ -58,10 +58,10 @@
"mountable": true,
"mounted": true,
"network_address": "gdx-144.orsay.grid5000.fr",
- "rate": 100000000,
- "switch": "procurve17.orsay.grid5000.fr",
- "switch_ip": "172.26.120.197",
- "switch_mac": "nil",
+ "rate": 1000000000,
+ "switch": "switch02.orsay.grid5000.fr",
+ "switch_ip": "172.26.120.102",
+ "switch_mac": "00:12:00:4c:f5:c2",
"vendor": "Broadcom",
"version": "NetXtreme BCM5780"
},
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-162.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-162.json
index 84e7228c22..e5179bce2d 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-162.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-162.json
@@ -59,8 +59,8 @@
"mounted": true,
"network_address": "gdx-162.orsay.grid5000.fr",
"rate": 100000000,
- "switch": "procurve18.orsay.grid5000.fr",
- "switch_ip": "172.26.120.198",
+ "switch": "procurve17.orsay.grid5000.fr",
+ "switch_ip": "172.26.120.197",
"switch_mac": "nil",
"vendor": "Broadcom",
"version": "NetXtreme BCM5780"
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-18.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-18.json
index 6d8d40ed8d..738ba43434 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-18.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-18.json
@@ -59,9 +59,9 @@
"mounted": true,
"network_address": "gdx-18.orsay.grid5000.fr",
"rate": 1000000000,
- "switch": "switch12.orsay.grid5000.fr",
- "switch_ip": "172.26.120.112",
- "switch_mac": "00:12:01:73:27:C2",
+ "switch": "switch11.orsay.grid5000.fr",
+ "switch_ip": "172.26.120.111",
+ "switch_mac": "00:12:01:73:21:C2",
"vendor": "Broadcom",
"version": "NetXtreme BCM5780"
},
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-180.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-180.json
index 8ca0b287c4..abed08731a 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-180.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-180.json
@@ -20,12 +20,12 @@
"mounted": false,
"network_address": "gdx-180-bmc.orsay.grid5000.fr",
"rate": 1000000000,
- "switch": "netgear06.orsay.grid5000.fr",
- "switch_console": "mrv06.orsay.grid5000.fr",
- "switch_console_ip": "172.26.120.206",
- "switch_console_mac": "00:a0:9c:00:16:42",
- "switch_ip": "172.26.120.156",
- "switch_mac": "nil",
+ "switch": "netgear05.orsay.grid5000.fr",
+ "switch_console": "mrv05.orsay.grid5000.fr",
+ "switch_console_ip": "172.26.120.205",
+ "switch_console_mac": "00:a0:9c:00:10:ae",
+ "switch_ip": "172.26.120.155",
+ "switch_mac": "00:0f:b5:fb:70:a5",
"vendor": "Broadcom",
"version": "NetXtreme BCM5780"
},
@@ -58,10 +58,10 @@
"mountable": true,
"mounted": true,
"network_address": "gdx-180.orsay.grid5000.fr",
- "rate": 1000000000,
- "switch": "switch14.orsay.grid5000.fr",
- "switch_ip": "172.26.120.114",
- "switch_mac": "00:11:bb:17:e8:c2",
+ "rate": 100000000,
+ "switch": "procurve18.orsay.grid5000.fr",
+ "switch_ip": "172.26.120.198",
+ "switch_mac": "nil",
"vendor": "Broadcom",
"version": "NetXtreme BCM5780"
},
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-181.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-181.json
index 7db01c3060..7d8ecfb53b 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-181.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-181.json
@@ -20,12 +20,12 @@
"mounted": false,
"network_address": "gdx-181-bmc.orsay.grid5000.fr",
"rate": 1000000000,
- "switch": "netgear06.orsay.grid5000.fr",
+ "switch": "switch14.orsay.grid5000.fr",
"switch_console": "mrv06.orsay.grid5000.fr",
"switch_console_ip": "172.26.120.206",
"switch_console_mac": "00:a0:9c:00:16:42",
- "switch_ip": "172.26.120.156",
- "switch_mac": "nil",
+ "switch_ip": "172.26.120.114",
+ "switch_mac": "00:11:bb:17:e8:c2",
"vendor": "Broadcom",
"version": "NetXtreme BCM5780"
},
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-182.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-182.json
index c722e6de58..8be4f2d1f9 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-182.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-182.json
@@ -20,12 +20,12 @@
"mounted": false,
"network_address": "gdx-182-bmc.orsay.grid5000.fr",
"rate": 1000000000,
- "switch": "netgear06.orsay.grid5000.fr",
+ "switch": "switch14.orsay.grid5000.fr",
"switch_console": "mrv06.orsay.grid5000.fr",
"switch_console_ip": "172.26.120.206",
"switch_console_mac": "00:a0:9c:00:16:42",
- "switch_ip": "172.26.120.156",
- "switch_mac": "nil",
+ "switch_ip": "172.26.120.114",
+ "switch_mac": "00:11:bb:17:e8:c2",
"vendor": "Broadcom",
"version": "NetXtreme BCM5780"
},
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-183.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-183.json
index e5243a4b22..c0fedd702f 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-183.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-183.json
@@ -20,12 +20,12 @@
"mounted": false,
"network_address": "gdx-183-bmc.orsay.grid5000.fr",
"rate": 1000000000,
- "switch": "netgear06.orsay.grid5000.fr",
+ "switch": "switch14.orsay.grid5000.fr",
"switch_console": "mrv06.orsay.grid5000.fr",
"switch_console_ip": "172.26.120.206",
"switch_console_mac": "00:a0:9c:00:16:42",
- "switch_ip": "172.26.120.156",
- "switch_mac": "nil",
+ "switch_ip": "172.26.120.114",
+ "switch_mac": "00:11:bb:17:e8:c2",
"vendor": "Broadcom",
"version": "NetXtreme BCM5780"
},
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-184.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-184.json
index 39ab4c8b9a..428939821a 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-184.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-184.json
@@ -20,12 +20,12 @@
"mounted": false,
"network_address": "gdx-184-bmc.orsay.grid5000.fr",
"rate": 1000000000,
- "switch": "netgear06.orsay.grid5000.fr",
+ "switch": "switch14.orsay.grid5000.fr",
"switch_console": "mrv06.orsay.grid5000.fr",
"switch_console_ip": "172.26.120.206",
"switch_console_mac": "00:a0:9c:00:16:42",
- "switch_ip": "172.26.120.156",
- "switch_mac": "nil",
+ "switch_ip": "172.26.120.114",
+ "switch_mac": "00:11:bb:17:e8:c2",
"vendor": "Broadcom",
"version": "NetXtreme BCM5780"
},
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-185.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-185.json
index ca3093761e..6f660e21d8 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-185.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-185.json
@@ -20,12 +20,12 @@
"mounted": false,
"network_address": "gdx-185-bmc.orsay.grid5000.fr",
"rate": 1000000000,
- "switch": "netgear06.orsay.grid5000.fr",
+ "switch": "switch14.orsay.grid5000.fr",
"switch_console": "mrv06.orsay.grid5000.fr",
"switch_console_ip": "172.26.120.206",
"switch_console_mac": "00:a0:9c:00:16:42",
- "switch_ip": "172.26.120.156",
- "switch_mac": "nil",
+ "switch_ip": "172.26.120.114",
+ "switch_mac": "00:11:bb:17:e8:c2",
"vendor": "Broadcom",
"version": "NetXtreme BCM5780"
},
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-186.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-186.json
index cbd9aa351a..789a0a051a 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-186.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-186.json
@@ -20,12 +20,12 @@
"mounted": false,
"network_address": "gdx-186-bmc.orsay.grid5000.fr",
"rate": 1000000000,
- "switch": "netgear06.orsay.grid5000.fr",
+ "switch": "switch14.orsay.grid5000.fr",
"switch_console": "mrv06.orsay.grid5000.fr",
"switch_console_ip": "172.26.120.206",
"switch_console_mac": "00:a0:9c:00:16:42",
- "switch_ip": "172.26.120.156",
- "switch_mac": "nil",
+ "switch_ip": "172.26.120.114",
+ "switch_mac": "00:11:bb:17:e8:c2",
"vendor": "Broadcom",
"version": "NetXtreme BCM5780"
},
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-187.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-187.json
index 2fc255ae88..144fef76b2 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-187.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-187.json
@@ -20,12 +20,12 @@
"mounted": false,
"network_address": "gdx-187-bmc.orsay.grid5000.fr",
"rate": 1000000000,
- "switch": "netgear06.orsay.grid5000.fr",
+ "switch": "switch15.orsay.grid5000.fr",
"switch_console": "mrv06.orsay.grid5000.fr",
"switch_console_ip": "172.26.120.206",
"switch_console_mac": "00:a0:9c:00:16:42",
- "switch_ip": "172.26.120.156",
- "switch_mac": "nil",
+ "switch_ip": "172.26.120.115",
+ "switch_mac": "00:12:00:4c:a7:c2",
"vendor": "Broadcom",
"version": "NetXtreme BCM5780"
},
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-188.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-188.json
index 13f29fd1fc..39e5fc9d82 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-188.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-188.json
@@ -20,12 +20,12 @@
"mounted": false,
"network_address": "gdx-188-bmc.orsay.grid5000.fr",
"rate": 1000000000,
- "switch": "netgear06.orsay.grid5000.fr",
+ "switch": "switch15.orsay.grid5000.fr",
"switch_console": "mrv06.orsay.grid5000.fr",
"switch_console_ip": "172.26.120.206",
"switch_console_mac": "00:a0:9c:00:16:42",
- "switch_ip": "172.26.120.156",
- "switch_mac": "nil",
+ "switch_ip": "172.26.120.115",
+ "switch_mac": "00:12:00:4c:a7:c2",
"vendor": "Broadcom",
"version": "NetXtreme BCM5780"
},
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-189.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-189.json
index bf9066d486..5e43e47b53 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-189.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-189.json
@@ -20,12 +20,12 @@
"mounted": false,
"network_address": "gdx-189-bmc.orsay.grid5000.fr",
"rate": 1000000000,
- "switch": "netgear06.orsay.grid5000.fr",
+ "switch": "switch15.orsay.grid5000.fr",
"switch_console": "mrv06.orsay.grid5000.fr",
"switch_console_ip": "172.26.120.206",
"switch_console_mac": "00:a0:9c:00:16:42",
- "switch_ip": "172.26.120.156",
- "switch_mac": "nil",
+ "switch_ip": "172.26.120.115",
+ "switch_mac": "00:12:00:4c:a7:c2",
"vendor": "Broadcom",
"version": "NetXtreme BCM5780"
},
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-190.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-190.json
index 797d9475e2..43ec84dbb4 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-190.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-190.json
@@ -20,12 +20,12 @@
"mounted": false,
"network_address": "gdx-190-bmc.orsay.grid5000.fr",
"rate": 1000000000,
- "switch": "netgear06.orsay.grid5000.fr",
+ "switch": "switch15.orsay.grid5000.fr",
"switch_console": "mrv06.orsay.grid5000.fr",
"switch_console_ip": "172.26.120.206",
"switch_console_mac": "00:a0:9c:00:16:42",
- "switch_ip": "172.26.120.156",
- "switch_mac": "nil",
+ "switch_ip": "172.26.120.115",
+ "switch_mac": "00:12:00:4c:a7:c2",
"vendor": "Broadcom",
"version": "NetXtreme BCM5780"
},
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-191.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-191.json
index abe28a25c0..cc1e9c1869 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-191.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-191.json
@@ -20,12 +20,12 @@
"mounted": false,
"network_address": "gdx-191-bmc.orsay.grid5000.fr",
"rate": 1000000000,
- "switch": "netgear06.orsay.grid5000.fr",
+ "switch": "switch15.orsay.grid5000.fr",
"switch_console": "mrv06.orsay.grid5000.fr",
"switch_console_ip": "172.26.120.206",
"switch_console_mac": "00:a0:9c:00:16:42",
- "switch_ip": "172.26.120.156",
- "switch_mac": "nil",
+ "switch_ip": "172.26.120.115",
+ "switch_mac": "00:12:00:4c:a7:c2",
"vendor": "Broadcom",
"version": "NetXtreme BCM5780"
},
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-192.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-192.json
index 09e2760e45..ee85500b85 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-192.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-192.json
@@ -20,12 +20,12 @@
"mounted": false,
"network_address": "gdx-192-bmc.orsay.grid5000.fr",
"rate": 1000000000,
- "switch": "netgear06.orsay.grid5000.fr",
+ "switch": "switch15.orsay.grid5000.fr",
"switch_console": "mrv06.orsay.grid5000.fr",
"switch_console_ip": "172.26.120.206",
"switch_console_mac": "00:a0:9c:00:16:42",
- "switch_ip": "172.26.120.156",
- "switch_mac": "nil",
+ "switch_ip": "172.26.120.115",
+ "switch_mac": "00:12:00:4c:a7:c2",
"vendor": "Broadcom",
"version": "NetXtreme BCM5780"
},
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-198.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-198.json
index 206bb4fe42..b0fb83d6a8 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-198.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-198.json
@@ -59,9 +59,9 @@
"mounted": true,
"network_address": "gdx-198.orsay.grid5000.fr",
"rate": 1000000000,
- "switch": "switch15.orsay.grid5000.fr",
- "switch_ip": "172.26.120.115",
- "switch_mac": "00:12:00:4c:a7:c2",
+ "switch": "switch14.orsay.grid5000.fr",
+ "switch_ip": "172.26.120.114",
+ "switch_mac": "00:11:bb:17:e8:c2",
"vendor": "Broadcom",
"version": "NetXtreme BCM5780"
},
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-216.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-216.json
index e939c6c963..88739e9304 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-216.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-216.json
@@ -20,11 +20,11 @@
"mounted": false,
"network_address": "gdx-216-bmc.orsay.grid5000.fr",
"rate": 1000000000,
- "switch": "netgear07.orsay.grid5000.fr",
- "switch_console": "mrv07.orsay.grid5000.fr",
- "switch_console_ip": "172.26.120.207",
- "switch_console_mac": "nil",
- "switch_ip": "172.26.120.157",
+ "switch": "netgear06.orsay.grid5000.fr",
+ "switch_console": "mrv06.orsay.grid5000.fr",
+ "switch_console_ip": "172.26.120.206",
+ "switch_console_mac": "00:a0:9c:00:16:42",
+ "switch_ip": "172.26.120.156",
"switch_mac": "nil",
"vendor": "Broadcom",
"version": "NetXtreme BCM5780"
@@ -59,9 +59,9 @@
"mounted": true,
"network_address": "gdx-216.orsay.grid5000.fr",
"rate": 1000000000,
- "switch": "procurve-04-07.orsay.grid5000.fr",
- "switch_ip": "172.26.120.107",
- "switch_mac": "nil",
+ "switch": "switch15.orsay.grid5000.fr",
+ "switch_ip": "172.26.120.115",
+ "switch_mac": "00:12:00:4c:a7:c2",
"vendor": "Broadcom",
"version": "NetXtreme BCM5780"
},
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-234.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-234.json
index 681fc788cf..de3a80e829 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-234.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-234.json
@@ -60,7 +60,7 @@
"network_address": "gdx-234.orsay.grid5000.fr",
"rate": 1000000000,
"switch": "procurve-04-07.orsay.grid5000.fr",
- "switch_ip": "172.26.120.104",
+ "switch_ip": "172.26.120.107",
"switch_mac": "nil",
"vendor": "Broadcom",
"version": "NetXtreme BCM5780"
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-252.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-252.json
index 0e34233fa0..cb83b6dd30 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-252.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-252.json
@@ -20,12 +20,12 @@
"mounted": false,
"network_address": "gdx-252-bmc.orsay.grid5000.fr",
"rate": 1000000000,
- "switch": "netgear08.orsay.grid5000.fr",
- "switch_console": "mrv08.orsay.grid5000.fr",
- "switch_console_ip": "172.26.120.208",
+ "switch": "netgear07.orsay.grid5000.fr",
+ "switch_console": "mrv07.orsay.grid5000.fr",
+ "switch_console_ip": "172.26.120.207",
"switch_console_mac": "nil",
- "switch_ip": "172.26.120.158",
- "switch_mac": "00:0f:b5:fc:0d:aa",
+ "switch_ip": "172.26.120.157",
+ "switch_mac": "nil",
"vendor": "Broadcom",
"version": "NetXtreme BCM5780"
},
@@ -59,9 +59,9 @@
"mounted": true,
"network_address": "gdx-252.orsay.grid5000.fr",
"rate": 1000000000,
- "switch": "switch10.orsay.grid5000.fr",
- "switch_ip": "172.26.120.110",
- "switch_mac": "00:12:01:72:cd:42",
+ "switch": "procurve-04-07.orsay.grid5000.fr",
+ "switch_ip": "172.26.120.104",
+ "switch_mac": "nil",
"vendor": "Broadcom",
"version": "NetXtreme BCM5780"
},
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-270.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-270.json
index 8091b94ec6..f0c05e2c52 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-270.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-270.json
@@ -59,9 +59,9 @@
"mounted": true,
"network_address": "gdx-270.orsay.grid5000.fr",
"rate": 1000000000,
- "switch": "switch16.orsay.grid5000.fr",
- "switch_ip": "172.26.120.116",
- "switch_mac": "00:12:01:5b:af:42",
+ "switch": "switch10.orsay.grid5000.fr",
+ "switch_ip": "172.26.120.110",
+ "switch_mac": "00:12:01:72:cd:42",
"vendor": "Broadcom",
"version": "NetXtreme BCM5780"
},
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-288.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-288.json
index f5bade2fe6..6d66f350a3 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-288.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-288.json
@@ -19,13 +19,13 @@
"mountable": false,
"mounted": false,
"network_address": "gdx-288-bmc.orsay.grid5000.fr",
- "rate": 100000000,
- "switch": "procurve-bmc-09.orsay.grid5000.fr",
- "switch_console": "mrv09.orsay.grid5000.fr",
- "switch_console_ip": "172.26.120.209",
- "switch_console_mac": "00:a0:9c:00:25:4a",
- "switch_ip": "172.26.120.159",
- "switch_mac": "nil",
+ "rate": 1000000000,
+ "switch": "netgear08.orsay.grid5000.fr",
+ "switch_console": "mrv08.orsay.grid5000.fr",
+ "switch_console_ip": "172.26.120.208",
+ "switch_console_mac": "nil",
+ "switch_ip": "172.26.120.158",
+ "switch_mac": "00:0f:b5:fc:0d:aa",
"vendor": "Broadcom",
"version": "NetXtreme BCM5780"
},
@@ -59,9 +59,9 @@
"mounted": true,
"network_address": "gdx-288.orsay.grid5000.fr",
"rate": 1000000000,
- "switch": "switch07.orsay.grid5000.fr",
- "switch_ip": "172.26.120.107",
- "switch_mac": "00:12:00:44:68:42",
+ "switch": "switch16.orsay.grid5000.fr",
+ "switch_ip": "172.26.120.116",
+ "switch_mac": "00:12:01:5b:af:42",
"vendor": "Broadcom",
"version": "NetXtreme BCM5780"
},
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-306.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-306.json
index a92f2049aa..ef624a140c 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-306.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-306.json
@@ -59,9 +59,9 @@
"mounted": true,
"network_address": "gdx-306.orsay.grid5000.fr",
"rate": 1000000000,
- "switch": "switch13.orsay.grid5000.fr",
- "switch_ip": "172.26.120.113",
- "switch_mac": "00:24:f9:2a:0e:41",
+ "switch": "switch07.orsay.grid5000.fr",
+ "switch_ip": "172.26.120.107",
+ "switch_mac": "00:12:00:44:68:42",
"vendor": "Broadcom",
"version": "NetXtreme BCM5780"
},
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-36.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-36.json
index 7ed2805ee0..b56a015e0e 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-36.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-36.json
@@ -20,12 +20,12 @@
"mounted": false,
"network_address": "gdx-36-bmc.orsay.grid5000.fr",
"rate": 1000000000,
- "switch": "netgear02.orsay.grid5000.fr",
- "switch_console": "mrv02.orsay.grid5000.fr",
- "switch_console_ip": "172.26.120.202",
- "switch_console_mac": "00:a0:9c:00:16:41",
- "switch_ip": "172.26.120.152",
- "switch_mac": "00:22:3f:e6:f8:ce",
+ "switch": "netgear01.orsay.grid5000.fr",
+ "switch_console": "mrv01.orsay.grid5000.fr",
+ "switch_console_ip": "172.26.120.201",
+ "switch_console_mac": "nil",
+ "switch_ip": "172.26.120.151",
+ "switch_mac": "00:0f:b5:fc:0d:26",
"vendor": "Broadcom",
"version": "NetXtreme BCM5780"
},
@@ -59,9 +59,9 @@
"mounted": true,
"network_address": "gdx-36.orsay.grid5000.fr",
"rate": 1000000000,
- "switch": "switch09.orsay.grid5000.fr",
- "switch_ip": "172.26.120.109",
- "switch_mac": "00:24:F9:3E:81:42",
+ "switch": "switch12.orsay.grid5000.fr",
+ "switch_ip": "172.26.120.112",
+ "switch_mac": "00:12:01:73:27:C2",
"vendor": "Broadcom",
"version": "NetXtreme BCM5780"
},
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-54.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-54.json
index 0323519be7..c0d5155567 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-54.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-54.json
@@ -59,9 +59,9 @@
"mounted": true,
"network_address": "gdx-54.orsay.grid5000.fr",
"rate": 1000000000,
- "switch": "switch08.orsay.grid5000.fr",
- "switch_ip": "172.26.120.108",
- "switch_mac": "00:11:BB:3E:FD:C2",
+ "switch": "switch09.orsay.grid5000.fr",
+ "switch_ip": "172.26.120.109",
+ "switch_mac": "00:24:F9:3E:81:42",
"vendor": "Broadcom",
"version": "NetXtreme BCM5780"
},
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-72.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-72.json
index 5e58578840..ee0a2a86af 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-72.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-72.json
@@ -20,12 +20,12 @@
"mounted": false,
"network_address": "gdx-72-bmc.orsay.grid5000.fr",
"rate": 1000000000,
- "switch": "netgear03.orsay.grid5000.fr",
- "switch_console": "mrv03.orsay.grid5000.fr",
- "switch_console_ip": "172.26.120.203",
- "switch_console_mac": "00:a0:9c:00:12:dd",
- "switch_ip": "172.26.120.153",
- "switch_mac": "00:0f:b5:fb:70:89",
+ "switch": "netgear02.orsay.grid5000.fr",
+ "switch_console": "mrv02.orsay.grid5000.fr",
+ "switch_console_ip": "172.26.120.202",
+ "switch_console_mac": "00:a0:9c:00:16:41",
+ "switch_ip": "172.26.120.152",
+ "switch_mac": "00:22:3f:e6:f8:ce",
"vendor": "Broadcom",
"version": "NetXtreme BCM5780"
},
@@ -59,9 +59,9 @@
"mounted": true,
"network_address": "gdx-72.orsay.grid5000.fr",
"rate": 1000000000,
- "switch": "switch06.orsay.grid5000.fr",
- "switch_ip": "172.26.120.106",
- "switch_mac": "00:24:f9:3e:e7:42",
+ "switch": "switch08.orsay.grid5000.fr",
+ "switch_ip": "172.26.120.108",
+ "switch_mac": "00:11:BB:3E:FD:C2",
"vendor": "Broadcom",
"version": "NetXtreme BCM5780"
},
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-90.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-90.json
index da3ebc6ad8..53d58c0840 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-90.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-90.json
@@ -59,9 +59,9 @@
"mounted": true,
"network_address": "gdx-90.orsay.grid5000.fr",
"rate": 1000000000,
- "switch": "switch05.orsay.grid5000.fr",
- "switch_ip": "172.26.120.105",
- "switch_mac": 155681622,
+ "switch": "switch06.orsay.grid5000.fr",
+ "switch_ip": "172.26.120.106",
+ "switch_mac": "00:24:f9:3e:e7:42",
"vendor": "Broadcom",
"version": "NetXtreme BCM5780"
},
diff --git a/generators/input/orsay-gdx.rb b/generators/input/orsay-gdx.rb
index e7acc8ad41..30c062d747 100644
--- a/generators/input/orsay-gdx.rb
+++ b/generators/input/orsay-gdx.rb
@@ -1,4 +1,15 @@
require 'net/ssh'
+
+def switch_match_node(switch,id); switch != nil and (switch[:nodes][0] <= id and id <= switch[:nodes][1]); end
+def get_switch_for_node(switches,id)
+ switches.each{|k,v|
+ arr = v.split(",").map{|s| s.to_i}
+ next if id < arr[0] or arr[1] < id
+ return lookup('orsay-network',k).merge({:nodes=>arr})
+ }
+ lookup('orsay-network',"switch-nil").merge({:nodes=>[0,0]})
+end
+
site :orsay do |site_uid|
ssh = Net::SSH.start("frontend.#{site_uid}.grid5000.fr","g5kadmin")
@@ -8,9 +19,13 @@ site :orsay do |site_uid|
misc "bios:1.28/bcm:1.20.17/bmc:1.10/rsaII:1.00"
# WARN: 2 nodes are missing (gdx-311 and gdx-312) and won't appear in the reference
- 1.upto(180+132-2) do |i|
+ 1.upto(180+132-2) do |i|
+ switch_eth0 = get_switch_for_node lookup("orsay-links","links-eth0","gdx"), i if not switch_match_node switch_eth0, i
+ switch_bmc = get_switch_for_node lookup("orsay-links","links-bmc","gdx"), i if not switch_match_node switch_bmc, i
+ switch_rsa = get_switch_for_node lookup("orsay-links","links-rsa","gdx"), i if not switch_match_node switch_rsa, i
+ switch_mx = get_switch_for_node lookup("orsay-links","links-mx","gdx"), i if not switch_match_node switch_mx, i
+
node "#{cluster_uid}-#{i}" do |node_uid|
- rack_uid = node_uid.split("-")[1].to_i / 18
supported_job_types({:deploy => true, :besteffort => true, :virtual => false})
architecture({
@@ -46,7 +61,7 @@ site :orsay do |site_uid|
network_adapters [{
:interface => 'Ethernet',
:device => 'bmc',
- :rate => (eval lookup('orsay-network', "switch-bmc-#{rack_uid/2}", 'rate')),
+ :rate => (eval switch_bmc["rate"]),
:mac => lookup('orsay-gdx', "#{node_uid}", 'mac_bmc'),
:vendor => 'Broadcom',
:version => 'NetXtreme BCM5780',
@@ -56,16 +71,19 @@ site :orsay do |site_uid|
:mounted => false,
:network_address => "#{node_uid}-bmc.#{site_uid}.grid5000.fr",
:ip => dns_lookup_through_ssh(ssh,"#{node_uid}-bmc.#{site_uid}.grid5000.fr"),
- :switch => (lookup('orsay-network', "switch-bmc-#{rack_uid/2}", 'name')+".#{site_uid}.grid5000.fr"),
- :switch_ip => lookup('orsay-network', "switch-bmc-#{rack_uid/2}", 'ip'),
- :switch_mac => lookup('orsay-network', "switch-bmc-#{rack_uid/2}", 'mac'),
- :switch_console => (lookup('orsay-network', "switch-rsa-#{rack_uid/2}", 'name')+".#{site_uid}.grid5000.fr"),
- :switch_console_ip => lookup('orsay-network', "switch-rsa-#{rack_uid/2}", 'ip'),
- :switch_console_mac => lookup('orsay-network', "switch-rsa-#{rack_uid/2}", 'mac'),
+ :switch => (switch_bmc["name"]+".#{site_uid}.grid5000.fr"),
+ :switch_ip => switch_bmc["ip"],
+ :switch_mac => switch_bmc["mac"],
+# :switch => (lookup('orsay-network', "switch-bmc-#{rack_uid/2}", 'name')+".#{site_uid}.grid5000.fr"),
+# :switch_ip => lookup('orsay-network', "switch-bmc-#{rack_uid/2}", 'ip'),
+# :switch_mac => lookup('orsay-network', "switch-bmc-#{rack_uid/2}", 'mac'),
+ :switch_console => (switch_rsa["name"]+".#{site_uid}.grid5000.fr"),
+ :switch_console_ip => switch_rsa["ip"],
+ :switch_console_mac => switch_rsa["mac"]
},{
:interface => 'Myrinet',
:device => 'myri0',
- :rate => (eval lookup('orsay-network', "switch-mx", 'rate')),
+ :rate => (eval switch_mx["rate"]),
:mac => lookup('orsay-gdx', "#{node_uid}", 'mac_mx'),
:vendor => 'Myrinet',
:version => '10G-PCIE-8A-C',
@@ -76,13 +94,13 @@ site :orsay do |site_uid|
:mounted => true,
:network_address => "#{node_uid}-myri0.#{site_uid}.grid5000.fr",
:ip => dns_lookup_through_ssh(ssh,"#{node_uid}-myri0.#{site_uid}.grid5000.fr"),
- :switch => (lookup('orsay-network', "switch-mx", 'name')+".#{site_uid}.grid5000.fr"),
- :switch_ip => lookup('orsay-network', "switch-mx", 'ip'),
- :switch_mac => lookup('orsay-network', "switch-mx", 'mac')
+ :switch => (switch_mx["name"]+".#{site_uid}.grid5000.fr"),
+ :switch_ip => switch_mx["ip"],
+ :switch_mac => switch_mx["mac"]
},{
:interface => 'Ethernet',
:device => 'eth0',
- :rate => (eval lookup('orsay-network', "switch-eth0-#{rack_uid}", 'rate')),
+ :rate => (eval switch_eth0["rate"]),
:mac => lookup('orsay-gdx', "#{node_uid}", 'mac_eth0'),
:vendor => 'Broadcom',
:version => 'NetXtreme BCM5780',
@@ -93,9 +111,9 @@ site :orsay do |site_uid|
:mounted => true,
:network_address => "#{node_uid}.#{site_uid}.grid5000.fr",
:ip => dns_lookup_through_ssh(ssh,"#{node_uid}.#{site_uid}.grid5000.fr"),
- :switch => (lookup('orsay-network', "switch-eth0-#{rack_uid}", 'name')+".#{site_uid}.grid5000.fr"),
- :switch_ip => lookup('orsay-network', "switch-eth0-#{rack_uid}", 'ip'),
- :switch_mac => lookup('orsay-network', "switch-eth0-#{rack_uid}", 'mac'),
+ :switch => (switch_eth0["name"]+".#{site_uid}.grid5000.fr"),
+ :switch_ip => switch_eth0["ip"],
+ :switch_mac => switch_eth0["mac"]
},{
:interface => 'Ethernet',
:device => 'eth1',
diff --git a/generators/input/orsay-links.yaml b/generators/input/orsay-links.yaml
new file mode 100644
index 0000000000..2b34b1912f
--- /dev/null
+++ b/generators/input/orsay-links.yaml
@@ -0,0 +1,55 @@
+---
+links-eth0:
+ gdx:
+ switch-eth0-0: "1,18"
+ switch-eth0-1: "19,36"
+ switch-eth0-2: "37,54"
+ switch-eth0-3: "55,72"
+ switch-eth0-4: "73,90"
+ switch-eth0-5: "91,108"
+ switch-eth0-6: "109,126"
+ switch-eth0-7: "127,144"
+ switch-eth0-8: "145,162"
+ switch-eth0-9: "163,180"
+ switch-eth0-10: "181,198"
+ switch-eth0-11: "199,216"
+ switch-eth0-12: "217,234"
+ switch-eth0-13: "235,252"
+ switch-eth0-14: "253,270"
+ switch-eth0-15: "271,288"
+ switch-eth0-16: "289,306"
+ switch-eth0-17: "307,310"
+ netgdx:
+ switch-gw: "1,30"
+links-bmc:
+ gdx:
+ switch-bmc-0: "1,36"
+ switch-bmc-1: "37,72"
+ switch-bmc-2: "73,108"
+ switch-bmc-3: "109,144"
+ switch-bmc-4: "145,180"
+ switch-eth0-10: "181,186"
+ switch-eth0-11: "187,192"
+ switch-bmc-5: "193,216"
+ switch-bmc-6: "217,252"
+ switch-bmc-7: "253,288"
+ switch-bmc-8: "289,310"
+ netgdx:
+ switch-gw: "1,30"
+links-rsa:
+ gdx:
+ switch-rsa-0: "1,36"
+ switch-rsa-1: "37,72"
+ switch-rsa-2: "73,108"
+ switch-rsa-3: "109,144"
+ switch-rsa-4: "145,180"
+ switch-rsa-5: "181,216"
+ switch-rsa-6: "217,252"
+ switch-rsa-7: "253,288"
+ switch-rsa-8: "289,310"
+ netgdx:
+ switch-rsa-netgdx: "1,30"
+links-mx:
+ gdx:
+ switch-mx: "1,310"
+
\ No newline at end of file
diff --git a/generators/input/orsay-network.yaml b/generators/input/orsay-network.yaml
index 3d3a1a7a59..98c9927e98 100644
--- a/generators/input/orsay-network.yaml
+++ b/generators/input/orsay-network.yaml
@@ -1,4 +1,11 @@
---
+switch-nil:
+ name: nil
+ rate: 0
+ ip: nil
+ mac: nil
+ next_switch : nil
+ next_switch_rate : 0
switch-eth0-0:
name: "switch11"
nodes: "gdx-[1-18]"
--
GitLab