Merge pull request #64 from linkernetworks/johnlin/fix-netowrk-type

change entity.network type to pointer
linkernetworks · Jul 6, 2018 · f128627 · f128627
2 parents 794b669 + b7dfc93
commit f128627
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 25 deletions.
diff --git a/src/networkprovider/fake.go b/src/networkprovider/fake.go
@@ -2,6 +2,7 @@ package networkprovider
 
 import (
 	"fmt"
+
 	"github.com/linkernetworks/vortex/src/entity"
 	"github.com/linkernetworks/vortex/src/serviceprovider"
 )
@@ -10,21 +11,21 @@ type FakeNetworkProvider struct {
 	entity.FakeNetwork
 }
 
-func (fake FakeNetworkProvider) ValidateBeforeCreating(sp *serviceprovider.Container, net entity.Network) error {
+func (fake FakeNetworkProvider) ValidateBeforeCreating(sp *serviceprovider.Container, net *entity.Network) error {
 	if fake.FakeParameter == "" {
 		return fmt.Errorf("Fail to validate but don't worry, I'm fake network")
 	}
 	return nil
 }
 
-func (fake FakeNetworkProvider) CreateNetwork(sp *serviceprovider.Container, net entity.Network) error {
+func (fake FakeNetworkProvider) CreateNetwork(sp *serviceprovider.Container, net *entity.Network) error {
 	if fake.IWantFail {
 		return fmt.Errorf("Fail to create network but don't worry, I'm fake network")
 	}
 	return nil
 }
 
-func (fake FakeNetworkProvider) DeleteNetwork(sp *serviceprovider.Container, net entity.Network) error {
+func (fake FakeNetworkProvider) DeleteNetwork(sp *serviceprovider.Container, net *entity.Network) error {
 	if fake.IWantFail {
 		return fmt.Errorf("Fail to delete network but don't worry, I'm fake network")
 	}

diff --git a/src/networkprovider/fake_test.go b/src/networkprovider/fake_test.go
@@ -16,7 +16,7 @@ func TestNetworkValidateBeforeCreating(t *testing.T) {
 		},
 	})
 	assert.NoError(t, err)
-	err = fake.ValidateBeforeCreating(nil, entity.Network{})
+	err = fake.ValidateBeforeCreating(nil, &entity.Network{})
 	assert.NoError(t, err)
 }
 
@@ -29,7 +29,7 @@ func TestFakeNetworkCreating(t *testing.T) {
 		},
 	})
 	assert.NoError(t, err)
-	err = fake.CreateNetwork(nil, entity.Network{})
+	err = fake.CreateNetwork(nil, &entity.Network{})
 	assert.NoError(t, err)
 }
 
@@ -41,7 +41,7 @@ func TestFakeNetworkValidateBeforeCreatingFail(t *testing.T) {
 		},
 	})
 	assert.NoError(t, err)
-	err = fake.ValidateBeforeCreating(nil, entity.Network{})
+	err = fake.ValidateBeforeCreating(nil, &entity.Network{})
 	assert.Error(t, err)
 }
 
@@ -53,7 +53,7 @@ func TestFakeNetworkCreatingFail(t *testing.T) {
 		},
 	})
 	assert.NoError(t, err)
-	err = fake.CreateNetwork(nil, entity.Network{})
+	err = fake.CreateNetwork(nil, &entity.Network{})
 	assert.Error(t, err)
 }
 
@@ -63,7 +63,7 @@ func TestFakeNetworkDelete(t *testing.T) {
 		Fake: entity.FakeNetwork{},
 	})
 	assert.NoError(t, err)
-	err = fake.DeleteNetwork(nil, entity.Network{})
+	err = fake.DeleteNetwork(nil, &entity.Network{})
 	assert.NoError(t, err)
 }
 
@@ -75,6 +75,6 @@ func TestFakeNetworkDeleteFail(t *testing.T) {
 		},
 	})
 	assert.NoError(t, err)
-	err = fake.DeleteNetwork(nil, entity.Network{})
+	err = fake.DeleteNetwork(nil, &entity.Network{})
 	assert.Error(t, err)
 }
diff --git a/src/networkprovider/network.go b/src/networkprovider/network.go
@@ -2,14 +2,15 @@ package networkprovider
 
 import (
 	"fmt"
+
 	"github.com/linkernetworks/vortex/src/entity"
 	"github.com/linkernetworks/vortex/src/serviceprovider"
 )
 
 type NetworkProvider interface {
-	ValidateBeforeCreating(sp *serviceprovider.Container, net entity.Network) error
-	CreateNetwork(sp *serviceprovider.Container, net entity.Network) error
-	DeleteNetwork(sp *serviceprovider.Container, net entity.Network) error
+	ValidateBeforeCreating(sp *serviceprovider.Container, net *entity.Network) error
+	CreateNetwork(sp *serviceprovider.Container, net *entity.Network) error
+	DeleteNetwork(sp *serviceprovider.Container, net *entity.Network) error
 }
 
 func GetNetworkProvider(network *entity.Network) (NetworkProvider, error) {

diff --git a/src/networkprovider/ovs.go b/src/networkprovider/ovs.go
@@ -15,7 +15,7 @@ type OVSNetworkProvider struct {
 	entity.OVSNetwork
 }
 
-func (ovs OVSNetworkProvider) ValidateBeforeCreating(sp *serviceprovider.Container, network entity.Network) error {
+func (ovs OVSNetworkProvider) ValidateBeforeCreating(sp *serviceprovider.Container, network *entity.Network) error {
 	session := sp.Mongo.NewSession()
 	defer session.Close()
 	//Check whether vlangTag is 0~4095
@@ -64,7 +64,7 @@ func deleteOVSNetwork(nodeIP string, bridgeName string) error {
 	return nc.DeleteOVSNetwork(bridgeName)
 }
 
-func (ovs OVSNetworkProvider) CreateNetwork(sp *serviceprovider.Container, network entity.Network) error {
+func (ovs OVSNetworkProvider) CreateNetwork(sp *serviceprovider.Container, network *entity.Network) error {
 	if network.Clusterwise {
 		nodes, _ := sp.KubeCtl.GetNodes()
 		for _, v := range nodes {
@@ -85,7 +85,7 @@ func (ovs OVSNetworkProvider) CreateNetwork(sp *serviceprovider.Container, netwo
 	return createOVSNetwork(nodeIP, network.OVS.BridgeName, network.OVS.PhysicalPorts)
 }
 
-func (ovs OVSNetworkProvider) DeleteNetwork(sp *serviceprovider.Container, network entity.Network) error {
+func (ovs OVSNetworkProvider) DeleteNetwork(sp *serviceprovider.Container, network *entity.Network) error {
 	if network.Clusterwise {
 		nodes, _ := sp.KubeCtl.GetNodes()
 		for _, v := range nodes {

diff --git a/src/networkprovider/ovs_test.go b/src/networkprovider/ovs_test.go
@@ -146,7 +146,7 @@ func (suite *NetworkTestSuite) TestCreateNetwork() {
 			np, err := GetNetworkProvider(tc.network)
 			suite.NoError(err)
 			np = np.(OVSNetworkProvider)
-			err = np.CreateNetwork(suite.sp, *tc.network)
+			err = np.CreateNetwork(suite.sp, tc.network)
 			suite.NoError(err)
 			defer exec.Command("ovs-vsctl", "del-br", tc.network.OVS.BridgeName).Run()
 		})
@@ -161,7 +161,7 @@ func (suite *NetworkTestSuite) TestCreateNetworkFail() {
 	np, err := GetNetworkProvider(&network)
 	suite.NoError(err)
 	np = np.(OVSNetworkProvider)
-	err = np.CreateNetwork(suite.sp, network)
+	err = np.CreateNetwork(suite.sp, &network)
 	suite.Error(err)
 }
 
@@ -203,7 +203,7 @@ func (suite *NetworkTestSuite) TestValidateBeforeCreating() {
 			suite.NoError(err)
 			np = np.(OVSNetworkProvider)
 
-			err = np.ValidateBeforeCreating(suite.sp, *tc.network)
+			err = np.ValidateBeforeCreating(suite.sp, tc.network)
 			suite.NoError(err)
 		})
 	}
@@ -255,7 +255,7 @@ func (suite *NetworkTestSuite) TestValidateBeforeCreatingFail() {
 				defer session.C(entity.NetworkCollectionName).Remove(tc.network)
 				suite.NoError(err)
 			}
-			err = np.ValidateBeforeCreating(suite.sp, *tc.network)
+			err = np.ValidateBeforeCreating(suite.sp, tc.network)
 			suite.Error(err)
 		})
 	}
@@ -276,12 +276,12 @@ func (suite *NetworkTestSuite) TestDeleteNetwork() {
 			np, err := GetNetworkProvider(tc.network)
 			suite.NoError(err)
 			np = np.(OVSNetworkProvider)
-			err = np.CreateNetwork(suite.sp, *tc.network)
+			err = np.CreateNetwork(suite.sp, tc.network)
 			suite.NoError(err)
 
 			exec.Command("ovs-vsctl", "add-br", tc.network.OVS.BridgeName).Run()
 			//FIXME we need a function to check the bridge is exist
-			err = np.DeleteNetwork(suite.sp, *tc.network)
+			err = np.DeleteNetwork(suite.sp, tc.network)
 			suite.NoError(err)
 		})
 	}
@@ -296,6 +296,6 @@ func (suite *NetworkTestSuite) TestDeleteNetworkFail() {
 	np, err := GetNetworkProvider(&network)
 	suite.NoError(err)
 	np = np.(OVSNetworkProvider)
-	err = np.DeleteNetwork(suite.sp, network)
+	err = np.DeleteNetwork(suite.sp, &network)
 	suite.Error(err)
 }
diff --git a/src/server/handler_network.go b/src/server/handler_network.go
@@ -37,12 +37,12 @@ func createNetworkHandler(ctx *web.Context) {
 		return
 	}
 
-	if err := networkProvider.ValidateBeforeCreating(sp, network); err != nil {
+	if err := networkProvider.ValidateBeforeCreating(sp, &network); err != nil {
 		response.BadRequest(req.Request, resp.ResponseWriter, err)
 		return
 	}
 
-	if err := networkProvider.CreateNetwork(sp, network); err != nil {
+	if err := networkProvider.CreateNetwork(sp, &network); err != nil {
 		response.InternalServerError(req.Request, resp.ResponseWriter, err)
 		return
 	}
@@ -157,7 +157,7 @@ func deleteNetworkHandler(ctx *web.Context) {
 		return
 	}
 
-	if err := networkProvider.DeleteNetwork(sp, network); err != nil {
+	if err := networkProvider.DeleteNetwork(sp, &network); err != nil {
 		response.InternalServerError(req.Request, resp.ResponseWriter, err)
 		return
 	}