From fc626bd985f8a8f47d8c22ea2afe32b30cd6a1bf Mon Sep 17 00:00:00 2001
From: Laurent Pouilloux <laurent.pouilloux@inria.fr>
Date: Tue, 4 Feb 2025 13:12:13 +0100
Subject: [PATCH] [sophia][mercantour2] fix some mistake in network description
---
.../mercantour2/nodes/mercantour2-3.json | 2 +-
.../mercantour2/nodes/mercantour2-4.json | 2 +-
.../mercantour2/nodes/mercantour2-7.json | 2 +-
.../mercantour2/nodes/mercantour2-8.json | 2 +-
.../sites/sophia/network_equipments/sw-3.json | 16 ++++++++--------
input/grid5000/sites/sophia/networks/sw-3.yaml | 10 +++++-----
6 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-3.json b/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-3.json
index 6f4361b6dd0..8426cdac5d1 100644
--- a/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-3.json
+++ b/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-3.json
@@ -132,7 +132,7 @@
"sriov": true,
"sriov_totalvfs": 7,
"switch": "sw-3",
- "switch_port": "1/1/13",
+ "switch_port": "1/1/15",
"vendor": "Intel"
},
{
diff --git a/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-4.json b/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-4.json
index 3de7706dc5a..0f4dd4ddba0 100644
--- a/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-4.json
+++ b/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-4.json
@@ -132,7 +132,7 @@
"sriov": true,
"sriov_totalvfs": 7,
"switch": "sw-3",
- "switch_port": "1/1/14",
+ "switch_port": "1/1/16",
"vendor": "Intel"
},
{
diff --git a/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-7.json b/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-7.json
index 3d01c5f739b..cefa627d64f 100644
--- a/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-7.json
+++ b/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-7.json
@@ -132,7 +132,7 @@
"sriov": true,
"sriov_totalvfs": 7,
"switch": "sw-3",
- "switch_port": "1/1/11",
+ "switch_port": "1/1/13",
"vendor": "Intel"
},
{
diff --git a/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-8.json b/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-8.json
index 236af42fdc3..b578d782997 100644
--- a/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-8.json
+++ b/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-8.json
@@ -132,7 +132,7 @@
"sriov": true,
"sriov_totalvfs": 7,
"switch": "sw-3",
- "switch_port": "1/1/12",
+ "switch_port": "1/1/14",
"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 1dcb7c3eb37..e180495f99e 100644
--- a/data/grid5000/sites/sophia/network_equipments/sw-3.json
+++ b/data/grid5000/sites/sophia/network_equipments/sw-3.json
@@ -70,28 +70,32 @@
"snmp_name": "1/1/10",
"uid": "mercantour1-4"
},
+ {
+ },
+ {
+ },
{
"kind": "node",
"port": "eth0",
- "snmp_name": "1/1/11",
+ "snmp_name": "1/1/13",
"uid": "mercantour2-7"
},
{
"kind": "node",
"port": "eth0",
- "snmp_name": "1/1/12",
+ "snmp_name": "1/1/14",
"uid": "mercantour2-8"
},
{
"kind": "node",
"port": "eth0",
- "snmp_name": "1/1/13",
+ "snmp_name": "1/1/15",
"uid": "mercantour2-3"
},
{
"kind": "node",
"port": "eth0",
- "snmp_name": "1/1/14",
+ "snmp_name": "1/1/16",
"uid": "mercantour2-4"
},
{
@@ -126,10 +130,6 @@
},
{
},
- {
- },
- {
- },
{
"kind": "node",
"port": "eth0",
diff --git a/input/grid5000/sites/sophia/networks/sw-3.yaml b/input/grid5000/sites/sophia/networks/sw-3.yaml
index 2c834cd05f6..4a2e66db011 100644
--- a/input/grid5000/sites/sophia/networks/sw-3.yaml
+++ b/input/grid5000/sites/sophia/networks/sw-3.yaml
@@ -34,13 +34,13 @@ sw-3:
uid: mercantour1-3
10:
uid: mercantour1-4
- 11:
- uid: mercantour2-7
- 12:
- uid: mercantour2-8
13:
- uid: mercantour2-3
+ uid: mercantour2-7
14:
+ uid: mercantour2-8
+ 15:
+ uid: mercantour2-3
+ 16:
uid: mercantour2-4
33:
uid: mercantour2-2
--
GitLab