Thin pool test with large size volume fix (#310)

- fixed size calculation for large size thin pools in the test - modified provision.fmf disk size to simulate larger disks in the tests
linux-system-roles · Dec 6, 2022 · 18f2f58 · 18f2f58
1 parent 2c20596
commit 18f2f58
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 13 deletions.
diff --git a/tests/provision.fmf b/tests/provision.fmf
@@ -5,13 +5,13 @@ standard-inventory-qcow2:
       - size: 10737418240
       - size: 10737418240
       - size: 10737418240
-      - size: 10737418240
+      - size: 1099511627800
         interface: scsi
-      - size: 10737418240
+      - size: 1099511627800
         interface: scsi
       - size: 10737418240
         interface: scsi
-      - size: 10737418240
+      - size: 1099511627800
         interface: nvme
       - size: 10737418240
         interface: nvme

diff --git a/tests/test-verify-volume-size.yml b/tests/test-verify-volume-size.yml
@@ -50,28 +50,36 @@
 
     - name: Default minimal thin pool reserved space size
       bsize:
-        size: "1G"
+        size: "1GB"
       register: _storage_test_default_thpool_reserve_min
 
     - name: Default maximal thin pool reserved space size
       bsize:
-        size: "100G"
+        size: "100GB"
       register: _storage_test_default_thpool_reserve_max
 
+    # Cannot use Size type yet, it would complicate following logic
     - name: Calculate maximum usable space in thin pool
-      bsize:
-        size: "{{ storage_test_pool_size.bytes * (1 - (_storage_test_default_thpool_reserve_percent|int)/100.0) }}"
-      register: _storage_test_max_thin_pool_size
+      set_fact:
+        _storage_test_max_thin_pool_size: "{{ storage_test_pool_size.bytes * (1 - (_storage_test_default_thpool_reserve_percent|int)/100.0) }}"
 
     - name: Apply upper size limit to max usable thin pool space
       set_fact:
-        _storage_test_max_thin_pool_size: _storage_test_default_thpool_reserve_max
-      when: storage_test_pool_size.bytes - _storage_test_max_thin_pool_size.bytes > _storage_test_default_thpool_reserve_max.bytes
+        _storage_test_max_thin_pool_size: "{{ storage_test_pool_size.bytes - _storage_test_default_thpool_reserve_max.bytes }}"
+      when: storage_test_pool_size.bytes - _storage_test_max_thin_pool_size|int > _storage_test_default_thpool_reserve_max.bytes
 
     - name: Apply lower size limit to max usable thin pool space
       set_fact:
-        _storage_test_max_thin_pool_size: _storage_test_default_thpool_reserve_min
-      when: storage_test_pool_size.bytes - _storage_test_max_thin_pool_size.bytes < _storage_test_default_thpool_reserve_min.bytes
+        _storage_test_max_thin_pool_size: "{{storage_test_pool_size.bytes - _storage_test_default_thpool_reserve_min.bytes}}"
+      when: storage_test_pool_size.bytes - _storage_test_max_thin_pool_size|int < _storage_test_default_thpool_reserve_min.bytes
+
+    - name: Convert maximum usable thin pool space from int to Size
+      bsize:
+        size: "{{ _storage_test_max_thin_pool_size }}B"
+      register: _storage_test_max_thin_pool_size
+
+    - debug:
+        var: _storage_test_max_thin_pool_size
 
     - debug:
         var: storage_test_volume.thin_pool_size
@@ -121,5 +129,5 @@
 
 - assert:
     that: (storage_test_expected_size|int - storage_test_actual_size.bytes)|abs / storage_test_expected_size|int < 0.01
-    msg: "Volume {{ storage_test_volume.name }} has unexpected size ({{ storage_test_expected_size|int }} / {{ storage_test_actual_size.bytes }})"
+    msg: "Volume {{ storage_test_volume.name }} has unexpected size (expected: {{ storage_test_expected_size|int }} / actual: {{ storage_test_actual_size.bytes }})"
   when: _storage_test_volume_present and storage_test_volume.type == "lvm"