diff --git a/data/grid5000/sites/sophia/clusters/mercantour5/mercantour5.json b/data/grid5000/sites/sophia/clusters/mercantour5/mercantour5.json
index a79050b46e8ca8b545b92027c7894e692f4454a3..a7ffddbcf1ca84036cab6ed45e1744034e3782eb 100644
--- a/data/grid5000/sites/sophia/clusters/mercantour5/mercantour5.json
+++ b/data/grid5000/sites/sophia/clusters/mercantour5/mercantour5.json
@@ -2,7 +2,7 @@
"boot_type": "bios",
"created_at": "Mon, 24 Feb 2025 00:00:00 GMT",
"exotic": false,
- "kavlan": false,
+ "kavlan": true,
"manufactured_at": "2019-07-30",
"metrics": [
{
diff --git a/data/grid5000/sites/sophia/clusters/mercantour5/nodes/mercantour5-1.json b/data/grid5000/sites/sophia/clusters/mercantour5/nodes/mercantour5-1.json
index 9384cc8f0e343239229aec58ebd6fc6e25a1f007..3e3c8c0cb61f654e8c284eb994f1cd486fb843c8 100644
--- a/data/grid5000/sites/sophia/clusters/mercantour5/nodes/mercantour5-1.json
+++ b/data/grid5000/sites/sophia/clusters/mercantour5/nodes/mercantour5-1.json
@@ -20,6 +20,50 @@
"warranty_end": "2026-07-31"
},
"exotic": false,
+ "kavlan": {
+ "eth0": {
+ "kavlan-1": "192.168.196.42",
+ "kavlan-11": "10.7.229.42",
+ "kavlan-12": "10.11.229.42",
+ "kavlan-13": "10.15.229.42",
+ "kavlan-14": "10.19.229.42",
+ "kavlan-16": "10.27.229.42",
+ "kavlan-17": "10.31.229.42",
+ "kavlan-18": "10.35.229.42",
+ "kavlan-2": "192.168.212.42",
+ "kavlan-20": "10.43.229.42",
+ "kavlan-21": "10.47.229.42",
+ "kavlan-3": "192.168.228.42",
+ "kavlan-4": "10.32.4.42",
+ "kavlan-5": "10.32.68.42",
+ "kavlan-6": "10.32.132.42",
+ "kavlan-7": "10.32.196.42",
+ "kavlan-8": "10.33.4.42",
+ "kavlan-9": "10.33.68.42"
+ }
+ },
+ "kavlan6": {
+ "eth0": {
+ "kavlan-1": "2001:660:4406:880:3::2a",
+ "kavlan-11": "2001:660:4406:1a0:803::2a",
+ "kavlan-12": "2001:660:4406:2a0:803::2a",
+ "kavlan-13": "2001:660:4406:4a0:803::2a",
+ "kavlan-14": "2001:660:4406:5a0:803::2a",
+ "kavlan-16": "2001:660:4406:7a0:803::2a",
+ "kavlan-17": "2001:660:4406:9a0:803::2a",
+ "kavlan-18": "2001:660:4406:8a0:803::2a",
+ "kavlan-2": "2001:660:4406:881:3::2a",
+ "kavlan-20": "2001:660:4406:3a0:803::2a",
+ "kavlan-21": "2001:660:4406:6a0:803::2a",
+ "kavlan-3": "2001:660:4406:882:3::2a",
+ "kavlan-4": "2001:660:4406:890:3::2a",
+ "kavlan-5": "2001:660:4406:891:3::2a",
+ "kavlan-6": "2001:660:4406:892:3::2a",
+ "kavlan-7": "2001:660:4406:893:3::2a",
+ "kavlan-8": "2001:660:4406:894:3::2a",
+ "kavlan-9": "2001:660:4406:895:3::2a"
+ }
+ },
"main_memory": {
"ram_size": 412316860416
},
@@ -100,7 +144,7 @@
"interface": "Ethernet",
"ip": "172.16.130.42",
"ip6": "2001:660:4406:800:3::2a",
- "kavlan": false,
+ "kavlan": true,
"mac": "6c:2b:59:9c:4a:32",
"management": false,
"model": "I350 Gigabit Network Connection",
@@ -111,8 +155,8 @@
"rate": 1000000000,
"sriov": false,
"sriov_totalvfs": 0,
- "switch": null,
- "switch_port": null,
+ "switch": "sw-3",
+ "switch_port": "1/1/28",
"vendor": "Intel"
},
{
diff --git a/data/grid5000/sites/sophia/clusters/mercantour5/nodes/mercantour5-2.json b/data/grid5000/sites/sophia/clusters/mercantour5/nodes/mercantour5-2.json
index b648466782b289b0511a6c90518bf1ff5ee3f54f..c9e9ea1ea84a313f22f5e7e0e12761e6eed639ba 100644
--- a/data/grid5000/sites/sophia/clusters/mercantour5/nodes/mercantour5-2.json
+++ b/data/grid5000/sites/sophia/clusters/mercantour5/nodes/mercantour5-2.json
@@ -20,6 +20,50 @@
"warranty_end": "2026-07-31"
},
"exotic": false,
+ "kavlan": {
+ "eth0": {
+ "kavlan-1": "192.168.196.43",
+ "kavlan-11": "10.7.229.43",
+ "kavlan-12": "10.11.229.43",
+ "kavlan-13": "10.15.229.43",
+ "kavlan-14": "10.19.229.43",
+ "kavlan-16": "10.27.229.43",
+ "kavlan-17": "10.31.229.43",
+ "kavlan-18": "10.35.229.43",
+ "kavlan-2": "192.168.212.43",
+ "kavlan-20": "10.43.229.43",
+ "kavlan-21": "10.47.229.43",
+ "kavlan-3": "192.168.228.43",
+ "kavlan-4": "10.32.4.43",
+ "kavlan-5": "10.32.68.43",
+ "kavlan-6": "10.32.132.43",
+ "kavlan-7": "10.32.196.43",
+ "kavlan-8": "10.33.4.43",
+ "kavlan-9": "10.33.68.43"
+ }
+ },
+ "kavlan6": {
+ "eth0": {
+ "kavlan-1": "2001:660:4406:880:3::2b",
+ "kavlan-11": "2001:660:4406:1a0:803::2b",
+ "kavlan-12": "2001:660:4406:2a0:803::2b",
+ "kavlan-13": "2001:660:4406:4a0:803::2b",
+ "kavlan-14": "2001:660:4406:5a0:803::2b",
+ "kavlan-16": "2001:660:4406:7a0:803::2b",
+ "kavlan-17": "2001:660:4406:9a0:803::2b",
+ "kavlan-18": "2001:660:4406:8a0:803::2b",
+ "kavlan-2": "2001:660:4406:881:3::2b",
+ "kavlan-20": "2001:660:4406:3a0:803::2b",
+ "kavlan-21": "2001:660:4406:6a0:803::2b",
+ "kavlan-3": "2001:660:4406:882:3::2b",
+ "kavlan-4": "2001:660:4406:890:3::2b",
+ "kavlan-5": "2001:660:4406:891:3::2b",
+ "kavlan-6": "2001:660:4406:892:3::2b",
+ "kavlan-7": "2001:660:4406:893:3::2b",
+ "kavlan-8": "2001:660:4406:894:3::2b",
+ "kavlan-9": "2001:660:4406:895:3::2b"
+ }
+ },
"main_memory": {
"ram_size": 412316860416
},
@@ -100,7 +144,7 @@
"interface": "Ethernet",
"ip": "172.16.130.43",
"ip6": "2001:660:4406:800:3::2b",
- "kavlan": false,
+ "kavlan": true,
"mac": "6c:2b:59:9c:3f:3a",
"management": false,
"model": "I350 Gigabit Network Connection",
@@ -111,8 +155,8 @@
"rate": 1000000000,
"sriov": false,
"sriov_totalvfs": 0,
- "switch": null,
- "switch_port": null,
+ "switch": "sw-3",
+ "switch_port": "1/1/29",
"vendor": "Intel"
},
{
diff --git a/data/grid5000/sites/sophia/clusters/mercantour5/nodes/mercantour5-3.json b/data/grid5000/sites/sophia/clusters/mercantour5/nodes/mercantour5-3.json
index d422da1116bb8f2f031d1eceb9835fa7148cfe3c..0775fe61000f1db15ad692db9d077d5f9b0b617f 100644
--- a/data/grid5000/sites/sophia/clusters/mercantour5/nodes/mercantour5-3.json
+++ b/data/grid5000/sites/sophia/clusters/mercantour5/nodes/mercantour5-3.json
@@ -20,6 +20,50 @@
"warranty_end": "2026-07-31"
},
"exotic": false,
+ "kavlan": {
+ "eth0": {
+ "kavlan-1": "192.168.196.44",
+ "kavlan-11": "10.7.229.44",
+ "kavlan-12": "10.11.229.44",
+ "kavlan-13": "10.15.229.44",
+ "kavlan-14": "10.19.229.44",
+ "kavlan-16": "10.27.229.44",
+ "kavlan-17": "10.31.229.44",
+ "kavlan-18": "10.35.229.44",
+ "kavlan-2": "192.168.212.44",
+ "kavlan-20": "10.43.229.44",
+ "kavlan-21": "10.47.229.44",
+ "kavlan-3": "192.168.228.44",
+ "kavlan-4": "10.32.4.44",
+ "kavlan-5": "10.32.68.44",
+ "kavlan-6": "10.32.132.44",
+ "kavlan-7": "10.32.196.44",
+ "kavlan-8": "10.33.4.44",
+ "kavlan-9": "10.33.68.44"
+ }
+ },
+ "kavlan6": {
+ "eth0": {
+ "kavlan-1": "2001:660:4406:880:3::2c",
+ "kavlan-11": "2001:660:4406:1a0:803::2c",
+ "kavlan-12": "2001:660:4406:2a0:803::2c",
+ "kavlan-13": "2001:660:4406:4a0:803::2c",
+ "kavlan-14": "2001:660:4406:5a0:803::2c",
+ "kavlan-16": "2001:660:4406:7a0:803::2c",
+ "kavlan-17": "2001:660:4406:9a0:803::2c",
+ "kavlan-18": "2001:660:4406:8a0:803::2c",
+ "kavlan-2": "2001:660:4406:881:3::2c",
+ "kavlan-20": "2001:660:4406:3a0:803::2c",
+ "kavlan-21": "2001:660:4406:6a0:803::2c",
+ "kavlan-3": "2001:660:4406:882:3::2c",
+ "kavlan-4": "2001:660:4406:890:3::2c",
+ "kavlan-5": "2001:660:4406:891:3::2c",
+ "kavlan-6": "2001:660:4406:892:3::2c",
+ "kavlan-7": "2001:660:4406:893:3::2c",
+ "kavlan-8": "2001:660:4406:894:3::2c",
+ "kavlan-9": "2001:660:4406:895:3::2c"
+ }
+ },
"main_memory": {
"ram_size": 412316860416
},
@@ -100,7 +144,7 @@
"interface": "Ethernet",
"ip": "172.16.130.44",
"ip6": "2001:660:4406:800:3::2c",
- "kavlan": false,
+ "kavlan": true,
"mac": "6c:2b:59:9c:4a:6d",
"management": false,
"model": "I350 Gigabit Network Connection",
@@ -111,8 +155,8 @@
"rate": 1000000000,
"sriov": false,
"sriov_totalvfs": 0,
- "switch": null,
- "switch_port": null,
+ "switch": "sw-3",
+ "switch_port": "1/1/30",
"vendor": "Intel"
},
{
diff --git a/data/grid5000/sites/sophia/clusters/mercantour5/nodes/mercantour5-4.json b/data/grid5000/sites/sophia/clusters/mercantour5/nodes/mercantour5-4.json
index 38d1ba9b7101ae308d91b0c1c3fb619bdb4f2b54..cb2d48c8683ba20e84c29378b65cb6a2584c09ce 100644
--- a/data/grid5000/sites/sophia/clusters/mercantour5/nodes/mercantour5-4.json
+++ b/data/grid5000/sites/sophia/clusters/mercantour5/nodes/mercantour5-4.json
@@ -20,6 +20,50 @@
"warranty_end": "2026-07-31"
},
"exotic": false,
+ "kavlan": {
+ "eth0": {
+ "kavlan-1": "192.168.196.45",
+ "kavlan-11": "10.7.229.45",
+ "kavlan-12": "10.11.229.45",
+ "kavlan-13": "10.15.229.45",
+ "kavlan-14": "10.19.229.45",
+ "kavlan-16": "10.27.229.45",
+ "kavlan-17": "10.31.229.45",
+ "kavlan-18": "10.35.229.45",
+ "kavlan-2": "192.168.212.45",
+ "kavlan-20": "10.43.229.45",
+ "kavlan-21": "10.47.229.45",
+ "kavlan-3": "192.168.228.45",
+ "kavlan-4": "10.32.4.45",
+ "kavlan-5": "10.32.68.45",
+ "kavlan-6": "10.32.132.45",
+ "kavlan-7": "10.32.196.45",
+ "kavlan-8": "10.33.4.45",
+ "kavlan-9": "10.33.68.45"
+ }
+ },
+ "kavlan6": {
+ "eth0": {
+ "kavlan-1": "2001:660:4406:880:3::2d",
+ "kavlan-11": "2001:660:4406:1a0:803::2d",
+ "kavlan-12": "2001:660:4406:2a0:803::2d",
+ "kavlan-13": "2001:660:4406:4a0:803::2d",
+ "kavlan-14": "2001:660:4406:5a0:803::2d",
+ "kavlan-16": "2001:660:4406:7a0:803::2d",
+ "kavlan-17": "2001:660:4406:9a0:803::2d",
+ "kavlan-18": "2001:660:4406:8a0:803::2d",
+ "kavlan-2": "2001:660:4406:881:3::2d",
+ "kavlan-20": "2001:660:4406:3a0:803::2d",
+ "kavlan-21": "2001:660:4406:6a0:803::2d",
+ "kavlan-3": "2001:660:4406:882:3::2d",
+ "kavlan-4": "2001:660:4406:890:3::2d",
+ "kavlan-5": "2001:660:4406:891:3::2d",
+ "kavlan-6": "2001:660:4406:892:3::2d",
+ "kavlan-7": "2001:660:4406:893:3::2d",
+ "kavlan-8": "2001:660:4406:894:3::2d",
+ "kavlan-9": "2001:660:4406:895:3::2d"
+ }
+ },
"main_memory": {
"ram_size": 412316860416
},
@@ -100,7 +144,7 @@
"interface": "Ethernet",
"ip": "172.16.130.45",
"ip6": "2001:660:4406:800:3::2d",
- "kavlan": false,
+ "kavlan": true,
"mac": "6c:2b:59:9a:05:c4",
"management": false,
"model": "I350 Gigabit Network Connection",
@@ -111,8 +155,8 @@
"rate": 1000000000,
"sriov": false,
"sriov_totalvfs": 0,
- "switch": null,
- "switch_port": null,
+ "switch": "sw-3",
+ "switch_port": "1/1/31",
"vendor": "Intel"
},
{
diff --git a/data/grid5000/sites/sophia/network_equipments/sw-3.json b/data/grid5000/sites/sophia/network_equipments/sw-3.json
index 3b1b3036123e918ccfa892ee6a3fac3747e936e9..828c2915f276fca8282a6421c119e6a6d1064523 100644
--- a/data/grid5000/sites/sophia/network_equipments/sw-3.json
+++ b/data/grid5000/sites/sophia/network_equipments/sw-3.json
@@ -125,12 +125,28 @@
{
},
{
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "1/1/28",
+ "uid": "mercantour5-1"
},
{
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "1/1/29",
+ "uid": "mercantour5-2"
},
{
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "1/1/30",
+ "uid": "mercantour5-3"
},
{
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "1/1/31",
+ "uid": "mercantour5-4"
},
{
},
diff --git a/input/grid5000/sites/sophia/clusters/mercantour5/mercantour5.yaml b/input/grid5000/sites/sophia/clusters/mercantour5/mercantour5.yaml
index 5edcf3132f37eba6226514fcf43254e09bf8f7ba..2ce78d4a72b1015f93e50237ff9f0f455d53a413 100644
--- a/input/grid5000/sites/sophia/clusters/mercantour5/mercantour5.yaml
+++ b/input/grid5000/sites/sophia/clusters/mercantour5/mercantour5.yaml
@@ -1,7 +1,7 @@
---
model: Dell PowerEdge C6420
created_at: 2025-02-24
-kavlan: false #TO DO AFTER
+kavlan: true
boot_type: bios
exotic: false
queues:
diff --git a/input/grid5000/sites/sophia/networks/sw-3.yaml b/input/grid5000/sites/sophia/networks/sw-3.yaml
index b6c8c1fc0b83d48407e76c2e5b3f169bd60d6dce..0c2214f487a342ae7f2a892af60314b50b2089b8 100644
--- a/input/grid5000/sites/sophia/networks/sw-3.yaml
+++ b/input/grid5000/sites/sophia/networks/sw-3.yaml
@@ -44,6 +44,14 @@ sw-3:
uid: mercantour2-4
17:
uid: mercantour6-1
+ 28:
+ uid: mercantour5-1
+ 29:
+ uid: mercantour5-2
+ 30:
+ uid: mercantour5-3
+ 31:
+ uid: mercantour5-4
33:
uid: mercantour2-2
34: