diff --git a/data/grid5000/sites/lille/network_equipments/gw-lille.json b/data/grid5000/sites/lille/network_equipments/gw-lille.json
index 613787e3d9247fcf7b33bc1824d20311ba38ec98..9f9a710d5c2a9a2e0d87ca4e504454d161e54cf8 100644
--- a/data/grid5000/sites/lille/network_equipments/gw-lille.json
+++ b/data/grid5000/sites/lille/network_equipments/gw-lille.json
@@ -283,25 +283,25 @@
"uid": "chirloute-5"
},
{
- "uid": "chicon-1"
+
},
{
- "uid": "chicon-2"
+
},
{
- "uid": "chicon-3"
+
},
{
- "uid": "chicon-4"
+
},
{
- "uid": "chicon-5"
+
},
{
- "uid": "chicon-6"
+
},
{
- "uid": "chicon-7"
+
},
{
"uid": "chinqchint-46"
@@ -341,99 +341,61 @@
},
{
- "kind": "node",
- "port": "eth1",
- "uid": "chicon-8"
+
},
{
- "kind": "node",
- "port": "eth1",
- "uid": "chicon-9"
+
},
{
- "kind": "node",
- "port": "eth1",
- "uid": "chicon-10"
+
},
{
- "kind": "node",
- "port": "eth1",
- "uid": "chicon-11"
+
},
{
- "kind": "node",
- "port": "eth1",
- "uid": "chicon-12"
+
},
{
- "kind": "node",
- "port": "eth1",
- "uid": "chicon-13"
+
},
{
- "kind": "node",
- "port": "eth1",
- "uid": "chicon-14"
+
},
{
- "kind": "node",
- "port": "eth1",
- "uid": "chicon-15"
+
},
{
- "kind": "node",
- "port": "eth1",
- "uid": "chicon-16"
+
},
{
- "kind": "node",
- "port": "eth1",
- "uid": "chicon-17"
+
},
{
- "kind": "node",
- "port": "eth1",
- "uid": "chicon-18"
+
},
{
- "kind": "node",
- "port": "eth1",
- "uid": "chicon-19"
+
},
{
- "kind": "node",
- "port": "eth1",
- "uid": "chicon-20"
+
},
{
- "kind": "node",
- "port": "eth1",
- "uid": "chicon-21"
+
},
{
- "kind": "node",
- "port": "eth1",
- "uid": "chicon-22"
+
},
{
- "kind": "node",
- "port": "eth1",
- "uid": "chicon-23"
+
},
{
- "kind": "node",
- "port": "eth1",
- "uid": "chicon-24"
+
},
{
- "kind": "node",
- "port": "eth1",
- "uid": "chicon-25"
+
},
{
- "kind": "node",
- "port": "eth1",
- "uid": "chicon-26"
+
},
{
diff --git a/generators/input/sites/lille/net-links/gw-lille.yaml b/generators/input/sites/lille/net-links/gw-lille.yaml
index c1b09fd257a8195dd72d86f2f3a36341ba3be96e..28e12e9b47b85d80091eb15a3a905dbfa091ed12 100644
--- a/generators/input/sites/lille/net-links/gw-lille.yaml
+++ b/generators/input/sites/lille/net-links/gw-lille.yaml
@@ -176,8 +176,6 @@ gw-lille:
30: chirloute-3
19: chimint-13
14: chimint-7
- 39: chicon-6
- 38: chicon-5
25: chirloute-2
3: chinqchint-43
9: chimint-2
@@ -186,10 +184,6 @@ gw-lille:
22: chimint-16
21: chimint-17
8: chimint-19
- 34: chicon-1
- 35: chicon-2
- 36: chicon-3
- 37: chicon-4
31: chirloute-6
20: chimint-14
15: chimint-9
@@ -197,7 +191,6 @@ gw-lille:
26: chirloute-4
29: chirloute-1
32: chirloute-8
- 40: chicon-7
42:
kind: other
uid: jiminy
@@ -228,86 +221,7 @@ gw-lille:
kind: node
uid: chirloute-7
port: eth1
- 3:
- kind: node
- uid: chicon-10
- port: eth1
- 15:
- kind: node
- uid: chicon-12
- port: eth1
- 7:
- kind: node
- uid: chicon-14
- port: eth1
- 8:
- kind: node
- uid: chicon-15
- port: eth1
- 9:
- kind: node
- uid: chicon-16
- port: eth1
- 10:
- kind: node
- uid: chicon-17
- port: eth1
- 15:
- kind: node
- uid: chicon-22
- port: eth1
- 16:
- kind: node
- uid: chicon-23
- port: eth1
- 18:
- kind: node
- uid: chicon-25
- port: eth1
- 2:
- kind: node
- uid: chicon-9
- port: eth1
- 1:
- kind: node
- uid: chicon-8
- port: eth1
- 4:
- kind: node
- uid: chicon-11
- port: eth1
- 5:
- kind: node
- uid: chicon-12
- port: eth1
- 6:
- kind: node
- uid: chicon-13
- port: eth1
- 11:
- kind: node
- uid: chicon-18
- port: eth1
- 12:
- kind: node
- uid: chicon-19
- port: eth1
- 13:
- kind: node
- uid: chicon-20
- port: eth1
- 14:
- kind: node
- uid: chicon-21
- port: eth1
- 17:
- kind: node
- uid: chicon-24
- port: eth1
- 19:
- kind: node
- uid: chicon-26
- port: eth1
+
channels:
naming_pattern: Po%CHANNELID%