Skip to content
Snippets Groups Projects
Commit 6096a1a3 authored by Rodrigo Vaz's avatar Rodrigo Vaz
Browse files

fix connection reference on NewDriver

parent 3c19ef3f
No related branches found
No related tags found
No related merge requests found
......@@ -6,5 +6,5 @@ import (
)
func main() {
plugin.RegisterDriver(kvm.NewDriver())
plugin.RegisterDriver(kvm.NewDriver("default", "path"))
}
......@@ -162,7 +162,7 @@ func (d *Driver) DriverName() string {
}
func (d *Driver) SetConfigFromFlags(flags drivers.DriverOptions) error {
log.Debugf("SetConfigFromFlags aclled")
log.Debugf("SetConfigFromFlags called")
d.Memory = flags.Int("kvm-memory")
d.DiskSize = flags.Int("kvm-disk-size")
d.CPU = flags.Int("kvm-cpu-count")
......@@ -274,7 +274,6 @@ func (d *Driver) validateNetwork(name string) error {
func (d *Driver) PreCreateCheck() error {
// TODO We could look at d.conn.GetCapabilities()
// parse the XML, and look for kvm
log.Debug("About to check libvirt version")
// TODO might want to check minimum version
......@@ -670,13 +669,19 @@ func createDiskImage(dest string, size int, r io.Reader) error {
return f.Close()
}
func NewDriver() *Driver {
d := &Driver{}
conn, err := libvirt.NewVirConnection(d.connectionString)
func NewDriver(hostName, storePath string) drivers.Driver {
conn, err := libvirt.NewVirConnection(connectionString)
if err != nil {
log.Fatalf("Failed to connect to libvirt: %s", err)
return nil
}
return &Driver{
conn: &conn,
PrivateNetwork: privateNetworkName,
BaseDriver: &drivers.BaseDriver{
MachineName: hostName,
StorePath: storePath,
},
}
d.conn = &conn
d.PrivateNetwork = privateNetworkName
return d
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment