From efd0307601d28c7cb2d686a967e8495589686e19 Mon Sep 17 00:00:00 2001
From: Lancelot Doan <lancelot.doan@inria.fr>
Date: Mon, 31 Mar 2025 10:51:06 +0200
Subject: [PATCH] [Grenoble][Chartreuse3] Add kavlan configuration

---
 .../clusters/chartreuse3/chartreuse3.json     |  2 +-
 .../chartreuse3/nodes/chartreuse3-1.json      | 46 ++++++++++++++++++-
 .../chartreuse3/nodes/chartreuse3-2.json      | 46 ++++++++++++++++++-
 .../chartreuse3/nodes/chartreuse3-3.json      | 46 ++++++++++++++++++-
 .../chartreuse3/nodes/chartreuse3-4.json      | 46 ++++++++++++++++++-
 .../clusters/chartreuse3/chartreuse3.yaml     |  2 +-
 6 files changed, 182 insertions(+), 6 deletions(-)

diff --git a/data/grid5000/sites/grenoble/clusters/chartreuse3/chartreuse3.json b/data/grid5000/sites/grenoble/clusters/chartreuse3/chartreuse3.json
index 1c81cf91723..1face6434c4 100644
--- a/data/grid5000/sites/grenoble/clusters/chartreuse3/chartreuse3.json
+++ b/data/grid5000/sites/grenoble/clusters/chartreuse3/chartreuse3.json
@@ -2,7 +2,7 @@
   "boot_type": "bios",
   "created_at": "Thu, 20 Mar 2025 00:00:00 GMT",
   "exotic": false,
-  "kavlan": false,
+  "kavlan": true,
   "manufactured_at": "2016-03-28",
   "metrics": [
     {
diff --git a/data/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-1.json b/data/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-1.json
index 89515f13314..d36a2a1782d 100644
--- a/data/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-1.json
+++ b/data/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-1.json
@@ -20,6 +20,50 @@
     "warranty_end": "2019-03-28"
   },
   "exotic": false,
+  "kavlan": {
+    "eth0": {
+      "kavlan-1": "192.168.198.9",
+      "kavlan-11": "10.7.247.9",
+      "kavlan-12": "10.11.247.9",
+      "kavlan-13": "10.15.247.9",
+      "kavlan-14": "10.19.247.9",
+      "kavlan-16": "10.27.247.9",
+      "kavlan-17": "10.31.247.9",
+      "kavlan-18": "10.35.247.9",
+      "kavlan-2": "192.168.214.9",
+      "kavlan-20": "10.43.247.9",
+      "kavlan-21": "10.47.247.9",
+      "kavlan-3": "192.168.230.9",
+      "kavlan-4": "10.4.7.9",
+      "kavlan-5": "10.4.71.9",
+      "kavlan-6": "10.4.135.9",
+      "kavlan-7": "10.4.199.9",
+      "kavlan-8": "10.5.7.9",
+      "kavlan-9": "10.5.71.9"
+    }
+  },
+  "kavlan6": {
+    "eth0": {
+      "kavlan-1": "2001:660:4406:180:b::9",
+      "kavlan-11": "2001:660:4406:1a0:10b::9",
+      "kavlan-12": "2001:660:4406:2a0:10b::9",
+      "kavlan-13": "2001:660:4406:4a0:10b::9",
+      "kavlan-14": "2001:660:4406:5a0:10b::9",
+      "kavlan-16": "2001:660:4406:7a0:10b::9",
+      "kavlan-17": "2001:660:4406:9a0:10b::9",
+      "kavlan-18": "2001:660:4406:8a0:10b::9",
+      "kavlan-2": "2001:660:4406:181:b::9",
+      "kavlan-20": "2001:660:4406:3a0:10b::9",
+      "kavlan-21": "2001:660:4406:6a0:10b::9",
+      "kavlan-3": "2001:660:4406:182:b::9",
+      "kavlan-4": "2001:660:4406:190:b::9",
+      "kavlan-5": "2001:660:4406:191:b::9",
+      "kavlan-6": "2001:660:4406:192:b::9",
+      "kavlan-7": "2001:660:4406:193:b::9",
+      "kavlan-8": "2001:660:4406:194:b::9",
+      "kavlan-9": "2001:660:4406:195:b::9"
+    }
+  },
   "main_memory": {
     "ram_size": 68719476736
   },
@@ -60,7 +104,7 @@
       "interface": "Ethernet",
       "ip": "172.16.26.9",
       "ip6": "2001:660:4406:100:b::9",
-      "kavlan": false,
+      "kavlan": true,
       "mac": "00:8c:fa:fd:6f:b6",
       "management": false,
       "model": "82599ES 10-Gigabit SFI/SFP+ Network Connection",
diff --git a/data/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-2.json b/data/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-2.json
index e4e7de88b80..2e3eff7caac 100644
--- a/data/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-2.json
+++ b/data/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-2.json
@@ -20,6 +20,50 @@
     "warranty_end": "2019-03-28"
   },
   "exotic": false,
+  "kavlan": {
+    "eth0": {
+      "kavlan-1": "192.168.198.10",
+      "kavlan-11": "10.7.247.10",
+      "kavlan-12": "10.11.247.10",
+      "kavlan-13": "10.15.247.10",
+      "kavlan-14": "10.19.247.10",
+      "kavlan-16": "10.27.247.10",
+      "kavlan-17": "10.31.247.10",
+      "kavlan-18": "10.35.247.10",
+      "kavlan-2": "192.168.214.10",
+      "kavlan-20": "10.43.247.10",
+      "kavlan-21": "10.47.247.10",
+      "kavlan-3": "192.168.230.10",
+      "kavlan-4": "10.4.7.10",
+      "kavlan-5": "10.4.71.10",
+      "kavlan-6": "10.4.135.10",
+      "kavlan-7": "10.4.199.10",
+      "kavlan-8": "10.5.7.10",
+      "kavlan-9": "10.5.71.10"
+    }
+  },
+  "kavlan6": {
+    "eth0": {
+      "kavlan-1": "2001:660:4406:180:b::a",
+      "kavlan-11": "2001:660:4406:1a0:10b::a",
+      "kavlan-12": "2001:660:4406:2a0:10b::a",
+      "kavlan-13": "2001:660:4406:4a0:10b::a",
+      "kavlan-14": "2001:660:4406:5a0:10b::a",
+      "kavlan-16": "2001:660:4406:7a0:10b::a",
+      "kavlan-17": "2001:660:4406:9a0:10b::a",
+      "kavlan-18": "2001:660:4406:8a0:10b::a",
+      "kavlan-2": "2001:660:4406:181:b::a",
+      "kavlan-20": "2001:660:4406:3a0:10b::a",
+      "kavlan-21": "2001:660:4406:6a0:10b::a",
+      "kavlan-3": "2001:660:4406:182:b::a",
+      "kavlan-4": "2001:660:4406:190:b::a",
+      "kavlan-5": "2001:660:4406:191:b::a",
+      "kavlan-6": "2001:660:4406:192:b::a",
+      "kavlan-7": "2001:660:4406:193:b::a",
+      "kavlan-8": "2001:660:4406:194:b::a",
+      "kavlan-9": "2001:660:4406:195:b::a"
+    }
+  },
   "main_memory": {
     "ram_size": 68719476736
   },
@@ -60,7 +104,7 @@
       "interface": "Ethernet",
       "ip": "172.16.26.10",
       "ip6": "2001:660:4406:100:b::a",
-      "kavlan": false,
+      "kavlan": true,
       "mac": "00:8c:fa:fe:97:4c",
       "management": false,
       "model": "82599ES 10-Gigabit SFI/SFP+ Network Connection",
diff --git a/data/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-3.json b/data/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-3.json
index 8b76e10af76..1c15072503a 100644
--- a/data/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-3.json
+++ b/data/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-3.json
@@ -20,6 +20,50 @@
     "warranty_end": "2019-03-28"
   },
   "exotic": false,
+  "kavlan": {
+    "eth0": {
+      "kavlan-1": "192.168.198.11",
+      "kavlan-11": "10.7.247.11",
+      "kavlan-12": "10.11.247.11",
+      "kavlan-13": "10.15.247.11",
+      "kavlan-14": "10.19.247.11",
+      "kavlan-16": "10.27.247.11",
+      "kavlan-17": "10.31.247.11",
+      "kavlan-18": "10.35.247.11",
+      "kavlan-2": "192.168.214.11",
+      "kavlan-20": "10.43.247.11",
+      "kavlan-21": "10.47.247.11",
+      "kavlan-3": "192.168.230.11",
+      "kavlan-4": "10.4.7.11",
+      "kavlan-5": "10.4.71.11",
+      "kavlan-6": "10.4.135.11",
+      "kavlan-7": "10.4.199.11",
+      "kavlan-8": "10.5.7.11",
+      "kavlan-9": "10.5.71.11"
+    }
+  },
+  "kavlan6": {
+    "eth0": {
+      "kavlan-1": "2001:660:4406:180:b::b",
+      "kavlan-11": "2001:660:4406:1a0:10b::b",
+      "kavlan-12": "2001:660:4406:2a0:10b::b",
+      "kavlan-13": "2001:660:4406:4a0:10b::b",
+      "kavlan-14": "2001:660:4406:5a0:10b::b",
+      "kavlan-16": "2001:660:4406:7a0:10b::b",
+      "kavlan-17": "2001:660:4406:9a0:10b::b",
+      "kavlan-18": "2001:660:4406:8a0:10b::b",
+      "kavlan-2": "2001:660:4406:181:b::b",
+      "kavlan-20": "2001:660:4406:3a0:10b::b",
+      "kavlan-21": "2001:660:4406:6a0:10b::b",
+      "kavlan-3": "2001:660:4406:182:b::b",
+      "kavlan-4": "2001:660:4406:190:b::b",
+      "kavlan-5": "2001:660:4406:191:b::b",
+      "kavlan-6": "2001:660:4406:192:b::b",
+      "kavlan-7": "2001:660:4406:193:b::b",
+      "kavlan-8": "2001:660:4406:194:b::b",
+      "kavlan-9": "2001:660:4406:195:b::b"
+    }
+  },
   "main_memory": {
     "ram_size": 68719476736
   },
@@ -60,7 +104,7 @@
       "interface": "Ethernet",
       "ip": "172.16.26.11",
       "ip6": "2001:660:4406:100:b::b",
-      "kavlan": false,
+      "kavlan": true,
       "mac": "00:8c:fa:fd:7c:ac",
       "management": false,
       "model": "82599ES 10-Gigabit SFI/SFP+ Network Connection",
diff --git a/data/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-4.json b/data/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-4.json
index efaf6dcb46d..c82fb405864 100644
--- a/data/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-4.json
+++ b/data/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-4.json
@@ -20,6 +20,50 @@
     "warranty_end": "2019-03-28"
   },
   "exotic": false,
+  "kavlan": {
+    "eth0": {
+      "kavlan-1": "192.168.198.12",
+      "kavlan-11": "10.7.247.12",
+      "kavlan-12": "10.11.247.12",
+      "kavlan-13": "10.15.247.12",
+      "kavlan-14": "10.19.247.12",
+      "kavlan-16": "10.27.247.12",
+      "kavlan-17": "10.31.247.12",
+      "kavlan-18": "10.35.247.12",
+      "kavlan-2": "192.168.214.12",
+      "kavlan-20": "10.43.247.12",
+      "kavlan-21": "10.47.247.12",
+      "kavlan-3": "192.168.230.12",
+      "kavlan-4": "10.4.7.12",
+      "kavlan-5": "10.4.71.12",
+      "kavlan-6": "10.4.135.12",
+      "kavlan-7": "10.4.199.12",
+      "kavlan-8": "10.5.7.12",
+      "kavlan-9": "10.5.71.12"
+    }
+  },
+  "kavlan6": {
+    "eth0": {
+      "kavlan-1": "2001:660:4406:180:b::c",
+      "kavlan-11": "2001:660:4406:1a0:10b::c",
+      "kavlan-12": "2001:660:4406:2a0:10b::c",
+      "kavlan-13": "2001:660:4406:4a0:10b::c",
+      "kavlan-14": "2001:660:4406:5a0:10b::c",
+      "kavlan-16": "2001:660:4406:7a0:10b::c",
+      "kavlan-17": "2001:660:4406:9a0:10b::c",
+      "kavlan-18": "2001:660:4406:8a0:10b::c",
+      "kavlan-2": "2001:660:4406:181:b::c",
+      "kavlan-20": "2001:660:4406:3a0:10b::c",
+      "kavlan-21": "2001:660:4406:6a0:10b::c",
+      "kavlan-3": "2001:660:4406:182:b::c",
+      "kavlan-4": "2001:660:4406:190:b::c",
+      "kavlan-5": "2001:660:4406:191:b::c",
+      "kavlan-6": "2001:660:4406:192:b::c",
+      "kavlan-7": "2001:660:4406:193:b::c",
+      "kavlan-8": "2001:660:4406:194:b::c",
+      "kavlan-9": "2001:660:4406:195:b::c"
+    }
+  },
   "main_memory": {
     "ram_size": 68719476736
   },
@@ -60,7 +104,7 @@
       "interface": "Ethernet",
       "ip": "172.16.26.12",
       "ip6": "2001:660:4406:100:b::c",
-      "kavlan": false,
+      "kavlan": true,
       "mac": "00:8c:fa:fe:9b:06",
       "management": false,
       "model": "82599ES 10-Gigabit SFI/SFP+ Network Connection",
diff --git a/input/grid5000/sites/grenoble/clusters/chartreuse3/chartreuse3.yaml b/input/grid5000/sites/grenoble/clusters/chartreuse3/chartreuse3.yaml
index d826a5eff0f..2a998153e86 100644
--- a/input/grid5000/sites/grenoble/clusters/chartreuse3/chartreuse3.yaml
+++ b/input/grid5000/sites/grenoble/clusters/chartreuse3/chartreuse3.yaml
@@ -1,7 +1,7 @@
 ---
 model: Dell PowerEdge C6320
 created_at: 2025-03-20
-kavlan: false
+kavlan: true
 boot_type: bios
 exotic: false 
 queues:
-- 
GitLab