diff --git a/data/grid5000/sites/grenoble/clusters/servan/nodes/servan-1.json b/data/grid5000/sites/grenoble/clusters/servan/nodes/servan-1.json
index ee5f8c32757a29d48589177fc4a35a45ca422270..9bf8b8894600bf04a8e0804627ab5658742ebb07 100644
--- a/data/grid5000/sites/grenoble/clusters/servan/nodes/servan-1.json
+++ b/data/grid5000/sites/grenoble/clusters/servan/nodes/servan-1.json
@@ -42,6 +42,48 @@
"kavlan-8": "10.5.4.1",
"kavlan-9": "10.5.68.1"
},
+ "eth1": {
+ "kavlan-1": "192.168.196.3",
+ "kavlan-11": "10.7.227.3",
+ "kavlan-12": "10.11.227.3",
+ "kavlan-13": "10.15.227.3",
+ "kavlan-14": "10.19.227.3",
+ "kavlan-16": "10.27.227.3",
+ "kavlan-17": "10.31.227.3",
+ "kavlan-18": "10.35.227.3",
+ "kavlan-2": "192.168.212.3",
+ "kavlan-20": "10.43.227.3",
+ "kavlan-21": "10.47.227.3",
+ "kavlan-22": "10.51.227.3",
+ "kavlan-3": "192.168.228.3",
+ "kavlan-4": "10.4.4.3",
+ "kavlan-5": "10.4.68.3",
+ "kavlan-6": "10.4.132.3",
+ "kavlan-7": "10.4.196.3",
+ "kavlan-8": "10.5.4.3",
+ "kavlan-9": "10.5.68.3"
+ },
+ "eth2": {
+ "kavlan-1": "192.168.196.5",
+ "kavlan-11": "10.7.227.5",
+ "kavlan-12": "10.11.227.5",
+ "kavlan-13": "10.15.227.5",
+ "kavlan-14": "10.19.227.5",
+ "kavlan-16": "10.27.227.5",
+ "kavlan-17": "10.31.227.5",
+ "kavlan-18": "10.35.227.5",
+ "kavlan-2": "192.168.212.5",
+ "kavlan-20": "10.43.227.5",
+ "kavlan-21": "10.47.227.5",
+ "kavlan-22": "10.51.227.5",
+ "kavlan-3": "192.168.228.5",
+ "kavlan-4": "10.4.4.5",
+ "kavlan-5": "10.4.68.5",
+ "kavlan-6": "10.4.132.5",
+ "kavlan-7": "10.4.196.5",
+ "kavlan-8": "10.5.4.5",
+ "kavlan-9": "10.5.68.5"
+ },
"fpga0": {
"kavlan-1": "192.168.196.11",
"kavlan-11": "10.7.227.11",
@@ -107,7 +149,7 @@
"kavlan-8": "2001:660:4406:194:8::1",
"kavlan-9": "2001:660:4406:195:8::1"
},
- "fpga0": {
+ "eth1": {
"kavlan-1": "2001:660:4406:180:8:1:0:1",
"kavlan-11": "2001:660:4406:1a0:108:1:0:1",
"kavlan-12": "2001:660:4406:2a0:108:1:0:1",
@@ -128,7 +170,7 @@
"kavlan-8": "2001:660:4406:194:8:1:0:1",
"kavlan-9": "2001:660:4406:195:8:1:0:1"
},
- "fpga1": {
+ "eth2": {
"kavlan-1": "2001:660:4406:180:8:2:0:1",
"kavlan-11": "2001:660:4406:1a0:108:2:0:1",
"kavlan-12": "2001:660:4406:2a0:108:2:0:1",
@@ -148,6 +190,48 @@
"kavlan-7": "2001:660:4406:193:8:2:0:1",
"kavlan-8": "2001:660:4406:194:8:2:0:1",
"kavlan-9": "2001:660:4406:195:8:2:0:1"
+ },
+ "fpga0": {
+ "kavlan-1": "2001:660:4406:180:8:3:0:1",
+ "kavlan-11": "2001:660:4406:1a0:108:3:0:1",
+ "kavlan-12": "2001:660:4406:2a0:108:3:0:1",
+ "kavlan-13": "2001:660:4406:4a0:108:3:0:1",
+ "kavlan-14": "2001:660:4406:5a0:108:3:0:1",
+ "kavlan-16": "2001:660:4406:7a0:108:3:0:1",
+ "kavlan-17": "2001:660:4406:9a0:108:3:0:1",
+ "kavlan-18": "2001:660:4406:8a0:108:3:0:1",
+ "kavlan-2": "2001:660:4406:181:8:3:0:1",
+ "kavlan-20": "2001:660:4406:3a0:108:3:0:1",
+ "kavlan-21": "2001:660:4406:6a0:108:3:0:1",
+ "kavlan-22": "2001:660:4406:ba0:108:3:0:1",
+ "kavlan-3": "2001:660:4406:182:8:3:0:1",
+ "kavlan-4": "2001:660:4406:190:8:3:0:1",
+ "kavlan-5": "2001:660:4406:191:8:3:0:1",
+ "kavlan-6": "2001:660:4406:192:8:3:0:1",
+ "kavlan-7": "2001:660:4406:193:8:3:0:1",
+ "kavlan-8": "2001:660:4406:194:8:3:0:1",
+ "kavlan-9": "2001:660:4406:195:8:3:0:1"
+ },
+ "fpga1": {
+ "kavlan-1": "2001:660:4406:180:8:4:0:1",
+ "kavlan-11": "2001:660:4406:1a0:108:4:0:1",
+ "kavlan-12": "2001:660:4406:2a0:108:4:0:1",
+ "kavlan-13": "2001:660:4406:4a0:108:4:0:1",
+ "kavlan-14": "2001:660:4406:5a0:108:4:0:1",
+ "kavlan-16": "2001:660:4406:7a0:108:4:0:1",
+ "kavlan-17": "2001:660:4406:9a0:108:4:0:1",
+ "kavlan-18": "2001:660:4406:8a0:108:4:0:1",
+ "kavlan-2": "2001:660:4406:181:8:4:0:1",
+ "kavlan-20": "2001:660:4406:3a0:108:4:0:1",
+ "kavlan-21": "2001:660:4406:6a0:108:4:0:1",
+ "kavlan-22": "2001:660:4406:ba0:108:4:0:1",
+ "kavlan-3": "2001:660:4406:182:8:4:0:1",
+ "kavlan-4": "2001:660:4406:190:8:4:0:1",
+ "kavlan-5": "2001:660:4406:191:8:4:0:1",
+ "kavlan-6": "2001:660:4406:192:8:4:0:1",
+ "kavlan-7": "2001:660:4406:193:8:4:0:1",
+ "kavlan-8": "2001:660:4406:194:8:4:0:1",
+ "kavlan-9": "2001:660:4406:195:8:4:0:1"
}
},
"main_memory": {
@@ -228,35 +312,47 @@
{
"device": "eth1",
"driver": "ice",
- "enabled": false,
+ "enabled": true,
"firmware_version": "3.00 0x8000893f 20.5.13",
"interface": "Ethernet",
- "kavlan": false,
+ "ip": "172.16.23.3",
+ "ip6": "2001:660:4406:100:8:1:0:1",
+ "kavlan": true,
"mac": "40:a6:b7:6b:1d:b1",
"management": false,
"model": "Ethernet Controller E810-C for SFP",
- "mountable": false,
+ "mountable": true,
"mounted": false,
"name": "eno34",
+ "network_address": "servan-1-eth1.grenoble.grid5000.fr",
+ "rate": 25000000000,
"sriov": false,
"sriov_totalvfs": 0,
+ "switch": "gw",
+ "switch_port": "ethernet1/1/69",
"vendor": "Intel"
},
{
"device": "eth2",
"driver": "ice",
- "enabled": false,
+ "enabled": true,
"firmware_version": "3.00 0x8000893f 20.5.13",
"interface": "Ethernet",
- "kavlan": false,
+ "ip": "172.16.23.5",
+ "ip6": "2001:660:4406:100:8:2:0:1",
+ "kavlan": true,
"mac": "40:a6:b7:6b:1d:b2",
"management": false,
"model": "Ethernet Controller E810-C for SFP",
- "mountable": false,
+ "mountable": true,
"mounted": false,
"name": "eno35",
+ "network_address": "servan-1-eth2.grenoble.grid5000.fr",
+ "rate": 25000000000,
"sriov": false,
"sriov_totalvfs": 0,
+ "switch": "gw",
+ "switch_port": "ethernet1/1/70",
"vendor": "Intel"
},
{
@@ -294,7 +390,7 @@
"enabled": true,
"interface": "FPGA/Ethernet",
"ip": "172.16.23.11",
- "ip6": "2001:660:4406:100:8:1:0:1",
+ "ip6": "2001:660:4406:100:8:3:0:1",
"kavlan": true,
"mac": "00:0a:35:06:4a:b8",
"management": false,
@@ -316,7 +412,7 @@
"enabled": true,
"interface": "FPGA/Ethernet",
"ip": "172.16.23.21",
- "ip6": "2001:660:4406:100:8:2:0:1",
+ "ip6": "2001:660:4406:100:8:4:0:1",
"kavlan": true,
"mac": "00:0a:35:06:4a:b9",
"management": false,
diff --git a/data/grid5000/sites/grenoble/clusters/servan/nodes/servan-2.json b/data/grid5000/sites/grenoble/clusters/servan/nodes/servan-2.json
index 1b0d43ae2c3603ae3a610f2ef346deb8b43a6e50..3e1417d722ea68e323f4a8dcca23ad15b85b9f8b 100644
--- a/data/grid5000/sites/grenoble/clusters/servan/nodes/servan-2.json
+++ b/data/grid5000/sites/grenoble/clusters/servan/nodes/servan-2.json
@@ -42,6 +42,48 @@
"kavlan-8": "10.5.4.2",
"kavlan-9": "10.5.68.2"
},
+ "eth1": {
+ "kavlan-1": "192.168.196.4",
+ "kavlan-11": "10.7.227.4",
+ "kavlan-12": "10.11.227.4",
+ "kavlan-13": "10.15.227.4",
+ "kavlan-14": "10.19.227.4",
+ "kavlan-16": "10.27.227.4",
+ "kavlan-17": "10.31.227.4",
+ "kavlan-18": "10.35.227.4",
+ "kavlan-2": "192.168.212.4",
+ "kavlan-20": "10.43.227.4",
+ "kavlan-21": "10.47.227.4",
+ "kavlan-22": "10.51.227.4",
+ "kavlan-3": "192.168.228.4",
+ "kavlan-4": "10.4.4.4",
+ "kavlan-5": "10.4.68.4",
+ "kavlan-6": "10.4.132.4",
+ "kavlan-7": "10.4.196.4",
+ "kavlan-8": "10.5.4.4",
+ "kavlan-9": "10.5.68.4"
+ },
+ "eth2": {
+ "kavlan-1": "192.168.196.6",
+ "kavlan-11": "10.7.227.6",
+ "kavlan-12": "10.11.227.6",
+ "kavlan-13": "10.15.227.6",
+ "kavlan-14": "10.19.227.6",
+ "kavlan-16": "10.27.227.6",
+ "kavlan-17": "10.31.227.6",
+ "kavlan-18": "10.35.227.6",
+ "kavlan-2": "192.168.212.6",
+ "kavlan-20": "10.43.227.6",
+ "kavlan-21": "10.47.227.6",
+ "kavlan-22": "10.51.227.6",
+ "kavlan-3": "192.168.228.6",
+ "kavlan-4": "10.4.4.6",
+ "kavlan-5": "10.4.68.6",
+ "kavlan-6": "10.4.132.6",
+ "kavlan-7": "10.4.196.6",
+ "kavlan-8": "10.5.4.6",
+ "kavlan-9": "10.5.68.6"
+ },
"fpga0": {
"kavlan-1": "192.168.196.12",
"kavlan-11": "10.7.227.12",
@@ -107,7 +149,7 @@
"kavlan-8": "2001:660:4406:194:8::2",
"kavlan-9": "2001:660:4406:195:8::2"
},
- "fpga0": {
+ "eth1": {
"kavlan-1": "2001:660:4406:180:8:1:0:2",
"kavlan-11": "2001:660:4406:1a0:108:1:0:2",
"kavlan-12": "2001:660:4406:2a0:108:1:0:2",
@@ -128,7 +170,7 @@
"kavlan-8": "2001:660:4406:194:8:1:0:2",
"kavlan-9": "2001:660:4406:195:8:1:0:2"
},
- "fpga1": {
+ "eth2": {
"kavlan-1": "2001:660:4406:180:8:2:0:2",
"kavlan-11": "2001:660:4406:1a0:108:2:0:2",
"kavlan-12": "2001:660:4406:2a0:108:2:0:2",
@@ -148,6 +190,48 @@
"kavlan-7": "2001:660:4406:193:8:2:0:2",
"kavlan-8": "2001:660:4406:194:8:2:0:2",
"kavlan-9": "2001:660:4406:195:8:2:0:2"
+ },
+ "fpga0": {
+ "kavlan-1": "2001:660:4406:180:8:3:0:2",
+ "kavlan-11": "2001:660:4406:1a0:108:3:0:2",
+ "kavlan-12": "2001:660:4406:2a0:108:3:0:2",
+ "kavlan-13": "2001:660:4406:4a0:108:3:0:2",
+ "kavlan-14": "2001:660:4406:5a0:108:3:0:2",
+ "kavlan-16": "2001:660:4406:7a0:108:3:0:2",
+ "kavlan-17": "2001:660:4406:9a0:108:3:0:2",
+ "kavlan-18": "2001:660:4406:8a0:108:3:0:2",
+ "kavlan-2": "2001:660:4406:181:8:3:0:2",
+ "kavlan-20": "2001:660:4406:3a0:108:3:0:2",
+ "kavlan-21": "2001:660:4406:6a0:108:3:0:2",
+ "kavlan-22": "2001:660:4406:ba0:108:3:0:2",
+ "kavlan-3": "2001:660:4406:182:8:3:0:2",
+ "kavlan-4": "2001:660:4406:190:8:3:0:2",
+ "kavlan-5": "2001:660:4406:191:8:3:0:2",
+ "kavlan-6": "2001:660:4406:192:8:3:0:2",
+ "kavlan-7": "2001:660:4406:193:8:3:0:2",
+ "kavlan-8": "2001:660:4406:194:8:3:0:2",
+ "kavlan-9": "2001:660:4406:195:8:3:0:2"
+ },
+ "fpga1": {
+ "kavlan-1": "2001:660:4406:180:8:4:0:2",
+ "kavlan-11": "2001:660:4406:1a0:108:4:0:2",
+ "kavlan-12": "2001:660:4406:2a0:108:4:0:2",
+ "kavlan-13": "2001:660:4406:4a0:108:4:0:2",
+ "kavlan-14": "2001:660:4406:5a0:108:4:0:2",
+ "kavlan-16": "2001:660:4406:7a0:108:4:0:2",
+ "kavlan-17": "2001:660:4406:9a0:108:4:0:2",
+ "kavlan-18": "2001:660:4406:8a0:108:4:0:2",
+ "kavlan-2": "2001:660:4406:181:8:4:0:2",
+ "kavlan-20": "2001:660:4406:3a0:108:4:0:2",
+ "kavlan-21": "2001:660:4406:6a0:108:4:0:2",
+ "kavlan-22": "2001:660:4406:ba0:108:4:0:2",
+ "kavlan-3": "2001:660:4406:182:8:4:0:2",
+ "kavlan-4": "2001:660:4406:190:8:4:0:2",
+ "kavlan-5": "2001:660:4406:191:8:4:0:2",
+ "kavlan-6": "2001:660:4406:192:8:4:0:2",
+ "kavlan-7": "2001:660:4406:193:8:4:0:2",
+ "kavlan-8": "2001:660:4406:194:8:4:0:2",
+ "kavlan-9": "2001:660:4406:195:8:4:0:2"
}
},
"main_memory": {
@@ -228,35 +312,47 @@
{
"device": "eth1",
"driver": "ice",
- "enabled": false,
+ "enabled": true,
"firmware_version": "3.00 0x8000893f 20.5.13",
"interface": "Ethernet",
- "kavlan": false,
+ "ip": "172.16.23.4",
+ "ip6": "2001:660:4406:100:8:1:0:2",
+ "kavlan": true,
"mac": "40:a6:b7:6b:13:41",
"management": false,
"model": "Ethernet Controller E810-C for SFP",
- "mountable": false,
+ "mountable": true,
"mounted": false,
"name": "eno34",
+ "network_address": "servan-2-eth1.grenoble.grid5000.fr",
+ "rate": 25000000000,
"sriov": false,
"sriov_totalvfs": 0,
+ "switch": "gw",
+ "switch_port": "ethernet1/1/71",
"vendor": "Intel"
},
{
"device": "eth2",
"driver": "ice",
- "enabled": false,
+ "enabled": true,
"firmware_version": "3.00 0x8000893f 20.5.13",
"interface": "Ethernet",
- "kavlan": false,
+ "ip": "172.16.23.6",
+ "ip6": "2001:660:4406:100:8:2:0:2",
+ "kavlan": true,
"mac": "40:a6:b7:6b:13:42",
"management": false,
"model": "Ethernet Controller E810-C for SFP",
- "mountable": false,
+ "mountable": true,
"mounted": false,
"name": "eno35",
+ "network_address": "servan-2-eth2.grenoble.grid5000.fr",
+ "rate": 25000000000,
"sriov": false,
"sriov_totalvfs": 0,
+ "switch": "gw",
+ "switch_port": "ethernet1/1/72",
"vendor": "Intel"
},
{
@@ -294,7 +390,7 @@
"enabled": true,
"interface": "FPGA/Ethernet",
"ip": "172.16.23.12",
- "ip6": "2001:660:4406:100:8:1:0:2",
+ "ip6": "2001:660:4406:100:8:3:0:2",
"kavlan": true,
"mac": "00:0a:35:06:4a:dc",
"management": false,
@@ -316,7 +412,7 @@
"enabled": true,
"interface": "FPGA/Ethernet",
"ip": "172.16.23.22",
- "ip6": "2001:660:4406:100:8:2:0:2",
+ "ip6": "2001:660:4406:100:8:4:0:2",
"kavlan": true,
"mac": "00:0a:35:06:4a:dd",
"management": false,
diff --git a/data/grid5000/sites/grenoble/clusters/servan/servan.json b/data/grid5000/sites/grenoble/clusters/servan/servan.json
index f39dc148d376297b4ea2250154c32017d4e83300..afa6bf7aa90f43517a5474cf3421f0dac8a19701 100644
--- a/data/grid5000/sites/grenoble/clusters/servan/servan.json
+++ b/data/grid5000/sites/grenoble/clusters/servan/servan.json
@@ -347,6 +347,182 @@
"protocol": "network_equipment"
}
},
+ {
+ "description": "Input byte counter for the network device port",
+ "labels": {
+ "interface": "eth1"
+ },
+ "name": "network_ifacein_bytes_total",
+ "period": 15000,
+ "source": {
+ "protocol": "network_equipment"
+ }
+ },
+ {
+ "description": "Output byte counter for the network device port",
+ "labels": {
+ "interface": "eth1"
+ },
+ "name": "network_ifaceout_bytes_total",
+ "period": 15000,
+ "source": {
+ "protocol": "network_equipment"
+ }
+ },
+ {
+ "description": "Input packet counter for the network device port",
+ "labels": {
+ "interface": "eth1"
+ },
+ "name": "network_ifacein_packets_total",
+ "period": 15000,
+ "source": {
+ "protocol": "network_equipment"
+ }
+ },
+ {
+ "description": "Output packet counter for the network device port",
+ "labels": {
+ "interface": "eth1"
+ },
+ "name": "network_ifaceout_packets_total",
+ "period": 15000,
+ "source": {
+ "protocol": "network_equipment"
+ }
+ },
+ {
+ "description": "Input counter of discarded packets for the network device port",
+ "labels": {
+ "interface": "eth1"
+ },
+ "name": "network_ifacein_packets_discard_total",
+ "period": 15000,
+ "source": {
+ "protocol": "network_equipment"
+ }
+ },
+ {
+ "description": "Output counter of discarded packets for the network device port",
+ "labels": {
+ "interface": "eth1"
+ },
+ "name": "network_ifaceout_packets_discard_total",
+ "period": 15000,
+ "source": {
+ "protocol": "network_equipment"
+ }
+ },
+ {
+ "description": "Input counter of packet errors for the network device port",
+ "labels": {
+ "interface": "eth1"
+ },
+ "name": "network_ifacein_packets_error_total",
+ "period": 15000,
+ "source": {
+ "protocol": "network_equipment"
+ }
+ },
+ {
+ "description": "Output counter of packet errors for the network device port",
+ "labels": {
+ "interface": "eth1"
+ },
+ "name": "network_ifaceout_packets_error_total",
+ "period": 15000,
+ "source": {
+ "protocol": "network_equipment"
+ }
+ },
+ {
+ "description": "Input byte counter for the network device port",
+ "labels": {
+ "interface": "eth2"
+ },
+ "name": "network_ifacein_bytes_total",
+ "period": 15000,
+ "source": {
+ "protocol": "network_equipment"
+ }
+ },
+ {
+ "description": "Output byte counter for the network device port",
+ "labels": {
+ "interface": "eth2"
+ },
+ "name": "network_ifaceout_bytes_total",
+ "period": 15000,
+ "source": {
+ "protocol": "network_equipment"
+ }
+ },
+ {
+ "description": "Input packet counter for the network device port",
+ "labels": {
+ "interface": "eth2"
+ },
+ "name": "network_ifacein_packets_total",
+ "period": 15000,
+ "source": {
+ "protocol": "network_equipment"
+ }
+ },
+ {
+ "description": "Output packet counter for the network device port",
+ "labels": {
+ "interface": "eth2"
+ },
+ "name": "network_ifaceout_packets_total",
+ "period": 15000,
+ "source": {
+ "protocol": "network_equipment"
+ }
+ },
+ {
+ "description": "Input counter of discarded packets for the network device port",
+ "labels": {
+ "interface": "eth2"
+ },
+ "name": "network_ifacein_packets_discard_total",
+ "period": 15000,
+ "source": {
+ "protocol": "network_equipment"
+ }
+ },
+ {
+ "description": "Output counter of discarded packets for the network device port",
+ "labels": {
+ "interface": "eth2"
+ },
+ "name": "network_ifaceout_packets_discard_total",
+ "period": 15000,
+ "source": {
+ "protocol": "network_equipment"
+ }
+ },
+ {
+ "description": "Input counter of packet errors for the network device port",
+ "labels": {
+ "interface": "eth2"
+ },
+ "name": "network_ifacein_packets_error_total",
+ "period": 15000,
+ "source": {
+ "protocol": "network_equipment"
+ }
+ },
+ {
+ "description": "Output counter of packet errors for the network device port",
+ "labels": {
+ "interface": "eth2"
+ },
+ "name": "network_ifaceout_packets_error_total",
+ "period": 15000,
+ "source": {
+ "protocol": "network_equipment"
+ }
+ },
{
"description": "Input byte counter for the network device port",
"labels": {
@@ -526,7 +702,7 @@
],
"model": "Dell PowerEdge R7525",
"nodes_count": 2,
- "nodes_description": "2 CPUs AMD EPYC 7352, 24 cores/CPU, 128GB RAM, 2x1490GB SSD, 1 x 25Gb Ethernet, 2 x 100Gb FPGA/Ethernet",
+ "nodes_description": "2 CPUs AMD EPYC 7352, 24 cores/CPU, 128GB RAM, 2x1490GB SSD, 3 x 25Gb Ethernet, 2 x 100Gb FPGA/Ethernet",
"priority": 202112,
"queues": [
"admin",
diff --git a/data/grid5000/sites/grenoble/network_equipments/gw.json b/data/grid5000/sites/grenoble/network_equipments/gw.json
index b93a7f83b7c120cc15042f777060faf63fd4d444..dfa8b9fda2121bbc15ad85f809d656ef16c9b69f 100644
--- a/data/grid5000/sites/grenoble/network_equipments/gw.json
+++ b/data/grid5000/sites/grenoble/network_equipments/gw.json
@@ -415,12 +415,36 @@
"uid": "port-channel50"
},
{
+ "kavlan_pattern": "ethernet1/1/%PORT%",
+ "kind": "node",
+ "port": "eth1",
+ "rate": 25000000000,
+ "snmp_name": "ethernet1/1/69",
+ "uid": "servan-1"
},
{
+ "kavlan_pattern": "ethernet1/1/%PORT%",
+ "kind": "node",
+ "port": "eth2",
+ "rate": 25000000000,
+ "snmp_name": "ethernet1/1/70",
+ "uid": "servan-1"
},
{
+ "kavlan_pattern": "ethernet1/1/%PORT%",
+ "kind": "node",
+ "port": "eth1",
+ "rate": 25000000000,
+ "snmp_name": "ethernet1/1/71",
+ "uid": "servan-2"
},
{
+ "kavlan_pattern": "ethernet1/1/%PORT%",
+ "kind": "node",
+ "port": "eth2",
+ "rate": 25000000000,
+ "snmp_name": "ethernet1/1/72",
+ "uid": "servan-2"
},
{
},
diff --git a/input/grid5000/ipv4.yaml b/input/grid5000/ipv4.yaml
index cd8553721423fd29fd5ef37b675a93648a7d48d1..27f1a61ae8648519cdf7681e2bd62fd742856e24 100644
--- a/input/grid5000/ipv4.yaml
+++ b/input/grid5000/ipv4.yaml
@@ -22,6 +22,8 @@ ipv4:
grenoble troll eth1 0 0 6 4
grenoble troll ib0 0 0 5 0
grenoble servan eth0 0 0 7 0
+ grenoble servan eth1 0 0 7 2
+ grenoble servan eth2 0 0 7 4
grenoble servan fpga0 0 0 7 10
grenoble servan fpga1 0 0 7 20
grenoble drac eth0 0 0 8 0
diff --git a/input/grid5000/sites/grenoble/clusters/servan/nodes/servan-1.yaml b/input/grid5000/sites/grenoble/clusters/servan/nodes/servan-1.yaml
index de49e02f6636eb6abff1366a25b6b97452945d9f..03f864b1ef3d43d2ea9b8392b11c5072f0544459 100644
--- a/input/grid5000/sites/grenoble/clusters/servan/nodes/servan-1.yaml
+++ b/input/grid5000/sites/grenoble/clusters/servan/nodes/servan-1.yaml
@@ -69,6 +69,8 @@ servan-1:
management: false
model: Ethernet Controller E810-C for SFP
name: eno34
+ rate: 25000000000
+ sriov: false
sriov: false
sriov_totalvfs: 0
vendor: Intel
@@ -80,6 +82,8 @@ servan-1:
management: false
model: Ethernet Controller E810-C for SFP
name: eno35
+ rate: 25000000000
+ sriov: false
sriov: false
sriov_totalvfs: 0
vendor: Intel
diff --git a/input/grid5000/sites/grenoble/clusters/servan/nodes/servan-2.yaml b/input/grid5000/sites/grenoble/clusters/servan/nodes/servan-2.yaml
index 21b51482259408a9812b42574c1c28c371c3207c..c91c32d594267ade1b74393740a1dd72606f2121 100644
--- a/input/grid5000/sites/grenoble/clusters/servan/nodes/servan-2.yaml
+++ b/input/grid5000/sites/grenoble/clusters/servan/nodes/servan-2.yaml
@@ -69,6 +69,7 @@ servan-2:
management: false
model: Ethernet Controller E810-C for SFP
name: eno34
+ rate: 25000000000
sriov: false
sriov_totalvfs: 0
vendor: Intel
@@ -80,6 +81,7 @@ servan-2:
management: false
model: Ethernet Controller E810-C for SFP
name: eno35
+ rate: 25000000000
sriov: false
sriov_totalvfs: 0
vendor: Intel
diff --git a/input/grid5000/sites/grenoble/clusters/servan/servan.yaml b/input/grid5000/sites/grenoble/clusters/servan/servan.yaml
index 2a7a6528fdefbe28fd1e55a5e487ecf53c1b3b8f..d9e541cfc9400ca1816baa9ab53ad3333782fcbb 100644
--- a/input/grid5000/sites/grenoble/clusters/servan/servan.yaml
+++ b/input/grid5000/sites/grenoble/clusters/servan/servan.yaml
@@ -28,12 +28,12 @@ nodes:
mountable: true
mounted: true
eth1:
- enabled: false
- mountable: false
+ enabled: true
+ mountable: true
mounted: false
eth2:
- enabled: false
- mountable: false
+ enabled: true
+ mountable: true
mounted: false
eth3:
enabled: false
diff --git a/input/grid5000/sites/grenoble/networks/gw-grenoble.yaml b/input/grid5000/sites/grenoble/networks/gw-grenoble.yaml
index a66e1a07881b8429afe03fb4fec04f234336acc6..f12b3705d5f6be83ccc256b7fde34121ca40eb81 100644
--- a/input/grid5000/sites/grenoble/networks/gw-grenoble.yaml
+++ b/input/grid5000/sites/grenoble/networks/gw-grenoble.yaml
@@ -208,6 +208,26 @@ gw:
kind: channel
rate: 25_000_000_000
snmp_pattern: "ethernet1/1/%PORT%"
+ 69:
+ uid: servan-1-eth1
+ snmp_pattern: "ethernet1/1/%PORT%"
+ kavlan_pattern: "ethernet1/1/%PORT%"
+ rate: 25000000000
+ 70:
+ uid: servan-1-eth2
+ snmp_pattern: "ethernet1/1/%PORT%"
+ kavlan_pattern: "ethernet1/1/%PORT%"
+ rate: 25000000000
+ 71:
+ uid: servan-2-eth1
+ snmp_pattern: "ethernet1/1/%PORT%"
+ kavlan_pattern: "ethernet1/1/%PORT%"
+ rate: 25000000000
+ 72:
+ uid: servan-2-eth2
+ snmp_pattern: "ethernet1/1/%PORT%"
+ kavlan_pattern: "ethernet1/1/%PORT%"
+ rate: 25000000000
75:
uid: port-channel30
kind: channel
diff --git a/input/grid5000/vlans.yaml b/input/grid5000/vlans.yaml
index 7d1deb2f14cf4bcb77232e1b36b03856e4802dd7..115f7b42bfffd0b1f593f72d574dbd3a6634dbdf 100644
--- a/input/grid5000/vlans.yaml
+++ b/input/grid5000/vlans.yaml
@@ -73,6 +73,8 @@ vlans:
local grenoble troll eth1 0 0 2 4
local grenoble drac eth0 0 0 3 0
local grenoble servan eth0 0 0 4 0
+ local grenoble servan eth1 0 0 4 2
+ local grenoble servan eth2 0 0 4 4
local grenoble servan fpga0 0 0 4 10
local grenoble servan fpga1 0 0 4 20
local grenoble nessie eth0 0 0 5 0
@@ -255,6 +257,8 @@ vlans:
global rennes parasilo eth0 0 0 33 0
global rennes parasilo eth1 0 0 33 100
global grenoble servan eth0 0 0 35 0
+ global grenoble servan eth1 0 0 35 2
+ global grenoble servan eth2 0 0 35 4
global grenoble servan fpga0 0 0 35 10
global grenoble servan fpga1 0 0 35 20
global rennes paradoxe eth0 0 0 36 0
@@ -365,6 +369,8 @@ vlans:
routed grenoble troll eth1 0 4 2 4
routed grenoble drac eth0 0 4 3 0
routed grenoble servan eth0 0 4 4 0
+ routed grenoble servan eth1 0 4 4 2
+ routed grenoble servan eth2 0 4 4 4
routed grenoble servan fpga0 0 4 4 10
routed grenoble servan fpga1 0 4 4 20
routed grenoble kinovis eth0 0 4 5 0