diff options
| author |   Frank Kimmlingen <frank.kimmlingen@telekom.de> | 2024-01-16 16:30:56 +0100 |
|---|---|---|
| committer | Frank Kimmlingen <frank.kimmlingen@telekom.de> | 2024-01-18 16:49:35 +0100 |
| commit | bffa7655e2fbd73a3975b650a9ec955c8a9d7d2f (patch) | |
| tree | 29f61549509e1ec4a2efbbb094fb7e9153514200 /ms/blueprintsprocessor/functions/netconf-executor/src/test/kotlin/org | |
| parent | 5b924a33f2b7cd936aab934d706c8f735f7570d6 (diff) | |
reduce CDS java security vulnerabilities
upgrade to spring-boot 2.7.18 (Last spring-boot 2.x version)
upgrade the additional versions inside the cds
Issue-ID: CCSDK-3981
Signed-off-by: Frank Kimmlingen <frank.kimmlingen@telekom.de>
Change-Id: I239fbdb8b6f58095d805399c6f9ed3af6e7b42fe
Diffstat (limited to 'ms/blueprintsprocessor/functions/netconf-executor/src/test/kotlin/org')
| -rw-r--r-- | ms/blueprintsprocessor/functions/netconf-executor/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/netconf/executor/core/NetconfSessionImplTest.kt | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ms/blueprintsprocessor/functions/netconf-executor/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/netconf/executor/core/NetconfSessionImplTest.kt b/ms/blueprintsprocessor/functions/netconf-executor/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/netconf/executor/core/NetconfSessionImplTest.kt index 41e4f8290..22c68f182 100644 --- a/ms/blueprintsprocessor/functions/netconf-executor/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/netconf/executor/core/NetconfSessionImplTest.kt +++ b/ms/blueprintsprocessor/functions/netconf-executor/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/netconf/executor/core/NetconfSessionImplTest.kt @@ -30,7 +30,7 @@ import org.apache.sshd.client.future.DefaultAuthFuture import org.apache.sshd.client.future.DefaultConnectFuture import org.apache.sshd.client.future.DefaultOpenFuture import org.apache.sshd.client.session.ClientSession -import org.apache.sshd.common.FactoryManager +import org.apache.sshd.core.CoreModuleProperties import org.junit.Before import org.junit.Test import org.onap.ccsdk.cds.blueprintsprocessor.functions.netconf.executor.api.DeviceInfo @@ -385,8 +385,8 @@ class NetconfSessionImplTest { netconfSessionSpy.setClient(mockSshClient) netconfSessionSpy.connect() verify { mockSshClient.start() } - assertTrue { propertiesMap.containsKey(FactoryManager.IDLE_TIMEOUT) } - assertTrue { propertiesMap.containsKey(FactoryManager.NIO2_READ_TIMEOUT) } + assertTrue { propertiesMap.containsKey(CoreModuleProperties.IDLE_TIMEOUT.name) } + assertTrue { propertiesMap.containsKey(CoreModuleProperties.NIO2_READ_TIMEOUT.name) } } @Test @@ -429,7 +429,7 @@ class NetconfSessionImplTest { val succeededSessionFuture = DefaultConnectFuture(Any(), Any()) succeededSessionFuture.value = mockClientSession every { mockSshClient.connect(deviceInfo.username, deviceInfo.ipAddress, deviceInfo.port) } returns succeededSessionFuture - every { mockClientSession.waitFor(any(), any()) } returns + every { mockClientSession.waitFor(any(), any<Long>()) } returns setOf(ClientSession.ClientSessionEvent.WAIT_AUTH, ClientSession.ClientSessionEvent.CLOSED) val netconfSessionSpy = spyk(netconfSession, recordPrivateCalls = true) every { netconfSessionSpy["setupNewSSHClient"]() as Unit } just Runs @@ -451,7 +451,7 @@ class NetconfSessionImplTest { val succeededSessionFuture = DefaultConnectFuture(Any(), Any()) succeededSessionFuture.value = mockClientSession every { mockSshClient.connect(deviceInfo.username, deviceInfo.ipAddress, deviceInfo.port) } returns succeededSessionFuture - every { mockClientSession.waitFor(any(), any()) } returns + every { mockClientSession.waitFor(any(), any<Long>()) } returns setOf( ClientSession.ClientSessionEvent.WAIT_AUTH, ClientSession.ClientSessionEvent.CLOSED, |