Agent: Get rid of default_tunnel

monkey/infection_monkey/model/host.py

@@ -1,4 +1,4 @@
-from typing import Optional
+from typing import Any, Dict, Optional
 
 from common import OperatingSystem
 
@@ -7,10 +7,9 @@ class VictimHost(object):
     def __init__(self, ip_addr: str, domain_name: str = ""):
         self.ip_addr = ip_addr
         self.domain_name = str(domain_name)
-        self.os = {}
+        self.os: Dict[str, Any] = {}
-        self.services = {}
+        self.services: Dict[str, Any] = {}
         self.icmp = False
-        self.default_tunnel = None
         self.default_server = None
 
     def as_dict(self):

monkey/tests/unit_tests/infection_monkey/model/test_victim_host_factory.py

@@ -19,7 +19,6 @@ def test_factory_no_tunnel():
 
     assert victim.default_server == "192.168.56.1:5000"
     assert victim.ip_addr == "192.168.56.2"
-    assert victim.default_tunnel is None
     assert victim.domain_name == ""
 
 
@@ -32,7 +31,6 @@ def test_factory_on_island():
     assert victim.default_server == "1.1.1.1:99"
     assert victim.domain_name == "www.bogus.monkey"
     assert victim.ip_addr == "192.168.56.2"
-    assert victim.default_tunnel == "1.2.3.4:1234"
 
 
 @pytest.mark.parametrize("default_port", ["", None])

monkey/tests/unit_tests/infection_monkey/telemetry/test_exploit_telem.py

@@ -16,7 +16,6 @@ HOST_AS_DICT = {
     "os": {},
     "services": {},
     "icmp": False,
-    "default_tunnel": None,
     "default_server": None,
 }
 EXPLOITER_NAME = "SSHExploiter"

monkey/tests/unit_tests/infection_monkey/telemetry/test_scan_telem.py

@@ -14,7 +14,6 @@ HOST_AS_DICT = {
     "os": {},
     "services": {},
     "icmp": False,
-    "default_tunnel": None,
     "default_server": None,
 }
 HOST_SERVICES = {}

monkey/tests/unit_tests/monkey_island/cc/services/edge/test_displayed_edge_service.py

@@ -18,7 +18,6 @@ SCAN_DATA_MOCK = [
                 },
             },
             "monkey_exe": None,
-            "default_tunnel": None,
             "default_server": None,
         },
     }