From 020ff1a557c4db77aea131783f4d137e4f1bb782 Mon Sep 17 00:00:00 2001
From: Pierre Jacquot <pierre.jacquot@inria.fr>
Date: Tue, 19 Sep 2023 09:42:15 +0200
Subject: [PATCH] [toulouse][network] Rename gw-toulouse to gw by default.
---
.../sites/toulouse/clusters/montcalm/nodes/montcalm-1.json | 2 +-
.../sites/toulouse/clusters/montcalm/nodes/montcalm-2.json | 2 +-
.../sites/toulouse/clusters/montcalm/nodes/montcalm-3.json | 2 +-
.../sites/toulouse/clusters/montcalm/nodes/montcalm-4.json | 2 +-
.../sites/toulouse/clusters/montcalm/nodes/montcalm-5.json | 2 +-
.../sites/toulouse/clusters/montcalm/nodes/montcalm-6.json | 2 +-
.../sites/toulouse/clusters/montcalm/nodes/montcalm-7.json | 2 +-
.../sites/toulouse/clusters/montcalm/nodes/montcalm-8.json | 2 +-
.../sites/toulouse/clusters/montcalm/nodes/montcalm-9.json | 2 +-
.../toulouse/network_equipments/{gw-toulouse.json => gw.json} | 4 ++--
.../grid5000/sites/toulouse/network_equipments/sw-estats.json | 2 +-
.../sites/toulouse/networks/{gw-toulouse.yaml => gw.yaml} | 4 ++--
input/grid5000/sites/toulouse/networks/sw-estats.yaml | 2 +-
13 files changed, 15 insertions(+), 15 deletions(-)
rename data/grid5000/sites/toulouse/network_equipments/{gw-toulouse.json => gw.json} (99%)
rename input/grid5000/sites/toulouse/networks/{gw-toulouse.yaml => gw.yaml} (99%)
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 83f00e0e283..6b759b87a7a 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 b1e5fa24022..f87b5554de1 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 f91f29a4e22..d695905a353 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 ff0abafbd74..fca311e50a4 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 5298b450814..e307f8e7010 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 91a67f0a97e..3e850624006 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 85b7f66fba8..1c85a0ac666 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 2f804d54690..e621a88959d 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 f31c9819836..8547070f6ed 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 835c72a6d69..302a1ca1715 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 901fbb7420e..ba032581818 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 008d02960a9..f66dcfdffc7 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 48e4fc3d1f8..cc71d708903 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
--
GitLab