diff --git a/monkey/infection_monkey/model/host.py b/monkey/infection_monkey/model/host.py index bcfcf2f16..170e6fea4 100644 --- a/monkey/infection_monkey/model/host.py +++ b/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.services = {} + self.os: Dict[str, Any] = {} + self.services: Dict[str, Any] = {} self.icmp = False - self.default_tunnel = None self.default_server = None def as_dict(self): diff --git a/monkey/tests/unit_tests/infection_monkey/model/test_victim_host_factory.py b/monkey/tests/unit_tests/infection_monkey/model/test_victim_host_factory.py index 3ec67438c..a584dca17 100644 --- a/monkey/tests/unit_tests/infection_monkey/model/test_victim_host_factory.py +++ b/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]) diff --git a/monkey/tests/unit_tests/infection_monkey/telemetry/test_exploit_telem.py b/monkey/tests/unit_tests/infection_monkey/telemetry/test_exploit_telem.py index 3255cc7b7..c38c1d130 100644 --- a/monkey/tests/unit_tests/infection_monkey/telemetry/test_exploit_telem.py +++ b/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" diff --git a/monkey/tests/unit_tests/infection_monkey/telemetry/test_scan_telem.py b/monkey/tests/unit_tests/infection_monkey/telemetry/test_scan_telem.py index a369fe4cf..837b7d782 100644 --- a/monkey/tests/unit_tests/infection_monkey/telemetry/test_scan_telem.py +++ b/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 = {} diff --git a/monkey/tests/unit_tests/monkey_island/cc/services/edge/test_displayed_edge_service.py b/monkey/tests/unit_tests/monkey_island/cc/services/edge/test_displayed_edge_service.py index aadd13f60..90195f980 100644 --- a/monkey/tests/unit_tests/monkey_island/cc/services/edge/test_displayed_edge_service.py +++ b/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, }, }