You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by tp...@apache.org on 2021/12/06 20:02:06 UTC
[nifi] branch main updated: NIFI-9447: Fix SNMP related tests to find available UDP ports instead of TCP
This is an automated email from the ASF dual-hosted git repository.
tpalfy pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/main by this push:
new 1eb4264 NIFI-9447: Fix SNMP related tests to find available UDP ports instead of TCP
1eb4264 is described below
commit 1eb4264e3469069a665ac87868515c8b973e3dc3
Author: Lehel <Le...@hotmail.com>
AuthorDate: Mon Dec 6 19:24:59 2021 +0100
NIFI-9447: Fix SNMP related tests to find available UDP ports instead of TCP
This closes #5576.
Signed-off-by: Tamas Palfy <ta...@gmail.com>
---
.../nifi/snmp/configuration/SNMPConfigurationTest.java | 2 +-
.../apache/nifi/snmp/factory/core/V1V2cSNMPFactoryTest.java | 12 ++++++------
.../org/apache/nifi/snmp/factory/core/V3SNMPFactoryTest.java | 12 ++++++------
.../nifi/snmp/operations/SNMPTrapReceiverHandlerTest.java | 6 +++---
.../nifi/snmp/processors/AbstractSNMPProcessorTest.java | 2 +-
.../java/org/apache/nifi/snmp/processors/GetSNMPTest.java | 4 ++--
.../apache/nifi/snmp/processors/TrapSNMPIntegrationTest.java | 4 ++--
7 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/nifi-nar-bundles/nifi-snmp-bundle/nifi-snmp-processors/src/test/java/org/apache/nifi/snmp/configuration/SNMPConfigurationTest.java b/nifi-nar-bundles/nifi-snmp-bundle/nifi-snmp-processors/src/test/java/org/apache/nifi/snmp/configuration/SNMPConfigurationTest.java
index e5cd4d3..b30b1c6 100644
--- a/nifi-nar-bundles/nifi-snmp-bundle/nifi-snmp-processors/src/test/java/org/apache/nifi/snmp/configuration/SNMPConfigurationTest.java
+++ b/nifi-nar-bundles/nifi-snmp-bundle/nifi-snmp-processors/src/test/java/org/apache/nifi/snmp/configuration/SNMPConfigurationTest.java
@@ -32,7 +32,7 @@ import static org.junit.Assert.assertEquals;
public class SNMPConfigurationTest {
- private static final int MANAGER_PORT = NetworkUtils.availablePort();
+ private static final int MANAGER_PORT = NetworkUtils.getAvailableUdpPort();
private static final String TARGET_PORT = "55556";
private static final int RETRIES = 3;
private static final int VERSION = SnmpConstants.version3;
diff --git a/nifi-nar-bundles/nifi-snmp-bundle/nifi-snmp-processors/src/test/java/org/apache/nifi/snmp/factory/core/V1V2cSNMPFactoryTest.java b/nifi-nar-bundles/nifi-snmp-bundle/nifi-snmp-processors/src/test/java/org/apache/nifi/snmp/factory/core/V1V2cSNMPFactoryTest.java
index 281bbec..5998242 100644
--- a/nifi-nar-bundles/nifi-snmp-bundle/nifi-snmp-processors/src/test/java/org/apache/nifi/snmp/factory/core/V1V2cSNMPFactoryTest.java
+++ b/nifi-nar-bundles/nifi-snmp-bundle/nifi-snmp-processors/src/test/java/org/apache/nifi/snmp/factory/core/V1V2cSNMPFactoryTest.java
@@ -39,8 +39,8 @@ public class V1V2cSNMPFactoryTest {
@Test
public void testFactoryCreatesV1V2Configuration() {
final V1V2cSNMPFactory snmpFactory = new V1V2cSNMPFactory();
- final int managerPort = NetworkUtils.availablePort();
- final String targetPort = String.valueOf(NetworkUtils.availablePort());
+ final int managerPort = NetworkUtils.getAvailableUdpPort();
+ final String targetPort = String.valueOf(NetworkUtils.getAvailableUdpPort());
final SNMPConfiguration snmpConfiguration = getSnmpConfiguration(managerPort, targetPort);
final Target target = snmpFactory.createTargetInstance(snmpConfiguration);
@@ -55,8 +55,8 @@ public class V1V2cSNMPFactoryTest {
@Test
public void testFactoryCreatesSnmpManager() {
final V1V2cSNMPFactory snmpFactory = new V1V2cSNMPFactory();
- final int managerPort = NetworkUtils.availablePort();
- final String targetPort = String.valueOf(NetworkUtils.availablePort());
+ final int managerPort = NetworkUtils.getAvailableUdpPort();
+ final String targetPort = String.valueOf(NetworkUtils.getAvailableUdpPort());
final SNMPConfiguration snmpConfiguration = getSnmpConfiguration(managerPort, targetPort);
final Snmp snmpManager = snmpFactory.createSnmpManagerInstance(snmpConfiguration);
@@ -68,8 +68,8 @@ public class V1V2cSNMPFactoryTest {
@Test
public void testFactoryCreatesResourceHandler() {
final V1V2cSNMPFactory snmpFactory = spy(V1V2cSNMPFactory.class);
- final int managerPort = NetworkUtils.availablePort();
- final String targetPort = String.valueOf(NetworkUtils.availablePort());
+ final int managerPort = NetworkUtils.getAvailableUdpPort();
+ final String targetPort = String.valueOf(NetworkUtils.getAvailableUdpPort());
final SNMPConfiguration snmpConfiguration = getSnmpConfiguration(managerPort, targetPort);
snmpFactory.createSNMPResourceHandler(snmpConfiguration);
diff --git a/nifi-nar-bundles/nifi-snmp-bundle/nifi-snmp-processors/src/test/java/org/apache/nifi/snmp/factory/core/V3SNMPFactoryTest.java b/nifi-nar-bundles/nifi-snmp-bundle/nifi-snmp-processors/src/test/java/org/apache/nifi/snmp/factory/core/V3SNMPFactoryTest.java
index 7962389..7e771a9 100644
--- a/nifi-nar-bundles/nifi-snmp-bundle/nifi-snmp-processors/src/test/java/org/apache/nifi/snmp/factory/core/V3SNMPFactoryTest.java
+++ b/nifi-nar-bundles/nifi-snmp-bundle/nifi-snmp-processors/src/test/java/org/apache/nifi/snmp/factory/core/V3SNMPFactoryTest.java
@@ -49,8 +49,8 @@ public class V3SNMPFactoryTest {
@Test
public void testFactoryCreatesTarget() {
final V3SNMPFactory snmpFactory = new V3SNMPFactory();
- final int managerPort = NetworkUtils.availablePort();
- final String targetPort = String.valueOf(NetworkUtils.availablePort());
+ final int managerPort = NetworkUtils.getAvailableUdpPort();
+ final String targetPort = String.valueOf(NetworkUtils.getAvailableUdpPort());
final SNMPConfiguration snmpConfiguration = getSnmpConfiguration(managerPort, targetPort);
final Target target = snmpFactory.createTargetInstance(snmpConfiguration);
@@ -65,8 +65,8 @@ public class V3SNMPFactoryTest {
@Test
public void testFactoryCreatesSnmpManager() {
final V3SNMPFactory snmpFactory = new V3SNMPFactory();
- final int managerPort = NetworkUtils.availablePort();
- final String targetPort = String.valueOf(NetworkUtils.availablePort());
+ final int managerPort = NetworkUtils.getAvailableUdpPort();
+ final String targetPort = String.valueOf(NetworkUtils.getAvailableUdpPort());
final SNMPConfiguration snmpConfiguration = getSnmpConfiguration(managerPort, targetPort);
final Snmp snmpManager = snmpFactory.createSnmpManagerInstance(snmpConfiguration);
@@ -80,8 +80,8 @@ public class V3SNMPFactoryTest {
@Test
public void testFactoryCreatesResourceHandler() {
final V3SNMPFactory snmpFactory = spy(V3SNMPFactory.class);
- final int managerPort = NetworkUtils.availablePort();
- final String targetPort = String.valueOf(NetworkUtils.availablePort());
+ final int managerPort = NetworkUtils.getAvailableUdpPort();
+ final String targetPort = String.valueOf(NetworkUtils.getAvailableUdpPort());
final SNMPConfiguration snmpConfiguration = getSnmpConfiguration(managerPort, targetPort);
snmpFactory.createSNMPResourceHandler(snmpConfiguration);
diff --git a/nifi-nar-bundles/nifi-snmp-bundle/nifi-snmp-processors/src/test/java/org/apache/nifi/snmp/operations/SNMPTrapReceiverHandlerTest.java b/nifi-nar-bundles/nifi-snmp-bundle/nifi-snmp-processors/src/test/java/org/apache/nifi/snmp/operations/SNMPTrapReceiverHandlerTest.java
index 795c4ea..25a20ea 100644
--- a/nifi-nar-bundles/nifi-snmp-bundle/nifi-snmp-processors/src/test/java/org/apache/nifi/snmp/operations/SNMPTrapReceiverHandlerTest.java
+++ b/nifi-nar-bundles/nifi-snmp-bundle/nifi-snmp-processors/src/test/java/org/apache/nifi/snmp/operations/SNMPTrapReceiverHandlerTest.java
@@ -58,7 +58,7 @@ public class SNMPTrapReceiverHandlerTest {
final ProcessSessionFactory mockProcessSessionFactory = mock(ProcessSessionFactory.class);
final MockComponentLog mockComponentLog = new MockComponentLog("componentId", new Object());
final Snmp mockSnmpManager = mock(Snmp.class);
- when(snmpConfiguration.getManagerPort()).thenReturn(NetworkUtils.availablePort());
+ when(snmpConfiguration.getManagerPort()).thenReturn(NetworkUtils.getAvailableUdpPort());
when(snmpConfiguration.getVersion()).thenReturn(SnmpConstants.version1);
final SNMPTrapReceiverHandler trapReceiverHandler = new SNMPTrapReceiverHandler(snmpConfiguration, null);
@@ -80,7 +80,7 @@ public class SNMPTrapReceiverHandlerTest {
final Snmp mockSnmpManager = mock(Snmp.class);
when(mockSnmpManager.getUSM()).thenReturn(mockUsm);
- when(snmpConfiguration.getManagerPort()).thenReturn(NetworkUtils.availablePort());
+ when(snmpConfiguration.getManagerPort()).thenReturn(NetworkUtils.getAvailableUdpPort());
when(snmpConfiguration.getVersion()).thenReturn(SnmpConstants.version1);
final SNMPTrapReceiverHandler trapReceiverHandler = new SNMPTrapReceiverHandler(snmpConfiguration, null);
@@ -118,7 +118,7 @@ public class SNMPTrapReceiverHandlerTest {
final Snmp mockSnmpManager = mock(Snmp.class);
final USM mockUsm = mock(USM.class);
- when(snmpConfiguration.getManagerPort()).thenReturn(NetworkUtils.availablePort());
+ when(snmpConfiguration.getManagerPort()).thenReturn(NetworkUtils.getAvailableUdpPort());
when(snmpConfiguration.getVersion()).thenReturn(SnmpConstants.version3);
doAnswer(invocation -> {
UsmUser usmUser = (UsmUser) invocation.getArgument(0);
diff --git a/nifi-nar-bundles/nifi-snmp-bundle/nifi-snmp-processors/src/test/java/org/apache/nifi/snmp/processors/AbstractSNMPProcessorTest.java b/nifi-nar-bundles/nifi-snmp-bundle/nifi-snmp-processors/src/test/java/org/apache/nifi/snmp/processors/AbstractSNMPProcessorTest.java
index a9b66a8..6622f87 100644
--- a/nifi-nar-bundles/nifi-snmp-bundle/nifi-snmp-processors/src/test/java/org/apache/nifi/snmp/processors/AbstractSNMPProcessorTest.java
+++ b/nifi-nar-bundles/nifi-snmp-bundle/nifi-snmp-processors/src/test/java/org/apache/nifi/snmp/processors/AbstractSNMPProcessorTest.java
@@ -53,7 +53,7 @@ public class AbstractSNMPProcessorTest {
@Before
public void init() {
- getTestRunner = new SNMPV1TestRunnerFactory().createSnmpGetTestRunner(NetworkUtils.availablePort(), TEST_OID, "GET");
+ getTestRunner = new SNMPV1TestRunnerFactory().createSnmpGetTestRunner(NetworkUtils.getAvailableUdpPort(), TEST_OID, "GET");
getSNMP = (GetSNMP) getTestRunner.getProcessor();
mockProcessContext = new MockProcessContext(getSNMP);
mockProcessSession = new MockProcessSession(new SharedSessionState(getSNMP, new AtomicLong(0L)), getSNMP);
diff --git a/nifi-nar-bundles/nifi-snmp-bundle/nifi-snmp-processors/src/test/java/org/apache/nifi/snmp/processors/GetSNMPTest.java b/nifi-nar-bundles/nifi-snmp-bundle/nifi-snmp-processors/src/test/java/org/apache/nifi/snmp/processors/GetSNMPTest.java
index 59ccb0f..2781255 100644
--- a/nifi-nar-bundles/nifi-snmp-bundle/nifi-snmp-processors/src/test/java/org/apache/nifi/snmp/processors/GetSNMPTest.java
+++ b/nifi-nar-bundles/nifi-snmp-bundle/nifi-snmp-processors/src/test/java/org/apache/nifi/snmp/processors/GetSNMPTest.java
@@ -36,7 +36,7 @@ public class GetSNMPTest {
@Test
public void testOnTriggerWithGetStrategyPerformsSnmpGet() {
- final TestRunner getSnmpTestRunner = new SNMPV1TestRunnerFactory().createSnmpGetTestRunner(NetworkUtils.availablePort(), OID, "GET");
+ final TestRunner getSnmpTestRunner = new SNMPV1TestRunnerFactory().createSnmpGetTestRunner(NetworkUtils.getAvailableUdpPort(), OID, "GET");
final GetSNMP spyGetSNMP = spy((GetSNMP) getSnmpTestRunner.getProcessor());
final MockProcessSession mockProcessSession = new MockProcessSession(new SharedSessionState(spyGetSNMP, new AtomicLong(0L)), spyGetSNMP);
@@ -49,7 +49,7 @@ public class GetSNMPTest {
@Test
public void testOnTriggerWithWalkStrategyPerformsSnmpWalk() {
- final TestRunner getSnmpTestRunner = new SNMPV1TestRunnerFactory().createSnmpGetTestRunner(NetworkUtils.availablePort(), OID, "WALK");
+ final TestRunner getSnmpTestRunner = new SNMPV1TestRunnerFactory().createSnmpGetTestRunner(NetworkUtils.getAvailableUdpPort(), OID, "WALK");
final GetSNMP spyGetSNMP = spy((GetSNMP) getSnmpTestRunner.getProcessor());
final MockProcessSession mockProcessSession = new MockProcessSession(new SharedSessionState(spyGetSNMP, new AtomicLong(0L)), spyGetSNMP);
diff --git a/nifi-nar-bundles/nifi-snmp-bundle/nifi-snmp-processors/src/test/java/org/apache/nifi/snmp/processors/TrapSNMPIntegrationTest.java b/nifi-nar-bundles/nifi-snmp-bundle/nifi-snmp-processors/src/test/java/org/apache/nifi/snmp/processors/TrapSNMPIntegrationTest.java
index b5b0f62..ab5c41b 100644
--- a/nifi-nar-bundles/nifi-snmp-bundle/nifi-snmp-processors/src/test/java/org/apache/nifi/snmp/processors/TrapSNMPIntegrationTest.java
+++ b/nifi-nar-bundles/nifi-snmp-bundle/nifi-snmp-processors/src/test/java/org/apache/nifi/snmp/processors/TrapSNMPIntegrationTest.java
@@ -40,7 +40,7 @@ public class TrapSNMPIntegrationTest {
@Test
public void testSendReceiveV1Trap() throws InterruptedException {
- final int listenPort = NetworkUtils.availablePort();
+ final int listenPort = NetworkUtils.getAvailableUdpPort();
final V1TrapConfiguration v1TrapConfiguration = TrapConfigurationFactory.getV1TrapConfiguration();
final SNMPTestRunnerFactory v1TestRunnerFactory = new SNMPV1TestRunnerFactory();
@@ -72,7 +72,7 @@ public class TrapSNMPIntegrationTest {
@Test
public void testSendReceiveV2Trap() throws InterruptedException {
- final int listenPort = NetworkUtils.availablePort();
+ final int listenPort = NetworkUtils.getAvailableUdpPort();
final V2TrapConfiguration v2TrapConfiguration = TrapConfigurationFactory.getV2TrapConfiguration();
final SNMPTestRunnerFactory v2cTestRunnerFactory = new SNMPV2cTestRunnerFactory();