CI test disk remove and VM reboot for all disk types

Signed-off-by: Justin Cinkelj <[email protected]>

Author: justinc1

tests/integration/targets/vm__remove_disk/tasks/03_remove_disk_running_with_reboot.yml

@@ -30,10 +30,10 @@
   scale_computing.hypercore.vm:
     <<: *vm_a_definition
     disks:
-      - type: ide_disk
+      - type: "{{ disk_type }}"
         disk_slot: 0
         size: "{{ '10 GB' | human_to_bytes }}"
-      - type: ide_disk
+      - type: "{{ disk_type }}"
         disk_slot: 1
         size: "{{ '11 GB' | human_to_bytes }}"
   register: vm_result
@@ -47,6 +47,8 @@
       - vm_result.record.0.description == "VM remove disk CI test"
       - vm_result.record.0.vm_name == "{{ vm_name_a }}"
       - vm_result.record.0.disks | length == 2
+      - vm_result.record.0.disks.0.type  == disk_type
+      - vm_result.record.0.disks.1.type  == disk_type
       - vm_result.vm_rebooted == False
       - vm_info_a_initial_result.records.0.description == "VM remove disk CI test"
       - vm_info_a_initial_result.records.0.vm_name == "{{ vm_name_a }}"
@@ -55,15 +57,17 @@
 
 # ------------------------------------------------------------------------------------------------------------------
 # Remove disk from running VM
-# Shutdown is allowed, and needed.
+# Force shutdown is allowed, and for disk_type:
+#  - ide_disk: force shutdown is needed to remove disk.
+#  - virtio_disk: in some HC3 versions disk can be removed from a running VM.
 - name: Remove disk from running VM with reboot
   block: &remove_disk_from_vm
     - name: Remove disk from running VM {{ vm_name_a }}
       scale_computing.hypercore.vm:
         <<: *vm_a_definition
         disks:
           # remove 1st disk, keep 2nd disk
-          - type: ide_disk
+          - type: "{{ disk_type }}"
             disk_slot: 1
             size: "{{ '11 GB' | human_to_bytes }}"
         force_reboot: True
@@ -78,11 +82,12 @@
           - vm_result is succeeded
           - vm_info_a_result.records.0.power_state == "started"
           - vm_info_a_result.records.0.disks  | length == 1
+          - vm_info_a_result.records.0.disks.0.type  == disk_type
           - vm_info_a_result.records.0.disks.0.uuid == vm_info_a_initial_result.records.0.disks.1.uuid
 - ansible.builtin.assert:
     that:
       - vm_result is changed
-      - vm_result.vm_rebooted == True
+      - vm_result.vm_rebooted == expected_vm_reboot
 
 - name: Remove disk from running VM with reboot - idempotence
   block:

tests/integration/targets/vm__remove_disk/tasks/main.yml

@@ -22,3 +22,19 @@
     - include_tasks: 01_remove_disk_stopped.yml
     - include_tasks: 02_remove_disk_running.yml
     - include_tasks: 03_remove_disk_running_with_reboot.yml
+      vars:
+        disk_type: ide_disk
+        expected_vm_reboot: True
+    - name: Get HyperCore version
+      scale_computing.hypercore.cluster_info:
+      register: cluster_info
+    - include_tasks: 03_remove_disk_running_with_reboot.yml
+      vars:
+        disk_type: virtio_disk
+        # HyperCore 9.1.14 could remove disk from running VM
+        # HyperCore 9.2.13, 9.2.17 could not remove disk from running VM
+        expected_vm_reboot: "{{ cluster_info.record.icos_version.startswith('9.2') }}"
+    - include_tasks: 03_remove_disk_running_with_reboot.yml
+      vars:
+        disk_type: scsi_disk
+        expected_vm_reboot: False