Revert "Merge branch 'sirius10G' into 'master'"

This reverts merge request !384

data/grid5000/sites/lyon/clusters/sirius/nodes/sirius-1.json

@@ -252,44 +252,44 @@
   "network_adapters": [
     {
       "device": "eth0",
-      "driver": "mlx5_core",
+      "driver": "igb",
       "enabled": true,
-      "firmware_version": "20.28.4000 (MT_0000000225)",
+      "firmware_version": "3.25, 0x800005cc",
       "interface": "Ethernet",
       "ip": "172.16.56.1",
       "ip6": "2001:660:4406:400:9::1",
       "kavlan": true,
-      "mac": "b8:ce:f6:2d:18:d6",
+      "mac": "5c:ff:35:e3:84:29",
       "management": false,
-      "model": "MT28908 Family [ConnectX-6]",
+      "model": "I210 Gigabit Network Connection",
       "mountable": true,
       "mounted": true,
-      "name": "enp225s0f0np0",
+      "name": "enp226s0",
       "network_address": "sirius-1.lyon.grid5000.fr",
-      "rate": 10000000000,
+      "rate": 1000000000,
       "sriov": false,
       "sriov_totalvfs": 0,
       "switch": "gw",
-      "switch_port": "ethernet1/1/26",
-      "vendor": "Mellanox Technologies"
+      "switch_port": "ethernet1/1/7",
+      "vendor": "Intel"
     },
     {
       "device": "eth1",
-      "driver": "igb",
+      "driver": "mlx5_core",
       "enabled": false,
-      "firmware_version": "3.25, 0x800005cc",
+      "firmware_version": "20.28.4000 (MT_0000000225)",
       "interface": "Ethernet",
       "kavlan": false,
-      "mac": "5c:ff:35:e3:84:29",
+      "mac": "b8:ce:f6:2d:18:d6",
       "management": false,
-      "model": "I210 Gigabit Network Connection",
+      "model": "MT28908 Family [ConnectX-6]",
       "mountable": false,
       "mounted": false,
-      "name": "enp226s0",
-      "rate": 1000000000,
+      "name": "enp225s0f0np0",
+      "rate": 100000000000,
       "sriov": false,
       "sriov_totalvfs": 0,
-      "vendor": "Intel"
+      "vendor": "Mellanox Technologies"
     },
     {
       "device": "eth2",

data/grid5000/sites/lyon/network_equipments/gw.json

@@ -54,6 +54,11 @@
           "uid": "pyxis-4"
         },
         {
+          "kind": "node",
+          "port": "eth0",
+          "rate": 1000000000,
+          "snmp_name": "ethernet1/1/7",
+          "uid": "sirius-1"
         },
         {
           "kind": "switch",
@@ -152,10 +157,6 @@
           "uid": "force10"
         },
         {
-          "kind": "node",
-          "port": "eth0",
-          "snmp_name": "ethernet1/1/26",
-          "uid": "sirius-1"
         },
         {
         },

input/grid5000/sites/lyon/clusters/sirius/nodes/sirius-1.yaml

@@ -88,10 +88,11 @@ sirius-1:
       ip: 172.17.56.1
       mac: 5c:ff:35:e3:84:be
       management: true
-    eth1:
+    eth0:
       driver: igb
       firmware_version: 3.25, 0x800005cc
       interface: Ethernet
+      ip: 172.16.56.1
       mac: 5c:ff:35:e3:84:29
       management: false
       model: I210 Gigabit Network Connection
@@ -100,13 +101,12 @@ sirius-1:
       sriov: false
       sriov_totalvfs: 0
       vendor: Intel
-    eth0:
+    eth1:
       name: enp225s0f0np0
       interface: Ethernet
       driver: mlx5_core
-      ip: 172.16.56.1
       mac: b8:ce:f6:2d:18:d6
-      rate: 10000000000
+      rate: 100000000000
       firmware_version: 20.28.4000 (MT_0000000225)
       model: MT28908 Family [ConnectX-6]
       vendor: Mellanox Technologies

input/grid5000/sites/lyon/networks/gw-lyon.yaml

@@ -127,6 +127,9 @@ gw:
         4: pyxis-2
         5: pyxis-3
         6: pyxis-4
+        7:
+          uid: sirius-1
+          rate: 1000000000
         8:
          uid: sneowise
          kind: switch
@@ -158,7 +161,6 @@ gw:
           uid: force10
           kind: switch
           port: '0:60'
-        26: sirius-1
         29:
           uid: sw-admin
           kind: other