From d6ebe377dcfce9a161df7b28b06d37389277c2df Mon Sep 17 00:00:00 2001
From: Nathan Paulin <nathan.paulin@inria.fr>
Date: Mon, 10 Mar 2025 12:40:51 +0100
Subject: [PATCH] Revert "[sophia][mercantour5] add kavlan support" and regen
ref api
This reverts commit 3577ae9b021aaf57be094621c833d444c4225472.
---
.../clusters/mercantour5/mercantour5.json | 2 +-
.../mercantour5/nodes/mercantour5-1.json | 46 +------------------
.../mercantour5/nodes/mercantour5-2.json | 46 +------------------
.../mercantour5/nodes/mercantour5-3.json | 46 +------------------
.../mercantour5/nodes/mercantour5-4.json | 46 +------------------
.../clusters/mercantour5/mercantour5.yaml | 2 +-
6 files changed, 6 insertions(+), 182 deletions(-)
diff --git a/data/grid5000/sites/sophia/clusters/mercantour5/mercantour5.json b/data/grid5000/sites/sophia/clusters/mercantour5/mercantour5.json
index a7ffddbcf1c..a79050b46e8 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": true,
+ "kavlan": false,
"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 3e3c8c0cb61..125254f0292 100644
--- a/data/grid5000/sites/sophia/clusters/mercantour5/nodes/mercantour5-1.json
+++ b/data/grid5000/sites/sophia/clusters/mercantour5/nodes/mercantour5-1.json
@@ -20,50 +20,6 @@
"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
},
@@ -144,7 +100,7 @@
"interface": "Ethernet",
"ip": "172.16.130.42",
"ip6": "2001:660:4406:800:3::2a",
- "kavlan": true,
+ "kavlan": false,
"mac": "6c:2b:59:9c:4a:32",
"management": false,
"model": "I350 Gigabit Network Connection",
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 c9e9ea1ea84..a35e6e3e005 100644
--- a/data/grid5000/sites/sophia/clusters/mercantour5/nodes/mercantour5-2.json
+++ b/data/grid5000/sites/sophia/clusters/mercantour5/nodes/mercantour5-2.json
@@ -20,50 +20,6 @@
"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
},
@@ -144,7 +100,7 @@
"interface": "Ethernet",
"ip": "172.16.130.43",
"ip6": "2001:660:4406:800:3::2b",
- "kavlan": true,
+ "kavlan": false,
"mac": "6c:2b:59:9c:3f:3a",
"management": false,
"model": "I350 Gigabit Network Connection",
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 0775fe61000..15752317281 100644
--- a/data/grid5000/sites/sophia/clusters/mercantour5/nodes/mercantour5-3.json
+++ b/data/grid5000/sites/sophia/clusters/mercantour5/nodes/mercantour5-3.json
@@ -20,50 +20,6 @@
"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
},
@@ -144,7 +100,7 @@
"interface": "Ethernet",
"ip": "172.16.130.44",
"ip6": "2001:660:4406:800:3::2c",
- "kavlan": true,
+ "kavlan": false,
"mac": "6c:2b:59:9c:4a:6d",
"management": false,
"model": "I350 Gigabit Network Connection",
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 cb2d48c8683..64dd4dd3b74 100644
--- a/data/grid5000/sites/sophia/clusters/mercantour5/nodes/mercantour5-4.json
+++ b/data/grid5000/sites/sophia/clusters/mercantour5/nodes/mercantour5-4.json
@@ -20,50 +20,6 @@
"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
},
@@ -144,7 +100,7 @@
"interface": "Ethernet",
"ip": "172.16.130.45",
"ip6": "2001:660:4406:800:3::2d",
- "kavlan": true,
+ "kavlan": false,
"mac": "6c:2b:59:9a:05:c4",
"management": false,
"model": "I350 Gigabit Network Connection",
diff --git a/input/grid5000/sites/sophia/clusters/mercantour5/mercantour5.yaml b/input/grid5000/sites/sophia/clusters/mercantour5/mercantour5.yaml
index 2ce78d4a72b..902f4668da6 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: true
+kavlan: false
boot_type: bios
exotic: false
queues:
--
GitLab