diff --git a/data/grid5000/sites/grenoble/pdus/pdu-kinovis2-1.json b/data/grid5000/sites/grenoble/pdus/pdu-kinovis2-1.json
new file mode 100644
index 0000000000000000000000000000000000000000..bef4f9b91c45fff02f1c76c4af149e5ec3baeb09
--- /dev/null
+++ b/data/grid5000/sites/grenoble/pdus/pdu-kinovis2-1.json
@@ -0,0 +1,6 @@
+{
+ "ip": "172.17.31.18",
+ "mac": "00:0D:5D:32:DF:29",
+ "type": "pdu",
+ "uid": "pdu-kinovis2-1"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/pdus/pdu-kinovis2-2.json b/data/grid5000/sites/grenoble/pdus/pdu-kinovis2-2.json
new file mode 100644
index 0000000000000000000000000000000000000000..0ca08df4411ee917dac5ee8a8cb8e37972b3c4ed
--- /dev/null
+++ b/data/grid5000/sites/grenoble/pdus/pdu-kinovis2-2.json
@@ -0,0 +1,6 @@
+{
+ "ip": "172.17.31.19",
+ "mac": "00:0D:5D:32:DF:2B",
+ "type": "pdu",
+ "uid": "pdu-kinovis2-2"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/pdus/pdu-kinovis2-3.json b/data/grid5000/sites/grenoble/pdus/pdu-kinovis2-3.json
new file mode 100644
index 0000000000000000000000000000000000000000..472843af49ea9559e8e614aeb00218f0cfe7c86d
--- /dev/null
+++ b/data/grid5000/sites/grenoble/pdus/pdu-kinovis2-3.json
@@ -0,0 +1,6 @@
+{
+ "ip": "172.17.31.20",
+ "mac": "00:0D:5D:32:DF:2D",
+ "type": "pdu",
+ "uid": "pdu-kinovis2-3"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/pdus/pdu-kinovis2-4.json b/data/grid5000/sites/grenoble/pdus/pdu-kinovis2-4.json
new file mode 100644
index 0000000000000000000000000000000000000000..c18c8c9feb2d511843b63a7eb24f47dcdfdbe35f
--- /dev/null
+++ b/data/grid5000/sites/grenoble/pdus/pdu-kinovis2-4.json
@@ -0,0 +1,6 @@
+{
+ "ip": "172.17.31.21",
+ "mac": "00:0D:5D:32:DF:2F",
+ "type": "pdu",
+ "uid": "pdu-kinovis2-4"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/servers/srv-data3.json b/data/grid5000/sites/grenoble/servers/srv-data3.json
new file mode 100644
index 0000000000000000000000000000000000000000..f1a0a750d7447c70b60ca257c7be117ee20ede5c
--- /dev/null
+++ b/data/grid5000/sites/grenoble/servers/srv-data3.json
@@ -0,0 +1,24 @@
+{
+ "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
diff --git a/data/grid5000/sites/sophia/network_equipments/gw.json b/data/grid5000/sites/sophia/network_equipments/gw.json
index 772caa9c6e2bf002d8ec99bb9fe6a106a0b36edd..e3e4cddaca844fc0ed6be267912e8d926ccbb9e9 100644
--- a/data/grid5000/sites/sophia/network_equipments/gw.json
+++ b/data/grid5000/sites/sophia/network_equipments/gw.json
@@ -1,4 +1,7 @@
{
+ "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
diff --git a/input/grid5000/sites/grenoble/pdus.yaml b/input/grid5000/sites/grenoble/pdus.yaml
index 27621de6ff18785c6991036fdbc978619f4e3560..ad4276c62d63b734aed7ed9b6c269fdd56de5e92 100644
--- a/input/grid5000/sites/grenoble/pdus.yaml
+++ b/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
diff --git a/input/grid5000/sites/grenoble/servers/physical.yaml b/input/grid5000/sites/grenoble/servers/physical.yaml
index 33c4b69cc901f8b639d8d76b1cf91e46872b377b..8c51a2ea55767f4aebaebbcaa33d59d01b080b6c 100644
--- a/input/grid5000/sites/grenoble/servers/physical.yaml
+++ b/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
diff --git a/input/grid5000/sites/sophia/networks/gw-sophia.yaml b/input/grid5000/sites/sophia/networks/gw-sophia.yaml
index cd464bff6e007eb733b0e8d2bec0142ef59a856c..9ad8b5b9ddadd0ce9b4e52dc58bfbb7311a8a697 100644
--- a/input/grid5000/sites/sophia/networks/gw-sophia.yaml
+++ b/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: