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 80293eaf264c7d51e3f6b8ea6b58eef29a73878e..dfb56f9d4ec7f2eddbdf020cb529167410870e33 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 45482579ed4c204405e8825d8a79b097297f6f51..968da476fc1a2b97dd074fc576f0a65bf7f5e6fe 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 46833ca82fbfae621f589c84fba175378514ecef..052024c001336e18c414f4642f361ff307f4cf0a 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 789aceac0635827a9218ddb8524e81fe08df72c0..7ed2c426e0dfdfc3ec6dd7f24abeaf8d9cccef18 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 7edf0fc02266fedb8784333cb613e89cdd050265..5d1cd68aa109a5324a906570cfb3201c68072a9f 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 4d672da6aaff1174079866aecf120e43d7110459..b202b4b4437e1ee8c5e64f45fae854ce8d089001 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 a0e5c6282c8db00fdf0c530c306a56e648a938fd..12ab891a7f16c40ab12c57f4b0d1f786a4fe6468 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 26a73c8c5d62fa740d3ca3248884348a2d3597cb..ae660734613f1c848d15b055a0474df296ac1cf3 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 78c627bf93d94b521434fb8cc62a9f5397054775..c6949a0f1798e618a434794c58f4e098b5278da3 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 6da5d05730a0fdd09b786de4c02a1a8a707e2074..196f20351a9ddd8df1ef4e91c439eea36a4e8bdf 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 46d8b07bd2118169d789afeea3e9b19bff5664d0..d33b7b564fd5af5a9784c83bbb8685708cf69ed5 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 e3ec179ffe2f17632eebd78cd0443983333ef166..54670c265b1a92e82d428901a543b1698662fee5 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 0045e2c7b4efb76a60faf1148b62ecbcc9d9a770..f1446182b2075bd4d0338e3d6674664b61bc1bc0 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 804f604c70beb5f87dd339bcdb7bfd6a7398417f..f40aa48c628142427ba4363ac76e9af9d418b2b1 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 4b4ddf649afc7876de68f982f3e0b026d87810ae..65147ffe5115f54b8812bd561895ac47ad044d4c 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 c678f1e3657a76caed262433f9af8416ba65608b..9c80328f65be1c757f6e2031a8973be171fa3a9c 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 41a238fbb8398e525fd029da7ef238ada898cc03..b8388ee0c5aa02b4af9753123d7e2845fa387834 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 34a5bb9fa5185816f410cd2b63e0c81fd3774f47..1329cf1f2c172e62151cab21b24d7953e7223ccf 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 3bf97ecdbf52ce642d2b7066d2c70b09557d8d88..ae42ce910f1933b378b0f447e94808b0f63bbdad 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 9474d9a37d795f70f07f9063fa7037780b3c5ef1..66d8c12361c09a7b6b18030553bfb182041e9ef5 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 d72062a7d0eeca94d4e61d09e0ca24aba15752d5..02e9065d56e93cd57dae6a650fed4f3ddfe7a7e9 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 be404a8c522580faaf216eac2dad26613a255bd9..6214d52564c6e588d7b56a7300ebab6943769140 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 a2c2e74a000b41950694c300b30c2621af3d6a0c..4fb4d8bb283895a95df7f82cb6b4617a97fe2b49 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 77d7727f3791a56d695ca29e73bd0ab295043efa..4d4e8b6480f5315e5e8f851d4cabe4418f8495c8 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 7d326cc5b887910822ffa838357683f66af652e4..1f4527f766f5f61bf1fbe726d76fef7200ad4168 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 c5bb3e916deaa81a1d6c8041d70ab133525bf702..078a2819e8b9c9e8afcefa691ed809388b9e1b0a 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 c855051241d4476ef5b244a93f334a473fe5e224..5670fdf8f97c7dce12b6096e9ed55f3b270965ca 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 88f946951be9c9fdd1b8eeadc0b9ce6859c3362e..cacce56863e3d318edbb9c81188287b33894773d 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 6c85960e134d1f8c1c6e048b6a764e4fa3147cab..8b282afbd3289f363dc101036c436b7965d6c22b 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 96b783a7ee5264232ca6ca29e0df44b9a7b17073..ac1d842b01174596def12bf7244affb6ecfb150d 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 200637b60b2683e443f4d438c20ebcdd050076ad..f46cdb53a67bafcab6bb3088d420a4b20806585d 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 798301956d09d9e86194c5a8e9709ccf9a84c628..0ad32ce8c78b8bbebb16ba74ab615efd067be862 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 a72b13377a2345bfe86536603cd6dff0723c10e0..4988a9a58f4a88846960dd3f75dbb871f8b21abe 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 98c9927e984d7f57d3e89004c776930b7cbc95db..024bd40496b4b3e2d32b585a34941615d97ae3dc 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