diff options
Diffstat (limited to 'libvirt')
-rw-r--r-- | libvirt/libvirt_interfaces.go | 4 | ||||
-rw-r--r-- | libvirt/libvirt_network_mock_test.go | 4 | ||||
-rw-r--r-- | libvirt/network_def.go | 2 | ||||
-rw-r--r-- | libvirt/network_def_test.go | 6 |
4 files changed, 8 insertions, 8 deletions
diff --git a/libvirt/libvirt_interfaces.go b/libvirt/libvirt_interfaces.go index ac408015..36161dc3 100644 --- a/libvirt/libvirt_interfaces.go +++ b/libvirt/libvirt_interfaces.go @@ -8,7 +8,7 @@ type Domain interface { QemuAgentCommand(command string, timeout libvirt.DomainQemuAgentCommandTimeout, flags uint32) (string, error) } -// LibVirtNetwork interface -type LibVirtNetwork interface { +// Network interface +type Network interface { GetXMLDesc(flags libvirt.NetworkXMLFlags) (string, error) } diff --git a/libvirt/libvirt_network_mock_test.go b/libvirt/libvirt_network_mock_test.go index a92930b0..5b856e28 100644 --- a/libvirt/libvirt_network_mock_test.go +++ b/libvirt/libvirt_network_mock_test.go @@ -2,11 +2,11 @@ package libvirt import "github.com/libvirt/libvirt-go" -type LibVirtNetworkMock struct { +type NetworkMock struct { GetXMLDescReply string GetXMLDescError error } -func (n LibVirtNetworkMock) GetXMLDesc(flags libvirt.NetworkXMLFlags) (string, error) { +func (n NetworkMock) GetXMLDesc(flags libvirt.NetworkXMLFlags) (string, error) { return n.GetXMLDescReply, n.GetXMLDescError } diff --git a/libvirt/network_def.go b/libvirt/network_def.go index 9c774373..66e17127 100644 --- a/libvirt/network_def.go +++ b/libvirt/network_def.go @@ -27,7 +27,7 @@ func newDefNetworkFromXML(s string) (libvirtxml.Network, error) { return networkDef, nil } -func newDefNetworkfromLibvirt(network LibVirtNetwork) (libvirtxml.Network, error) { +func newDefNetworkfromLibvirt(network Network) (libvirtxml.Network, error) { networkXMLDesc, err := network.GetXMLDesc(0) if err != nil { return libvirtxml.Network{}, fmt.Errorf("Error retrieving libvirt domain XML description: %s", err) diff --git a/libvirt/network_def_test.go b/libvirt/network_def_test.go index ddb5be4b..2762f779 100644 --- a/libvirt/network_def_test.go +++ b/libvirt/network_def_test.go @@ -127,7 +127,7 @@ func TestHasDHCPForwardSet(t *testing.T) { } func TestNetworkFromLibvirtError(t *testing.T) { - net := LibVirtNetworkMock{ + net := NetworkMock{ GetXMLDescError: errors.New("boom"), } @@ -138,7 +138,7 @@ func TestNetworkFromLibvirtError(t *testing.T) { } func TestNetworkFromLibvirtWrongResponse(t *testing.T) { - net := LibVirtNetworkMock{ + net := NetworkMock{ GetXMLDescReply: "wrong xml", } @@ -149,7 +149,7 @@ func TestNetworkFromLibvirtWrongResponse(t *testing.T) { } func TestNetworkFromLibvirt(t *testing.T) { - net := LibVirtNetworkMock{ + net := NetworkMock{ GetXMLDescReply: ` <network> <name>default</name> |