Refactor xml definitions to match libvirt-go-xml current API

libvirt/libvirt-go-xml@dd998da changed the structs to be more like unions.
dmacvicar · Jul 12, 2018 · 77982e7 · 77982e7
1 parent 0ff62a2
commit 77982e7
Show file tree

Hide file tree

Showing 9 changed files with 194 additions and 139 deletions.
diff --git a/libvirt/disk_def.go b/libvirt/disk_def.go
@@ -9,9 +9,9 @@ import (
 
 const oui = "05abcd"
 
+// note, source is not initialized
 func newDefDisk(i int) libvirtxml.DomainDisk {
 	return libvirtxml.DomainDisk{
-		Type:   "file",
 		Device: "disk",
 		Target: &libvirtxml.DomainDiskTarget{
 			Bus: "virtio",

diff --git a/libvirt/domain.go b/libvirt/domain.go
@@ -196,7 +196,7 @@ func getDomainInterfacesFromNetworks(domain libvirtxml.Domain,
 	var macAddresses []string
 
 	for _, networkInterface := range domain.Devices.Interfaces {
-		networkNames = append(networkNames, networkInterface.Source.Network)
+		networkNames = append(networkNames, networkInterface.Source.Network.Network)
 		macAddresses = append(macAddresses, strings.ToUpper(networkInterface.MAC.Address))
 	}
 

diff --git a/libvirt/domain_def.go b/libvirt/domain_def.go
@@ -8,9 +8,9 @@ import (
 	libvirtxml "github.com/libvirt/libvirt-go-xml"
 )
 
+// note source and target are not initialized
 func newFilesystemDef() libvirtxml.DomainFilesystem {
 	return libvirtxml.DomainFilesystem{
-		Type:       "mount",  // This is the only type used by qemu/kvm
 		AccessMode: "mapped", // A safe default value
 		ReadOnly:   &libvirtxml.DomainFilesystemReadOnly{},
 	}
@@ -37,24 +37,25 @@ func newDomainDef() libvirtxml.Domain {
 		Devices: &libvirtxml.DomainDeviceList{
 			Graphics: []libvirtxml.DomainGraphic{
 				{
-					Type:     "spice",
-					AutoPort: "yes",
+					Spice: &libvirtxml.DomainGraphicSpice{
+						AutoPort: "yes",
+					},
 				},
 			},
 			Channels: []libvirtxml.DomainChannel{
 				{
-					Type: "unix",
 					Target: &libvirtxml.DomainChannelTarget{
-						Type: "virtio",
-						Name: "org.qemu.guest_agent.0",
+						VirtIO: &libvirtxml.DomainChannelTargetVirtIO{
+							Name: "org.qemu.guest_agent.0",
+						},
 					},
 				},
 			},
 			RNGs: []libvirtxml.DomainRNG{
 				{
 					Model: "virtio",
 					Backend: &libvirtxml.DomainRNGBackend{
-						Model: "random",
+						Random: &libvirtxml.DomainRNGBackendRandom{},
 					},
 				},
 			},