diff options
| -rw-r--r-- | libvirt/domain_def.go | 4 | ||||
| -rw-r--r-- | libvirt/network_interface_def.go | 4 | ||||
| -rw-r--r-- | libvirt/resource_libvirt_domain.go | 4 | ||||
| -rw-r--r-- | libvirt/resource_libvirt_domain_test.go | 1 | ||||
| -rw-r--r-- | libvirt/resource_libvirt_volume.go | 1 | ||||
| -rw-r--r-- | libvirt/volume_def.go | 1 |
6 files changed, 5 insertions, 10 deletions
diff --git a/libvirt/domain_def.go b/libvirt/domain_def.go index f7c2f969..ca67f6a7 100644 --- a/libvirt/domain_def.go +++ b/libvirt/domain_def.go @@ -12,9 +12,9 @@ type defDomain struct { Memory defMemory `xml:"memory"` VCpu defVCpu `xml:"vcpu"` Devices struct { - Disks []defDisk `xml:"disk"` + Disks []defDisk `xml:"disk"` NetworkInterfaces []defNetworkInterface `xml:"interface"` - Spice struct { + Spice struct { Type string `xml:"type,attr"` Autoport string `xml:"autoport,attr"` } `xml:"graphics"` diff --git a/libvirt/network_interface_def.go b/libvirt/network_interface_def.go index 85452691..4e401a6f 100644 --- a/libvirt/network_interface_def.go +++ b/libvirt/network_interface_def.go @@ -8,11 +8,11 @@ import ( type defNetworkInterface struct { XMLName xml.Name `xml:"interface"` Type string `xml:"type,attr"` - Mac struct { + Mac struct { Address string `xml:"address,attr,omitempty"` } `xml:"mac,omitempty"` Source struct { - Network string `xml:"network,attr"` + Network string `xml:"network,attr"` } `xml:"source"` Model struct { Type string `xml:"type,attr"` diff --git a/libvirt/resource_libvirt_domain.go b/libvirt/resource_libvirt_domain.go index 1d9537f0..c0a4281f 100644 --- a/libvirt/resource_libvirt_domain.go +++ b/libvirt/resource_libvirt_domain.go @@ -51,7 +51,6 @@ func resourceLibvirtDomain() *schema.Resource { Schema: networkInterfaceCommonSchema(), }, }, - }, } } @@ -213,7 +212,7 @@ func resourceLibvirtDomainRead(d *schema.ResourceData, meta interface{}) error { for _, networkInterfaceDef := range domainDef.Devices.NetworkInterfaces { netIface := map[string]interface{}{ "network": networkInterfaceDef.Source.Network, - "mac": networkInterfaceDef.Mac.Address, + "mac": networkInterfaceDef.Mac.Address, } netIfaces = append(netIfaces, netIface) } @@ -291,4 +290,3 @@ func waitForDomainDestroyed(virConn *libvirt.VirConnection, id uint32) error { } } } - diff --git a/libvirt/resource_libvirt_domain_test.go b/libvirt/resource_libvirt_domain_test.go index 011a62d9..12616188 100644 --- a/libvirt/resource_libvirt_domain_test.go +++ b/libvirt/resource_libvirt_domain_test.go @@ -153,7 +153,6 @@ func TestAccLibvirtDomain_NetworkInterface(t *testing.T) { }) } - func testAccCheckLibvirtDomainDestroy(s *terraform.State) error { virtConn := testAccProvider.Meta().(*Client).libvirt diff --git a/libvirt/resource_libvirt_volume.go b/libvirt/resource_libvirt_volume.go index 2a9a616d..cd0e76a8 100644 --- a/libvirt/resource_libvirt_volume.go +++ b/libvirt/resource_libvirt_volume.go @@ -104,7 +104,6 @@ func resourceLibvirtVolumeCreate(d *schema.ResourceData, meta interface{}) error return fmt.Errorf("'base_volume_id' can't be specified when also 'source' is given (the size will be set to the size of the base image.") } - size, err := remoteImageSize(url.(string)) if err != nil { return err diff --git a/libvirt/volume_def.go b/libvirt/volume_def.go index cbc889c6..3f4a9012 100644 --- a/libvirt/volume_def.go +++ b/libvirt/volume_def.go @@ -21,7 +21,6 @@ type defVolume struct { Permissions struct { Mode int `xml:"mode,omitempty"` } `xml:"permissions,omitempty"` - } `xml:"target"` Allocation int `xml:"allocation"` Capacity struct { |