WIP2

linkernetworks · Jun 25, 2018 · efa1c1d · efa1c1d
1 parent 0213aee
commit efa1c1d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -23,8 +23,7 @@ install:
 
 script:
   - make build
-  - make test
-  - make src.test-coverage
+  - sudo -E PATH:$PATH TEST_GRPC=1 make src.test-coverage
   - docker build --tag sdnvortex/vortex --file ./dockerfiles/Dockerfile .
 
 before_deploy:

diff --git a/src/server/handler_network_test.go b/src/server/handler_network_test.go
@@ -60,6 +60,7 @@ func (suite *NetworkTestSuite) SetupTest() {
 	namespace := "default"
 	suite.kubectl = kc.New(suite.fakeclient, namespace)
 
+	sp.KubeCtl = suite.kubectl
 	//Create a fake clinet
 	//Init
 	nodeAddr := corev1.NodeAddress{
@@ -79,8 +80,9 @@ func (suite *NetworkTestSuite) SetupTest() {
 	_, err := suite.fakeclient.CoreV1().Nodes().Create(&node)
 	assert.NoError(suite.T(), err)
 
-	suite.ifName = namesgenerator.GetRandomName(0)
-	pName := namesgenerator.GetRandomName(0)
+	//There's a length limit of link name
+	suite.ifName = namesgenerator.GetRandomName(0)[0:8]
+	pName := namesgenerator.GetRandomName(0)[0:8]
 	//Create a veth for testing
 	err = exec.Command("ip", "link", "add", suite.ifName, "type", "veth", "peer", "name", pName).Run()
 	assert.NoError(suite.T(), err)
@@ -96,7 +98,8 @@ func TestNetworkSuite(t *testing.T) {
 		fmt.Println("We only testing the ovs function on Linux Host")
 		t.Skip()
 		return
-	} else if _, defined := os.LookupEnv("TEST_GRPC"); !defined {
+	}
+	if _, defined := os.LookupEnv("TEST_GRPC"); !defined {
 		t.SkipNow()
 		return
 	}
@@ -115,7 +118,7 @@ func (suite *NetworkTestSuite) TestCreateNetwork() {
 	network := entity.Network{
 		BridgeName:    tName,
 		BridgeType:    "ovs",
-		NodeName:      "create-network-node",
+		NodeName:      suite.nodeName,
 		PhysicalPorts: []entity.PhysicalPort{eth1},
 	}
 
@@ -132,7 +135,7 @@ func (suite *NetworkTestSuite) TestCreateNetwork() {
 	//assertResponseCode(t, http.StatusOK, httpWriter)
 	assertResponseCode(suite.T(), http.StatusOK, httpWriter)
 	defer suite.session.Remove(entity.NetworkCollectionName, "bridgeName", tName)
-	defer exec.Command("ovs-vsctl", "del-br", tName)
+	defer exec.Command("ovs-vsctl", "del-br", tName).Run()
 
 	//We use the new write but empty input
 	httpWriter = httptest.NewRecorder()