Merge branch 'fpga-nic' into 'master'

[grenoble][servan] change the FPGA nic driver to n/a (xrt is not a network driver) and type to Ethernet

See merge request !396

data/grid5000/sites/grenoble/clusters/servan/nodes/servan-1.json

@@ -276,9 +276,9 @@
     },
     {
       "device": "fpga0",
-      "driver": "xrt",
+      "driver": "n/a",
       "enabled": true,
-      "interface": "Ethernet-FPGA",
+      "interface": "Ethernet",
       "ip": "172.16.23.11",
       "ip6": "2001:660:4406:100:8:1:0:1",
       "kavlan": true,
@@ -287,6 +287,7 @@
       "model": "Alveo U200 QSFP28 (100GbE)",
       "mountable": true,
       "mounted": false,
+      "name": "fpga0",
       "network_address": "servan-1-fpga0.grenoble.grid5000.fr",
       "rate": 100000000000,
       "sriov": false,
@@ -297,9 +298,9 @@
     },
     {
       "device": "fpga1",
-      "driver": "xrt",
+      "driver": "n/a",
       "enabled": true,
-      "interface": "Ethernet-FPGA",
+      "interface": "Ethernet",
       "ip": "172.16.23.21",
       "ip6": "2001:660:4406:100:8:2:0:1",
       "kavlan": true,
@@ -308,6 +309,7 @@
       "model": "Alveo U200 QSFP28 (100GbE)",
       "mountable": true,
       "mounted": false,
+      "name": "fpga1",
       "network_address": "servan-1-fpga1.grenoble.grid5000.fr",
       "rate": 100000000000,
       "sriov": false,

data/grid5000/sites/grenoble/clusters/servan/nodes/servan-2.json

@@ -276,9 +276,9 @@
     },
     {
       "device": "fpga0",
-      "driver": "xrt",
+      "driver": "n/a",
       "enabled": true,
-      "interface": "Ethernet-FPGA",
+      "interface": "Ethernet",
       "ip": "172.16.23.12",
       "ip6": "2001:660:4406:100:8:1:0:2",
       "kavlan": true,
@@ -287,6 +287,7 @@
       "model": "Alveo U200 QSFP28 (100GbE)",
       "mountable": true,
       "mounted": false,
+      "name": "fpga0",
       "network_address": "servan-2-fpga0.grenoble.grid5000.fr",
       "rate": 100000000000,
       "sriov": false,
@@ -297,9 +298,9 @@
     },
     {
       "device": "fpga1",
-      "driver": "xrt",
+      "driver": "n/a",
       "enabled": true,
-      "interface": "Ethernet-FPGA",
+      "interface": "Ethernet",
       "ip": "172.16.23.22",
       "ip6": "2001:660:4406:100:8:2:0:2",
       "kavlan": true,
@@ -308,6 +309,7 @@
       "model": "Alveo U200 QSFP28 (100GbE)",
       "mountable": true,
       "mounted": false,
+      "name": "fpga1",
       "network_address": "servan-2-fpga1.grenoble.grid5000.fr",
       "rate": 100000000000,
       "sriov": false,

data/grid5000/sites/grenoble/clusters/servan/servan.json

@@ -345,6 +345,182 @@
       "source": {
         "protocol": "network_equipment"
       }
+    },
+    {
+      "description": "Input byte counter for the network device port",
+      "labels": {
+        "interface": "fpga0"
+      },
+      "name": "network_ifacein_bytes_total",
+      "period": 15000,
+      "source": {
+        "protocol": "network_equipment"
+      }
+    },
+    {
+      "description": "Output byte counter for the network device port",
+      "labels": {
+        "interface": "fpga0"
+      },
+      "name": "network_ifaceout_bytes_total",
+      "period": 15000,
+      "source": {
+        "protocol": "network_equipment"
+      }
+    },
+    {
+      "description": "Input packet counter for the network device port",
+      "labels": {
+        "interface": "fpga0"
+      },
+      "name": "network_ifacein_packets_total",
+      "period": 15000,
+      "source": {
+        "protocol": "network_equipment"
+      }
+    },
+    {
+      "description": "Output packet counter for the network device port",
+      "labels": {
+        "interface": "fpga0"
+      },
+      "name": "network_ifaceout_packets_total",
+      "period": 15000,
+      "source": {
+        "protocol": "network_equipment"
+      }
+    },
+    {
+      "description": "Input counter of discarded packets for the network device port",
+      "labels": {
+        "interface": "fpga0"
+      },
+      "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": "fpga0"
+      },
+      "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": "fpga0"
+      },
+      "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": "fpga0"
+      },
+      "name": "network_ifaceout_packets_error_total",
+      "period": 15000,
+      "source": {
+        "protocol": "network_equipment"
+      }
+    },
+    {
+      "description": "Input byte counter for the network device port",
+      "labels": {
+        "interface": "fpga1"
+      },
+      "name": "network_ifacein_bytes_total",
+      "period": 15000,
+      "source": {
+        "protocol": "network_equipment"
+      }
+    },
+    {
+      "description": "Output byte counter for the network device port",
+      "labels": {
+        "interface": "fpga1"
+      },
+      "name": "network_ifaceout_bytes_total",
+      "period": 15000,
+      "source": {
+        "protocol": "network_equipment"
+      }
+    },
+    {
+      "description": "Input packet counter for the network device port",
+      "labels": {
+        "interface": "fpga1"
+      },
+      "name": "network_ifacein_packets_total",
+      "period": 15000,
+      "source": {
+        "protocol": "network_equipment"
+      }
+    },
+    {
+      "description": "Output packet counter for the network device port",
+      "labels": {
+        "interface": "fpga1"
+      },
+      "name": "network_ifaceout_packets_total",
+      "period": 15000,
+      "source": {
+        "protocol": "network_equipment"
+      }
+    },
+    {
+      "description": "Input counter of discarded packets for the network device port",
+      "labels": {
+        "interface": "fpga1"
+      },
+      "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": "fpga1"
+      },
+      "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": "fpga1"
+      },
+      "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": "fpga1"
+      },
+      "name": "network_ifaceout_packets_error_total",
+      "period": 15000,
+      "source": {
+        "protocol": "network_equipment"
+      }
     }
   ],
   "model": "Dell PowerEdge R7525",

input/grid5000/sites/grenoble/clusters/servan/servan.yaml

@@ -40,7 +40,7 @@ nodes:
         mountable: false
         mounted: false
       fpga0:
-        interface: Ethernet-FPGA
+        interface: Ethernet
         enabled: true
         management: false
         mountable: true
@@ -49,8 +49,12 @@ nodes:
         rate: 100000000000
         sriov: false
         sriov_totalvfs: 0
+        name: fpga0
+        driver: n/a
+        model: Alveo U200 QSFP28 (100GbE)
+        vendor: Xilinx
       fpga1:
-        interface: Ethernet-FPGA
+        interface: Ethernet
         management: false
         enabled: true
         mountable: true
@@ -59,6 +63,10 @@ nodes:
         rate: 100000000000
         sriov: false
         sriov_totalvfs: 0
+        name: fpga1
+        driver: n/a
+        model: Alveo U200 QSFP28 (100GbE)
+        vendor: Xilinx
     storage_devices:
       pci-0000:c3:00.0-nvme-1:
         interface: NVME
@@ -74,26 +82,14 @@ nodes:
     network_adapters:
       fpga0:
         mac: 00:0A:35:06:4A:B8
-        driver: xrt
-        model: Alveo U200 QSFP28 (100GbE)
-        vendor: Xilinx
       fpga1:
         mac: 00:0A:35:06:4A:B9
-        driver: xrt
-        model: Alveo U200 QSFP28 (100GbE)
-        vendor: Xilinx
   servan-2:
     network_adapters:
       fpga0:
         mac: 00:0A:35:06:4A:DC
-        driver: xrt
-        model: Alveo U200 QSFP28 (100GbE)
-        vendor: Xilinx
       fpga1:
         mac: 00:0A:35:06:4A:DD
-        driver: xrt
-        model: Alveo U200 QSFP28 (100GbE)
-        vendor: Xilinx