Merge pull request #1 from stackabletech/add-tests

Add tests

Author: NickLarsenNZ

.gitignore

@@ -5,3 +5,4 @@ tmp/
 /target
 roles/create-vm/files/guest-files/spice-guest-tools.exe
 /.direnv
+_work/

nix/sources.json

@@ -1,4 +1,16 @@
 {
+    "beku.py": {
+        "branch": "main",
+        "description": "Test suite expander for Stackable Kuttl tests.",
+        "homepage": null,
+        "owner": "stackabletech",
+        "repo": "beku.py",
+        "rev": "1ebc9e7b70fb8ee11dfb569ae45b3bcd63666d0e",
+        "sha256": "1zg24h5wdis7cysa08r8vvbw2rpyx6fgv148i1lg54dwd3sa0h0d",
+        "type": "tarball",
+        "url": "https://github.com/stackabletech/beku.py/archive/1ebc9e7b70fb8ee11dfb569ae45b3bcd63666d0e.tar.gz",
+        "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
+    },
     "nixpkgs": {
         "branch": "nixos-unstable",
         "description": "Nix Packages collection",

roles/create-vm/defaults/main.yaml

@@ -10,7 +10,8 @@ vm_disk_format: qcow2
 
 vm_network_hostnet_name: stackable-adds-test-hostnet
 vm_network_hostnet_subnet: 192.168.197.0/24
-vm_network_internet_name: default
+vm_network_internet_name: stackable-adds-test-internet
+vm_network_internet_subnet: 192.168.196.0/24
 
 install_iso_windows: "{{ lookup('first_found', 'target') }}/Windows Server 2022 EVAL.iso"
 

roles/create-vm/tasks/main.yaml

@@ -8,6 +8,7 @@
     path: "{{ install_iso_windows }}"
     get_checksum: false
   register: install_iso_windows_stat
+
 - name: Complain about missing Windows ISO
   ansible.builtin.fail:
     msg: "Windows ISO could not be found, please download it from https://www.microsoft.com/en-us/evalcenter/download-windows-server-2022 and put it at {{ install_iso_windows  }} (or modify install_iso_windows to point at the correct path)"
@@ -18,6 +19,7 @@
     dest: "{{ install_iso_virtio_win }}"
     url: "{{ install_iso_virtio_win_url }}"
     checksum: "{{ install_iso_virtio_win_checksum }}"
+
 - name: Download SPICE guest tools
   ansible.builtin.get_url:
     dest: "{{ install_exe_spice_guest_tools }}"
@@ -30,11 +32,26 @@
     command: define
     xml: "{{ lookup('template', 'windows-vm-network.xml.j2') }}"
     uri: "{{ libvirt_uri }}"
+
 - name: Start VM Network
   community.libvirt.virt_net:
     name: "{{ vm_network_hostnet_name }}"
     state: active
     uri: "{{ libvirt_uri }}"
+
+- name: Create VM Network (Internet)
+  community.libvirt.virt_net:
+    name: "{{ vm_network_internet_name }}"
+    command: define
+    xml: "{{ lookup('template', 'windows-vm-network-internet.xml.j2') }}"
+    uri: "{{ libvirt_uri }}"
+
+- name: Start VM Network (Internet)
+  community.libvirt.virt_net:
+    name: "{{ vm_network_internet_name }}"
+    state: active
+    uri: "{{ libvirt_uri }}"
+
 - name: Create VM
   community.libvirt.virt:
     command: define
@@ -43,6 +60,7 @@
       - ADD_UUID
       - ADD_MAC_ADDRESSES
     uri: "{{ libvirt_uri }}"
+
 - name: Check if VM Volume already exists
   # Ansible has no idempotent way to define libvirt volumes,
   # so instead try to check whether it exists.
@@ -52,29 +70,34 @@
   # Errors should cause the create step to fail anyway
   failed_when: False
   changed_when: result_check_vm_disk.rc != 0
+
 - name: Create VM Volume
   when: result_check_vm_disk is changed
   ansible.builtin.command:
     cmd: virsh --connect "{{ libvirt_uri }}" vol-create --pool "{{ vm_disk_pool }}" --file /dev/stdin
     stdin: "{{ lookup('template', 'windows-vm-volume.xml.j2') }}"
+
 - name: Start VM
   community.libvirt.virt:
     name: "{{ vm_name }}"
     state: running
     uri: "{{ libvirt_uri }}"
+
 - name: Get VM Metadata
   community.libvirt.virt:
     name: "{{ vm_name }}"
     command: get_xml
     uri: "{{ libvirt_uri }}"
   register: created_vm
+
 # VM can have multiple NICs, extract the one we care about so we can match it against the IP address of the guest later
 - name: Extract VM's MAC address
   community.general.xml:
     xmlstring: "{{ created_vm.get_xml }}"
     xpath: /domain/devices/interface[alias/@name="ua-net-hostnet"]/mac
     content: attribute
   register: vm_network_mac_xml
+
 - set_fact:
     vm_network_mac: "{{ vm_network_mac_xml.matches[0].mac.address }}"
   delegate_to: sble-addc

roles/create-vm/templates/windows-vm-network-internet.xml.j2

@@ -0,0 +1,14 @@
+<network connections="1">
+  <name>{{ vm_network_internet_name }}</name>
+  <forward mode="nat"/>
+  <bridge stp='on' delay='0'/>
+  <ip
+    address="{{ vm_network_internet_subnet | ansible.utils.ipaddr('next_usable') }}"
+    netmask="{{ vm_network_internet_subnet | ansible.utils.ipaddr('netmask') }}">
+    <dhcp>
+      <range
+        start="{{ vm_network_internet_subnet | ansible.utils.next_nth_usable(2) }}"
+        end="{{ vm_network_internet_subnet | ansible.utils.ipaddr('last_usable') }}"/>
+    </dhcp>
+  </ip>
+</network>