diff --git a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-1.json b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-1.json
index 35c3b5c865b9a07cfd10f73635b9941d2c9867c3..2580b13a5db879b6066855b0eb7ec9ac253b335d 100644
--- a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-1.json
+++ b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-1.json
@@ -155,19 +155,24 @@
{
"device": "eth2",
"driver": "ice",
- "enabled": false,
+ "enabled": true,
"firmware_version": "3.20 0x80012765 1.3189.0",
"interface": "Ethernet",
+ "ip": "172.16.160.21",
+ "ip6": "2001:660:4406:a00:1:1:0:1",
"kavlan": false,
"mac": "6c:fe:54:47:1a:84",
"management": false,
"model": "Ethernet Controller E810-C for SFP",
- "mountable": false,
+ "mountable": true,
"mounted": false,
"name": "ens1f0",
+ "network_address": "fleckenstein-1-eth2.strasbourg.grid5000.fr",
"rate": 25000000000,
"sriov": true,
"sriov_totalvfs": 64,
+ "switch": "gw-strasbourg",
+ "switch_port": "Ethernet8",
"vendor": "Intel"
},
{
diff --git a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-10.json b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-10.json
index 45a809a01629de69c78b6ae067fc00bc221a2a9d..efde12785e314690e028cbea385374b13391115c 100644
--- a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-10.json
+++ b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-10.json
@@ -155,19 +155,24 @@
{
"device": "eth2",
"driver": "ice",
- "enabled": false,
+ "enabled": true,
"firmware_version": "3.20 0x80012765 1.3189.0",
"interface": "Ethernet",
+ "ip": "172.16.160.30",
+ "ip6": "2001:660:4406:a00:1:1:0:a",
"kavlan": false,
"mac": "6c:fe:54:47:1a:3c",
"management": false,
"model": "Ethernet Controller E810-C for SFP",
- "mountable": false,
+ "mountable": true,
"mounted": false,
"name": "ens1f0",
+ "network_address": "fleckenstein-10-eth2.strasbourg.grid5000.fr",
"rate": 25000000000,
"sriov": true,
"sriov_totalvfs": 64,
+ "switch": "gw-strasbourg",
+ "switch_port": "Ethernet35",
"vendor": "Intel"
},
{
diff --git a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-2.json b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-2.json
index 1663ba5e2c6c335b564bfcd4a519159572e20c6f..1feebc3b49e238f0ab611a8b5828e714194b6cae 100644
--- a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-2.json
+++ b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-2.json
@@ -155,19 +155,24 @@
{
"device": "eth2",
"driver": "ice",
- "enabled": false,
+ "enabled": true,
"firmware_version": "3.20 0x80012765 1.3189.0",
"interface": "Ethernet",
+ "ip": "172.16.160.22",
+ "ip6": "2001:660:4406:a00:1:1:0:2",
"kavlan": false,
"mac": "6c:fe:54:47:2f:48",
"management": false,
"model": "Ethernet Controller E810-C for SFP",
- "mountable": false,
+ "mountable": true,
"mounted": false,
"name": "ens1f0",
+ "network_address": "fleckenstein-2-eth2.strasbourg.grid5000.fr",
"rate": 25000000000,
"sriov": true,
"sriov_totalvfs": 64,
+ "switch": "gw-strasbourg",
+ "switch_port": "Ethernet11",
"vendor": "Intel"
},
{
diff --git a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-3.json b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-3.json
index d40eb4f63ac31aaf57ef0ea3358043144c00a654..b0ded218deb5661e28bd57c18fb325dc2695cb87 100644
--- a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-3.json
+++ b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-3.json
@@ -155,19 +155,24 @@
{
"device": "eth2",
"driver": "ice",
- "enabled": false,
+ "enabled": true,
"firmware_version": "3.20 0x80012765 1.3189.0",
"interface": "Ethernet",
+ "ip": "172.16.160.23",
+ "ip6": "2001:660:4406:a00:1:1:0:3",
"kavlan": false,
"mac": "6c:fe:54:47:2f:c0",
"management": false,
"model": "Ethernet Controller E810-C for SFP",
- "mountable": false,
+ "mountable": true,
"mounted": false,
"name": "ens1f0",
+ "network_address": "fleckenstein-3-eth2.strasbourg.grid5000.fr",
"rate": 25000000000,
"sriov": true,
"sriov_totalvfs": 64,
+ "switch": "gw-strasbourg",
+ "switch_port": "Ethernet14",
"vendor": "Intel"
},
{
diff --git a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-4.json b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-4.json
index e096a6c9d9fe3ce463519e569243754d9dc05ba1..234334e44cd4542e817ffa8e512cbaf53e441937 100644
--- a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-4.json
+++ b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-4.json
@@ -155,19 +155,24 @@
{
"device": "eth2",
"driver": "ice",
- "enabled": false,
+ "enabled": true,
"firmware_version": "3.20 0x80012765 1.3189.0",
"interface": "Ethernet",
+ "ip": "172.16.160.24",
+ "ip6": "2001:660:4406:a00:1:1:0:4",
"kavlan": false,
"mac": "6c:fe:54:47:2f:d4",
"management": false,
"model": "Ethernet Controller E810-C for SFP",
- "mountable": false,
+ "mountable": true,
"mounted": false,
"name": "ens1f0",
+ "network_address": "fleckenstein-4-eth2.strasbourg.grid5000.fr",
"rate": 25000000000,
"sriov": true,
"sriov_totalvfs": 64,
+ "switch": "gw-strasbourg",
+ "switch_port": "Ethernet17",
"vendor": "Intel"
},
{
diff --git a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-5.json b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-5.json
index b148a812bc6cc0f1c24d475207805a1157d3f063..804830c02699a33c2588d337532a2cda7752ee43 100644
--- a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-5.json
+++ b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-5.json
@@ -155,19 +155,24 @@
{
"device": "eth2",
"driver": "ice",
- "enabled": false,
+ "enabled": true,
"firmware_version": "3.20 0x80012765 1.3189.0",
"interface": "Ethernet",
+ "ip": "172.16.160.25",
+ "ip6": "2001:660:4406:a00:1:1:0:5",
"kavlan": false,
"mac": "6c:fe:54:47:2f:f4",
"management": false,
"model": "Ethernet Controller E810-C for SFP",
- "mountable": false,
+ "mountable": true,
"mounted": false,
"name": "ens1f0",
+ "network_address": "fleckenstein-5-eth2.strasbourg.grid5000.fr",
"rate": 25000000000,
"sriov": true,
"sriov_totalvfs": 64,
+ "switch": "gw-strasbourg",
+ "switch_port": "Ethernet20",
"vendor": "Intel"
},
{
diff --git a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-6.json b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-6.json
index 792206e223fd79a484735b195fbefdfbcf519960..731a3eda66b69bd1551df047b16c120ac7c7fddf 100644
--- a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-6.json
+++ b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-6.json
@@ -155,19 +155,24 @@
{
"device": "eth2",
"driver": "ice",
- "enabled": false,
+ "enabled": true,
"firmware_version": "3.20 0x80012765 1.3189.0",
"interface": "Ethernet",
+ "ip": "172.16.160.26",
+ "ip6": "2001:660:4406:a00:1:1:0:6",
"kavlan": false,
"mac": "6c:fe:54:47:2f:d8",
"management": false,
"model": "Ethernet Controller E810-C for SFP",
- "mountable": false,
+ "mountable": true,
"mounted": false,
"name": "ens1f0",
+ "network_address": "fleckenstein-6-eth2.strasbourg.grid5000.fr",
"rate": 25000000000,
"sriov": true,
"sriov_totalvfs": 64,
+ "switch": "gw-strasbourg",
+ "switch_port": "Ethernet23",
"vendor": "Intel"
},
{
diff --git a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-7.json b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-7.json
index db6730452ac4a19b7dfbafaf5fc562b932e42a1f..52d8c49db446a0c6e813e9499ba9acb51827e29a 100644
--- a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-7.json
+++ b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-7.json
@@ -155,19 +155,24 @@
{
"device": "eth2",
"driver": "ice",
- "enabled": false,
+ "enabled": true,
"firmware_version": "3.20 0x80012765 1.3189.0",
"interface": "Ethernet",
+ "ip": "172.16.160.27",
+ "ip6": "2001:660:4406:a00:1:1:0:7",
"kavlan": false,
"mac": "6c:fe:54:47:28:38",
"management": false,
"model": "Ethernet Controller E810-C for SFP",
- "mountable": false,
+ "mountable": true,
"mounted": false,
"name": "ens1f0",
+ "network_address": "fleckenstein-7-eth2.strasbourg.grid5000.fr",
"rate": 25000000000,
"sriov": true,
"sriov_totalvfs": 64,
+ "switch": "gw-strasbourg",
+ "switch_port": "Ethernet26",
"vendor": "Intel"
},
{
diff --git a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-8.json b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-8.json
index 4cae171c70040f17b9726584330447f14fcca082..b97a88f7b176d37f0b7be2d72d4754b45df1e8aa 100644
--- a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-8.json
+++ b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-8.json
@@ -155,19 +155,24 @@
{
"device": "eth2",
"driver": "ice",
- "enabled": false,
+ "enabled": true,
"firmware_version": "3.20 0x80012765 1.3189.0",
"interface": "Ethernet",
+ "ip": "172.16.160.28",
+ "ip6": "2001:660:4406:a00:1:1:0:8",
"kavlan": false,
"mac": "6c:fe:54:47:26:9c",
"management": false,
"model": "Ethernet Controller E810-C for SFP",
- "mountable": false,
+ "mountable": true,
"mounted": false,
"name": "ens1f0",
+ "network_address": "fleckenstein-8-eth2.strasbourg.grid5000.fr",
"rate": 25000000000,
"sriov": true,
"sriov_totalvfs": 64,
+ "switch": "gw-strasbourg",
+ "switch_port": "Ethernet29",
"vendor": "Intel"
},
{
diff --git a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-9.json b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-9.json
index 6a6437b3c3044aaa7e07403445a26cc6ed9821cc..5a3823f4fc707558d0d6eaa5185ccd7534cae2fa 100644
--- a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-9.json
+++ b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-9.json
@@ -155,19 +155,24 @@
{
"device": "eth2",
"driver": "ice",
- "enabled": false,
+ "enabled": true,
"firmware_version": "3.20 0x80012765 1.3189.0",
"interface": "Ethernet",
+ "ip": "172.16.160.29",
+ "ip6": "2001:660:4406:a00:1:1:0:9",
"kavlan": false,
"mac": "6c:fe:54:47:22:34",
"management": false,
"model": "Ethernet Controller E810-C for SFP",
- "mountable": false,
+ "mountable": true,
"mounted": false,
"name": "ens1f0",
+ "network_address": "fleckenstein-9-eth2.strasbourg.grid5000.fr",
"rate": 25000000000,
"sriov": true,
"sriov_totalvfs": 64,
+ "switch": "gw-strasbourg",
+ "switch_port": "Ethernet32",
"vendor": "Intel"
},
{
diff --git a/data/grid5000/sites/strasbourg/network_equipments/gw-strasbourg.json b/data/grid5000/sites/strasbourg/network_equipments/gw-strasbourg.json
index 7e5e75c93a7ec5178d075f95db526a02c6aceded..838a2a6771f6b31160acac4b486e0a7602af23bd 100644
--- a/data/grid5000/sites/strasbourg/network_equipments/gw-strasbourg.json
+++ b/data/grid5000/sites/strasbourg/network_equipments/gw-strasbourg.json
@@ -1,4 +1,12 @@
{
+ "channels": {
+ "port-channel1": {
+ "kind": "server",
+ "port": "port-channel1",
+ "rate": 50000000000,
+ "uid": "srv-data"
+ }
+ },
"ip": "172.17.175.254",
"ip6": "2001:660:4406:a00::ffff:ffff",
"kind": "router",
@@ -10,22 +18,22 @@
"kind": "node",
"ports": [
{
- "kind": "node",
- "port": "data",
+ "kind": "channel",
"snmp_name": "Ethernet0",
- "uid": "srv"
+ "uid": "port-channel1"
},
{
+ "kind": "channel",
+ "snmp_name": "Ethernet1",
+ "uid": "port-channel1"
},
{
- "kind": "node",
- "port": "eth0",
+ "kind": "server",
"snmp_name": "Ethernet2",
"uid": "pve-1"
},
{
- "kind": "node",
- "port": "eth0",
+ "kind": "server",
"snmp_name": "Ethernet3",
"uid": "pve-2"
},
@@ -40,10 +48,6 @@
"uid": "fleckenstein-1"
},
{
- "kind": "node",
- "port": "eth1",
- "snmp_name": "Ethernet7",
- "uid": "fleckenstein-1"
},
{
"kind": "node",
@@ -58,10 +62,6 @@
"uid": "fleckenstein-2"
},
{
- "kind": "node",
- "port": "eth1",
- "snmp_name": "Ethernet10",
- "uid": "fleckenstein-2"
},
{
"kind": "node",
@@ -76,10 +76,6 @@
"uid": "fleckenstein-3"
},
{
- "kind": "node",
- "port": "eth1",
- "snmp_name": "Ethernet13",
- "uid": "fleckenstein-3"
},
{
"kind": "node",
@@ -94,10 +90,6 @@
"uid": "fleckenstein-4"
},
{
- "kind": "node",
- "port": "eth1",
- "snmp_name": "Ethernet16",
- "uid": "fleckenstein-4"
},
{
"kind": "node",
@@ -112,10 +104,6 @@
"uid": "fleckenstein-5"
},
{
- "kind": "node",
- "port": "eth1",
- "snmp_name": "Ethernet19",
- "uid": "fleckenstein-5"
},
{
"kind": "node",
@@ -130,10 +118,6 @@
"uid": "fleckenstein-6"
},
{
- "kind": "node",
- "port": "eth1",
- "snmp_name": "Ethernet22",
- "uid": "fleckenstein-6"
},
{
"kind": "node",
@@ -148,10 +132,6 @@
"uid": "fleckenstein-7"
},
{
- "kind": "node",
- "port": "eth1",
- "snmp_name": "Ethernet25",
- "uid": "fleckenstein-7"
},
{
"kind": "node",
@@ -166,10 +146,6 @@
"uid": "fleckenstein-8"
},
{
- "kind": "node",
- "port": "eth1",
- "snmp_name": "Ethernet28",
- "uid": "fleckenstein-8"
},
{
"kind": "node",
@@ -184,10 +160,6 @@
"uid": "fleckenstein-9"
},
{
- "kind": "node",
- "port": "eth1",
- "snmp_name": "Ethernet31",
- "uid": "fleckenstein-9"
},
{
"kind": "node",
@@ -202,10 +174,6 @@
"uid": "fleckenstein-10"
},
{
- "kind": "node",
- "port": "eth1",
- "snmp_name": "Ethernet34",
- "uid": "fleckenstein-10"
},
{
"kind": "node",
diff --git a/input/grid5000/ipv4.yaml b/input/grid5000/ipv4.yaml
index 62b33872bf8366cb93549cfddf981855ada1de2b..7042dcec123d1c89cad8843e5cdde3067a42fd62 100644
--- a/input/grid5000/ipv4.yaml
+++ b/input/grid5000/ipv4.yaml
@@ -100,5 +100,7 @@ ipv4:
rennes roazhon13 eth0 0 0 14 44
sophia uvb eth0 0 0 4 0
strasbourg fleckenstein eth0 0 0 0 0
+ strasbourg fleckenstein eth1 0 0 0 10
+ strasbourg fleckenstein eth2 0 0 0 20
toulouse montcalm eth0 0 0 8 0
toulouse estats eth0 0 0 9 0
diff --git a/input/grid5000/sites/strasbourg/clusters/fleckenstein/fleckenstein.yaml b/input/grid5000/sites/strasbourg/clusters/fleckenstein/fleckenstein.yaml
index 2e41440ff851f1feca8db6a5d08814b53bd43ac4..e7e662e46bad4f015058af207cd8b8db948e554a 100644
--- a/input/grid5000/sites/strasbourg/clusters/fleckenstein/fleckenstein.yaml
+++ b/input/grid5000/sites/strasbourg/clusters/fleckenstein/fleckenstein.yaml
@@ -33,8 +33,8 @@ nodes:
mountable: false
mounted: false
eth2:
- enabled: false
- mountable: false
+ enabled: true
+ mountable: true
mounted: false
eth3:
enabled: false
diff --git a/input/grid5000/sites/strasbourg/networks/gw-strasbourg.yml b/input/grid5000/sites/strasbourg/networks/gw-strasbourg.yml
index 614286b6c65ebd236bd786a32f750abd92ab8529..915f6e41173be409c2100dda11577bb6c0b69b0e 100644
--- a/input/grid5000/sites/strasbourg/networks/gw-strasbourg.yml
+++ b/input/grid5000/sites/strasbourg/networks/gw-strasbourg.yml
@@ -66,36 +66,51 @@ gw-strasbourg:
kavlan_pattern: "%PORT%"
kind: node
ports:
- 0: srv-data
- 2: pve-1
- 3: pve-2
+ 0:
+ uid: port-channel1
+ kind: channel
+ 1:
+ uid: port-channel1
+ kind: channel
+ 2:
+ uid: pve-1
+ kind: server
+ 3:
+ uid: pve-2
+ kind: server
6: fleckenstein-1-eth0
- 7: fleckenstein-1-eth1
+ 7:
8: fleckenstein-1-eth2
9: fleckenstein-2-eth0
- 10: fleckenstein-2-eth1
+ 10:
11: fleckenstein-2-eth2
12: fleckenstein-3-eth0
- 13: fleckenstein-3-eth1
+ 13:
14: fleckenstein-3-eth2
15: fleckenstein-4-eth0
- 16: fleckenstein-4-eth1
+ 16:
17: fleckenstein-4-eth2
18: fleckenstein-5-eth0
- 19: fleckenstein-5-eth1
+ 19:
20: fleckenstein-5-eth2
21: fleckenstein-6-eth0
- 22: fleckenstein-6-eth1
+ 22:
23: fleckenstein-6-eth2
24: fleckenstein-7-eth0
- 25: fleckenstein-7-eth1
+ 25:
26: fleckenstein-7-eth2
27: fleckenstein-8-eth0
- 28: fleckenstein-8-eth1
+ 28:
29: fleckenstein-8-eth2
30: fleckenstein-9-eth0
- 31: fleckenstein-9-eth1
+ 31:
32: fleckenstein-9-eth2
33: fleckenstein-10-eth0
- 34: fleckenstein-10-eth1
+ 34:
35: fleckenstein-10-eth2
+ channels:
+ port-channel1:
+ port: port-channel1
+ uid: srv-data
+ rate: 50000000000
+ kind: server