From 61db84affb990552762b6178d798cddc58ffc3a4 Mon Sep 17 00:00:00 2001
From: Laurent Pouilloux <laurent.pouilloux@inria.fr>
Date: Mon, 10 Mar 2025 14:51:53 +0100
Subject: [PATCH] [nancy][grvingt] fix inconsistency in network description
---
.../sites/nancy/clusters/grvingt/nodes/grvingt-39.json | 2 +-
.../sites/nancy/clusters/grvingt/nodes/grvingt-40.json | 2 +-
.../sites/nancy/clusters/grvingt/nodes/grvingt-44.json | 2 +-
data/grid5000/sites/nancy/network_equipments/sgrvingt.json | 6 +++---
input/grid5000/sites/nancy/networks/sgrvingt.yaml | 6 +++---
5 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-39.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-39.json
index 0a4aa113255..9b01acf5e19 100644
--- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-39.json
+++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-39.json
@@ -156,7 +156,7 @@
"sriov": false,
"sriov_totalvfs": 0,
"switch": "sgrvingt",
- "switch_port": "TenGigabitEthernet 1/19",
+ "switch_port": "TenGigabitEthernet 1/20",
"vendor": "Intel"
},
{
diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-40.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-40.json
index b59d4dbc00f..26e0fb8b711 100644
--- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-40.json
+++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-40.json
@@ -156,7 +156,7 @@
"sriov": false,
"sriov_totalvfs": 0,
"switch": "sgrvingt",
- "switch_port": "TenGigabitEthernet 1/49/1",
+ "switch_port": "TenGigabitEthernet 1/19",
"vendor": "Intel"
},
{
diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-44.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-44.json
index ae6e0dda3c5..6c856b106c9 100644
--- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-44.json
+++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-44.json
@@ -156,7 +156,7 @@
"sriov": false,
"sriov_totalvfs": 0,
"switch": "sgrvingt",
- "switch_port": "TenGigabitEthernet 1/20",
+ "switch_port": "TenGigabitEthernet 1/49/1",
"vendor": "Intel"
},
{
diff --git a/data/grid5000/sites/nancy/network_equipments/sgrvingt.json b/data/grid5000/sites/nancy/network_equipments/sgrvingt.json
index 5782b0fb588..8803878fd5c 100644
--- a/data/grid5000/sites/nancy/network_equipments/sgrvingt.json
+++ b/data/grid5000/sites/nancy/network_equipments/sgrvingt.json
@@ -123,13 +123,13 @@
"kind": "node",
"port": "eth0",
"snmp_name": "TenGigabitEthernet 1/19",
- "uid": "grvingt-39"
+ "uid": "grvingt-40"
},
{
"kind": "node",
"port": "eth0",
"snmp_name": "TenGigabitEthernet 1/20",
- "uid": "grvingt-44"
+ "uid": "grvingt-39"
},
{
"kind": "node",
@@ -406,7 +406,7 @@
"kind": "node",
"port": "eth0",
"snmp_name": "TenGigabitEthernet 1/49/1",
- "uid": "grvingt-40"
+ "uid": "grvingt-44"
},
{
"kind": "node",
diff --git a/input/grid5000/sites/nancy/networks/sgrvingt.yaml b/input/grid5000/sites/nancy/networks/sgrvingt.yaml
index bd28880f80f..c34ffa91db7 100644
--- a/input/grid5000/sites/nancy/networks/sgrvingt.yaml
+++ b/input/grid5000/sites/nancy/networks/sgrvingt.yaml
@@ -83,8 +83,8 @@ sgrvingt:
16: grvingt-32
17: grvingt-35
18: grvingt-36
- 19: grvingt-39
- 20: grvingt-44
+ 19: grvingt-40
+ 20: grvingt-39
21: grvingt-38
22: grvingt-37
24: grvingt-34
@@ -122,7 +122,7 @@ sgrvingt:
kind: node
rate: 10000000000
ports:
- 1: grvingt-40
+ 1: grvingt-44
2: grvingt-43
3: grvingt-48
4: grvingt-47
--
GitLab