network: remove extra/libnetwork

remove extra/libnetwork

Signed-off-by: Rudy Zhang <[email protected]>

Author: rudyfly

Makefile

@@ -2,7 +2,7 @@
 GOBUILD=go build
 GOCLEAN=go clean
 GOTEST=go test
-GOPACKAGES=$(shell go list ./... | grep -v /vendor/ | grep -v /extra/ | sed 's/^_//')
+GOPACKAGES=$(shell go list ./... | grep -v /vendor/ | sed 's/^_//')
 
 # Binary name of CLI and Daemon
 BINARY_NAME=pouchd
@@ -45,18 +45,18 @@ check: pre fmt lint vet validate-swagger
 fmt: ## run go fmt
 	@echo $@
 	@which gofmt
-	@test -z "$$(gofmt -s -l . 2>/dev/null | grep -Fv 'vendor/' | grep -Fv 'extra/' | grep -v ".pb.go$$" | tee /dev/stderr)" || \
+	@test -z "$$(gofmt -s -l . 2>/dev/null | grep -Fv 'vendor/' | grep -v ".pb.go$$" | tee /dev/stderr)" || \
 		(echo "please format Go code with 'gofmt -s -w'" && false)
-	@test -z "$$(find . -path ./vendor -prune -o ! -path ./extra -prune -o ! -name timestamp.proto ! -name duration.proto -name '*.proto' -type f -exec grep -Hn -e "^ " {} \; | tee /dev/stderr)" || \
+	@test -z "$$(find . -path ./vendor -prune -o ! -name timestamp.proto ! -name duration.proto -name '*.proto' -type f -exec grep -Hn -e "^ " {} \; | tee /dev/stderr)" || \
 		(echo "please indent proto files with tabs only" && false)
-	@test -z "$$(find . -path ./vendor -prune -o ! -path ./extra -prune -o -name '*.proto' -type f -exec grep -Hn "Meta meta = " {} \; | grep -v '(gogoproto.nullable) = false' | tee /dev/stderr)" || \
+	@test -z "$$(find . -path ./vendor -prune -o ! -name '*.proto' -type f -exec grep -Hn "Meta meta = " {} \; | grep -v '(gogoproto.nullable) = false' | tee /dev/stderr)" || \
 		(echo "meta fields in proto files must have option (gogoproto.nullable) = false" && false)
 
 .PHONY: lint
 lint: ## run go lint
 	@echo $@
 	@which golint
-	@test -z "$$(golint ./... | grep -Fv 'vendor/' | grep -Fv 'extra' | grep -v ".pb.go:" | tee /dev/stderr)"
+	@test -z "$$(golint ./... | grep -Fv 'vendor/' | grep -v ".pb.go:" | tee /dev/stderr)"
 
 .PHONY: vet
 vet: # run go vet

daemon/mgr/network.go

@@ -6,7 +6,6 @@ import (
 	"net"
 	"path"
 	"strings"
-	"time"
 
 	apitypes "github.com/alibaba/pouch/apis/types"
 	"github.com/alibaba/pouch/daemon/config"
@@ -16,7 +15,6 @@ import (
 	"github.com/alibaba/pouch/pkg/meta"
 	"github.com/alibaba/pouch/pkg/randomid"
 
-	netlog "github.com/Sirupsen/logrus"
 	"github.com/docker/go-connections/nat"
 	"github.com/docker/libnetwork"
 	nwconfig "github.com/docker/libnetwork/config"
@@ -70,8 +68,6 @@ func NewNetworkManager(cfg *config.Config, store *meta.Store, ctrMgr ContainerMg
 	cfg.NetworkConfg.MetaPath = path.Dir(store.BaseDir)
 	cfg.NetworkConfg.ExecRoot = network.DefaultExecRoot
 
-	initNetworkLog(cfg)
-
 	// get active sandboxes
 	ctrs, err := ctrMgr.List(context.Background(),
 		func(c *Container) bool {
@@ -484,7 +480,7 @@ func networkOptions(create apitypes.NetworkCreateConfig) ([]libnetwork.NetworkOp
 	nwOptions = append(nwOptions, libnetwork.NetworkOptionDriverOpts(networkCreate.Options))
 
 	if create.Name == "ingress" {
-		nwOptions = append(nwOptions, libnetwork.NetworkOptionIngress())
+		nwOptions = append(nwOptions, libnetwork.NetworkOptionIngress(true))
 	}
 
 	if networkCreate.Internal {
@@ -537,20 +533,6 @@ func (nm *NetworkManager) getNetworkSandbox(id string) libnetwork.Sandbox {
 	return sb
 }
 
-// libnetwork's logrus version is different from pouchd,
-// so we need to set libnetwork's logrus addintionly.
-func initNetworkLog(cfg *config.Config) {
-	if cfg.Debug {
-		netlog.SetLevel(netlog.DebugLevel)
-	}
-
-	formatter := &netlog.TextFormatter{
-		FullTimestamp:   true,
-		TimestampFormat: time.RFC3339Nano,
-	}
-	netlog.SetFormatter(formatter)
-}
-
 func endpointOptions(n libnetwork.Network, endpoint *types.Endpoint) ([]libnetwork.EndpointOption, error) {
 	var createOptions []libnetwork.EndpointOption
 	epConfig := endpoint.EndpointConfig

docs/test/test.md

@@ -99,9 +99,7 @@ The following steps are also needed to make sure libnetwork package could be fou
 
 ```
 BUILDPATH=/tmp/pouchbuild
-mkdir -p $BUILDPATH/src/github.com/docker
-cp -r /go/src/github.com/alibaba/pouch/extra/libnetwork $BUILDPATH/src/github.com/docker/libnetwork
-export GOPATH=$GOPATH:$BUILDPATH:$BUILDPATH/src/github.com/docker/libnetwork/Godeps/_workspace
+export GOPATH=$GOPATH:$BUILDPATH
 ```
 
 And please notice that files in `/tmp` directory may be deleted after reboot.