adapt runv network interface change

network.GetIfaceAddr() is gone.

Signed-off-by: Peng Tao <[email protected]>

Author: bergwolf

daemon/daemon.go

@@ -9,7 +9,13 @@ import (
 
 	"github.com/hyperhq/hyperd/daemon/daemondb"
 	"github.com/hyperhq/hyperd/daemon/pod"
+	"github.com/hyperhq/hyperd/networking/portmapping"
 	apitypes "github.com/hyperhq/hyperd/types"
+	"github.com/hyperhq/hyperd/utils"
+	"github.com/hyperhq/runv/driverloader"
+	"github.com/hyperhq/runv/factory"
+	"github.com/hyperhq/runv/hypervisor"
+	"github.com/hyperhq/runv/hypervisor/network"
 
 	docker "github.com/docker/docker/daemon"
 	"github.com/docker/docker/daemon/logger/jsonfilelog"
@@ -18,12 +24,7 @@ import (
 	"github.com/docker/docker/registry"
 	dockerutils "github.com/docker/docker/utils"
 	"github.com/golang/glog"
-	"github.com/hyperhq/hyperd/networking/portmapping"
-	"github.com/hyperhq/hyperd/utils"
-	"github.com/hyperhq/runv/driverloader"
-	"github.com/hyperhq/runv/factory"
-	"github.com/hyperhq/runv/hypervisor"
-	"github.com/hyperhq/runv/hypervisor/network"
+	"github.com/vishvananda/netlink"
 )
 
 var (
@@ -230,12 +231,22 @@ func (daemon *Daemon) initNetworks(c *apitypes.HyperConfig) error {
 		glog.Errorf("InitNetwork failed, %s", err.Error())
 		return err
 	}
-	addr, err := network.GetIfaceAddr(network.BridgeIface)
+	brlink, err := netlink.LinkByName(network.BridgeIface)
+	if err != nil {
+		glog.Errorf("failed to get link of the configured bridge (%s): %v", network.BridgeIface, err)
+		return err
+	}
+	addrs, err := netlink.AddrList(brlink, netlink.FAMILY_V4)
 	if err != nil {
-		glog.Errorf("failed to get address of the configured bridge: %v", err)
+		glog.Errorf("failed to get ip address of the configured bridge (%s): %v", network.BridgeIface, err)
+		return err
+	}
+	if len(addrs) == 0 {
+		err = fmt.Errorf("configured bridge (%s) has no IPv4 addresses")
+		glog.Error(err)
 		return err
 	}
-	if err := portmapping.Setup(network.BridgeIface, addr, c.DisableIptables); err != nil {
+	if err := portmapping.Setup(network.BridgeIface, fmt.Sprintf("%s", addrs[0].IPNet), c.DisableIptables); err != nil {
 		glog.Errorf("Setup portmapping failed: %v", err)
 	}
 	return nil

daemon/pod/networks.go

@@ -52,6 +52,7 @@ func (inf *Interface) prepare() error {
 		}
 		inf.descript = &runv.InterfaceDescription{
 			Id:     inf.spec.Ifname,
+			Name:   inf.spec.Ifname,
 			Lo:     false,
 			Bridge: setting.Bridge,
 			Ip:     setting.IPAddress,
@@ -63,6 +64,7 @@ func (inf *Interface) prepare() error {
 
 	inf.descript = &runv.InterfaceDescription{
 		Id:      inf.spec.Ifname,
+		Name:    inf.spec.Ifname,
 		Lo:      false,
 		Bridge:  inf.spec.Bridge,
 		Ip:      inf.spec.Ip,

networking/portmapping/setup_linux.go

@@ -2,7 +2,6 @@ package portmapping
 
 import (
 	"fmt"
-	"net"
 	"os"
 	"os/exec"
 
@@ -16,7 +15,7 @@ var (
 )
 
 //setup environment for iptables and IP forwarding
-func Setup(bIface string, addr net.Addr, disable bool) error {
+func Setup(bIface, addr string, disable bool) error {
 	var err error
 
 	disableIptables = disable
@@ -37,13 +36,13 @@ func Setup(bIface string, addr net.Addr, disable bool) error {
 	return nil
 }
 
-func setupIPTables(addr net.Addr) error {
+func setupIPTables(addr string) error {
 	if disableIptables {
 		return nil
 	}
 
 	// Enable NAT
-	natArgs := []string{"-s", addr.String(), "!", "-o", bridgeIface, "-j", "MASQUERADE"}
+	natArgs := []string{"-s", addr, "!", "-o", bridgeIface, "-j", "MASQUERADE"}
 
 	if !iptables.Exists(iptables.Nat, "POSTROUTING", natArgs...) {
 		if output, err := iptables.Raw(append([]string{