From 405d1a616be35e60a336bca5e1293d871e8d57a0 Mon Sep 17 00:00:00 2001
From: PENVEN Loris <loris.penven@irisa.fr>
Date: Wed, 6 Nov 2024 15:25:41 +0100
Subject: [PATCH] [Strasbourg][network] Renamed gw-strasbourg into gw
---
data/grid5000/accesses/refrepo.json | 40 +++++++++----------
.../fleckenstein/nodes/fleckenstein-1.json | 4 +-
.../fleckenstein/nodes/fleckenstein-10.json | 4 +-
.../fleckenstein/nodes/fleckenstein-2.json | 4 +-
.../fleckenstein/nodes/fleckenstein-3.json | 4 +-
.../fleckenstein/nodes/fleckenstein-4.json | 4 +-
.../fleckenstein/nodes/fleckenstein-5.json | 4 +-
.../fleckenstein/nodes/fleckenstein-6.json | 4 +-
.../fleckenstein/nodes/fleckenstein-7.json | 4 +-
.../fleckenstein/nodes/fleckenstein-8.json | 4 +-
.../fleckenstein/nodes/fleckenstein-9.json | 4 +-
.../{gw-strasbourg.json => gw.json} | 5 ++-
.../{gw-strasbourg.yml => gw-strasbourg.yaml} | 4 +-
13 files changed, 47 insertions(+), 42 deletions(-)
rename data/grid5000/sites/strasbourg/network_equipments/{gw-strasbourg.json => gw.json} (99%)
rename input/grid5000/sites/strasbourg/networks/{gw-strasbourg.yml => gw-strasbourg.yaml} (98%)
diff --git a/data/grid5000/accesses/refrepo.json b/data/grid5000/accesses/refrepo.json
index a895f8a47f1..cd964bc87ac 100644
--- a/data/grid5000/accesses/refrepo.json
+++ b/data/grid5000/accesses/refrepo.json
@@ -138638,7 +138638,7 @@
"rate": 25000000000,
"sriov": true,
"sriov_totalvfs": 128,
- "switch": "gw-strasbourg",
+ "switch": "gw",
"switch_port": "Ethernet6",
"vendor": "Intel"
},
@@ -138678,7 +138678,7 @@
"rate": 25000000000,
"sriov": true,
"sriov_totalvfs": 64,
- "switch": "gw-strasbourg",
+ "switch": "gw",
"switch_port": "Ethernet8",
"vendor": "Intel"
},
@@ -138926,7 +138926,7 @@
"rate": 25000000000,
"sriov": true,
"sriov_totalvfs": 128,
- "switch": "gw-strasbourg",
+ "switch": "gw",
"switch_port": "Ethernet33",
"vendor": "Intel"
},
@@ -138966,7 +138966,7 @@
"rate": 25000000000,
"sriov": true,
"sriov_totalvfs": 64,
- "switch": "gw-strasbourg",
+ "switch": "gw",
"switch_port": "Ethernet35",
"vendor": "Intel"
},
@@ -139214,7 +139214,7 @@
"rate": 25000000000,
"sriov": true,
"sriov_totalvfs": 128,
- "switch": "gw-strasbourg",
+ "switch": "gw",
"switch_port": "Ethernet9",
"vendor": "Intel"
},
@@ -139254,7 +139254,7 @@
"rate": 25000000000,
"sriov": true,
"sriov_totalvfs": 64,
- "switch": "gw-strasbourg",
+ "switch": "gw",
"switch_port": "Ethernet11",
"vendor": "Intel"
},
@@ -139502,7 +139502,7 @@
"rate": 25000000000,
"sriov": true,
"sriov_totalvfs": 128,
- "switch": "gw-strasbourg",
+ "switch": "gw",
"switch_port": "Ethernet12",
"vendor": "Intel"
},
@@ -139542,7 +139542,7 @@
"rate": 25000000000,
"sriov": true,
"sriov_totalvfs": 64,
- "switch": "gw-strasbourg",
+ "switch": "gw",
"switch_port": "Ethernet14",
"vendor": "Intel"
},
@@ -139790,7 +139790,7 @@
"rate": 25000000000,
"sriov": true,
"sriov_totalvfs": 128,
- "switch": "gw-strasbourg",
+ "switch": "gw",
"switch_port": "Ethernet15",
"vendor": "Intel"
},
@@ -139830,7 +139830,7 @@
"rate": 25000000000,
"sriov": true,
"sriov_totalvfs": 64,
- "switch": "gw-strasbourg",
+ "switch": "gw",
"switch_port": "Ethernet17",
"vendor": "Intel"
},
@@ -140078,7 +140078,7 @@
"rate": 25000000000,
"sriov": true,
"sriov_totalvfs": 128,
- "switch": "gw-strasbourg",
+ "switch": "gw",
"switch_port": "Ethernet18",
"vendor": "Intel"
},
@@ -140118,7 +140118,7 @@
"rate": 25000000000,
"sriov": true,
"sriov_totalvfs": 64,
- "switch": "gw-strasbourg",
+ "switch": "gw",
"switch_port": "Ethernet20",
"vendor": "Intel"
},
@@ -140366,7 +140366,7 @@
"rate": 25000000000,
"sriov": true,
"sriov_totalvfs": 128,
- "switch": "gw-strasbourg",
+ "switch": "gw",
"switch_port": "Ethernet21",
"vendor": "Intel"
},
@@ -140406,7 +140406,7 @@
"rate": 25000000000,
"sriov": true,
"sriov_totalvfs": 64,
- "switch": "gw-strasbourg",
+ "switch": "gw",
"switch_port": "Ethernet23",
"vendor": "Intel"
},
@@ -140654,7 +140654,7 @@
"rate": 25000000000,
"sriov": true,
"sriov_totalvfs": 128,
- "switch": "gw-strasbourg",
+ "switch": "gw",
"switch_port": "Ethernet24",
"vendor": "Intel"
},
@@ -140694,7 +140694,7 @@
"rate": 25000000000,
"sriov": true,
"sriov_totalvfs": 64,
- "switch": "gw-strasbourg",
+ "switch": "gw",
"switch_port": "Ethernet26",
"vendor": "Intel"
},
@@ -140942,7 +140942,7 @@
"rate": 25000000000,
"sriov": true,
"sriov_totalvfs": 128,
- "switch": "gw-strasbourg",
+ "switch": "gw",
"switch_port": "Ethernet27",
"vendor": "Intel"
},
@@ -140982,7 +140982,7 @@
"rate": 25000000000,
"sriov": true,
"sriov_totalvfs": 64,
- "switch": "gw-strasbourg",
+ "switch": "gw",
"switch_port": "Ethernet29",
"vendor": "Intel"
},
@@ -141230,7 +141230,7 @@
"rate": 25000000000,
"sriov": true,
"sriov_totalvfs": 128,
- "switch": "gw-strasbourg",
+ "switch": "gw",
"switch_port": "Ethernet30",
"vendor": "Intel"
},
@@ -141270,7 +141270,7 @@
"rate": 25000000000,
"sriov": true,
"sriov_totalvfs": 64,
- "switch": "gw-strasbourg",
+ "switch": "gw",
"switch_port": "Ethernet32",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-1.json b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-1.json
index 3c34e10d3fe..77c936d8f37 100644
--- a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-1.json
+++ b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-1.json
@@ -131,7 +131,7 @@
"rate": 25000000000,
"sriov": true,
"sriov_totalvfs": 128,
- "switch": "gw-strasbourg",
+ "switch": "gw",
"switch_port": "Ethernet6",
"vendor": "Intel"
},
@@ -171,7 +171,7 @@
"rate": 25000000000,
"sriov": true,
"sriov_totalvfs": 64,
- "switch": "gw-strasbourg",
+ "switch": "gw",
"switch_port": "Ethernet8",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-10.json b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-10.json
index 4512bd4f01a..bb7ce44ecf1 100644
--- a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-10.json
+++ b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-10.json
@@ -131,7 +131,7 @@
"rate": 25000000000,
"sriov": true,
"sriov_totalvfs": 128,
- "switch": "gw-strasbourg",
+ "switch": "gw",
"switch_port": "Ethernet33",
"vendor": "Intel"
},
@@ -171,7 +171,7 @@
"rate": 25000000000,
"sriov": true,
"sriov_totalvfs": 64,
- "switch": "gw-strasbourg",
+ "switch": "gw",
"switch_port": "Ethernet35",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-2.json b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-2.json
index 9e336c81ad4..ff533d95d92 100644
--- a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-2.json
+++ b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-2.json
@@ -131,7 +131,7 @@
"rate": 25000000000,
"sriov": true,
"sriov_totalvfs": 128,
- "switch": "gw-strasbourg",
+ "switch": "gw",
"switch_port": "Ethernet9",
"vendor": "Intel"
},
@@ -171,7 +171,7 @@
"rate": 25000000000,
"sriov": true,
"sriov_totalvfs": 64,
- "switch": "gw-strasbourg",
+ "switch": "gw",
"switch_port": "Ethernet11",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-3.json b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-3.json
index 440a96a3ca1..7953f3c117a 100644
--- a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-3.json
+++ b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-3.json
@@ -131,7 +131,7 @@
"rate": 25000000000,
"sriov": true,
"sriov_totalvfs": 128,
- "switch": "gw-strasbourg",
+ "switch": "gw",
"switch_port": "Ethernet12",
"vendor": "Intel"
},
@@ -171,7 +171,7 @@
"rate": 25000000000,
"sriov": true,
"sriov_totalvfs": 64,
- "switch": "gw-strasbourg",
+ "switch": "gw",
"switch_port": "Ethernet14",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-4.json b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-4.json
index 0ec69e33201..c839410efeb 100644
--- a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-4.json
+++ b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-4.json
@@ -131,7 +131,7 @@
"rate": 25000000000,
"sriov": true,
"sriov_totalvfs": 128,
- "switch": "gw-strasbourg",
+ "switch": "gw",
"switch_port": "Ethernet15",
"vendor": "Intel"
},
@@ -171,7 +171,7 @@
"rate": 25000000000,
"sriov": true,
"sriov_totalvfs": 64,
- "switch": "gw-strasbourg",
+ "switch": "gw",
"switch_port": "Ethernet17",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-5.json b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-5.json
index 576af02a218..a808345bec8 100644
--- a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-5.json
+++ b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-5.json
@@ -131,7 +131,7 @@
"rate": 25000000000,
"sriov": true,
"sriov_totalvfs": 128,
- "switch": "gw-strasbourg",
+ "switch": "gw",
"switch_port": "Ethernet18",
"vendor": "Intel"
},
@@ -171,7 +171,7 @@
"rate": 25000000000,
"sriov": true,
"sriov_totalvfs": 64,
- "switch": "gw-strasbourg",
+ "switch": "gw",
"switch_port": "Ethernet20",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-6.json b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-6.json
index 00a046fb01b..48db3c6aae7 100644
--- a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-6.json
+++ b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-6.json
@@ -131,7 +131,7 @@
"rate": 25000000000,
"sriov": true,
"sriov_totalvfs": 128,
- "switch": "gw-strasbourg",
+ "switch": "gw",
"switch_port": "Ethernet21",
"vendor": "Intel"
},
@@ -171,7 +171,7 @@
"rate": 25000000000,
"sriov": true,
"sriov_totalvfs": 64,
- "switch": "gw-strasbourg",
+ "switch": "gw",
"switch_port": "Ethernet23",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-7.json b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-7.json
index e0d6c02a98a..663ace0da17 100644
--- a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-7.json
+++ b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-7.json
@@ -131,7 +131,7 @@
"rate": 25000000000,
"sriov": true,
"sriov_totalvfs": 128,
- "switch": "gw-strasbourg",
+ "switch": "gw",
"switch_port": "Ethernet24",
"vendor": "Intel"
},
@@ -171,7 +171,7 @@
"rate": 25000000000,
"sriov": true,
"sriov_totalvfs": 64,
- "switch": "gw-strasbourg",
+ "switch": "gw",
"switch_port": "Ethernet26",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-8.json b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-8.json
index 5e5de10d705..2f6de45ffae 100644
--- a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-8.json
+++ b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-8.json
@@ -131,7 +131,7 @@
"rate": 25000000000,
"sriov": true,
"sriov_totalvfs": 128,
- "switch": "gw-strasbourg",
+ "switch": "gw",
"switch_port": "Ethernet27",
"vendor": "Intel"
},
@@ -171,7 +171,7 @@
"rate": 25000000000,
"sriov": true,
"sriov_totalvfs": 64,
- "switch": "gw-strasbourg",
+ "switch": "gw",
"switch_port": "Ethernet29",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-9.json b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-9.json
index 8acfd8cc8e0..9bf49f9076d 100644
--- a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-9.json
+++ b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-9.json
@@ -131,7 +131,7 @@
"rate": 25000000000,
"sriov": true,
"sriov_totalvfs": 128,
- "switch": "gw-strasbourg",
+ "switch": "gw",
"switch_port": "Ethernet30",
"vendor": "Intel"
},
@@ -171,7 +171,7 @@
"rate": 25000000000,
"sriov": true,
"sriov_totalvfs": 64,
- "switch": "gw-strasbourg",
+ "switch": "gw",
"switch_port": "Ethernet32",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/strasbourg/network_equipments/gw-strasbourg.json b/data/grid5000/sites/strasbourg/network_equipments/gw.json
similarity index 99%
rename from data/grid5000/sites/strasbourg/network_equipments/gw-strasbourg.json
rename to data/grid5000/sites/strasbourg/network_equipments/gw.json
index 838a2a6771f..f90ff89e0b1 100644
--- a/data/grid5000/sites/strasbourg/network_equipments/gw-strasbourg.json
+++ b/data/grid5000/sites/strasbourg/network_equipments/gw.json
@@ -1,4 +1,7 @@
{
+ "alias": [
+ "gw-strasbourg"
+ ],
"channels": {
"port-channel1": {
"kind": "server",
@@ -192,7 +195,7 @@
"site": "strasbourg",
"snmp_community": "Unknown",
"type": "network_equipment",
- "uid": "gw-strasbourg",
+ "uid": "gw",
"vlans": {
"vlan100": {
"addresses": [
diff --git a/input/grid5000/sites/strasbourg/networks/gw-strasbourg.yml b/input/grid5000/sites/strasbourg/networks/gw-strasbourg.yaml
similarity index 98%
rename from input/grid5000/sites/strasbourg/networks/gw-strasbourg.yml
rename to input/grid5000/sites/strasbourg/networks/gw-strasbourg.yaml
index 915f6e41173..857a08764f3 100644
--- a/input/grid5000/sites/strasbourg/networks/gw-strasbourg.yml
+++ b/input/grid5000/sites/strasbourg/networks/gw-strasbourg.yaml
@@ -1,5 +1,5 @@
---
-gw-strasbourg:
+gw:
model: wedge100bf_32x
serial: AM26029251
ip: 172.17.175.254
@@ -8,6 +8,8 @@ gw-strasbourg:
managed_by_us: true
site: strasbourg
snmp_community: Unknown
+ alias:
+ - gw-strasbourg
vlans:
"vlan100":
administrative: yes
--
GitLab