model service network

cmd/analyzer/subcmds/vpcconfigs.go

@@ -58,9 +58,9 @@ func vpcConfigsFromFiles(fileNames []string, inArgs *inArgs) (*vpcmodel.Multiple
 	var rc commonvpc.ResourcesContainer
 	switch provider {
 	case common.IBM:
-		rc = &ibmvpc.IBMresourcesContainer{}
+		rc = ibmvpc.NewIBMresourcesContainer()
 	case common.AWS:
-		rc = &awsvpc.AWSresourcesContainer{}
+		rc = awsvpc.NewAWSresourcesContainer()
 	default:
 		return nil, fmt.Errorf(notSupportedYet, provider)
 	}
@@ -78,9 +78,9 @@ func vpcConfigsFromAccount(inArgs *inArgs) (*vpcmodel.MultipleVPCConfigs, error)
 	var commonRC commonvpc.ResourcesContainer
 	switch inArgs.provider {
 	case common.IBM:
-		commonRC, err = ibmvpc.NewIBMresourcesContainer(rc)
+		commonRC, err = ibmvpc.CopyIBMresourcesContainer(rc)
 	case common.AWS:
-		commonRC, err = awsvpc.NewAWSresourcesContainer(rc)
+		commonRC, err = awsvpc.CopyAWSresourcesContainer(rc)
 	default:
 		return nil, fmt.Errorf(notSupportedYet, inArgs.provider.String())
 	}

pkg/awsvpc/analysis_output_test.go

@@ -67,7 +67,7 @@ var tests = []*testfunc.VpcAnalysisTest{
 	// tests is the list of tests to run
 	for testIdx := range tests {
 		tt := tests[testIdx]
-		tt.TestAnalysisSingleTest(t, testfunc.OutputGeneration, &AWSresourcesContainer{}, analysisOut, tt.InputConfig)
+		tt.TestAnalysisSingleTest(t, testfunc.OutputGeneration, NewAWSresourcesContainer(), analysisOut, tt.InputConfig)
 	}
 	fmt.Println("done")
 }*/
@@ -76,7 +76,7 @@ func TestReportWithComparison(t *testing.T) {
 	// tests is the list of tests to run
 	for testIdx := range tests {
 		tt := tests[testIdx]
-		tt.TestAnalysisSingleTest(t, testfunc.OutputComparison, &AWSresourcesContainer{}, analysisOut, tt.InputConfig)
+		tt.TestAnalysisSingleTest(t, testfunc.OutputComparison, NewAWSresourcesContainer(), analysisOut, tt.InputConfig)
 	}
 	fmt.Println("done")
 }

pkg/awsvpc/examples/out/explain_out/from_external_public_subnet_all_vpcs_explain_detail.txt

@@ -1,5 +1,5 @@
 Explaining connectivity from 147.235.0.0/16 to 10.240.0.96 within mixed
-Interpreted source(s): 147.235.0.0/16 (external)
+Interpreted source(s): 147.235.0.0/16 (Public Internet)
 Interpreted destination(s): p3[10.240.0.96]
 =======================================================================
 

pkg/awsvpc/examples/out/explain_out/to_external_blocked_only_private_subnet_all_vpcs_explain_detail.txt

@@ -1,6 +1,6 @@
 Explaining connectivity from 10.240.20.245 to 161.26.0.0 within vpc0
 Interpreted source(s): app1[10.240.20.245]
-Interpreted destination(s): 161.26.0.0 (external)
+Interpreted destination(s): 161.26.0.0 (Public Internet)
 ====================================================================
 
 No connectivity from app1[10.240.20.245] to Public Internet 161.26.0.0/32;

pkg/awsvpc/examples/out/explain_out/to_external_private_subnet_all_vpcs_explain_detail.txt

@@ -1,6 +1,6 @@
 Explaining connectivity from 10.240.20.245 to 161.26.0.0 within vpc0
 Interpreted source(s): app1[10.240.20.245]
-Interpreted destination(s): 161.26.0.0 (external)
+Interpreted destination(s): 161.26.0.0 (Public Internet)
 ====================================================================
 
 No connectivity from app1[10.240.20.245] to Public Internet 161.26.0.0/32;

pkg/awsvpc/examples/out/explain_out/to_external_public_subnet_all_vpcs_explain_detail.txt

@@ -1,6 +1,6 @@
 Explaining connectivity from 10.240.10.42 to 161.26.0.0 within vpc0
 Interpreted source(s): proxy[10.240.10.42]
-Interpreted destination(s): 161.26.0.0 (external)
+Interpreted destination(s): 161.26.0.0 (Public Internet)
 ===================================================================
 
 Connections from proxy[10.240.10.42] to Public Internet 161.26.0.0/32: All Connections

pkg/awsvpc/explainability_test.go

@@ -101,7 +101,7 @@ func TestExplainWithComparsion(t *testing.T) {
 	// explainTests is the list of tests to run
 	for testIdx := range explainTests {
 		tt := explainTests[testIdx]
-		tt.TestSingleExplain(t, testfunc.OutputComparison, &AWSresourcesContainer{}, tt.Name)
+		tt.TestSingleExplain(t, testfunc.OutputComparison, NewAWSresourcesContainer(), tt.Name)
 	}
 	fmt.Println("done")
 }
@@ -112,7 +112,7 @@ func TestExplainWithComparsion(t *testing.T) {
 	// tests is the list of tests to run
 	for testIdx := range explainTests {
 		tt := explainTests[testIdx]
-		tt.TestSingleExplain(t, commonvpc.OutputGeneration, &AWSresourcesContainer{}, tt.Name)
+		tt.TestSingleExplain(t, commonvpc.OutputGeneration, NewAWSresourcesContainer(), tt.Name)
 	}
 	fmt.Println("done")
 }*/

pkg/awsvpc/lint_test.go

@@ -47,7 +47,7 @@ func TestLintWithComparsion(t *testing.T) {
 		tt.Mode = testfunc.OutputComparison
 		t.Run(tt.Name, func(t *testing.T) {
 			t.Parallel()
-			rc := &AWSresourcesContainer{}
+			rc := NewAWSresourcesContainer()
 			tt.TestSingleLint(t, rc)
 		})
 	}
@@ -63,7 +63,7 @@ func TestLintWithComparsion(t *testing.T) {
 		tt.Mode = testfunc.OutputGeneration
 		t.Run(tt.Name, func(t *testing.T) {
 			t.Parallel()
-			rc := &AWSresourcesContainer{}
+			rc := NewAWSresourcesContainer()
 			tt.TestSingleLint(t, rc)
 		})
 	}

pkg/awsvpc/parser.go

@@ -31,12 +31,22 @@ type AWSresourcesContainer struct {
 	aws.ResourcesContainer
 }
 
-func NewAWSresourcesContainer(rc common.ResourcesContainerInf) (*AWSresourcesContainer, error) {
+// NewAWSresourcesContainer is used to return empty NewAWSresourcesContainer and also initialize
+// vpcmodel.NetworkAddressLists with aws Public internet and service network
+// if you do not use this function, you need to initialize vpcmodel.NetworkAddressLists
+func NewAWSresourcesContainer() *AWSresourcesContainer {
+	vpcmodel.InitNetworkAddressLists(vpcmodel.GetDefaultPublicInternetAddressList(), []string{})
+	return &AWSresourcesContainer{}
+}
+
+func CopyAWSresourcesContainer(rc common.ResourcesContainerInf) (*AWSresourcesContainer, error) {
 	awsResources, ok := rc.GetResources().(*aws.ResourcesContainer)
 	if !ok {
 		return nil, fmt.Errorf("error casting resources to *aws.ResourcesContainerModel type")
 	}
-	return &AWSresourcesContainer{ResourcesContainer: *awsResources}, nil
+	awsRC := NewAWSresourcesContainer()
+	awsRC.ResourcesContainer = *awsResources
+	return awsRC, nil
 }
 
 // parseResourcesFromFile returns aws.ResourcesContainer object, containing the configured resources structs
@@ -79,7 +89,7 @@ func mergeResourcesContainers(rc1, rc2 *AWSresourcesContainer) (*AWSresourcesCon
 func (rc *AWSresourcesContainer) VpcConfigsFromFiles(fileNames []string, resourceGroup string, vpcIDs, regions []string) (
 	*vpcmodel.MultipleVPCConfigs, error) {
 	for _, file := range fileNames {
-		mergedRC := &AWSresourcesContainer{}
+		mergedRC := NewAWSresourcesContainer()
 		err1 := mergedRC.ParseResourcesFromFile(file)
 		if err1 != nil {
 			return nil, fmt.Errorf("error parsing input vpc resources file: %w", err1)

pkg/commonvpc/parser.go

@@ -31,22 +31,23 @@ const (
 
 // Resource types const strings, used in the generated resources of this pkg
 const (
-	ResourceTypeVSI              = "VSI"
-	ResourceTypeNetworkInterface = "NetworkInterface"
-	ResourceTypeSubnet           = "Subnet"
-	ResourceTypePublicGateway    = "PublicGateway"
-	ResourceTypeInternetGateway  = "InternetGateway"
-	ResourceTypeFloatingIP       = "FloatingIP"
-	ResourceTypeVPC              = "VPC"
-	ResourceTypeSG               = "SG"
-	ResourceTypeNACL             = "NACL"
-	ResourceTypeIKSNode          = "IKSNodeNetworkInterface"
-	ResourceTypeVPE              = "VPE"
-	ResourceTypeTGW              = "TGW"
-	ResourceTypeReservedIP       = "ReservedIP"
-	ResourceTypeLoadBalancer     = "LoadBalancer"
-	ResourceTypePrivateIP        = "PrivateIP"
-	ResourceTypeRoutingTable     = "RoutingTable"
+	ResourceTypeVSI                   = "VSI"
+	ResourceTypeNetworkInterface      = "NetworkInterface"
+	ResourceTypeSubnet                = "Subnet"
+	ResourceTypePublicGateway         = "PublicGateway"
+	ResourceTypeInternetGateway       = "InternetGateway"
+	ResourceTypeFloatingIP            = "FloatingIP"
+	ResourceTypeVPC                   = "VPC"
+	ResourceTypeSG                    = "SG"
+	ResourceTypeNACL                  = "NACL"
+	ResourceTypeIKSNode               = "IKSNodeNetworkInterface"
+	ResourceTypeVPE                   = "VPE"
+	ResourceTypeTGW                   = "TGW"
+	ResourceTypeReservedIP            = "ReservedIP"
+	ResourceTypeLoadBalancer          = "LoadBalancer"
+	ResourceTypePrivateIP             = "PrivateIP"
+	ResourceTypeRoutingTable          = "RoutingTable"
+	ResourceTypeServiceNetworkGateway = "ServiceGateway"
 )
 
 // Implemented by AWSresourcesContainer and IBMresourcesContainer

pkg/drawio/iconTreeNode.go

@@ -370,3 +370,14 @@ func NewInternetServiceTreeNode(parent SquareTreeNodeInterface, name string) *In
 	parent.addIconTreeNode(&inter)
 	return &inter
 }
+
+// ////////////////////////////////////////////////////////////////
+type ServiceNetworkTreeNode struct {
+	abstractIconTreeNode
+}
+
+func NewServiceNetworkTreeNode(parent SquareTreeNodeInterface, name string) *ServiceNetworkTreeNode {
+	sn := ServiceNetworkTreeNode{newAbstractIconTreeNode(parent, name)}
+	parent.addIconTreeNode(&sn)
+	return &sn
+}

pkg/drawio/layout.go

@@ -871,6 +871,7 @@ func (ly *layoutS) setIconsLocations() {
 			}
 			ly.setTgwLocations(region)
 		}
+		ly.setIconsLocationsOnTop(cloud)
 	}
 	ly.setPublicNetworkIconsLocations()
 	ly.setGroupingIconLocations()

pkg/drawio/nodesRelations.go

@@ -193,7 +193,7 @@ func tnRelations(network TreeNodeInterface) map[TreeNodeInterface][]TreeNodeInte
 		// each node related to a line get all the other nodes:
 		lineRelations := lineRelation(info)
 		for _, relatedTn := range lineRelations {
-			res[relatedTn] = append(res[relatedTn], lineRelations...)
+			res[relatedTn] = append(res[relatedTn], lineRelations...) //nolint:gocritic // false positive
 		}
 	}
 

pkg/drawio/styles.go

@@ -58,6 +58,7 @@ var images = map[common.Provider]map[reflect.Type]string{
 		reflect.TypeOf(TransitGatewayTreeNode{}):  "PHN2ZyBpZD0iTGF5ZXJfMSIgZGF0YS1uYW1lPSJMYXllciAxIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCA0OSA0OSI+PGRlZnM+PHN0eWxlPi5jbHMtMXtmaWxsOiMxMTkyZTg7fS5jbHMtMiwuY2xzLTR7ZmlsbDpub25lO30uY2xzLTJ7ZmlsbC1ydWxlOmV2ZW5vZGQ7fS5jbHMtM3tmaWxsOiNmZmY7fTwvc3R5bGU+PC9kZWZzPjxyZWN0IGNsYXNzPSJjbHMtMSIgeD0iMC41IiB5PSIwLjUiIHdpZHRoPSI0OCIgaGVpZ2h0PSI0OCIvPjxnIGlkPSJtYXNrLTIiPjxwb2x5Z29uIGlkPSJwYXRoLTEiIGNsYXNzPSJjbHMtMiIgcG9pbnRzPSIxNy4xOCAxNC4yOSAzNy4xNyAxNC4yOSAzNy4xNyAzNC4yOSAxNy4xOCAzNC4yOSAxNy4xOCAxNC4yOSIvPjwvZz48cGF0aCBjbGFzcz0iY2xzLTMiIGQ9Ik0zMC42OSwyNy41NmwyLjE4LTIuMTlhMS4yMSwxLjIxLDAsMCwwLDAtMS43NWwtMy4zMS0zLjMxLjg4LS44N2EuNTYuNTYsMCwwLDAsLjMxLjA2LDEuMjUsMS4yNSwwLDEsMC0xLjI1LTEuMjUuNTcuNTcsMCwwLDAsLjA2LjMxbC0zLjgxLDMuODJBMi4yNiwyLjI2LDAsMCwwLDI0LjUsMjJhMi4xOSwyLjE5LDAsMCwwLTEuMjUuMzhsLTIuMDYtMi4wN0wyNC41LDE3bDIuMTksMi4xOS44Ny0uODgtMi4xOS0yLjE5YTEuMjEsMS4yMSwwLDAsMC0xLjc0LDBsLTMuMzIsMy4zMi0uODctLjg4YS41Ny41NywwLDAsMCwuMDYtLjMxLDEuMjUsMS4yNSwwLDEsMC0xLjI1LDEuMjUuNTcuNTcsMCwwLDAsLjMxLS4wNmwzLjgyLDMuODFBMi4yNiwyLjI2LDAsMCwwLDIyLDI0LjVhMi4xOSwyLjE5LDAsMCwwLC4zOCwxLjI1bC0yLjA3LDIuMDZMMTcsMjQuNWwyLjE5LTIuMTktLjg4LS44Ny0yLjE5LDIuMTlhMS4yLDEuMiwwLDAsMCwwLDEuNzRsMy4zMiwzLjMyLS44OC44N2EuNTcuNTcsMCwwLDAtLjMxLS4wNiwxLjI1LDEuMjUsMCwxLDAsMS4yNSwxLjI1LjU2LjU2LDAsMCwwLS4wNi0uMzFsMy44MS0zLjgyYTIuMjUsMi4yNSwwLDAsMCwyLjUsMGwyLjA2LDIuMDdMMjQuNSwzMmwtMi4xOS0yLjE5LS44Ny44OCwyLjE5LDIuMThhMS4xOSwxLjE5LDAsMCwwLDEuNzQsMGwzLjMyLTMuMzEuODcuODhjMCwuMTItLjA2LjE4LS4wNi4zMWExLjI1LDEuMjUsMCwxLDAsMS4yNS0xLjI1LjU2LjU2LDAsMCwwLS4zMS4wNmwtMy44Mi0zLjgxYTIuMjUsMi4yNSwwLDAsMCwwLTIuNWwyLjA3LTIuMDZMMzIsMjQuNWwtMi4xOSwyLjE5Wk0yNC41LDI1Ljc1YTEuMjUsMS4yNSwwLDEsMSwxLjI1LTEuMjVBMS4yNSwxLjI1LDAsMCwxLDI0LjUsMjUuNzVaIi8+PHJlY3QgY2xhc3M9ImNscy00IiB4PSIxNC41IiB5PSIxNC41IiB3aWR0aD0iMjAiIGhlaWdodD0iMjAiLz48L3N2Zz4=",
 		reflect.TypeOf(InternetTreeNode{}):        "PHN2ZyBpZD0iTGF5ZXJfMSIgZGF0YS1uYW1lPSJMYXllciAxIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCA0OSA0OSI+PGRlZnM+PHN0eWxlPi5jbHMtMXtmaWxsOiMxMTkyZTg7fS5jbHMtMntmaWxsOiNmZmY7fS5jbHMtM3tmaWxsOm5vbmU7fTwvc3R5bGU+PC9kZWZzPjxyZWN0IGNsYXNzPSJjbHMtMSIgeD0iMC41IiB5PSIwLjUiIHdpZHRoPSI0OCIgaGVpZ2h0PSI0OCIgcng9IjgiLz48cGF0aCBjbGFzcz0iY2xzLTIiIGQ9Ik0yNC41LDE1Ljc1YTguNzUsOC43NSwwLDEsMCw4Ljc1LDguNzVBOC43NSw4Ljc1LDAsMCwwLDI0LjUsMTUuNzVaTTMyLDIzLjg4SDI4LjI1YTE1LjE5LDE1LjE5LDAsMCwwLTEuNzQtNi42QTcuNSw3LjUsMCwwLDEsMzIsMjMuODhaTTI0LjUsMzJoLS40MkExMy43MiwxMy43MiwwLDAsMSwyMiwyNS4xMmg1QTEzLjYzLDEzLjYzLDAsMCwxLDI0Ljk0LDMyWk0yMiwyMy44OEExMy42MywxMy42MywwLDAsMSwyNC4wNiwxN2EzLjkzLDMuOTMsMCwwLDEsLjg0LDBBMTMuNjQsMTMuNjQsMCwwLDEsMjcsMjMuODhabS40OC02LjZhMTUuMTgsMTUuMTgsMCwwLDAtMS43Myw2LjZIMTdhNy41LDcuNSwwLDAsMSw1LjQ5LTYuNlpNMTcsMjUuMTJoMy43NWExNS4yLDE1LjIsMCwwLDAsMS43Miw2LjZBNy41Miw3LjUyLDAsMCwxLDE3LDI1LjEyWm05LjQ4LDYuNmExNS4xOSwxNS4xOSwwLDAsMCwxLjc0LTYuNkgzMkE3LjUsNy41LDAsMCwxLDI2LjUxLDMxLjcyWiIvPjxyZWN0IGlkPSJfVHJhbnNwYXJlbnRfUmVjdGFuZ2xlXyIgZGF0YS1uYW1lPSIgVHJhbnNwYXJlbnQgUmVjdGFuZ2xlICIgY2xhc3M9ImNscy0zIiB4PSIxNC41IiB5PSIxNC41IiB3aWR0aD0iMjAiIGhlaWdodD0iMjAiLz48L3N2Zz4=",
 		reflect.TypeOf(InternetServiceTreeNode{}): "PHN2ZyBpZD0iTGF5ZXJfMSIgZGF0YS1uYW1lPSJMYXllciAxIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCA0OSA0OSI+PGRlZnM+PHN0eWxlPi5jbHMtMXtmaWxsOiMxMTkyZTg7fS5jbHMtMntmaWxsOiNmZmY7fS5jbHMtM3tmaWxsOm5vbmU7fTwvc3R5bGU+PC9kZWZzPjxyZWN0IGNsYXNzPSJjbHMtMSIgeD0iMC41IiB5PSIwLjUiIHdpZHRoPSI0OCIgaGVpZ2h0PSI0OCIvPjxwYXRoIGNsYXNzPSJjbHMtMiIgZD0iTTMxLjg3LDIwLjc1YTYuMjUsNi4yNSwwLDAsMC0xMi4yNi4wOCw0LjY4LDQuNjgsMCwwLDAsLjgzLDkuMjloLjk0VjI4Ljg3aC0uOTRBMy40MywzLjQzLDAsMCwxLDIwLjIsMjJsLjUyLDAsLjA2LS41MmE1LDUsMCwwLDEsOS44MS0uNzFaIi8+PHJlY3QgY2xhc3M9ImNscy0zIiB4PSIxNC41IiB5PSIxNC41IiB3aWR0aD0iMjAiIGhlaWdodD0iMjAiLz48cGF0aCBjbGFzcz0iY2xzLTIiIGQ9Ik0zMS4zNywyOS41YTEuODQsMS44NCwwLDAsMC0xLjIuNDVsLTIuNTYtMS41NGMwLS4wNSwwLS4xLDAtLjE2czAtLjExLDAtLjE2bDIuNTYtMS41NGExLjg2LDEuODYsMCwwLDAsMS4yLjQ1LDEuODgsMS44OCwwLDEsMC0xLjg3LTEuODgsMS40MiwxLjQyLDAsMCwwLDAsLjM2bC0yLjQ1LDEuNDZhMS44NiwxLjg2LDAsMCwwLTEuMzQtLjU3LDEuODgsMS44OCwwLDAsMCwwLDMuNzUsMS44NSwxLjg1LDAsMCwwLDEuMzQtLjU2TDI5LjU0LDMxYTEuNDUsMS40NSwwLDAsMCwwLC4zNSwxLjg4LDEuODgsMCwxLDAsMS44Ny0xLjg3Wm0wLTVhLjYzLjYzLDAsMSwxLS42Mi42MkEuNjMuNjMsMCwwLDEsMzEuMzcsMjQuNVptLTUuNjIsNC4zN2EuNjMuNjMsMCwwLDEtLjYzLS42Mi42NC42NCwwLDAsMSwuNjMtLjYzLjYzLjYzLDAsMCwxLC42Mi42M0EuNjIuNjIsMCwwLDEsMjUuNzUsMjguODdaTTMxLjM3LDMyYS42My42MywwLDEsMSwuNjMtLjYzQS42My42MywwLDAsMSwzMS4zNywzMloiLz48L3N2Zz4=",
+		reflect.TypeOf(ServiceNetworkTreeNode{}):  "PHN2ZyBpZD0iTGF5ZXJfMSIgZGF0YS1uYW1lPSJMYXllciAxIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCA0OSA0OSI+DQo8ZGVmcz4NCjxzdHlsZT4uY2xzLTF7ZmlsbDojZWU1Mzk2O30uY2xzLTJ7ZmlsbDpub25lO30uY2xzLTN7ZmlsbDojZmZmO308L3N0eWxlPg0KPC9kZWZzPg0KPHJlY3QgY2xhc3M9ImNscy0xIiB4PSIwLjUiIHk9IjAuNSIgd2lkdGg9IjQ4IiBoZWlnaHQ9IjQ4Ii8+DQo8cmVjdCBjbGFzcz0iY2xzLTIiIHg9IjE0LjUiIHk9IjE0LjUiIHdpZHRoPSIyMCIgaGVpZ2h0PSIyMCIvPg0KPHRleHQgZm9udC1zaXplPSIyNSIgZmlsbD0id2hpdGUiIHg9IjkiIHk9IjM1Ij5TTjwvdGV4dD4NCjwvc3ZnPg0K",
 		reflect.TypeOf(LoadBalancerTreeNode{}):    "PHN2ZyBpZD0iTGF5ZXJfMSIgZGF0YS1uYW1lPSJMYXllciAxIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCA0OSA0OSI+PGRlZnM+PHN0eWxlPi5jbHMtMXtmaWxsOiMxMTkyZTg7fS5jbHMtMntmaWxsOiNmZmY7fS5jbHMtM3tmaWxsOm5vbmU7fTwvc3R5bGU+PC9kZWZzPjxyZWN0IGNsYXNzPSJjbHMtMSIgeD0iMC41IiB5PSIwLjUiIHdpZHRoPSI0OCIgaGVpZ2h0PSI0OCIgcng9IjgiLz48cGF0aCBjbGFzcz0iY2xzLTIiIGQ9Ik0zMC4xMiwyNC41aC01VjIzLjMxSDIzLjg4VjI0LjVoLTVhMS4yMywxLjIzLDAsMCwwLTEuMjYsMS4xOXYzLjU2aDEuMjZWMjUuNjloNXYzLjU2aDEuMjRWMjUuNjloNXYzLjU2aDEuMjZWMjUuNjlBMS4yMywxLjIzLDAsMCwwLDMwLjEyLDI0LjVaIi8+PHJlY3QgY2xhc3M9ImNscy0yIiB4PSIxNyIgeT0iMzAuNDMiIHdpZHRoPSIyLjUiIGhlaWdodD0iMi4zNyIvPjxyZWN0IGNsYXNzPSJjbHMtMiIgeD0iMjMuMjUiIHk9IjMwLjQzIiB3aWR0aD0iMi41IiBoZWlnaHQ9IjIuMzciLz48cmVjdCBjbGFzcz0iY2xzLTIiIHg9IjI5LjUiIHk9IjMwLjQzIiB3aWR0aD0iMi41IiBoZWlnaHQ9IjIuMzciLz48cmVjdCBjbGFzcz0iY2xzLTMiIHg9IjE0LjUiIHk9IjE1IiB3aWR0aD0iMjAiIGhlaWdodD0iMTguOTkiLz48cGF0aCBjbGFzcz0iY2xzLTIiIGQ9Ik0yMC4xMiwxNi4xOXY1Ljk0aDguNzZWMTYuMTlabTEuMjYsMS4xOWgxLjI0djMuNTZIMjEuMzhabTYuMjQsMy41NkgyMy44OFYxNy4zOGgzLjc0WiIvPjwvc3ZnPg==",
 		reflect.TypeOf(PrivateIPTreeNode{}):       privateIPImage,
 	},

pkg/ibmvpc/analysis_output_test.go

@@ -753,6 +753,13 @@ var tests = []*testfunc.VpcAnalysisTest{
 		GroupingType: vpcmodel.GroupingWithConsistencyEdges,
 		NoLbAbstract: true,
 	},
+	{
+		VpcTestCommon: testfunc.VpcTestCommon{
+			InputConfig: "service_network_test",
+			UseCases:    []vpcmodel.OutputUseCase{vpcmodel.AllEndpoints},
+			Format:      vpcmodel.Text,
+		},
+	},
 }
 
 // uncomment the function below to run for updating the expected output
@@ -761,7 +768,7 @@ var tests = []*testfunc.VpcAnalysisTest{
 	// tests is the list of tests to run
 	for testIdx := range tests {
 		tt := tests[testIdx]
-		tt.TestAnalysisSingleTest(t, testfunc.OutputGeneration, &IBMresourcesContainer{}, analysisOut, tt.InputConfig)
+		tt.TestAnalysisSingleTest(t, testfunc.OutputGeneration, NewIBMresourcesContainer(), analysisOut, tt.InputConfig)
 	}
 	fmt.Println("done")
 }*/
@@ -770,7 +777,7 @@ func TestReportWithComparison(t *testing.T) {
 	// tests is the list of tests to run
 	for testIdx := range tests {
 		tt := tests[testIdx]
-		tt.TestAnalysisSingleTest(t, testfunc.OutputComparison, &IBMresourcesContainer{}, analysisOut, tt.InputConfig)
+		tt.TestAnalysisSingleTest(t, testfunc.OutputComparison, NewIBMresourcesContainer(), analysisOut, tt.InputConfig)
 	}
 	fmt.Println("done")
 }
@@ -809,7 +816,7 @@ func TestUnsupportedAnalysis(t *testing.T) {
 	// tests is the list of tests to run
 	for testIdx := range tests {
 		tt := tests[testIdx]
-		tt.TestAnalysisSingleTest(t, tt.Mode, &IBMresourcesContainer{}, analysisOut, tt.Name)
+		tt.TestAnalysisSingleTest(t, tt.Mode, NewIBMresourcesContainer(), analysisOut, tt.Name)
 	}
 	fmt.Println("done")
 }

pkg/ibmvpc/diff_test.go

@@ -95,14 +95,14 @@ var diffTests = []*testfunc.VpcDiffTest{
 // uncomment the function below to run for updating the expected output
 
 /*
-func TestDiffWithGeneration(t *testing.T) {
-	// tests is the list of tests to run
-	for testIdx := range diffTests {
-		tt := diffTests[testIdx]
-		tt.TestDiffSingle(t, testfunc.OutputGeneration, &IBMresourcesContainer{}, analysisOut, tt.InputConfig)
+	func TestDiffWithGeneration(t *testing.T) {
+		// tests is the list of tests to run
+		for testIdx := range diffTests {
+			tt := diffTests[testIdx]
+			tt.TestDiffSingle(t, testfunc.OutputGeneration, NewIBMresourcesContainer(), diffOut, tt.InputConfig)
+		}
+		fmt.Println("done")
 	}
-	fmt.Println("done")
-}
 */
 
 const diffOut = "diff_out"
@@ -111,7 +111,7 @@ func TestDiffWithComparison(t *testing.T) {
 	// tests is the list of tests to run
 	for testIdx := range diffTests {
 		tt := diffTests[testIdx]
-		tt.TestDiffSingle(t, testfunc.OutputComparison, &IBMresourcesContainer{}, diffOut, tt.InputConfig)
+		tt.TestDiffSingle(t, testfunc.OutputComparison, NewIBMresourcesContainer(), diffOut, tt.InputConfig)
 	}
 	fmt.Println("done")
 }