Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Switch to session libvirt #35

Closed
wants to merge 1 commit into from
Closed

Switch to session libvirt #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions constants.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@ const (
DriverName = "libvirt"
DriverVersion = "0.12.7"

connectionString = "qemu:///system"
sessionConnectionString = "qemu:///session"
systemConnectionString = "qemu:///system"

dnsmasqLeases = "/var/lib/libvirt/dnsmasq/%s.leases"
dnsmasqStatus = "/var/lib/libvirt/dnsmasq/%s.status"
DefaultMemory = 8096
Expand Down Expand Up @@ -45,9 +47,9 @@ const (
<graphics type='vnc' autoport='yes' listen='127.0.0.1'>
<listen type='address' address='127.0.0.1'/>
</graphics>
<interface type='network'>
<interface type='bridge'>
zeenix marked this conversation as resolved.
Show resolved Hide resolved
<mac address='52:fd:fc:07:21:82'/>
<source network='{{.Network}}'/>
<source bridge='{{ .BridgeName }}'/>
<model type='virtio'/>
</interface>
<console type='pty'></console>
Expand All @@ -60,4 +62,3 @@ const (
</devices>
</domain>`
)

78 changes: 52 additions & 26 deletions libvirt.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,8 @@ type Driver struct {

// Libvirt connection and state
connectionString string
conn *libvirt.Connect
sessionConn *libvirt.Connect
systemConn *libvirt.Connect
zeenix marked this conversation as resolved.
Show resolved Hide resolved
VM *libvirt.Domain
vmLoaded bool
}
Expand Down Expand Up @@ -88,7 +89,7 @@ type DomainConfig struct {
CacheMode string
IOMode string
DiskPath string
Network string
BridgeName string
}

func (d *Driver) GetMachineName() string {
Expand Down Expand Up @@ -146,22 +147,36 @@ func (d *Driver) GetURL() (string, error) {
return "", nil
}

func (d *Driver) getConn() (*libvirt.Connect, error) {
if d.conn == nil {
conn, err := libvirt.NewConnect(connectionString)
func (d *Driver) getSessionConn() (*libvirt.Connect, error) {
log.Debugf("Connecting to session")
if d.sessionConn == nil {
conn, err := libvirt.NewConnect(sessionConnectionString)
if err != nil {
log.Errorf("Failed to connect to libvirt: %s", err)
return &libvirt.Connect{}, errors.New("Unable to connect to kvm driver")
}
d.sessionConn = conn
}
return d.sessionConn, nil
}

func (d *Driver) getSystemConn() (*libvirt.Connect, error) {
zeenix marked this conversation as resolved.
Show resolved Hide resolved
log.Debugf("Connecting to system")
if d.systemConn == nil {
conn, err := libvirt.NewConnectReadOnly(systemConnectionString)
zeenix marked this conversation as resolved.
Show resolved Hide resolved
if err != nil {
log.Errorf("Failed to connect to libvirt: %s", err)
return &libvirt.Connect{}, errors.New("Unable to connect to kvm driver, did you add yourself to the libvirtd group?")
}
d.conn = conn
d.systemConn = conn
}
return d.conn, nil
return d.systemConn, nil
}

// Create, or verify the private network is properly configured
func (d *Driver) validateNetwork() error {
log.Debug("Validating network")
conn, err := d.getConn()
conn, err := d.getSystemConn()
if err != nil {
return err
}
Expand Down Expand Up @@ -198,20 +213,16 @@ func (d *Driver) validateNetwork() error {
if nw.Ip.Address == "" {
return fmt.Errorf("%s network doesn't have DHCP configured", d.Network)
}
// Corner case, but might happen...
if active, err := network.IsActive(); !active {
log.Debugf("Reactivating network: %s", err)
err = network.Create()
if err != nil {
log.Warnf("Failed to Start network: %s", err)
return err
}
// Since `crc` will ensure network is active as part of it's preflight, this is very unlikely to happen but let's
// give a helpful error if that happens.
if active, _ := network.IsActive(); !active {
return fmt.Errorf("Network '%s' inactive. Use 'crc setup' to activate the network", d.Network)
}
return nil
}

func (d *Driver) PreCreateCheck() error {
conn, err := d.getConn()
conn, err := d.getSessionConn()
if err != nil {
return err
}
Expand Down Expand Up @@ -266,14 +277,19 @@ func (d *Driver) Create() error {
return err
}

bridgeName, err := d.getBridgeName()
if err != nil {
return err
}

config := DomainConfig{
DomainName: d.MachineName,
Memory: d.Memory,
CPU: d.CPU,
CacheMode: d.CacheMode,
IOMode: d.IOMode,
DiskPath: d.DiskPath,
Network: d.Network,
BridgeName: bridgeName,
}

var xml bytes.Buffer
Expand All @@ -282,7 +298,7 @@ func (d *Driver) Create() error {
return err
}

conn, err := d.getConn()
conn, err := d.getSessionConn()
if err != nil {
return err
}
Expand Down Expand Up @@ -430,7 +446,7 @@ func (d *Driver) GetState() (state.State, error) {
func (d *Driver) validateVMRef() error {
if !d.vmLoaded {
log.Debugf("Fetching VM...")
conn, err := d.getConn()
conn, err := d.getSessionConn()
if err != nil {
return err
}
Expand Down Expand Up @@ -461,7 +477,7 @@ func (d *Driver) getMAC() (string, error) {
...
<devices>
...
<interface type='network'>
<interface type='bridge'>
...
<mac address='52:54:00:d2:3f:ba'/>
...
Expand All @@ -472,7 +488,7 @@ func (d *Driver) getMAC() (string, error) {
Address string `xml:"address,attr"`
}
type Source struct {
Network string `xml:"network,attr"`
BridgeName string `xml:"bridge,attr"`
}
type Interface struct {
Type string `xml:"type,attr"`
Expand All @@ -495,8 +511,8 @@ func (d *Driver) getMAC() (string, error) {
return dom.Devices.Interfaces[0].Mac.Address, nil
}

func (d *Driver) getIPByMacFromSettings(mac string) (string, error) {
conn, err := d.getConn()
func (d *Driver) getBridgeName() (string, error) {
conn, err := d.getSystemConn()
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does this method needs more changes? It seems to expect a libvirt network, but we switched to bridges? With qemu:///session, can we get the vm ip address without using qemu:///system?

Copy link
Author

@zeenix zeenix Oct 28, 2019 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We switched to using the network in the VM as a bridge, we still know that it's a libvirt network existing on the system connection. So I don't think so.

if err != nil {
return "", err
}
Expand All @@ -505,12 +521,22 @@ func (d *Driver) getIPByMacFromSettings(mac string) (string, error) {
log.Warnf("Failed to find network: %s", err)
return "", err
}
bridge_name, err := network.GetBridgeName()
bridgeName, err := network.GetBridgeName()
if err != nil {
log.Warnf("Failed to get network bridge: %s", err)
return "", err
}

return bridgeName, nil
}

func (d *Driver) getIPByMacFromSettings(mac string) (string, error) {
bridgeName, err := d.getBridgeName()
if err != nil {
log.Warnf("Failed to get network bridge: %s", err)
return "", err
}
statusFile := fmt.Sprintf(dnsmasqStatus, bridge_name)
statusFile := fmt.Sprintf(dnsmasqStatus, bridgeName)
data, err := ioutil.ReadFile(statusFile)
type Lease struct {
zeenix marked this conversation as resolved.
Show resolved Hide resolved
Ip_address string `json:"ip-address"`
Expand Down