From fa81180f80190e209a42a2e3f6d61691397ecb2e Mon Sep 17 00:00:00 2001
From: Dario Maiocchi <dmaiocchi@suse.com>
Date: Sun, 12 Nov 2017 18:08:55 +0100
Subject: type name will be used as libvirt.LibVirtDomain by

other packages, and that stutters; consider calling this Domain
---
 libvirt/libvirt_domain_mock_test.go |  4 ++--
 libvirt/libvirt_interfaces.go       |  4 ++--
 libvirt/qemu_agent.go               |  2 +-
 libvirt/qemu_agent_test.go          | 12 ++++++------
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/libvirt/libvirt_domain_mock_test.go b/libvirt/libvirt_domain_mock_test.go
index b54feb61..151b07c9 100644
--- a/libvirt/libvirt_domain_mock_test.go
+++ b/libvirt/libvirt_domain_mock_test.go
@@ -2,10 +2,10 @@ package libvirt
 
 import "github.com/libvirt/libvirt-go"
 
-type LibVirtDomainMock struct {
+type DomainMock struct {
 	QemuAgentCommandResponse string
 }
 
-func (d LibVirtDomainMock) QemuAgentCommand(command string, timeout libvirt.DomainQemuAgentCommandTimeout, flags uint32) (string, error) {
+func (d DomainMock) QemuAgentCommand(command string, timeout libvirt.DomainQemuAgentCommandTimeout, flags uint32) (string, error) {
 	return d.QemuAgentCommandResponse, nil
 }
diff --git a/libvirt/libvirt_interfaces.go b/libvirt/libvirt_interfaces.go
index af21fb14..ac408015 100644
--- a/libvirt/libvirt_interfaces.go
+++ b/libvirt/libvirt_interfaces.go
@@ -2,9 +2,9 @@ package libvirt
 
 import "github.com/libvirt/libvirt-go"
 
-// LibVirtDomain  Interface used to expose a libvirt.Domain
+// Domain  Interface used to expose a libvirt.Domain
 // Used to allow testing
-type LibVirtDomain interface {
+type Domain interface {
 	QemuAgentCommand(command string, timeout libvirt.DomainQemuAgentCommandTimeout, flags uint32) (string, error)
 }
 
diff --git a/libvirt/qemu_agent.go b/libvirt/qemu_agent.go
index 71fc6db1..82e76685 100644
--- a/libvirt/qemu_agent.go
+++ b/libvirt/qemu_agent.go
@@ -32,7 +32,7 @@ type QemuAgentInterfaceIPAddress struct {
 // When wait4ipv4 is turned on the code will not report interfaces that don't
 // have a ipv4 address set. This is useful when a domain gets the ipv6 address
 // before the ipv4 one.
-func getDomainInterfacesViaQemuAgent(domain LibVirtDomain, wait4ipv4 bool) []libvirt.DomainInterface {
+func getDomainInterfacesViaQemuAgent(domain Domain, wait4ipv4 bool) []libvirt.DomainInterface {
 	log.Print("[DEBUG] get network interfaces using qemu agent")
 
 	var interfaces []libvirt.DomainInterface
diff --git a/libvirt/qemu_agent_test.go b/libvirt/qemu_agent_test.go
index 026dec5d..b38cd9d3 100644
--- a/libvirt/qemu_agent_test.go
+++ b/libvirt/qemu_agent_test.go
@@ -8,7 +8,7 @@ import (
 )
 
 func TestGetDomainInterfacesViaQemuAgentInvalidResponse(t *testing.T) {
-	domain := LibVirtDomainMock{}
+	domain := DomainMock{}
 
 	interfaces := getDomainInterfacesViaQemuAgent(domain, false)
 
@@ -25,7 +25,7 @@ func TestGetDomainInterfacesViaQemuAgentNoInterfaces(t *testing.T) {
 	if err != nil {
 		t.Errorf("error: %v", err)
 	}
-	domain := LibVirtDomainMock{
+	domain := DomainMock{
 		QemuAgentCommandResponse: string(data),
 	}
 
@@ -55,7 +55,7 @@ func TestGetDomainInterfacesViaQemuAgentIgnoreLoopbackDevice(t *testing.T) {
 	if err != nil {
 		t.Errorf("error: %v", err)
 	}
-	domain := LibVirtDomainMock{
+	domain := DomainMock{
 		QemuAgentCommandResponse: string(data),
 	}
 
@@ -86,7 +86,7 @@ func TestGetDomainInterfacesViaQemuAgentIgnoreDevicesWithoutAddress(t *testing.T
 	if err != nil {
 		t.Errorf("error: %v", err)
 	}
-	domain := LibVirtDomainMock{
+	domain := DomainMock{
 		QemuAgentCommandResponse: string(data),
 	}
 
@@ -117,7 +117,7 @@ func TestGetDomainInterfacesViaQemuAgentUnknownIpAddressType(t *testing.T) {
 	if err != nil {
 		t.Errorf("error: %v", err)
 	}
-	domain := LibVirtDomainMock{
+	domain := DomainMock{
 		QemuAgentCommandResponse: string(data),
 	}
 
@@ -158,7 +158,7 @@ func TestGetDomainInterfacesViaQemuAgent(t *testing.T) {
 	if err != nil {
 		t.Errorf("error: %v", err)
 	}
-	domain := LibVirtDomainMock{
+	domain := DomainMock{
 		QemuAgentCommandResponse: string(data),
 	}
 
-- 
cgit v1.2.3