diff options
| -rw-r--r-- | libvirt/qemu_agent.go | 12 | ||||
| -rw-r--r-- | libvirt/qemu_agent_test.go | 18 |
2 files changed, 15 insertions, 15 deletions
diff --git a/libvirt/qemu_agent.go b/libvirt/qemu_agent.go index 656a1261..d89866a3 100644 --- a/libvirt/qemu_agent.go +++ b/libvirt/qemu_agent.go @@ -7,18 +7,18 @@ import ( libvirt "github.com/libvirt/libvirt-go" ) - +// QemuAgentInterfacesResponse type type QemuAgentInterfacesResponse struct { Interfaces []QemuAgentInterface `json:"return"` } - +// QemuAgentInterface type type QemuAgentInterface struct { Name string `json:"name"` Hwaddr string `json:"hardware-address"` - IpAddresses []QemuAgentInterfaceIpAddress `json:"ip-addresses"` + IPAddresses []QemuAgentInterfaceIPAddress `json:"ip-addresses"` } - -type QemuAgentInterfaceIpAddress struct { +// QemuAgentInterfaceIPAddress type +type QemuAgentInterfaceIPAddress struct { Type string `json:"ip-address-type"` Address string `json:"ip-address"` Prefix uint `json:"prefix"` @@ -64,7 +64,7 @@ func getDomainInterfacesViaQemuAgent(domain LibVirtDomain, wait4ipv4 bool) []lib Hwaddr: iface.Hwaddr} ipv4Assigned := false - for _, addr := range iface.IpAddresses { + for _, addr := range iface.IPAddresses { if addr.Address == "" { // ignore interfaces without an address (eg. waiting for dhcp lease) continue diff --git a/libvirt/qemu_agent_test.go b/libvirt/qemu_agent_test.go index 1b534190..026dec5d 100644 --- a/libvirt/qemu_agent_test.go +++ b/libvirt/qemu_agent_test.go @@ -41,8 +41,8 @@ func TestGetDomainInterfacesViaQemuAgentIgnoreLoopbackDevice(t *testing.T) { QemuAgentInterface{ Name: "lo", Hwaddr: "ho:me", - IpAddresses: []QemuAgentInterfaceIpAddress{ - QemuAgentInterfaceIpAddress{ + IPAddresses: []QemuAgentInterfaceIPAddress{ + QemuAgentInterfaceIPAddress{ Type: "ipv4", Address: "127.0.0.1", Prefix: 1, @@ -72,8 +72,8 @@ func TestGetDomainInterfacesViaQemuAgentIgnoreDevicesWithoutAddress(t *testing.T QemuAgentInterface{ Name: "eth1", Hwaddr: "xy:yy:zz", - IpAddresses: []QemuAgentInterfaceIpAddress{ - QemuAgentInterfaceIpAddress{ + IPAddresses: []QemuAgentInterfaceIPAddress{ + QemuAgentInterfaceIPAddress{ Type: "ipv4", Address: "", Prefix: 1, @@ -103,8 +103,8 @@ func TestGetDomainInterfacesViaQemuAgentUnknownIpAddressType(t *testing.T) { QemuAgentInterface{ Name: "eth2", Hwaddr: "zy:yy:zz", - IpAddresses: []QemuAgentInterfaceIpAddress{ - QemuAgentInterfaceIpAddress{ + IPAddresses: []QemuAgentInterfaceIPAddress{ + QemuAgentInterfaceIPAddress{ Type: "ipv8", Address: "i don't exist", Prefix: 1, @@ -139,13 +139,13 @@ func TestGetDomainInterfacesViaQemuAgent(t *testing.T) { QemuAgentInterface{ Name: device, Hwaddr: mac, - IpAddresses: []QemuAgentInterfaceIpAddress{ - QemuAgentInterfaceIpAddress{ + IPAddresses: []QemuAgentInterfaceIPAddress{ + QemuAgentInterfaceIPAddress{ Type: "ipv4", Address: ipv4Addr, Prefix: 1, }, - QemuAgentInterfaceIpAddress{ + QemuAgentInterfaceIPAddress{ Type: "ipv6", Address: ipv6Addr, Prefix: 1, |