diff --git a/data/grid5000/sites/lyon/network_equipments/bettie.json b/data/grid5000/sites/lyon/network_equipments/bettie.json
index adfc73a0bda0f0210611dcfd2768924f1d359a5c..5b2bbfb4f241c0104a28f2711afefaa7dc47ac01 100644
--- a/data/grid5000/sites/lyon/network_equipments/bettie.json
+++ b/data/grid5000/sites/lyon/network_equipments/bettie.json
@@ -159,7 +159,7 @@
{
"kind": "router",
"port": "5:17",
- "uid": "aspen-8810"
+ "uid": "gw-lyon"
}
],
"rate": 100000000
diff --git a/data/grid5000/sites/lyon/network_equipments/chris.json b/data/grid5000/sites/lyon/network_equipments/chris.json
index 205380eca88a9cb8848b5cf201ba253c288e8d4e..7474688829e46bfe3f0dfe8f48498731669c46f2 100644
--- a/data/grid5000/sites/lyon/network_equipments/chris.json
+++ b/data/grid5000/sites/lyon/network_equipments/chris.json
@@ -172,7 +172,7 @@
"kind": "router",
"port": "4:47",
"rate": 1000000000,
- "uid": "aspen-8810"
+ "uid": "gw-lyon"
}
],
"rate": 100000000
diff --git a/data/grid5000/sites/lyon/network_equipments/force10.json b/data/grid5000/sites/lyon/network_equipments/force10.json
index bc0c73996d37856015fa306999f0540d1bf7aaa9..0bb8141bbd66157b3d1477d23d436231e23eb7bb 100644
--- a/data/grid5000/sites/lyon/network_equipments/force10.json
+++ b/data/grid5000/sites/lyon/network_equipments/force10.json
@@ -140,7 +140,7 @@
{
"kind": "router",
"port": "9:2",
- "uid": "aspen-8810"
+ "uid": "gw-lyon"
}
],
"rate": 10000000000
@@ -158,7 +158,7 @@
"rate": 1000000000
}
],
- "model": "Force10 S4810P",
+ "model": "cisco",
"routes": {
},
diff --git a/data/grid5000/sites/lyon/network_equipments/aspen-8810.json b/data/grid5000/sites/lyon/network_equipments/gw-lyon.json
similarity index 99%
rename from data/grid5000/sites/lyon/network_equipments/aspen-8810.json
rename to data/grid5000/sites/lyon/network_equipments/gw-lyon.json
index d363ce734d586bd52bafea95b17ee66965163412..8599f04581832078a6bfcd8f9ca4f560ecf2471c 100644
--- a/data/grid5000/sites/lyon/network_equipments/aspen-8810.json
+++ b/data/grid5000/sites/lyon/network_equipments/gw-lyon.json
@@ -487,7 +487,7 @@
"site": "lyon",
"snmp_community": "public",
"type": "network_equipment",
- "uid": "aspen-8810",
+ "uid": "gw-lyon",
"vlans": {
"naming_pattern": "Vlan%VLANID%"
},
diff --git a/data/grid5000/sites/lyon/network_equipments/salome.json b/data/grid5000/sites/lyon/network_equipments/salome.json
index d452a1ec4dad0a96d3f7dff439055d1ec9971b1c..cd689009d2c1359bf8f408577bc2c687e47f9f77 100644
--- a/data/grid5000/sites/lyon/network_equipments/salome.json
+++ b/data/grid5000/sites/lyon/network_equipments/salome.json
@@ -159,7 +159,7 @@
},
{
"rate": 10000000000,
- "uid": "aspen-8810"
+ "uid": "gw-lyon"
}
],
"rate": 1000000000
diff --git a/data/grid5000/sites/lyon/network_equipments/zybline.json b/data/grid5000/sites/lyon/network_equipments/zybline.json
index 803753e3e91a0b9aec9e55fbb34f7d9d76f8731e..c633abacbc987f53ef84e604ab6cb0598636980d 100644
--- a/data/grid5000/sites/lyon/network_equipments/zybline.json
+++ b/data/grid5000/sites/lyon/network_equipments/zybline.json
@@ -156,12 +156,12 @@
{
"kind": "router",
"port": "5:15",
- "uid": "aspen-8810"
+ "uid": "gw-lyon"
},
{
"kind": "router",
"port": "5:16",
- "uid": "aspen-8810"
+ "uid": "gw-lyon"
}
],
"rate": 100000000
diff --git a/generators/input/sites/lyon/net-links/bettie.yaml b/generators/input/sites/lyon/net-links/bettie.yaml
index 8a346163928e4bd7f89e8e0a295011dfe634cc15..551cf3e2ea3eecf843b547a235529e2463ce85a8 100644
--- a/generators/input/sites/lyon/net-links/bettie.yaml
+++ b/generators/input/sites/lyon/net-links/bettie.yaml
@@ -56,7 +56,7 @@ bettie:
39: sagittaire-78
40: sagittaire-79
48:
- uid: aspen-8810
+ uid: gw-lyon
kind: router
port: "5:17"
channels:
diff --git a/generators/input/sites/lyon/net-links/chris.yaml b/generators/input/sites/lyon/net-links/chris.yaml
index bf309912324019a5754002ceee15ea9182383d51..f185a13d36424d690199d73aa3dcae908e5bb77d 100644
--- a/generators/input/sites/lyon/net-links/chris.yaml
+++ b/generators/input/sites/lyon/net-links/chris.yaml
@@ -61,7 +61,7 @@ chris:
kind: switch
port: "1:0"
49:
- uid: aspen-8810
+ uid: gw-lyon
kind: router
port: "4:47"
rate: 1000000000
diff --git a/generators/input/sites/lyon/net-links/force10.yaml b/generators/input/sites/lyon/net-links/force10.yaml
index cdeccbce5c0902bcfa1790ca982110386479cea5..02a18a50cc203daa389d9d2c5ef71e4130063a31 100644
--- a/generators/input/sites/lyon/net-links/force10.yaml
+++ b/generators/input/sites/lyon/net-links/force10.yaml
@@ -1,6 +1,6 @@
---
force10:
- model: Force10 S4810P
+ model: cisco
kind: switch
site: lyon
snmp_community: public
@@ -46,7 +46,7 @@ force10:
uid: pollux
kind: other
42:
- uid: aspen-8810
+ uid: gw-lyon
kind: router
port: "9:2"
1:
diff --git a/generators/input/sites/lyon/net-links/aspen-8810.yaml b/generators/input/sites/lyon/net-links/gw-lyon.yaml
similarity index 99%
rename from generators/input/sites/lyon/net-links/aspen-8810.yaml
rename to generators/input/sites/lyon/net-links/gw-lyon.yaml
index 1a7772e2d6af484e2f0b89c081dc162e6f702380..95120cb46f39cb922c642d80f57aa1d8043206eb 100644
--- a/generators/input/sites/lyon/net-links/aspen-8810.yaml
+++ b/generators/input/sites/lyon/net-links/gw-lyon.yaml
@@ -1,5 +1,5 @@
---
-aspen-8810:
+gw-lyon:
model: Extreme Networks version 12.1.3.14
kind: router
site: lyon
diff --git a/generators/input/sites/lyon/net-links/salome.yaml b/generators/input/sites/lyon/net-links/salome.yaml
index b03ae3aab22d43df996a47dddff00a2feb82215e..8be84d029b8503b2d294a57ba3e8ba1ab4c07678 100644
--- a/generators/input/sites/lyon/net-links/salome.yaml
+++ b/generators/input/sites/lyon/net-links/salome.yaml
@@ -15,7 +15,7 @@ salome:
rate: 1000000000
ports:
49:
- uid: aspen-8810
+ uid: gw-lyon
rate: 10000000000
47:
uid: mizar
diff --git a/generators/input/sites/lyon/net-links/zybline.yaml b/generators/input/sites/lyon/net-links/zybline.yaml
index 634d0e629a0ec2dc4baaaf206f92eb851b26b553..53c34cbe73a66372fef44ddd557989bbe76ad357 100644
--- a/generators/input/sites/lyon/net-links/zybline.yaml
+++ b/generators/input/sites/lyon/net-links/zybline.yaml
@@ -55,11 +55,11 @@ zybline:
38: sagittaire-73
39: sagittaire-74
47:
- uid: aspen-8810
+ uid: gw-lyon
kind: router
port: "5:15"
48:
- uid: aspen-8810
+ uid: gw-lyon
kind: router
port: "5:16"
channels: