From 0ffa4a4ff3354a0e599f48d23cd42a66de07ae1b Mon Sep 17 00:00:00 2001
From: Patrice RINGOT <patrice.ringot@loria.fr>
Date: Fri, 1 Dec 2023 10:36:06 +0100
Subject: [PATCH] [nancy] move grvingt-41,42,45,46 from the last breakout port
of sgrvingt to normal ports
---
.../clusters/grvingt/nodes/grvingt-41.json | 2 +-
.../clusters/grvingt/nodes/grvingt-42.json | 2 +-
.../clusters/grvingt/nodes/grvingt-45.json | 2 +-
.../clusters/grvingt/nodes/grvingt-46.json | 2 +-
.../nancy/network_equipments/sgrvingt.json | 50 ++++++-------------
.../sites/nancy/networks/sgrvingt.yaml | 14 ++----
6 files changed, 24 insertions(+), 48 deletions(-)
diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-41.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-41.json
index a5ad1d07c92..a8d72381130 100644
--- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-41.json
+++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-41.json
@@ -154,7 +154,7 @@
"sriov": false,
"sriov_totalvfs": 0,
"switch": "sgrvingt",
- "switch_port": "TenGigabitEthernet 1/54/2",
+ "switch_port": "TenGigabitEthernet 1/41",
"vendor": "Intel"
},
{
diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-42.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-42.json
index 021e661200f..76901631f09 100644
--- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-42.json
+++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-42.json
@@ -154,7 +154,7 @@
"sriov": false,
"sriov_totalvfs": 0,
"switch": "sgrvingt",
- "switch_port": "TenGigabitEthernet 1/54/1",
+ "switch_port": "TenGigabitEthernet 1/42",
"vendor": "Intel"
},
{
diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-45.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-45.json
index cf957a7207e..56610d59dae 100644
--- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-45.json
+++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-45.json
@@ -154,7 +154,7 @@
"sriov": false,
"sriov_totalvfs": 0,
"switch": "sgrvingt",
- "switch_port": "TenGigabitEthernet 1/54/4",
+ "switch_port": "TenGigabitEthernet 1/47",
"vendor": "Intel"
},
{
diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-46.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-46.json
index d88af99f5e6..b8f25a46071 100644
--- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-46.json
+++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-46.json
@@ -154,7 +154,7 @@
"sriov": false,
"sriov_totalvfs": 0,
"switch": "sgrvingt",
- "switch_port": "TenGigabitEthernet 1/54/3",
+ "switch_port": "TenGigabitEthernet 1/46",
"vendor": "Intel"
},
{
diff --git a/data/grid5000/sites/nancy/network_equipments/sgrvingt.json b/data/grid5000/sites/nancy/network_equipments/sgrvingt.json
index e8f818cb80e..d6d71f8ce1b 100644
--- a/data/grid5000/sites/nancy/network_equipments/sgrvingt.json
+++ b/data/grid5000/sites/nancy/network_equipments/sgrvingt.json
@@ -252,8 +252,16 @@
"uid": "grvingt-2"
},
{
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "TenGigabitEthernet 1/41",
+ "uid": "grvingt-41"
},
{
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "TenGigabitEthernet 1/42",
+ "uid": "grvingt-42"
},
{
"kind": "server",
@@ -268,8 +276,16 @@
{
},
{
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "TenGigabitEthernet 1/46",
+ "uid": "grvingt-46"
},
{
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "TenGigabitEthernet 1/47",
+ "uid": "grvingt-45"
},
{
"kind": "router",
@@ -543,40 +559,6 @@
],
"rate": 10000000000,
"snmp_pattern": "TenGigabitEthernet 1/%LINECARD%/%PORT%"
- },
- {
- "kavlan_pattern": "TenGigabitEthernet1/%LINECARD%/%PORT%",
- "kind": "node",
- "ports": [
- {
- },
- {
- "kind": "node",
- "port": "eth0",
- "snmp_name": "TenGigabitEthernet 1/54/1",
- "uid": "grvingt-42"
- },
- {
- "kind": "node",
- "port": "eth0",
- "snmp_name": "TenGigabitEthernet 1/54/2",
- "uid": "grvingt-41"
- },
- {
- "kind": "node",
- "port": "eth0",
- "snmp_name": "TenGigabitEthernet 1/54/3",
- "uid": "grvingt-46"
- },
- {
- "kind": "node",
- "port": "eth0",
- "snmp_name": "TenGigabitEthernet 1/54/4",
- "uid": "grvingt-45"
- }
- ],
- "rate": 10000000000,
- "snmp_pattern": "TenGigabitEthernet 1/%LINECARD%/%PORT%"
}
],
"managed_by_us": true,
diff --git a/input/grid5000/sites/nancy/networks/sgrvingt.yaml b/input/grid5000/sites/nancy/networks/sgrvingt.yaml
index d0f4ed94aa6..3b432971f23 100644
--- a/input/grid5000/sites/nancy/networks/sgrvingt.yaml
+++ b/input/grid5000/sites/nancy/networks/sgrvingt.yaml
@@ -104,12 +104,16 @@ sgrvingt:
38: grvingt-6
39: grvingt-1
40: grvingt-2
+ 41: grvingt-41
+ 42: grvingt-42
43:
uid: grvingt-srv
kind: server
44:
uid: wurst
kind: server
+ 46: grvingt-46
+ 47: grvingt-45
48:
uid: gw
kind: router
@@ -163,13 +167,3 @@ sgrvingt:
2: grvingt-59
3: grvingt-64
4: grvingt-63
- 54:
- snmp_pattern: "TenGigabitEthernet 1/%LINECARD%/%PORT%"
- kavlan_pattern: "TenGigabitEthernet1/%LINECARD%/%PORT%"
- kind: node
- rate: 10000000000
- ports:
- 1: grvingt-42
- 2: grvingt-41
- 3: grvingt-46
- 4: grvingt-45
--
GitLab