[grenoble][vercors3] add predictable network interfaces mapping and fix typo

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

@@ -54,6 +54,27 @@
       "switch": "imag-1b-F2-prod-01",
       "switch_port": "1/1/7"
     },
+    {
+      "device": "eth1",
+      "enabled": false,
+      "kavlan": false,
+      "mountable": false,
+      "mounted": false
+    },
+    {
+      "device": "eth2",
+      "enabled": false,
+      "kavlan": false,
+      "mountable": false,
+      "mounted": false
+    },
+    {
+      "device": "eth3",
+      "enabled": false,
+      "kavlan": false,
+      "mountable": false,
+      "mounted": false
+    },
     {
       "device": "bmc",
       "enabled": true,
@@ -115,7 +136,7 @@
     },
     {
       "by_id": "",
-      "by_path": "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:2:0:0",
+      "by_path": "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:2:1:0",
       "id": "disk1",
       "interface": "SAS",
       "model": "unknown",

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

@@ -54,6 +54,27 @@
       "switch": "imag-1b-F2-prod-01",
       "switch_port": "1/1/8"
     },
+    {
+      "device": "eth1",
+      "enabled": false,
+      "kavlan": false,
+      "mountable": false,
+      "mounted": false
+    },
+    {
+      "device": "eth2",
+      "enabled": false,
+      "kavlan": false,
+      "mountable": false,
+      "mounted": false
+    },
+    {
+      "device": "eth3",
+      "enabled": false,
+      "kavlan": false,
+      "mountable": false,
+      "mounted": false
+    },
     {
       "device": "bmc",
       "enabled": true,
@@ -115,7 +136,7 @@
     },
     {
       "by_id": "",
-      "by_path": "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:2:0:0",
+      "by_path": "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:2:1:0",
       "id": "disk1",
       "interface": "SAS",
       "model": "unknown",

data/grid5000/sites/grenoble/network_equipments/imag-1b-F2-admin-01.json

@@ -21,22 +21,22 @@
         {
         },
         {
-          "kind": "other",
-          "snmp_name": "1/1/5",
-          "uid": "vercors3-1-bmc"
         },
         {
-          "kind": "other",
-          "snmp_name": "1/1/6",
-          "uid": "vercors3-2-bmc"
         },
         {
         },
         {
         },
         {
+          "kind": "other",
+          "snmp_name": "1/1/9",
+          "uid": "vercors3-2-bmc"
         },
         {
+          "kind": "other",
+          "snmp_name": "1/1/10",
+          "uid": "vercors3-1-bmc"
         },
         {
         },

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

@@ -29,6 +29,18 @@ nodes:
         enabled: true
         mountable: true
         mounted: true
+      eth1:
+        enabled: false
+        mountable: false
+        mounted: false
+      eth2:
+        enabled: false
+        mountable: false
+        mounted: false
+      eth3:
+        enabled: false
+        mountable: false
+        mounted: false
     storage_devices:
       disk0:
         id: disk0
@@ -37,7 +49,7 @@ nodes:
       disk1:
         id: disk1
         interface: SAS
-        by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:2:0:0"
+        by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:2:1:0"
     software:
       standard-environment: debian11-x64-std # TODO: check that architecture is OK
     management_tools:

input/grid5000/sites/grenoble/networks/imag-1b-F2-admin-01.yaml

@@ -16,12 +16,12 @@ imag-1b-F2-admin-01:
       rate: 10_000_000_000
       backplane_bps: 1_760_000_000_000
       ports:
-        5:
-          uid: vercors3-1-bmc
-          kind: other
-        6:
+        9:
           uid: vercors3-2-bmc
           kind: other
+        10:
+          uid: vercors3-1-bmc
+          kind: other
         #40:
         #  uid: imag-1b-F1-prod-01-mgmt
         #  kind: switch

lib/refrepo/net_names_mapping.yaml

@@ -384,6 +384,11 @@ vercors2:
   eno2: eth1
   eno3: eth2
   eno4: eth3
+vercors3:
+  enp1s0f0np0: eth0
+  eno2np1: eth1
+  enp1s0f0: eth2
+  enp1s0f1: eth3
 vianden:
   enp1s0f0np0: eth0
   eno12409np1: eth1