NO-ISSUE: update vendor and mocks

openshift · Dec 25, 2024 · df68ea1 · df68ea1
1 parent d0cf7b5
commit df68ea1
Show file tree

Hide file tree

Showing 894 changed files with 2,611 additions and 5,409 deletions.
diff --git a/.gitignore b/.gitignore
@@ -6,3 +6,4 @@ subsystem/logs
 .project
 subsystem/data/*.leases*
 *.log
+**/junit_unit_test.xml
diff --git a/Dockerfile.assisted_installer_agent-build b/Dockerfile.assisted_installer_agent-build
@@ -6,7 +6,7 @@ RUN curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/i
         go install golang.org/x/tools/cmd/[email protected] && \
         go install github.com/onsi/ginkgo/[email protected] && \
         go install github.com/golang/mock/[email protected] && \
-        go install github.com/vektra/mockery/v2@v2.9.6 && \
+        go install github.com/vektra/mockery/v2@v2.39.2 && \
         go install gotest.tools/[email protected] && \
         go install github.com/axw/gocov/[email protected] && \
         go install github.com/AlekSi/[email protected]

diff --git a/pkg/journalLogger/mock_IJournalWriter.go b/pkg/journalLogger/mock_IJournalWriter.go
diff --git a/src/connectivity_check/connectivity_check_test.go b/src/connectivity_check/connectivity_check_test.go
@@ -218,7 +218,7 @@ var _ = Describe("check host parallel validation", func() {
 		It(t.name, func() {
 			d := setupDispather(t.simulateL2IPConflict, t.success, t.hosts.Nics)
 			ret, err := d.Run(models.ConnectivityCheckParams{t.hosts}, funk.Map(t.nics, func(s string) OutgoingNic {
-				return OutgoingNic{Name: s, HasIpv4Addresses: true, HasIpv6Addresses: true}
+				return OutgoingNic{Name: s, HasIpv4Addresses: true, HasIpv6Addresses: true, Addresses: getAddr("192.168.1.133", 24)}
 			}).([]OutgoingNic))
 			Expect(err).ToNot(HaveOccurred())
 			Expect(ret.RemoteHosts).To(HaveLen(1))
@@ -346,3 +346,13 @@ func TestConnectivityCheck(t *testing.T) {
 	RegisterFailHandler(Fail)
 	RunSpecs(t, "connectivity check tests")
 }
+
+func getAddr(addr string, mask int) []net.Addr {
+	localIP := net.ParseIP(addr)
+	localMask := net.CIDRMask(mask, 32)
+
+	return []net.Addr{&net.IPNet{
+		IP:   localIP,
+		Mask: localMask,
+	}}
+}
diff --git a/src/connectivity_check/ipv4_arping_checker_test.go b/src/connectivity_check/ipv4_arping_checker_test.go
@@ -55,7 +55,7 @@ Received 0 response(s)
 		attributes := Attributes{
 			RemoteIPAddress:    remoteIPAddress,
 			RemoteMACAddress:   remoteMACAddress,
-			OutgoingNIC:        OutgoingNic{Name: outgoingNIC, HasIpv4Addresses: true},
+			OutgoingNIC:        OutgoingNic{Name: outgoingNIC, HasIpv4Addresses: true, Addresses: getAddr(outgoingIPAddress, 24)},
 			RemoteMACAddresses: remoteMACAddresses,
 		}
 		mockFullReply(remoteIPAddress, remoteMACAddress)
@@ -84,7 +84,7 @@ Received 0 response(s)
 		attributes := Attributes{
 			RemoteIPAddress:    remoteIPAddress,
 			RemoteMACAddress:   remoteMACAddress,
-			OutgoingNIC:        OutgoingNic{Name: outgoingNIC, HasIpv4Addresses: true},
+			OutgoingNIC:        OutgoingNic{Name: outgoingNIC, HasIpv4Addresses: true, Addresses: getAddr(outgoingIPAddress, 24)},
 			RemoteMACAddresses: remoteMACAddresses,
 		}
 		mockFullReply(remoteIPAddress, secondaryMACAddress)
@@ -103,7 +103,7 @@ Received 0 response(s)
 		attributes := Attributes{
 			RemoteIPAddress:    remoteIPAddress,
 			RemoteMACAddress:   remoteMACAddress,
-			OutgoingNIC:        OutgoingNic{Name: outgoingNIC, HasIpv4Addresses: true},
+			OutgoingNIC:        OutgoingNic{Name: outgoingNIC, HasIpv4Addresses: true, Addresses: getAddr(outgoingIPAddress, 24)},
 			RemoteMACAddresses: remoteMACAddresses,
 		}
 		mockFullReply(remoteIPAddress, additionalMACAddress)
@@ -122,7 +122,7 @@ Received 0 response(s)
 		attributes := Attributes{
 			RemoteIPAddress:    remoteIPAddress,
 			RemoteMACAddress:   remoteMACAddress,
-			OutgoingNIC:        OutgoingNic{Name: outgoingNIC, HasIpv4Addresses: true},
+			OutgoingNIC:        OutgoingNic{Name: outgoingNIC, HasIpv4Addresses: true, Addresses: getAddr(outgoingIPAddress, 24)},
 			RemoteMACAddresses: remoteMACAddresses,
 		}
 		mockEmptyReply(remoteIPAddress)

diff --git a/src/connectivity_check/mock_Checker.go b/src/connectivity_check/mock_Checker.go
diff --git a/src/connectivity_check/mock_Executer.go b/src/connectivity_check/mock_Executer.go
diff --git a/src/connectivity_check/mock_ResultReporter.go b/src/connectivity_check/mock_ResultReporter.go
diff --git a/src/container_image_availability/mock_ImageAvailabilityDependencies.go b/src/container_image_availability/mock_ImageAvailabilityDependencies.go