[grenoble][troll] Enable eth1

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

@@ -41,6 +41,27 @@
       "kavlan-7": "10.4.194.1",
       "kavlan-8": "10.5.2.1",
       "kavlan-9": "10.5.66.1"
+    },
+    "eth1": {
+      "kavlan-1": "192.168.194.5",
+      "kavlan-11": "10.7.198.5",
+      "kavlan-12": "10.11.198.5",
+      "kavlan-13": "10.15.198.5",
+      "kavlan-14": "10.19.198.5",
+      "kavlan-16": "10.27.198.5",
+      "kavlan-17": "10.31.198.5",
+      "kavlan-18": "10.35.198.5",
+      "kavlan-2": "192.168.210.5",
+      "kavlan-20": "10.43.198.5",
+      "kavlan-21": "10.47.198.5",
+      "kavlan-22": "10.51.198.5",
+      "kavlan-3": "192.168.226.5",
+      "kavlan-4": "10.4.2.5",
+      "kavlan-5": "10.4.66.5",
+      "kavlan-6": "10.4.130.5",
+      "kavlan-7": "10.4.194.5",
+      "kavlan-8": "10.5.2.5",
+      "kavlan-9": "10.5.66.5"
     }
   },
   "kavlan6": {
@@ -64,6 +85,27 @@
       "kavlan-7": "2001:660:4406:193:7::1",
       "kavlan-8": "2001:660:4406:194:7::1",
       "kavlan-9": "2001:660:4406:195:7::1"
+    },
+    "eth1": {
+      "kavlan-1": "2001:660:4406:180:7:1:0:1",
+      "kavlan-11": "2001:660:4406:1a0:107:1:0:1",
+      "kavlan-12": "2001:660:4406:2a0:107:1:0:1",
+      "kavlan-13": "2001:660:4406:4a0:107:1:0:1",
+      "kavlan-14": "2001:660:4406:5a0:107:1:0:1",
+      "kavlan-16": "2001:660:4406:7a0:107:1:0:1",
+      "kavlan-17": "2001:660:4406:9a0:107:1:0:1",
+      "kavlan-18": "2001:660:4406:8a0:107:1:0:1",
+      "kavlan-2": "2001:660:4406:181:7:1:0:1",
+      "kavlan-20": "2001:660:4406:3a0:107:1:0:1",
+      "kavlan-21": "2001:660:4406:6a0:107:1:0:1",
+      "kavlan-22": "2001:660:4406:ba0:107:1:0:1",
+      "kavlan-3": "2001:660:4406:182:7:1:0:1",
+      "kavlan-4": "2001:660:4406:190:7:1:0:1",
+      "kavlan-5": "2001:660:4406:191:7:1:0:1",
+      "kavlan-6": "2001:660:4406:192:7:1:0:1",
+      "kavlan-7": "2001:660:4406:193:7:1:0:1",
+      "kavlan-8": "2001:660:4406:194:7:1:0:1",
+      "kavlan-9": "2001:660:4406:195:7:1:0:1"
     }
   },
   "main_memory": {
@@ -238,18 +280,24 @@
     {
       "device": "eth1",
       "driver": "mlx5_core",
-      "enabled": false,
+      "enabled": true,
       "firmware_version": "14.32.2004 (DEL2810000034)",
       "interface": "Ethernet",
-      "kavlan": false,
+      "ip": "172.16.22.5",
+      "ip6": "2001:660:4406:100:7:1:0:1",
+      "kavlan": true,
       "mac": "b8:59:9f:b0:87:01",
       "management": false,
       "model": "MT27710 Family [ConnectX-4 Lx]",
-      "mountable": false,
+      "mountable": true,
       "mounted": false,
       "name": "eno2",
+      "network_address": "troll-1-eth1.grenoble.grid5000.fr",
+      "rate": 25000000000,
       "sriov": true,
       "sriov_totalvfs": 63,
+      "switch": "gw",
+      "switch_port": "ethernet1/1/61",
       "vendor": "Mellanox Technologies"
     },
     {

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

@@ -41,6 +41,27 @@
       "kavlan-7": "10.4.194.2",
       "kavlan-8": "10.5.2.2",
       "kavlan-9": "10.5.66.2"
+    },
+    "eth1": {
+      "kavlan-1": "192.168.194.6",
+      "kavlan-11": "10.7.198.6",
+      "kavlan-12": "10.11.198.6",
+      "kavlan-13": "10.15.198.6",
+      "kavlan-14": "10.19.198.6",
+      "kavlan-16": "10.27.198.6",
+      "kavlan-17": "10.31.198.6",
+      "kavlan-18": "10.35.198.6",
+      "kavlan-2": "192.168.210.6",
+      "kavlan-20": "10.43.198.6",
+      "kavlan-21": "10.47.198.6",
+      "kavlan-22": "10.51.198.6",
+      "kavlan-3": "192.168.226.6",
+      "kavlan-4": "10.4.2.6",
+      "kavlan-5": "10.4.66.6",
+      "kavlan-6": "10.4.130.6",
+      "kavlan-7": "10.4.194.6",
+      "kavlan-8": "10.5.2.6",
+      "kavlan-9": "10.5.66.6"
     }
   },
   "kavlan6": {
@@ -64,6 +85,27 @@
       "kavlan-7": "2001:660:4406:193:7::2",
       "kavlan-8": "2001:660:4406:194:7::2",
       "kavlan-9": "2001:660:4406:195:7::2"
+    },
+    "eth1": {
+      "kavlan-1": "2001:660:4406:180:7:1:0:2",
+      "kavlan-11": "2001:660:4406:1a0:107:1:0:2",
+      "kavlan-12": "2001:660:4406:2a0:107:1:0:2",
+      "kavlan-13": "2001:660:4406:4a0:107:1:0:2",
+      "kavlan-14": "2001:660:4406:5a0:107:1:0:2",
+      "kavlan-16": "2001:660:4406:7a0:107:1:0:2",
+      "kavlan-17": "2001:660:4406:9a0:107:1:0:2",
+      "kavlan-18": "2001:660:4406:8a0:107:1:0:2",
+      "kavlan-2": "2001:660:4406:181:7:1:0:2",
+      "kavlan-20": "2001:660:4406:3a0:107:1:0:2",
+      "kavlan-21": "2001:660:4406:6a0:107:1:0:2",
+      "kavlan-22": "2001:660:4406:ba0:107:1:0:2",
+      "kavlan-3": "2001:660:4406:182:7:1:0:2",
+      "kavlan-4": "2001:660:4406:190:7:1:0:2",
+      "kavlan-5": "2001:660:4406:191:7:1:0:2",
+      "kavlan-6": "2001:660:4406:192:7:1:0:2",
+      "kavlan-7": "2001:660:4406:193:7:1:0:2",
+      "kavlan-8": "2001:660:4406:194:7:1:0:2",
+      "kavlan-9": "2001:660:4406:195:7:1:0:2"
     }
   },
   "main_memory": {
@@ -238,18 +280,24 @@
     {
       "device": "eth1",
       "driver": "mlx5_core",
-      "enabled": false,
+      "enabled": true,
       "firmware_version": "14.32.2004 (DEL2810000034)",
       "interface": "Ethernet",
-      "kavlan": false,
+      "ip": "172.16.22.6",
+      "ip6": "2001:660:4406:100:7:1:0:2",
+      "kavlan": true,
       "mac": "b8:59:9f:b0:87:09",
       "management": false,
       "model": "MT27710 Family [ConnectX-4 Lx]",
-      "mountable": false,
+      "mountable": true,
       "mounted": false,
       "name": "eno2",
+      "network_address": "troll-2-eth1.grenoble.grid5000.fr",
+      "rate": 25000000000,
       "sriov": true,
       "sriov_totalvfs": 63,
+      "switch": "gw",
+      "switch_port": "ethernet1/1/62",
       "vendor": "Mellanox Technologies"
     },
     {

data/grid5000/sites/grenoble/clusters/troll/nodes/troll-3.json

@@ -41,6 +41,27 @@
       "kavlan-7": "10.4.194.3",
       "kavlan-8": "10.5.2.3",
       "kavlan-9": "10.5.66.3"
+    },
+    "eth1": {
+      "kavlan-1": "192.168.194.7",
+      "kavlan-11": "10.7.198.7",
+      "kavlan-12": "10.11.198.7",
+      "kavlan-13": "10.15.198.7",
+      "kavlan-14": "10.19.198.7",
+      "kavlan-16": "10.27.198.7",
+      "kavlan-17": "10.31.198.7",
+      "kavlan-18": "10.35.198.7",
+      "kavlan-2": "192.168.210.7",
+      "kavlan-20": "10.43.198.7",
+      "kavlan-21": "10.47.198.7",
+      "kavlan-22": "10.51.198.7",
+      "kavlan-3": "192.168.226.7",
+      "kavlan-4": "10.4.2.7",
+      "kavlan-5": "10.4.66.7",
+      "kavlan-6": "10.4.130.7",
+      "kavlan-7": "10.4.194.7",
+      "kavlan-8": "10.5.2.7",
+      "kavlan-9": "10.5.66.7"
     }
   },
   "kavlan6": {
@@ -64,6 +85,27 @@
       "kavlan-7": "2001:660:4406:193:7::3",
       "kavlan-8": "2001:660:4406:194:7::3",
       "kavlan-9": "2001:660:4406:195:7::3"
+    },
+    "eth1": {
+      "kavlan-1": "2001:660:4406:180:7:1:0:3",
+      "kavlan-11": "2001:660:4406:1a0:107:1:0:3",
+      "kavlan-12": "2001:660:4406:2a0:107:1:0:3",
+      "kavlan-13": "2001:660:4406:4a0:107:1:0:3",
+      "kavlan-14": "2001:660:4406:5a0:107:1:0:3",
+      "kavlan-16": "2001:660:4406:7a0:107:1:0:3",
+      "kavlan-17": "2001:660:4406:9a0:107:1:0:3",
+      "kavlan-18": "2001:660:4406:8a0:107:1:0:3",
+      "kavlan-2": "2001:660:4406:181:7:1:0:3",
+      "kavlan-20": "2001:660:4406:3a0:107:1:0:3",
+      "kavlan-21": "2001:660:4406:6a0:107:1:0:3",
+      "kavlan-22": "2001:660:4406:ba0:107:1:0:3",
+      "kavlan-3": "2001:660:4406:182:7:1:0:3",
+      "kavlan-4": "2001:660:4406:190:7:1:0:3",
+      "kavlan-5": "2001:660:4406:191:7:1:0:3",
+      "kavlan-6": "2001:660:4406:192:7:1:0:3",
+      "kavlan-7": "2001:660:4406:193:7:1:0:3",
+      "kavlan-8": "2001:660:4406:194:7:1:0:3",
+      "kavlan-9": "2001:660:4406:195:7:1:0:3"
     }
   },
   "main_memory": {
@@ -238,18 +280,24 @@
     {
       "device": "eth1",
       "driver": "mlx5_core",
-      "enabled": false,
+      "enabled": true,
       "firmware_version": "14.32.2004 (DEL2810000034)",
       "interface": "Ethernet",
-      "kavlan": false,
+      "ip": "172.16.22.7",
+      "ip6": "2001:660:4406:100:7:1:0:3",
+      "kavlan": true,
       "mac": "b8:59:9f:b0:86:e9",
       "management": false,
       "model": "MT27710 Family [ConnectX-4 Lx]",
-      "mountable": false,
+      "mountable": true,
       "mounted": false,
       "name": "eno2",
+      "network_address": "troll-3-eth1.grenoble.grid5000.fr",
+      "rate": 25000000000,
       "sriov": true,
       "sriov_totalvfs": 63,
+      "switch": "gw",
+      "switch_port": "ethernet1/1/63",
       "vendor": "Mellanox Technologies"
     },
     {

data/grid5000/sites/grenoble/clusters/troll/nodes/troll-4.json

@@ -41,6 +41,27 @@
       "kavlan-7": "10.4.194.4",
       "kavlan-8": "10.5.2.4",
       "kavlan-9": "10.5.66.4"
+    },
+    "eth1": {
+      "kavlan-1": "192.168.194.8",
+      "kavlan-11": "10.7.198.8",
+      "kavlan-12": "10.11.198.8",
+      "kavlan-13": "10.15.198.8",
+      "kavlan-14": "10.19.198.8",
+      "kavlan-16": "10.27.198.8",
+      "kavlan-17": "10.31.198.8",
+      "kavlan-18": "10.35.198.8",
+      "kavlan-2": "192.168.210.8",
+      "kavlan-20": "10.43.198.8",
+      "kavlan-21": "10.47.198.8",
+      "kavlan-22": "10.51.198.8",
+      "kavlan-3": "192.168.226.8",
+      "kavlan-4": "10.4.2.8",
+      "kavlan-5": "10.4.66.8",
+      "kavlan-6": "10.4.130.8",
+      "kavlan-7": "10.4.194.8",
+      "kavlan-8": "10.5.2.8",
+      "kavlan-9": "10.5.66.8"
     }
   },
   "kavlan6": {
@@ -64,6 +85,27 @@
       "kavlan-7": "2001:660:4406:193:7::4",
       "kavlan-8": "2001:660:4406:194:7::4",
       "kavlan-9": "2001:660:4406:195:7::4"
+    },
+    "eth1": {
+      "kavlan-1": "2001:660:4406:180:7:1:0:4",
+      "kavlan-11": "2001:660:4406:1a0:107:1:0:4",
+      "kavlan-12": "2001:660:4406:2a0:107:1:0:4",
+      "kavlan-13": "2001:660:4406:4a0:107:1:0:4",
+      "kavlan-14": "2001:660:4406:5a0:107:1:0:4",
+      "kavlan-16": "2001:660:4406:7a0:107:1:0:4",
+      "kavlan-17": "2001:660:4406:9a0:107:1:0:4",
+      "kavlan-18": "2001:660:4406:8a0:107:1:0:4",
+      "kavlan-2": "2001:660:4406:181:7:1:0:4",
+      "kavlan-20": "2001:660:4406:3a0:107:1:0:4",
+      "kavlan-21": "2001:660:4406:6a0:107:1:0:4",
+      "kavlan-22": "2001:660:4406:ba0:107:1:0:4",
+      "kavlan-3": "2001:660:4406:182:7:1:0:4",
+      "kavlan-4": "2001:660:4406:190:7:1:0:4",
+      "kavlan-5": "2001:660:4406:191:7:1:0:4",
+      "kavlan-6": "2001:660:4406:192:7:1:0:4",
+      "kavlan-7": "2001:660:4406:193:7:1:0:4",
+      "kavlan-8": "2001:660:4406:194:7:1:0:4",
+      "kavlan-9": "2001:660:4406:195:7:1:0:4"
     }
   },
   "main_memory": {
@@ -238,18 +280,24 @@
     {
       "device": "eth1",
       "driver": "mlx5_core",
-      "enabled": false,
+      "enabled": true,
       "firmware_version": "14.32.2004 (DEL2810000034)",
       "interface": "Ethernet",
-      "kavlan": false,
+      "ip": "172.16.22.8",
+      "ip6": "2001:660:4406:100:7:1:0:4",
+      "kavlan": true,
       "mac": "b8:59:9f:b1:09:05",
       "management": false,
       "model": "MT27710 Family [ConnectX-4 Lx]",
-      "mountable": false,
+      "mountable": true,
       "mounted": false,
       "name": "eno2",
+      "network_address": "troll-4-eth1.grenoble.grid5000.fr",
+      "rate": 25000000000,
       "sriov": true,
       "sriov_totalvfs": 63,
+      "switch": "gw",
+      "switch_port": "ethernet1/1/64",
       "vendor": "Mellanox Technologies"
     },
     {

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

@@ -449,11 +449,99 @@
       "source": {
         "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"
+      }
     }
   ],
   "model": "Dell PowerEdge R640",
   "nodes_count": 4,
-  "nodes_description": "2 CPUs Intel Xeon Gold 5218, 16 cores/CPU, 384GB RAM, 1536GB PMEM, 447GB SSD, 1490GB SSD, 1 x 25Gb Ethernet, 1 x 100Gb Omni-Path",
+  "nodes_description": "2 CPUs Intel Xeon Gold 5218, 16 cores/CPU, 384GB RAM, 1536GB PMEM, 447GB SSD, 1490GB SSD, 2 x 25Gb Ethernet, 1 x 100Gb Omni-Path",
   "priority": 201911,
   "queues": [
     "admin",

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

@@ -367,12 +367,36 @@
         {
         },
         {
+          "kavlan_pattern": "ethernet1/1/%PORT%",
+          "kind": "node",
+          "port": "eth1",
+          "rate": 25000000000,
+          "snmp_name": "ethernet1/1/61",
+          "uid": "troll-1"
         },
         {
+          "kavlan_pattern": "ethernet1/1/%PORT%",
+          "kind": "node",
+          "port": "eth1",
+          "rate": 25000000000,
+          "snmp_name": "ethernet1/1/62",
+          "uid": "troll-2"
         },
         {
+          "kavlan_pattern": "ethernet1/1/%PORT%",
+          "kind": "node",
+          "port": "eth1",
+          "rate": 25000000000,
+          "snmp_name": "ethernet1/1/63",
+          "uid": "troll-3"
         },
         {
+          "kavlan_pattern": "ethernet1/1/%PORT%",
+          "kind": "node",
+          "port": "eth1",
+          "rate": 25000000000,
+          "snmp_name": "ethernet1/1/64",
+          "uid": "troll-4"
         },
         {
         },

input/grid5000/ipv4.yaml

@@ -19,6 +19,7 @@ ipv4:
       grenoble dahu eth0 0 0 4 0
       grenoble dahu ib0 0 0 4 0
       grenoble troll eth0 0 0 6 0
+      grenoble troll eth1 0 0 6 4
       grenoble troll ib0 0 0 5 0
       grenoble servan eth0 0 0 7 0
       grenoble servan fpga0 0 0 7 10

input/grid5000/sites/grenoble/clusters/troll/nodes/troll-1.yaml

@@ -130,6 +130,7 @@ troll-1:
       management: false
       model: MT27710 Family [ConnectX-4 Lx]
       name: eno2
+      rate: 25000000000
       sriov: true
       sriov_totalvfs: 63
       vendor: Mellanox Technologies

input/grid5000/sites/grenoble/clusters/troll/nodes/troll-2.yaml

@@ -130,6 +130,7 @@ troll-2:
       management: false
       model: MT27710 Family [ConnectX-4 Lx]
       name: eno2
+      rate: 25000000000
       sriov: true
       sriov_totalvfs: 63
       vendor: Mellanox Technologies

input/grid5000/sites/grenoble/clusters/troll/nodes/troll-3.yaml

@@ -130,6 +130,7 @@ troll-3:
       management: false
       model: MT27710 Family [ConnectX-4 Lx]
       name: eno2
+      rate: 25000000000
       sriov: true
       sriov_totalvfs: 63
       vendor: Mellanox Technologies

input/grid5000/sites/grenoble/clusters/troll/nodes/troll-4.yaml

@@ -130,6 +130,7 @@ troll-4:
       management: false
       model: MT27710 Family [ConnectX-4 Lx]
       name: eno2
+      rate: 25000000000
       sriov: true
       sriov_totalvfs: 63
       vendor: Mellanox Technologies

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

@@ -32,8 +32,8 @@ nodes:
         mountable: true
         mounted: true
       eth1:
-        enabled: false
-        mountable: false
+        enabled: true
+        mountable: true
         mounted: false
       ib0:
         mounted: true

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

@@ -178,6 +178,26 @@ gw:
           kind: channel
           rate: 10_000_000_000
           snmp_pattern: "ethernet1/1/%PORT%:1"
+        61:
+          uid: troll-1-eth1
+          snmp_pattern: "ethernet1/1/%PORT%"
+          kavlan_pattern: "ethernet1/1/%PORT%" # Pattern pour les noeuds en 25Gb/s
+          rate: 25000000000
+        62:
+          uid: troll-2-eth1
+          snmp_pattern: "ethernet1/1/%PORT%"
+          kavlan_pattern: "ethernet1/1/%PORT%"
+          rate: 25000000000
+        63:
+          uid: troll-3-eth1
+          snmp_pattern: "ethernet1/1/%PORT%"
+          kavlan_pattern: "ethernet1/1/%PORT%"
+          rate: 25000000000
+        64:
+          uid: troll-4-eth1
+          snmp_pattern: "ethernet1/1/%PORT%"
+          kavlan_pattern: "ethernet1/1/%PORT%"
+          rate: 25000000000
         67:
           uid: port-channel50
           kind: channel

input/grid5000/vlans.yaml

@@ -70,6 +70,7 @@ vlans:
       local grenoble yeti eth0 0 0 0 0
       local grenoble dahu eth0 0 0 1 0
       local grenoble troll eth0 0 0 2 0
+      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 fpga0 0 0 4 10
@@ -225,6 +226,7 @@ vlans:
       global lille chuc eth0 0 0 5 100
       global lille chuc eth1 0 0 5 150
       global grenoble troll eth0 0 0 6 0
+      global grenoble troll eth1 0 0 6 4
       global grenoble drac eth0 0 0 7 0
       global lyon sagittaire eth1 0 0 8 0
       global lyon taurus eth0 0 0 9 0
@@ -360,6 +362,7 @@ vlans:
       routed grenoble yeti eth0 0 4 0 0
       routed grenoble dahu eth0 0 4 1 0
       routed grenoble troll eth0 0 4 2 0
+      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 fpga0 0 4 4 10