diff --git a/data/grid5000/sites/lille/network_equipments/gw.json b/data/grid5000/sites/lille/network_equipments/gw.json
index 6a328c58676bfff8d50d8e9ab0ca00efe8d4dbbb..b90baaa6ccb885bf0f297c13e79b98842d10e275 100644
--- a/data/grid5000/sites/lille/network_equipments/gw.json
+++ b/data/grid5000/sites/lille/network_equipments/gw.json
@@ -9,6 +9,24 @@
"port": "lag2",
"rate": 200000000000,
"uid": "sw-1"
+ },
+ "port-channel2": {
+ "kind": "server",
+ "port": "port-channel2",
+ "rate": 50000000000,
+ "uid": "srv-data2"
+ },
+ "port-channel3": {
+ "kind": "server",
+ "port": "port-channel3",
+ "rate": 50000000000,
+ "uid": "granche-srv1"
+ },
+ "port-channel4": {
+ "kind": "server",
+ "port": "port-channel4",
+ "rate": 50000000000,
+ "uid": "granche-srv2"
}
},
"ip": "172.16.47.254",
@@ -27,29 +45,62 @@
{
"kind": "server",
"snmp_name": "Ethernet1/1",
- "uid": "pve-dmz-north-2"
+ "uid": "pve-1"
},
{
+ "kind": "server",
+ "snmp_name": "Ethernet1/2",
+ "uid": "pve-1"
},
{
+ "kind": "server",
+ "snmp_name": "Ethernet1/3",
+ "uid": "pve-2"
},
{
+ "kind": "server",
+ "snmp_name": "Ethernet1/4",
+ "uid": "pve-2"
},
{
+ "kind": "server",
+ "snmp_name": "Ethernet1/5",
+ "uid": "pve-4"
},
{
+ "kind": "server",
+ "snmp_name": "Ethernet1/6",
+ "uid": "pve-4"
},
{
+ "kind": "channel",
+ "snmp_name": "Ethernet1/7",
+ "uid": "port-channel2"
},
{
+ "kind": "channel",
+ "snmp_name": "Ethernet1/8",
+ "uid": "port-channel2"
},
{
+ "kind": "channel",
+ "snmp_name": "Ethernet1/9",
+ "uid": "port-channel3"
},
{
+ "kind": "channel",
+ "snmp_name": "Ethernet1/10",
+ "uid": "port-channel3"
},
{
+ "kind": "channel",
+ "snmp_name": "Ethernet1/11",
+ "uid": "port-channel4"
},
{
+ "kind": "channel",
+ "snmp_name": "Ethernet1/12",
+ "uid": "port-channel4"
},
{
},
@@ -118,9 +169,14 @@
{
},
{
+ "kind": "server",
+ "rate": 10000000000,
+ "snmp_name": "Ethernet1/46",
+ "uid": "pve-dmz-north-2"
},
{
"kind": "backbone",
+ "rate": 10000000000,
"snmp_name": "Ethernet1/47",
"uid": "renater-lille"
},
@@ -147,7 +203,7 @@
"uid": "port-channel1"
}
],
- "rate": 10000000000,
+ "rate": 25000000000,
"snmp_pattern": "Ethernet%LINECARD%/%PORT%"
}
],
diff --git a/data/grid5000/sites/lille/network_equipments/sw-1.json b/data/grid5000/sites/lille/network_equipments/sw-1.json
index c969005ba9f1175aa780bf7b2b5a1162a10d1102..311bac89b54cada791660b36a77b80bff39e032c 100644
--- a/data/grid5000/sites/lille/network_equipments/sw-1.json
+++ b/data/grid5000/sites/lille/network_equipments/sw-1.json
@@ -7,12 +7,6 @@
],
"backplane_bps": 1440000000000,
"channels": {
- "lag1": {
- "kind": "server",
- "port": "lacp",
- "rate": 50000000000,
- "uid": "srv-data2"
- },
"lag2": {
"kind": "router",
"port": "port-channel1",
@@ -32,34 +26,16 @@
{
},
{
- "kind": "server",
- "snmp_name": "1/1/1",
- "uid": "pve-1"
},
{
- "kind": "server",
- "snmp_name": "1/1/2",
- "uid": "pve-1-eth1"
},
{
- "kind": "server",
- "snmp_name": "1/1/3",
- "uid": "pve-2"
},
{
- "kind": "server",
- "snmp_name": "1/1/4",
- "uid": "pve-2-eth1"
},
{
- "kind": "channel",
- "snmp_name": "1/1/5",
- "uid": "lag1"
},
{
- "kind": "channel",
- "snmp_name": "1/1/6",
- "uid": "lag1"
},
{
"kind": "node",
@@ -230,9 +206,6 @@
{
},
{
- "kind": "server",
- "snmp_name": "1/1/39",
- "uid": "pve-4"
},
{
},
diff --git a/data/grid5000/sites/lille/network_equipments/sw-chiclet-2.json b/data/grid5000/sites/lille/network_equipments/sw-chiclet-2.json
index ece4656e493f40f29e8b99001dbc6995fa0ae814..f01f004422a98b1055fb4737003e9b96978873e5 100644
--- a/data/grid5000/sites/lille/network_equipments/sw-chiclet-2.json
+++ b/data/grid5000/sites/lille/network_equipments/sw-chiclet-2.json
@@ -7,18 +7,6 @@
"rate": 200000000000,
"uid": "sw-chiclet-1"
},
- "port-channel3": {
- "kind": "server",
- "port": "port-channel3",
- "rate": 20000000000,
- "uid": "granche-srv1"
- },
- "port-channel4": {
- "kind": "server",
- "port": "port-channel4",
- "rate": 20000000000,
- "uid": "granche-srv2"
- },
"port-channel5": {
"kind": "server",
"port": "port-channel5",
@@ -70,24 +58,12 @@
{
},
{
- "kind": "channel",
- "snmp_name": "Ethernet1/15",
- "uid": "port-channel3"
},
{
- "kind": "channel",
- "snmp_name": "Ethernet1/16",
- "uid": "port-channel3"
},
{
- "kind": "channel",
- "snmp_name": "Ethernet1/17",
- "uid": "port-channel4"
},
{
- "kind": "channel",
- "snmp_name": "Ethernet1/18",
- "uid": "port-channel4"
},
{
"kind": "channel",
diff --git a/input/grid5000/sites/lille/networks/gw-lille.yaml b/input/grid5000/sites/lille/networks/gw-lille.yaml
index 5e9ba63e821c199044c38cb9ce44d637031f4f36..2281bbda2d4aa70e56126c3a5a6fe16299398b59 100644
--- a/input/grid5000/sites/lille/networks/gw-lille.yaml
+++ b/input/grid5000/sites/lille/networks/gw-lille.yaml
@@ -118,14 +118,52 @@ gw:
snmp_pattern: Ethernet%LINECARD%/%PORT%
kavlan_pattern: Ethernet%LINECARD%/%PORT%
backplane_bps: 36000000000000
- rate: 10000000000
+ rate: 25000000000
ports:
1:
+ uid: pve-1
+ kind: server
+ 2:
+ uid: pve-1
+ kind: server
+ 3:
+ uid: pve-2
+ kind: server
+ 4:
+ uid: pve-2
+ kind: server
+ 5:
+ uid: pve-4
+ kind: server
+ 6:
+ uid: pve-4
+ kind: server
+ 7:
+ uid: port-channel2
+ kind: channel
+ 8:
+ uid: port-channel2
+ kind: channel
+ 9:
+ uid: port-channel3
+ kind: channel
+ 10:
+ uid: port-channel3
+ kind: channel
+ 11:
+ uid: port-channel4
+ kind: channel
+ 12:
+ uid: port-channel4
+ kind: channel
+ 46:
uid: pve-dmz-north-2
kind: server
+ rate: 10000000000
47:
uid: renater-lille
kind: backbone
+ rate: 10000000000
53:
uid: port-channel1
kind: channel
@@ -140,3 +178,18 @@ gw:
port: lag2
rate: 200000000000
kind: switch
+ port-channel2:
+ uid: srv-data2
+ port: port-channel2
+ kind: server
+ rate: 50000000000
+ port-channel3:
+ uid: granche-srv1
+ port: port-channel3
+ kind: server
+ rate: 50000000000
+ port-channel4:
+ uid: granche-srv2
+ port: port-channel4
+ kind: server
+ rate: 50000000000
diff --git a/input/grid5000/sites/lille/networks/sw-1.yaml b/input/grid5000/sites/lille/networks/sw-1.yaml
index 925bab8c10bc7cab9e929986d2bb8a65f81a62e0..95bd8e94356b310a76e49d1f61bb0d9385bd3f83 100644
--- a/input/grid5000/sites/lille/networks/sw-1.yaml
+++ b/input/grid5000/sites/lille/networks/sw-1.yaml
@@ -18,24 +18,6 @@ sw-1:
rate: 25000000000
kind: node
ports:
- 1:
- uid: pve-1
- kind: server
- 2:
- uid: pve-1-eth1
- kind: server
- 3:
- uid: pve-2
- kind: server
- 4:
- uid: pve-2-eth1
- kind: server
- 5:
- uid: lag1
- kind: channel
- 6:
- uid: lag1
- kind: channel
7:
uid: chuc-1
8:
@@ -88,9 +70,6 @@ sw-1:
uid: chirop-5
32:
uid: chirop-5-eth1
- 39:
- uid: pve-4
- kind: server
47:
uid: sw-admin6
kind: switch
@@ -105,11 +84,6 @@ sw-1:
uid: lag2
kind: channel
channels:
- lag1:
- uid: srv-data2
- kind: server
- port: lacp
- rate: 50000000000
lag2:
port: port-channel1
uid: gw
diff --git a/input/grid5000/sites/lille/networks/sw-chiclet-2.yaml b/input/grid5000/sites/lille/networks/sw-chiclet-2.yaml
index 2042511cd49e74a5fef5029c89b4b736f9957a8a..61149dac30713131612dd8e5511b568b09e7764c 100644
--- a/input/grid5000/sites/lille/networks/sw-chiclet-2.yaml
+++ b/input/grid5000/sites/lille/networks/sw-chiclet-2.yaml
@@ -69,18 +69,6 @@ sw-chiclet-2:
13:
uid: chiterne
kind: server
- 15:
- uid: port-channel3
- kind: channel
- 16:
- uid: port-channel3
- kind: channel
- 17:
- uid: port-channel4
- kind: channel
- 18:
- uid: port-channel4
- kind: channel
19:
uid: port-channel5
kind: channel
@@ -111,16 +99,6 @@ sw-chiclet-2:
uid: sw-chiclet-1
kind: switch
rate: 200000000000
- port-channel3:
- port: port-channel3
- uid: granche-srv1
- kind: server
- rate: 20000000000
- port-channel4:
- port: port-channel4
- uid: granche-srv2
- kind: server
- rate: 20000000000
port-channel5:
port: port-channel5
uid: pve-3