diff options
| -rw-r--r-- | libvirt/cloudinit_def.go | 21 | ||||
| -rw-r--r-- | libvirt/coreos_ignition_def.go | 21 | ||||
| -rw-r--r-- | libvirt/resource_libvirt_volume.go | 22 | ||||
| -rw-r--r-- | libvirt/utils_volume.go | 22 |
4 files changed, 28 insertions, 58 deletions
diff --git a/libvirt/cloudinit_def.go b/libvirt/cloudinit_def.go index bdba94bc..ed91b57e 100644 --- a/libvirt/cloudinit_def.go +++ b/libvirt/cloudinit_def.go @@ -108,26 +108,9 @@ func (ci *defCloudInit) CreateAndUpload(virConn *libvirt.VirConnection) (string, defer volume.Free() // upload ISO file - copier := func(src io.Reader) error { - stream, err := libvirt.NewVirStream(virConn, 0) - if err != nil { - return err - } - defer stream.Close() - - volume.Upload(stream, 0, uint64(size), 0) - - n, err := io.Copy(stream, src) - if err != nil { - return fmt.Errorf("Error while downloading %s: %s", img.String(), err) - } - log.Printf("%d bytes uploaded\n", n) - return nil - } - - err = img.Import(copier, volumeDef) + err = img.Import(newCopier(virConn, volume, uint64(size)), volumeDef) if err != nil { - return "", err + return "", fmt.Errorf("Error while uploading cloudinit %s: %s", img.String(), err) } key, err := volume.GetKey() diff --git a/libvirt/coreos_ignition_def.go b/libvirt/coreos_ignition_def.go index e0f786e3..da510cdc 100644 --- a/libvirt/coreos_ignition_def.go +++ b/libvirt/coreos_ignition_def.go @@ -88,26 +88,9 @@ func (ign *defIgnition) CreateAndUpload(virConn *libvirt.VirConnection) (string, defer volume.Free() // upload ignition file - copier := func(src io.Reader) error { - stream, err := libvirt.NewVirStream(virConn, 0) - if err != nil { - return err - } - defer stream.Close() - - volume.Upload(stream, 0, volumeDef.Capacity.Amount, 0) - - n, err := io.Copy(stream, src) - if err != nil { - return fmt.Errorf("Error while downloading %s: %s", img.String(), err) - } - log.Printf("%d bytes uploaded\n", n) - return nil - } - - err = img.Import(copier, volumeDef) + err = img.Import(newCopier(virConn, volume, volumeDef.Capacity.Amount), volumeDef) if err != nil { - return "", err + return "", fmt.Errorf("Error while uploading ignition file %s: %s", img.String(), err) } key, err := volume.GetKey() diff --git a/libvirt/resource_libvirt_volume.go b/libvirt/resource_libvirt_volume.go index 5c0337b2..5a527b3d 100644 --- a/libvirt/resource_libvirt_volume.go +++ b/libvirt/resource_libvirt_volume.go @@ -3,7 +3,6 @@ package libvirt import ( "encoding/xml" "fmt" - "io" "log" "net/http" "strconv" @@ -245,26 +244,9 @@ func resourceLibvirtVolumeCreate(d *schema.ResourceData, meta interface{}) error // upload source if present if _, ok := d.GetOk("source"); ok { - copier := func(src io.Reader) error { - stream, err := libvirt.NewVirStream(virConn, 0) - if err != nil { - return err - } - defer stream.Close() - - volume.Upload(stream, 0, volumeDef.Capacity.Amount, 0) - - n, err := io.Copy(stream, src) - if err != nil { - return fmt.Errorf("Error while downloading %s: %s", img.String(), err) - } - log.Printf("%d bytes uploaded\n", n) - return nil - } - - err = img.Import(copier, volumeDef) + err = img.Import(newCopier(virConn, *volume, volumeDef.Capacity.Amount), volumeDef) if err != nil { - return err + return fmt.Errorf("Error while uploading source %s: %s", img.String(), err) } } diff --git a/libvirt/utils_volume.go b/libvirt/utils_volume.go index 594d1f68..67418985 100644 --- a/libvirt/utils_volume.go +++ b/libvirt/utils_volume.go @@ -9,6 +9,8 @@ import ( "os" "strconv" "strings" + + libvirt "github.com/dmacvicar/libvirt-go" ) // network transparent image @@ -131,3 +133,23 @@ func newImage(source string) (image, error) { return nil, fmt.Errorf("Don't know how to read from '%s': %s", url.String(), err) } } + +func newCopier(virConn *libvirt.VirConnection, volume libvirt.VirStorageVol, size uint64) func(src io.Reader) error { + copier := func(src io.Reader) error { + stream, err := libvirt.NewVirStream(virConn, 0) + if err != nil { + return err + } + defer stream.Close() + + volume.Upload(stream, 0, size, 0) + + n, err := io.Copy(stream, src) + if err != nil { + return err + } + log.Printf("%d bytes uploaded\n", n) + return nil + } + return copier +} |