From 9dae39eb54048b82bb2b8e37dd80a52ca385ff9f Mon Sep 17 00:00:00 2001 From: Daniel Sagi Date: Mon, 1 Jul 2019 21:01:57 +0300 Subject: [PATCH] changed azure checks on tests --- tests/discovery/test_hosts.py | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/tests/discovery/test_hosts.py b/tests/discovery/test_hosts.py index 1090ea3..41cff9f 100644 --- a/tests/discovery/test_hosts.py +++ b/tests/discovery/test_hosts.py @@ -2,21 +2,24 @@ import requests_mock import time from queue import Empty -from src.modules.discovery.hosts import FromPodHostDiscovery, RunningAsPodEvent, HostScanEvent, AzureMetadataApi +from src.modules.discovery.aks import AzureHostDiscovery, AzureMetadataApi +from src.modules.discovery.hosts import HostScanEvent, RunningPodOnCloud from src.core.events.types import Event, NewHostEvent from src.core.events import handler +from src.core.types import CloudTypes + from __main__ import config -def test_FromPodHostDiscovery(): +def test_AzureHostDiscovery(): with requests_mock.Mocker() as m: - e = RunningAsPodEvent() + e = RunningPodOnCloud(cloud=CloudTypes.AKS) config.azure = False config.remote = None config.cidr = None m.get("http://169.254.169.254/metadata/instance?api-version=2017-08-01", status_code=404) - f = FromPodHostDiscovery(e) + f = AzureHostDiscovery(e) assert not f.is_azure_api() # Test that we generate NewHostEvent for the addresses reported by the Azure Metadata API @@ -26,15 +29,6 @@ def test_FromPodHostDiscovery(): assert f.is_azure_api() f.execute() - # Test that we don't trigger a HostScanEvent unless either config.remote or config.cidr are configured - m.get("http://canhazip.com/", text="10.10.10.10") - config.remote = "1.2.3.4" - f.execute() - - config.azure = False - config.remote = None - config.cidr = "1.2.3.4/24" - f.execute() # In this set of tests we should only trigger HostScanEvent when remote or cidr are set