diff options
Diffstat (limited to 'libvirt')
| -rw-r--r-- | libvirt/config.go | 7 | ||||
| -rw-r--r-- | libvirt/provider.go | 2 | ||||
| -rw-r--r-- | libvirt/utils_domain_def.go | 1 | ||||
| -rw-r--r-- | libvirt/utils_libvirt_test.go | 8 |
4 files changed, 10 insertions, 8 deletions
diff --git a/libvirt/config.go b/libvirt/config.go index 4fdfd501..41edc021 100644 --- a/libvirt/config.go +++ b/libvirt/config.go @@ -6,16 +6,19 @@ import ( libvirt "github.com/libvirt/libvirt-go" ) +// Config struct for the libvirt-provider type Config struct { - Uri string + URI string } +// Client libvirt type Client struct { libvirt *libvirt.Connect } +// Client libvirt, generate libvirt client given URI func (c *Config) Client() (*Client, error) { - conn, err := libvirt.NewConnect(c.Uri) + conn, err := libvirt.NewConnect(c.URI) if err != nil { return nil, err } diff --git a/libvirt/provider.go b/libvirt/provider.go index 08a00435..010ad8b4 100644 --- a/libvirt/provider.go +++ b/libvirt/provider.go @@ -30,7 +30,7 @@ func Provider() terraform.ResourceProvider { func providerConfigure(d *schema.ResourceData) (interface{}, error) { config := Config{ - Uri: d.Get("uri").(string), + URI: d.Get("uri").(string), } return config.Client() diff --git a/libvirt/utils_domain_def.go b/libvirt/utils_domain_def.go index 2f7f74a6..a712f145 100644 --- a/libvirt/utils_domain_def.go +++ b/libvirt/utils_domain_def.go @@ -34,7 +34,6 @@ func getCanonicalMachineName(caps libvirtxml.Caps, arch string, virttype string, return "", fmt.Errorf("[WARN] Cannot find machine type %s for %s/%s in %v", targetmachine, virttype, arch, caps) } - func getOriginalMachineName(caps libvirtxml.Caps, arch string, virttype string, targetmachine string) (string, error) { guest, err := getGuestForArchType(caps, arch, virttype) if err != nil { diff --git a/libvirt/utils_libvirt_test.go b/libvirt/utils_libvirt_test.go index 38d90136..0f53b6b3 100644 --- a/libvirt/utils_libvirt_test.go +++ b/libvirt/utils_libvirt_test.go @@ -71,11 +71,11 @@ func TestGetCanonicalMachineName(t *testing.T) { virttype := "hvm" machine := "pc" - caps,err := getHostCapabilities(conn) + caps, err := getHostCapabilities(conn) if err != nil { t.Error(err) } - + name, err := getCanonicalMachineName(caps, arch, virttype, machine) if err != nil { @@ -93,7 +93,7 @@ func TestGetOriginalMachineName(t *testing.T) { virttype := "hvm" machine := "pc" - caps,err := getHostCapabilities(conn) + caps, err := getHostCapabilities(conn) if err != nil { t.Error(err) } @@ -117,7 +117,7 @@ func TestGetHostCapabilties(t *testing.T) { start := time.Now() conn := connect(t) defer conn.Close() - caps,err := getHostCapabilities(conn) + caps, err := getHostCapabilities(conn) if err != nil { t.Errorf("Can't get host capabilties") } |