diff --git a/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-1.json b/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-1.json
index 83f00e0e283162ad05f701d6010b97fdecf56c0d..6b759b87a7a081cde4085011856d06390307e5b7 100644
--- a/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-1.json
+++ b/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-1.json
@@ -133,7 +133,7 @@
"rate": 10000000000,
"sriov": false,
"sriov_totalvfs": 0,
- "switch": "gw-toulouse",
+ "switch": "gw",
"switch_port": "1/1/1",
"vendor": "Broadcom Inc. and subsidiaries"
},
diff --git a/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-2.json b/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-2.json
index b1e5fa240222a424a727a58cc9dee2f24271ce8a..f87b5554de1caaaace045ce605c17da40b30ccf3 100644
--- a/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-2.json
+++ b/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-2.json
@@ -133,7 +133,7 @@
"rate": 10000000000,
"sriov": false,
"sriov_totalvfs": 0,
- "switch": "gw-toulouse",
+ "switch": "gw",
"switch_port": "1/1/2",
"vendor": "Broadcom Inc. and subsidiaries"
},
diff --git a/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-3.json b/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-3.json
index f91f29a4e220e08df34165e2cb51bd02e49c5797..d695905a353eaa12370963af47e3af135a7fb744 100644
--- a/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-3.json
+++ b/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-3.json
@@ -133,7 +133,7 @@
"rate": 10000000000,
"sriov": false,
"sriov_totalvfs": 0,
- "switch": "gw-toulouse",
+ "switch": "gw",
"switch_port": "1/1/3",
"vendor": "Broadcom Inc. and subsidiaries"
},
diff --git a/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-4.json b/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-4.json
index ff0abafbd74d82f2ef6176295f5dafd465de699a..fca311e50a4bdf5cd249ddc8f07fd34c31e44b1d 100644
--- a/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-4.json
+++ b/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-4.json
@@ -133,7 +133,7 @@
"rate": 10000000000,
"sriov": false,
"sriov_totalvfs": 0,
- "switch": "gw-toulouse",
+ "switch": "gw",
"switch_port": "1/1/4",
"vendor": "Broadcom Inc. and subsidiaries"
},
diff --git a/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-5.json b/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-5.json
index 5298b4508141a20cdbeebd8ca4969a1900a5faa7..e307f8e701015626f7154363052c2a432495589c 100644
--- a/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-5.json
+++ b/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-5.json
@@ -133,7 +133,7 @@
"rate": 10000000000,
"sriov": false,
"sriov_totalvfs": 0,
- "switch": "gw-toulouse",
+ "switch": "gw",
"switch_port": "1/1/5",
"vendor": "Broadcom Inc. and subsidiaries"
},
diff --git a/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-6.json b/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-6.json
index 91a67f0a97e26a7b746329e722a8edde8d7792db..3e8506240067b8cffc03fa23edfa0ee2b6384eed 100644
--- a/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-6.json
+++ b/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-6.json
@@ -133,7 +133,7 @@
"rate": 10000000000,
"sriov": false,
"sriov_totalvfs": 0,
- "switch": "gw-toulouse",
+ "switch": "gw",
"switch_port": "1/1/6",
"vendor": "Broadcom Inc. and subsidiaries"
},
diff --git a/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-7.json b/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-7.json
index 85b7f66fba814c9c1e56c9507a9f05fa40567819..1c85a0ac666a4027e1a55b242ec60d2fc68eab87 100644
--- a/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-7.json
+++ b/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-7.json
@@ -133,7 +133,7 @@
"rate": 10000000000,
"sriov": false,
"sriov_totalvfs": 0,
- "switch": "gw-toulouse",
+ "switch": "gw",
"switch_port": "1/1/7",
"vendor": "Broadcom Inc. and subsidiaries"
},
diff --git a/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-8.json b/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-8.json
index 2f804d54690523dee934a7ceff016ec533f1da61..e621a88959dedcca6686959e0992a3c7483e8240 100644
--- a/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-8.json
+++ b/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-8.json
@@ -133,7 +133,7 @@
"rate": 10000000000,
"sriov": false,
"sriov_totalvfs": 0,
- "switch": "gw-toulouse",
+ "switch": "gw",
"switch_port": "1/1/8",
"vendor": "Broadcom Inc. and subsidiaries"
},
diff --git a/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-9.json b/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-9.json
index f31c9819836fe2707da1efe339e49df355f7eadc..8547070f6edccbbb281feefdc4b6db6ed2f20d79 100644
--- a/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-9.json
+++ b/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-9.json
@@ -133,7 +133,7 @@
"rate": 10000000000,
"sriov": false,
"sriov_totalvfs": 0,
- "switch": "gw-toulouse",
+ "switch": "gw",
"switch_port": "1/1/9",
"vendor": "Broadcom Inc. and subsidiaries"
},
diff --git a/data/grid5000/sites/toulouse/network_equipments/gw-toulouse.json b/data/grid5000/sites/toulouse/network_equipments/gw.json
similarity index 99%
rename from data/grid5000/sites/toulouse/network_equipments/gw-toulouse.json
rename to data/grid5000/sites/toulouse/network_equipments/gw.json
index 835c72a6d699431ebfc440a908acf4e43d1ff0bf..302a1ca1715b6ce0e4e9043aa3e6715dfdfcd1e9 100644
--- a/data/grid5000/sites/toulouse/network_equipments/gw-toulouse.json
+++ b/data/grid5000/sites/toulouse/network_equipments/gw.json
@@ -1,6 +1,6 @@
{
"alias": [
- "gw"
+ "gw-toulouse"
],
"channels": {
"port-channel1": {
@@ -136,7 +136,7 @@
"site": "toulouse",
"snmp_community": "g5kadmin",
"type": "network_equipment",
- "uid": "gw-toulouse",
+ "uid": "gw",
"vlans": {
"vlan100": {
"addresses": [
diff --git a/data/grid5000/sites/toulouse/network_equipments/sw-estats.json b/data/grid5000/sites/toulouse/network_equipments/sw-estats.json
index 901fbb7420eab516c5ed8b3b53eda9f8a9af6f58..ba0325818188384e2134d7314c45080618fbd5c1 100644
--- a/data/grid5000/sites/toulouse/network_equipments/sw-estats.json
+++ b/data/grid5000/sites/toulouse/network_equipments/sw-estats.json
@@ -7,7 +7,7 @@
"kind": "router",
"port": "port-channel2",
"rate": 20000000000,
- "uid": "gw-toulouse"
+ "uid": "gw"
}
},
"ip": "172.17.127.252",
diff --git a/input/grid5000/sites/toulouse/networks/gw-toulouse.yaml b/input/grid5000/sites/toulouse/networks/gw.yaml
similarity index 99%
rename from input/grid5000/sites/toulouse/networks/gw-toulouse.yaml
rename to input/grid5000/sites/toulouse/networks/gw.yaml
index 008d02960a94dafa52074d24ef221468b4036e9e..f66dcfdffc72969be367b0532821035c82e7fca0 100644
--- a/input/grid5000/sites/toulouse/networks/gw-toulouse.yaml
+++ b/input/grid5000/sites/toulouse/networks/gw.yaml
@@ -1,9 +1,9 @@
---
-gw-toulouse:
+gw:
model: Aruba 6300
serial: SG27KMX1X6
alias:
- - gw
+ - gw-toulouse
ip: 172.17.127.254
ip6: 2001:660:4406:900::ffff:ffff
kind: router
diff --git a/input/grid5000/sites/toulouse/networks/sw-estats.yaml b/input/grid5000/sites/toulouse/networks/sw-estats.yaml
index 48e4fc3d1f8f7d4360953306f707b9c5abe43508..cc71d708903174e4ca3111f20e3ce9c1ad090985 100644
--- a/input/grid5000/sites/toulouse/networks/sw-estats.yaml
+++ b/input/grid5000/sites/toulouse/networks/sw-estats.yaml
@@ -36,7 +36,7 @@ sw-estats:
kind: channel
channels:
port-channel1:
- uid: gw-toulouse
+ uid: gw
kind: router
rate: 20000000000
port: port-channel2