From ee0819adc280b338fc71cbdcbfdfdab6a3791dee Mon Sep 17 00:00:00 2001
From: Gaetan SIMO <gaetan.simo@inria.fr>
Date: Fri, 10 Jun 2011 14:40:47 +0200
Subject: [PATCH] [orsay] Updating Managements interfaces network
configurations on netgdx.
---
.../orsay/clusters/netgdx/nodes/netgdx-1.json | 8 +++----
.../clusters/netgdx/nodes/netgdx-10.json | 8 +++----
.../clusters/netgdx/nodes/netgdx-11.json | 8 +++----
.../clusters/netgdx/nodes/netgdx-12.json | 8 +++----
.../clusters/netgdx/nodes/netgdx-13.json | 8 +++----
.../clusters/netgdx/nodes/netgdx-14.json | 8 +++----
.../clusters/netgdx/nodes/netgdx-15.json | 8 +++----
.../clusters/netgdx/nodes/netgdx-16.json | 8 +++----
.../clusters/netgdx/nodes/netgdx-17.json | 8 +++----
.../clusters/netgdx/nodes/netgdx-18.json | 8 +++----
.../clusters/netgdx/nodes/netgdx-19.json | 8 +++----
.../orsay/clusters/netgdx/nodes/netgdx-2.json | 8 +++----
.../clusters/netgdx/nodes/netgdx-20.json | 8 +++----
.../clusters/netgdx/nodes/netgdx-21.json | 8 +++----
.../clusters/netgdx/nodes/netgdx-22.json | 8 +++----
.../clusters/netgdx/nodes/netgdx-23.json | 8 +++----
.../clusters/netgdx/nodes/netgdx-24.json | 8 +++----
.../clusters/netgdx/nodes/netgdx-25.json | 8 +++----
.../clusters/netgdx/nodes/netgdx-26.json | 8 +++----
.../clusters/netgdx/nodes/netgdx-27.json | 8 +++----
.../clusters/netgdx/nodes/netgdx-28.json | 8 +++----
.../clusters/netgdx/nodes/netgdx-29.json | 8 +++----
.../orsay/clusters/netgdx/nodes/netgdx-3.json | 8 +++----
.../clusters/netgdx/nodes/netgdx-30.json | 8 +++----
.../orsay/clusters/netgdx/nodes/netgdx-4.json | 8 +++----
.../orsay/clusters/netgdx/nodes/netgdx-5.json | 8 +++----
.../orsay/clusters/netgdx/nodes/netgdx-6.json | 8 +++----
.../orsay/clusters/netgdx/nodes/netgdx-7.json | 8 +++----
.../orsay/clusters/netgdx/nodes/netgdx-8.json | 8 +++----
.../orsay/clusters/netgdx/nodes/netgdx-9.json | 8 +++----
data/grid5000/sites/orsay/orsay.json | 12 +++++++++-
generators/input/orsay-links.yaml | 4 ++--
generators/input/orsay-netgdx.rb | 8 +++----
generators/input/orsay-network.yaml | 24 +++++++------------
34 files changed, 146 insertions(+), 142 deletions(-)
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-1.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-1.json
index 80293eaf26..dfb56f9d4e 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-1.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-1.json
@@ -20,12 +20,12 @@
"mounted": false,
"network_address": "netgdx-1-bmc.orsay.grid5000.fr",
"rate": 1000000000,
- "switch": "cisco.orsay.grid5000.fr",
+ "switch": "netgear10.orsay.grid5000.fr",
"switch_console": "mrv00.orsay.grid5000.fr",
"switch_console_ip": "172.26.120.200",
- "switch_console_mac": "nil",
- "switch_ip": "172.26.120.100",
- "switch_mac": "00:11:5d:3d:50:00",
+ "switch_console_mac": "00:a0:9c:00:12:fa",
+ "switch_ip": "172.26.120.160",
+ "switch_mac": "00:0f:b5:fc:0d:a8",
"vendor": "Broadcom",
"version": "NetXtreme BCM5780"
},
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-10.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-10.json
index 45482579ed..968da476fc 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-10.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-10.json
@@ -20,12 +20,12 @@
"mounted": false,
"network_address": "netgdx-10-bmc.orsay.grid5000.fr",
"rate": 1000000000,
- "switch": "cisco.orsay.grid5000.fr",
+ "switch": "netgear10.orsay.grid5000.fr",
"switch_console": "mrv00.orsay.grid5000.fr",
"switch_console_ip": "172.26.120.200",
- "switch_console_mac": "nil",
- "switch_ip": "172.26.120.100",
- "switch_mac": "00:11:5d:3d:50:00",
+ "switch_console_mac": "00:a0:9c:00:12:fa",
+ "switch_ip": "172.26.120.160",
+ "switch_mac": "00:0f:b5:fc:0d:a8",
"vendor": "Broadcom",
"version": "NetXtreme BCM5780"
},
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-11.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-11.json
index 46833ca82f..052024c001 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-11.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-11.json
@@ -20,12 +20,12 @@
"mounted": false,
"network_address": "netgdx-11-bmc.orsay.grid5000.fr",
"rate": 1000000000,
- "switch": "cisco.orsay.grid5000.fr",
+ "switch": "netgear10.orsay.grid5000.fr",
"switch_console": "mrv00.orsay.grid5000.fr",
"switch_console_ip": "172.26.120.200",
- "switch_console_mac": "nil",
- "switch_ip": "172.26.120.100",
- "switch_mac": "00:11:5d:3d:50:00",
+ "switch_console_mac": "00:a0:9c:00:12:fa",
+ "switch_ip": "172.26.120.160",
+ "switch_mac": "00:0f:b5:fc:0d:a8",
"vendor": "Broadcom",
"version": "NetXtreme BCM5780"
},
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-12.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-12.json
index 789aceac06..7ed2c426e0 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-12.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-12.json
@@ -20,12 +20,12 @@
"mounted": false,
"network_address": "netgdx-12-bmc.orsay.grid5000.fr",
"rate": 1000000000,
- "switch": "cisco.orsay.grid5000.fr",
+ "switch": "netgear10.orsay.grid5000.fr",
"switch_console": "mrv00.orsay.grid5000.fr",
"switch_console_ip": "172.26.120.200",
- "switch_console_mac": "nil",
- "switch_ip": "172.26.120.100",
- "switch_mac": "00:11:5d:3d:50:00",
+ "switch_console_mac": "00:a0:9c:00:12:fa",
+ "switch_ip": "172.26.120.160",
+ "switch_mac": "00:0f:b5:fc:0d:a8",
"vendor": "Broadcom",
"version": "NetXtreme BCM5780"
},
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-13.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-13.json
index 7edf0fc022..5d1cd68aa1 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-13.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-13.json
@@ -20,12 +20,12 @@
"mounted": false,
"network_address": "netgdx-13-bmc.orsay.grid5000.fr",
"rate": 1000000000,
- "switch": "cisco.orsay.grid5000.fr",
+ "switch": "netgear10.orsay.grid5000.fr",
"switch_console": "mrv00.orsay.grid5000.fr",
"switch_console_ip": "172.26.120.200",
- "switch_console_mac": "nil",
- "switch_ip": "172.26.120.100",
- "switch_mac": "00:11:5d:3d:50:00",
+ "switch_console_mac": "00:a0:9c:00:12:fa",
+ "switch_ip": "172.26.120.160",
+ "switch_mac": "00:0f:b5:fc:0d:a8",
"vendor": "Broadcom",
"version": "NetXtreme BCM5780"
},
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-14.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-14.json
index 4d672da6aa..b202b4b443 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-14.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-14.json
@@ -20,12 +20,12 @@
"mounted": false,
"network_address": "netgdx-14-bmc.orsay.grid5000.fr",
"rate": 1000000000,
- "switch": "cisco.orsay.grid5000.fr",
+ "switch": "netgear10.orsay.grid5000.fr",
"switch_console": "mrv00.orsay.grid5000.fr",
"switch_console_ip": "172.26.120.200",
- "switch_console_mac": "nil",
- "switch_ip": "172.26.120.100",
- "switch_mac": "00:11:5d:3d:50:00",
+ "switch_console_mac": "00:a0:9c:00:12:fa",
+ "switch_ip": "172.26.120.160",
+ "switch_mac": "00:0f:b5:fc:0d:a8",
"vendor": "Broadcom",
"version": "NetXtreme BCM5780"
},
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-15.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-15.json
index a0e5c6282c..12ab891a7f 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-15.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-15.json
@@ -20,12 +20,12 @@
"mounted": false,
"network_address": "netgdx-15-bmc.orsay.grid5000.fr",
"rate": 1000000000,
- "switch": "cisco.orsay.grid5000.fr",
+ "switch": "netgear10.orsay.grid5000.fr",
"switch_console": "mrv00.orsay.grid5000.fr",
"switch_console_ip": "172.26.120.200",
- "switch_console_mac": "nil",
- "switch_ip": "172.26.120.100",
- "switch_mac": "00:11:5d:3d:50:00",
+ "switch_console_mac": "00:a0:9c:00:12:fa",
+ "switch_ip": "172.26.120.160",
+ "switch_mac": "00:0f:b5:fc:0d:a8",
"vendor": "Broadcom",
"version": "NetXtreme BCM5780"
},
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-16.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-16.json
index 26a73c8c5d..ae66073461 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-16.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-16.json
@@ -20,12 +20,12 @@
"mounted": false,
"network_address": "netgdx-16-bmc.orsay.grid5000.fr",
"rate": 1000000000,
- "switch": "cisco.orsay.grid5000.fr",
+ "switch": "netgear10.orsay.grid5000.fr",
"switch_console": "mrv00.orsay.grid5000.fr",
"switch_console_ip": "172.26.120.200",
- "switch_console_mac": "nil",
- "switch_ip": "172.26.120.100",
- "switch_mac": "00:11:5d:3d:50:00",
+ "switch_console_mac": "00:a0:9c:00:12:fa",
+ "switch_ip": "172.26.120.160",
+ "switch_mac": "00:0f:b5:fc:0d:a8",
"vendor": "Broadcom",
"version": "NetXtreme BCM5780"
},
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-17.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-17.json
index 78c627bf93..c6949a0f17 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-17.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-17.json
@@ -20,12 +20,12 @@
"mounted": false,
"network_address": "netgdx-17-bmc.orsay.grid5000.fr",
"rate": 1000000000,
- "switch": "cisco.orsay.grid5000.fr",
+ "switch": "netgear10.orsay.grid5000.fr",
"switch_console": "mrv00.orsay.grid5000.fr",
"switch_console_ip": "172.26.120.200",
- "switch_console_mac": "nil",
- "switch_ip": "172.26.120.100",
- "switch_mac": "00:11:5d:3d:50:00",
+ "switch_console_mac": "00:a0:9c:00:12:fa",
+ "switch_ip": "172.26.120.160",
+ "switch_mac": "00:0f:b5:fc:0d:a8",
"vendor": "Broadcom",
"version": "NetXtreme BCM5780"
},
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-18.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-18.json
index 6da5d05730..196f20351a 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-18.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-18.json
@@ -20,12 +20,12 @@
"mounted": false,
"network_address": "netgdx-18-bmc.orsay.grid5000.fr",
"rate": 1000000000,
- "switch": "cisco.orsay.grid5000.fr",
+ "switch": "netgear10.orsay.grid5000.fr",
"switch_console": "mrv00.orsay.grid5000.fr",
"switch_console_ip": "172.26.120.200",
- "switch_console_mac": "nil",
- "switch_ip": "172.26.120.100",
- "switch_mac": "00:11:5d:3d:50:00",
+ "switch_console_mac": "00:a0:9c:00:12:fa",
+ "switch_ip": "172.26.120.160",
+ "switch_mac": "00:0f:b5:fc:0d:a8",
"vendor": "Broadcom",
"version": "NetXtreme BCM5780"
},
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-19.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-19.json
index 46d8b07bd2..d33b7b564f 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-19.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-19.json
@@ -20,12 +20,12 @@
"mounted": false,
"network_address": "netgdx-19-bmc.orsay.grid5000.fr",
"rate": 1000000000,
- "switch": "cisco.orsay.grid5000.fr",
+ "switch": "netgear10.orsay.grid5000.fr",
"switch_console": "mrv00.orsay.grid5000.fr",
"switch_console_ip": "172.26.120.200",
- "switch_console_mac": "nil",
- "switch_ip": "172.26.120.100",
- "switch_mac": "00:11:5d:3d:50:00",
+ "switch_console_mac": "00:a0:9c:00:12:fa",
+ "switch_ip": "172.26.120.160",
+ "switch_mac": "00:0f:b5:fc:0d:a8",
"vendor": "Broadcom",
"version": "NetXtreme BCM5780"
},
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-2.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-2.json
index e3ec179ffe..54670c265b 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-2.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-2.json
@@ -20,12 +20,12 @@
"mounted": false,
"network_address": "netgdx-2-bmc.orsay.grid5000.fr",
"rate": 1000000000,
- "switch": "cisco.orsay.grid5000.fr",
+ "switch": "netgear10.orsay.grid5000.fr",
"switch_console": "mrv00.orsay.grid5000.fr",
"switch_console_ip": "172.26.120.200",
- "switch_console_mac": "nil",
- "switch_ip": "172.26.120.100",
- "switch_mac": "00:11:5d:3d:50:00",
+ "switch_console_mac": "00:a0:9c:00:12:fa",
+ "switch_ip": "172.26.120.160",
+ "switch_mac": "00:0f:b5:fc:0d:a8",
"vendor": "Broadcom",
"version": "NetXtreme BCM5780"
},
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-20.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-20.json
index 0045e2c7b4..f1446182b2 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-20.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-20.json
@@ -20,12 +20,12 @@
"mounted": false,
"network_address": "netgdx-20-bmc.orsay.grid5000.fr",
"rate": 1000000000,
- "switch": "cisco.orsay.grid5000.fr",
+ "switch": "netgear10.orsay.grid5000.fr",
"switch_console": "mrv00.orsay.grid5000.fr",
"switch_console_ip": "172.26.120.200",
- "switch_console_mac": "nil",
- "switch_ip": "172.26.120.100",
- "switch_mac": "00:11:5d:3d:50:00",
+ "switch_console_mac": "00:a0:9c:00:12:fa",
+ "switch_ip": "172.26.120.160",
+ "switch_mac": "00:0f:b5:fc:0d:a8",
"vendor": "Broadcom",
"version": "NetXtreme BCM5780"
},
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-21.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-21.json
index 804f604c70..f40aa48c62 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-21.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-21.json
@@ -20,12 +20,12 @@
"mounted": false,
"network_address": "netgdx-21-bmc.orsay.grid5000.fr",
"rate": 1000000000,
- "switch": "cisco.orsay.grid5000.fr",
+ "switch": "netgear10.orsay.grid5000.fr",
"switch_console": "mrv00.orsay.grid5000.fr",
"switch_console_ip": "172.26.120.200",
- "switch_console_mac": "nil",
- "switch_ip": "172.26.120.100",
- "switch_mac": "00:11:5d:3d:50:00",
+ "switch_console_mac": "00:a0:9c:00:12:fa",
+ "switch_ip": "172.26.120.160",
+ "switch_mac": "00:0f:b5:fc:0d:a8",
"vendor": "Broadcom",
"version": "NetXtreme BCM5780"
},
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-22.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-22.json
index 4b4ddf649a..65147ffe51 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-22.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-22.json
@@ -20,12 +20,12 @@
"mounted": false,
"network_address": "netgdx-22-bmc.orsay.grid5000.fr",
"rate": 1000000000,
- "switch": "cisco.orsay.grid5000.fr",
+ "switch": "netgear10.orsay.grid5000.fr",
"switch_console": "mrv00.orsay.grid5000.fr",
"switch_console_ip": "172.26.120.200",
- "switch_console_mac": "nil",
- "switch_ip": "172.26.120.100",
- "switch_mac": "00:11:5d:3d:50:00",
+ "switch_console_mac": "00:a0:9c:00:12:fa",
+ "switch_ip": "172.26.120.160",
+ "switch_mac": "00:0f:b5:fc:0d:a8",
"vendor": "Broadcom",
"version": "NetXtreme BCM5780"
},
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-23.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-23.json
index c678f1e365..9c80328f65 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-23.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-23.json
@@ -20,12 +20,12 @@
"mounted": false,
"network_address": "netgdx-23-bmc.orsay.grid5000.fr",
"rate": 1000000000,
- "switch": "cisco.orsay.grid5000.fr",
+ "switch": "netgear10.orsay.grid5000.fr",
"switch_console": "mrv00.orsay.grid5000.fr",
"switch_console_ip": "172.26.120.200",
- "switch_console_mac": "nil",
- "switch_ip": "172.26.120.100",
- "switch_mac": "00:11:5d:3d:50:00",
+ "switch_console_mac": "00:a0:9c:00:12:fa",
+ "switch_ip": "172.26.120.160",
+ "switch_mac": "00:0f:b5:fc:0d:a8",
"vendor": "Broadcom",
"version": "NetXtreme BCM5780"
},
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-24.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-24.json
index 41a238fbb8..b8388ee0c5 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-24.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-24.json
@@ -20,12 +20,12 @@
"mounted": false,
"network_address": "netgdx-24-bmc.orsay.grid5000.fr",
"rate": 1000000000,
- "switch": "cisco.orsay.grid5000.fr",
+ "switch": "netgear10.orsay.grid5000.fr",
"switch_console": "mrv00.orsay.grid5000.fr",
"switch_console_ip": "172.26.120.200",
- "switch_console_mac": "nil",
- "switch_ip": "172.26.120.100",
- "switch_mac": "00:11:5d:3d:50:00",
+ "switch_console_mac": "00:a0:9c:00:12:fa",
+ "switch_ip": "172.26.120.160",
+ "switch_mac": "00:0f:b5:fc:0d:a8",
"vendor": "Broadcom",
"version": "NetXtreme BCM5780"
},
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-25.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-25.json
index 34a5bb9fa5..1329cf1f2c 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-25.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-25.json
@@ -20,12 +20,12 @@
"mounted": false,
"network_address": "netgdx-25-bmc.orsay.grid5000.fr",
"rate": 1000000000,
- "switch": "cisco.orsay.grid5000.fr",
+ "switch": "netgear10.orsay.grid5000.fr",
"switch_console": "mrv00.orsay.grid5000.fr",
"switch_console_ip": "172.26.120.200",
- "switch_console_mac": "nil",
- "switch_ip": "172.26.120.100",
- "switch_mac": "00:11:5d:3d:50:00",
+ "switch_console_mac": "00:a0:9c:00:12:fa",
+ "switch_ip": "172.26.120.160",
+ "switch_mac": "00:0f:b5:fc:0d:a8",
"vendor": "Broadcom",
"version": "NetXtreme BCM5780"
},
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-26.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-26.json
index 3bf97ecdbf..ae42ce910f 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-26.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-26.json
@@ -20,12 +20,12 @@
"mounted": false,
"network_address": "netgdx-26-bmc.orsay.grid5000.fr",
"rate": 1000000000,
- "switch": "cisco.orsay.grid5000.fr",
+ "switch": "netgear10.orsay.grid5000.fr",
"switch_console": "mrv00.orsay.grid5000.fr",
"switch_console_ip": "172.26.120.200",
- "switch_console_mac": "nil",
- "switch_ip": "172.26.120.100",
- "switch_mac": "00:11:5d:3d:50:00",
+ "switch_console_mac": "00:a0:9c:00:12:fa",
+ "switch_ip": "172.26.120.160",
+ "switch_mac": "00:0f:b5:fc:0d:a8",
"vendor": "Broadcom",
"version": "NetXtreme BCM5780"
},
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-27.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-27.json
index 9474d9a37d..66d8c12361 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-27.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-27.json
@@ -20,12 +20,12 @@
"mounted": false,
"network_address": "netgdx-27-bmc.orsay.grid5000.fr",
"rate": 1000000000,
- "switch": "cisco.orsay.grid5000.fr",
+ "switch": "netgear10.orsay.grid5000.fr",
"switch_console": "mrv00.orsay.grid5000.fr",
"switch_console_ip": "172.26.120.200",
- "switch_console_mac": "nil",
- "switch_ip": "172.26.120.100",
- "switch_mac": "00:11:5d:3d:50:00",
+ "switch_console_mac": "00:a0:9c:00:12:fa",
+ "switch_ip": "172.26.120.160",
+ "switch_mac": "00:0f:b5:fc:0d:a8",
"vendor": "Broadcom",
"version": "NetXtreme BCM5780"
},
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-28.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-28.json
index d72062a7d0..02e9065d56 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-28.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-28.json
@@ -20,12 +20,12 @@
"mounted": false,
"network_address": "netgdx-28-bmc.orsay.grid5000.fr",
"rate": 1000000000,
- "switch": "cisco.orsay.grid5000.fr",
+ "switch": "netgear10.orsay.grid5000.fr",
"switch_console": "mrv00.orsay.grid5000.fr",
"switch_console_ip": "172.26.120.200",
- "switch_console_mac": "nil",
- "switch_ip": "172.26.120.100",
- "switch_mac": "00:11:5d:3d:50:00",
+ "switch_console_mac": "00:a0:9c:00:12:fa",
+ "switch_ip": "172.26.120.160",
+ "switch_mac": "00:0f:b5:fc:0d:a8",
"vendor": "Broadcom",
"version": "NetXtreme BCM5780"
},
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-29.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-29.json
index be404a8c52..6214d52564 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-29.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-29.json
@@ -20,12 +20,12 @@
"mounted": false,
"network_address": "netgdx-29-bmc.orsay.grid5000.fr",
"rate": 1000000000,
- "switch": "cisco.orsay.grid5000.fr",
+ "switch": "netgear10.orsay.grid5000.fr",
"switch_console": "mrv00.orsay.grid5000.fr",
"switch_console_ip": "172.26.120.200",
- "switch_console_mac": "nil",
- "switch_ip": "172.26.120.100",
- "switch_mac": "00:11:5d:3d:50:00",
+ "switch_console_mac": "00:a0:9c:00:12:fa",
+ "switch_ip": "172.26.120.160",
+ "switch_mac": "00:0f:b5:fc:0d:a8",
"vendor": "Broadcom",
"version": "NetXtreme BCM5780"
},
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-3.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-3.json
index a2c2e74a00..4fb4d8bb28 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-3.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-3.json
@@ -20,12 +20,12 @@
"mounted": false,
"network_address": "netgdx-3-bmc.orsay.grid5000.fr",
"rate": 1000000000,
- "switch": "cisco.orsay.grid5000.fr",
+ "switch": "netgear10.orsay.grid5000.fr",
"switch_console": "mrv00.orsay.grid5000.fr",
"switch_console_ip": "172.26.120.200",
- "switch_console_mac": "nil",
- "switch_ip": "172.26.120.100",
- "switch_mac": "00:11:5d:3d:50:00",
+ "switch_console_mac": "00:a0:9c:00:12:fa",
+ "switch_ip": "172.26.120.160",
+ "switch_mac": "00:0f:b5:fc:0d:a8",
"vendor": "Broadcom",
"version": "NetXtreme BCM5780"
},
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-30.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-30.json
index 77d7727f37..4d4e8b6480 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-30.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-30.json
@@ -20,12 +20,12 @@
"mounted": false,
"network_address": "netgdx-30-bmc.orsay.grid5000.fr",
"rate": 1000000000,
- "switch": "cisco.orsay.grid5000.fr",
+ "switch": "netgear10.orsay.grid5000.fr",
"switch_console": "mrv00.orsay.grid5000.fr",
"switch_console_ip": "172.26.120.200",
- "switch_console_mac": "nil",
- "switch_ip": "172.26.120.100",
- "switch_mac": "00:11:5d:3d:50:00",
+ "switch_console_mac": "00:a0:9c:00:12:fa",
+ "switch_ip": "172.26.120.160",
+ "switch_mac": "00:0f:b5:fc:0d:a8",
"vendor": "Broadcom",
"version": "NetXtreme BCM5780"
},
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-4.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-4.json
index 7d326cc5b8..1f4527f766 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-4.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-4.json
@@ -20,12 +20,12 @@
"mounted": false,
"network_address": "netgdx-4-bmc.orsay.grid5000.fr",
"rate": 1000000000,
- "switch": "cisco.orsay.grid5000.fr",
+ "switch": "netgear10.orsay.grid5000.fr",
"switch_console": "mrv00.orsay.grid5000.fr",
"switch_console_ip": "172.26.120.200",
- "switch_console_mac": "nil",
- "switch_ip": "172.26.120.100",
- "switch_mac": "00:11:5d:3d:50:00",
+ "switch_console_mac": "00:a0:9c:00:12:fa",
+ "switch_ip": "172.26.120.160",
+ "switch_mac": "00:0f:b5:fc:0d:a8",
"vendor": "Broadcom",
"version": "NetXtreme BCM5780"
},
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-5.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-5.json
index c5bb3e916d..078a2819e8 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-5.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-5.json
@@ -20,12 +20,12 @@
"mounted": false,
"network_address": "netgdx-5-bmc.orsay.grid5000.fr",
"rate": 1000000000,
- "switch": "cisco.orsay.grid5000.fr",
+ "switch": "netgear10.orsay.grid5000.fr",
"switch_console": "mrv00.orsay.grid5000.fr",
"switch_console_ip": "172.26.120.200",
- "switch_console_mac": "nil",
- "switch_ip": "172.26.120.100",
- "switch_mac": "00:11:5d:3d:50:00",
+ "switch_console_mac": "00:a0:9c:00:12:fa",
+ "switch_ip": "172.26.120.160",
+ "switch_mac": "00:0f:b5:fc:0d:a8",
"vendor": "Broadcom",
"version": "NetXtreme BCM5780"
},
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-6.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-6.json
index c855051241..5670fdf8f9 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-6.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-6.json
@@ -20,12 +20,12 @@
"mounted": false,
"network_address": "netgdx-6-bmc.orsay.grid5000.fr",
"rate": 1000000000,
- "switch": "cisco.orsay.grid5000.fr",
+ "switch": "netgear10.orsay.grid5000.fr",
"switch_console": "mrv00.orsay.grid5000.fr",
"switch_console_ip": "172.26.120.200",
- "switch_console_mac": "nil",
- "switch_ip": "172.26.120.100",
- "switch_mac": "00:11:5d:3d:50:00",
+ "switch_console_mac": "00:a0:9c:00:12:fa",
+ "switch_ip": "172.26.120.160",
+ "switch_mac": "00:0f:b5:fc:0d:a8",
"vendor": "Broadcom",
"version": "NetXtreme BCM5780"
},
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-7.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-7.json
index 88f946951b..cacce56863 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-7.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-7.json
@@ -20,12 +20,12 @@
"mounted": false,
"network_address": "netgdx-7-bmc.orsay.grid5000.fr",
"rate": 1000000000,
- "switch": "cisco.orsay.grid5000.fr",
+ "switch": "netgear10.orsay.grid5000.fr",
"switch_console": "mrv00.orsay.grid5000.fr",
"switch_console_ip": "172.26.120.200",
- "switch_console_mac": "nil",
- "switch_ip": "172.26.120.100",
- "switch_mac": "00:11:5d:3d:50:00",
+ "switch_console_mac": "00:a0:9c:00:12:fa",
+ "switch_ip": "172.26.120.160",
+ "switch_mac": "00:0f:b5:fc:0d:a8",
"vendor": "Broadcom",
"version": "NetXtreme BCM5780"
},
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-8.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-8.json
index 6c85960e13..8b282afbd3 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-8.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-8.json
@@ -20,12 +20,12 @@
"mounted": false,
"network_address": "netgdx-8-bmc.orsay.grid5000.fr",
"rate": 1000000000,
- "switch": "cisco.orsay.grid5000.fr",
+ "switch": "netgear10.orsay.grid5000.fr",
"switch_console": "mrv00.orsay.grid5000.fr",
"switch_console_ip": "172.26.120.200",
- "switch_console_mac": "nil",
- "switch_ip": "172.26.120.100",
- "switch_mac": "00:11:5d:3d:50:00",
+ "switch_console_mac": "00:a0:9c:00:12:fa",
+ "switch_ip": "172.26.120.160",
+ "switch_mac": "00:0f:b5:fc:0d:a8",
"vendor": "Broadcom",
"version": "NetXtreme BCM5780"
},
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-9.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-9.json
index 96b783a7ee..ac1d842b01 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-9.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-9.json
@@ -20,12 +20,12 @@
"mounted": false,
"network_address": "netgdx-9-bmc.orsay.grid5000.fr",
"rate": 1000000000,
- "switch": "cisco.orsay.grid5000.fr",
+ "switch": "netgear10.orsay.grid5000.fr",
"switch_console": "mrv00.orsay.grid5000.fr",
"switch_console_ip": "172.26.120.200",
- "switch_console_mac": "nil",
- "switch_ip": "172.26.120.100",
- "switch_mac": "00:11:5d:3d:50:00",
+ "switch_console_mac": "00:a0:9c:00:12:fa",
+ "switch_ip": "172.26.120.160",
+ "switch_mac": "00:0f:b5:fc:0d:a8",
"vendor": "Broadcom",
"version": "NetXtreme BCM5780"
},
diff --git a/data/grid5000/sites/orsay/orsay.json b/data/grid5000/sites/orsay/orsay.json
index 200637b60b..f46cdb53a6 100755
--- a/data/grid5000/sites/orsay/orsay.json
+++ b/data/grid5000/sites/orsay/orsay.json
@@ -1,4 +1,14 @@
{
+ "description": "",
+ "email_contact": "orsay-staff@lists.grid5000.fr",
+ "latitude": 48.7,
+ "location": "Orsay, France",
+ "longitude": 2.2,
+ "name": "Orsay",
+ "security_contact": "orsay-staff@lists.grid5000.fr",
+ "sys_admin_contact": "orsay-staff@lists.grid5000.fr",
"type": "site",
- "uid": "orsay"
+ "uid": "orsay",
+ "user_support_contact": "orsay-staff@lists.grid5000.fr",
+ "web": "https://www.grid5000.fr/mediawiki/index.php/Orsay:Home"
}
\ No newline at end of file
diff --git a/generators/input/orsay-links.yaml b/generators/input/orsay-links.yaml
index 798301956d..0ad32ce8c7 100644
--- a/generators/input/orsay-links.yaml
+++ b/generators/input/orsay-links.yaml
@@ -41,7 +41,7 @@ links-bmc:
switch-bmc-7: "253,288"
switch-bmc-8: "289,310"
netgdx:
- switch-gw: "1,30"
+ switch-bmc-9: "1,30"
links-rsa:
gdx:
switch-rsa-0: "1,36"
@@ -54,7 +54,7 @@ links-rsa:
switch-rsa-7: "253,288"
switch-rsa-8: "289,310"
netgdx:
- switch-rsa-netgdx: "1,30"
+ switch-rsa-9: "1,30"
links-mx:
gdx:
switch-mx: "1,310"
diff --git a/generators/input/orsay-netgdx.rb b/generators/input/orsay-netgdx.rb
index a72b13377a..4988a9a58f 100644
--- a/generators/input/orsay-netgdx.rb
+++ b/generators/input/orsay-netgdx.rb
@@ -60,7 +60,7 @@ site :orsay do |site_uid|
network_adapters [{
:interface => 'Ethernet',
:device => 'bmc',
- :rate => (eval lookup('orsay-network', "switch-bmc-netgdx", 'rate')),
+ :rate => (eval lookup('orsay-network', "switch-bmc-9", 'rate')),
:mac => lookup('orsay-netgdx', "#{node_uid}", 'mac_bmc'),
:vendor => 'Broadcom',
:version => 'NetXtreme BCM5780',
@@ -70,9 +70,9 @@ 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 => (switch_bmc["name-admin"]+".#{site_uid}.grid5000.fr"),
- :switch_ip => switch_bmc["ip-admin"],
- :switch_mac => switch_bmc["mac-admin"],
+ :switch => (switch_bmc["name"]+".#{site_uid}.grid5000.fr"),
+ :switch_ip => switch_bmc["ip"],
+ :switch_mac => switch_bmc["mac"],
:switch_console => (switch_rsa["name"]+".#{site_uid}.grid5000.fr"),
:switch_console_ip => switch_rsa["ip"],
:switch_console_mac => switch_rsa["mac"]
diff --git a/generators/input/orsay-network.yaml b/generators/input/orsay-network.yaml
index 98c9927e98..024bd40496 100644
--- a/generators/input/orsay-network.yaml
+++ b/generators/input/orsay-network.yaml
@@ -200,7 +200,6 @@ switch-bmc-5:
next_switch_rate : 1.G
switch-bmc-6:
name: "netgear07"
- nodes: "gdx-[216-252]"
rate: 1.G
ip: 172.26.120.157
mac: nil
@@ -208,7 +207,6 @@ switch-bmc-6:
next_switch_rate : 1.G
switch-bmc-7:
name: "netgear08"
- nodes: "gdx-[253-288]"
rate: 1.G
ip: 172.26.120.158
mac: 00:0f:b5:fc:0d:aa
@@ -216,23 +214,20 @@ switch-bmc-7:
next_switch_rate : 1.G
switch-bmc-8:
name: "procurve-bmc-09"
- nodes: "gdx-[289-310]"
rate: 100.M
ip: 172.26.120.159
mac: nil
next_switch : "switch-eth0-17"
next_switch_rate : 1.G
-switch-bmc-netgdx:
- name: "netgearxy"
- nodes: "netgdx-[1-30]"
- rate: 1.G
- ip: 172.26.120.150
- mac: nil
+switch-bmc-9:
+ name: "netgear10"
+ rate: 1.G
+ ip: 172.26.120.160
+ mac: 00:0f:b5:fc:0d:a8
next_switch : "switch-gw"
next_switch_rate : 1.G
switch-rsa-0:
name: "mrv01"
- nodes: "gdx-[1-36]"
rate: 1.G
ip: 172.26.120.201
mac: nil
@@ -302,22 +297,21 @@ switch-rsa-8:
mac: 00:a0:9c:00:25:4a
next_switch : "switch-eth0-17"
next_switch_rate : 1.G
-switch-rsa-netgdx:
+switch-rsa-9:
name: "mrv00"
- nodes: "netgdx-[1-30]"
rate: 1.G
ip: 172.26.120.200
- mac: nil
+ mac: 00:a0:9c:00:12:fa
+ next_switch : "switch-gw"
+ next_switch_rate : 1.G
switch-mx:
name: "switch-mx"
- nodes: "gdx-[1-310]"
rate: 10.G
ip: nil
mac: nil
switch-gw:
name-prod: "gw"
name-admin: "cisco"
- nodes: "netgdx-[1-30]"
rate: 1.G
ip-prod: 172.24.120.10
mac-prod: 00:11:5d:3d:50:00
--
GitLab