From 0d172ab55c6eb9a235870d8f98d619078bb91078 Mon Sep 17 00:00:00 2001
From: Manuel Bentele
Date: Tue, 16 Nov 2021 08:43:18 +0100
Subject: Add CPU topology functionality for Libvirt domain XML configs

---
 .../java/org/openslx/libvirt/domain/Domain.java    |  84 +++++++++++
 .../org/openslx/libvirt/domain/DomainTest.java     |  68 +++++++++
 ...mu-kvm_default-ubuntu-20-04-vm_cpu-topology.xml | 166 +++++++++++++++++++++
 3 files changed, 318 insertions(+)
 create mode 100644 src/test/resources/libvirt/xml/qemu-kvm_default-ubuntu-20-04-vm_cpu-topology.xml

diff --git a/src/main/java/org/openslx/libvirt/domain/Domain.java b/src/main/java/org/openslx/libvirt/domain/Domain.java
index e6049fa..ca10261 100644
--- a/src/main/java/org/openslx/libvirt/domain/Domain.java
+++ b/src/main/java/org/openslx/libvirt/domain/Domain.java
@@ -767,6 +767,90 @@ public class Domain extends LibvirtXmlDocument
 		this.getRootXmlNode().setXmlElementAttributeValue( "cpu", "check", check.toString() );
 	}
 
+	/**
+	 * Returns the number of virtual machine CPU dies defined in the Libvirt domain XML document.
+	 * 
+	 * @return number of virtual machine CPU dies.
+	 */
+	public int getCpuDies()
+	{
+		final String numDies = this.getRootXmlNode().getXmlElementAttributeValue( "cpu/topology", "dies" );
+		return Integer.valueOf( numDies );
+	}
+
+	/**
+	 * Set number of virtual machine CPU dies in the Libvirt domain XML document.
+	 * 
+	 * @param number virtual machine CPU dies.
+	 */
+	public void setCpuDies( int number )
+	{
+		this.getRootXmlNode().setXmlElementAttributeValue( "cpu/topology", "dies", Integer.toString( number ) );
+	}
+
+	/**
+	 * Returns the number of virtual machine CPU sockets defined in the Libvirt domain XML document.
+	 * 
+	 * @return number of virtual machine CPU sockets.
+	 */
+	public int getCpuSockets()
+	{
+		final String numSockets = this.getRootXmlNode().getXmlElementAttributeValue( "cpu/topology", "sockets" );
+		return Integer.valueOf( numSockets );
+	}
+
+	/**
+	 * Set number of virtual machine CPU dies in the Libvirt domain XML document.
+	 * 
+	 * @param number virtual machine CPU dies.
+	 */
+	public void setCpuSockets( int number )
+	{
+		this.getRootXmlNode().setXmlElementAttributeValue( "cpu/topology", "sockets", Integer.toString( number ) );
+	}
+
+	/**
+	 * Returns the number of virtual machine CPU cores defined in the Libvirt domain XML document.
+	 * 
+	 * @return number of virtual machine CPU cores.
+	 */
+	public int getCpuCores()
+	{
+		final String numCores = this.getRootXmlNode().getXmlElementAttributeValue( "cpu/topology", "cores" );
+		return Integer.valueOf( numCores );
+	}
+
+	/**
+	 * Set number of virtual machine CPU cores in the Libvirt domain XML document.
+	 * 
+	 * @param number virtual machine CPU cores.
+	 */
+	public void setCpuCores( int number )
+	{
+		this.getRootXmlNode().setXmlElementAttributeValue( "cpu/topology", "cores", Integer.toString( number ) );
+	}
+
+	/**
+	 * Returns the number of virtual machine CPU threads defined in the Libvirt domain XML document.
+	 * 
+	 * @return number of virtual machine CPU threads.
+	 */
+	public int getCpuThreads()
+	{
+		final String numThreads = this.getRootXmlNode().getXmlElementAttributeValue( "cpu/topology", "threads" );
+		return Integer.valueOf( numThreads );
+	}
+
+	/**
+	 * Set number of virtual machine CPU threads in the Libvirt domain XML document.
+	 * 
+	 * @param number virtual machine CPU threads.
+	 */
+	public void setCpuThreads( int number )
+	{
+		this.getRootXmlNode().setXmlElementAttributeValue( "cpu/topology", "threads", Integer.toString( number ) );
+	}
+
 	/**
 	 * Returns the file name of the emulator binary defined in the Libvirt domain XML document.
 	 * 
diff --git a/src/test/java/org/openslx/libvirt/domain/DomainTest.java b/src/test/java/org/openslx/libvirt/domain/DomainTest.java
index 6b53125..00bf83b 100644
--- a/src/test/java/org/openslx/libvirt/domain/DomainTest.java
+++ b/src/test/java/org/openslx/libvirt/domain/DomainTest.java
@@ -322,6 +322,74 @@ public class DomainTest
 		assertEquals( CpuCheck.NONE.toString(), vm.getCpuCheck().toString() );
 	}
 
+	@Test
+	@DisplayName( "Get VM CPU dies from libvirt XML file" )
+	public void testGetCpuDies()
+	{
+		Domain vm = this.newDomainInstance( "qemu-kvm_default-ubuntu-20-04-vm_cpu-topology.xml" );
+		assertEquals( 2, vm.getCpuDies() );
+	}
+
+	@Test
+	@DisplayName( "Set VM CPU dies in libvirt XML file" )
+	public void testSetCpuDies()
+	{
+		Domain vm = this.newDomainInstance( "qemu-kvm_default-ubuntu-20-04-vm_cpu-topology.xml" );
+		vm.setCpuDies( 3 );
+		assertEquals( 3, vm.getCpuDies() );
+	}
+
+	@Test
+	@DisplayName( "Get VM CPU sockets from libvirt XML file" )
+	public void testGetCpuSockets()
+	{
+		Domain vm = this.newDomainInstance( "qemu-kvm_default-ubuntu-20-04-vm_cpu-topology.xml" );
+		assertEquals( 3, vm.getCpuSockets() );
+	}
+
+	@Test
+	@DisplayName( "Set VM CPU sockets in libvirt XML file" )
+	public void testSetCpuSockets()
+	{
+		Domain vm = this.newDomainInstance( "qemu-kvm_default-ubuntu-20-04-vm_cpu-topology.xml" );
+		vm.setCpuSockets( 2 );
+		assertEquals( 2, vm.getCpuSockets() );
+	}
+
+	@Test
+	@DisplayName( "Get VM CPU cores from libvirt XML file" )
+	public void testGetCpuCores()
+	{
+		Domain vm = this.newDomainInstance( "qemu-kvm_default-ubuntu-20-04-vm_cpu-topology.xml" );
+		assertEquals( 4, vm.getCpuCores() );
+	}
+
+	@Test
+	@DisplayName( "Set VM CPU cores in libvirt XML file" )
+	public void testSetCpuCores()
+	{
+		Domain vm = this.newDomainInstance( "qemu-kvm_default-ubuntu-20-04-vm_cpu-topology.xml" );
+		vm.setCpuCores( 8 );
+		assertEquals( 8, vm.getCpuCores() );
+	}
+
+	@Test
+	@DisplayName( "Get VM CPU threads from libvirt XML file" )
+	public void testGetCpuThreads()
+	{
+		Domain vm = this.newDomainInstance( "qemu-kvm_default-ubuntu-20-04-vm_cpu-topology.xml" );
+		assertEquals( 1, vm.getCpuThreads() );
+	}
+
+	@Test
+	@DisplayName( "Set VM CPU threads in libvirt XML file" )
+	public void testSetCpuThreads()
+	{
+		Domain vm = this.newDomainInstance( "qemu-kvm_default-ubuntu-20-04-vm_cpu-topology.xml" );
+		vm.setCpuThreads( 2 );
+		assertEquals( 2, vm.getCpuThreads() );
+	}
+
 	@Test
 	@DisplayName( "Get VM emulator binary from libvirt XML file" )
 	public void testGetDevicesEmulator()
diff --git a/src/test/resources/libvirt/xml/qemu-kvm_default-ubuntu-20-04-vm_cpu-topology.xml b/src/test/resources/libvirt/xml/qemu-kvm_default-ubuntu-20-04-vm_cpu-topology.xml
new file mode 100644
index 0000000..a3f7c24
--- /dev/null
+++ b/src/test/resources/libvirt/xml/qemu-kvm_default-ubuntu-20-04-vm_cpu-topology.xml
@@ -0,0 +1,166 @@
+<domain type='kvm'>
+  <name>ubuntu-20-04</name>
+  <uuid>8dc5433c-0228-49e4-b019-fa2b606aa544</uuid>
+  <title>Ubuntu 20.04</title>
+  <description>Ubuntu 20.04 desktop installation</description>
+  <metadata>
+    <libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">
+      <libosinfo:os id="http://ubuntu.com/ubuntu/20.04"/>
+    </libosinfo:libosinfo>
+  </metadata>
+  <memory unit='KiB'>4194304</memory>
+  <currentMemory unit='KiB'>4194304</currentMemory>
+  <vcpu placement='static'>2</vcpu>
+  <os>
+    <type arch='x86_64' machine='pc-q35-5.1'>hvm</type>
+    <boot dev='hd'/>
+  </os>
+  <features>
+    <acpi/>
+    <apic/>
+    <vmport state='off'/>
+  </features>
+  <cpu mode='host-model' check='partial'>
+    <topology dies='2' sockets='3' cores='4' threads='1'/>
+  </cpu>
+  <clock offset='utc'>
+    <timer name='rtc' tickpolicy='catchup'/>
+    <timer name='pit' tickpolicy='delay'/>
+    <timer name='hpet' present='no'/>
+  </clock>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <pm>
+    <suspend-to-mem enabled='no'/>
+    <suspend-to-disk enabled='no'/>
+  </pm>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk type='block' device='disk'>
+      <driver name='qemu' type='raw' cache='none' io='native'/>
+      <source dev='/dev/data/ubuntu-20-04.img'/>
+      <target dev='vda' bus='virtio'/>
+      <address type='pci' domain='0x0000' bus='0x03' slot='0x00' function='0x0'/>
+    </disk>
+    <disk type='file' device='cdrom'>
+      <driver name='qemu' type='raw'/>
+      <target dev='sda' bus='sata'/>
+      <readonly/>
+      <address type='drive' controller='0' bus='0' target='0' unit='0'/>
+    </disk>
+    <disk type='file' device='floppy'>
+      <driver name='qemu' type='raw'/>
+      <target dev='fda' bus='fdc'/>
+      <address type='drive' controller='0' bus='0' target='0' unit='0'/>
+    </disk>
+    <controller type='usb' index='0' model='ich9-ehci1'>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x1d' function='0x7'/>
+    </controller>
+    <controller type='usb' index='0' model='ich9-uhci1'>
+      <master startport='0'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x1d' function='0x0' multifunction='on'/>
+    </controller>
+    <controller type='usb' index='0' model='ich9-uhci2'>
+      <master startport='2'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x1d' function='0x1'/>
+    </controller>
+    <controller type='usb' index='0' model='ich9-uhci3'>
+      <master startport='4'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x1d' function='0x2'/>
+    </controller>
+    <controller type='sata' index='0'>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x1f' function='0x2'/>
+    </controller>
+    <controller type='pci' index='0' model='pcie-root'/>
+    <controller type='pci' index='1' model='pcie-root-port'>
+      <model name='pcie-root-port'/>
+      <target chassis='1' port='0x10'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0' multifunction='on'/>
+    </controller>
+    <controller type='pci' index='2' model='pcie-root-port'>
+      <model name='pcie-root-port'/>
+      <target chassis='2' port='0x11'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x1'/>
+    </controller>
+    <controller type='pci' index='3' model='pcie-root-port'>
+      <model name='pcie-root-port'/>
+      <target chassis='3' port='0x12'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x2'/>
+    </controller>
+    <controller type='pci' index='4' model='pcie-root-port'>
+      <model name='pcie-root-port'/>
+      <target chassis='4' port='0x13'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x3'/>
+    </controller>
+    <controller type='pci' index='5' model='pcie-root-port'>
+      <model name='pcie-root-port'/>
+      <target chassis='5' port='0x14'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x4'/>
+    </controller>
+    <controller type='pci' index='6' model='pcie-root-port'>
+      <model name='pcie-root-port'/>
+      <target chassis='6' port='0x15'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x5'/>
+    </controller>
+    <controller type='virtio-serial' index='0'>
+      <address type='pci' domain='0x0000' bus='0x02' slot='0x00' function='0x0'/>
+    </controller>
+    <controller type='scsi' index='0' model='virtio-scsi'>
+      <address type='pci' domain='0x0000' bus='0x06' slot='0x00' function='0x0'/>
+    </controller>
+    <controller type='fdc' index='0'/>
+    <interface type='network'>
+      <mac address='52:54:00:0d:90:0c'/>
+      <source network='default'/>
+      <model type='virtio'/>
+      <address type='pci' domain='0x0000' bus='0x01' slot='0x00' function='0x0'/>
+    </interface>
+    <serial type='pty'>
+      <target type='isa-serial' port='0'>
+        <model name='isa-serial'/>
+      </target>
+    </serial>
+    <console type='pty'>
+      <target type='serial' port='0'/>
+    </console>
+    <channel type='unix'>
+      <target type='virtio' name='org.qemu.guest_agent.0'/>
+      <address type='virtio-serial' controller='0' bus='0' port='1'/>
+    </channel>
+    <channel type='spicevmc'>
+      <target type='virtio' name='com.redhat.spice.0'/>
+      <address type='virtio-serial' controller='0' bus='0' port='2'/>
+    </channel>
+    <input type='tablet' bus='usb'>
+      <address type='usb' bus='0' port='1'/>
+    </input>
+    <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
+    <graphics type='spice' autoport='yes'>
+      <listen type='address'/>
+      <image compression='off'/>
+    </graphics>
+    <sound model='ich9'>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x1b' function='0x0'/>
+    </sound>
+    <video>
+      <model type='qxl' ram='65536' vram='65536' vgamem='16384' heads='1' primary='yes'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/>
+    </video>
+    <redirdev bus='usb' type='spicevmc'>
+      <address type='usb' bus='0' port='2'/>
+    </redirdev>
+    <redirdev bus='usb' type='spicevmc'>
+      <address type='usb' bus='0' port='3'/>
+    </redirdev>
+    <memballoon model='virtio'>
+      <address type='pci' domain='0x0000' bus='0x04' slot='0x00' function='0x0'/>
+    </memballoon>
+    <rng model='virtio'>
+      <backend model='random'>/dev/urandom</backend>
+      <address type='pci' domain='0x0000' bus='0x05' slot='0x00' function='0x0'/>
+    </rng>
+  </devices>
+</domain>
+
-- 
cgit v1.2.3-55-g7522