fix test for ovs_system

linkernetworks · Jul 12, 2018 · 6fd94d4 · 6fd94d4
1 parent 2ba7997
commit 6fd94d4
Show file tree

Hide file tree

Showing 2 changed files with 158 additions and 124 deletions.
diff --git a/src/networkprovider/ovs_netdev_test.go b/src/networkprovider/ovs_netdev_test.go
@@ -28,15 +28,15 @@ func init() {
 }
 
 // OK
-type DPDKNetworkTestSuite struct {
+type OVSNetdevNetworkTestSuite struct {
 	suite.Suite
 	sp                 *serviceprovider.Container
 	standaloneNetwork  entity.Network
 	clusterwiseNetwork entity.Network
 }
 
 // OK
-func (suite *DPDKNetworkTestSuite) SetupSuite() {
+func (suite *OVSNetdevNetworkTestSuite) SetupSuite() {
 	cf := config.MustRead("../../config/testing.json")
 	suite.sp = serviceprovider.NewForTesting(cf)
 
@@ -107,10 +107,9 @@ func (suite *DPDKNetworkTestSuite) SetupSuite() {
 			},
 		},
 	}
-
 }
 
-func (suite *DPDKNetworkTestSuite) TearDownSuite() {}
+func (suite *OVSNetdevNetworkTestSuite) TearDownSuite() {}
 
 // OK
 func TestNetworkSuite(t *testing.T) {
@@ -123,11 +122,11 @@ func TestNetworkSuite(t *testing.T) {
 		t.SkipNow()
 		return
 	}
-	suite.Run(t, new(DPDKNetworkTestSuite))
+	suite.Run(t, new(OVSNetdevNetworkTestSuite))
 }
 
-// OK
-func (suite *DPDKNetworkTestSuite) TestCreateOVSDPDKNetwork() {
+// OK. might fail
+func (suite *OVSNetdevNetworkTestSuite) TestCreateOVSDPDKNetwork() {
 	brName := namesgenerator.GetRandomName(0)
 	err := createOVSDPDKNetwork(
 		DPDK_LOCAL_IP,
@@ -140,7 +139,7 @@ func (suite *DPDKNetworkTestSuite) TestCreateOVSDPDKNetwork() {
 }
 
 // OK
-func (suite *DPDKNetworkTestSuite) TestCreateOVSUserspaceNetwork() {
+func (suite *OVSNetdevNetworkTestSuite) TestCreateOVSUserspaceNetwork() {
 	brName := namesgenerator.GetRandomName(0)
 	err := createOVSUserspaceNetwork(
 		DPDK_LOCAL_IP,
@@ -153,7 +152,7 @@ func (suite *DPDKNetworkTestSuite) TestCreateOVSUserspaceNetwork() {
 }
 
 // OK
-func (suite *DPDKNetworkTestSuite) TestDeleteOVSUserspaceNetwork() {
+func (suite *OVSNetdevNetworkTestSuite) TestDeleteOVSUserspaceNetwork() {
 	brName := namesgenerator.GetRandomName(0)
 	// ovs-vsctl add-br br0 -- set bridge br0 datapath_type=netdev
 	exec.Command("ovs-vsctl", "add-br", brName, "--", "set", "bridge", brName, "datapath_type=netdev").Run()
@@ -162,7 +161,7 @@ func (suite *DPDKNetworkTestSuite) TestDeleteOVSUserspaceNetwork() {
 }
 
 // OK
-func (suite *DPDKNetworkTestSuite) TestCreateNetwork() {
+func (suite *OVSNetdevNetworkTestSuite) TestCreateNetwork() {
 	testCases := []struct {
 		caseName string
 		network  *entity.Network
@@ -184,7 +183,7 @@ func (suite *DPDKNetworkTestSuite) TestCreateNetwork() {
 }
 
 // OK
-func (suite *DPDKNetworkTestSuite) TestCreateNetworkFail() {
+func (suite *OVSNetdevNetworkTestSuite) TestCreateNetworkFail() {
 	network := entity.Network{
 		Type:       entity.OVSUserspaceNetworkType,
 		IsDPDKPort: false,
@@ -200,7 +199,7 @@ func (suite *DPDKNetworkTestSuite) TestCreateNetworkFail() {
 }
 
 // OK
-func (suite *DPDKNetworkTestSuite) TestValidateBeforeCreating() {
+func (suite *OVSNetdevNetworkTestSuite) TestValidateBeforeCreating() {
 	tName := namesgenerator.GetRandomName(0)
 	// Valid VLAN number
 	ValidVLANnetwork := entity.Network{
@@ -245,7 +244,7 @@ func (suite *DPDKNetworkTestSuite) TestValidateBeforeCreating() {
 }
 
 // OK
-func (suite *DPDKNetworkTestSuite) TestValidateBeforeCreatingFail() {
+func (suite *OVSNetdevNetworkTestSuite) TestValidateBeforeCreatingFail() {
 	tName := namesgenerator.GetRandomName(0)
 	// Invalid VLAN number
 	InvalidVLANnetwork := entity.Network{
@@ -300,7 +299,7 @@ func (suite *DPDKNetworkTestSuite) TestValidateBeforeCreatingFail() {
 }
 
 // OK
-func (suite *DPDKNetworkTestSuite) TestDeleteNetwork() {
+func (suite *OVSNetdevNetworkTestSuite) TestDeleteNetwork() {
 	testCases := []struct {
 		caseName string
 		network  *entity.Network
@@ -328,7 +327,7 @@ func (suite *DPDKNetworkTestSuite) TestDeleteNetwork() {
 }
 
 // OK
-func (suite *DPDKNetworkTestSuite) TestDeleteNetworkFail() {
+func (suite *OVSNetdevNetworkTestSuite) TestDeleteNetworkFail() {
 	network := entity.Network{
 		Type:       entity.OVSUserspaceNetworkType,
 		IsDPDKPort: false,