Skip to content

Commit 64e2af7

Browse files
olasaadi99olasaadi99
committed
fix diff
1 parent afc710d commit 64e2af7

6 files changed

+27
-14
lines changed

‎pkg/ibmvpc/examples/out/diff_out/acl_testing3_all_vpcs_endpointsDiff.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
| type | src | dst | conn1 | conn2 | vsis-diff-info |
44
|------|-----|------|-------|-------|----------------|
55
| changed | vsi2-ky[10.240.20.4] | vsi1-ky[10.240.10.4] | All Connections | TCP * ; ICMP,UDP | |
6-
| removed | vsi1-ky[10.240.10.4] | Public Internet 161.26.0.0/16 | UDP | No Connections | |
6+
| removed | vsi1-ky[10.240.10.4] | Service Network 161.26.0.0/16 | UDP | No Connections | |
77
| removed | vsi1-ky[10.240.10.4] | vsi2-ky[10.240.20.4] | TCP,UDP | No Connections | |
88

99
TCP connections for which response is not permitted are marked with *

‎pkg/ibmvpc/examples/out/diff_out/acl_testing3_all_vpcs_endpointsDiff.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Connectivity diff between VPC test-vpc1-ky and VPC test-vpc2-ky
22
diff-type: changed, source: vsi2-ky[10.240.20.4], destination: vsi1-ky[10.240.10.4], config1: All Connections, config2: TCP * ; ICMP,UDP
3-
diff-type: removed, source: vsi1-ky[10.240.10.4], destination: Public Internet 161.26.0.0/16, config1: UDP, config2: No Connections
3+
diff-type: removed, source: vsi1-ky[10.240.10.4], destination: Service Network 161.26.0.0/16, config1: UDP, config2: No Connections
44
diff-type: removed, source: vsi1-ky[10.240.10.4], destination: vsi2-ky[10.240.20.4], config1: TCP,UDP, config2: No Connections
55

66
TCP connections for which response is not permitted are marked with *

‎pkg/ibmvpc/examples/out/diff_out/sg_testing1_copy_all_vpcs_endpointsDiff.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
Connectivity diff between VPC test-vpc1-ky and VPC test-vpc1-ky
2-
diff-type: changed, source: db-endpoint-gateway-ky[10.240.30.6], destination: Public Internet (all ranges), config1: All Connections, config2: TCP src-ports: 1-99,221-65535 * ; TCP src-ports: 100-220 dst-ports: 1-9,61-65535 * ; ICMP,UDP; TCP src-ports: 100-220 dst-ports: 10-60
2+
diff-type: changed, source: db-endpoint-gateway-ky[10.240.30.6], destination: Service Network (all ranges), config1: All Connections, config2: TCP src-ports: 1-99,221-65535 * ; TCP src-ports: 100-220 dst-ports: 1-9,61-65535 * ; ICMP,UDP; TCP src-ports: 100-220 dst-ports: 10-60
33
diff-type: changed, source: db-endpoint-gateway-ky[10.240.30.6], destination: vsi1-ky[10.240.10.4], config1: All Connections, config2: TCP src-ports: 1-99,201-65535 * ; TCP src-ports: 100-200 dst-ports: 1-9,51-65535 * ; ICMP,UDP; TCP src-ports: 100-200 dst-ports: 10-50
44
diff-type: changed, source: vsi2-ky[10.240.20.4], destination: vsi1-ky[10.240.10.4], config1: All Connections, config2: TCP src-ports: 1-99,201-65535 * ; TCP src-ports: 100-200 dst-ports: 51-65535 * ; ICMP,UDP; TCP src-ports: 100-200 dst-ports: 1-50
55
diff-type: changed, source: vsi2-ky[10.240.20.4], destination: vsi3b-ky[10.240.30.4], config1: TCP, config2: TCP src-ports: 10-60 dst-ports: 100-220
6-
diff-type: changed, source: vsi3a-ky[10.240.30.5], destination: Public Internet (all ranges), config1: All Connections, config2: TCP src-ports: 1-99,221-65535 * ; TCP src-ports: 100-220 dst-ports: 1-9,61-65535 * ; ICMP,UDP; TCP src-ports: 100-220 dst-ports: 10-60
6+
diff-type: changed, source: vsi3a-ky[10.240.30.5], destination: Service Network (all ranges), config1: All Connections, config2: TCP src-ports: 1-99,221-65535 * ; TCP src-ports: 100-220 dst-ports: 1-9,61-65535 * ; ICMP,UDP; TCP src-ports: 100-220 dst-ports: 10-60
77
diff-type: changed, source: vsi3a-ky[10.240.30.5], destination: vsi1-ky[10.240.10.4], config1: All Connections, config2: TCP src-ports: 1-99,201-65535 * ; TCP src-ports: 100-200 dst-ports: 1-9,51-65535 * ; ICMP,UDP; TCP src-ports: 100-200 dst-ports: 10-50
88
diff-type: changed, source: vsi3b-ky[10.240.30.4], destination: vsi1-ky[10.240.10.4], config1: All Connections, config2: TCP src-ports: 1-99,201-65535 * ; TCP src-ports: 100-200 dst-ports: 1-9,51-65535 * ; ICMP,UDP; TCP src-ports: 100-200 dst-ports: 10-50
99
diff-type: changed, source: vsi3b-ky[10.240.30.4], destination: vsi2-ky[10.240.20.4], config1: TCP, config2: TCP src-ports: 1-99,221-65535 * ; TCP src-ports: 100-220 dst-ports: 1-9,61-65535 * ; TCP src-ports: 100-220 dst-ports: 10-60
1010
diff-type: removed, source: vsi1-ky[10.240.10.4], destination: Public Internet 142.0.0.0/7, config1: ICMP, config2: No Connections
11-
diff-type: removed, source: vsi1-ky[10.240.10.4], destination: Public Internet 161.26.0.0/16, config1: UDP, config2: No Connections
11+
diff-type: removed, source: vsi1-ky[10.240.10.4], destination: Service Network 161.26.0.0/16, config1: UDP, config2: No Connections
1212

1313
TCP connections for which response is not permitted are marked with *

‎pkg/ibmvpc/examples/out/diff_out/sg_testing1_new_all_vpcs_endpointsDiff.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Connectivity diff between VPC test-vpc1-ky and VPC test-vpc1-ky
22
diff-type: removed, source: db-endpoint-gateway-ky[10.240.30.6], destination: vsi3a-ky[10.240.30.5], config1: All Connections, config2: No Connections, vsis-diff-info: vsi3a-ky[10.240.30.5] removed
33
diff-type: removed, source: vsi1-ky[10.240.10.4], destination: Public Internet 143.0.0.0/8, config1: ICMP, config2: No Connections
4-
diff-type: removed, source: vsi3a-ky[10.240.30.5], destination: Public Internet (all ranges), config1: All Connections, config2: No Connections, vsis-diff-info: vsi3a-ky[10.240.30.5] removed
4+
diff-type: removed, source: vsi3a-ky[10.240.30.5], destination: Service Network (all ranges), config1: All Connections, config2: No Connections, vsis-diff-info: vsi3a-ky[10.240.30.5] removed
55
diff-type: removed, source: vsi3a-ky[10.240.30.5], destination: db-endpoint-gateway-ky[10.240.30.6], config1: All Connections, config2: No Connections, vsis-diff-info: vsi3a-ky[10.240.30.5] removed
66
diff-type: removed, source: vsi3a-ky[10.240.30.5], destination: vsi1-ky[10.240.10.4], config1: All Connections, config2: No Connections, vsis-diff-info: vsi3a-ky[10.240.30.5] removed
77
diff-type: removed, source: vsi3b-ky[10.240.30.4], destination: vsi3a-ky[10.240.30.5], config1: All Connections, config2: No Connections, vsis-diff-info: vsi3a-ky[10.240.30.5] removed

‎pkg/ibmvpc/examples/out/diff_out/sg_testing_3_all_vpcs_endpointsDiff.txt

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,23 @@
11
Connectivity diff between VPC test-vpc-ky and VPC test-vpc1-ky
2-
diff-type: added, source: Public Internet 1.0.0.0-9.255.255.255,11.0.0.0-100.63.255.255,100.128.0.0-126.255.255.255,128.0.0.0-169.253.255.255,169.255.0.0-172.15.255.255,172.32.0.0-191.255.255.255,192.0.1.0/24,192.0.3.0-192.88.98.255,192.88.100.0-192.167.255.255,192.169.0.0-198.17.255.255,198.20.0.0-198.51.99.255,198.51.101.0-203.0.112.255,203.0.114.0-223.255.255.255, destination: vsi2-ky[10.240.20.4], config1: No Connections, config2: All Connections, vsis-diff-info: vsi2-ky[10.240.20.4] added
3-
diff-type: added, source: db-endpoint-gateway-ky[10.240.30.6], destination: Public Internet (all ranges), config1: No Connections, config2: All Connections, vsis-diff-info: db-endpoint-gateway-ky[10.240.30.6] added
2+
diff-type: added, source: Public Internet (all ranges), destination: vsi2-ky[10.240.20.4], config1: No Connections, config2: All Connections, vsis-diff-info: vsi2-ky[10.240.20.4] added
3+
diff-type: added, source: Service Network (all ranges), destination: vsi2-ky[10.240.20.4], config1: No Connections, config2: All Connections, vsis-diff-info: vsi2-ky[10.240.20.4] added
4+
diff-type: added, source: db-endpoint-gateway-ky[10.240.30.6], destination: Service Network (all ranges), config1: No Connections, config2: All Connections, vsis-diff-info: db-endpoint-gateway-ky[10.240.30.6] added
45
diff-type: added, source: db-endpoint-gateway-ky[10.240.30.6], destination: vsi2-ky[10.240.20.4], config1: No Connections, config2: All Connections, vsis-diff-info: db-endpoint-gateway-ky[10.240.30.6] and vsi2-ky[10.240.20.4] added
56
diff-type: added, source: db-endpoint-gateway-ky[10.240.30.6], destination: vsi3b-ky[10.240.30.4], config1: No Connections, config2: All Connections, vsis-diff-info: db-endpoint-gateway-ky[10.240.30.6] and vsi3b-ky[10.240.30.4] added
6-
diff-type: added, source: vsi1-ky[10.240.10.4], destination: Public Internet 1.0.0.0-9.255.255.255,11.0.0.0-100.63.255.255,100.128.0.0-126.255.255.255,128.0.0.0-169.253.255.255,169.255.0.0-172.15.255.255,172.32.0.0-191.255.255.255,192.0.1.0/24,192.0.3.0-192.88.98.255,192.88.100.0-192.167.255.255,192.169.0.0-198.17.255.255,198.20.0.0-198.51.99.255,198.51.101.0-203.0.112.255,203.0.114.0-223.255.255.255, config1: No Connections, config2: All Connections, vsis-diff-info: vsi1-ky[10.240.10.4] added
7+
diff-type: added, source: vsi1-ky[10.240.10.4], destination: Public Internet (all ranges), config1: No Connections, config2: All Connections, vsis-diff-info: vsi1-ky[10.240.10.4] added
8+
diff-type: added, source: vsi1-ky[10.240.10.4], destination: Service Network (all ranges), config1: No Connections, config2: All Connections, vsis-diff-info: vsi1-ky[10.240.10.4] added
79
diff-type: added, source: vsi1-ky[10.240.10.4], destination: vsi2-ky[10.240.20.4], config1: No Connections, config2: All Connections, vsis-diff-info: vsi1-ky[10.240.10.4] and vsi2-ky[10.240.20.4] added
810
diff-type: added, source: vsi1-ky[10.240.10.4], destination: vsi3b-ky[10.240.30.4], config1: No Connections, config2: All Connections, vsis-diff-info: vsi1-ky[10.240.10.4] and vsi3b-ky[10.240.30.4] added
9-
diff-type: added, source: vsi2-ky[10.240.20.4], destination: Public Internet 1.0.0.0-9.255.255.255,11.0.0.0-100.63.255.255,100.128.0.0-126.255.255.255,128.0.0.0-169.253.255.255,169.255.0.0-172.15.255.255,172.32.0.0-191.255.255.255,192.0.1.0/24,192.0.3.0-192.88.98.255,192.88.100.0-192.167.255.255,192.169.0.0-198.17.255.255,198.20.0.0-198.51.99.255,198.51.101.0-203.0.112.255,203.0.114.0-223.255.255.255, config1: No Connections, config2: All Connections, vsis-diff-info: vsi2-ky[10.240.20.4] added
11+
diff-type: added, source: vsi2-ky[10.240.20.4], destination: Public Internet (all ranges), config1: No Connections, config2: All Connections, vsis-diff-info: vsi2-ky[10.240.20.4] added
12+
diff-type: added, source: vsi2-ky[10.240.20.4], destination: Service Network (all ranges), config1: No Connections, config2: All Connections, vsis-diff-info: vsi2-ky[10.240.20.4] added
1013
diff-type: added, source: vsi2-ky[10.240.20.4], destination: vsi3b-ky[10.240.30.4], config1: No Connections, config2: All Connections, vsis-diff-info: vsi2-ky[10.240.20.4] and vsi3b-ky[10.240.30.4] added
11-
diff-type: added, source: vsi3a-ky[10.240.30.5], destination: Public Internet (all ranges), config1: No Connections, config2: All Connections, vsis-diff-info: vsi3a-ky[10.240.30.5] added
14+
diff-type: added, source: vsi3a-ky[10.240.30.5], destination: Service Network (all ranges), config1: No Connections, config2: All Connections, vsis-diff-info: vsi3a-ky[10.240.30.5] added
1215
diff-type: added, source: vsi3a-ky[10.240.30.5], destination: vsi2-ky[10.240.20.4], config1: No Connections, config2: All Connections, vsis-diff-info: vsi3a-ky[10.240.30.5] and vsi2-ky[10.240.20.4] added
1316
diff-type: added, source: vsi3a-ky[10.240.30.5], destination: vsi3b-ky[10.240.30.4], config1: No Connections, config2: All Connections, vsis-diff-info: vsi3a-ky[10.240.30.5] and vsi3b-ky[10.240.30.4] added
14-
diff-type: added, source: vsi3b-ky[10.240.30.4], destination: Public Internet (all ranges), config1: No Connections, config2: All Connections, vsis-diff-info: vsi3b-ky[10.240.30.4] added
17+
diff-type: added, source: vsi3b-ky[10.240.30.4], destination: Service Network (all ranges), config1: No Connections, config2: All Connections, vsis-diff-info: vsi3b-ky[10.240.30.4] added
1518
diff-type: added, source: vsi3b-ky[10.240.30.4], destination: vsi2-ky[10.240.20.4], config1: No Connections, config2: All Connections, vsis-diff-info: vsi3b-ky[10.240.30.4] and vsi2-ky[10.240.20.4] added
16-
diff-type: removed, source: Public Internet 1.0.0.0-9.255.255.255,11.0.0.0-100.63.255.255,100.128.0.0-126.255.255.255,128.0.0.0-169.253.255.255,169.255.0.0-172.15.255.255,172.32.0.0-191.255.255.255,192.0.1.0/24,192.0.3.0-192.88.98.255,192.88.100.0-192.167.255.255,192.169.0.0-198.17.255.255,198.20.0.0-198.51.99.255,198.51.101.0-203.0.112.255,203.0.114.0-223.255.255.255, destination: proxy-ky[10.240.0.4], config1: All Connections, config2: No Connections, vsis-diff-info: proxy-ky[10.240.0.4] removed
19+
diff-type: removed, source: Public Internet (all ranges), destination: proxy-ky[10.240.0.4], config1: All Connections, config2: No Connections, vsis-diff-info: proxy-ky[10.240.0.4] removed
20+
diff-type: removed, source: Service Network (all ranges), destination: proxy-ky[10.240.0.4], config1: All Connections, config2: No Connections, vsis-diff-info: proxy-ky[10.240.0.4] removed
1721
diff-type: removed, source: be-ky[10.240.128.5], destination: opa-ky[10.240.128.4], config1: TCP dst-ports: 8181, config2: No Connections, vsis-diff-info: be-ky[10.240.128.5] and opa-ky[10.240.128.4] removed
1822
diff-type: removed, source: be-ky[10.240.128.5], destination: policydb-endpoint-gateway[10.240.128.7], config1: TCP, config2: No Connections, vsis-diff-info: be-ky[10.240.128.5] and policydb-endpoint-gateway[10.240.128.7] removed
1923
diff-type: removed, source: be-ky[10.240.128.5], destination: policydb-endpoint-gateway[10.240.64.4], config1: TCP, config2: No Connections, vsis-diff-info: be-ky[10.240.128.5] and policydb-endpoint-gateway[10.240.64.4] removed

‎pkg/vpcmodel/semanticDiff.go

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -405,6 +405,11 @@ func resizeNodes(oldNodes []Node, disjointIPblocks []*netset.IPBlock) (newNodes
405405
// range over old nodes and inside range over disjoint blocks
406406
// if a disjoint block is contained in an old oldNode - create external oldNode and add it
407407
// if no disjoint block is contained in an old oldNode - add the old oldNode as is
408+
networkAddressLists := GetNetworkAddressList()
409+
_, serviceNetworkIPRanges, err := networkAddressLists.GetServiceNetworkIPblocksList()
410+
if err != nil {
411+
return nil, err
412+
}
408413
for _, oldNode := range oldNodes {
409414
if oldNode.IsInternal() {
410415
newNodes = append(newNodes, oldNode)
@@ -415,7 +420,11 @@ func resizeNodes(oldNodes []Node, disjointIPblocks []*netset.IPBlock) (newNodes
415420
if disjointIPBlock.IsSubset(oldNode.IPBlock()) {
416421
disjointContained = true
417422
for _, thisCidr := range disjointIPBlock.ToCidrList() {
418-
newNode, err := newExternalNodeForCidr(thisCidr, publicInternetNodeName)
423+
externalResourceType := publicInternetNodeName
424+
if disjointIPBlock.IsSubset(serviceNetworkIPRanges) {
425+
externalResourceType = serviceNetworkNodeName
426+
}
427+
newNode, err := newExternalNodeForCidr(thisCidr, externalResourceType)
419428
if err != nil {
420429
return nil, err
421430
}

0 commit comments

Comments
 (0)