855 grouping legal graph

cmd/analyzer/subcmds/analysis.go

@@ -83,7 +83,7 @@ func analysisVPCConfigs(cmd *cobra.Command, inArgs *inArgs, analysisType vpcmode
 		inArgs.grouping,
 		analysisType,
 		false,
-		inArgs.explanationArgs, outFormat, inArgs.lbAbstraction)
+		inArgs.explanationArgs, outFormat, inArgs.lbAbstraction, false)
 	if err != nil {
 		return err
 	}

pkg/commonvpc/testfunc/analysis_output_test_functionality.go

@@ -15,15 +15,16 @@ import (
 
 type VpcAnalysisTest struct {
 	VpcTestCommon
-	Grouping     bool
-	NoLbAbstract bool
+	Grouping                    bool
+	NoLbAbstract                bool
+	AddConsistencyEdgesExternal bool
 }
 
 func (tt *VpcAnalysisTest) TestAnalysisSingleTest(t *testing.T, mode testMode, rc commonvpc.ResourcesContainer, testDir, testName string) {
 	tt.Name = testName
 	tt.setMode(mode)
 	t.Run(tt.Name, func(t *testing.T) {
 		t.Parallel()
-		tt.runSingleCommonTest(t, testDir, rc, tt.Grouping, tt.NoLbAbstract, nil)
+		tt.runSingleCommonTest(t, testDir, rc, tt.Grouping, tt.NoLbAbstract, nil, tt.AddConsistencyEdgesExternal)
 	})
 }

pkg/commonvpc/testfunc/common_test_functionality.go

@@ -47,6 +47,7 @@ const (
 	suffixOutFileDiffEndpoints        = "endpointsDiff"
 	suffixOutFileExplain              = "explain"
 	suffixOutFileDetail               = "_detail"
+	consistencyEdgesExternal          = "_EdgeConsistent"
 	txtOutSuffix                      = ".txt"
 	mdOutSuffix                       = ".md"
 	JSONOutSuffix                     = ".json"
@@ -86,6 +87,7 @@ func getTestFileName(testName string,
 	grouping bool,
 	noLbAbstract bool,
 	detailExplain bool,
+	addConsistencyEdgesExternal bool,
 	format vpcmodel.OutFormat,
 	configName string,
 	allVPCs bool,
@@ -128,6 +130,9 @@ func getTestFileName(testName string,
 	if detailExplain {
 		res += suffixOutFileDetail
 	}
+	if addConsistencyEdgesExternal {
+		res += consistencyEdgesExternal
+	}
 	if !allVPCs {
 		res += strings.ReplaceAll(strings.Join(vpcIDs, ""), ":", "")
 	}
@@ -174,9 +179,10 @@ func (tt *VpcTestCommon) initTest() {
 }
 
 func (tt *VpcTestCommon) initTestFileNames(uc vpcmodel.OutputUseCase,
-	vpcName string, allVPCs, detailExplain bool, testDirOut string, grouping, noLbAbstract bool) error {
+	vpcName string, allVPCs, detailExplain bool, testDirOut string, grouping, noLbAbstract,
+	addConsistencyEdgesExternal bool) error {
 	expectedFileName, actualFileName, err := getTestFileName(
-		tt.Name, uc, grouping, noLbAbstract, detailExplain, tt.Format, vpcName, allVPCs, tt.VpcList)
+		tt.Name, uc, grouping, noLbAbstract, detailExplain, addConsistencyEdgesExternal, tt.Format, vpcName, allVPCs, tt.VpcList)
 	if err != nil {
 		return err
 	}
@@ -192,17 +198,19 @@ func (tt *VpcTestCommon) runTestPerUseCase(t *testing.T,
 	mode testMode,
 	outDir string,
 	grouping, noLbAbstract bool,
-	explanationArgs *vpcmodel.ExplanationArgs) error {
+	explanationArgs *vpcmodel.ExplanationArgs,
+	addConsistencyEdgesExternal bool) error {
 	detailExplain := false
 	if explanationArgs != nil {
 		detailExplain = explanationArgs.Detail
 	}
 	allVpcs := len(tt.VpcList) == 0
-	if err := tt.initTestFileNames(uc, "", allVpcs, detailExplain, outDir, grouping, noLbAbstract); err != nil {
+	if err := tt.initTestFileNames(uc, "", allVpcs, detailExplain, outDir, grouping, noLbAbstract,
+		addConsistencyEdgesExternal); err != nil {
 		return err
 	}
 	og, err := vpcmodel.NewOutputGenerator(cConfigs, grouping, uc, tt.Format == vpcmodel.ARCHDRAWIO,
-		explanationArgs, tt.Format, !noLbAbstract)
+		explanationArgs, tt.Format, !noLbAbstract, addConsistencyEdgesExternal)
 	if err != nil {
 		return err
 	}
@@ -326,7 +334,7 @@ func (tt *VpcTestCommon) setMode(mode testMode) {
 }
 
 func (tt *VpcTestCommon) runSingleCommonTest(t *testing.T, testDir string, rc commonvpc.ResourcesContainer,
-	grouping, noLbAbstract bool, explanationArgs *vpcmodel.ExplanationArgs) {
+	grouping, noLbAbstract bool, explanationArgs *vpcmodel.ExplanationArgs, addConsistencyEdgesExternal bool) {
 	// init test - set the input/output file names according to test name
 	tt.initTest()
 
@@ -335,7 +343,8 @@ func (tt *VpcTestCommon) runSingleCommonTest(t *testing.T, testDir string, rc co
 
 	// generate actual output for all use cases specified for this test
 	for _, uc := range tt.UseCases {
-		err := tt.runTestPerUseCase(t, vpcConfigs, uc, tt.Mode, testDir, grouping, noLbAbstract, explanationArgs)
+		err := tt.runTestPerUseCase(t, vpcConfigs, uc, tt.Mode, testDir, grouping, noLbAbstract,
+			explanationArgs, addConsistencyEdgesExternal)
 		require.Equal(t, tt.ErrPerUseCase[uc], err, "comparing actual err to expected err")
 	}
 	for uc, outFile := range tt.ActualOutput {

pkg/commonvpc/testfunc/explain_test_functionality.go

@@ -42,6 +42,6 @@ func (tt *VpcExplainTest) TestSingleExplain(t *testing.T, mode testMode, rc comm
 	tt.Format = vpcmodel.Text
 	t.Run(tt.Name, func(t *testing.T) {
 		t.Parallel()
-		tt.runSingleCommonTest(t, explainOut, rc, false, false, explanationArgs)
+		tt.runSingleCommonTest(t, explainOut, rc, false, false, explanationArgs, false)
 	})
 }

pkg/commonvpc/testfunc/semantic_diff_test_functionality.go

@@ -44,7 +44,8 @@ func (tt *VpcDiffTest) runDiffSingleTest(t *testing.T, testDir string, rc common
 
 	// generate actual output for all use cases specified for this test
 	for _, uc := range tt.UseCases {
-		err := tt.runTestPerUseCase(t, vpcConfigs, uc, tt.Mode, testDir, false, false, nil)
+		err := tt.runTestPerUseCase(t, vpcConfigs, uc, tt.Mode, testDir, false, false,
+			nil, false)
 		require.Equal(t, tt.ErrPerUseCase[uc], err, "comparing diff's actual err to expected err")
 	}
 	for uc, outFile := range tt.ActualOutput {

pkg/ibmvpc/analysis_output_test.go

@@ -703,19 +703,73 @@ var tests = []*testfunc.VpcAnalysisTest{
 		},
 		Grouping: true,
 	},
+	// tests for AddConsistencyEdgesExternal
+	{
+		VpcTestCommon: testfunc.VpcTestCommon{
+			InputConfig: "sg_testing1_new",
+			UseCases:    []vpcmodel.OutputUseCase{vpcmodel.AllEndpoints},
+			Format:      vpcmodel.Text,
+		},
+		AddConsistencyEdgesExternal: true,
+	},
+	{
+		VpcTestCommon: testfunc.VpcTestCommon{
+			InputConfig: "sg_testing1_new",
+			UseCases:    []vpcmodel.OutputUseCase{vpcmodel.AllEndpoints},
+			Format:      vpcmodel.HTML,
+		},
+		AddConsistencyEdgesExternal: true,
+	},
+	{
+		VpcTestCommon: testfunc.VpcTestCommon{
+			InputConfig: "sg_testing1_new",
+			UseCases:    []vpcmodel.OutputUseCase{vpcmodel.AllEndpoints},
+			Format:      vpcmodel.Text,
+		},
+		AddConsistencyEdgesExternal: true,
+		Grouping:                    true,
+	},
+	{
+		VpcTestCommon: testfunc.VpcTestCommon{
+			InputConfig: "sg_testing1_new",
+			UseCases:    []vpcmodel.OutputUseCase{vpcmodel.AllEndpoints},
+			Format:      vpcmodel.HTML,
+		},
+		AddConsistencyEdgesExternal: true,
+		Grouping:                    true,
+	},
+	{
+		VpcTestCommon: testfunc.VpcTestCommon{
+			InputConfig: "iks_config_object",
+			UseCases:    []vpcmodel.OutputUseCase{vpcmodel.AllEndpoints},
+			Format:      vpcmodel.Text,
+		},
+		Grouping:                    true,
+		NoLbAbstract:                true,
+		AddConsistencyEdgesExternal: true,
+	},
+	{
+		VpcTestCommon: testfunc.VpcTestCommon{
+			InputConfig: "iks_config_object",
+			UseCases:    []vpcmodel.OutputUseCase{vpcmodel.AllEndpoints},
+			Format:      vpcmodel.HTML,
+		},
+		Grouping:                    true,
+		NoLbAbstract:                true,
+		AddConsistencyEdgesExternal: true,
+	},
 }
 
 // uncomment the function below to run for updating the expected output
-/*
-func TestReportWithGeneration(t *testing.T) {
+
+/*func TestReportWithGeneration(t *testing.T) {
 	// tests is the list of tests to run
 	for testIdx := range tests {
 		tt := tests[testIdx]
 		tt.TestAnalysisSingleTest(t, testfunc.OutputGeneration, &IBMresourcesContainer{}, analysisOut, tt.InputConfig)
 	}
 	fmt.Println("done")
-}
-*/
+}*/
 
 func TestReportWithComparison(t *testing.T) {
 	// tests is the list of tests to run

pkg/ibmvpc/connectivityAnalysis_test.go

@@ -196,7 +196,7 @@ func TestAnalyzeConnectivity4(t *testing.T) {
 
 func runConnectivityTest(t *testing.T, tc *testNodesConfig, ncList []*naclConfig, expectedStrResult string) {
 	c := createConfigFromTestConfig(tc, ncList)
-	connectivity, err := c.GetVPCNetworkConnectivity(false, false)
+	connectivity, err := c.GetVPCNetworkConnectivity(false, false, false)
 	require.Nil(t, err)
 	connectivityStr := connectivity.String()
 	fmt.Println(connectivityStr)
@@ -372,7 +372,7 @@ vsi-2[10.240.20.4] => vsi-1[10.240.10.4] : All Connections
 */
 func TestAnalyzeConnectivity(t *testing.T) {
 	c := NewSimpleVPCConfig()
-	connectivity, err := c.GetVPCNetworkConnectivity(false, false)
+	connectivity, err := c.GetVPCNetworkConnectivity(false, false, false)
 	require.Nil(t, err)
 	connectivityStr := connectivity.String()
 	fmt.Println(connectivityStr)