rename and cleanup

.travis.yml

@@ -16,7 +16,7 @@ notifications:
 before_install:
   - go get -u github.com/kardianos/govendor
   - sudo apt-get install -y git build-essential openvswitch-switch
-  - docker run -d -v /run/openvswitch/db.sock:/var/run/openvswitch/db.sock -p 50051:50051 sdnvortex/network-controller:v0.1 /go/bin/server -tcp=0.0.0.0:50051
+  - docker run -d -v /run/openvswitch/db.sock:/var/run/openvswitch/db.sock -p 50051:50051 sdnvortex/network-controller:v0.1.1 /go/bin/server -tcp=0.0.0.0:50051
 
 install:
   - make pre-build

src/networkcontroller/networkcontroller.go → src/networkcontroller/network_controller.go

@@ -1,12 +1,13 @@
 package networkcontroller
 
 import (
+	"time"
+
 	pb "github.com/linkernetworks/network-controller/messages"
 	"github.com/linkernetworks/vortex/src/entity"
 	"github.com/linkernetworks/vortex/src/kubernetes"
 	"golang.org/x/net/context"
 	"google.golang.org/grpc"
-	"time"
 )
 
 type NetworkController struct {
@@ -39,16 +40,22 @@ func New(kubeCtl *kubernetes.KubeCtl, network entity.Network) (*NetworkControlle
 }
 
 func (nc *NetworkController) CreateNetwork() error {
-	_, err := nc.ClientCtl.CreateBridge(nc.Context, &pb.CreateBridgeRequest{
-		BridgeName: nc.Network.BridgeName})
+	_, err := nc.ClientCtl.CreateBridge(
+		nc.Context,
+		&pb.CreateBridgeRequest{
+			BridgeName: nc.Network.BridgeName,
+		})
 	if err != nil {
 		return err
 	}
 
 	for _, port := range nc.Network.PhysicalPorts {
-		_, err := nc.ClientCtl.AddPort(nc.Context, &pb.AddPortRequest{
-			BridgeName: nc.Network.BridgeName,
-			IfaceName:  port.Name})
+		_, err := nc.ClientCtl.AddPort(
+			nc.Context,
+			&pb.AddPortRequest{
+				BridgeName: nc.Network.BridgeName,
+				IfaceName:  port.Name,
+			})
 		if err != nil {
 			return err
 		}

src/networkcontroller/networkcontroller_test.go → src/networkcontroller/network_controller_test.go

@@ -6,6 +6,7 @@ import (
 	"github.com/linkernetworks/vortex/src/entity"
 	"github.com/linkernetworks/vortex/src/kubernetes"
 	"github.com/stretchr/testify/suite"
+	"math/rand"
 	"os"
 	"os/exec"
 	"runtime"
@@ -16,6 +17,10 @@ import (
 	fakeclientset "k8s.io/client-go/kubernetes/fake"
 )
 
+func init() {
+	rand.Seed(time.Now().UnixNano())
+}
+
 type NetworkControllerTestSuite struct {
 	suite.Suite
 	kubectl  *kubernetes.KubeCtl

src/server/handler_network.go

@@ -17,7 +17,7 @@ import (
 )
 
 func createNetworkHandler(ctx *web.Context) {
-	as, req, resp := ctx.ServiceProvider, ctx.Request, ctx.Response
+	sp, req, resp := ctx.ServiceProvider, ctx.Request, ctx.Response
 
 	network := entity.Network{}
 	if err := req.ReadEntity(&network); err != nil {
@@ -26,7 +26,7 @@ func createNetworkHandler(ctx *web.Context) {
 		return
 	}
 
-	session := as.Mongo.NewSession()
+	session := sp.Mongo.NewSession()
 	defer session.Close()
 	session.C(entity.NetworkCollectionName).EnsureIndex(mgo.Index{
 		Key:    []string{"bridgeName", "nodeName"},
@@ -43,15 +43,15 @@ func createNetworkHandler(ctx *web.Context) {
 		}
 	}
 
-	nc, err := networkcontroller.New(as.KubeCtl, network)
+	nc, err := networkcontroller.New(sp.KubeCtl, network)
 	if err != nil {
-		logger.Error(err)
+		logger.Errorf("Failed to new network controller: %s", err.Error())
 		response.InternalServerError(req.Request, resp.ResponseWriter, err)
 		return
 	}
 
 	if err := nc.CreateNetwork(); err != nil {
-		logger.Error(err)
+		logger.Errorf("Failed to create network: %s", err.Error())
 		response.InternalServerError(req.Request, resp.ResponseWriter, err)
 		return
 	}