fix serviceGateway name

olasaadi99 · olasaadi99 · commit 109806128bce · 2024-11-11T10:05:45.000+02:00
diff --git a/pkg/commonvpc/parser.go b/pkg/commonvpc/parser.go
@@ -31,23 +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"
-	ResourceTypeServiceNetwork   = "ServiceNetwork"
+	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
diff --git a/pkg/ibmvpc/examples/out/explain_out/GroupingExternalSG1_all_vpcs_explain.txt b/pkg/ibmvpc/examples/out/explain_out/GroupingExternalSG1_all_vpcs_explain.txt
@@ -7,7 +7,7 @@ Connections from vsi1-ky[10.240.10.4] to Service Network 161.26.0.0/16: protocol
 
 Path:
 	vsi1-ky[10.240.10.4] -> security group sg1-ky -> network ACL acl1-ky -> subnet subnet1-ky -> 
-	ServiceNetwork serviceNetwork -> 
+	ServiceGateway  -> 
 	Service Network 161.26.0.0/16
 
 ------------------------------------------------------------------------------------------------------------------------
diff --git a/pkg/ibmvpc/examples/out/explain_out/GroupingExternalSG1_all_vpcs_explain_detail.txt b/pkg/ibmvpc/examples/out/explain_out/GroupingExternalSG1_all_vpcs_explain_detail.txt
@@ -7,7 +7,7 @@ Connections from vsi1-ky[10.240.10.4] to Service Network 161.26.0.0/16: protocol
 
 Path:
 	vsi1-ky[10.240.10.4] -> security group sg1-ky -> network ACL acl1-ky -> subnet subnet1-ky -> 
-	ServiceNetwork serviceNetwork -> 
+	ServiceGateway  -> 
 	Service Network 161.26.0.0/16
 
 
diff --git a/pkg/ibmvpc/examples/out/explain_out/NACLExternal1_all_vpcs_explain_detail.txt b/pkg/ibmvpc/examples/out/explain_out/NACLExternal1_all_vpcs_explain_detail.txt
@@ -7,7 +7,7 @@ Connections from vsi1-ky[10.240.10.4] to Service Network 161.26.0.0/16: protocol
 
 Path:
 	vsi1-ky[10.240.10.4] -> security group sg1-ky -> network ACL acl1-ky -> subnet subnet1-ky -> 
-	ServiceNetwork serviceNetwork -> 
+	ServiceGateway  -> 
 	Service Network 161.26.0.0/16
 
 
diff --git a/pkg/ibmvpc/examples/out/explain_out/NACLGrouping_all_vpcs_explain_detail.txt b/pkg/ibmvpc/examples/out/explain_out/NACLGrouping_all_vpcs_explain_detail.txt
@@ -7,7 +7,7 @@ Connections from vsi1-ky[10.240.10.4] to Service Network 161.26.0.0/16: protocol
 
 Path:
 	vsi1-ky[10.240.10.4] -> security group sg1-ky -> network ACL acl1-ky -> subnet subnet1-ky -> 
-	ServiceNetwork serviceNetwork -> 
+	ServiceGateway  -> 
 	Service Network 161.26.0.0/16
 
 
diff --git a/pkg/ibmvpc/examples/out/explain_out/NACLQueryAllowSubset_all_vpcs_explain_detail.txt b/pkg/ibmvpc/examples/out/explain_out/NACLQueryAllowSubset_all_vpcs_explain_detail.txt
@@ -8,7 +8,7 @@ Connections are allowed from vsi1-ky[10.240.10.4] to Service Network 161.26.0.0/
 
 Path:
 	vsi1-ky[10.240.10.4] -> security group sg1-ky -> network ACL acl1-ky -> subnet subnet1-ky -> 
-	ServiceNetwork serviceNetwork -> 
+	ServiceGateway  -> 
 	Service Network 161.26.0.0/16
 
 
diff --git a/pkg/ibmvpc/examples/out/explain_out/NACLQueryConnection1_all_vpcs_explain_detail.txt b/pkg/ibmvpc/examples/out/explain_out/NACLQueryConnection1_all_vpcs_explain_detail.txt
@@ -7,7 +7,7 @@ Connections are allowed from vsi1-ky[10.240.10.4] to Service Network 161.26.0.0/
 
 Path:
 	vsi1-ky[10.240.10.4] -> security group sg1-ky -> network ACL acl1-ky -> subnet subnet1-ky -> 
-	ServiceNetwork serviceNetwork -> 
+	ServiceGateway  -> 
 	Service Network 161.26.0.0/16
 
 
diff --git a/pkg/ibmvpc/examples/out/explain_out/NACLQueryConnection2_all_vpcs_explain_detail.txt b/pkg/ibmvpc/examples/out/explain_out/NACLQueryConnection2_all_vpcs_explain_detail.txt
@@ -6,7 +6,7 @@ Interpreted destination(s): 161.26.0.0/16 (Service Network)
 No connectivity from vsi1-ky[10.240.10.4] to Service Network 161.26.0.0/16 using "protocol: TCP";
 	connection is blocked at egress
 
-External traffic via ServiceNetwork: serviceNetwork
+External traffic via ServiceGateway: 
 Egress: security group sg1-ky allows connection; network ACL acl1-ky blocks connection
 
 Path:
diff --git a/pkg/ibmvpc/examples/out/explain_out/NACLQueryConnectionRules2_all_vpcs_explain_detail.txt b/pkg/ibmvpc/examples/out/explain_out/NACLQueryConnectionRules2_all_vpcs_explain_detail.txt
@@ -8,7 +8,7 @@ Connections from vsi1-ky[10.240.10.4] to Service Network 161.26.0.0/16: All Conn
 
 Path:
 	vsi1-ky[10.240.10.4] -> security group sg1-ky -> network ACL acl1-ky -> subnet subnet1-ky -> 
-	ServiceNetwork serviceNetwork -> 
+	ServiceGateway  -> 
 	Service Network 161.26.0.0/16
 
 
diff --git a/pkg/ibmvpc/examples/out/explain_out/NACLQueryConnectionRules3_all_vpcs_explain_detail.txt b/pkg/ibmvpc/examples/out/explain_out/NACLQueryConnectionRules3_all_vpcs_explain_detail.txt
@@ -8,7 +8,7 @@ Connections are allowed from vsi1-ky[10.240.10.4] to Service Network 161.26.0.0/
 
 Path:
 	vsi1-ky[10.240.10.4] -> security group sg1-ky -> network ACL acl1-ky -> subnet subnet1-ky -> 
-	ServiceNetwork serviceNetwork -> 
+	ServiceGateway  -> 
 	Service Network 161.26.0.0/16
 
 
diff --git a/pkg/ibmvpc/examples/out/explain_out/NACLQueryConnectionRules4_all_vpcs_explain_detail.txt b/pkg/ibmvpc/examples/out/explain_out/NACLQueryConnectionRules4_all_vpcs_explain_detail.txt
@@ -7,7 +7,7 @@ Connections are allowed from vsi1-ky[10.240.10.4] to Service Network 161.26.0.0/
 
 Path:
 	vsi1-ky[10.240.10.4] -> security group sg1-ky -> network ACL acl1-ky -> subnet subnet1-ky -> 
-	ServiceNetwork serviceNetwork -> 
+	ServiceGateway  -> 
 	Service Network 161.26.0.0/16
 
 
diff --git a/pkg/ibmvpc/examples/out/explain_out/QueryConnectionSGBasic1_all_vpcs_explain_detail.txt b/pkg/ibmvpc/examples/out/explain_out/QueryConnectionSGBasic1_all_vpcs_explain_detail.txt
@@ -7,7 +7,7 @@ Connections are allowed from vsi1-ky[10.240.10.4] to Service Network 161.26.0.0/
 
 Path:
 	vsi1-ky[10.240.10.4] -> security group sg1-ky -> network ACL acl1-ky -> subnet subnet1-ky -> 
-	ServiceNetwork serviceNetwork -> 
+	ServiceGateway  -> 
 	Service Network 161.26.0.0/16
 
 
diff --git a/pkg/ibmvpc/examples/out/explain_out/QueryConnectionSGBasic2_all_vpcs_explain_detail.txt b/pkg/ibmvpc/examples/out/explain_out/QueryConnectionSGBasic2_all_vpcs_explain_detail.txt
@@ -7,7 +7,7 @@ Connections are allowed from vsi1-ky[10.240.10.4] to Service Network 161.26.0.0/
 
 Path:
 	vsi1-ky[10.240.10.4] -> security group sg1-ky -> network ACL acl1-ky -> subnet subnet1-ky -> 
-	ServiceNetwork serviceNetwork -> 
+	ServiceGateway  -> 
 	Service Network 161.26.0.0/16
 
 
diff --git a/pkg/ibmvpc/examples/out/explain_out/QueryConnectionSGBasic3_all_vpcs_explain_detail.txt b/pkg/ibmvpc/examples/out/explain_out/QueryConnectionSGBasic3_all_vpcs_explain_detail.txt
@@ -7,7 +7,7 @@ Connections are allowed from vsi1-ky[10.240.10.4] to Service Network 161.26.0.0/
 
 Path:
 	vsi1-ky[10.240.10.4] -> security group sg1-ky -> network ACL acl1-ky -> subnet subnet1-ky -> 
-	ServiceNetwork serviceNetwork -> 
+	ServiceGateway  -> 
 	Service Network 161.26.0.0/20
 
 
diff --git a/pkg/ibmvpc/examples/out/explain_out/QueryConnectionSGBasic4_all_vpcs_explain_detail.txt b/pkg/ibmvpc/examples/out/explain_out/QueryConnectionSGBasic4_all_vpcs_explain_detail.txt
@@ -7,7 +7,7 @@ Connections are allowed from vsi1-ky[10.240.10.4] to Service Network 161.26.0.0/
 
 Path:
 	vsi1-ky[10.240.10.4] -> security group sg1-ky -> network ACL acl1-ky -> subnet subnet1-ky -> 
-	ServiceNetwork serviceNetwork -> 
+	ServiceGateway  -> 
 	Service Network 161.26.0.0/16
 
 
diff --git a/pkg/ibmvpc/examples/out/explain_out/SGInternal3SrcToExternalGroup_all_vpcs_explain_detail.txt b/pkg/ibmvpc/examples/out/explain_out/SGInternal3SrcToExternalGroup_all_vpcs_explain_detail.txt
@@ -7,7 +7,7 @@ Connections from db-endpoint-gateway-ky[10.240.30.6] to Service Network 161.26.0
 
 Path:
 	db-endpoint-gateway-ky[10.240.30.6] -> security group sg3-ky -> network ACL acl3-ky -> subnet subnet3-ky -> 
-	ServiceNetwork serviceNetwork -> 
+	ServiceGateway  -> 
 	Service Network 161.26.0.0/16
 
 
@@ -33,7 +33,7 @@ Connections from vsi3a-ky[10.240.30.5] to Service Network 161.26.0.0/16: All Con
 
 Path:
 	vsi3a-ky[10.240.30.5] -> security group sg3-ky -> network ACL acl3-ky -> subnet subnet3-ky -> 
-	ServiceNetwork serviceNetwork -> 
+	ServiceGateway  -> 
 	Service Network 161.26.0.0/16
 
 
@@ -123,7 +123,7 @@ Path is disabled; The relevant rules are:
 No connectivity from vsi3b-ky[10.240.30.4] to Service Network 161.26.0.0/16;
 	connection is blocked at egress
 
-External traffic via ServiceNetwork: serviceNetwork
+External traffic via ServiceGateway: 
 Egress: security group sg2-ky does not allow connection; network ACL acl3-ky allows connection
 
 Path:
diff --git a/pkg/ibmvpc/examples/out/explain_out/SimpleExternalSG1_all_vpcs_explain_detail.txt b/pkg/ibmvpc/examples/out/explain_out/SimpleExternalSG1_all_vpcs_explain_detail.txt
@@ -7,7 +7,7 @@ Connections from vsi1-ky[10.240.10.4] to Service Network 161.26.0.0/16: protocol
 
 Path:
 	vsi1-ky[10.240.10.4] -> security group sg1-ky -> network ACL acl1-ky -> subnet subnet1-ky -> 
-	ServiceNetwork serviceNetwork -> 
+	ServiceGateway  -> 
 	Service Network 161.26.0.0/16
 
 
diff --git a/pkg/ibmvpc/examples/out/explain_out/SimpleExternalSG3_all_vpcs_explain_detail.txt b/pkg/ibmvpc/examples/out/explain_out/SimpleExternalSG3_all_vpcs_explain_detail.txt
@@ -7,7 +7,7 @@ Connections from vsi1-ky[10.240.10.4] to Service Network 161.26.0.0/32: protocol
 
 Path:
 	vsi1-ky[10.240.10.4] -> security group sg1-ky -> network ACL acl1-ky -> subnet subnet1-ky -> 
-	ServiceNetwork serviceNetwork -> 
+	ServiceGateway  -> 
 	Service Network 161.26.0.0/32
 
 
diff --git a/pkg/ibmvpc/examples/out/explain_out/SimpleExternalSG4_all_vpcs_explain.txt b/pkg/ibmvpc/examples/out/explain_out/SimpleExternalSG4_all_vpcs_explain.txt
@@ -6,7 +6,7 @@ Interpreted destination(s): 161.26.0.0/32 (Service Network)
 No connectivity from vsi3b-ky[10.240.30.4] to Service Network 161.26.0.0/32;
 	connection is blocked at egress
 
-External traffic via ServiceNetwork: serviceNetwork
+External traffic via ServiceGateway: 
 Egress: security group sg2-ky does not allow connection; network ACL acl3-ky allows connection
 
 Path:
diff --git a/pkg/ibmvpc/implicit_routing.go b/pkg/ibmvpc/implicit_routing.go
@@ -82,7 +82,7 @@ func systemRTConfigFromVPCConfig(vpcConfig *vpcmodel.VPCConfig) *systemRTConfig
 			res.pgwList = append(res.pgwList, router.(*PublicGateway))
 		case commonvpc.ResourceTypeFloatingIP:
 			res.fipList = append(res.fipList, router.(*FloatingIP))
-		case commonvpc.ResourceTypeServiceNetwork:
+		case commonvpc.ResourceTypeServiceNetworkGateway:
 			res.sgw = router.(*ServiceNetworkGateway)
 		}
 	}
diff --git a/pkg/ibmvpc/parser.go b/pkg/ibmvpc/parser.go
@@ -564,13 +564,13 @@ func (rc *IBMresourcesContainer) getPgwConfig(
 	return nil
 }
 
-func newSGW(sgwName string, cidr *netset.IPBlock) *ServiceNetworkGateway {
+func newSGW(cidr *netset.IPBlock) *ServiceNetworkGateway {
 	return &ServiceNetworkGateway{
 		VPCResource: vpcmodel.VPCResource{
-			ResourceName: sgwName,
-			ResourceUID:  sgwName,
+			ResourceName: "",
+			ResourceUID:  "",
 			Zone:         "",
-			ResourceType: commonvpc.ResourceTypeServiceNetwork,
+			ResourceType: commonvpc.ResourceTypeServiceNetworkGateway,
 			VPCRef:       nil,
 		},
 		cidr: cidr,
@@ -581,7 +581,7 @@ func (rc *IBMresourcesContainer) addSgwToConfig(
 	res *vpcmodel.MultipleVPCConfigs,
 ) {
 	_, serviceNetworkIPblock, _ := vpcmodel.GetNetworkAddressList().GetServiceNetworkIPblocksList()
-	routerSgw := newSGW("serviceNetwork", serviceNetworkIPblock)
+	routerSgw := newSGW(serviceNetworkIPblock)
 	for _, vpcConfig := range res.Configs() {
 		vpcConfig.RoutingResources = append(vpcConfig.RoutingResources, routerSgw)
 		vpcConfig.UIDToResource[routerSgw.ResourceUID] = routerSgw
