diff --git a/nifi-nar-bundles/nifi-snmp-bundle/nifi-snmp-processors/src/main/java/org/apache/nifi/snmp/factory/core/SNMPManagerFactory.java b/nifi-nar-bundles/nifi-snmp-bundle/nifi-snmp-processors/src/main/java/org/apache/nifi/snmp/factory/core/SNMPManagerFactory.java index 17afbb0607..464dd842a6 100644 --- a/nifi-nar-bundles/nifi-snmp-bundle/nifi-snmp-processors/src/main/java/org/apache/nifi/snmp/factory/core/SNMPManagerFactory.java +++ b/nifi-nar-bundles/nifi-snmp-bundle/nifi-snmp-processors/src/main/java/org/apache/nifi/snmp/factory/core/SNMPManagerFactory.java @@ -26,13 +26,11 @@ import java.io.IOException; public class SNMPManagerFactory { - private static final String LOCALHOST = "127.0.0.1"; - public Snmp createSnmpManagerInstance(final SNMPConfiguration configuration) { - final String managerAddress = LOCALHOST + "/" + configuration.getManagerPort(); + final int port = configuration.getManagerPort(); final Snmp snmpManager; try { - snmpManager = new Snmp(new DefaultUdpTransportMapping(new UdpAddress(managerAddress))); + snmpManager = new Snmp(new DefaultUdpTransportMapping(new UdpAddress(port))); snmpManager.listen(); } catch (IOException e) { throw new ProcessException(e); 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 b30b1c6b2c..656ffa77e2 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 @@ -21,7 +21,7 @@ import org.junit.Test; import org.snmp4j.mp.SnmpConstants; import static org.apache.nifi.snmp.helper.configurations.SNMPConfigurationFactory.COMMUNITY_STRING; -import static org.apache.nifi.snmp.helper.configurations.SNMPConfigurationFactory.DEFAULT_HOST; +import static org.apache.nifi.snmp.helper.configurations.SNMPConfigurationFactory.LOCALHOST; import static org.apache.nifi.snmp.helper.configurations.SNMPV3ConfigurationFactory.AUTH_PASSPHRASE; import static org.apache.nifi.snmp.helper.configurations.SNMPV3ConfigurationFactory.AUTH_PROTOCOL; import static org.apache.nifi.snmp.helper.configurations.SNMPV3ConfigurationFactory.PRIV_PASSPHRASE; @@ -42,7 +42,7 @@ public class SNMPConfigurationTest { public void testMembersAreSetCorrectly() { final SNMPConfiguration snmpConfiguration = SNMPConfiguration.builder() .setManagerPort(MANAGER_PORT) - .setTargetHost(DEFAULT_HOST) + .setTargetHost(LOCALHOST) .setTargetPort(TARGET_PORT) .setRetries(RETRIES) .setTimeoutInMs(TIMEOUT_IN_MS) @@ -57,7 +57,7 @@ public class SNMPConfigurationTest { .build(); assertEquals(MANAGER_PORT, snmpConfiguration.getManagerPort()); - assertEquals(DEFAULT_HOST, snmpConfiguration.getTargetHost()); + assertEquals(LOCALHOST, snmpConfiguration.getTargetHost()); assertEquals(TARGET_PORT, snmpConfiguration.getTargetPort()); assertEquals(RETRIES, snmpConfiguration.getRetries()); assertEquals(TIMEOUT_IN_MS, snmpConfiguration.getTimeoutInMs()); 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 5998242af1..7da6426ff9 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 @@ -25,7 +25,7 @@ import org.snmp4j.Snmp; import org.snmp4j.Target; import org.snmp4j.security.SecurityLevel; -import static org.apache.nifi.snmp.helper.configurations.SNMPConfigurationFactory.DEFAULT_HOST; +import static org.apache.nifi.snmp.helper.configurations.SNMPConfigurationFactory.LOCALHOST; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.IsInstanceOf.instanceOf; import static org.junit.Assert.assertEquals; @@ -46,7 +46,7 @@ public class V1V2cSNMPFactoryTest { final Target target = snmpFactory.createTargetInstance(snmpConfiguration); assertThat(target, instanceOf(CommunityTarget.class)); - assertEquals(DEFAULT_HOST + "/" + targetPort, target.getAddress().toString()); + assertEquals(LOCALHOST + "/" + targetPort, target.getAddress().toString()); assertEquals(RETRIES, target.getRetries()); assertEquals(1, target.getSecurityLevel()); assertEquals(StringUtils.EMPTY, target.getSecurityName().toString()); @@ -62,7 +62,7 @@ public class V1V2cSNMPFactoryTest { final Snmp snmpManager = snmpFactory.createSnmpManagerInstance(snmpConfiguration); final String address = snmpManager.getMessageDispatcher().getTransportMappings().iterator().next().getListenAddress().toString(); - assertEquals(DEFAULT_HOST + "/" + managerPort, address); + assertEquals("0.0.0.0" + "/" + managerPort, address); } @Test @@ -82,7 +82,7 @@ public class V1V2cSNMPFactoryTest { return new SNMPConfiguration.Builder() .setRetries(RETRIES) .setManagerPort(managerPort) - .setTargetHost(DEFAULT_HOST) + .setTargetHost(LOCALHOST) .setTargetPort(targetPort) .setSecurityLevel(SecurityLevel.noAuthNoPriv.name()) .build(); 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 7e771a9f01..e2c48dc0af 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 @@ -28,7 +28,7 @@ import org.snmp4j.security.USM; import org.snmp4j.smi.Integer32; import org.snmp4j.smi.OctetString; -import static org.apache.nifi.snmp.helper.configurations.SNMPConfigurationFactory.DEFAULT_HOST; +import static org.apache.nifi.snmp.helper.configurations.SNMPConfigurationFactory.LOCALHOST; import static org.apache.nifi.snmp.helper.configurations.SNMPV3ConfigurationFactory.AUTH_PASSPHRASE; import static org.apache.nifi.snmp.helper.configurations.SNMPV3ConfigurationFactory.AUTH_PROTOCOL; import static org.apache.nifi.snmp.helper.configurations.SNMPV3ConfigurationFactory.PRIV_PASSPHRASE; @@ -56,7 +56,7 @@ public class V3SNMPFactoryTest { final Target target = snmpFactory.createTargetInstance(snmpConfiguration); assertThat(target, instanceOf(UserTarget.class)); - assertEquals(DEFAULT_HOST + "/" + targetPort, target.getAddress().toString()); + assertEquals(LOCALHOST + "/" + targetPort, target.getAddress().toString()); assertEquals(RETRIES, target.getRetries()); assertEquals(EXPECTED_SECURITY_LEVEL, target.getSecurityLevel()); assertEquals(SECURITY_NAME, target.getSecurityName().toString()); @@ -73,7 +73,7 @@ public class V3SNMPFactoryTest { final String address = snmpManager.getMessageDispatcher().getTransportMappings().iterator().next().getListenAddress().toString(); USM usm = (USM) SecurityModels.getInstance().getSecurityModel(new Integer32(3)); - assertEquals(DEFAULT_HOST + "/" + managerPort, address); + assertEquals("0.0.0.0" + "/" + managerPort, address); assertTrue(usm.hasUser(null, new OctetString("SHAAES128"))); } @@ -93,7 +93,7 @@ public class V3SNMPFactoryTest { return new SNMPConfiguration.Builder() .setRetries(RETRIES) .setManagerPort(managerPort) - .setTargetHost(DEFAULT_HOST) + .setTargetHost(LOCALHOST) .setTargetPort(targetPort) .setSecurityLevel(SecurityLevel.authPriv.name()) .setSecurityName(SECURITY_NAME) diff --git a/nifi-nar-bundles/nifi-snmp-bundle/nifi-snmp-processors/src/test/java/org/apache/nifi/snmp/helper/configurations/SNMPConfigurationFactory.java b/nifi-nar-bundles/nifi-snmp-bundle/nifi-snmp-processors/src/test/java/org/apache/nifi/snmp/helper/configurations/SNMPConfigurationFactory.java index 89e8bd4db5..e6c7451437 100644 --- a/nifi-nar-bundles/nifi-snmp-bundle/nifi-snmp-processors/src/test/java/org/apache/nifi/snmp/helper/configurations/SNMPConfigurationFactory.java +++ b/nifi-nar-bundles/nifi-snmp-bundle/nifi-snmp-processors/src/test/java/org/apache/nifi/snmp/helper/configurations/SNMPConfigurationFactory.java @@ -20,7 +20,7 @@ import org.apache.nifi.snmp.configuration.SNMPConfiguration; public interface SNMPConfigurationFactory { - String DEFAULT_HOST = "127.0.0.1"; + String LOCALHOST = "127.0.0.1"; String COMMUNITY_STRING = "public"; SNMPConfiguration createSnmpGetSetConfiguration(int agentPort); diff --git a/nifi-nar-bundles/nifi-snmp-bundle/nifi-snmp-processors/src/test/java/org/apache/nifi/snmp/helper/configurations/SNMPV1V2cConfigurationFactory.java b/nifi-nar-bundles/nifi-snmp-bundle/nifi-snmp-processors/src/test/java/org/apache/nifi/snmp/helper/configurations/SNMPV1V2cConfigurationFactory.java index 72591bec15..d7253950aa 100644 --- a/nifi-nar-bundles/nifi-snmp-bundle/nifi-snmp-processors/src/test/java/org/apache/nifi/snmp/helper/configurations/SNMPV1V2cConfigurationFactory.java +++ b/nifi-nar-bundles/nifi-snmp-bundle/nifi-snmp-processors/src/test/java/org/apache/nifi/snmp/helper/configurations/SNMPV1V2cConfigurationFactory.java @@ -29,7 +29,7 @@ public class SNMPV1V2cConfigurationFactory implements SNMPConfigurationFactory { @Override public SNMPConfiguration createSnmpGetSetConfiguration(final int agentPort) { return SNMPConfiguration.builder() - .setTargetHost(DEFAULT_HOST) + .setTargetHost(LOCALHOST) .setTargetPort(String.valueOf(agentPort)) .setCommunityString(COMMUNITY_STRING) .setVersion(snmpVersion) diff --git a/nifi-nar-bundles/nifi-snmp-bundle/nifi-snmp-processors/src/test/java/org/apache/nifi/snmp/helper/configurations/SNMPV3ConfigurationFactory.java b/nifi-nar-bundles/nifi-snmp-bundle/nifi-snmp-processors/src/test/java/org/apache/nifi/snmp/helper/configurations/SNMPV3ConfigurationFactory.java index 7a278f5bbc..8e38df7ec4 100644 --- a/nifi-nar-bundles/nifi-snmp-bundle/nifi-snmp-processors/src/test/java/org/apache/nifi/snmp/helper/configurations/SNMPV3ConfigurationFactory.java +++ b/nifi-nar-bundles/nifi-snmp-bundle/nifi-snmp-processors/src/test/java/org/apache/nifi/snmp/helper/configurations/SNMPV3ConfigurationFactory.java @@ -32,7 +32,7 @@ public class SNMPV3ConfigurationFactory implements SNMPConfigurationFactory { @Override public SNMPConfiguration createSnmpGetSetConfiguration(final int agentPort) { return SNMPConfiguration.builder() - .setTargetHost(DEFAULT_HOST) + .setTargetHost(LOCALHOST) .setTargetPort(String.valueOf(agentPort)) .setCommunityString(COMMUNITY_STRING) .setVersion(SnmpConstants.version3)