diff --git a/data/grid5000/sites/grenoble/clusters/drac/drac.json b/data/grid5000/sites/grenoble/clusters/drac/drac.json
index 8469b3e3eefb5b328abc29185a4d25f53ec4b071..ba05c3f3546a781ff5328ba89d2e90242de4ec8c 100644
--- a/data/grid5000/sites/grenoble/clusters/drac/drac.json
+++ b/data/grid5000/sites/grenoble/clusters/drac/drac.json
@@ -1,7 +1,7 @@
{
"created_at": "Mon, 05 Oct 2020 00:00:00 GMT",
"exotic": true,
- "kavlan": false,
+ "kavlan": true,
"metrics": [
],
diff --git a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-1.json b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-1.json
index d816512d8a124cbcb5eae680adfcbfebf4969dea..c0a76171736d82f8ce9aacb54ce55d9189405f4a 100644
--- a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-1.json
+++ b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-1.json
@@ -55,6 +55,48 @@
"vendor": "Nvidia"
}
},
+ "kavlan": {
+ "eth0": {
+ "kavlan-1": "192.168.195.1",
+ "kavlan-11": "10.7.199.1",
+ "kavlan-12": "10.11.199.1",
+ "kavlan-13": "10.15.199.1",
+ "kavlan-14": "10.19.199.1",
+ "kavlan-16": "10.27.199.1",
+ "kavlan-18": "10.35.199.1",
+ "kavlan-2": "192.168.211.1",
+ "kavlan-20": "10.43.199.1",
+ "kavlan-21": "10.47.199.1",
+ "kavlan-3": "192.168.227.1",
+ "kavlan-4": "10.4.3.1",
+ "kavlan-5": "10.4.67.1",
+ "kavlan-6": "10.4.131.1",
+ "kavlan-7": "10.4.195.1",
+ "kavlan-8": "10.5.3.1",
+ "kavlan-9": "10.5.67.1"
+ }
+ },
+ "kavlan6": {
+ "eth0": {
+ "kavlan-1": "2001:660:4406:180:9:0::1",
+ "kavlan-11": "2001:660:4406:1a0:109:0::1",
+ "kavlan-12": "2001:660:4406:2a0:109:0::1",
+ "kavlan-13": "2001:660:4406:4a0:109:0::1",
+ "kavlan-14": "2001:660:4406:5a0:109:0::1",
+ "kavlan-16": "2001:660:4406:7a0:109:0::1",
+ "kavlan-18": "2001:660:4406:8a0:109:0::1",
+ "kavlan-2": "2001:660:4406:181:9:0::1",
+ "kavlan-20": "2001:660:4406:3a0:109:0::1",
+ "kavlan-21": "2001:660:4406:6a0:109:0::1",
+ "kavlan-3": "2001:660:4406:182:9:0::1",
+ "kavlan-4": "2001:660:4406:190:9:0::1",
+ "kavlan-5": "2001:660:4406:191:9:0::1",
+ "kavlan-6": "2001:660:4406:192:9:0::1",
+ "kavlan-7": "2001:660:4406:193:9:0::1",
+ "kavlan-8": "2001:660:4406:194:9:0::1",
+ "kavlan-9": "2001:660:4406:195:9:0::1"
+ }
+ },
"main_memory": {
"ram_size": 137438953472
},
@@ -71,7 +113,7 @@
"interface": "Ethernet",
"ip": "172.16.24.1",
"ip6": "2001:660:4406:100:9:0::1",
- "kavlan": false,
+ "kavlan": true,
"mac": "98:be:94:68:1e:54",
"management": false,
"model": "NetXtreme II BCM57800 1/10 Gigabit Ethernet",
@@ -81,7 +123,7 @@
"network_address": "drac-1.grenoble.grid5000.fr",
"rate": 10000000000,
"switch": "gw-new",
- "switch_port": "41",
+ "switch_port": "ethernet1/1/37:1",
"vendor": "Broadcom"
},
{
diff --git a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-10.json b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-10.json
index 3bdacbef348d2e431382cead4f756909ca958a64..f8dbbfcf700cd78b6e70a79507175ce712c6711b 100644
--- a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-10.json
+++ b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-10.json
@@ -55,6 +55,48 @@
"vendor": "Nvidia"
}
},
+ "kavlan": {
+ "eth0": {
+ "kavlan-1": "192.168.195.10",
+ "kavlan-11": "10.7.199.10",
+ "kavlan-12": "10.11.199.10",
+ "kavlan-13": "10.15.199.10",
+ "kavlan-14": "10.19.199.10",
+ "kavlan-16": "10.27.199.10",
+ "kavlan-18": "10.35.199.10",
+ "kavlan-2": "192.168.211.10",
+ "kavlan-20": "10.43.199.10",
+ "kavlan-21": "10.47.199.10",
+ "kavlan-3": "192.168.227.10",
+ "kavlan-4": "10.4.3.10",
+ "kavlan-5": "10.4.67.10",
+ "kavlan-6": "10.4.131.10",
+ "kavlan-7": "10.4.195.10",
+ "kavlan-8": "10.5.3.10",
+ "kavlan-9": "10.5.67.10"
+ }
+ },
+ "kavlan6": {
+ "eth0": {
+ "kavlan-1": "2001:660:4406:180:9:0::a",
+ "kavlan-11": "2001:660:4406:1a0:109:0::a",
+ "kavlan-12": "2001:660:4406:2a0:109:0::a",
+ "kavlan-13": "2001:660:4406:4a0:109:0::a",
+ "kavlan-14": "2001:660:4406:5a0:109:0::a",
+ "kavlan-16": "2001:660:4406:7a0:109:0::a",
+ "kavlan-18": "2001:660:4406:8a0:109:0::a",
+ "kavlan-2": "2001:660:4406:181:9:0::a",
+ "kavlan-20": "2001:660:4406:3a0:109:0::a",
+ "kavlan-21": "2001:660:4406:6a0:109:0::a",
+ "kavlan-3": "2001:660:4406:182:9:0::a",
+ "kavlan-4": "2001:660:4406:190:9:0::a",
+ "kavlan-5": "2001:660:4406:191:9:0::a",
+ "kavlan-6": "2001:660:4406:192:9:0::a",
+ "kavlan-7": "2001:660:4406:193:9:0::a",
+ "kavlan-8": "2001:660:4406:194:9:0::a",
+ "kavlan-9": "2001:660:4406:195:9:0::a"
+ }
+ },
"main_memory": {
"ram_size": 137438953472
},
@@ -71,7 +113,7 @@
"interface": "Ethernet",
"ip": "172.16.24.10",
"ip6": "2001:660:4406:100:9:0::a",
- "kavlan": false,
+ "kavlan": true,
"mac": "98:be:94:68:7a:44",
"management": false,
"model": "NetXtreme II BCM57800 1/10 Gigabit Ethernet",
@@ -81,7 +123,7 @@
"network_address": "drac-10.grenoble.grid5000.fr",
"rate": 10000000000,
"switch": "gw-new",
- "switch_port": "50",
+ "switch_port": "ethernet1/1/46:1",
"vendor": "Broadcom"
},
{
diff --git a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-11.json b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-11.json
index ebe7113e8a22119801bd64b2b606bae9acdfd54f..08cd4e1744ec23dae76e4bc19c1bc26730206b9f 100644
--- a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-11.json
+++ b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-11.json
@@ -55,6 +55,48 @@
"vendor": "Nvidia"
}
},
+ "kavlan": {
+ "eth0": {
+ "kavlan-1": "192.168.195.11",
+ "kavlan-11": "10.7.199.11",
+ "kavlan-12": "10.11.199.11",
+ "kavlan-13": "10.15.199.11",
+ "kavlan-14": "10.19.199.11",
+ "kavlan-16": "10.27.199.11",
+ "kavlan-18": "10.35.199.11",
+ "kavlan-2": "192.168.211.11",
+ "kavlan-20": "10.43.199.11",
+ "kavlan-21": "10.47.199.11",
+ "kavlan-3": "192.168.227.11",
+ "kavlan-4": "10.4.3.11",
+ "kavlan-5": "10.4.67.11",
+ "kavlan-6": "10.4.131.11",
+ "kavlan-7": "10.4.195.11",
+ "kavlan-8": "10.5.3.11",
+ "kavlan-9": "10.5.67.11"
+ }
+ },
+ "kavlan6": {
+ "eth0": {
+ "kavlan-1": "2001:660:4406:180:9:0::b",
+ "kavlan-11": "2001:660:4406:1a0:109:0::b",
+ "kavlan-12": "2001:660:4406:2a0:109:0::b",
+ "kavlan-13": "2001:660:4406:4a0:109:0::b",
+ "kavlan-14": "2001:660:4406:5a0:109:0::b",
+ "kavlan-16": "2001:660:4406:7a0:109:0::b",
+ "kavlan-18": "2001:660:4406:8a0:109:0::b",
+ "kavlan-2": "2001:660:4406:181:9:0::b",
+ "kavlan-20": "2001:660:4406:3a0:109:0::b",
+ "kavlan-21": "2001:660:4406:6a0:109:0::b",
+ "kavlan-3": "2001:660:4406:182:9:0::b",
+ "kavlan-4": "2001:660:4406:190:9:0::b",
+ "kavlan-5": "2001:660:4406:191:9:0::b",
+ "kavlan-6": "2001:660:4406:192:9:0::b",
+ "kavlan-7": "2001:660:4406:193:9:0::b",
+ "kavlan-8": "2001:660:4406:194:9:0::b",
+ "kavlan-9": "2001:660:4406:195:9:0::b"
+ }
+ },
"main_memory": {
"ram_size": 137438953472
},
@@ -71,7 +113,7 @@
"interface": "Ethernet",
"ip": "172.16.24.11",
"ip6": "2001:660:4406:100:9:0::b",
- "kavlan": false,
+ "kavlan": true,
"mac": "98:be:94:68:46:54",
"management": false,
"model": "NetXtreme II BCM57800 1/10 Gigabit Ethernet",
@@ -81,7 +123,7 @@
"network_address": "drac-11.grenoble.grid5000.fr",
"rate": 10000000000,
"switch": "gw-new",
- "switch_port": "51",
+ "switch_port": "ethernet1/1/47:1",
"vendor": "Broadcom"
},
{
diff --git a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-12.json b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-12.json
index c4c81fadeb4638d486c65d93c3ccf14504af2d3b..708996b3d7c2c2e41ec6384a1e32fa6cfd697c4d 100644
--- a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-12.json
+++ b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-12.json
@@ -55,6 +55,48 @@
"vendor": "Nvidia"
}
},
+ "kavlan": {
+ "eth0": {
+ "kavlan-1": "192.168.195.12",
+ "kavlan-11": "10.7.199.12",
+ "kavlan-12": "10.11.199.12",
+ "kavlan-13": "10.15.199.12",
+ "kavlan-14": "10.19.199.12",
+ "kavlan-16": "10.27.199.12",
+ "kavlan-18": "10.35.199.12",
+ "kavlan-2": "192.168.211.12",
+ "kavlan-20": "10.43.199.12",
+ "kavlan-21": "10.47.199.12",
+ "kavlan-3": "192.168.227.12",
+ "kavlan-4": "10.4.3.12",
+ "kavlan-5": "10.4.67.12",
+ "kavlan-6": "10.4.131.12",
+ "kavlan-7": "10.4.195.12",
+ "kavlan-8": "10.5.3.12",
+ "kavlan-9": "10.5.67.12"
+ }
+ },
+ "kavlan6": {
+ "eth0": {
+ "kavlan-1": "2001:660:4406:180:9:0::c",
+ "kavlan-11": "2001:660:4406:1a0:109:0::c",
+ "kavlan-12": "2001:660:4406:2a0:109:0::c",
+ "kavlan-13": "2001:660:4406:4a0:109:0::c",
+ "kavlan-14": "2001:660:4406:5a0:109:0::c",
+ "kavlan-16": "2001:660:4406:7a0:109:0::c",
+ "kavlan-18": "2001:660:4406:8a0:109:0::c",
+ "kavlan-2": "2001:660:4406:181:9:0::c",
+ "kavlan-20": "2001:660:4406:3a0:109:0::c",
+ "kavlan-21": "2001:660:4406:6a0:109:0::c",
+ "kavlan-3": "2001:660:4406:182:9:0::c",
+ "kavlan-4": "2001:660:4406:190:9:0::c",
+ "kavlan-5": "2001:660:4406:191:9:0::c",
+ "kavlan-6": "2001:660:4406:192:9:0::c",
+ "kavlan-7": "2001:660:4406:193:9:0::c",
+ "kavlan-8": "2001:660:4406:194:9:0::c",
+ "kavlan-9": "2001:660:4406:195:9:0::c"
+ }
+ },
"main_memory": {
"ram_size": 137438953472
},
@@ -71,7 +113,7 @@
"interface": "Ethernet",
"ip": "172.16.24.12",
"ip6": "2001:660:4406:100:9:0::c",
- "kavlan": false,
+ "kavlan": true,
"mac": "98:be:94:68:7a:14",
"management": false,
"model": "NetXtreme II BCM57800 1/10 Gigabit Ethernet",
@@ -81,7 +123,7 @@
"network_address": "drac-12.grenoble.grid5000.fr",
"rate": 10000000000,
"switch": "gw-new",
- "switch_port": "52",
+ "switch_port": "ethernet1/1/48:1",
"vendor": "Broadcom"
},
{
diff --git a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-2.json b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-2.json
index adeebec0738c36be80cbfa3c02c0781d2353fb23..0c5a17cb394fdd23f6f40d9dafa612c4c0093ed8 100644
--- a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-2.json
+++ b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-2.json
@@ -55,6 +55,48 @@
"vendor": "Nvidia"
}
},
+ "kavlan": {
+ "eth0": {
+ "kavlan-1": "192.168.195.2",
+ "kavlan-11": "10.7.199.2",
+ "kavlan-12": "10.11.199.2",
+ "kavlan-13": "10.15.199.2",
+ "kavlan-14": "10.19.199.2",
+ "kavlan-16": "10.27.199.2",
+ "kavlan-18": "10.35.199.2",
+ "kavlan-2": "192.168.211.2",
+ "kavlan-20": "10.43.199.2",
+ "kavlan-21": "10.47.199.2",
+ "kavlan-3": "192.168.227.2",
+ "kavlan-4": "10.4.3.2",
+ "kavlan-5": "10.4.67.2",
+ "kavlan-6": "10.4.131.2",
+ "kavlan-7": "10.4.195.2",
+ "kavlan-8": "10.5.3.2",
+ "kavlan-9": "10.5.67.2"
+ }
+ },
+ "kavlan6": {
+ "eth0": {
+ "kavlan-1": "2001:660:4406:180:9:0::2",
+ "kavlan-11": "2001:660:4406:1a0:109:0::2",
+ "kavlan-12": "2001:660:4406:2a0:109:0::2",
+ "kavlan-13": "2001:660:4406:4a0:109:0::2",
+ "kavlan-14": "2001:660:4406:5a0:109:0::2",
+ "kavlan-16": "2001:660:4406:7a0:109:0::2",
+ "kavlan-18": "2001:660:4406:8a0:109:0::2",
+ "kavlan-2": "2001:660:4406:181:9:0::2",
+ "kavlan-20": "2001:660:4406:3a0:109:0::2",
+ "kavlan-21": "2001:660:4406:6a0:109:0::2",
+ "kavlan-3": "2001:660:4406:182:9:0::2",
+ "kavlan-4": "2001:660:4406:190:9:0::2",
+ "kavlan-5": "2001:660:4406:191:9:0::2",
+ "kavlan-6": "2001:660:4406:192:9:0::2",
+ "kavlan-7": "2001:660:4406:193:9:0::2",
+ "kavlan-8": "2001:660:4406:194:9:0::2",
+ "kavlan-9": "2001:660:4406:195:9:0::2"
+ }
+ },
"main_memory": {
"ram_size": 137438953472
},
@@ -71,7 +113,7 @@
"interface": "Ethernet",
"ip": "172.16.24.2",
"ip6": "2001:660:4406:100:9:0::2",
- "kavlan": false,
+ "kavlan": true,
"mac": "98:be:94:68:72:34",
"management": false,
"model": "NetXtreme II BCM57800 1/10 Gigabit Ethernet",
@@ -81,7 +123,7 @@
"network_address": "drac-2.grenoble.grid5000.fr",
"rate": 10000000000,
"switch": "gw-new",
- "switch_port": "42",
+ "switch_port": "ethernet1/1/38:1",
"vendor": "Broadcom"
},
{
diff --git a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-3.json b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-3.json
index b07287199ec33d3ee91c8c3118c03dfd90c64f8e..5d128518bb0ee350008757cc362825dd1482033f 100644
--- a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-3.json
+++ b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-3.json
@@ -55,6 +55,48 @@
"vendor": "Nvidia"
}
},
+ "kavlan": {
+ "eth0": {
+ "kavlan-1": "192.168.195.3",
+ "kavlan-11": "10.7.199.3",
+ "kavlan-12": "10.11.199.3",
+ "kavlan-13": "10.15.199.3",
+ "kavlan-14": "10.19.199.3",
+ "kavlan-16": "10.27.199.3",
+ "kavlan-18": "10.35.199.3",
+ "kavlan-2": "192.168.211.3",
+ "kavlan-20": "10.43.199.3",
+ "kavlan-21": "10.47.199.3",
+ "kavlan-3": "192.168.227.3",
+ "kavlan-4": "10.4.3.3",
+ "kavlan-5": "10.4.67.3",
+ "kavlan-6": "10.4.131.3",
+ "kavlan-7": "10.4.195.3",
+ "kavlan-8": "10.5.3.3",
+ "kavlan-9": "10.5.67.3"
+ }
+ },
+ "kavlan6": {
+ "eth0": {
+ "kavlan-1": "2001:660:4406:180:9:0::3",
+ "kavlan-11": "2001:660:4406:1a0:109:0::3",
+ "kavlan-12": "2001:660:4406:2a0:109:0::3",
+ "kavlan-13": "2001:660:4406:4a0:109:0::3",
+ "kavlan-14": "2001:660:4406:5a0:109:0::3",
+ "kavlan-16": "2001:660:4406:7a0:109:0::3",
+ "kavlan-18": "2001:660:4406:8a0:109:0::3",
+ "kavlan-2": "2001:660:4406:181:9:0::3",
+ "kavlan-20": "2001:660:4406:3a0:109:0::3",
+ "kavlan-21": "2001:660:4406:6a0:109:0::3",
+ "kavlan-3": "2001:660:4406:182:9:0::3",
+ "kavlan-4": "2001:660:4406:190:9:0::3",
+ "kavlan-5": "2001:660:4406:191:9:0::3",
+ "kavlan-6": "2001:660:4406:192:9:0::3",
+ "kavlan-7": "2001:660:4406:193:9:0::3",
+ "kavlan-8": "2001:660:4406:194:9:0::3",
+ "kavlan-9": "2001:660:4406:195:9:0::3"
+ }
+ },
"main_memory": {
"ram_size": 137438953472
},
@@ -71,7 +113,7 @@
"interface": "Ethernet",
"ip": "172.16.24.3",
"ip6": "2001:660:4406:100:9:0::3",
- "kavlan": false,
+ "kavlan": true,
"mac": "98:be:94:68:72:64",
"management": false,
"model": "NetXtreme II BCM57800 1/10 Gigabit Ethernet",
@@ -81,7 +123,7 @@
"network_address": "drac-3.grenoble.grid5000.fr",
"rate": 10000000000,
"switch": "gw-new",
- "switch_port": "43",
+ "switch_port": "ethernet1/1/39:1",
"vendor": "Broadcom"
},
{
diff --git a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-4.json b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-4.json
index 86dfc03a9f79ebc4c1cd4ef17b48f29ed9321f60..6a59fd751362431310eecfe39d9d4e61de38093d 100644
--- a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-4.json
+++ b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-4.json
@@ -55,6 +55,48 @@
"vendor": "Nvidia"
}
},
+ "kavlan": {
+ "eth0": {
+ "kavlan-1": "192.168.195.4",
+ "kavlan-11": "10.7.199.4",
+ "kavlan-12": "10.11.199.4",
+ "kavlan-13": "10.15.199.4",
+ "kavlan-14": "10.19.199.4",
+ "kavlan-16": "10.27.199.4",
+ "kavlan-18": "10.35.199.4",
+ "kavlan-2": "192.168.211.4",
+ "kavlan-20": "10.43.199.4",
+ "kavlan-21": "10.47.199.4",
+ "kavlan-3": "192.168.227.4",
+ "kavlan-4": "10.4.3.4",
+ "kavlan-5": "10.4.67.4",
+ "kavlan-6": "10.4.131.4",
+ "kavlan-7": "10.4.195.4",
+ "kavlan-8": "10.5.3.4",
+ "kavlan-9": "10.5.67.4"
+ }
+ },
+ "kavlan6": {
+ "eth0": {
+ "kavlan-1": "2001:660:4406:180:9:0::4",
+ "kavlan-11": "2001:660:4406:1a0:109:0::4",
+ "kavlan-12": "2001:660:4406:2a0:109:0::4",
+ "kavlan-13": "2001:660:4406:4a0:109:0::4",
+ "kavlan-14": "2001:660:4406:5a0:109:0::4",
+ "kavlan-16": "2001:660:4406:7a0:109:0::4",
+ "kavlan-18": "2001:660:4406:8a0:109:0::4",
+ "kavlan-2": "2001:660:4406:181:9:0::4",
+ "kavlan-20": "2001:660:4406:3a0:109:0::4",
+ "kavlan-21": "2001:660:4406:6a0:109:0::4",
+ "kavlan-3": "2001:660:4406:182:9:0::4",
+ "kavlan-4": "2001:660:4406:190:9:0::4",
+ "kavlan-5": "2001:660:4406:191:9:0::4",
+ "kavlan-6": "2001:660:4406:192:9:0::4",
+ "kavlan-7": "2001:660:4406:193:9:0::4",
+ "kavlan-8": "2001:660:4406:194:9:0::4",
+ "kavlan-9": "2001:660:4406:195:9:0::4"
+ }
+ },
"main_memory": {
"ram_size": 137438953472
},
@@ -71,7 +113,7 @@
"interface": "Ethernet",
"ip": "172.16.24.4",
"ip6": "2001:660:4406:100:9:0::4",
- "kavlan": false,
+ "kavlan": true,
"mac": "98:be:94:68:72:54",
"management": false,
"model": "NetXtreme II BCM57800 1/10 Gigabit Ethernet",
@@ -81,7 +123,7 @@
"network_address": "drac-4.grenoble.grid5000.fr",
"rate": 10000000000,
"switch": "gw-new",
- "switch_port": "44",
+ "switch_port": "ethernet1/1/40:1",
"vendor": "Broadcom"
},
{
diff --git a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-5.json b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-5.json
index 703a89c4c9e8e5644ea6cbfe54d23d96ac1922b2..cc4da6cb2143a78accb8629cc382e1cbfa14e933 100644
--- a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-5.json
+++ b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-5.json
@@ -55,6 +55,48 @@
"vendor": "Nvidia"
}
},
+ "kavlan": {
+ "eth0": {
+ "kavlan-1": "192.168.195.5",
+ "kavlan-11": "10.7.199.5",
+ "kavlan-12": "10.11.199.5",
+ "kavlan-13": "10.15.199.5",
+ "kavlan-14": "10.19.199.5",
+ "kavlan-16": "10.27.199.5",
+ "kavlan-18": "10.35.199.5",
+ "kavlan-2": "192.168.211.5",
+ "kavlan-20": "10.43.199.5",
+ "kavlan-21": "10.47.199.5",
+ "kavlan-3": "192.168.227.5",
+ "kavlan-4": "10.4.3.5",
+ "kavlan-5": "10.4.67.5",
+ "kavlan-6": "10.4.131.5",
+ "kavlan-7": "10.4.195.5",
+ "kavlan-8": "10.5.3.5",
+ "kavlan-9": "10.5.67.5"
+ }
+ },
+ "kavlan6": {
+ "eth0": {
+ "kavlan-1": "2001:660:4406:180:9:0::5",
+ "kavlan-11": "2001:660:4406:1a0:109:0::5",
+ "kavlan-12": "2001:660:4406:2a0:109:0::5",
+ "kavlan-13": "2001:660:4406:4a0:109:0::5",
+ "kavlan-14": "2001:660:4406:5a0:109:0::5",
+ "kavlan-16": "2001:660:4406:7a0:109:0::5",
+ "kavlan-18": "2001:660:4406:8a0:109:0::5",
+ "kavlan-2": "2001:660:4406:181:9:0::5",
+ "kavlan-20": "2001:660:4406:3a0:109:0::5",
+ "kavlan-21": "2001:660:4406:6a0:109:0::5",
+ "kavlan-3": "2001:660:4406:182:9:0::5",
+ "kavlan-4": "2001:660:4406:190:9:0::5",
+ "kavlan-5": "2001:660:4406:191:9:0::5",
+ "kavlan-6": "2001:660:4406:192:9:0::5",
+ "kavlan-7": "2001:660:4406:193:9:0::5",
+ "kavlan-8": "2001:660:4406:194:9:0::5",
+ "kavlan-9": "2001:660:4406:195:9:0::5"
+ }
+ },
"main_memory": {
"ram_size": 137438953472
},
@@ -71,7 +113,7 @@
"interface": "Ethernet",
"ip": "172.16.24.5",
"ip6": "2001:660:4406:100:9:0::5",
- "kavlan": false,
+ "kavlan": true,
"mac": "98:be:94:68:48:cc",
"management": false,
"model": "NetXtreme II BCM57800 1/10 Gigabit Ethernet",
@@ -81,7 +123,7 @@
"network_address": "drac-5.grenoble.grid5000.fr",
"rate": 10000000000,
"switch": "gw-new",
- "switch_port": "45",
+ "switch_port": "ethernet1/1/41:1",
"vendor": "Broadcom"
},
{
diff --git a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-6.json b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-6.json
index 02423ff424918a4f23e39ac2552590a6d577a095..ec5388ffd668d542edd7482cdf2342af1b4b40da 100644
--- a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-6.json
+++ b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-6.json
@@ -55,6 +55,48 @@
"vendor": "Nvidia"
}
},
+ "kavlan": {
+ "eth0": {
+ "kavlan-1": "192.168.195.6",
+ "kavlan-11": "10.7.199.6",
+ "kavlan-12": "10.11.199.6",
+ "kavlan-13": "10.15.199.6",
+ "kavlan-14": "10.19.199.6",
+ "kavlan-16": "10.27.199.6",
+ "kavlan-18": "10.35.199.6",
+ "kavlan-2": "192.168.211.6",
+ "kavlan-20": "10.43.199.6",
+ "kavlan-21": "10.47.199.6",
+ "kavlan-3": "192.168.227.6",
+ "kavlan-4": "10.4.3.6",
+ "kavlan-5": "10.4.67.6",
+ "kavlan-6": "10.4.131.6",
+ "kavlan-7": "10.4.195.6",
+ "kavlan-8": "10.5.3.6",
+ "kavlan-9": "10.5.67.6"
+ }
+ },
+ "kavlan6": {
+ "eth0": {
+ "kavlan-1": "2001:660:4406:180:9:0::6",
+ "kavlan-11": "2001:660:4406:1a0:109:0::6",
+ "kavlan-12": "2001:660:4406:2a0:109:0::6",
+ "kavlan-13": "2001:660:4406:4a0:109:0::6",
+ "kavlan-14": "2001:660:4406:5a0:109:0::6",
+ "kavlan-16": "2001:660:4406:7a0:109:0::6",
+ "kavlan-18": "2001:660:4406:8a0:109:0::6",
+ "kavlan-2": "2001:660:4406:181:9:0::6",
+ "kavlan-20": "2001:660:4406:3a0:109:0::6",
+ "kavlan-21": "2001:660:4406:6a0:109:0::6",
+ "kavlan-3": "2001:660:4406:182:9:0::6",
+ "kavlan-4": "2001:660:4406:190:9:0::6",
+ "kavlan-5": "2001:660:4406:191:9:0::6",
+ "kavlan-6": "2001:660:4406:192:9:0::6",
+ "kavlan-7": "2001:660:4406:193:9:0::6",
+ "kavlan-8": "2001:660:4406:194:9:0::6",
+ "kavlan-9": "2001:660:4406:195:9:0::6"
+ }
+ },
"main_memory": {
"ram_size": 137438953472
},
@@ -71,7 +113,7 @@
"interface": "Ethernet",
"ip": "172.16.24.6",
"ip6": "2001:660:4406:100:9:0::6",
- "kavlan": false,
+ "kavlan": true,
"mac": "98:be:94:68:7a:50",
"management": false,
"model": "NetXtreme II BCM57800 1/10 Gigabit Ethernet",
@@ -81,7 +123,7 @@
"network_address": "drac-6.grenoble.grid5000.fr",
"rate": 10000000000,
"switch": "gw-new",
- "switch_port": "46",
+ "switch_port": "ethernet1/1/42:1",
"vendor": "Broadcom"
},
{
diff --git a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-7.json b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-7.json
index b78a8eaac67949a43cbc8b56613125a060911416..7664557a19ba85356d08ef066afa8690eff049e1 100644
--- a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-7.json
+++ b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-7.json
@@ -55,6 +55,48 @@
"vendor": "Nvidia"
}
},
+ "kavlan": {
+ "eth0": {
+ "kavlan-1": "192.168.195.7",
+ "kavlan-11": "10.7.199.7",
+ "kavlan-12": "10.11.199.7",
+ "kavlan-13": "10.15.199.7",
+ "kavlan-14": "10.19.199.7",
+ "kavlan-16": "10.27.199.7",
+ "kavlan-18": "10.35.199.7",
+ "kavlan-2": "192.168.211.7",
+ "kavlan-20": "10.43.199.7",
+ "kavlan-21": "10.47.199.7",
+ "kavlan-3": "192.168.227.7",
+ "kavlan-4": "10.4.3.7",
+ "kavlan-5": "10.4.67.7",
+ "kavlan-6": "10.4.131.7",
+ "kavlan-7": "10.4.195.7",
+ "kavlan-8": "10.5.3.7",
+ "kavlan-9": "10.5.67.7"
+ }
+ },
+ "kavlan6": {
+ "eth0": {
+ "kavlan-1": "2001:660:4406:180:9:0::7",
+ "kavlan-11": "2001:660:4406:1a0:109:0::7",
+ "kavlan-12": "2001:660:4406:2a0:109:0::7",
+ "kavlan-13": "2001:660:4406:4a0:109:0::7",
+ "kavlan-14": "2001:660:4406:5a0:109:0::7",
+ "kavlan-16": "2001:660:4406:7a0:109:0::7",
+ "kavlan-18": "2001:660:4406:8a0:109:0::7",
+ "kavlan-2": "2001:660:4406:181:9:0::7",
+ "kavlan-20": "2001:660:4406:3a0:109:0::7",
+ "kavlan-21": "2001:660:4406:6a0:109:0::7",
+ "kavlan-3": "2001:660:4406:182:9:0::7",
+ "kavlan-4": "2001:660:4406:190:9:0::7",
+ "kavlan-5": "2001:660:4406:191:9:0::7",
+ "kavlan-6": "2001:660:4406:192:9:0::7",
+ "kavlan-7": "2001:660:4406:193:9:0::7",
+ "kavlan-8": "2001:660:4406:194:9:0::7",
+ "kavlan-9": "2001:660:4406:195:9:0::7"
+ }
+ },
"main_memory": {
"ram_size": 137438953472
},
@@ -71,7 +113,7 @@
"interface": "Ethernet",
"ip": "172.16.24.7",
"ip6": "2001:660:4406:100:9:0::7",
- "kavlan": false,
+ "kavlan": true,
"mac": "98:be:94:68:80:14",
"management": false,
"model": "NetXtreme II BCM57800 1/10 Gigabit Ethernet",
@@ -81,7 +123,7 @@
"network_address": "drac-7.grenoble.grid5000.fr",
"rate": 10000000000,
"switch": "gw-new",
- "switch_port": "47",
+ "switch_port": "ethernet1/1/43:1",
"vendor": "Broadcom"
},
{
diff --git a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-8.json b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-8.json
index 50839ed878178068ba73ad025c8fef3f583f8c6d..40a108ded0b36c6466b4e025c4a6be255c9c3218 100644
--- a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-8.json
+++ b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-8.json
@@ -55,6 +55,48 @@
"vendor": "Nvidia"
}
},
+ "kavlan": {
+ "eth0": {
+ "kavlan-1": "192.168.195.8",
+ "kavlan-11": "10.7.199.8",
+ "kavlan-12": "10.11.199.8",
+ "kavlan-13": "10.15.199.8",
+ "kavlan-14": "10.19.199.8",
+ "kavlan-16": "10.27.199.8",
+ "kavlan-18": "10.35.199.8",
+ "kavlan-2": "192.168.211.8",
+ "kavlan-20": "10.43.199.8",
+ "kavlan-21": "10.47.199.8",
+ "kavlan-3": "192.168.227.8",
+ "kavlan-4": "10.4.3.8",
+ "kavlan-5": "10.4.67.8",
+ "kavlan-6": "10.4.131.8",
+ "kavlan-7": "10.4.195.8",
+ "kavlan-8": "10.5.3.8",
+ "kavlan-9": "10.5.67.8"
+ }
+ },
+ "kavlan6": {
+ "eth0": {
+ "kavlan-1": "2001:660:4406:180:9:0::8",
+ "kavlan-11": "2001:660:4406:1a0:109:0::8",
+ "kavlan-12": "2001:660:4406:2a0:109:0::8",
+ "kavlan-13": "2001:660:4406:4a0:109:0::8",
+ "kavlan-14": "2001:660:4406:5a0:109:0::8",
+ "kavlan-16": "2001:660:4406:7a0:109:0::8",
+ "kavlan-18": "2001:660:4406:8a0:109:0::8",
+ "kavlan-2": "2001:660:4406:181:9:0::8",
+ "kavlan-20": "2001:660:4406:3a0:109:0::8",
+ "kavlan-21": "2001:660:4406:6a0:109:0::8",
+ "kavlan-3": "2001:660:4406:182:9:0::8",
+ "kavlan-4": "2001:660:4406:190:9:0::8",
+ "kavlan-5": "2001:660:4406:191:9:0::8",
+ "kavlan-6": "2001:660:4406:192:9:0::8",
+ "kavlan-7": "2001:660:4406:193:9:0::8",
+ "kavlan-8": "2001:660:4406:194:9:0::8",
+ "kavlan-9": "2001:660:4406:195:9:0::8"
+ }
+ },
"main_memory": {
"ram_size": 137438953472
},
@@ -71,7 +113,7 @@
"interface": "Ethernet",
"ip": "172.16.24.8",
"ip6": "2001:660:4406:100:9:0::8",
- "kavlan": false,
+ "kavlan": true,
"mac": "98:be:94:68:7b:90",
"management": false,
"model": "NetXtreme II BCM57800 1/10 Gigabit Ethernet",
@@ -81,7 +123,7 @@
"network_address": "drac-8.grenoble.grid5000.fr",
"rate": 10000000000,
"switch": "gw-new",
- "switch_port": "48",
+ "switch_port": "ethernet1/1/44:1",
"vendor": "Broadcom"
},
{
diff --git a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-9.json b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-9.json
index 937ab2ab9a9340c645dc2bb1c44d1a0d976f92d0..50c127d706df126da160d163b4c5adac6434dcea 100644
--- a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-9.json
+++ b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-9.json
@@ -55,6 +55,48 @@
"vendor": "Nvidia"
}
},
+ "kavlan": {
+ "eth0": {
+ "kavlan-1": "192.168.195.9",
+ "kavlan-11": "10.7.199.9",
+ "kavlan-12": "10.11.199.9",
+ "kavlan-13": "10.15.199.9",
+ "kavlan-14": "10.19.199.9",
+ "kavlan-16": "10.27.199.9",
+ "kavlan-18": "10.35.199.9",
+ "kavlan-2": "192.168.211.9",
+ "kavlan-20": "10.43.199.9",
+ "kavlan-21": "10.47.199.9",
+ "kavlan-3": "192.168.227.9",
+ "kavlan-4": "10.4.3.9",
+ "kavlan-5": "10.4.67.9",
+ "kavlan-6": "10.4.131.9",
+ "kavlan-7": "10.4.195.9",
+ "kavlan-8": "10.5.3.9",
+ "kavlan-9": "10.5.67.9"
+ }
+ },
+ "kavlan6": {
+ "eth0": {
+ "kavlan-1": "2001:660:4406:180:9:0::9",
+ "kavlan-11": "2001:660:4406:1a0:109:0::9",
+ "kavlan-12": "2001:660:4406:2a0:109:0::9",
+ "kavlan-13": "2001:660:4406:4a0:109:0::9",
+ "kavlan-14": "2001:660:4406:5a0:109:0::9",
+ "kavlan-16": "2001:660:4406:7a0:109:0::9",
+ "kavlan-18": "2001:660:4406:8a0:109:0::9",
+ "kavlan-2": "2001:660:4406:181:9:0::9",
+ "kavlan-20": "2001:660:4406:3a0:109:0::9",
+ "kavlan-21": "2001:660:4406:6a0:109:0::9",
+ "kavlan-3": "2001:660:4406:182:9:0::9",
+ "kavlan-4": "2001:660:4406:190:9:0::9",
+ "kavlan-5": "2001:660:4406:191:9:0::9",
+ "kavlan-6": "2001:660:4406:192:9:0::9",
+ "kavlan-7": "2001:660:4406:193:9:0::9",
+ "kavlan-8": "2001:660:4406:194:9:0::9",
+ "kavlan-9": "2001:660:4406:195:9:0::9"
+ }
+ },
"main_memory": {
"ram_size": 137438953472
},
@@ -71,7 +113,7 @@
"interface": "Ethernet",
"ip": "172.16.24.9",
"ip6": "2001:660:4406:100:9:0::9",
- "kavlan": false,
+ "kavlan": true,
"mac": "98:be:94:68:75:c0",
"management": false,
"model": "NetXtreme II BCM57800 1/10 Gigabit Ethernet",
@@ -81,7 +123,7 @@
"network_address": "drac-9.grenoble.grid5000.fr",
"rate": 10000000000,
"switch": "gw-new",
- "switch_port": "49",
+ "switch_port": "ethernet1/1/45:1",
"vendor": "Broadcom"
},
{
diff --git a/data/grid5000/sites/grenoble/network_equipments/gw-new.json b/data/grid5000/sites/grenoble/network_equipments/gw-new.json
index 0f400df119cd758609dfee84f63ccaac62f18393..4c06f294456509eb973185a1a5aa3598d3815e50 100644
--- a/data/grid5000/sites/grenoble/network_equipments/gw-new.json
+++ b/data/grid5000/sites/grenoble/network_equipments/gw-new.json
@@ -1,9 +1,12 @@
{
+ "backplane_bps": 6400000000000,
"ip": "172.16.31.252",
"kind": "switch",
"linecards": [
{
- "kavlan_pattern": "%PORT%",
+ },
+ {
+ "kavlan_pattern": "ethernet1/1/%PORT%:1",
"kind": "node",
"ports": [
{
@@ -80,85 +83,191 @@
},
{
},
- {
- },
- {
- },
- {
- },
- {
- },
{
"kind": "node",
"port": "eth0",
- "snmp_name": "41",
+ "snmp_name": "ethernet1/1/37:1",
"uid": "drac-1"
},
{
"kind": "node",
"port": "eth0",
- "snmp_name": "42",
+ "snmp_name": "ethernet1/1/38:1",
"uid": "drac-2"
},
{
"kind": "node",
"port": "eth0",
- "snmp_name": "43",
+ "snmp_name": "ethernet1/1/39:1",
"uid": "drac-3"
},
{
"kind": "node",
"port": "eth0",
- "snmp_name": "44",
+ "snmp_name": "ethernet1/1/40:1",
"uid": "drac-4"
},
{
"kind": "node",
"port": "eth0",
- "snmp_name": "45",
+ "snmp_name": "ethernet1/1/41:1",
"uid": "drac-5"
},
{
"kind": "node",
"port": "eth0",
- "snmp_name": "46",
+ "snmp_name": "ethernet1/1/42:1",
"uid": "drac-6"
},
{
"kind": "node",
"port": "eth0",
- "snmp_name": "47",
+ "snmp_name": "ethernet1/1/43:1",
"uid": "drac-7"
},
{
"kind": "node",
"port": "eth0",
- "snmp_name": "48",
+ "snmp_name": "ethernet1/1/44:1",
"uid": "drac-8"
},
{
"kind": "node",
"port": "eth0",
- "snmp_name": "49",
+ "snmp_name": "ethernet1/1/45:1",
"uid": "drac-9"
},
{
"kind": "node",
"port": "eth0",
- "snmp_name": "50",
+ "snmp_name": "ethernet1/1/46:1",
"uid": "drac-10"
},
{
"kind": "node",
"port": "eth0",
- "snmp_name": "51",
+ "snmp_name": "ethernet1/1/47:1",
"uid": "drac-11"
},
{
"kind": "node",
"port": "eth0",
- "snmp_name": "52",
+ "snmp_name": "ethernet1/1/48:1",
"uid": "drac-12"
+ }
+ ],
+ "rate": 10000000000,
+ "snmp_pattern": "ethernet1/1/%PORT%:1"
+ },
+ {
+ "kavlan_pattern": "ethernet1/1/%PORT%:1",
+ "kind": "node",
+ "ports": [
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
},
{
},
@@ -238,12 +347,12 @@
},
{
"kind": "switch",
- "snmp_name": "91",
+ "snmp_name": "ethernet1/1/91:1",
"uid": "sw-aci-333"
}
],
"rate": 10000000000,
- "snmp_pattern": "%PORT%"
+ "snmp_pattern": "ethernet1/1/%PORT%:1"
}
],
"model": "Dell S5296F-ON",
@@ -252,5 +361,5 @@
"snmp_community": "public",
"type": "network_equipment",
"uid": "gw-new",
- "warranty": "N/A"
+ "warranty": "2027-11-03"
}
\ No newline at end of file
diff --git a/input/grid5000/sites/grenoble/clusters/drac/drac.yaml b/input/grid5000/sites/grenoble/clusters/drac/drac.yaml
index 10323d3199c82741ceacb4f7991f1ea1d24db573..d5ab0fdaa80442b33a8b2e02d322339a32f0153f 100644
--- a/input/grid5000/sites/grenoble/clusters/drac/drac.yaml
+++ b/input/grid5000/sites/grenoble/clusters/drac/drac.yaml
@@ -1,7 +1,7 @@
---
model: IBM PowerNV S822LC (8335-GTB)
created_at: 2020-10-05
-kavlan: false
+kavlan: true
exotic: true
queues:
- admin
diff --git a/input/grid5000/sites/grenoble/networks/gw-new.yaml b/input/grid5000/sites/grenoble/networks/gw-new.yaml
index f294c6a93abd2f8b2023923e86dd9be6fb37fd4d..0d09ca65b8d2481373088699bf035eeaf05706f1 100644
--- a/input/grid5000/sites/grenoble/networks/gw-new.yaml
+++ b/input/grid5000/sites/grenoble/networks/gw-new.yaml
@@ -2,30 +2,106 @@
gw-new:
role: production
model: Dell S5296F-ON
+ warranty: "2027-11-03"
kind: switch
site: grenoble
- warranty: N/A
snmp_community: public
ip: 172.16.31.252
+ backplane_bps: 6400000000000
linecards:
- 0:
- snmp_pattern: "%PORT%"
- kavlan_pattern: "%PORT%"
+ 1: # Les noeuds en 10Gb/s
+ snmp_pattern: "ethernet1/1/%PORT%:1"
+ kavlan_pattern: "ethernet1/1/%PORT%:1"
kind: node
rate: 10000000000
ports:
- 41: drac-1
- 42: drac-2
- 43: drac-3
- 44: drac-4
- 45: drac-5
- 46: drac-6
- 47: drac-7
- 48: drac-8
- 49: drac-9
- 50: drac-10
- 51: drac-11
- 52: drac-12
+ #1: dahu-1
+ #2: dahu-2
+ #3: dahu-3
+ #4: dahu-4
+ #5: dahu-5
+ #6: dahu-6
+ #7: dahu-7
+ #8: dahu-8
+ #9: dahu-9
+ #10: dahu-10
+ #11: dahu-11
+ #12: dahu-12
+ #13: dahu-13
+ #14: dahu-14
+ #15: dahu-15
+ #16: dahu-16
+ #17: dahu-17
+ #18: dahu-18
+ #19: dahu-19
+ #20: dahu-20
+ #21: dahu-21
+ #22: dahu-22
+ #23: dahu-23
+ #24: dahu-24
+ #25: dahu-25
+ #26: dahu-26
+ #27: dahu-27
+ #28: dahu-28
+ #29: dahu-29
+ #30: dahu-30
+ #31: dahu-31
+ #32: dahu-32
+ #33: yeti-1
+ #34: yeti-2
+ #35: yeti-3
+ #36: yeti-4
+ 37: drac-1
+ 38: drac-2
+ 39: drac-3
+ 40: drac-4
+ 41: drac-5
+ 42: drac-6
+ 43: drac-7
+ 44: drac-8
+ 45: drac-9
+ 46: drac-10
+ 47: drac-11
+ 48: drac-12
+ #2: # Les noeuds en 25Gb/s et les serveurs en 25Gb/s
+ #snmp_pattern: "ethernet1/1/%PORT%"
+ #kavlan_pattern: "ethernet1/1/%PORT%"
+ #kind: node
+ #rate: 25000000000
+ #ports:
+ #77: troll-1
+ #78: troll-2
+ #79: troll-3
+ #80: troll-4
+ #83:
+ # uid: port-channel10
+ # kind: channel
+ #84:
+ # uid: port-channel10
+ # kind: channel
+ 2: # 3 <----- Les serveurs en 10Gb/s et les uplinks
+ snmp_pattern: "ethernet1/1/%PORT%:1"
+ kavlan_pattern: "ethernet1/1/%PORT%:1"
+ kind: node
+ rate: 10000000000
+ ports:
+ #85: digsed-1 # lacp
+ #86: digsed-2 # lacp
+ #87: dighyp1 # lacp
+ #88: dighyp2 # lacp
+ #89: digwatt
+ #90: ACI-TN-G5K-EXT
91:
uid: sw-aci-333
kind: switch
+ #92: ACI-TN-G5K-EXT-1
+ #93: ACI-TN-G5K-EXT-2
+ #94: ACI-TN-G5K-EXT-3
+ #95: ACI-TN-G5K-EXT-4
+ #96: RENATER-G5K-BACKBONE
+ #channels:
+ #port-channel10:
+ #uid: dignfs
+ #port: NA
+ #kind: server
+ #rate: 50000000000
diff --git a/input/grid5000/vlans.yaml b/input/grid5000/vlans.yaml
index a7e422da9240aadceb57082d659fa25ce010be42..3071ade7d3e5bc351505e0093e647c6f2a9a574f 100644
--- a/input/grid5000/vlans.yaml
+++ b/input/grid5000/vlans.yaml
@@ -64,6 +64,7 @@ vlans:
local grenoble yeti eth0 0 0 0 0
local grenoble dahu eth0 0 0 1 0
local grenoble troll eth0 0 0 2 0
+ local grenoble drac eth0 0 0 3 0
local lille chetemi eth0 0 0 0 0
local lille chetemi eth1 0 0 1 0
local lille chifflet eth0 0 0 2 0
@@ -126,6 +127,7 @@ vlans:
global lille chiclet eth0 0 0 5 0
global lille chiclet eth1 0 0 5 100
global grenoble troll eth0 0 0 6 0
+ global grenoble drac eth0 0 0 7 0
global lyon sagittaire eth1 0 0 8 0
global lyon taurus eth0 0 0 9 0
global lyon orion eth0 0 0 10 0
@@ -172,6 +174,7 @@ vlans:
routed grenoble yeti eth0 0 4 0 0
routed grenoble dahu eth0 0 4 1 0
routed grenoble troll eth0 0 4 2 0
+ routed grenoble drac eth0 0 4 3 0
routed lille chetemi eth0 0 8 0 0
routed lille chetemi eth1 0 8 1 0
routed lille chifflet eth0 0 8 2 0