Move NetDev utils from common/ to net/

This commit is contained in:
Martynas Pumputis committed 2016-10-19 17:03:30 +01:00
1 parent 3492cd93d0
commit e611f04f41
7 files changed
+172 -175

No files matched your search

+2 -3
View File
@@ -17,7 +17,6 @@ import (
docker "github.com/fsouza/go-dockerclient"
weaveapi "github.com/weaveworks/weave/api"
"github.com/weaveworks/weave/common"
weavedocker "github.com/weaveworks/weave/common/docker"
weavenet "github.com/weaveworks/weave/net"
"github.com/weaveworks/weave/net/address"
@@ -149,7 +148,7 @@ func NewProxy(c Config) (*Proxy, error) {
p.client = client.Client
if !p.WithoutDNS {
netDev, err := common.GetBridgeNetDev(c.DockerBridge)
netDev, err := weavenet.GetBridgeNetDev(c.DockerBridge)
if err != nil {
return nil, err
}
@@ -625,7 +624,7 @@ func (proxy *Proxy) updateContainerNetworkSettings(container jsonObject) error {
if err := proxy.waitForStartByIdent(containerID); err != nil {
return err
}
netDevs, err := common.GetWeaveNetDevs(pid)
netDevs, err := weavenet.GetWeaveNetDevs(pid)
if err != nil || len(netDevs) == 0 || len(netDevs[0].CIDRs) == 0 {
return err
}