unit-tests improvements

Author: olasaadi99

pkg/ibmvpc/connectivityAnalysis_test.go

@@ -156,52 +156,74 @@ var nc6 = &naclConfig{
 
 // tests below
 
-var expectedConnStrTest1 = `vsi-0-subnet-1[10.240.10.4] => vsi-0-subnet-2[10.240.20.4] : All Connections
-vsi-0-subnet-2[10.240.20.4] => vsi-0-subnet-1[10.240.10.4] : All Connections
-`
-
-func TestAnalyzeConnectivity1(t *testing.T) {
-	runConnectivityTest(t, tc1, []*naclConfig{nc1}, expectedConnStrTest1)
-}
-
-var expectedConnStrTest2 = `vsi-0-subnet-1[10.240.10.4] => vsi-0-subnet-2[10.240.20.4] : TCP * ; ICMP,UDP
-`
-
-func TestAnalyzeConnectivity2(t *testing.T) {
-	runConnectivityTest(t, tc1, []*naclConfig{nc2, nc3}, expectedConnStrTest2)
+type ConnectivityAnalysisTest struct {
+	name              string
+	tc                *testNodesConfig
+	ncList            []*naclConfig
+	expectedStrResult string
 }
 
-var expectedConnStrTest2a = `vsi-0-subnet-1[10.240.10.4] => vsi-0-subnet-2[10.240.20.4] : ICMP
-` // ICMP is actually enabled only unidirectional in this case, but responsive analysis does not apply to ICMP
-
-func TestAnalyzeConnectivity2a(t *testing.T) {
-	runConnectivityTest(t, tc1, []*naclConfig{nc2a, nc3a}, expectedConnStrTest2a)
-}
-
-var expectedConnStrTest3 = `vsi-0-subnet-1[10.240.10.4] => vsi-0-subnet-2[10.240.20.4] : All Connections
+var connectivityAnalysisTests = []*ConnectivityAnalysisTest{
+	{
+		name:   "testAnalyzeConnectivity1",
+		tc:     tc1,
+		ncList: []*naclConfig{nc1},
+		expectedStrResult: `vsi-0-subnet-1[10.240.10.4] => vsi-0-subnet-2[10.240.20.4] : All Connections
+vsi-0-subnet-2[10.240.20.4] => vsi-0-subnet-1[10.240.10.4] : All Connections
+`,
+	},
+	{
+		name:   "testAnalyzeConnectivity2",
+		tc:     tc1,
+		ncList: []*naclConfig{nc2, nc3},
+		expectedStrResult: `vsi-0-subnet-1[10.240.10.4] => vsi-0-subnet-2[10.240.20.4] : TCP * ; ICMP,UDP
+`,
+	},
+	{
+		name:   "testAnalyzeConnectivity2a",
+		tc:     tc1,
+		ncList: []*naclConfig{nc2a, nc3a},
+		expectedStrResult: `vsi-0-subnet-1[10.240.10.4] => vsi-0-subnet-2[10.240.20.4] : ICMP
+`, // ICMP is actually enabled only unidirectional in this case, but responsive analysis does not apply to ICMP
+	},
+	{
+		name:   "testAnalyzeConnectivity3",
+		tc:     tc1,
+		ncList: []*naclConfig{nc2, nc4},
+		expectedStrResult: `vsi-0-subnet-1[10.240.10.4] => vsi-0-subnet-2[10.240.20.4] : All Connections
 vsi-0-subnet-2[10.240.20.4] => vsi-0-subnet-1[10.240.10.4] : TCP
-`
-
-func TestAnalyzeConnectivity3(t *testing.T) {
-	runConnectivityTest(t, tc1, []*naclConfig{nc2, nc4}, expectedConnStrTest3)
-}
-
-var expectedConnStrTest4 = `vsi-0-subnet-1[10.240.10.4] => vsi-0-subnet-2[10.240.20.4] : TCP src-ports: 10-100 dst-ports: 443
+`,
+	},
+	{
+		name:   "testAnalyzeConnectivity4",
+		tc:     tc1,
+		ncList: []*naclConfig{nc5, nc6},
+		expectedStrResult: `vsi-0-subnet-1[10.240.10.4] => vsi-0-subnet-2[10.240.20.4] : TCP src-ports: 10-100 dst-ports: 443
 vsi-0-subnet-2[10.240.20.4] => vsi-0-subnet-1[10.240.10.4] : TCP src-ports: 443 dst-ports: 10-100
-`
+`,
+	},
+}
 
-func TestAnalyzeConnectivity4(t *testing.T) {
-	runConnectivityTest(t, tc1, []*naclConfig{nc5, nc6}, expectedConnStrTest4)
+func TestConnectivityAnalysis(t *testing.T) {
+	// connectivityAnalysisTests is the list of tests to run
+	for testIdx := range connectivityAnalysisTests {
+		tt := connectivityAnalysisTests[testIdx]
+		t.Run(tt.name, func(t *testing.T) {
+			t.Parallel()
+			tt.runConnectivityTest(t)
+		})
+	}
+	fmt.Println("done")
 }
 
-func runConnectivityTest(t *testing.T, tc *testNodesConfig, ncList []*naclConfig, expectedStrResult string) {
-	c := createConfigFromTestConfig(tc, ncList)
+func (tt *ConnectivityAnalysisTest) runConnectivityTest(t *testing.T) {
+	c := createConfigFromTestConfig(tt.tc, tt.ncList)
 	connectivity, err := c.GetVPCNetworkConnectivity(false, vpcmodel.NoGroupingNoConsistencyEdges)
 	require.Nil(t, err)
 	connectivityStr := connectivity.String()
 	fmt.Println(connectivityStr)
 	fmt.Println("done")
-	require.Equal(t, expectedStrResult, connectivityStr)
+	require.Equal(t, tt.expectedStrResult, connectivityStr)
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////////////

pkg/ibmvpc/naclAnalysis_test.go

@@ -50,7 +50,7 @@ func testSingleNACL(nacl *commonvpc.NACL) {
 	}
 }
 
-func TestGetAllowedXgressConnections(t *testing.T) {
+func TestNaclAnalysis(t *testing.T) {
 	subnet := newIPBlockFromCIDROrAddressWithoutValidation("10.0.0.0/24")
 
 	tests := []struct {
@@ -60,7 +60,7 @@ func TestGetAllowedXgressConnections(t *testing.T) {
 	}{
 		{
 
-			testName: "a",
+			testName: "naclAnalysis1",
 			naclRules: []*commonvpc.NACLRule{
 				{
 					Src:         newIPBlockFromCIDROrAddressWithoutValidation("1.2.3.4/32"),
@@ -148,7 +148,7 @@ func TestGetAllowedXgressConnections(t *testing.T) {
 			},
 		},
 		{
-			testName: "b",
+			testName: "naclAnalysis2",
 			naclRules: []*commonvpc.NACLRule{
 				{
 					Src:         newIPBlockFromCIDROrAddressWithoutValidation("1.2.3.4/32"),
@@ -250,7 +250,7 @@ func TestGetAllowedXgressConnections(t *testing.T) {
 			},
 		},
 		{
-			testName: "c",
+			testName: "naclAnalysis3",
 			naclRules: []*commonvpc.NACLRule{
 				{
 					Dst:         newIPBlockFromCIDROrAddressWithoutValidation("1.2.3.4/32"),
@@ -294,8 +294,11 @@ func TestGetAllowedXgressConnections(t *testing.T) {
 	}
 
 	for _, test := range tests {
-		connectivityMap := commonvpc.AnalyzeNACLRulesPerDisjointTargets(test.naclRules, subnet, true)
-		require.True(t, equalConnectivityMap(connectivityMap, test.expectedConnectivityMap))
+		t.Run(test.testName, func(t *testing.T) {
+			t.Parallel()
+			connectivityMap := commonvpc.AnalyzeNACLRulesPerDisjointTargets(test.naclRules, subnet, true)
+			require.True(t, equalConnectivityMap(connectivityMap, test.expectedConnectivityMap))
+		})
 	}
 	fmt.Printf("done\n")
 }