From bdacc795fddf3320267f78fc02a7f2d7004834c5 Mon Sep 17 00:00:00 2001
From: Lancelot Doan <lancelot.doan@inria.fr>
Date: Fri, 21 Feb 2025 11:24:03 +0100
Subject: [PATCH] [Grenoble] Change interface name to pass tests
---
.../chartreuse2/nodes/chartreuse2-1.json | 26 +++++++++----------
.../chartreuse2/nodes/chartreuse2-2.json | 26 +++++++++----------
.../chartreuse2/nodes/chartreuse2-3.json | 26 +++++++++----------
.../chartreuse2/nodes/chartreuse2-4.json | 26 +++++++++----------
.../clusters/chartreuse2/chartreuse2.yaml | 2 +-
.../chartreuse2/nodes/chartreuse2-1.yaml | 2 +-
.../chartreuse2/nodes/chartreuse2-2.yaml | 2 +-
.../chartreuse2/nodes/chartreuse2-3.yaml | 2 +-
.../chartreuse2/nodes/chartreuse2-4.yaml | 2 +-
9 files changed, 57 insertions(+), 57 deletions(-)
diff --git a/data/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-1.json b/data/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-1.json
index a4de9c8bcbd..62f95e427c9 100644
--- a/data/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-1.json
+++ b/data/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-1.json
@@ -76,19 +76,7 @@
"vendor": "Intel"
},
{
- "device": "bmc",
- "enabled": true,
- "interface": "Ethernet",
- "ip": "172.17.26.5",
- "kavlan": false,
- "mac": "7c:d3:0a:bf:38:d8",
- "management": true,
- "mountable": false,
- "mounted": false,
- "network_address": "chartreuse2-1-bmc.grenoble.grid5000.fr"
- },
- {
- "device": "eno2",
+ "device": "eth1",
"driver": "ixgbe",
"enabled": false,
"firmware_version": "0x8000095e, 18.5.18",
@@ -103,6 +91,18 @@
"sriov": true,
"sriov_totalvfs": 63,
"vendor": "Intel"
+ },
+ {
+ "device": "bmc",
+ "enabled": true,
+ "interface": "Ethernet",
+ "ip": "172.17.26.5",
+ "kavlan": false,
+ "mac": "7c:d3:0a:bf:38:d8",
+ "management": true,
+ "mountable": false,
+ "mounted": false,
+ "network_address": "chartreuse2-1-bmc.grenoble.grid5000.fr"
}
],
"nodeset": "chartreuse2",
diff --git a/data/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-2.json b/data/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-2.json
index d2bfc332381..7adff7e1e30 100644
--- a/data/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-2.json
+++ b/data/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-2.json
@@ -76,19 +76,7 @@
"vendor": "Intel"
},
{
- "device": "bmc",
- "enabled": true,
- "interface": "Ethernet",
- "ip": "172.17.26.6",
- "kavlan": false,
- "mac": "7c:d3:0a:bf:40:28",
- "management": true,
- "mountable": false,
- "mounted": false,
- "network_address": "chartreuse2-2-bmc.grenoble.grid5000.fr"
- },
- {
- "device": "eno2",
+ "device": "eth1",
"driver": "ixgbe",
"enabled": false,
"firmware_version": "0x8000095e, 18.5.18",
@@ -103,6 +91,18 @@
"sriov": true,
"sriov_totalvfs": 63,
"vendor": "Intel"
+ },
+ {
+ "device": "bmc",
+ "enabled": true,
+ "interface": "Ethernet",
+ "ip": "172.17.26.6",
+ "kavlan": false,
+ "mac": "7c:d3:0a:bf:40:28",
+ "management": true,
+ "mountable": false,
+ "mounted": false,
+ "network_address": "chartreuse2-2-bmc.grenoble.grid5000.fr"
}
],
"nodeset": "chartreuse2",
diff --git a/data/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-3.json b/data/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-3.json
index 9f84ba23eae..1acec5f6925 100644
--- a/data/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-3.json
+++ b/data/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-3.json
@@ -76,19 +76,7 @@
"vendor": "Intel"
},
{
- "device": "bmc",
- "enabled": true,
- "interface": "Ethernet",
- "ip": "172.17.26.7",
- "kavlan": false,
- "mac": "7c:d3:0a:bf:41:0c",
- "management": true,
- "mountable": false,
- "mounted": false,
- "network_address": "chartreuse2-3-bmc.grenoble.grid5000.fr"
- },
- {
- "device": "eno2",
+ "device": "eth1",
"driver": "ixgbe",
"enabled": false,
"firmware_version": "0x8000095e, 18.5.18",
@@ -103,6 +91,18 @@
"sriov": true,
"sriov_totalvfs": 63,
"vendor": "Intel"
+ },
+ {
+ "device": "bmc",
+ "enabled": true,
+ "interface": "Ethernet",
+ "ip": "172.17.26.7",
+ "kavlan": false,
+ "mac": "7c:d3:0a:bf:41:0c",
+ "management": true,
+ "mountable": false,
+ "mounted": false,
+ "network_address": "chartreuse2-3-bmc.grenoble.grid5000.fr"
}
],
"nodeset": "chartreuse2",
diff --git a/data/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-4.json b/data/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-4.json
index 033e736499a..a07a6c0598e 100644
--- a/data/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-4.json
+++ b/data/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-4.json
@@ -76,19 +76,7 @@
"vendor": "Intel"
},
{
- "device": "bmc",
- "enabled": true,
- "interface": "Ethernet",
- "ip": "172.17.26.8",
- "kavlan": false,
- "mac": "7c:d3:0a:bf:3f:f2",
- "management": true,
- "mountable": false,
- "mounted": false,
- "network_address": "chartreuse2-4-bmc.grenoble.grid5000.fr"
- },
- {
- "device": "eno2",
+ "device": "eth1",
"driver": "ixgbe",
"enabled": false,
"firmware_version": "0x8000095e, 18.5.18",
@@ -103,6 +91,18 @@
"sriov": true,
"sriov_totalvfs": 63,
"vendor": "Intel"
+ },
+ {
+ "device": "bmc",
+ "enabled": true,
+ "interface": "Ethernet",
+ "ip": "172.17.26.8",
+ "kavlan": false,
+ "mac": "7c:d3:0a:bf:3f:f2",
+ "management": true,
+ "mountable": false,
+ "mounted": false,
+ "network_address": "chartreuse2-4-bmc.grenoble.grid5000.fr"
}
],
"nodeset": "chartreuse2",
diff --git a/input/grid5000/sites/grenoble/clusters/chartreuse2/chartreuse2.yaml b/input/grid5000/sites/grenoble/clusters/chartreuse2/chartreuse2.yaml
index f64a743ce2e..a719bea54fb 100644
--- a/input/grid5000/sites/grenoble/clusters/chartreuse2/chartreuse2.yaml
+++ b/input/grid5000/sites/grenoble/clusters/chartreuse2/chartreuse2.yaml
@@ -26,7 +26,7 @@ nodes:
enabled: true
mountable: true
mounted: true
- eno2:
+ eth1:
enabled: false
mountable: false
mounted: false
diff --git a/input/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-1.yaml b/input/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-1.yaml
index 2ee1c2f8999..7afeb44f74f 100644
--- a/input/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-1.yaml
+++ b/input/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-1.yaml
@@ -36,7 +36,7 @@ chartreuse2-1:
ip: 172.17.26.5
mac: 7c:d3:0a:bf:38:d8
management: true
- eno2:
+ eth1:
driver: ixgbe
firmware_version: 0x8000095e, 18.5.18
interface: Ethernet
diff --git a/input/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-2.yaml b/input/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-2.yaml
index d1718168844..c89accfb22c 100644
--- a/input/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-2.yaml
+++ b/input/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-2.yaml
@@ -36,7 +36,7 @@ chartreuse2-2:
ip: 172.17.26.6
mac: 7c:d3:0a:bf:40:28
management: true
- eno2:
+ eth1:
driver: ixgbe
firmware_version: 0x8000095e, 18.5.18
interface: Ethernet
diff --git a/input/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-3.yaml b/input/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-3.yaml
index 83dea645e99..123672288f4 100644
--- a/input/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-3.yaml
+++ b/input/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-3.yaml
@@ -36,7 +36,7 @@ chartreuse2-3:
ip: 172.17.26.7
mac: 7c:d3:0a:bf:41:0c
management: true
- eno2:
+ eth1:
driver: ixgbe
firmware_version: 0x8000095e, 18.5.18
interface: Ethernet
diff --git a/input/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-4.yaml b/input/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-4.yaml
index 517821b9a04..b142cf4dd75 100644
--- a/input/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-4.yaml
+++ b/input/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-4.yaml
@@ -36,7 +36,7 @@ chartreuse2-4:
ip: 172.17.26.8
mac: 7c:d3:0a:bf:3f:f2
management: true
- eno2:
+ eth1:
driver: ixgbe
firmware_version: 0x8000095e, 18.5.18
interface: Ethernet
--
GitLab