diff --git a/data/grid5000/sites/rennes/network_equipments/gw.json b/data/grid5000/sites/rennes/network_equipments/gw.json
index 3ecebcf5163869f548fd71ccc21ba2ec4f5f5bec..31c40e1eb26d35e0aa0701b00b9d99822d9d1c87 100644
--- a/data/grid5000/sites/rennes/network_equipments/gw.json
+++ b/data/grid5000/sites/rennes/network_equipments/gw.json
@@ -4,27 +4,27 @@
],
"backplane_bps": 1440000000000,
"channels": {
- "lag1": {
+ "lag 1": {
"kind": "switch",
- "port": "lag1",
+ "port": "lag 1",
"rate": 200000000000,
"uid": "sw-1"
},
- "lag2": {
+ "lag 2": {
"kind": "server",
- "port": "lag2",
+ "port": "lag 2",
"rate": 50000000000,
"uid": "srv-data"
},
- "lag3": {
+ "lag 3": {
"kind": "switch",
"port": "port-channel286",
"rate": 20000000000,
"uid": "swcore-01-rba"
},
- "lag4": {
+ "lag 4": {
"kind": "server",
- "port": "lag4",
+ "port": "lag 4",
"rate": 50000000000,
"uid": "srv-data2"
}
@@ -99,12 +99,12 @@
{
"kind": "channel",
"snmp_name": "1/1/29",
- "uid": "lag4"
+ "uid": "lag 4"
},
{
"kind": "channel",
"snmp_name": "1/1/30",
- "uid": "lag4"
+ "uid": "lag 4"
},
{
"kind": "server",
@@ -126,12 +126,12 @@
{
"kind": "channel",
"snmp_name": "1/1/35",
- "uid": "lag2"
+ "uid": "lag 2"
},
{
"kind": "channel",
"snmp_name": "1/1/36",
- "uid": "lag2"
+ "uid": "lag 2"
},
{
},
@@ -173,25 +173,25 @@
"kind": "channel",
"rate": 10000000000,
"snmp_name": "1/1/47",
- "uid": "lag3"
+ "uid": "lag 3"
},
{
"kind": "channel",
"rate": 10000000000,
"snmp_name": "1/1/48",
- "uid": "lag3"
+ "uid": "lag 3"
},
{
"kind": "channel",
"rate": 100000000000,
"snmp_name": "1/1/49",
- "uid": "lag1"
+ "uid": "lag 1"
},
{
"kind": "channel",
"rate": 100000000000,
"snmp_name": "1/1/50",
- "uid": "lag1"
+ "uid": "lag 1"
}
],
"rate": 25000000000,
diff --git a/data/grid5000/sites/rennes/network_equipments/sw-1.json b/data/grid5000/sites/rennes/network_equipments/sw-1.json
index d41cab7ba8080755d760db81ab2d114b22bba004..d3e20c4ad259f409e876e7f251e5a783f35a3edd 100644
--- a/data/grid5000/sites/rennes/network_equipments/sw-1.json
+++ b/data/grid5000/sites/rennes/network_equipments/sw-1.json
@@ -1,9 +1,9 @@
{
"backplane_bps": 1440000000000,
"channels": {
- "lag1": {
+ "lag 1": {
"kind": "switch",
- "port": "lag1",
+ "port": "lag 1",
"rate": 200000000000,
"uid": "gw"
}
@@ -247,13 +247,13 @@
"kind": "channel",
"rate": 100000000000,
"snmp_name": "1/1/49",
- "uid": "lag1"
+ "uid": "lag 1"
},
{
"kind": "channel",
"rate": 100000000000,
"snmp_name": "1/1/50",
- "uid": "lag1"
+ "uid": "lag 1"
}
],
"rate": 25000000000,
diff --git a/data/grid5000/sites/rennes/network_equipments/swcore-01-rba.json b/data/grid5000/sites/rennes/network_equipments/swcore-01-rba.json
index 400c54178ec7a6873de0616d3b60043d5b18a836..da9e652d2d5909b7d231b155476e908b7a45d20e 100644
--- a/data/grid5000/sites/rennes/network_equipments/swcore-01-rba.json
+++ b/data/grid5000/sites/rennes/network_equipments/swcore-01-rba.json
@@ -2,7 +2,7 @@
"channels": {
"port-channel286": {
"kind": "router",
- "port": "lag3",
+ "port": "lag 3",
"rate": 20000000000,
"uid": "gw"
},
diff --git a/data/grid5000/sites/toulouse/network_equipments/gw.json b/data/grid5000/sites/toulouse/network_equipments/gw.json
index a275d22424bbf4489ac4b078c4a7466a8b562d30..9d61d806337590d72fff047e2e8cb34460dc3799 100644
--- a/data/grid5000/sites/toulouse/network_equipments/gw.json
+++ b/data/grid5000/sites/toulouse/network_equipments/gw.json
@@ -3,13 +3,13 @@
"gw-toulouse"
],
"channels": {
- "lag1": {
+ "lag 1": {
"kind": "server",
"port": "port-channel1",
"rate": 20000000000,
"uid": "nfs"
},
- "lag2": {
+ "lag 2": {
"kind": "switch",
"port": "lacp key 1",
"rate": 20000000000,
@@ -99,12 +99,12 @@
{
"kind": "channel",
"snmp_name": "1/1/15",
- "uid": "lag2"
+ "uid": "lag 2"
},
{
"kind": "channel",
"snmp_name": "1/1/16",
- "uid": "lag2"
+ "uid": "lag 2"
},
{
"kind": "server",
@@ -119,12 +119,12 @@
{
"kind": "channel",
"snmp_name": "1/1/19",
- "uid": "lag1"
+ "uid": "lag 1"
},
{
"kind": "channel",
"snmp_name": "1/1/20",
- "uid": "lag1"
+ "uid": "lag 1"
}
],
"rate": 10000000000,
diff --git a/data/grid5000/sites/toulouse/network_equipments/sw-estats.json b/data/grid5000/sites/toulouse/network_equipments/sw-estats.json
index 0d9d0a591040787895da9e87a01caba219371065..a05ab575cb158f31eff7667a01b989c3ea12eb88 100644
--- a/data/grid5000/sites/toulouse/network_equipments/sw-estats.json
+++ b/data/grid5000/sites/toulouse/network_equipments/sw-estats.json
@@ -5,7 +5,7 @@
"channels": {
"lacp key 1": {
"kind": "router",
- "port": "lag2",
+ "port": "lag 2",
"rate": 20000000000,
"uid": "gw"
}
diff --git a/input/grid5000/sites/rennes/networks/gw-rennes.yaml b/input/grid5000/sites/rennes/networks/gw-rennes.yaml
index f5405ae6dd5f8db3328fa09769ea3deb92e5f91b..d2e87d570a4ec6cde4ec17f0ec207d1b716861e3 100644
--- a/input/grid5000/sites/rennes/networks/gw-rennes.yaml
+++ b/input/grid5000/sites/rennes/networks/gw-rennes.yaml
@@ -70,10 +70,10 @@ gw:
rate: 25000000000
ports:
29:
- uid: lag4
+ uid: lag 4
kind: channel
30:
- uid: lag4
+ uid: lag 4
kind: channel
31:
uid: srv-1
@@ -85,10 +85,10 @@ gw:
uid: srv-3
kind: server
35:
- uid: lag2
+ uid: lag 2
kind: channel
36:
- uid: lag2
+ uid: lag 2
kind: channel
43:
uid: sw-adm-1
@@ -107,39 +107,39 @@ gw:
kind: backbone
rate: 10000000000
47:
- uid: lag3
+ uid: lag 3
kind: channel
rate: 10000000000
48:
- uid: lag3
+ uid: lag 3
kind: channel
rate: 10000000000
49:
- uid: lag1
+ uid: lag 1
kind: channel
rate: 100000000000
50:
- uid: lag1
+ uid: lag 1
kind: channel
rate: 100000000000
channels:
- lag1:
+ lag 1:
kind: switch
rate: 200000000000
uid: sw-1
- port: lag1
- lag2:
+ port: lag 1
+ lag 2:
kind: server
rate: 50000000000
uid: srv-data
- port: lag2
- lag3:
+ port: lag 2
+ lag 3:
kind: switch
rate: 20000000000
uid: swcore-01-rba
port: port-channel286
- lag4:
+ lag 4:
kind: server
rate: 50000000000
uid: srv-data2
- port: lag4
+ port: lag 4
diff --git a/input/grid5000/sites/rennes/networks/sw-1.yaml b/input/grid5000/sites/rennes/networks/sw-1.yaml
index defd51c5cdd9e1c39d166351766c6e6f1e63e9c2..5eec6ef290ab5a29d69035348f8de931571c80a7 100644
--- a/input/grid5000/sites/rennes/networks/sw-1.yaml
+++ b/input/grid5000/sites/rennes/networks/sw-1.yaml
@@ -80,16 +80,16 @@ sw-1:
32:
uid: paradoxe-32
49:
- uid: lag1
+ uid: lag 1
kind: channel
rate: 100000000000
50:
- uid: lag1
+ uid: lag 1
kind: channel
rate: 100000000000
channels:
- lag1:
+ lag 1:
kind: switch
rate: 200000000000
uid: gw
- port: lag1
+ port: lag 1
diff --git a/input/grid5000/sites/rennes/networks/swcore-01-rba.yaml b/input/grid5000/sites/rennes/networks/swcore-01-rba.yaml
index 2aea7f2d408d08e2f4ac3527bda9c094435afee5..ca49c4c379b3ce5f8c15fc8e2c8635a0001f46a9 100644
--- a/input/grid5000/sites/rennes/networks/swcore-01-rba.yaml
+++ b/input/grid5000/sites/rennes/networks/swcore-01-rba.yaml
@@ -51,5 +51,5 @@ swcore-01-rba:
port-channel286:
uid: gw
kind: router
- port: lag3
+ port: lag 3
rate: 20000000000
diff --git a/input/grid5000/sites/toulouse/networks/gw.yaml b/input/grid5000/sites/toulouse/networks/gw.yaml
index c8b2280fd3555dd4863aa1ec8770bb254f9ba67a..223b052ad845993a22c1e70072bba11b0965f7c1 100644
--- a/input/grid5000/sites/toulouse/networks/gw.yaml
+++ b/input/grid5000/sites/toulouse/networks/gw.yaml
@@ -79,10 +79,10 @@ gw:
9: montcalm-9
10: montcalm-10
15:
- uid: lag2
+ uid: lag 2
kind: channel
16:
- uid: lag2
+ uid: lag 2
kind: channel
17:
uid: pve-1
@@ -91,18 +91,18 @@ gw:
uid: pve-2
kind: server
19:
- uid: lag1
+ uid: lag 1
kind: channel
20:
- uid: lag1
+ uid: lag 1
kind: channel
channels:
- lag1:
+ lag 1:
uid: nfs
kind: server
rate: 20000000000
port: port-channel1
- lag2:
+ lag 2:
uid: sw-estats
kind: switch
rate: 20000000000
diff --git a/input/grid5000/sites/toulouse/networks/sw-estats.yaml b/input/grid5000/sites/toulouse/networks/sw-estats.yaml
index 1d3d28c1c44f190e9255e19b09a9802fed3925cb..298870592cb9a355fce1242579df4c91057d32f8 100644
--- a/input/grid5000/sites/toulouse/networks/sw-estats.yaml
+++ b/input/grid5000/sites/toulouse/networks/sw-estats.yaml
@@ -43,4 +43,4 @@ sw-estats:
uid: gw
kind: router
rate: 20000000000
- port: lag2
+ port: lag 2