diff --git a/generators/input/sites/grenoble/clusters/edel_manual.yaml b/generators/input/sites/grenoble/clusters/edel_manual.yaml
index 2d4c7fc3a5b3fceee4e5de4cfb9c78d1f9ced8bf..564cbeda50298b233c8792511c22cc367cb7a3ba 100644
--- a/generators/input/sites/grenoble/clusters/edel_manual.yaml
+++ b/generators/input/sites/grenoble/clusters/edel_manual.yaml
@@ -2,360 +2,360 @@
edel-1:
network_interfaces:
eth0:
- switch_name: edel-sw-1
+ switch_name: sw-edel-1
switch_port: Gi1/0/5
edel-2:
network_interfaces:
eth0:
- switch_name: edel-sw-1
+ switch_name: sw-edel-1
switch_port: Gi1/0/6
edel-3:
network_interfaces:
eth0:
- switch_name: edel-sw-1
+ switch_name: sw-edel-1
switch_port: Gi1/0/7
edel-4:
network_interfaces:
eth0:
- switch_name: edel-sw-1
+ switch_name: sw-edel-1
switch_port: Gi1/0/8
edel-5:
network_interfaces:
eth0:
- switch_name: edel-sw-1
+ switch_name: sw-edel-1
switch_port: Gi1/0/9
edel-6:
network_interfaces:
eth0:
- switch_name: edel-sw-1
+ switch_name: sw-edel-1
switch_port: Gi1/0/10
edel-7:
network_interfaces:
eth0:
- switch_name: edel-sw-1
+ switch_name: sw-edel-1
switch_port: Gi1/0/11
edel-8:
network_interfaces:
eth0:
- switch_name: edel-sw-1
+ switch_name: sw-edel-1
switch_port: Gi1/0/12
edel-9:
network_interfaces:
eth0:
- switch_name: edel-sw-1
+ switch_name: sw-edel-1
switch_port: Gi1/0/13
edel-10:
network_interfaces:
eth0:
- switch_name: edel-sw-1
+ switch_name: sw-edel-1
switch_port: Gi1/0/14
edel-11:
network_interfaces:
eth0:
- switch_name: edel-sw-1
+ switch_name: sw-edel-1
switch_port: Gi1/0/15
edel-12:
network_interfaces:
eth0:
- switch_name: edel-sw-1
+ switch_name: sw-edel-1
switch_port: Gi1/0/16
edel-13:
network_interfaces:
eth0:
- switch_name: edel-sw-1
+ switch_name: sw-edel-1
switch_port: Gi1/0/17
edel-14:
network_interfaces:
eth0:
- switch_name: edel-sw-1
+ switch_name: sw-edel-1
switch_port: Gi1/0/18
edel-15:
network_interfaces:
eth0:
- switch_name: edel-sw-1
+ switch_name: sw-edel-1
switch_port: Gi1/0/19
edel-16:
network_interfaces:
eth0:
- switch_name: edel-sw-1
+ switch_name: sw-edel-1
switch_port: Gi1/0/20
edel-17:
network_interfaces:
eth0:
- switch_name: edel-sw-1
+ switch_name: sw-edel-1
switch_port: Gi1/0/21
edel-18:
network_interfaces:
eth0:
- switch_name: edel-sw-1
+ switch_name: sw-edel-1
switch_port: Gi1/0/22
edel-19:
network_interfaces:
eth0:
- switch_name: edel-sw-2
+ switch_name: sw-edel-2
switch_port: Gi1/0/5
edel-20:
network_interfaces:
eth0:
- switch_name: edel-sw-2
+ switch_name: sw-edel-2
switch_port: Gi1/0/6
edel-21:
network_interfaces:
eth0:
- switch_name: edel-sw-2
+ switch_name: sw-edel-2
switch_port: Gi1/0/7
edel-22:
network_interfaces:
eth0:
- switch_name: edel-sw-2
+ switch_name: sw-edel-2
switch_port: Gi1/0/8
edel-23:
network_interfaces:
eth0:
- switch_name: edel-sw-2
+ switch_name: sw-edel-2
switch_port: Gi1/0/9
edel-24:
network_interfaces:
eth0:
- switch_name: edel-sw-2
+ switch_name: sw-edel-2
switch_port: Gi1/0/10
edel-25:
network_interfaces:
eth0:
- switch_name: edel-sw-2
+ switch_name: sw-edel-2
switch_port: Gi1/0/11
edel-26:
network_interfaces:
eth0:
- switch_name: edel-sw-2
+ switch_name: sw-edel-2
switch_port: Gi1/0/12
edel-27:
network_interfaces:
eth0:
- switch_name: edel-sw-2
+ switch_name: sw-edel-2
switch_port: Gi1/0/13
edel-28:
network_interfaces:
eth0:
- switch_name: edel-sw-2
+ switch_name: sw-edel-2
switch_port: Gi1/0/14
edel-29:
network_interfaces:
eth0:
- switch_name: edel-sw-2
+ switch_name: sw-edel-2
switch_port: Gi1/0/15
edel-30:
network_interfaces:
eth0:
- switch_name: edel-sw-2
+ switch_name: sw-edel-2
switch_port: Gi1/0/16
edel-31:
network_interfaces:
eth0:
- switch_name: edel-sw-2
+ switch_name: sw-edel-2
switch_port: Gi1/0/17
edel-32:
network_interfaces:
eth0:
- switch_name: edel-sw-2
+ switch_name: sw-edel-2
switch_port: Gi1/0/18
edel-33:
network_interfaces:
eth0:
- switch_name: edel-sw-2
+ switch_name: sw-edel-2
switch_port: Gi1/0/19
edel-34:
network_interfaces:
eth0:
- switch_name: edel-sw-2
+ switch_name: sw-edel-2
switch_port: Gi1/0/20
edel-35:
network_interfaces:
eth0:
- switch_name: edel-sw-2
+ switch_name: sw-edel-2
switch_port: Gi1/0/21
edel-36:
network_interfaces:
eth0:
- switch_name: edel-sw-2
+ switch_name: sw-edel-2
switch_port: Gi1/0/22
edel-37:
network_interfaces:
eth0:
- switch_name: edel-sw-3
+ switch_name: sw-edel-3
switch_port: Gi1/0/5
edel-38:
network_interfaces:
eth0:
- switch_name: edel-sw-3
+ switch_name: sw-edel-3
switch_port: Gi1/0/6
edel-39:
network_interfaces:
eth0:
- switch_name: edel-sw-3
+ switch_name: sw-edel-3
switch_port: Gi1/0/7
edel-40:
network_interfaces:
eth0:
- switch_name: edel-sw-3
+ switch_name: sw-edel-3
switch_port: Gi1/0/8
edel-41:
network_interfaces:
eth0:
- switch_name: edel-sw-3
+ switch_name: sw-edel-3
switch_port: Gi1/0/9
edel-42:
network_interfaces:
eth0:
- switch_name: edel-sw-3
+ switch_name: sw-edel-3
switch_port: Gi1/0/10
edel-43:
network_interfaces:
eth0:
- switch_name: edel-sw-3
+ switch_name: sw-edel-3
switch_port: Gi1/0/11
edel-44:
network_interfaces:
eth0:
- switch_name: edel-sw-3
+ switch_name: sw-edel-3
switch_port: Gi1/0/12
edel-45:
network_interfaces:
eth0:
- switch_name: edel-sw-3
+ switch_name: sw-edel-3
switch_port: Gi1/0/13
edel-46:
network_interfaces:
eth0:
- switch_name: edel-sw-3
+ switch_name: sw-edel-3
switch_port: Gi1/0/14
edel-47:
network_interfaces:
eth0:
- switch_name: edel-sw-3
+ switch_name: sw-edel-3
switch_port: Gi1/0/15
edel-48:
network_interfaces:
eth0:
- switch_name: edel-sw-3
+ switch_name: sw-edel-3
switch_port: Gi1/0/16
edel-49:
network_interfaces:
eth0:
- switch_name: edel-sw-3
+ switch_name: sw-edel-3
switch_port: Gi1/0/17
edel-50:
network_interfaces:
eth0:
- switch_name: edel-sw-3
+ switch_name: sw-edel-3
switch_port: Gi1/0/18
edel-51:
network_interfaces:
eth0:
- switch_name: edel-sw-3
+ switch_name: sw-edel-3
switch_port: Gi1/0/19
edel-52:
network_interfaces:
eth0:
- switch_name: edel-sw-3
+ switch_name: sw-edel-3
switch_port: Gi1/0/20
edel-53:
network_interfaces:
eth0:
- switch_name: edel-sw-3
+ switch_name: sw-edel-3
switch_port: Gi1/0/21
edel-54:
network_interfaces:
eth0:
- switch_name: edel-sw-3
+ switch_name: sw-edel-3
switch_port: Gi1/0/22
edel-55:
network_interfaces:
eth0:
- switch_name: edel-sw-4
+ switch_name: sw-edel-4
switch_port: Gi1/0/5
edel-56:
network_interfaces:
eth0:
- switch_name: edel-sw-4
+ switch_name: sw-edel-4
switch_port: Gi1/0/6
edel-57:
network_interfaces:
eth0:
- switch_name: edel-sw-4
+ switch_name: sw-edel-4
switch_port: Gi1/0/7
edel-58:
network_interfaces:
eth0:
- switch_name: edel-sw-4
+ switch_name: sw-edel-4
switch_port: Gi1/0/8
edel-59:
network_interfaces:
eth0:
- switch_name: edel-sw-4
+ switch_name: sw-edel-4
switch_port: Gi1/0/9
edel-60:
network_interfaces:
eth0:
- switch_name: edel-sw-4
+ switch_name: sw-edel-4
switch_port: Gi1/0/10
edel-61:
network_interfaces:
eth0:
- switch_name: edel-sw-4
+ switch_name: sw-edel-4
switch_port: Gi1/0/11
edel-62:
network_interfaces:
eth0:
- switch_name: edel-sw-4
+ switch_name: sw-edel-4
switch_port: Gi1/0/12
edel-63:
network_interfaces:
eth0:
- switch_name: edel-sw-4
+ switch_name: sw-edel-4
switch_port: Gi1/0/13
edel-64:
network_interfaces:
eth0:
- switch_name: edel-sw-4
+ switch_name: sw-edel-4
switch_port: Gi1/0/14
edel-65:
network_interfaces:
eth0:
- switch_name: edel-sw-4
+ switch_name: sw-edel-4
switch_port: Gi1/0/15
edel-66:
network_interfaces:
eth0:
- switch_name: edel-sw-4
+ switch_name: sw-edel-4
switch_port: Gi1/0/16
edel-67:
network_interfaces:
eth0:
- switch_name: edel-sw-4
+ switch_name: sw-edel-4
switch_port: Gi1/0/17
edel-68:
network_interfaces:
eth0:
- switch_name: edel-sw-4
+ switch_name: sw-edel-4
switch_port: Gi1/0/18
edel-69:
network_interfaces:
eth0:
- switch_name: edel-sw-4
+ switch_name: sw-edel-4
switch_port: Gi1/0/19
edel-70:
network_interfaces:
eth0:
- switch_name: edel-sw-4
+ switch_name: sw-edel-4
switch_port: Gi1/0/20
edel-71:
network_interfaces:
eth0:
- switch_name: edel-sw-4
+ switch_name: sw-edel-4
switch_port: Gi1/0/21
edel-72:
network_interfaces:
eth0:
- switch_name: edel-sw-4
+ switch_name: sw-edel-4
switch_port: Gi1/0/22
diff --git a/generators/input/sites/grenoble/net-links/gw-grenoble.yaml b/generators/input/sites/grenoble/net-links/gw-grenoble.yaml
index 05a1a936292a917b10de1a8998a8569d539abc4d..eb2114fae2d496c478febfcf87876ad5cac1856b 100644
--- a/generators/input/sites/grenoble/net-links/gw-grenoble.yaml
+++ b/generators/input/sites/grenoble/net-links/gw-grenoble.yaml
@@ -68,40 +68,40 @@ gw-grenoble:
rate: 1000000000
ports:
1:
- uid: edel-sw-2
+ uid: sw-edel-2
port: 0/1
2:
- uid: edel-sw-2
+ uid: sw-edel-2
port: 0/2
3:
- uid: edel-sw-2
+ uid: sw-edel-2
port: 0/3
4:
- uid: edel-sw-1
+ uid: sw-edel-1
port: 0/1
5:
- uid: edel-sw-1
+ uid: sw-edel-1
port: 0/2
6:
- uid: edel-sw-1
+ uid: sw-edel-1
port: 0/3
7:
- uid: edel-sw-3
+ uid: sw-edel-3
port: 0/1
8:
- uid: edel-sw-3
+ uid: sw-edel-3
port: 0/2
9:
- uid: edel-sw-3
+ uid: sw-edel-3
port: 0/3
10:
- uid: edel-sw-4
+ uid: sw-edel-4
port: 0/1
11:
- uid: edel-sw-4
+ uid: sw-edel-4
port: 0/2
12:
- uid: edel-sw-4
+ uid: sw-edel-4
port: 0/3
23:
uid: voltaire-1
diff --git a/generators/input/sites/grenoble/net-links/edel-sw-1.yaml b/generators/input/sites/grenoble/net-links/sw-edel-1.yaml
similarity index 98%
rename from generators/input/sites/grenoble/net-links/edel-sw-1.yaml
rename to generators/input/sites/grenoble/net-links/sw-edel-1.yaml
index 45ee3b1b3a0a516b1119c4324651221c45e0d3b3..74db8a4b7280972c441446f95b55a389e03e0c3d 100644
--- a/generators/input/sites/grenoble/net-links/edel-sw-1.yaml
+++ b/generators/input/sites/grenoble/net-links/sw-edel-1.yaml
@@ -1,5 +1,5 @@
---
-edel-sw-1:
+sw-edel-1:
model: Broadcom
kind: switch
site: grenoble
diff --git a/generators/input/sites/grenoble/net-links/edel-sw-2.yaml b/generators/input/sites/grenoble/net-links/sw-edel-2.yaml
similarity index 98%
rename from generators/input/sites/grenoble/net-links/edel-sw-2.yaml
rename to generators/input/sites/grenoble/net-links/sw-edel-2.yaml
index 87619298c08bbbc171c8081b11fbc3088b3d12bb..2925604cb78c8bb18116e7a1dabc1a2e98c14741 100644
--- a/generators/input/sites/grenoble/net-links/edel-sw-2.yaml
+++ b/generators/input/sites/grenoble/net-links/sw-edel-2.yaml
@@ -1,5 +1,5 @@
---
-edel-sw-2:
+sw-edel-2:
model: Broadcom
kind: switch
site: grenoble
diff --git a/generators/input/sites/grenoble/net-links/edel-sw-3.yaml b/generators/input/sites/grenoble/net-links/sw-edel-3.yaml
similarity index 98%
rename from generators/input/sites/grenoble/net-links/edel-sw-3.yaml
rename to generators/input/sites/grenoble/net-links/sw-edel-3.yaml
index 75cb0f451aca61da6b08aa209e63c987c47ebf37..a3e6ae5f0f65c6f07d3d235030d767551849032a 100644
--- a/generators/input/sites/grenoble/net-links/edel-sw-3.yaml
+++ b/generators/input/sites/grenoble/net-links/sw-edel-3.yaml
@@ -1,5 +1,5 @@
---
-edel-sw-3:
+sw-edel-3:
model: Broadcom
kind: switch
site: grenoble
diff --git a/generators/input/sites/grenoble/net-links/edel-sw-4.yaml b/generators/input/sites/grenoble/net-links/sw-edel-4.yaml
similarity index 98%
rename from generators/input/sites/grenoble/net-links/edel-sw-4.yaml
rename to generators/input/sites/grenoble/net-links/sw-edel-4.yaml
index 26853724d420bc7a4f863ead4a939a5f0b372261..700dbb15d398e3d002741b63176147300fe214da 100644
--- a/generators/input/sites/grenoble/net-links/edel-sw-4.yaml
+++ b/generators/input/sites/grenoble/net-links/sw-edel-4.yaml
@@ -1,5 +1,5 @@
---
-edel-sw-4:
+sw-edel-4:
model: Broadcom
kind: switch
site: grenoble