fix: dns resolution for ipv4 (#1158)

Author: ajasnosz

CHANGELOG.md

@@ -11,6 +11,7 @@
 - add communities for v1 traps
 - add nodeSelector to worker chart
 - upgrade base docker image
+- dns resolution if only ipv4 is used
 
 ## [1.12.1]
 

splunk_connect_for_snmp/snmp/auth.py

@@ -92,15 +92,12 @@ def get_security_engine_id(logger, ir: InventoryRecord, snmp_engine: SnmpEngine)
 
 def setup_transport_target(ir):
     ip = get_ip_from_socket(ir) if IPv6_ENABLED else ir.address
-    if ip_address(ip).version == 6:
-        transport = Udp6TransportTarget(
+    if IPv6_ENABLED and ip_address(ip).version == 6:
+        return Udp6TransportTarget(
             (ir.address, ir.port), timeout=UDP_CONNECTION_TIMEOUT
         )
-    else:
-        transport = UdpTransportTarget(
-            (ir.address, ir.port), timeout=UDP_CONNECTION_TIMEOUT
-        )
-    return transport
+
+    return UdpTransportTarget((ir.address, ir.port), timeout=UDP_CONNECTION_TIMEOUT)
 
 
 def get_ip_from_socket(ir):

test/snmp/test_auth.py

@@ -349,11 +349,13 @@ def test_setup_transport_target_ipv4(
         transport = setup_transport_target(ir)
         self.assertEqual("UDP4", transport)
 
+    @patch("splunk_connect_for_snmp.snmp.auth.IPv6_ENABLED")
     @patch("splunk_connect_for_snmp.snmp.auth.Udp6TransportTarget")
     @patch("splunk_connect_for_snmp.snmp.auth.UdpTransportTarget")
     def test_setup_transport_target_ipv6(
-        self, m_setup_udp_transport_target, m_setup_udp6_transport_target
+        self, m_setup_udp_transport_target, m_setup_udp6_transport_target, ipv6_enabled
     ):
+        ipv6_enabled.return_value = True
         ir.address = "2001:0db8:ac10:fe01::0001"
         ir.port = 161
         m_setup_udp_transport_target.return_value = "UDP4"

ui_tests/tests/test_splunk_integration.py

@@ -381,7 +381,7 @@ def test_setting_host_in_inventory(setup):
     p_header.apply_changes()
     time_to_upgrade = p_header.get_time_to_upgrade()
     p_header.close_configuration_applied_notification_popup()
-    time.sleep(time_to_upgrade + 80)  # wait for upgrade + walk time + polling
+    time.sleep(time_to_upgrade + 75)  # wait for upgrade + walk time + polling
 
     # check walk scheduled
     search_query = f'index={config.LOGS_INDEX} "Sending due task sc4snmp;{host}:{DEFAULT_PORT};walk"'