diff --git a/data/grid5000/sites/grenoble/network_equipments/imag-1b-F1-admin-01.json b/data/grid5000/sites/grenoble/network_equipments/imag-1b-F1-admin-01.json
new file mode 100644
index 0000000000000000000000000000000000000000..bbb44c91399155d0fa4b401f371bab9e8d7de7b2
--- /dev/null
+++ b/data/grid5000/sites/grenoble/network_equipments/imag-1b-F1-admin-01.json
@@ -0,0 +1,128 @@
+{
+  "backplane_bps": 1760000000000,
+  "channels_ssh_pattern": "#{/\\D+/.match(\"%CHANNEL%\")} #{/\\d+/.match(\"%CHANNEL%\")}",
+  "ip": "172.17.31.246",
+  "kind": "switch",
+  "linecards": [
+    {
+    },
+    {
+      "backplane_bps": 1760000000000,
+      "kavlan_pattern": "%LINECARD%/1/%PORT%",
+      "ports": [
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+          "kind": "switch",
+          "snmp_name": "1/1/48",
+          "trunk": false,
+          "uid": "imag-1b-F1-prod-01"
+        }
+      ],
+      "rate": 10000000000,
+      "snmp_pattern": "%LINECARD%/1/%PORT%"
+    }
+  ],
+  "managed_by_us": true,
+  "model": "Aruba R9W97A 8100-40XT8XF4C switch",
+  "serial": "SG44LS104S",
+  "site": "grenoble",
+  "snmp_community": "public",
+  "type": "network_equipment",
+  "uid": "imag-1b-F1-admin-01",
+  "warranty": "2048-05"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/network_equipments/imag-1b-F2-admin-01.json b/data/grid5000/sites/grenoble/network_equipments/imag-1b-F2-admin-01.json
new file mode 100644
index 0000000000000000000000000000000000000000..24f334f25e96ca9517faabc0c09a7f92eefcf078
--- /dev/null
+++ b/data/grid5000/sites/grenoble/network_equipments/imag-1b-F2-admin-01.json
@@ -0,0 +1,128 @@
+{
+  "backplane_bps": 1760000000000,
+  "channels_ssh_pattern": "#{/\\D+/.match(\"%CHANNEL%\")} #{/\\d+/.match(\"%CHANNEL%\")}",
+  "ip": "172.17.31.247",
+  "kind": "switch",
+  "linecards": [
+    {
+    },
+    {
+      "backplane_bps": 1760000000000,
+      "kavlan_pattern": "%LINECARD%/1/%PORT%",
+      "ports": [
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+          "kind": "switch",
+          "snmp_name": "1/1/48",
+          "trunk": false,
+          "uid": "imag-1b-F2-prod-01"
+        }
+      ],
+      "rate": 10000000000,
+      "snmp_pattern": "%LINECARD%/1/%PORT%"
+    }
+  ],
+  "managed_by_us": true,
+  "model": "Aruba R9W97A 8100-40XT8XF4C switch",
+  "serial": "SG44LS105K",
+  "site": "grenoble",
+  "snmp_community": "public",
+  "type": "network_equipment",
+  "uid": "imag-1b-F2-admin-01",
+  "warranty": "2048-05"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/network_equipments/imag-1b-F3-admin-01.json b/data/grid5000/sites/grenoble/network_equipments/imag-1b-F3-admin-01.json
new file mode 100644
index 0000000000000000000000000000000000000000..2765c5ef7dd5c39c239666485ad4b5d53d1d5e5f
--- /dev/null
+++ b/data/grid5000/sites/grenoble/network_equipments/imag-1b-F3-admin-01.json
@@ -0,0 +1,128 @@
+{
+  "backplane_bps": 1760000000000,
+  "channels_ssh_pattern": "#{/\\D+/.match(\"%CHANNEL%\")} #{/\\d+/.match(\"%CHANNEL%\")}",
+  "ip": "172.17.31.248",
+  "kind": "switch",
+  "linecards": [
+    {
+    },
+    {
+      "backplane_bps": 1760000000000,
+      "kavlan_pattern": "%LINECARD%/1/%PORT%",
+      "ports": [
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+          "kind": "switch",
+          "snmp_name": "1/1/48",
+          "trunk": false,
+          "uid": "imag-1b-F3-prod-01"
+        }
+      ],
+      "rate": 10000000000,
+      "snmp_pattern": "%LINECARD%/1/%PORT%"
+    }
+  ],
+  "managed_by_us": true,
+  "model": "Aruba R9W97A 8100-40XT8XF4C switch",
+  "serial": "SG43LS10CD",
+  "site": "grenoble",
+  "snmp_community": "public",
+  "type": "network_equipment",
+  "uid": "imag-1b-F3-admin-01",
+  "warranty": "2048-05"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/network_equipments/imag-1b-F3-prod-01.json b/data/grid5000/sites/grenoble/network_equipments/imag-1b-F3-prod-01.json
index fcaa89b9995689ed4508055184eb639b3452584c..2e0e697d3dd2dd8df19a462cb7b94556fccd4855 100644
--- a/data/grid5000/sites/grenoble/network_equipments/imag-1b-F3-prod-01.json
+++ b/data/grid5000/sites/grenoble/network_equipments/imag-1b-F3-prod-01.json
@@ -39,24 +39,28 @@
         {
           "kind": "node",
           "port": "eth0",
+          "rate": 10000000000,
           "snmp_name": "1/1/5",
           "uid": "chartreuse2-1"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "rate": 10000000000,
           "snmp_name": "1/1/6",
           "uid": "chartreuse2-3"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "rate": 10000000000,
           "snmp_name": "1/1/7",
           "uid": "chartreuse2-2"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "rate": 10000000000,
           "snmp_name": "1/1/8",
           "uid": "chartreuse2-4"
         },
diff --git a/data/grid5000/sites/grenoble/network_equipments/opa-grenoble.json b/data/grid5000/sites/grenoble/network_equipments/opa-grenoble.json
new file mode 100644
index 0000000000000000000000000000000000000000..85a44348f04782be02b076477671c18c72cd856b
--- /dev/null
+++ b/data/grid5000/sites/grenoble/network_equipments/opa-grenoble.json
@@ -0,0 +1,249 @@
+{
+  "backplane_bps": 1200000000000,
+  "kind": "hpcswitch",
+  "linecards": [
+    {
+    },
+    {
+      "backplane_bps": 1200000000000,
+      "kind": "node",
+      "ports": [
+        {
+        },
+        {
+          "kind": "node",
+          "port": "ib0",
+          "uid": "dahu-1"
+        },
+        {
+          "kind": "node",
+          "port": "ib0",
+          "uid": "dahu-2"
+        },
+        {
+          "kind": "node",
+          "port": "ib0",
+          "uid": "dahu-3"
+        },
+        {
+          "kind": "node",
+          "port": "ib0",
+          "uid": "dahu-4"
+        },
+        {
+          "kind": "node",
+          "port": "ib0",
+          "uid": "dahu-5"
+        },
+        {
+          "kind": "node",
+          "port": "ib0",
+          "uid": "dahu-6"
+        },
+        {
+          "kind": "node",
+          "port": "ib0",
+          "uid": "dahu-7"
+        },
+        {
+          "kind": "node",
+          "port": "ib0",
+          "uid": "dahu-8"
+        },
+        {
+          "kind": "node",
+          "port": "ib0",
+          "uid": "dahu-9"
+        },
+        {
+          "kind": "node",
+          "port": "ib0",
+          "uid": "dahu-10"
+        },
+        {
+          "kind": "node",
+          "port": "ib0",
+          "uid": "dahu-11"
+        },
+        {
+          "kind": "node",
+          "port": "ib0",
+          "uid": "dahu-12"
+        },
+        {
+          "kind": "node",
+          "port": "ib0",
+          "uid": "dahu-13"
+        },
+        {
+          "kind": "node",
+          "port": "ib0",
+          "uid": "dahu-14"
+        },
+        {
+          "kind": "node",
+          "port": "ib0",
+          "uid": "dahu-15"
+        },
+        {
+          "kind": "node",
+          "port": "ib0",
+          "uid": "dahu-16"
+        },
+        {
+          "kind": "node",
+          "port": "ib0",
+          "uid": "dahu-17"
+        },
+        {
+          "kind": "node",
+          "port": "ib0",
+          "uid": "dahu-18"
+        },
+        {
+          "kind": "node",
+          "port": "ib0",
+          "uid": "dahu-19"
+        },
+        {
+          "kind": "node",
+          "port": "ib0",
+          "uid": "dahu-20"
+        },
+        {
+          "kind": "node",
+          "port": "ib0",
+          "uid": "dahu-21"
+        },
+        {
+          "kind": "node",
+          "port": "ib0",
+          "uid": "dahu-22"
+        },
+        {
+          "kind": "node",
+          "port": "ib0",
+          "uid": "dahu-23"
+        },
+        {
+          "kind": "node",
+          "port": "ib0",
+          "uid": "dahu-24"
+        },
+        {
+          "kind": "node",
+          "port": "ib0",
+          "uid": "dahu-25"
+        },
+        {
+          "kind": "node",
+          "port": "ib0",
+          "uid": "dahu-26"
+        },
+        {
+          "kind": "node",
+          "port": "ib0",
+          "uid": "dahu-27"
+        },
+        {
+          "kind": "node",
+          "port": "ib0",
+          "uid": "dahu-28"
+        },
+        {
+          "kind": "node",
+          "port": "ib0",
+          "uid": "dahu-29"
+        },
+        {
+          "kind": "node",
+          "port": "ib0",
+          "uid": "dahu-30"
+        },
+        {
+          "kind": "node",
+          "port": "ib0",
+          "uid": "dahu-31"
+        },
+        {
+          "kind": "node",
+          "port": "ib0",
+          "uid": "dahu-32"
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+          "kind": "node",
+          "port": "ib0",
+          "uid": "yeti-1"
+        },
+        {
+          "kind": "node",
+          "port": "ib0",
+          "uid": "yeti-2"
+        },
+        {
+          "kind": "node",
+          "port": "ib0",
+          "uid": "yeti-3"
+        },
+        {
+          "kind": "node",
+          "port": "ib0",
+          "uid": "yeti-4"
+        },
+        {
+          "kind": "node",
+          "port": "ib0",
+          "uid": "troll-1"
+        },
+        {
+          "kind": "node",
+          "port": "ib0",
+          "uid": "troll-2"
+        },
+        {
+          "kind": "node",
+          "port": "ib0",
+          "uid": "troll-3"
+        },
+        {
+          "kind": "node",
+          "port": "ib0",
+          "uid": "troll-4"
+        }
+      ],
+      "rate": 100000000000
+    }
+  ],
+  "managed_by_us": false,
+  "model": "Intel Omni-Path Edge Switch 100 Series/H1048-OPF",
+  "serial": "nil",
+  "site": "grenoble",
+  "snmp_community": "public",
+  "type": "network_equipment",
+  "uid": "opa-grenoble",
+  "warranty": "nil"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/network_equipments/skinovis2-admin-01.json b/data/grid5000/sites/grenoble/network_equipments/skinovis2-admin-01.json
new file mode 100644
index 0000000000000000000000000000000000000000..df45c90aea0afa8c97c6e65537b1717d5fe9bc58
--- /dev/null
+++ b/data/grid5000/sites/grenoble/network_equipments/skinovis2-admin-01.json
@@ -0,0 +1,124 @@
+{
+  "backplane_bps": 10000000000,
+  "ip": "172.17.31.244",
+  "kind": "switch",
+  "linecards": [
+    {
+    },
+    {
+      "backplane_bps": 10000000000,
+      "ports": [
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+          "kind": "switch",
+          "trunk": false,
+          "uid": "skinovis2-prod-01"
+        }
+      ],
+      "rate": 1000000000
+    }
+  ],
+  "managed_by_us": true,
+  "model": "Dell PowerConnect 6248",
+  "serial": "nil",
+  "site": "grenoble",
+  "snmp_community": "public",
+  "type": "network_equipment",
+  "uid": "skinovis2-admin-01",
+  "warranty": "2024-12-01"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/network_equipments/skinovis2-prod-01.json b/data/grid5000/sites/grenoble/network_equipments/skinovis2-prod-01.json
index 70ef62c313503035d20cfbb8b657e86c756b2f75..f3aefd49b6e4db5a6721a15123722e9b100d25d7 100644
--- a/data/grid5000/sites/grenoble/network_equipments/skinovis2-prod-01.json
+++ b/data/grid5000/sites/grenoble/network_equipments/skinovis2-prod-01.json
@@ -106,104 +106,44 @@
         {
         },
         {
-          "kind": "other",
-          "snmp_name": "Ethernet1/41",
-          "uid": "camera-1"
         },
         {
-          "kind": "other",
-          "snmp_name": "Ethernet1/42",
-          "uid": "camera-2"
         },
         {
-          "kind": "other",
-          "snmp_name": "Ethernet1/43",
-          "uid": "camera-3"
         },
         {
-          "kind": "other",
-          "snmp_name": "Ethernet1/44",
-          "uid": "camera-4"
         },
         {
-          "kind": "other",
-          "snmp_name": "Ethernet1/45",
-          "uid": "camera-5"
         },
         {
-          "kind": "other",
-          "snmp_name": "Ethernet1/46",
-          "uid": "camera-6"
         },
         {
-          "kind": "other",
-          "snmp_name": "Ethernet1/47",
-          "uid": "camera-7"
         },
         {
-          "kind": "other",
-          "snmp_name": "Ethernet1/48",
-          "uid": "camera-8"
         },
         {
-          "kind": "other",
-          "snmp_name": "Ethernet1/49",
-          "uid": "camera-9"
         },
         {
-          "kind": "other",
-          "snmp_name": "Ethernet1/50",
-          "uid": "camera-10"
         },
         {
-          "kind": "other",
-          "snmp_name": "Ethernet1/51",
-          "uid": "camera-11"
         },
         {
-          "kind": "other",
-          "snmp_name": "Ethernet1/52",
-          "uid": "camera-12"
         },
         {
-          "kind": "other",
-          "snmp_name": "Ethernet1/53",
-          "uid": "camera-13"
         },
         {
-          "kind": "other",
-          "snmp_name": "Ethernet1/54",
-          "uid": "camera-14"
         },
         {
-          "kind": "other",
-          "snmp_name": "Ethernet1/55",
-          "uid": "camera-15"
         },
         {
-          "kind": "other",
-          "snmp_name": "Ethernet1/56",
-          "uid": "camera-16"
         },
         {
-          "kind": "other",
-          "snmp_name": "Ethernet1/57",
-          "uid": "camera-17"
         },
         {
-          "kind": "other",
-          "snmp_name": "Ethernet1/58",
-          "uid": "camera-18"
         },
         {
-          "kind": "other",
-          "snmp_name": "Ethernet1/59",
-          "uid": "camera-20"
         },
         {
-          "kind": "other",
-          "snmp_name": "Ethernet1/60",
-          "uid": "camera-21"
         },
         {
         },
diff --git a/data/grid5000/sites/grenoble/network_equipments/sw-ib-mellanox.json b/data/grid5000/sites/grenoble/network_equipments/sw-ib-mellanox.json
new file mode 100644
index 0000000000000000000000000000000000000000..9cbf485f86b5f01a1ba9c1fb6946db2c7cc873d4
--- /dev/null
+++ b/data/grid5000/sites/grenoble/network_equipments/sw-ib-mellanox.json
@@ -0,0 +1,143 @@
+{
+  "kind": "hpcswitch",
+  "linecards": [
+    {
+    },
+    {
+      "kind": "node",
+      "ports": [
+        {
+        },
+        {
+          "kind": "node",
+          "port": "ib0",
+          "uid": "drac-1"
+        },
+        {
+          "kind": "node",
+          "port": "ib0",
+          "uid": "drac-2"
+        },
+        {
+          "kind": "node",
+          "port": "ib0",
+          "uid": "drac-3"
+        },
+        {
+          "kind": "node",
+          "port": "ib0",
+          "uid": "drac-4"
+        },
+        {
+          "kind": "node",
+          "port": "ib0",
+          "uid": "drac-5"
+        },
+        {
+          "kind": "node",
+          "port": "ib0",
+          "uid": "drac-6"
+        },
+        {
+          "kind": "node",
+          "port": "ib0",
+          "uid": "drac-7"
+        },
+        {
+          "kind": "node",
+          "port": "ib0",
+          "uid": "drac-8"
+        },
+        {
+          "kind": "node",
+          "port": "ib0",
+          "uid": "drac-9"
+        },
+        {
+          "kind": "node",
+          "port": "ib0",
+          "uid": "drac-10"
+        },
+        {
+          "kind": "node",
+          "port": "ib0",
+          "uid": "drac-11"
+        },
+        {
+          "kind": "node",
+          "port": "ib0",
+          "uid": "drac-12"
+        },
+        {
+          "kind": "node",
+          "port": "ib1",
+          "uid": "drac-1"
+        },
+        {
+          "kind": "node",
+          "port": "ib1",
+          "uid": "drac-2"
+        },
+        {
+          "kind": "node",
+          "port": "ib1",
+          "uid": "drac-3"
+        },
+        {
+          "kind": "node",
+          "port": "ib1",
+          "uid": "drac-4"
+        },
+        {
+          "kind": "node",
+          "port": "ib1",
+          "uid": "drac-5"
+        },
+        {
+          "kind": "node",
+          "port": "ib1",
+          "uid": "drac-6"
+        },
+        {
+          "kind": "node",
+          "port": "ib1",
+          "uid": "drac-7"
+        },
+        {
+          "kind": "node",
+          "port": "ib1",
+          "uid": "drac-8"
+        },
+        {
+          "kind": "node",
+          "port": "ib1",
+          "uid": "drac-9"
+        },
+        {
+          "kind": "node",
+          "port": "ib1",
+          "uid": "drac-10"
+        },
+        {
+          "kind": "node",
+          "port": "ib1",
+          "uid": "drac-11"
+        },
+        {
+          "kind": "node",
+          "port": "ib1",
+          "uid": "drac-12"
+        }
+      ],
+      "rate": 100000000000
+    }
+  ],
+  "managed_by_us": false,
+  "model": "Mellanox IB switch",
+  "serial": "nil",
+  "site": "grenoble",
+  "snmp_community": "public",
+  "type": "network_equipment",
+  "uid": "sw-ib-mellanox",
+  "warranty": "nil"
+}
\ No newline at end of file
diff --git a/input/grid5000/sites/grenoble/networks/imag-1b-F1-admin-01.yaml b/input/grid5000/sites/grenoble/networks/imag-1b-F1-admin-01.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..7b64964ac66d961db97453675ed6827df0c79780
--- /dev/null
+++ b/input/grid5000/sites/grenoble/networks/imag-1b-F1-admin-01.yaml
@@ -0,0 +1,24 @@
+---
+imag-1b-F1-admin-01:
+  model: Aruba R9W97A 8100-40XT8XF4C switch
+  warranty: 2048-05
+  serial: SG44LS104S
+  kind: switch
+  managed_by_us: true
+  site: grenoble
+  snmp_community: public
+  ip: 172.17.31.246
+  backplane_bps: 1_760_000_000_000
+  linecards:
+    1:
+      snmp_pattern: "%LINECARD%/1/%PORT%"
+      kavlan_pattern: "%LINECARD%/1/%PORT%"
+      rate: 10_000_000_000
+      backplane_bps: 1_760_000_000_000
+      ports:
+        48:
+          uid: imag-1b-F1-prod-01
+          kind: switch
+          trunk: false
+  channels_ssh_pattern: '#{/\D+/.match("%CHANNEL%")} #{/\d+/.match("%CHANNEL%")}'
+
diff --git a/input/grid5000/sites/grenoble/networks/imag-1b-F2-admin-01.yaml b/input/grid5000/sites/grenoble/networks/imag-1b-F2-admin-01.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..da4a4bdaf4e175b7b5ff005c867e3001ed458ba4
--- /dev/null
+++ b/input/grid5000/sites/grenoble/networks/imag-1b-F2-admin-01.yaml
@@ -0,0 +1,27 @@
+---
+imag-1b-F2-admin-01:
+  model: Aruba R9W97A 8100-40XT8XF4C switch
+  warranty: 2048-05
+  serial: SG44LS105K
+  kind: switch
+  managed_by_us: true
+  site: grenoble
+  snmp_community: public
+  ip: 172.17.31.247
+  backplane_bps: 1_760_000_000_000
+  linecards:
+    1:
+      snmp_pattern: "%LINECARD%/1/%PORT%"
+      kavlan_pattern: "%LINECARD%/1/%PORT%"
+      rate: 10_000_000_000
+      backplane_bps: 1_760_000_000_000
+      ports:
+        #40:
+        #  uid: imag-1b-F1-prod-01-mgmt
+        #  kind: switch
+        48:
+          uid: imag-1b-F2-prod-01
+          kind: switch
+          trunk: false
+  channels_ssh_pattern: '#{/\D+/.match("%CHANNEL%")} #{/\d+/.match("%CHANNEL%")}'
+
diff --git a/input/grid5000/sites/grenoble/networks/imag-1b-F3-admin-01.yaml b/input/grid5000/sites/grenoble/networks/imag-1b-F3-admin-01.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..97cbe6f756eab3bb24b000df935b1fb1cc0e3570
--- /dev/null
+++ b/input/grid5000/sites/grenoble/networks/imag-1b-F3-admin-01.yaml
@@ -0,0 +1,30 @@
+---
+imag-1b-F3-admin-01:
+  model: Aruba R9W97A 8100-40XT8XF4C switch
+  warranty: 2048-05
+  serial: SG43LS10CD
+  kind: switch
+  managed_by_us: true
+  site: grenoble
+  snmp_community: public
+  ip: 172.17.31.248
+  backplane_bps: 1_760_000_000_000
+  linecards:
+    1:
+      snmp_pattern: "%LINECARD%/1/%PORT%"
+      kavlan_pattern: "%LINECARD%/1/%PORT%"
+      rate: 10_000_000_000
+      backplane_bps: 1_760_000_000_000
+      ports:
+        #36:
+        #  uid: imag-1b-F2-prod-01-mgmt
+        #  kind: switch
+        #40:
+        #  uid: imag-1b-F3-prod-01-mgmt
+        #  kind: switch
+        48:
+          uid: imag-1b-F3-prod-01
+          kind: switch
+          trunk: false
+  channels_ssh_pattern: '#{/\D+/.match("%CHANNEL%")} #{/\d+/.match("%CHANNEL%")}'
+
diff --git a/input/grid5000/sites/grenoble/networks/imag-1b-F3-prod-01.yaml b/input/grid5000/sites/grenoble/networks/imag-1b-F3-prod-01.yaml
index f44a3ed55657dd8fef57927577d57e70fa9a7291..71d1e0074e4c5699859c210a8bb1279d98883f23 100644
--- a/input/grid5000/sites/grenoble/networks/imag-1b-F3-prod-01.yaml
+++ b/input/grid5000/sites/grenoble/networks/imag-1b-F3-prod-01.yaml
@@ -25,12 +25,16 @@ imag-1b-F3-prod-01:
           kind: channel
         5:
           uid: chartreuse2-1
+          rate: 10_000_000_000
         6:
           uid: chartreuse2-3
+          rate: 10_000_000_000
         7:
           uid: chartreuse2-2
+          rate: 10_000_000_000
         8:
           uid: chartreuse2-4
+          rate: 10_000_000_000
         22:
           uid: nessie-1
         39:
diff --git a/input/grid5000/sites/grenoble/networks/opa-grenoble.yaml b/input/grid5000/sites/grenoble/networks/opa-grenoble.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..a03013244e47c9943f24b27054f79efe81c3b0ad
--- /dev/null
+++ b/input/grid5000/sites/grenoble/networks/opa-grenoble.yaml
@@ -0,0 +1,56 @@
+---
+opa-grenoble:
+  model: Intel Omni-Path Edge Switch 100 Series/H1048-OPF
+  warranty: nil
+  serial: nil
+  kind: hpcswitch
+  managed_by_us: false
+  site: grenoble
+  snmp_community: public
+  backplane_bps: 1_200_000_000_000
+  linecards:
+    1:
+      backplane_bps: 1_200_000_000_000
+      rate: 100_000_000_000
+      kind: node
+      ports:
+        1: dahu-1-ib0
+        2: dahu-2-ib0
+        3: dahu-3-ib0
+        4: dahu-4-ib0
+        5: dahu-5-ib0
+        6: dahu-6-ib0
+        7: dahu-7-ib0
+        8: dahu-8-ib0
+        9: dahu-9-ib0
+        10: dahu-10-ib0
+        11: dahu-11-ib0
+        12: dahu-12-ib0
+        13: dahu-13-ib0
+        14: dahu-14-ib0
+        15: dahu-15-ib0
+        16: dahu-16-ib0
+        17: dahu-17-ib0
+        18: dahu-18-ib0
+        19: dahu-19-ib0
+        20: dahu-20-ib0
+        21: dahu-21-ib0
+        22: dahu-22-ib0
+        23: dahu-23-ib0
+        24: dahu-24-ib0
+        25: dahu-25-ib0
+        26: dahu-26-ib0
+        27: dahu-27-ib0
+        28: dahu-28-ib0
+        29: dahu-29-ib0
+        30: dahu-30-ib0
+        31: dahu-31-ib0
+        32: dahu-32-ib0
+        45: yeti-1-ib0
+        46: yeti-2-ib0
+        47: yeti-3-ib0
+        48: yeti-4-ib0
+        49: troll-1-ib0
+        50: troll-2-ib0
+        51: troll-3-ib0
+        52: troll-4-ib0
diff --git a/input/grid5000/sites/grenoble/networks/skinovis2-admin-01.yaml b/input/grid5000/sites/grenoble/networks/skinovis2-admin-01.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..48cd52cfd24bdac1fced45d5d9d376fb94e1c86b
--- /dev/null
+++ b/input/grid5000/sites/grenoble/networks/skinovis2-admin-01.yaml
@@ -0,0 +1,21 @@
+---
+skinovis2-admin-01:
+  model: Dell PowerConnect 6248
+  warranty: 2024-12-01
+  serial: nil
+  kind: switch
+  managed_by_us: true
+  site: grenoble
+  snmp_community: public
+  ip: 172.17.31.244
+  backplane_bps: 10_000_000_000
+  linecards:
+    1:
+      backplane_bps: 10_000_000_000
+      rate: 1_000_000_000
+      ports:
+        48:
+          uid: skinovis2-prod-01
+          kind: switch
+          trunk: false
+
diff --git a/input/grid5000/sites/grenoble/networks/skinovis2-prod-01.yaml b/input/grid5000/sites/grenoble/networks/skinovis2-prod-01.yaml
index c1f60e607e87a5e80190b74a0940d5065dfd38da..52250d0e5c5a387b8d35931ad8e8247b5d52176c 100644
--- a/input/grid5000/sites/grenoble/networks/skinovis2-prod-01.yaml
+++ b/input/grid5000/sites/grenoble/networks/skinovis2-prod-01.yaml
@@ -22,69 +22,69 @@ skinovis2-prod-01:
           kind: switch
           rate: 1_000_000_000
           trunk: false
-        41:
-          uid: camera-1
-          kind: other
-        42:
-          uid: camera-2
-          kind: other
-        43:
-          uid: camera-3
-          kind: other
-        44:
-          uid: camera-4
-          kind: other
-        45:
-          uid: camera-5
-          kind: other
-        46:
-          uid: camera-6
-          kind: other
-        47:
-          uid: camera-7
-          kind: other
-        48:
-          uid: camera-8
-          kind: other
-        49:
-          uid: camera-9
-          kind: other
-        50:
-          uid: camera-10
-          kind: other
-        51:
-          uid: camera-11
-          kind: other
-        52:
-          uid: camera-12
-          kind: other
-        53:
-          uid: camera-13
-          kind: other
-        54:
-          uid: camera-14
-          kind: other
-        55:
-          uid: camera-15
-          kind: other
-        56:
-          uid: camera-16
-          kind: other
-        57:
-          uid: camera-17
-          kind: other
-        58:
-          uid: camera-18
-          kind: other
-        59:
-          uid: camera-19
-          kind: other
-        59:
-          uid: camera-20
-          kind: other
-        60:
-          uid: camera-21
-          kind: other
+        #41:
+        #  uid: camera-1
+        #  kind: other
+        #42:
+        #  uid: camera-2
+        #  kind: other
+        #43:
+        #  uid: camera-3
+        #  kind: other
+        #44:
+        #  uid: camera-4
+        #  kind: other
+        #45:
+        #  uid: camera-5
+        #  kind: other
+        #46:
+        #  uid: camera-6
+        #  kind: other
+        #47:
+        #  uid: camera-7
+        #  kind: other
+        #48:
+        #  uid: camera-8
+        #  kind: other
+        #49:
+        #  uid: camera-9
+        #  kind: other
+        #50:
+        #  uid: camera-10
+        #  kind: other
+        #51:
+        #  uid: camera-11
+        #  kind: other
+        #52:
+        #  uid: camera-12
+        #  kind: other
+        #53:
+        #  uid: camera-13
+        #  kind: other
+        #54:
+        #  uid: camera-14
+        #  kind: other
+        #55:
+        #  uid: camera-15
+        #  kind: other
+        #56:
+        #  uid: camera-16
+        #  kind: other
+        #57:
+        #  uid: camera-17
+        #  kind: other
+        #58:
+        #  uid: camera-18
+        #  kind: other
+        #59:
+        #  uid: camera-19
+        #  kind: other
+        #59:
+        #  uid: camera-20
+        #  kind: other
+        #60:
+        #  uid: camera-21
+        #  kind: other
         83:
           uid: port-channel1
           kind: channel
diff --git a/input/grid5000/sites/grenoble/networks/sw-ib-mellanox.yaml b/input/grid5000/sites/grenoble/networks/sw-ib-mellanox.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..1f3870d32ff84211cad9430e9b252004350177a8
--- /dev/null
+++ b/input/grid5000/sites/grenoble/networks/sw-ib-mellanox.yaml
@@ -0,0 +1,38 @@
+---
+sw-ib-mellanox:
+  model: Mellanox IB switch
+  warranty: nil
+  serial: nil
+  kind: hpcswitch
+  managed_by_us: false
+  site: grenoble
+  snmp_community: public
+  linecards:
+    1:
+      rate: 100_000_000_000
+      kind: node
+      ports:
+        1: drac-1-ib0
+        2: drac-2-ib0
+        3: drac-3-ib0
+        4: drac-4-ib0
+        5: drac-5-ib0
+        6: drac-6-ib0
+        7: drac-7-ib0
+        8: drac-8-ib0
+        9: drac-9-ib0
+        10: drac-10-ib0
+        11: drac-11-ib0
+        12: drac-12-ib0
+        13: drac-1-ib1
+        14: drac-2-ib1
+        15: drac-3-ib1
+        16: drac-4-ib1
+        17: drac-5-ib1
+        18: drac-6-ib1
+        19: drac-7-ib1
+        20: drac-8-ib1
+        21: drac-9-ib1
+        22: drac-10-ib1
+        23: drac-11-ib1
+        24: drac-12-ib1