Merge branch 'master' into wip-2025

data/grid5000/sites/grenoble/pdus/pdu-kinovis2-1.json

+{
+  "ip": "172.17.31.18",
+  "mac": "00:0D:5D:32:DF:29",
+  "type": "pdu",
+  "uid": "pdu-kinovis2-1"
+}
\ No newline at end of file

data/grid5000/sites/grenoble/pdus/pdu-kinovis2-2.json

+{
+  "ip": "172.17.31.19",
+  "mac": "00:0D:5D:32:DF:2B",
+  "type": "pdu",
+  "uid": "pdu-kinovis2-2"
+}
\ No newline at end of file

data/grid5000/sites/grenoble/pdus/pdu-kinovis2-3.json

+{
+  "ip": "172.17.31.20",
+  "mac": "00:0D:5D:32:DF:2D",
+  "type": "pdu",
+  "uid": "pdu-kinovis2-3"
+}
\ No newline at end of file

data/grid5000/sites/grenoble/pdus/pdu-kinovis2-4.json

+{
+  "ip": "172.17.31.21",
+  "mac": "00:0D:5D:32:DF:2F",
+  "type": "pdu",
+  "uid": "pdu-kinovis2-4"
+}
\ No newline at end of file

data/grid5000/sites/grenoble/servers/srv-data3.json

+{
+  "alias": [
+
+  ],
+  "kind": "physical",
+  "network_adapters": {
+    "adm": {
+      "ip": "172.17.31.17"
+    },
+    "bmc": {
+      "ip": "172.17.30.17",
+      "mac": "5C:ED:8C:F4:A2:22"
+    },
+    "default": {
+      "ip": "172.16.31.17",
+      "mac": "30:3E:A7:05:F2:81"
+    }
+  },
+  "redfish": true,
+  "serial": "CZ24250CWJ",
+  "type": "server",
+  "uid": "srv-data3",
+  "warranty": "2031-07-04"
+}
\ No newline at end of file

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

 {
+  "alias": [
+    "gw-sophia"
+  ],
   "backplane_bps": 1440000000000,
   "channels": {
     "lag1": {
@@ -44,7 +47,8 @@
       "uid": "srv-scratch3"
     }
   },
-  "ip": "172.17.143.251",
+  "ip": "172.16.143.254",
+  "ip6": "2001:660:4406:800::ffff:ffff",
   "kind": "router",
   "linecards": [
     {
@@ -254,5 +258,88 @@
   "snmp_community": "public",
   "type": "network_equipment",
   "uid": "gw",
+  "vlans": {
+    "vlan100": {
+      "addresses": [
+        "172.16.143.254"
+      ],
+      "administrative": true
+    },
+    "vlan101": {
+      "addresses": [
+        "172.17.143.254"
+      ]
+    },
+    "vlan108": {
+      "addresses": [
+        "172.17.143.254"
+      ]
+    },
+    "vlan500": {
+      "addresses": [
+        "192.168.4.12"
+      ]
+    },
+    "vlan701": {
+      "addresses": [
+        "192.168.192.0/20"
+      ],
+      "name": "kavlan-1"
+    },
+    "vlan702": {
+      "addresses": [
+        "192.168.208.0/20"
+      ],
+      "name": "kavlan-2"
+    },
+    "vlan703": {
+      "addresses": [
+        "192.168.224.0/20"
+      ],
+      "name": "kavlan-3"
+    },
+    "vlan704": {
+      "addresses": [
+        "10.32.0.0/18"
+      ],
+      "name": "kavlan-4"
+    },
+    "vlan705": {
+      "addresses": [
+        "10.32.64.0/18"
+      ],
+      "name": "kavlan-5"
+    },
+    "vlan706": {
+      "addresses": [
+        "10.32.128.0/18"
+      ],
+      "name": "kavlan-6"
+    },
+    "vlan707": {
+      "addresses": [
+        "10.32.192.0/18"
+      ],
+      "name": "kavlan-7"
+    },
+    "vlan708": {
+      "addresses": [
+        "10.33.0.0/18"
+      ],
+      "name": "kavlan-8"
+    },
+    "vlan709": {
+      "addresses": [
+        "10.33.64.0/18"
+      ],
+      "name": "kavlan-9"
+    },
+    "vlan718": {
+      "addresses": [
+        "10.35.192.0/18"
+      ],
+      "name": "kavlan-18"
+    }
+  },
   "warranty": "2048-05"
 }
\ No newline at end of file

input/grid5000/sites/grenoble/pdus.yaml

@@ -22,3 +22,15 @@ pdus:
         optional_period: 20
         source:
           protocol: wattmetre
+  pdu-kinovis2-1:
+    ip: 172.17.31.18
+    mac: 00:0D:5D:32:DF:29
+  pdu-kinovis2-2:
+    ip: 172.17.31.19
+    mac: 00:0D:5D:32:DF:2B
+  pdu-kinovis2-3:
+    ip: 172.17.31.20
+    mac: 00:0D:5D:32:DF:2D
+  pdu-kinovis2-4:
+    ip: 172.17.31.21
+    mac: 00:0D:5D:32:DF:2F

input/grid5000/sites/grenoble/servers/physical.yaml

@@ -133,3 +133,17 @@ srv-data2:
     adm:
       ip: 172.17.31.16
 
+srv-data3:
+  kind: physical
+  warranty: 2031-07-04
+  serial: CZ24250CWJ
+  alias: []
+  network_adapters:
+    default:
+      ip: 172.16.31.17
+      mac: 30:3E:A7:05:F2:81
+    bmc:
+      ip: 172.17.30.17
+      mac: 5C:ED:8C:F4:A2:22
+    adm:
+      ip: 172.17.31.17

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

@@ -4,9 +4,66 @@ gw:
   warranty: 2048-05
   kind: router
   managed_by_us: true
+  alias:
+    - gw-sophia
   site: sophia
-  ip: 172.17.143.251
   snmp_community: public
+  ip: 172.16.143.254
+  ip6: 2001:660:4406:800::ffff:ffff
+  vlans:
+    "vlan100":
+      administrative: yes
+      addresses:
+        - 172.16.143.254
+    "vlan101":
+      addresses:
+        - 172.17.143.254
+    "vlan108":
+      addresses:
+        - 172.17.143.254
+    "vlan500":
+      addresses:
+        - 192.168.4.12
+    "vlan701":
+      name: kavlan-1
+      addresses:
+        - 192.168.192.0/20
+    "vlan702":
+      name: kavlan-2
+      addresses:
+        - 192.168.208.0/20
+    "vlan703":
+      name: kavlan-3
+      addresses:
+        - 192.168.224.0/20
+    "vlan704":
+      name: kavlan-4
+      addresses:
+        - 10.32.0.0/18
+    "vlan705":
+      name: kavlan-5
+      addresses:
+        - 10.32.64.0/18
+    "vlan706":
+      name: kavlan-6
+      addresses:
+        - 10.32.128.0/18
+    "vlan707":
+      name: kavlan-7
+      addresses:
+        - 10.32.192.0/18
+    "vlan708":
+      name: kavlan-8
+      addresses:
+        - 10.33.0.0/18
+    "vlan709":
+      name: kavlan-9
+      addresses:
+        - 10.33.64.0/18
+    "vlan718":
+      name: kavlan-18
+      addresses:
+        - 10.35.192.0/18
   backplane_bps: 1440000000000
   linecards:
     1: