Skip to content

Commit bb1eb23

Browse files
vojtechtrefnyrichm
authored andcommitted
test: fix sector-based disk size calculation from ansible_devices
Device sizes specified in sectors are in general in 512 sectors regardless of the actual device physical sector size. Example of ansible_devices facts for a 4k sector size drive: ... "sectors": "41943040", "sectorsize": "4096", "size": "20.00 GB" ... Resolves: RHEL-30959 Signed-off-by: Vojtech Trefny <[email protected]>
1 parent 6db3ef8 commit bb1eb23

File tree

3 files changed

+4
-8
lines changed

3 files changed

+4
-8
lines changed

tests/tests_create_lv_size_equal_to_vg.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@
88
volume_group_size: '10g'
99
lv_size: '10g'
1010
unused_disk_subfact: '{{ ansible_devices[unused_disks[0]] }}'
11-
disk_size: '{{ unused_disk_subfact.sectors | int *
12-
unused_disk_subfact.sectorsize | int }}'
11+
disk_size: '{{ unused_disk_subfact.sectors | int * 512 }}'
1312
tags:
1413
- tests::lvm
1514

tests/tests_misc.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@
88
volume_group_size: "5g"
99
volume1_size: "4g"
1010
unused_disk_subfact: "{{ ansible_devices[unused_disks[0]] }}"
11-
too_large_size: "{{ (unused_disk_subfact.sectors | int * 1.2) *
12-
unused_disk_subfact.sectorsize | int }}"
11+
too_large_size: "{{ (unused_disk_subfact.sectors | int * 1.2) * 512 }}"
1312
tags:
1413
- tests::lvm
1514
tasks:

tests/tests_resize.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,8 @@
1111
invalid_size1: xyz GiB
1212
invalid_size2: none
1313
unused_disk_subfact: '{{ ansible_devices[unused_disks[0]] }}'
14-
too_large_size: '{{ unused_disk_subfact.sectors | int * 1.2 *
15-
unused_disk_subfact.sectorsize | int }}'
16-
disk_size: '{{ unused_disk_subfact.sectors | int *
17-
unused_disk_subfact.sectorsize | int }}'
14+
too_large_size: '{{ unused_disk_subfact.sectors | int * 1.2 * 512 }}'
15+
disk_size: '{{ unused_disk_subfact.sectors | int * 512 }}'
1816
tags:
1917
- tests::lvm
2018
tasks:

0 commit comments

Comments
 (0)