Skip to content

Commit ee321e8

Browse files
LimmenLimmen
authored
Merge pull request #426 from Limmen/elk
fixed linter and typecheck
2 parents 7abec26 + 3ec57a8 commit ee321e8

8 files changed

+28
-36
lines changed

‎emulation-system/tests/test_start_client_manager.py

+2-3
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,12 @@
77
from docker.types import IPAMConfig, IPAMPool
88
import time
99
from csle_common.dao.emulation_config.emulation_env_config import EmulationEnvConfig
10-
from csle_common.util.emulation_util import EmulationUtil
1110
import csle_common.constants.constants as constants
1211
import csle_collector.client_manager.client_manager_pb2_grpc
1312
import csle_collector.client_manager.client_manager_pb2
1413
import csle_collector.client_manager.query_clients
1514
from csle_common.metastore.metastore_facade import MetastoreFacade
16-
from IPython.lib.editorhooks import emacs
15+
from typing import Generator
1716

1817

1918
@pytest.fixture(scope="module")
@@ -27,7 +26,7 @@ def docker_client() -> None:
2726

2827

2928
@pytest.fixture(scope="module")
30-
def network(docker_client) -> None:
29+
def network(docker_client) -> Generator:
3130
"""
3231
Create a custom network with a specific subnet
3332

‎emulation-system/tests/test_start_elk_manager.py

+3-5
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,12 @@
77
from docker.types import IPAMConfig, IPAMPool
88
import time
99
from csle_common.dao.emulation_config.emulation_env_config import EmulationEnvConfig
10-
from csle_common.util.emulation_util import EmulationUtil
1110
import csle_common.constants.constants as constants
12-
from csle_common.controllers.elk_controller import ELKController
1311
import csle_collector.elk_manager.elk_manager_pb2_grpc
1412
import csle_collector.elk_manager.elk_manager_pb2
1513
import csle_collector.elk_manager.query_elk_manager
1614
from csle_common.metastore.metastore_facade import MetastoreFacade
17-
from IPython.lib.editorhooks import emacs
15+
from typing import Generator
1816

1917

2018
@pytest.fixture(scope="module")
@@ -28,14 +26,14 @@ def docker_client() -> None:
2826

2927

3028
@pytest.fixture(scope="module")
31-
def network(docker_client) -> None:
29+
def network(docker_client) -> Generator:
3230
"""
3331
Create a custom network with a specific subnet
3432
3533
:param docker_client: docker_client
3634
:yield: network
3735
38-
:return: None
36+
:return: Generator
3937
"""
4038
subnet = "15.15.15.0/24"
4139
ipam_pool = IPAMPool(subnet=subnet)

‎emulation-system/tests/test_start_host_manager.py

+4-2
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111
import csle_collector.host_manager.host_manager_pb2
1212
import csle_collector.host_manager.query_host_manager
1313
from csle_common.metastore.metastore_facade import MetastoreFacade
14+
from typing import List
15+
from typing import Generator
1416

1517

1618
@pytest.fixture(scope="module")
@@ -42,13 +44,13 @@ def network(docker_client) -> Generator:
4244
network.remove()
4345

4446

45-
def get_derived_containers(docker_client, excluded_tag="blank") -> None:
47+
def get_derived_containers(docker_client, excluded_tag="blank") -> List:
4648
"""
4749
Get all the containers except the blank ones
4850
4951
:param docker_client: docker_client
5052
51-
:return: None
53+
:return: List of Images
5254
"""
5355
# Get all images except those with the excluded tag
5456
config = MetastoreFacade.get_config(id=1)

‎emulation-system/tests/test_start_kafka_manager.py

+3-4
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,12 @@
77
from docker.types import IPAMConfig, IPAMPool
88
import time
99
from csle_common.dao.emulation_config.emulation_env_config import EmulationEnvConfig
10-
from csle_common.util.emulation_util import EmulationUtil
1110
import csle_common.constants.constants as constants
1211
import csle_collector.kafka_manager.kafka_manager_pb2_grpc
1312
import csle_collector.kafka_manager.kafka_manager_pb2
1413
import csle_collector.kafka_manager.query_kafka_server
1514
from csle_common.metastore.metastore_facade import MetastoreFacade
16-
from IPython.lib.editorhooks import emacs
15+
from typing import Generator
1716

1817

1918
@pytest.fixture(scope="module")
@@ -27,14 +26,14 @@ def docker_client() -> None:
2726

2827

2928
@pytest.fixture(scope="module")
30-
def network(docker_client) -> None:
29+
def network(docker_client) -> Generator:
3130
"""
3231
Create a custom network with a specific subnet
3332
3433
:param docker_client: docker_client
3534
:yield: network
3635
37-
:return: None
36+
:return: Generator
3837
"""
3938
subnet = "15.15.15.0/24"
4039
ipam_pool = IPAMPool(subnet=subnet)

‎emulation-system/tests/test_start_ossec_manager.py

+3-4
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,12 @@
77
from docker.types import IPAMConfig, IPAMPool
88
import time
99
from csle_common.dao.emulation_config.emulation_env_config import EmulationEnvConfig
10-
from csle_common.util.emulation_util import EmulationUtil
1110
import csle_common.constants.constants as constants
1211
import csle_collector.ossec_ids_manager.ossec_ids_manager_pb2_grpc
1312
import csle_collector.ossec_ids_manager.ossec_ids_manager_pb2
1413
import csle_collector.ossec_ids_manager.query_ossec_ids_manager
1514
from csle_common.metastore.metastore_facade import MetastoreFacade
16-
from IPython.lib.editorhooks import emacs
15+
from typing import Generator
1716

1817

1918
@pytest.fixture(scope="module")
@@ -27,14 +26,14 @@ def docker_client() -> None:
2726

2827

2928
@pytest.fixture(scope="module")
30-
def network(docker_client) -> None:
29+
def network(docker_client) -> Generator:
3130
"""
3231
Create a custom network with a specific subnet
3332
3433
:param docker_client: docker_client
3534
:yield: network
3635
37-
:return: None
36+
:return: Generator
3837
"""
3938
subnet = "15.15.15.0/24"
4039
ipam_pool = IPAMPool(subnet=subnet)

‎emulation-system/tests/test_start_ryu_manager.py

+3-4
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,12 @@
77
from docker.types import IPAMConfig, IPAMPool
88
import time
99
from csle_common.dao.emulation_config.emulation_env_config import EmulationEnvConfig
10-
from csle_common.util.emulation_util import EmulationUtil
1110
import csle_common.constants.constants as constants
1211
import csle_collector.ryu_manager.ryu_manager_pb2_grpc
1312
import csle_collector.ryu_manager.ryu_manager_pb2
1413
import csle_collector.ryu_manager.query_ryu_manager
1514
from csle_common.metastore.metastore_facade import MetastoreFacade
16-
from IPython.lib.editorhooks import emacs
15+
from typing import Generator
1716

1817

1918
@pytest.fixture(scope="module")
@@ -27,14 +26,14 @@ def docker_client() -> None:
2726

2827

2928
@pytest.fixture(scope="module")
30-
def network(docker_client) -> None:
29+
def network(docker_client) -> Generator:
3130
"""
3231
Create a custom network with a specific subnet
3332
3433
:param docker_client: docker_client
3534
:yield: network
3635
37-
:return: None
36+
:return: Generator
3837
"""
3938
subnet = "15.15.15.0/24"
4039
ipam_pool = IPAMPool(subnet=subnet)

‎emulation-system/tests/test_start_snort_manager.py

+6-8
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,11 @@
77
from docker.types import IPAMConfig, IPAMPool
88
import time
99
from csle_common.dao.emulation_config.emulation_env_config import EmulationEnvConfig
10-
from csle_common.util.emulation_util import EmulationUtil
1110
import csle_common.constants.constants as constants
12-
from csle_common.controllers.snort_ids_controller import SnortIDSController
1311
import csle_collector.snort_ids_manager.snort_ids_manager_pb2_grpc
1412
import csle_collector.snort_ids_manager.snort_ids_manager_pb2
1513
from csle_common.metastore.metastore_facade import MetastoreFacade
16-
from IPython.lib.editorhooks import emacs
14+
from typing import Generator
1715

1816

1917
@pytest.fixture(scope="module")
@@ -27,14 +25,14 @@ def docker_client() -> None:
2725

2826

2927
@pytest.fixture(scope="module")
30-
def network(docker_client) -> None:
28+
def network(docker_client) -> Generator:
3129
"""
3230
Create a custom network with a specific subnet
3331
3432
:param docker_client: docker_client
3533
:yield: network
3634
37-
:return: None
35+
:return: Generator
3836
"""
3937
subnet = "15.15.15.0/24"
4038
ipam_pool = IPAMPool(subnet=subnet)
@@ -64,7 +62,7 @@ def get_derived_containers(docker_client, excluded_tag=constants.CONTAINER_IMAGE
6462
and all(constants.CONTAINER_IMAGES.BASE not in tag for tag in image.tags)
6563
and all(excluded_tag not in tag for tag in image.tags)
6664
]
67-
return derived_images
65+
return derived_images
6866

6967

7068
@pytest.fixture(scope="module", params=get_derived_containers(docker.from_env()))
@@ -81,7 +79,7 @@ def container_setup(request, docker_client, network) -> Generator:
8179
# Create and start each derived container
8280
image = request.param
8381
container = docker_client.containers.create(
84-
image.tags[0],
82+
image.tags[0],
8583
command="sh -c 'while true; do sleep 3600; done'",
8684
detach=True,
8785
)
@@ -144,7 +142,7 @@ def test_start_snort_manager(container_setup) -> None:
144142
with grpc.insecure_channel(f"{ip}:{port}", options=constants.GRPC_SERVERS.GRPC_OPTIONS) as channel:
145143
stub = csle_collector.snort_ids_manager.snort_ids_manager_pb2_grpc.SnortIdsManagerStub(channel)
146144
status = csle_collector.snort_ids_manager.query_snort_ids_manager.get_snort_ids_monitor_status(stub=stub)
147-
assert status
145+
assert status
148146
except Exception as e:
149147
print(f"Error occurred in container {container_setup.name}: {e}")
150148
failed_containers.append(container_setup.name)

‎emulation-system/tests/test_start_traffic_manager.py

+4-6
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,12 @@
77
from docker.types import IPAMConfig, IPAMPool
88
import time
99
from csle_common.dao.emulation_config.emulation_env_config import EmulationEnvConfig
10-
from csle_common.util.emulation_util import EmulationUtil
1110
import csle_common.constants.constants as constants
1211
import csle_collector.traffic_manager.traffic_manager_pb2_grpc
1312
import csle_collector.traffic_manager.traffic_manager_pb2
1413
import csle_collector.traffic_manager.query_traffic_manager
1514
from csle_common.metastore.metastore_facade import MetastoreFacade
16-
from IPython.lib.editorhooks import emacs
17-
15+
from typing import Generator
1816

1917
@pytest.fixture(scope="module")
2018
def docker_client() -> None:
@@ -27,14 +25,14 @@ def docker_client() -> None:
2725

2826

2927
@pytest.fixture(scope="module")
30-
def network(docker_client) -> None:
28+
def network(docker_client) -> Generator:
3129
"""
3230
Create a custom network with a specific subnet
3331
3432
:param docker_client: docker_client
3533
:yield: network
3634
37-
:return: None
35+
:return: Generator
3836
"""
3937
subnet = "15.15.15.0/24"
4038
ipam_pool = IPAMPool(subnet=subnet)
@@ -64,7 +62,7 @@ def get_derived_containers(docker_client, excluded_tag=constants.CONTAINER_IMAGE
6462
and all(constants.CONTAINER_IMAGES.BASE not in tag for tag in image.tags)
6563
and all(excluded_tag not in tag for tag in image.tags)
6664
]
67-
return derived_images
65+
return derived_images[:1]
6866

6967

7068
@pytest.fixture(scope="module", params=get_derived_containers(docker.from_env()))

0 commit comments

Comments
 (0)