Merge remote-tracking branch 'origin/dev' into feature/2623-action-masking

tests/conftest.py

@@ -53,11 +53,11 @@ class TestService(Service):
         pass
 
 
-class TestDummyApplication(Application, identifier="TestDummyApplication"):
+class DummyApplication(Application, identifier="DummyApplication"):
     """Test Application class"""
 
     def __init__(self, **kwargs):
-        kwargs["name"] = "TestDummyApplication"
+        kwargs["name"] = "DummyApplication"
         kwargs["port"] = Port.HTTP
         kwargs["protocol"] = IPProtocol.TCP
         super().__init__(**kwargs)
@@ -87,9 +87,9 @@ def service_class():
 
 
 @pytest.fixture(scope="function")
-def application(file_system) -> TestDummyApplication:
-    return TestDummyApplication(
-        name="TestDummyApplication",
+def application(file_system) -> DummyApplication:
+    return DummyApplication(
+        name="DummyApplication",
         port=Port.ARP,
         file_system=file_system,
         sys_log=SysLog(hostname="dummy_application"),
@@ -98,7 +98,7 @@ def application(file_system) -> TestDummyApplication:
 
 @pytest.fixture(scope="function")
 def application_class():
-    return TestDummyApplication
+    return DummyApplication
 
 
 @pytest.fixture(scope="function")
@@ -257,8 +257,7 @@ def example_network() -> Network:
     server_2.power_on()
     network.connect(endpoint_b=server_2.network_interface[1], endpoint_a=switch_1.network_interface[2])
 
-    router_1.acl.add_rule(action=ACLAction.PERMIT, src_port=Port.ARP, dst_port=Port.ARP, position=22)
-    router_1.acl.add_rule(action=ACLAction.PERMIT, protocol=IPProtocol.ICMP, position=23)
+    router_1.acl.add_rule(action=ACLAction.PERMIT, position=1)
 
     assert all(link.is_up for link in network.links.values())