Skip to content

Commit 7c134bc

Browse files
LimmenLimmen
committed
fix linter
1 parent ced9c14 commit 7c134bc

File tree

2 files changed

+38
-28
lines changed

2 files changed

+38
-28
lines changed

‎simulation-system/libs/csle-common/tests/test_ossec_ids_controller.py

+27-22
Original file line numberDiff line numberDiff line change
@@ -98,16 +98,17 @@ def test_start_ossec_idses(self, mock_start_ossec_ids) -> None:
9898
"csle_common.controllers.ossec_ids_controller.OSSECIDSController.start_ossec_ids_manager"
9999
)
100100
@patch(
101-
"csle_common.controllers.ossec_ids_controller.OSSECIDSController.get_ossec_ids_monitor_thread_status_by_ip_and_port"
101+
"csle_common.controllers.ossec_ids_controller.OSSECIDSController"
102+
".get_ossec_ids_monitor_thread_status_by_ip_and_port"
102103
)
103104
@patch("grpc.insecure_channel")
104105
@patch("csle_common.controllers.ossec_ids_controller.Logger")
105106
def test_start_ossec_ids(
106-
self,
107-
mock_logger,
108-
mock_insecure_channel,
109-
mock_get_monitor_status,
110-
mock_start_manager,
107+
self,
108+
mock_logger,
109+
mock_insecure_channel,
110+
mock_get_monitor_status,
111+
mock_start_manager,
111112
) -> None:
112113
"""
113114
Test the method for starting a OSSEC IDS with a specific IP
@@ -141,11 +142,12 @@ def test_start_ossec_ids(
141142
"csle_common.controllers.ossec_ids_controller.OSSECIDSController.start_ossec_ids_manager"
142143
)
143144
@patch(
144-
"csle_common.controllers.ossec_ids_controller.OSSECIDSController.get_ossec_ids_monitor_thread_status_by_ip_and_port"
145+
"csle_common.controllers.ossec_ids_controller.OSSECIDSController"
146+
".get_ossec_ids_monitor_thread_status_by_ip_and_port"
145147
)
146148
@patch("grpc.insecure_channel")
147149
def test_stop_ossec_ids(
148-
self, mock_insecure_channel, mock_get_monitor_status, mock_start_manager
150+
self, mock_insecure_channel, mock_get_monitor_status, mock_start_manager
149151
) -> None:
150152
"""
151153
Test the method for stopping a OSSEC IDS with a specific IP
@@ -191,7 +193,7 @@ def test_start_ossec_idses_managers(self, mock_start_manager) -> None:
191193
@patch("csle_common.util.emulation_util.EmulationUtil.connect_admin")
192194
@patch("csle_common.util.emulation_util.EmulationUtil.execute_ssh_cmd")
193195
def test_start_ossec_ids_manager(
194-
self, mock_execute_ssh_cmd, mock_connect_admin
196+
self, mock_execute_ssh_cmd, mock_connect_admin
195197
) -> None:
196198
"""
197199
Test method for starting the OSSEC IDS manager on a specific container
@@ -232,7 +234,7 @@ def test_stop_ossec_idses_managers(self, mock_stop_manager) -> None:
232234
@patch("csle_common.util.emulation_util.EmulationUtil.connect_admin")
233235
@patch("csle_common.util.emulation_util.EmulationUtil.execute_ssh_cmd")
234236
def test_stop_ossec_ids_manager(
235-
self, mock_execute_ssh_cmd, mock_connect_admin
237+
self, mock_execute_ssh_cmd, mock_connect_admin
236238
) -> None:
237239
"""
238240
Test method for stopping the OSSEC IDS manager on a specific container
@@ -255,18 +257,20 @@ def test_start_ossec_idses_monitor_threads(self, mock_start_monitor) -> None:
255257
constants.CONTAINER_IMAGES = MagicMock()
256258
constants.CONTAINER_IMAGES.OSSEC_IDS_IMAGES = ["container-1", "container-2"]
257259
physical_server_ip = "192.168.1.10"
258-
OSSECIDSController.start_ossec_idses_monitor_threads(emulation_env_config=self.emulation_env_config,physical_server_ip=physical_server_ip,logger=self.logger)
260+
OSSECIDSController.start_ossec_idses_monitor_threads(emulation_env_config=self.emulation_env_config,
261+
physical_server_ip=physical_server_ip,logger=self.logger)
259262
assert mock_start_monitor.call_count == 2"""
260263

261264
@patch(
262265
"csle_common.controllers.ossec_ids_controller.OSSECIDSController.start_ossec_ids_manager"
263266
)
264267
@patch(
265-
"csle_common.controllers.ossec_ids_controller.OSSECIDSController.get_ossec_ids_monitor_thread_status_by_ip_and_port"
268+
"csle_common.controllers.ossec_ids_controller.OSSECIDSController"
269+
".get_ossec_ids_monitor_thread_status_by_ip_and_port"
266270
)
267271
@patch("grpc.insecure_channel")
268272
def test_start_ossec_ids_monitor_thread(
269-
self, mock_insecure_channel, mock_get_monitor_status, mock_start_manager
273+
self, mock_insecure_channel, mock_get_monitor_status, mock_start_manager
270274
) -> None:
271275
"""
272276
A method that sends a request to the OSSECIDSManager on a specific IP to start
@@ -333,7 +337,7 @@ def test_stop_ossec_ids_monitor_thread(self, mock_start_manager) -> None:
333337
"csle_common.controllers.ossec_ids_controller.OSSECIDSController.start_ossec_idses_managers"
334338
)
335339
def test_get_ossec_idses_monitor_threads_statuses(
336-
self, mock_start_managers
340+
self, mock_start_managers
337341
) -> None:
338342
"""
339343
Test a method that sends a request to the OSSECIDSManager on every container to get the status of the
@@ -383,7 +387,7 @@ def test_get_ossec_idses_managers_ports(self) -> None:
383387

384388
@patch("grpc.insecure_channel")
385389
def test_get_ossec_ids_monitor_thread_status_by_ip_and_port(
386-
self, mock_insecure_channel
390+
self, mock_insecure_channel
387391
) -> None:
388392
"""
389393
Tests a method that sends a request to the OSSECIDSManager with a specific port and ip
@@ -411,19 +415,20 @@ def test_get_ossec_ids_monitor_thread_status_by_ip_and_port(
411415
"csle_common.controllers.ossec_ids_controller.OSSECIDSController.get_ossec_idses_managers_ports"
412416
)
413417
@patch(
414-
"csle_common.controllers.ossec_ids_controller.OSSECIDSController.get_ossec_ids_monitor_thread_status_by_ip_and_port"
418+
"csle_common.controllers.ossec_ids_controller.OSSECIDSController"
419+
".get_ossec_ids_monitor_thread_status_by_ip_and_port"
415420
)
416421
@patch("csle_common.util.emulation_util.EmulationUtil.physical_ip_match")
417422
@patch(
418423
"csle_collector.ossec_ids_manager.ossec_ids_manager_util.OSSecManagerUtil.ossec_ids_monitor_dto_empty"
419424
)
420425
def test_get_ossec_managers_info(
421-
self,
422-
mock_ossec_dto_empty,
423-
mock_physical_ip_match,
424-
mock_get_status,
425-
mock_get_ports,
426-
mock_get_ips,
426+
self,
427+
mock_ossec_dto_empty,
428+
mock_physical_ip_match,
429+
mock_get_status,
430+
mock_get_ports,
431+
mock_get_ips,
427432
) -> None:
428433
"""
429434
Tests the method that extracts the information of the OSSEC IDS managers for a given emulation

‎simulation-system/libs/csle-common/tests/test_ovs_controller.py

+11-6
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,7 @@
22
import logging
33
from unittest.mock import patch, MagicMock
44
import csle_common.constants.constants as constants
5-
from csle_common.controllers.ovs_controller import (
6-
OVSController,
7-
)
5+
from csle_common.controllers.ovs_controller import OVSController
86
from csle_common.dao.emulation_config.containers_config import ContainersConfig
97

108

@@ -14,7 +12,7 @@ class TestOVSControllerSuite:
1412
"""
1513

1614
@pytest.fixture
17-
def mock_containers_config(self):
15+
def mock_containers_config(self) -> None:
1816
"""
1917
Test method that sets up OVS switches on containers
2018
@@ -42,10 +40,10 @@ def mock_containers_config(self):
4240
@patch("subprocess.Popen")
4341
@patch("time.sleep")
4442
def test_create_virtual_switches_on_container(
45-
self, mock_sleep, mock_popen, mock_containers_config
43+
self, mock_sleep, mock_popen, mock_containers_config
4644
) -> None:
4745
"""
48-
Test method that aplies the OVS configuration on the OVS switches
46+
Test method that creates the OVS switches
4947
5048
:param mock_sleep: mock_sleep
5149
:param mock_popen: mock_popen
@@ -63,6 +61,13 @@ def test_create_virtual_switches_on_container(
6361
@patch("csle_common.util.emulation_util.EmulationUtil.connect_admin")
6462
@patch("csle_common.util.emulation_util.EmulationUtil.execute_ssh_cmd")
6563
def test_apply_ovs_config(self, mock_execute_ssh_cmd, mock_connect_admin) -> None:
64+
"""
65+
Test method that applies the OVS configuration
66+
67+
:param mock_execute_ssh_cmd: mock_execute_ssh_cmd
68+
:param mock_connect_admin: mock_connect_admin
69+
:return:
70+
"""
6671
emulation_env_config = MagicMock()
6772
ovs_switch_config = MagicMock()
6873
ovs_switch_config.container_name = "ovs_container_1"

0 commit comments

Comments
 (0)