Skip to content

Commit aaf2f5a

Browse files
olasaadi99olasaadi99
committed
fix diff
1 parent ce1ef1e commit aaf2f5a

File tree

5 files changed

+20
-11
lines changed

5 files changed

+20
-11
lines changed

‎pkg/ibmvpc/analysis_output_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -809,6 +809,7 @@ func TestUnsupportedAnalysis(t *testing.T) {
809809
// tests is the list of tests to run
810810
for testIdx := range tests {
811811
tt := tests[testIdx]
812+
vpcmodel.InitNetworkAddressLists(GetPublicInternetAddressList(), GetServiceNetworkAddressList())
812813
tt.TestAnalysisSingleTest(t, tt.Mode, &IBMresourcesContainer{}, analysisOut, tt.Name)
813814
}
814815
fmt.Println("done")

‎pkg/ibmvpc/diff_test.go

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -95,14 +95,15 @@ var diffTests = []*testfunc.VpcDiffTest{
9595
// uncomment the function below to run for updating the expected output
9696

9797
/*
98-
func TestDiffWithGeneration(t *testing.T) {
99-
// tests is the list of tests to run
100-
for testIdx := range diffTests {
101-
tt := diffTests[testIdx]
102-
tt.TestDiffSingle(t, testfunc.OutputGeneration, &IBMresourcesContainer{}, diffOut, tt.InputConfig)
98+
func TestDiffWithGeneration(t *testing.T) {
99+
// tests is the list of tests to run
100+
for testIdx := range diffTests {
101+
tt := diffTests[testIdx]
102+
vpcmodel.InitNetworkAddressLists(GetPublicInternetAddressList(), GetServiceNetworkAddressList())
103+
tt.TestDiffSingle(t, testfunc.OutputGeneration, &IBMresourcesContainer{}, diffOut, tt.InputConfig)
104+
}
105+
fmt.Println("done")
103106
}
104-
fmt.Println("done")
105-
}
106107
*/
107108

108109
const diffOut = "diff_out"
@@ -111,6 +112,7 @@ func TestDiffWithComparison(t *testing.T) {
111112
// tests is the list of tests to run
112113
for testIdx := range diffTests {
113114
tt := diffTests[testIdx]
115+
vpcmodel.InitNetworkAddressLists(GetPublicInternetAddressList(), GetServiceNetworkAddressList())
114116
tt.TestDiffSingle(t, testfunc.OutputComparison, &IBMresourcesContainer{}, diffOut, tt.InputConfig)
115117
}
116118
fmt.Println("done")

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
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
23
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
34
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
45
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
57
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
68
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
79
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

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +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
45
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
56
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
67
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: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,19 @@
11
Connectivity diff between VPC test-vpc-ky and VPC test-vpc1-ky
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
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
34
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
45
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
5-
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
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
67
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
78
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
8-
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
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
910
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
1012
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
1113
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
1215
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
13-
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
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
1417
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
1518
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
1619
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

0 commit comments

Comments
 (0)