diff --git a/data/grid5000/sites/grenoble/clusters/kinovis/nodes/kinovis-1.json b/data/grid5000/sites/grenoble/clusters/kinovis/nodes/kinovis-1.json
index 49c02db611f001bc5dc21e3c6713e4765da851b0..91c19701912728e4a1a59b07c1bec56a031f6dd1 100644
--- a/data/grid5000/sites/grenoble/clusters/kinovis/nodes/kinovis-1.json
+++ b/data/grid5000/sites/grenoble/clusters/kinovis/nodes/kinovis-1.json
@@ -371,7 +371,7 @@
"by_path": "/dev/disk/by-path/pci-0000:3b:00.0-scsi-0:3:111:0",
"firmware_version": 5.28,
"id": "disk0",
- "interface": "SATA",
+ "interface": "RAID",
"model": "MR416i-o Gen11",
"size": 1919816826880,
"storage": "SSD",
diff --git a/data/grid5000/sites/grenoble/clusters/kinovis/nodes/kinovis-2.json b/data/grid5000/sites/grenoble/clusters/kinovis/nodes/kinovis-2.json
index f8204d01bebe2d414b5378f4b934a6f3ffde9f4d..b2069670e61ee62ca436af719f96072d2aef2dba 100644
--- a/data/grid5000/sites/grenoble/clusters/kinovis/nodes/kinovis-2.json
+++ b/data/grid5000/sites/grenoble/clusters/kinovis/nodes/kinovis-2.json
@@ -367,19 +367,19 @@
},
"storage_devices": [
{
- "by_id": "/dev/disk/by-id/wwn-0x600062b21bc2cf802f3cbf290530f39e",
- "by_path": "/dev/disk/by-path/pci-0000:3b:00.0-scsi-0:3:111:0",
+ "by_id": "/dev/disk/by-id/wwn-0x600062b21bc2cf802fc74824a1268947",
+ "by_path": "/dev/disk/by-path/pci-0000:3b:00.0-scsi-0:3:104:0",
"firmware_version": 5.28,
"id": "disk0",
- "interface": "SATA",
+ "interface": "RAID",
"model": "MR416i-o Gen11",
"size": 1919816826880,
"storage": "SSD",
"vendor": "HPE"
},
{
- "by_id": "/dev/disk/by-id/wwn-0x600062b21bc2cf802f70148dab1e4574",
- "by_path": "/dev/disk/by-path/pci-0000:3b:00.0-scsi-0:3:104:0",
+ "by_id": "/dev/disk/by-id/wwn-0x600062b21bc2cf802fc7481387cec463",
+ "by_path": "/dev/disk/by-path/pci-0000:3b:00.0-scsi-0:3:105:0",
"firmware_version": 5.28,
"id": "disk1",
"interface": "RAID",
@@ -389,8 +389,8 @@
"vendor": "HPE"
},
{
- "by_id": "/dev/disk/by-id/wwn-0x600062b21bc2cf802f7014788c0ff482",
- "by_path": "/dev/disk/by-path/pci-0000:3b:00.0-scsi-0:3:105:0",
+ "by_id": "/dev/disk/by-id/wwn-0x600062b21bc2cf802fc748006a9ac098",
+ "by_path": "/dev/disk/by-path/pci-0000:3b:00.0-scsi-0:3:106:0",
"firmware_version": 5.28,
"id": "disk2",
"interface": "RAID",
@@ -400,8 +400,8 @@
"vendor": "HPE"
},
{
- "by_id": "/dev/disk/by-id/wwn-0x600062b21bc2cf802f7014575b2450b7",
- "by_path": "/dev/disk/by-path/pci-0000:3b:00.0-scsi-0:3:106:0",
+ "by_id": "/dev/disk/by-id/wwn-0x600062b21bc2cf802fc747e948fb6749",
+ "by_path": "/dev/disk/by-path/pci-0000:3b:00.0-scsi-0:3:107:0",
"firmware_version": 5.28,
"id": "disk3",
"interface": "RAID",
@@ -411,8 +411,8 @@
"vendor": "HPE"
},
{
- "by_id": "/dev/disk/by-id/wwn-0x600062b21bc2cf802f70142e1dd8a510",
- "by_path": "/dev/disk/by-path/pci-0000:3b:00.0-scsi-0:3:107:0",
+ "by_id": "/dev/disk/by-id/wwn-0x600062b21bc2cf802fc747d62ca26d64",
+ "by_path": "/dev/disk/by-path/pci-0000:3b:00.0-scsi-0:3:108:0",
"firmware_version": 5.28,
"id": "disk4",
"interface": "RAID",
@@ -422,8 +422,8 @@
"vendor": "HPE"
},
{
- "by_id": "/dev/disk/by-id/wwn-0x600062b21bc2cf802f7013f5c95aca59",
- "by_path": "/dev/disk/by-path/pci-0000:3b:00.0-scsi-0:3:108:0",
+ "by_id": "/dev/disk/by-id/wwn-0x600062b21bc2cf802fc747c20e062e7d",
+ "by_path": "/dev/disk/by-path/pci-0000:3b:00.0-scsi-0:3:109:0",
"firmware_version": 5.28,
"id": "disk5",
"interface": "RAID",
@@ -433,8 +433,8 @@
"vendor": "HPE"
},
{
- "by_id": "/dev/disk/by-id/wwn-0x600062b21bc2cf802f7013bc75157feb",
- "by_path": "/dev/disk/by-path/pci-0000:3b:00.0-scsi-0:3:109:0",
+ "by_id": "/dev/disk/by-id/wwn-0x600062b21bc2cf802fc747aaeb80576a",
+ "by_path": "/dev/disk/by-path/pci-0000:3b:00.0-scsi-0:3:110:0",
"firmware_version": 5.28,
"id": "disk6",
"interface": "RAID",
@@ -444,8 +444,8 @@
"vendor": "HPE"
},
{
- "by_id": "/dev/disk/by-id/wwn-0x600062b21bc2cf802f70118324d5cefd",
- "by_path": "/dev/disk/by-path/pci-0000:3b:00.0-scsi-0:3:110:0",
+ "by_id": "/dev/disk/by-id/wwn-0x600062b21bc2cf802fc74781ad28365d",
+ "by_path": "/dev/disk/by-path/pci-0000:3b:00.0-scsi-0:3:111:0",
"firmware_version": 5.28,
"id": "disk7",
"interface": "RAID",
diff --git a/data/grid5000/sites/grenoble/clusters/kinovis/nodes/kinovis-3.json b/data/grid5000/sites/grenoble/clusters/kinovis/nodes/kinovis-3.json
index 717d8209f1ba9c6f01143d130800b1c468de16f9..bcb29a078f0c406e9ddd400f8df4882a3803b11c 100644
--- a/data/grid5000/sites/grenoble/clusters/kinovis/nodes/kinovis-3.json
+++ b/data/grid5000/sites/grenoble/clusters/kinovis/nodes/kinovis-3.json
@@ -371,7 +371,7 @@
"by_path": "/dev/disk/by-path/pci-0000:3b:00.0-scsi-0:3:111:0",
"firmware_version": 5.28,
"id": "disk0",
- "interface": "SATA",
+ "interface": "RAID",
"model": "MR416i-o Gen11",
"size": 1919816826880,
"storage": "SSD",
@@ -444,7 +444,7 @@
"vendor": "HPE"
},
{
- "by_id": "/dev/disk/by-id/wwn-0x600062b21bc2c4c02f701141cda436ba",
+ "by_id": "/dev/disk/by-id/wwn-0x600062b21bc2c4c02fc6fb791d899346",
"by_path": "/dev/disk/by-path/pci-0000:3b:00.0-scsi-0:3:110:0",
"firmware_version": 5.28,
"id": "disk7",
diff --git a/data/grid5000/sites/grenoble/clusters/kinovis/nodes/kinovis-4.json b/data/grid5000/sites/grenoble/clusters/kinovis/nodes/kinovis-4.json
index da66237d33ba117d51e1d2935b58c8330e0b163b..1c82fa5a8afc1d86a87d64c5c39b3567d8ddc006 100644
--- a/data/grid5000/sites/grenoble/clusters/kinovis/nodes/kinovis-4.json
+++ b/data/grid5000/sites/grenoble/clusters/kinovis/nodes/kinovis-4.json
@@ -371,7 +371,7 @@
"by_path": "/dev/disk/by-path/pci-0000:3b:00.0-scsi-0:3:111:0",
"firmware_version": 5.28,
"id": "disk0",
- "interface": "SATA",
+ "interface": "RAID",
"model": "MR416i-o Gen11",
"size": 1919816826880,
"storage": "SSD",
diff --git a/data/grid5000/sites/grenoble/clusters/kinovis/nodes/kinovis-5.json b/data/grid5000/sites/grenoble/clusters/kinovis/nodes/kinovis-5.json
index 89fd67d3a4ffe20bf2b6eca08e27379734d3dfb4..ee38d5c7da150de8ed6467a9210916642453743c 100644
--- a/data/grid5000/sites/grenoble/clusters/kinovis/nodes/kinovis-5.json
+++ b/data/grid5000/sites/grenoble/clusters/kinovis/nodes/kinovis-5.json
@@ -371,7 +371,7 @@
"by_path": "/dev/disk/by-path/pci-0000:3b:00.0-scsi-0:3:111:0",
"firmware_version": 5.28,
"id": "disk0",
- "interface": "SATA",
+ "interface": "RAID",
"model": "MR416i-o Gen11",
"size": 1919816826880,
"storage": "SSD",
diff --git a/data/grid5000/sites/grenoble/clusters/kinovis/nodes/kinovis-6.json b/data/grid5000/sites/grenoble/clusters/kinovis/nodes/kinovis-6.json
index 21e1e596a7cde91170ca443954c61782e5b85f45..1fb39fd951ea5f386d6874a8d1d6e8b18229c417 100644
--- a/data/grid5000/sites/grenoble/clusters/kinovis/nodes/kinovis-6.json
+++ b/data/grid5000/sites/grenoble/clusters/kinovis/nodes/kinovis-6.json
@@ -371,7 +371,7 @@
"by_path": "/dev/disk/by-path/pci-0000:3b:00.0-scsi-0:3:111:0",
"firmware_version": 5.28,
"id": "disk0",
- "interface": "SATA",
+ "interface": "RAID",
"model": "MR416i-o Gen11",
"size": 1919816826880,
"storage": "SSD",
diff --git a/input/grid5000/sites/grenoble/clusters/kinovis/kinovis.yaml b/input/grid5000/sites/grenoble/clusters/kinovis/kinovis.yaml
index 4b53abfa4d81a79e29228fc1bf42cafd483d5e9a..73d995d35ff452ee79ac6eab939ae2ea5904651f 100644
--- a/input/grid5000/sites/grenoble/clusters/kinovis/kinovis.yaml
+++ b/input/grid5000/sites/grenoble/clusters/kinovis/kinovis.yaml
@@ -38,32 +38,25 @@ nodes:
mountable: true
mounted: false
storage_devices:
- pci-0000:3b:00.0-scsi-0:3:111:0:
- id: disk0
- interface: SATA
pci-0000:3b:00.0-scsi-0:3:104:0:
- id: disk1
interface: RAID
pci-0000:3b:00.0-scsi-0:3:105:0:
- id: disk2
interface: RAID
pci-0000:3b:00.0-scsi-0:3:106:0:
- id: disk3
interface: RAID
pci-0000:3b:00.0-scsi-0:3:107:0:
- id: disk4
interface: RAID
pci-0000:3b:00.0-scsi-0:3:108:0:
- id: disk5
interface: RAID
pci-0000:3b:00.0-scsi-0:3:109:0:
- id: disk6
interface: RAID
pci-0000:3b:00.0-scsi-0:3:110:0:
- id: disk7
+ interface: RAID
+ pci-0000:3b:00.0-scsi-0:3:111:0:
interface: RAID
software:
standard-environment: debian11-x64-std
management_tools:
bmc_vendor_tool: ipmitool
nodeset: kinovis
+
diff --git a/input/grid5000/sites/grenoble/clusters/kinovis/kinovis_disks.yaml b/input/grid5000/sites/grenoble/clusters/kinovis/kinovis_disks.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..cc1ed77398d9dea397bd40eb6c271bab36afc7b9
--- /dev/null
+++ b/input/grid5000/sites/grenoble/clusters/kinovis/kinovis_disks.yaml
@@ -0,0 +1,59 @@
+---
+nodes:
+ kinovis-1:
+ storage_devices:
+ pci-0000:3b:00.0-scsi-0:3:104:0:
+ id: disk1
+ pci-0000:3b:00.0-scsi-0:3:105:0:
+ id: disk2
+ pci-0000:3b:00.0-scsi-0:3:106:0:
+ id: disk3
+ pci-0000:3b:00.0-scsi-0:3:107:0:
+ id: disk4
+ pci-0000:3b:00.0-scsi-0:3:108:0:
+ id: disk5
+ pci-0000:3b:00.0-scsi-0:3:109:0:
+ id: disk6
+ pci-0000:3b:00.0-scsi-0:3:110:0:
+ id: disk7
+ pci-0000:3b:00.0-scsi-0:3:111:0:
+ id: disk0
+
+ kinovis-2:
+ storage_devices:
+ pci-0000:3b:00.0-scsi-0:3:104:0:
+ id: disk0
+ pci-0000:3b:00.0-scsi-0:3:105:0:
+ id: disk1
+ pci-0000:3b:00.0-scsi-0:3:106:0:
+ id: disk2
+ pci-0000:3b:00.0-scsi-0:3:107:0:
+ id: disk3
+ pci-0000:3b:00.0-scsi-0:3:108:0:
+ id: disk4
+ pci-0000:3b:00.0-scsi-0:3:109:0:
+ id: disk5
+ pci-0000:3b:00.0-scsi-0:3:110:0:
+ id: disk6
+ pci-0000:3b:00.0-scsi-0:3:111:0:
+ id: disk7
+
+ kinovis-[3-6]:
+ storage_devices:
+ pci-0000:3b:00.0-scsi-0:3:104:0:
+ id: disk1
+ pci-0000:3b:00.0-scsi-0:3:105:0:
+ id: disk2
+ pci-0000:3b:00.0-scsi-0:3:106:0:
+ id: disk3
+ pci-0000:3b:00.0-scsi-0:3:107:0:
+ id: disk4
+ pci-0000:3b:00.0-scsi-0:3:108:0:
+ id: disk5
+ pci-0000:3b:00.0-scsi-0:3:109:0:
+ id: disk6
+ pci-0000:3b:00.0-scsi-0:3:110:0:
+ id: disk7
+ pci-0000:3b:00.0-scsi-0:3:111:0:
+ id: disk0
+
diff --git a/input/grid5000/sites/grenoble/clusters/kinovis/nodes/kinovis-2.yaml b/input/grid5000/sites/grenoble/clusters/kinovis/nodes/kinovis-2.yaml
index e480b81bd265e8e2f428304b0271ba37d86e05b8..85785226f4f169924fbaf1d6d16f0dea1a631814 100644
--- a/input/grid5000/sites/grenoble/clusters/kinovis/nodes/kinovis-2.yaml
+++ b/input/grid5000/sites/grenoble/clusters/kinovis/nodes/kinovis-2.yaml
@@ -123,60 +123,60 @@ kinovis-2:
version: Gold 6442Y
storage_devices:
pci-0000:3b:00.0-scsi-0:3:104:0:
- by_id: "/dev/disk/by-id/wwn-0x600062b21bc2cf802f70148dab1e4574"
+ by_id: "/dev/disk/by-id/wwn-0x600062b21bc2cf802fc74824a1268947"
by_path: "/dev/disk/by-path/pci-0000:3b:00.0-scsi-0:3:104:0"
firmware_version: 5.28
model: MR416i-o Gen11
- size: 7680945029120
+ size: 1919816826880
storage: SSD
pci-0000:3b:00.0-scsi-0:3:105:0:
- by_id: "/dev/disk/by-id/wwn-0x600062b21bc2cf802f7014788c0ff482"
+ by_id: "/dev/disk/by-id/wwn-0x600062b21bc2cf802fc7481387cec463"
by_path: "/dev/disk/by-path/pci-0000:3b:00.0-scsi-0:3:105:0"
firmware_version: 5.28
model: MR416i-o Gen11
size: 7680945029120
storage: SSD
pci-0000:3b:00.0-scsi-0:3:106:0:
- by_id: "/dev/disk/by-id/wwn-0x600062b21bc2cf802f7014575b2450b7"
+ by_id: "/dev/disk/by-id/wwn-0x600062b21bc2cf802fc748006a9ac098"
by_path: "/dev/disk/by-path/pci-0000:3b:00.0-scsi-0:3:106:0"
firmware_version: 5.28
model: MR416i-o Gen11
size: 7680945029120
storage: SSD
pci-0000:3b:00.0-scsi-0:3:107:0:
- by_id: "/dev/disk/by-id/wwn-0x600062b21bc2cf802f70142e1dd8a510"
+ by_id: "/dev/disk/by-id/wwn-0x600062b21bc2cf802fc747e948fb6749"
by_path: "/dev/disk/by-path/pci-0000:3b:00.0-scsi-0:3:107:0"
firmware_version: 5.28
model: MR416i-o Gen11
size: 7680945029120
storage: SSD
pci-0000:3b:00.0-scsi-0:3:108:0:
- by_id: "/dev/disk/by-id/wwn-0x600062b21bc2cf802f7013f5c95aca59"
+ by_id: "/dev/disk/by-id/wwn-0x600062b21bc2cf802fc747d62ca26d64"
by_path: "/dev/disk/by-path/pci-0000:3b:00.0-scsi-0:3:108:0"
firmware_version: 5.28
model: MR416i-o Gen11
size: 7680945029120
storage: SSD
pci-0000:3b:00.0-scsi-0:3:109:0:
- by_id: "/dev/disk/by-id/wwn-0x600062b21bc2cf802f7013bc75157feb"
+ by_id: "/dev/disk/by-id/wwn-0x600062b21bc2cf802fc747c20e062e7d"
by_path: "/dev/disk/by-path/pci-0000:3b:00.0-scsi-0:3:109:0"
firmware_version: 5.28
model: MR416i-o Gen11
size: 7680945029120
storage: SSD
pci-0000:3b:00.0-scsi-0:3:110:0:
- by_id: "/dev/disk/by-id/wwn-0x600062b21bc2cf802f70118324d5cefd"
+ by_id: "/dev/disk/by-id/wwn-0x600062b21bc2cf802fc747aaeb80576a"
by_path: "/dev/disk/by-path/pci-0000:3b:00.0-scsi-0:3:110:0"
firmware_version: 5.28
model: MR416i-o Gen11
size: 7680945029120
storage: SSD
pci-0000:3b:00.0-scsi-0:3:111:0:
- by_id: "/dev/disk/by-id/wwn-0x600062b21bc2cf802f3cbf290530f39e"
+ by_id: "/dev/disk/by-id/wwn-0x600062b21bc2cf802fc74781ad28365d"
by_path: "/dev/disk/by-path/pci-0000:3b:00.0-scsi-0:3:111:0"
firmware_version: 5.28
model: MR416i-o Gen11
- size: 1919816826880
+ size: 7680945029120
storage: SSD
supported_job_types:
virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/kinovis/nodes/kinovis-3.yaml b/input/grid5000/sites/grenoble/clusters/kinovis/nodes/kinovis-3.yaml
index 797e8b3d24ead1f491da7aa085f2a0437747e803..d58d930ff9b5b18b6ed6b7e8e23a169c2151be38 100644
--- a/input/grid5000/sites/grenoble/clusters/kinovis/nodes/kinovis-3.yaml
+++ b/input/grid5000/sites/grenoble/clusters/kinovis/nodes/kinovis-3.yaml
@@ -165,7 +165,7 @@ kinovis-3:
size: 7680945029120
storage: SSD
pci-0000:3b:00.0-scsi-0:3:110:0:
- by_id: "/dev/disk/by-id/wwn-0x600062b21bc2c4c02f701141cda436ba"
+ by_id: "/dev/disk/by-id/wwn-0x600062b21bc2c4c02fc6fb791d899346"
by_path: "/dev/disk/by-path/pci-0000:3b:00.0-scsi-0:3:110:0"
firmware_version: 5.28
model: MR416i-o Gen11
diff --git a/lib/refrepo/valid/data/homogeneity.yaml.erb b/lib/refrepo/valid/data/homogeneity.yaml.erb
index e398f839febdbaea76a5ce8afc1c6729942c63ff..c076c637e6716e80ac1d35f643e7983319344a63 100644
--- a/lib/refrepo/valid/data/homogeneity.yaml.erb
+++ b/lib/refrepo/valid/data/homogeneity.yaml.erb
@@ -32,7 +32,28 @@ grenoble:
- ~storage_devices.pci-0000:00:11.5-ata-5.firmware_version
drac-[8-9]:
- ~storage_devices.pci-0009:04:00.0-ata-1.firmware_version
-
+ kinovis-[1-2]:
+ - ~storage_devices.pci-0000:3b:00.0-scsi-0:3:104:0.size
+ - ~storage_devices.pci-0000:3b:00.0-scsi-0:3:111:0.size
+ - ~storage_devices.pci-0000:3b:00.0-scsi-0:3:104:0.id
+ - ~storage_devices.pci-0000:3b:00.0-scsi-0:3:105:0.id
+ - ~storage_devices.pci-0000:3b:00.0-scsi-0:3:106:0.id
+ - ~storage_devices.pci-0000:3b:00.0-scsi-0:3:107:0.id
+ - ~storage_devices.pci-0000:3b:00.0-scsi-0:3:108:0.id
+ - ~storage_devices.pci-0000:3b:00.0-scsi-0:3:109:0.id
+ - ~storage_devices.pci-0000:3b:00.0-scsi-0:3:110:0.id
+ - ~storage_devices.pci-0000:3b:00.0-scsi-0:3:111:0.id
+ kinovis-[2-3]:
+ - ~storage_devices.pci-0000:3b:00.0-scsi-0:3:104:0.size
+ - ~storage_devices.pci-0000:3b:00.0-scsi-0:3:111:0.size
+ - ~storage_devices.pci-0000:3b:00.0-scsi-0:3:104:0.id
+ - ~storage_devices.pci-0000:3b:00.0-scsi-0:3:105:0.id
+ - ~storage_devices.pci-0000:3b:00.0-scsi-0:3:106:0.id
+ - ~storage_devices.pci-0000:3b:00.0-scsi-0:3:107:0.id
+ - ~storage_devices.pci-0000:3b:00.0-scsi-0:3:108:0.id
+ - ~storage_devices.pci-0000:3b:00.0-scsi-0:3:109:0.id
+ - ~storage_devices.pci-0000:3b:00.0-scsi-0:3:110:0.id
+ - ~storage_devices.pci-0000:3b:00.0-scsi-0:3:111:0.id
yeti-1:
- ~storage_devices.pci-0000:59:00.0-nvme-1.model
yeti-2:
diff --git a/lib/refrepo/valid/input/required_unwanted_files.rb b/lib/refrepo/valid/input/required_unwanted_files.rb
index aca7839fc3f49e31390ee477503b74b233367e4f..5ef8e7b841d9ffc9ee43521ada652565c842e52e 100644
--- a/lib/refrepo/valid/input/required_unwanted_files.rb
+++ b/lib/refrepo/valid/input/required_unwanted_files.rb
@@ -21,7 +21,7 @@ def yaml_input_required_unwanted_files(options)
Dir::entries(cluster_input_dir).each do |f|
next if %w{. .. nodes pdus.yaml}.include?(f)
- next if f =~ /^#{cluster_uid}(|_metrics|_pdus|_pdu|_retired|_ib|_extra).yaml(.erb)?$/
+ next if f =~ /^#{cluster_uid}(|_metrics|_pdus|_pdu|_retired|_ib|_extra|_disks).yaml(.erb)?$/
puts "ERROR: Unwanted file #{f} in #{cluster_input_dir}"
r = false
end