Merge pull request #367 from sentrysoftware/feature/issue-366-option-…

…2c-not-recognized-for-snmp-version-in-metricshub-cli-and-metricshubyaml Issue #366: Recognize '2c' as a valid SNMP version option
sentrysoftware · Aug 9, 2024 · f59bb1c · f59bb1c
2 parents c5cf9d2 + 26200b0
commit f59bb1c
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/...tension/src/main/java/org/sentrysoftware/metricshub/extension/snmp/SnmpConfiguration.java b/...tension/src/main/java/org/sentrysoftware/metricshub/extension/snmp/SnmpConfiguration.java
@@ -108,7 +108,12 @@ public static SnmpVersion interpretValueOf(@NonNull final String version) {
 				return V1;
 			}
 
-			if ("2".equals(lowerCaseVersion) || "v2".equals(lowerCaseVersion) || "v2c".equals(lowerCaseVersion)) {
+			if (
+				"2".equals(lowerCaseVersion) ||
+				"v2".equals(lowerCaseVersion) ||
+				"v2c".equals(lowerCaseVersion) ||
+				"2c".equals(lowerCaseVersion)
+			) {
 				return V2C;
 			}
 

diff --git a/...ion/src/test/java/org/sentrysoftware/metricshub/extension/snmp/SnmpConfigurationTest.java b/...ion/src/test/java/org/sentrysoftware/metricshub/extension/snmp/SnmpConfigurationTest.java
@@ -1,5 +1,6 @@
 package org.sentrysoftware.metricshub.extension.snmp;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import org.junit.jupiter.api.Test;
@@ -99,4 +100,14 @@ void testValidateConfiguration() {
 			assertThrows(InvalidConfigurationException.class, () -> snmpConfig.validateConfiguration(resourceKey));
 		}
 	}
+
+	@Test
+	void testSnmpVersionInterpretValueOf() {
+		assertEquals(SnmpVersion.V1, SnmpVersion.interpretValueOf("1"));
+		assertEquals(SnmpVersion.V1, SnmpVersion.interpretValueOf("v1"));
+		assertEquals(SnmpVersion.V2C, SnmpVersion.interpretValueOf("2"));
+		assertEquals(SnmpVersion.V2C, SnmpVersion.interpretValueOf("v2"));
+		assertEquals(SnmpVersion.V2C, SnmpVersion.interpretValueOf("v2c"));
+		assertEquals(SnmpVersion.V2C, SnmpVersion.interpretValueOf("2c"));
+	}
 }