211 vsis

cmd/analyzer/main.go

@@ -44,7 +44,9 @@ func analysisTypeToUseCase(inArgs *InArgs) vpcmodel.OutputUseCase {
 	case allSubnets:
 		return vpcmodel.AllSubnets
 	case allSubnetsDiff:
-		return vpcmodel.AllSubnetsDiff
+		return vpcmodel.SubnetsDiff
+	case allEndpointsDiff:
+		return vpcmodel.EndpointsDiff
 	}
 	return vpcmodel.AllEndpoints
 }

cmd/analyzer/parse_args.go

@@ -48,7 +48,7 @@ var supportedAnalysisTypes = map[string]bool{
 	allSubnets:       true,
 	singleSubnet:     true,
 	allSubnetsDiff:   true,
-	allEndpointsDiff: false,
+	allEndpointsDiff: true,
 }
 
 func getSupportedValuesString(supportedValues map[string]bool) string {

pkg/ibmvpc/analysis_output_test.go

@@ -52,6 +52,7 @@ const (
 	suffixOutFileSubnetsLevel      = "subnetsBased_withPGW"
 	suffixOutFileSubnetsLevelNoPGW = "subnetsBased_withoutPGW"
 	suffixOutFileDiffSubnets       = "subnetsDiff"
+	suffixOutFileDiffEndpoints     = "endpointsDiff"
 	txtOutSuffix                   = ".txt"
 	debugOutSuffix                 = "_debug.txt"
 	mdOutSuffix                    = ".md"
@@ -95,29 +96,38 @@ func getTestFileName(testName string,
 		res = baseName + suffixOutFileSubnetsLevel
 	case vpcmodel.AllSubnetsNoPGW:
 		res = baseName + suffixOutFileSubnetsLevelNoPGW
-	case vpcmodel.AllSubnetsDiff:
+	case vpcmodel.SubnetsDiff:
 		res = baseName + suffixOutFileDiffSubnets
+	case vpcmodel.EndpointsDiff:
+		res = baseName + suffixOutFileDiffEndpoints
 	}
+	suffix, suffixErr := getTestFileSuffix(format)
+	if suffixErr != nil {
+		return "", "", suffixErr
+	}
+	res += suffix
+	expectedFileName = res
+	actualFileName = actualOutFilePrefix + res
+	return expectedFileName, actualFileName, nil
+}
+
+func getTestFileSuffix(format vpcmodel.OutFormat) (suffix string, err error) {
 	switch format {
 	case vpcmodel.Text:
-		res += txtOutSuffix
+		return txtOutSuffix, nil
 	case vpcmodel.Debug:
-		res += debugOutSuffix
+		return debugOutSuffix, nil
 	case vpcmodel.MD:
-		res += mdOutSuffix
+		return mdOutSuffix, nil
 	case vpcmodel.JSON:
-		res += jsonOutSuffix
+		return jsonOutSuffix, nil
 	case vpcmodel.DRAWIO:
-		res += drawioOutSuffix
+		return drawioOutSuffix, nil
 	case vpcmodel.ARCHDRAWIO:
-		res += archDrawioOutSuffix
+		return archDrawioOutSuffix, nil
 	default:
-		return "", "", errors.New("unexpected out format")
+		return "", errors.New("unexpected out format")
 	}
-
-	expectedFileName = res
-	actualFileName = actualOutFilePrefix + res
-	return expectedFileName, actualFileName, nil
 }
 
 // initTest: based on the test name, set the input config file name, and the output
@@ -336,35 +346,39 @@ var tests = []*vpcGeneralTest{
 		format:   vpcmodel.Text,
 	},
 	{
-		name: "acl_testing5",
-		// TODO: currently for this test, there are 2 connections that only differ in statefulness attribute, and
-		// are not yet displayed in the diff report (sub1-1-ky => sub1-2-ky , sub1-1-ky => sub1-3-ky)
-		useCases: []vpcmodel.OutputUseCase{vpcmodel.AllSubnetsDiff},
+		name:     "acl_testing5",
+		useCases: []vpcmodel.OutputUseCase{vpcmodel.SubnetsDiff},
+		format:   vpcmodel.Text,
+	},
+	{
+		name:     "acl_testing3",
+		useCases: []vpcmodel.OutputUseCase{vpcmodel.EndpointsDiff},
 		format:   vpcmodel.Text,
 	},
 }
 
 var formatsAvoidComparison = map[vpcmodel.OutFormat]bool{vpcmodel.ARCHDRAWIO: true, vpcmodel.DRAWIO: true}
 
 // uncomment the function below to run for updating the expected output
-/*var formatsAvoidOutputGeneration = map[vpcmodel.OutFormat]bool{vpcmodel.ARCHDRAWIO: true, vpcmodel.DRAWIO: true}
-func TestAllWithGeneration(t *testing.T) {
-	// tests is the list of tests to run
-	for testIdx := range tests {
-		tt := tests[testIdx]
-		// todo - remove the following if when drawio is stable
-		if formatsAvoidOutputGeneration[tt.format] {
-			tt.mode = outputIgnore
-		} else {
-			tt.mode = outputGeneration
-		}
-		t.Run(tt.name, func(t *testing.T) {
-			t.Parallel()
-			tt.runTest(t)
-		})
-	}
-	fmt.Println("done")
-}*/
+// var formatsAvoidOutputGeneration = map[vpcmodel.OutFormat]bool{vpcmodel.ARCHDRAWIO: true, vpcmodel.DRAWIO: true}
+//
+// func TestAllWithGeneration(t *testing.T) {
+//	// tests is the list of tests to run
+//	for testIdx := range tests {
+//		tt := tests[testIdx]
+//		// todo - remove the following if when drawio is stable
+//		if formatsAvoidOutputGeneration[tt.format] {
+//			tt.mode = outputIgnore
+//		} else {
+//			tt.mode = outputGeneration
+//		}
+//		t.Run(tt.name, func(t *testing.T) {
+//			t.Parallel()
+//			tt.runTest(t)
+//		})
+//	}
+//	fmt.Println("done")
+//}
 
 func TestAllWithComparison(t *testing.T) {
 	// tests is the list of tests to run
@@ -407,7 +421,7 @@ func (tt *vpcGeneralTest) runTest(t *testing.T) {
 	var vpcConfigs2nd map[string]*vpcmodel.VPCConfig
 	diffUseCase := false
 	for _, useCase := range tt.useCases {
-		if useCase == vpcmodel.AllSubnetsDiff {
+		if useCase == vpcmodel.SubnetsDiff || useCase == vpcmodel.EndpointsDiff {
 			diffUseCase = true
 		}
 	}

pkg/ibmvpc/examples/acl_testing3endpointsDiff.txt

@@ -0,0 +1,3 @@
+Analysis for diff between VPC test-vpc1-ky and VPC test-vpc2-ky
+diff-type: removed, source: vsi1-ky[10.240.10.4], destination: Public Internet [161.26.0.0/16], config1: protocol: UDP *, config2: No connection, vsis-diff-info: 
+diff-type: removed, source: vsi1-ky[10.240.10.4], destination: vsi2-ky[10.240.20.4], config1: protocol: TCP,UDP, config2: No connection, vsis-diff-info: