Nat Network Support

machine.go

@@ -166,7 +166,16 @@ func (m *Machine) Poweroff() error {
 	case Poweroff, Aborted, Saved:
 		return nil
 	}
-	return Manage().run("controlvm", m.Name, "poweroff")
+	for m.State != Poweroff { // busy wait until the machine is stopped, because it can lock machine deletion otherwise
+		if err := Manage().run("controlvm", m.Name, "poweroff"); err != nil {
+			return err
+		}
+		time.Sleep(1 * time.Second)
+		if err := m.Refresh(); err != nil {
+			return err
+		}
+	}
+	return nil
 }
 
 // Restart gracefully restarts the machine.
@@ -283,6 +292,8 @@ func GetMachine(id string) (*Machine, error) {
 			nic.HostInterface = propMap[fmt.Sprintf("hostonlyadapter%d", i)]
 		} else if nic.Network == NICNetBridged {
 			nic.HostInterface = propMap[fmt.Sprintf("bridgeadapter%d", i)]
+		} else if nic.Network == NICNetNATNetwork {
+			nic.NatNetwork = propMap[fmt.Sprintf("nat-network%d", i)]
 		}
 		m.NICs = append(m.NICs, nic)
 	}
@@ -405,6 +416,8 @@ func (m *Machine) Modify() error {
 			args = append(args, fmt.Sprintf("--hostonlyadapter%d", n), nic.HostInterface)
 		} else if nic.Network == NICNetBridged {
 			args = append(args, fmt.Sprintf("--bridgeadapter%d", n), nic.HostInterface)
+		} else if nic.Network == NICNetNATNetwork {
+			args = append(args, fmt.Sprintf("--nat-network%d", n), nic.NatNetwork)
 		}
 	}
 
@@ -437,6 +450,8 @@ func (m *Machine) SetNIC(n int, nic NIC) error {
 		args = append(args, fmt.Sprintf("--hostonlyadapter%d", n), nic.HostInterface)
 	} else if nic.Network == NICNetBridged {
 		args = append(args, fmt.Sprintf("--bridgeadapter%d", n), nic.HostInterface)
+	} else if nic.Network == NICNetNATNetwork {
+			args = append(args, fmt.Sprintf("--nat-network%d", n), nic.NatNetwork)
 	}
 	return Manage().run(args...)
 }

natnet.go

@@ -4,8 +4,11 @@ import (
 	"bufio"
 	"net"
 	"strings"
+	"errors"
+)
+var (
+		ErrNoSuchNet = errors.New("No such NAT network")
 )
-
 // A NATNet defines a NAT network.
 type NATNet struct {
 	Name    string
@@ -15,6 +18,59 @@ type NATNet struct {
 	Enabled bool
 }
 
+func (n *NATNet) Delete() error {
+	err := Manage().run("natnetwork", "remove", "--netname", n.Name)
+	if err != nil {
+		return err
+	}
+	return nil
+}
+
+func (n *NATNet) Config() error {
+	if n.IPv4.IP != nil && n.IPv4.Mask != nil {
+		if err := Manage().run("natnetwork", "modify", "--netname", n.Name, "--network", n.IPv4.String()); err != nil {
+			return err
+		}
+	}
+
+	if err := Manage().run("natnetwork", "modify", "--netname", n.Name, "--dhcp", bool2string(n.DHCP)); err != nil {
+		return err
+	}
+
+	if n.Enabled {
+		if err := Manage().run("natnetwork", "modify", "--netname", n.Name, "--enable"); err != nil {
+			return err
+		}
+	} else {
+		if err := Manage().run("natnetwork", "modify", "--netname", n.Name, "--disable"); err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
+
+func CreateNATNet(name string, network string, dhcp bool) (*NATNet, error) {
+	err := Manage().run("natnetwork", "add", "--netname", name, "--network", network, "--dhcp", bool2string(dhcp))
+	if err != nil {
+		return nil, err
+	}
+	_, ipnet, err := net.ParseCIDR(network)
+	return &NATNet{Name: name, IPv4: *ipnet, DHCP: dhcp, Enabled: true}, nil
+}
+
+func GetNATNetwork(name string) (*NATNet, error) {
+	natnets, err := NATNets()
+	if err != nil {
+		return nil, err
+	}
+	natnet, ok := natnets[name]
+	if !ok {
+		return nil, ErrNoSuchNet
+	}
+	return &natnet, nil
+}
+
 // NATNets gets all NAT networks in a  map keyed by NATNet.Name.
 func NATNets() (map[string]NATNet, error) {
 	out, err := Manage().runOut("list", "natnets")
@@ -38,13 +94,12 @@ func NATNets() (map[string]NATNet, error) {
 		switch key, val := res[1], res[2]; key {
 		case "NetworkName":
 			n.Name = val
-		case "IP":
-			n.IPv4.IP = net.ParseIP(val)
 		case "Network":
 			_, ipnet, err := net.ParseCIDR(val)
 			if err != nil {
 				return nil, err
 			}
+			n.IPv4.IP = ipnet.IP
 			n.IPv4.Mask = ipnet.Mask
 		case "IPv6 Prefix":
 			// TODO: IPv6 CIDR parsing works fine on macOS, check on Windows

nic.go

@@ -5,6 +5,7 @@ type NIC struct {
 	Network       NICNetwork
 	Hardware      NICHardware
 	HostInterface string // The host interface name to bind to in 'hostonly' and 'bridged' mode
+	NatNetwork    string // The nat network to use in 'natnetwork' mode
 	MacAddr       string
 }
 
@@ -18,6 +19,8 @@ const (
 	NICNetDisconnected = NICNetwork("null")
 	// NICNetNAT when the NIC is NAT-ed to access the external network.
 	NICNetNAT = NICNetwork("nat")
+        // NICNetNATNetwork when the NIC is on an internal network, with NATed external access.
+        NICNetNATNetwork   = NICNetwork("natnetwork")
 	// NICNetBridged when the NIC is the bridge to the external network.
 	NICNetBridged = NICNetwork("bridged")
 	// NICNetInternal when the NIC does not have access to the external network.