Skip to content

Commit 7cae3da

Browse files
author
RINGOT Patrice
committed
Merge branch 'gros_disk_resa' into 'master'
[gros] update ref api for disk reservation See merge request grid5000/reference-repository!37
2 parents 21303c3 + abd5a7d commit 7cae3da

File tree

249 files changed

+2731
-2728
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

249 files changed

+2731
-2728
lines changed

‎data/grid5000/sites/nancy/clusters/gros/nodes/gros-1.json

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -163,29 +163,29 @@
163163
},
164164
"storage_devices": [
165165
{
166-
"by_id": "/dev/disk/by-id/wwn-0x64cd98f02cf2f7002540696d050e340d",
167-
"by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:2:0:0",
166+
"by_id": "/dev/disk/by-id/wwn-0x500a075121e45cda",
167+
"by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0",
168168
"device": "sda",
169169
"driver": "megaraid_sas",
170-
"firmware_version": 4.29,
170+
"firmware_version": "D1DF000",
171171
"interface": "SATA",
172-
"model": "PERC H330 Mini",
173-
"size": 479559942144,
172+
"model": "MTFDDAK480TDN",
173+
"size": 480103981056,
174174
"storage": "SSD",
175-
"vendor": "Dell (Raid)"
175+
"vendor": "Micron"
176176
},
177177
{
178-
"by_id": "/dev/disk/by-id/wwn-0x64cd98f02cf2f7002540696e0513d470",
179-
"by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:2:1:0",
178+
"by_id": "/dev/disk/by-id/wwn-0x500a075121a49235",
179+
"by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0",
180180
"device": "sdb",
181181
"driver": "megaraid_sas",
182-
"firmware_version": 4.29,
182+
"firmware_version": "D1DF000",
183183
"interface": "SATA",
184-
"model": "PERC H330 Mini",
184+
"model": "MTFDDAK960TDN",
185185
"reservation": true,
186-
"size": 959656755200,
186+
"size": 960197124096,
187187
"storage": "SSD",
188-
"vendor": "Dell (Raid)"
188+
"vendor": "Micron"
189189
}
190190
],
191191
"supported_job_types": {

‎data/grid5000/sites/nancy/clusters/gros/nodes/gros-10.json

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -163,29 +163,29 @@
163163
},
164164
"storage_devices": [
165165
{
166-
"by_id": "/dev/disk/by-id/wwn-0x64cd98f02cf2fa0025150ac004b30460",
167-
"by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:2:0:0",
166+
"by_id": "/dev/disk/by-id/wwn-0x500a075121e49072",
167+
"by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0",
168168
"device": "sda",
169169
"driver": "megaraid_sas",
170-
"firmware_version": 4.29,
170+
"firmware_version": "D1DF000",
171171
"interface": "SATA",
172-
"model": "PERC H330 Mini",
173-
"size": 479559942144,
172+
"model": "MTFDDAK480TDN",
173+
"size": 480103981056,
174174
"storage": "SSD",
175-
"vendor": "Dell (Raid)"
175+
"vendor": "Micron"
176176
},
177177
{
178-
"by_id": "/dev/disk/by-id/wwn-0x64cd98f02cf2fa0025150ac104bb8bf6",
179-
"by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:2:1:0",
178+
"by_id": "/dev/disk/by-id/wwn-0x500a075121a49344",
179+
"by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0",
180180
"device": "sdb",
181181
"driver": "megaraid_sas",
182-
"firmware_version": 4.29,
182+
"firmware_version": "D1DF000",
183183
"interface": "SATA",
184-
"model": "PERC H330 Mini",
184+
"model": "MTFDDAK960TDN",
185185
"reservation": true,
186-
"size": 959656755200,
186+
"size": 960197124096,
187187
"storage": "SSD",
188-
"vendor": "Dell (Raid)"
188+
"vendor": "Micron"
189189
}
190190
],
191191
"supported_job_types": {

‎data/grid5000/sites/nancy/clusters/gros/nodes/gros-100.json

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -163,29 +163,29 @@
163163
},
164164
"storage_devices": [
165165
{
166-
"by_id": "/dev/disk/by-id/wwn-0x6f402700aed6300025150abc04b1f853",
167-
"by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:2:0:0",
166+
"by_id": "/dev/disk/by-id/wwn-0x500a075121db9dca",
167+
"by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0",
168168
"device": "sda",
169169
"driver": "megaraid_sas",
170-
"firmware_version": 4.29,
170+
"firmware_version": "D1DF000",
171171
"interface": "SATA",
172-
"model": "PERC H330 Mini",
173-
"size": 479559942144,
172+
"model": "MTFDDAK480TDN",
173+
"size": 480103981056,
174174
"storage": "SSD",
175-
"vendor": "Dell (Raid)"
175+
"vendor": "Micron"
176176
},
177177
{
178-
"by_id": "/dev/disk/by-id/wwn-0x6f402700aed6300025150abd04baa325",
179-
"by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:2:1:0",
178+
"by_id": "/dev/disk/by-id/wwn-0x500a075121a482a3",
179+
"by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0",
180180
"device": "sdb",
181181
"driver": "megaraid_sas",
182-
"firmware_version": 4.29,
182+
"firmware_version": "D1DF000",
183183
"interface": "SATA",
184-
"model": "PERC H330 Mini",
184+
"model": "MTFDDAK960TDN",
185185
"reservation": true,
186-
"size": 959656755200,
186+
"size": 960197124096,
187187
"storage": "SSD",
188-
"vendor": "Dell (Raid)"
188+
"vendor": "Micron"
189189
}
190190
],
191191
"supported_job_types": {

‎data/grid5000/sites/nancy/clusters/gros/nodes/gros-101.json

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -163,29 +163,29 @@
163163
},
164164
"storage_devices": [
165165
{
166-
"by_id": "/dev/disk/by-id/wwn-0x6f402700aed59c0025150acf04b3c076",
167-
"by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:2:0:0",
166+
"by_id": "/dev/disk/by-id/wwn-0x500a075121db9e4e",
167+
"by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0",
168168
"device": "sda",
169169
"driver": "megaraid_sas",
170-
"firmware_version": 4.29,
170+
"firmware_version": "D1DF000",
171171
"interface": "SATA",
172-
"model": "PERC H330 Mini",
173-
"size": 479559942144,
172+
"model": "MTFDDAK480TDN",
173+
"size": 480103981056,
174174
"storage": "SSD",
175-
"vendor": "Dell (Raid)"
175+
"vendor": "Micron"
176176
},
177177
{
178-
"by_id": "/dev/disk/by-id/wwn-0x6f402700aed59c0025150acf04bc4b70",
179-
"by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:2:1:0",
178+
"by_id": "/dev/disk/by-id/wwn-0x500a075121a4831f",
179+
"by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0",
180180
"device": "sdb",
181181
"driver": "megaraid_sas",
182-
"firmware_version": 4.29,
182+
"firmware_version": "D1DF000",
183183
"interface": "SATA",
184-
"model": "PERC H330 Mini",
184+
"model": "MTFDDAK960TDN",
185185
"reservation": true,
186-
"size": 959656755200,
186+
"size": 960197124096,
187187
"storage": "SSD",
188-
"vendor": "Dell (Raid)"
188+
"vendor": "Micron"
189189
}
190190
],
191191
"supported_job_types": {

‎data/grid5000/sites/nancy/clusters/gros/nodes/gros-102.json

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -163,29 +163,29 @@
163163
},
164164
"storage_devices": [
165165
{
166-
"by_id": "/dev/disk/by-id/wwn-0x64cd98f02cf4540025150aa904af4a4a",
167-
"by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:2:0:0",
166+
"by_id": "/dev/disk/by-id/wwn-0x500a075121e45e37",
167+
"by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0",
168168
"device": "sda",
169169
"driver": "megaraid_sas",
170-
"firmware_version": 4.29,
170+
"firmware_version": "D1DF000",
171171
"interface": "SATA",
172-
"model": "PERC H330 Mini",
173-
"size": 479559942144,
172+
"model": "MTFDDAK480TDN",
173+
"size": 480103981056,
174174
"storage": "SSD",
175-
"vendor": "Dell (Raid)"
175+
"vendor": "Micron"
176176
},
177177
{
178-
"by_id": "/dev/disk/by-id/wwn-0x64cd98f02cf4540025150aaa04b7dfda",
179-
"by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:2:1:0",
178+
"by_id": "/dev/disk/by-id/wwn-0x500a075121a48f72",
179+
"by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0",
180180
"device": "sdb",
181181
"driver": "megaraid_sas",
182-
"firmware_version": 4.29,
182+
"firmware_version": "D1DF000",
183183
"interface": "SATA",
184-
"model": "PERC H330 Mini",
184+
"model": "MTFDDAK960TDN",
185185
"reservation": true,
186-
"size": 959656755200,
186+
"size": 960197124096,
187187
"storage": "SSD",
188-
"vendor": "Dell (Raid)"
188+
"vendor": "Micron"
189189
}
190190
],
191191
"supported_job_types": {

‎data/grid5000/sites/nancy/clusters/gros/nodes/gros-103.json

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -163,29 +163,29 @@
163163
},
164164
"storage_devices": [
165165
{
166-
"by_id": "/dev/disk/by-id/wwn-0x64cd98f02cf46a0025150aeb04b33cd5",
167-
"by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:2:0:0",
166+
"by_id": "/dev/disk/by-id/wwn-0x500a075121e45de9",
167+
"by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0",
168168
"device": "sda",
169169
"driver": "megaraid_sas",
170-
"firmware_version": 4.29,
170+
"firmware_version": "D1DF000",
171171
"interface": "SATA",
172-
"model": "PERC H330 Mini",
173-
"size": 479559942144,
172+
"model": "MTFDDAK480TDN",
173+
"size": 480103981056,
174174
"storage": "SSD",
175-
"vendor": "Dell (Raid)"
175+
"vendor": "Micron"
176176
},
177177
{
178-
"by_id": "/dev/disk/by-id/wwn-0x64cd98f02cf46a0025150aeb04bbbb39",
179-
"by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:2:1:0",
178+
"by_id": "/dev/disk/by-id/wwn-0x500a075121a48f3f",
179+
"by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0",
180180
"device": "sdb",
181181
"driver": "megaraid_sas",
182-
"firmware_version": 4.29,
182+
"firmware_version": "D1DF000",
183183
"interface": "SATA",
184-
"model": "PERC H330 Mini",
184+
"model": "MTFDDAK960TDN",
185185
"reservation": true,
186-
"size": 959656755200,
186+
"size": 960197124096,
187187
"storage": "SSD",
188-
"vendor": "Dell (Raid)"
188+
"vendor": "Micron"
189189
}
190190
],
191191
"supported_job_types": {

‎data/grid5000/sites/nancy/clusters/gros/nodes/gros-104.json

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -163,29 +163,29 @@
163163
},
164164
"storage_devices": [
165165
{
166-
"by_id": "/dev/disk/by-id/wwn-0x6f402700aed9920025150ab804b3e4d5",
167-
"by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:2:0:0",
166+
"by_id": "/dev/disk/by-id/wwn-0x500a075121e45d12",
167+
"by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0",
168168
"device": "sda",
169169
"driver": "megaraid_sas",
170-
"firmware_version": 4.29,
170+
"firmware_version": "D1DF000",
171171
"interface": "SATA",
172-
"model": "PERC H330 Mini",
173-
"size": 479559942144,
172+
"model": "MTFDDAK480TDN",
173+
"size": 480103981056,
174174
"storage": "SSD",
175-
"vendor": "Dell (Raid)"
175+
"vendor": "Micron"
176176
},
177177
{
178-
"by_id": "/dev/disk/by-id/wwn-0x6f402700aed9920025150ab804bc905f",
179-
"by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:2:1:0",
178+
"by_id": "/dev/disk/by-id/wwn-0x500a075121a48f94",
179+
"by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0",
180180
"device": "sdb",
181181
"driver": "megaraid_sas",
182-
"firmware_version": 4.29,
182+
"firmware_version": "D1DF000",
183183
"interface": "SATA",
184-
"model": "PERC H330 Mini",
184+
"model": "MTFDDAK960TDN",
185185
"reservation": true,
186-
"size": 959656755200,
186+
"size": 960197124096,
187187
"storage": "SSD",
188-
"vendor": "Dell (Raid)"
188+
"vendor": "Micron"
189189
}
190190
],
191191
"supported_job_types": {

‎data/grid5000/sites/nancy/clusters/gros/nodes/gros-105.json

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -163,29 +163,29 @@
163163
},
164164
"storage_devices": [
165165
{
166-
"by_id": "/dev/disk/by-id/wwn-0x64cd98f02cf3500025150ae204b2285e",
167-
"by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:2:0:0",
166+
"by_id": "/dev/disk/by-id/wwn-0x500a075121dbabec",
167+
"by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0",
168168
"device": "sda",
169169
"driver": "megaraid_sas",
170-
"firmware_version": 4.29,
170+
"firmware_version": "D1DF000",
171171
"interface": "SATA",
172-
"model": "PERC H330 Mini",
173-
"size": 479559942144,
172+
"model": "MTFDDAK480TDN",
173+
"size": 480103981056,
174174
"storage": "SSD",
175-
"vendor": "Dell (Raid)"
175+
"vendor": "Micron"
176176
},
177177
{
178-
"by_id": "/dev/disk/by-id/wwn-0x64cd98f02cf3500025150ae304bab953",
179-
"by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:2:1:0",
178+
"by_id": "/dev/disk/by-id/wwn-0x500a075121a483e5",
179+
"by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0",
180180
"device": "sdb",
181181
"driver": "megaraid_sas",
182-
"firmware_version": 4.29,
182+
"firmware_version": "D1DF000",
183183
"interface": "SATA",
184-
"model": "PERC H330 Mini",
184+
"model": "MTFDDAK960TDN",
185185
"reservation": true,
186-
"size": 959656755200,
186+
"size": 960197124096,
187187
"storage": "SSD",
188-
"vendor": "Dell (Raid)"
188+
"vendor": "Micron"
189189
}
190190
],
191191
"supported_job_types": {

‎data/grid5000/sites/nancy/clusters/gros/nodes/gros-106.json

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -163,29 +163,29 @@
163163
},
164164
"storage_devices": [
165165
{
166-
"by_id": "/dev/disk/by-id/wwn-0x6f402700aeda070025150af904b7f20a",
167-
"by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:2:0:0",
166+
"by_id": "/dev/disk/by-id/wwn-0x500a075121db9da5",
167+
"by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0",
168168
"device": "sda",
169169
"driver": "megaraid_sas",
170-
"firmware_version": 4.29,
170+
"firmware_version": "D1DF000",
171171
"interface": "SATA",
172-
"model": "PERC H330 Mini",
173-
"size": 479559942144,
172+
"model": "MTFDDAK480TDN",
173+
"size": 480103981056,
174174
"storage": "SSD",
175-
"vendor": "Dell (Raid)"
175+
"vendor": "Micron"
176176
},
177177
{
178-
"by_id": "/dev/disk/by-id/wwn-0x6f402700aeda070025150af904c08221",
179-
"by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:2:1:0",
178+
"by_id": "/dev/disk/by-id/wwn-0x500a075121a48491",
179+
"by_path": "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0",
180180
"device": "sdb",
181181
"driver": "megaraid_sas",
182-
"firmware_version": 4.29,
182+
"firmware_version": "D1DF000",
183183
"interface": "SATA",
184-
"model": "PERC H330 Mini",
184+
"model": "MTFDDAK960TDN",
185185
"reservation": true,
186-
"size": 959656755200,
186+
"size": 960197124096,
187187
"storage": "SSD",
188-
"vendor": "Dell (Raid)"
188+
"vendor": "Micron"
189189
}
190190
],
191191
"supported_job_types": {

0 commit comments

Comments
 (0)