diff --git a/data/grid5000/sites/grenoble/network_equipments/blade-1.json b/data/grid5000/sites/grenoble/network_equipments/blade-1.json
index 452690bc568a41ccef178143cdc735cf2aac86ed..5a20db9ac5553f7d11e959e772faf5e70a5279d3 100644
--- a/data/grid5000/sites/grenoble/network_equipments/blade-1.json
+++ b/data/grid5000/sites/grenoble/network_equipments/blade-1.json
@@ -13,15 +13,7 @@
},
{
"port": "2:1",
- "uid": "aspen"
- },
- {
- "port": "2:2",
- "uid": "aspen"
- },
- {
- "port": "2:3",
- "uid": "aspen"
+ "uid": "gw-grenoble"
}
],
"rate": 1000000000
diff --git a/data/grid5000/sites/grenoble/network_equipments/blade-2.json b/data/grid5000/sites/grenoble/network_equipments/blade-2.json
index b955675e2ee6a79c6ff40d4cce572219cc4e7dc0..d846b1b515d34947f8b2f1fb32205946447adca6 100644
--- a/data/grid5000/sites/grenoble/network_equipments/blade-2.json
+++ b/data/grid5000/sites/grenoble/network_equipments/blade-2.json
@@ -13,15 +13,7 @@
},
{
"port": "2:4",
- "uid": "aspen"
- },
- {
- "port": "2:5",
- "uid": "aspen"
- },
- {
- "port": "2:6",
- "uid": "aspen"
+ "uid": "gw-grenoble"
}
],
"rate": 1000000000
diff --git a/data/grid5000/sites/grenoble/network_equipments/blade-3.json b/data/grid5000/sites/grenoble/network_equipments/blade-3.json
index f5cfd66236436ec16c615c2300f4562f20405b37..6c6ddb255f08a465a0f110c795ff72ebdd40f2c1 100644
--- a/data/grid5000/sites/grenoble/network_equipments/blade-3.json
+++ b/data/grid5000/sites/grenoble/network_equipments/blade-3.json
@@ -13,15 +13,7 @@
},
{
"port": "2:7",
- "uid": "aspen"
- },
- {
- "port": "2:8",
- "uid": "aspen"
- },
- {
- "port": "2:9",
- "uid": "aspen"
+ "uid": "gw-grenoble"
}
],
"rate": 1000000000
diff --git a/data/grid5000/sites/grenoble/network_equipments/blade-4.json b/data/grid5000/sites/grenoble/network_equipments/blade-4.json
index 090af79e5b1b93a9f179550d14633681b191eeee..751559aeb61ad5829b3597a1f9c701af21073d2d 100644
--- a/data/grid5000/sites/grenoble/network_equipments/blade-4.json
+++ b/data/grid5000/sites/grenoble/network_equipments/blade-4.json
@@ -13,15 +13,7 @@
},
{
"port": "2:10",
- "uid": "aspen"
- },
- {
- "port": "2:11",
- "uid": "aspen"
- },
- {
- "port": "2:12",
- "uid": "aspen"
+ "uid": "gw-grenoble"
}
],
"rate": 1000000000
diff --git a/data/grid5000/sites/grenoble/network_equipments/aspen.json b/data/grid5000/sites/grenoble/network_equipments/gw-grenoble.json
similarity index 99%
rename from data/grid5000/sites/grenoble/network_equipments/aspen.json
rename to data/grid5000/sites/grenoble/network_equipments/gw-grenoble.json
index e98ec547ff5e5bd7c4f18b20b1093e650871c1a6..ce1319be333c113728c401cca8bc20d264a375c0 100644
--- a/data/grid5000/sites/grenoble/network_equipments/aspen.json
+++ b/data/grid5000/sites/grenoble/network_equipments/gw-grenoble.json
@@ -496,7 +496,7 @@
"site": "grenoble",
"snmp_community": "public",
"type": "network_equipment",
- "uid": "aspen",
+ "uid": "gw-grenoble",
"vlans": {
"1": {
"addresses": [
diff --git a/generators/input/sites/grenoble/net-links/blade-1.yaml b/generators/input/sites/grenoble/net-links/blade-1.yaml
index 41f1d22c1ab433d6d8a0fd43e0322b39350e9a42..64725bd6bd81c9049fb65a1375863de07104067f 100644
--- a/generators/input/sites/grenoble/net-links/blade-1.yaml
+++ b/generators/input/sites/grenoble/net-links/blade-1.yaml
@@ -17,14 +17,8 @@ blade-1:
rate: 1000000000
ports:
1:
- uid: aspen
+ uid: gw-grenoble
port: "2:1"
- 2:
- uid: aspen
- port: "2:2"
- 3:
- uid: aspen
- port: "2:3"
1:
naming_pattern: "%LINECARD%/%PORT%"
kind: node
diff --git a/generators/input/sites/grenoble/net-links/blade-2.yaml b/generators/input/sites/grenoble/net-links/blade-2.yaml
index 5b1023d66e3d362cccfd3864f9036ab5c9df9d49..78e802962ea06739535d7a4bd41557f2195cb4b6 100644
--- a/generators/input/sites/grenoble/net-links/blade-2.yaml
+++ b/generators/input/sites/grenoble/net-links/blade-2.yaml
@@ -17,14 +17,8 @@ blade-2:
rate: 1000000000
ports:
1:
- uid: aspen
+ uid: gw-grenoble
port: "2:4"
- 2:
- uid: aspen
- port: "2:5"
- 3:
- uid: aspen
- port: "2:6"
1:
naming_pattern: "%LINECARD%/%PORT%"
kind: node
diff --git a/generators/input/sites/grenoble/net-links/blade-3.yaml b/generators/input/sites/grenoble/net-links/blade-3.yaml
index 646c853050d1aea1d40ff12e8bc0fee852f01dea..825121fd23a3ddf2144568ac40ba437596f50936 100644
--- a/generators/input/sites/grenoble/net-links/blade-3.yaml
+++ b/generators/input/sites/grenoble/net-links/blade-3.yaml
@@ -17,14 +17,8 @@ blade-3:
rate: 1000000000
ports:
1:
- uid: aspen
+ uid: gw-grenoble
port: "2:7"
- 2:
- uid: aspen
- port: "2:8"
- 3:
- uid: aspen
- port: "2:9"
1:
naming_pattern: "%LINECARD%/%PORT%"
kind: node
diff --git a/generators/input/sites/grenoble/net-links/blade-4.yaml b/generators/input/sites/grenoble/net-links/blade-4.yaml
index 0435605d7abff29eba9d966d84062623b31dcffc..ed7f96f3be77613a5c69a0824b1cab3370b2d1a9 100644
--- a/generators/input/sites/grenoble/net-links/blade-4.yaml
+++ b/generators/input/sites/grenoble/net-links/blade-4.yaml
@@ -17,14 +17,8 @@ blade-4:
rate: 1000000000
ports:
1:
- uid: aspen
+ uid: gw-grenoble
port: "2:10"
- 2:
- uid: aspen
- port: "2:11"
- 3:
- uid: aspen
- port: "2:12"
1:
naming_pattern: "%LINECARD%/%PORT%"
kind: node
diff --git a/generators/input/sites/grenoble/net-links/aspen.yaml b/generators/input/sites/grenoble/net-links/gw-grenoble.yaml
similarity index 99%
rename from generators/input/sites/grenoble/net-links/aspen.yaml
rename to generators/input/sites/grenoble/net-links/gw-grenoble.yaml
index 1ed84415f01876d9a643456ef50feef9c215bb49..f988a0ee059779a826bacaaa615ec6c7748ed413 100644
--- a/generators/input/sites/grenoble/net-links/aspen.yaml
+++ b/generators/input/sites/grenoble/net-links/gw-grenoble.yaml
@@ -1,5 +1,5 @@
---
-aspen:
+gw-grenoble:
model: ExtremeNetworks
kind: router
site: grenoble