From 50dcbf14ea823ae573b39d4e9a3734df060ae8f0 Mon Sep 17 00:00:00 2001 From: PARISOT Clement <clement.parisot@inria.fr> Date: Mon, 3 Feb 2025 16:22:44 +0100 Subject: [PATCH 1/2] [grenoble] servers - add srv-data3 (kinovis2) --- .../sites/grenoble/servers/srv-data3.json | 24 +++++++++++++++++++ .../sites/grenoble/servers/physical.yaml | 14 +++++++++++ 2 files changed, 38 insertions(+) create mode 100644 data/grid5000/sites/grenoble/servers/srv-data3.json 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 00000000000..725a9d98cbf --- /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:80" + } + }, + "redfish": true, + "serial": "CZ24250CWJ", + "type": "server", + "uid": "srv-data3", + "warranty": "2031-07-04" +} \ No newline at end of file diff --git a/input/grid5000/sites/grenoble/servers/physical.yaml b/input/grid5000/sites/grenoble/servers/physical.yaml index 33c4b69cc90..958f7ae76f8 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:80 + bmc: + ip: 172.17.30.17 + mac: 5C:ED:8C:F4:A2:22 + adm: + ip: 172.17.31.17 -- GitLab From 561f7c1fab08069e21e59bcc404c1e8d59f6daec Mon Sep 17 00:00:00 2001 From: PARISOT Clement <clement.parisot@inria.fr> Date: Mon, 3 Feb 2025 17:02:05 +0100 Subject: [PATCH 2/2] [grenoble] pdus - Add kinovis2 PDUs --- .../grid5000/sites/grenoble/pdus/pdu-kinovis2-1.json | 6 ++++++ .../grid5000/sites/grenoble/pdus/pdu-kinovis2-2.json | 6 ++++++ .../grid5000/sites/grenoble/pdus/pdu-kinovis2-3.json | 6 ++++++ .../grid5000/sites/grenoble/pdus/pdu-kinovis2-4.json | 6 ++++++ input/grid5000/sites/grenoble/pdus.yaml | 12 ++++++++++++ 5 files changed, 36 insertions(+) create mode 100644 data/grid5000/sites/grenoble/pdus/pdu-kinovis2-1.json create mode 100644 data/grid5000/sites/grenoble/pdus/pdu-kinovis2-2.json create mode 100644 data/grid5000/sites/grenoble/pdus/pdu-kinovis2-3.json create mode 100644 data/grid5000/sites/grenoble/pdus/pdu-kinovis2-4.json 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 00000000000..bef4f9b91c4 --- /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 00000000000..0ca08df4411 --- /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 00000000000..472843af49e --- /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 00000000000..c18c8c9feb2 --- /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/input/grid5000/sites/grenoble/pdus.yaml b/input/grid5000/sites/grenoble/pdus.yaml index 27621de6ff1..ad4276c62d6 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 -- GitLab