diff --git a/gns3server/api/routes/compute/cloud_nodes.py b/gns3server/api/routes/compute/cloud_nodes.py index c220ea1c2..3c62dbb54 100644 --- a/gns3server/api/routes/compute/cloud_nodes.py +++ b/gns3server/api/routes/compute/cloud_nodes.py @@ -176,6 +176,7 @@ async def update_cloud_nio( """ nio = node.get_nio(port_number) + nio.filters.clear() if nio_data.filters: nio.filters = nio_data.filters await node.update_nio(port_number, nio) diff --git a/gns3server/api/routes/compute/docker_nodes.py b/gns3server/api/routes/compute/docker_nodes.py index bf1bb072c..978eff344 100644 --- a/gns3server/api/routes/compute/docker_nodes.py +++ b/gns3server/api/routes/compute/docker_nodes.py @@ -289,6 +289,7 @@ async def update_docker_node_nio( """ nio = node.get_nio(adapter_number) + nio.filters.clear() if nio_data.filters: nio.filters = nio_data.filters await node.adapter_update_nio_binding(adapter_number, nio) diff --git a/gns3server/api/routes/compute/dynamips_nodes.py b/gns3server/api/routes/compute/dynamips_nodes.py index 50ee7b45f..08eebb0d7 100644 --- a/gns3server/api/routes/compute/dynamips_nodes.py +++ b/gns3server/api/routes/compute/dynamips_nodes.py @@ -232,6 +232,7 @@ async def update_nio( """ nio = node.get_nio(adapter_number, port_number) + nio.filters.clear() if nio_data.filters: nio.filters = nio_data.filters await node.slot_update_nio_binding(adapter_number, port_number, nio) diff --git a/gns3server/api/routes/compute/iou_nodes.py b/gns3server/api/routes/compute/iou_nodes.py index f3b5b8fe8..4453c9bff 100644 --- a/gns3server/api/routes/compute/iou_nodes.py +++ b/gns3server/api/routes/compute/iou_nodes.py @@ -250,6 +250,7 @@ async def update_iou_node_nio( """ nio = node.get_nio(adapter_number, port_number) + nio.filters.clear() if nio_data.filters: nio.filters = nio_data.filters await node.adapter_update_nio_binding(adapter_number, port_number, nio) diff --git a/gns3server/api/routes/compute/nat_nodes.py b/gns3server/api/routes/compute/nat_nodes.py index 06788f6a8..03283c9b0 100644 --- a/gns3server/api/routes/compute/nat_nodes.py +++ b/gns3server/api/routes/compute/nat_nodes.py @@ -171,6 +171,7 @@ async def update_nat_node_nio( """ nio = node.get_nio(port_number) + nio.filters.clear() if nio_data.filters: nio.filters = nio_data.filters await node.update_nio(port_number, nio) diff --git a/gns3server/api/routes/compute/qemu_nodes.py b/gns3server/api/routes/compute/qemu_nodes.py index 1689fabe9..e8be9b003 100644 --- a/gns3server/api/routes/compute/qemu_nodes.py +++ b/gns3server/api/routes/compute/qemu_nodes.py @@ -304,10 +304,10 @@ async def update_qemu_node_nio( """ nio = node.get_nio(adapter_number) + nio.filters.clear() if nio_data.filters: nio.filters = nio_data.filters - if nio_data.suspend: - nio.suspend = nio_data.suspend + nio.suspend = nio_data.suspend await node.adapter_update_nio_binding(adapter_number, nio) return nio.asdict() diff --git a/gns3server/api/routes/compute/virtualbox_nodes.py b/gns3server/api/routes/compute/virtualbox_nodes.py index f676025e6..957f1635f 100644 --- a/gns3server/api/routes/compute/virtualbox_nodes.py +++ b/gns3server/api/routes/compute/virtualbox_nodes.py @@ -268,10 +268,10 @@ async def update_virtualbox_node_nio( """ nio = node.get_nio(adapter_number) + nio.filters.clear() if nio_data.filters: nio.filters = nio_data.filters - if nio_data.suspend: - nio.suspend = nio_data.suspend + nio.suspend = nio_data.suspend await node.adapter_update_nio_binding(adapter_number, nio) return nio.asdict() diff --git a/gns3server/api/routes/compute/vmware_nodes.py b/gns3server/api/routes/compute/vmware_nodes.py index 30f79902c..aecce0289 100644 --- a/gns3server/api/routes/compute/vmware_nodes.py +++ b/gns3server/api/routes/compute/vmware_nodes.py @@ -233,6 +233,7 @@ async def update_vmware_node_nio( """ nio = node.get_nio(adapter_number) + nio.filters.clear() if nio_data.filters: nio.filters = nio_data.filters await node.adapter_update_nio_binding(adapter_number, nio) diff --git a/gns3server/api/routes/compute/vpcs_nodes.py b/gns3server/api/routes/compute/vpcs_nodes.py index bd5181b67..545421d2e 100644 --- a/gns3server/api/routes/compute/vpcs_nodes.py +++ b/gns3server/api/routes/compute/vpcs_nodes.py @@ -235,6 +235,7 @@ async def update_vpcs_node_nio( """ nio = node.get_nio(port_number) + nio.filters.clear() if nio_data.filters: nio.filters = nio_data.filters await node.port_update_nio_binding(port_number, nio) diff --git a/gns3server/compute/nios/nio_udp.py b/gns3server/compute/nios/nio_udp.py index 32fe16b86..b7736a39e 100644 --- a/gns3server/compute/nios/nio_udp.py +++ b/gns3server/compute/nios/nio_udp.py @@ -78,5 +78,7 @@ class NIOUDP(NIO): "type": "nio_udp", "lport": self._lport, "rport": self._rport, - "rhost": self._rhost + "rhost": self._rhost, + "suspend": self._suspended, + "filters": self._filters } diff --git a/gns3server/schemas/compute/nios.py b/gns3server/schemas/compute/nios.py index 686c85327..cf69f9e30 100644 --- a/gns3server/schemas/compute/nios.py +++ b/gns3server/schemas/compute/nios.py @@ -34,7 +34,7 @@ class UDPNIO(BaseModel): lport: int = Field(..., gt=0, le=65535, description="Local port") rhost: str = Field(..., description="Remote host") rport: int = Field(..., gt=0, le=65535, description="Remote port") - suspend: Optional[int] = Field(None, description="Suspend the NIO") + suspend: Optional[bool] = Field(None, description="Suspend the NIO") filters: Optional[dict] = Field(None, description="Packet filters") diff --git a/tests/api/routes/compute/test_cloud_nodes.py b/tests/api/routes/compute/test_cloud_nodes.py index 18014eb92..7a3b6bbac 100644 --- a/tests/api/routes/compute/test_cloud_nodes.py +++ b/tests/api/routes/compute/test_cloud_nodes.py @@ -97,19 +97,25 @@ class TestCloudNodesRoutes: vm: dict ) -> None: - params = {"type": "nio_udp", - "lport": 4242, - "rport": 4343, - "rhost": "127.0.0.1"} + params = { + "type": "nio_udp", + "lport": 4242, + "rport": 4343, + "rhost": "127.0.0.1", + "filters": {"packet_loss": 10} + } - url = app.url_path_for("compute:create_cloud_nio", - project_id=vm["project_id"], - node_id=vm["node_id"], - adapter_number="0", - port_number="0") - await compute_client.post(url, json=params) + url = app.url_path_for( + "compute:create_cloud_nio", + project_id=vm["project_id"], + node_id=vm["node_id"], + adapter_number="0", + port_number="0") + response = await compute_client.post(url, json=params) + assert response.status_code == status.HTTP_201_CREATED + assert response.json()["filters"] == {"packet_loss": 10} + params["filters"].clear() - params["filters"] = {} url = app.url_path_for("compute:create_cloud_nio", project_id=vm["project_id"], node_id=vm["node_id"], @@ -118,6 +124,7 @@ class TestCloudNodesRoutes: response = await compute_client.put(url, json=params) assert response.status_code == status.HTTP_201_CREATED assert response.json()["type"] == "nio_udp" + assert response.json()["filters"] == {} async def test_cloud_delete_nio( diff --git a/tests/api/routes/compute/test_docker_nodes.py b/tests/api/routes/compute/test_docker_nodes.py index b36c29656..ebbba442f 100644 --- a/tests/api/routes/compute/test_docker_nodes.py +++ b/tests/api/routes/compute/test_docker_nodes.py @@ -218,7 +218,8 @@ class TestDockerNodesRoutes: "type": "nio_udp", "lport": 4242, "rport": 4343, - "rhost": "127.0.0.1" + "rhost": "127.0.0.1", + "filters": {"packet_loss": 10} } url = app.url_path_for("compute:create_docker_node_nio", @@ -228,6 +229,8 @@ class TestDockerNodesRoutes: port_number="0") response = await compute_client.post(url, json=params) assert response.status_code == status.HTTP_201_CREATED + assert response.json()["filters"] == {"packet_loss": 10} + params["filters"] = {} url = app.url_path_for("compute:update_docker_node_nio", project_id=vm["project_id"], @@ -237,7 +240,8 @@ class TestDockerNodesRoutes: with asyncio_patch("gns3server.compute.docker.docker_vm.DockerVM.adapter_update_nio_binding"): response = await compute_client.put(url, json=params) assert response.status_code == status.HTTP_201_CREATED - + assert response.json()["type"] == "nio_udp" + assert response.json()["filters"] == {} async def test_docker_delete_nio(self, app: FastAPI, compute_client: AsyncClient, vm: dict) -> None: diff --git a/tests/api/routes/compute/test_iou_nodes.py b/tests/api/routes/compute/test_iou_nodes.py index 8343ba330..b0de85b57 100644 --- a/tests/api/routes/compute/test_iou_nodes.py +++ b/tests/api/routes/compute/test_iou_nodes.py @@ -297,10 +297,13 @@ class TestIOUNodesRoutes: async def test_iou_nio_update_udp(self, app: FastAPI, compute_client: AsyncClient, vm: dict) -> None: - params = {"type": "nio_udp", - "lport": 4242, - "rport": 4343, - "rhost": "127.0.0.1"} + params = { + "type": "nio_udp", + "lport": 4242, + "rport": 4343, + "rhost": "127.0.0.1", + "filters": {"packet_loss": 10} + } url = app.url_path_for("compute:create_iou_node_nio", project_id=vm["project_id"], @@ -308,8 +311,10 @@ class TestIOUNodesRoutes: adapter_number="1", port_number="0") - await compute_client.post(url, json=params) - params["filters"] = {} + response = await compute_client.post(url, json=params) + assert response.status_code == status.HTTP_201_CREATED + assert response.json()["filters"] == {"packet_loss": 10} + params["filters"].clear() url = app.url_path_for("compute:update_iou_node_nio", project_id=vm["project_id"], @@ -319,6 +324,7 @@ class TestIOUNodesRoutes: response = await compute_client.put(url, json=params) assert response.status_code == status.HTTP_201_CREATED assert response.json()["type"] == "nio_udp" + assert response.json()["filters"] == {} async def test_iou_nio_create_ethernet( diff --git a/tests/api/routes/compute/test_nat_nodes.py b/tests/api/routes/compute/test_nat_nodes.py index 636a538ad..fea31fa01 100644 --- a/tests/api/routes/compute/test_nat_nodes.py +++ b/tests/api/routes/compute/test_nat_nodes.py @@ -104,7 +104,8 @@ class TestNATNodesRoutes: "type": "nio_udp", "lport": 4242, "rport": 4343, - "rhost": "127.0.0.1" + "rhost": "127.0.0.1", + "filters": {"packet_loss": 10} } url = app.url_path_for("compute:create_nat_node_nio", @@ -113,8 +114,10 @@ class TestNATNodesRoutes: adapter_number="0", port_number="0") - await compute_client.post(url, json=params) - params["filters"] = {} + response = await compute_client.post(url, json=params) + assert response.status_code == status.HTTP_201_CREATED + assert response.json()["filters"] == {"packet_loss": 10} + params["filters"].clear() url = app.url_path_for("compute:update_nat_node_nio", project_id=vm["project_id"], @@ -124,7 +127,7 @@ class TestNATNodesRoutes: response = await compute_client.put(url, json=params) assert response.status_code == status.HTTP_201_CREATED assert response.json()["type"] == "nio_udp" - + assert response.json()["filters"] == {} async def test_nat_delete_nio(self, app: FastAPI, compute_client: AsyncClient, vm: dict) -> None: diff --git a/tests/api/routes/compute/test_qemu_nodes.py b/tests/api/routes/compute/test_qemu_nodes.py index 464b5ddf8..6edcbec3a 100644 --- a/tests/api/routes/compute/test_qemu_nodes.py +++ b/tests/api/routes/compute/test_qemu_nodes.py @@ -344,7 +344,8 @@ class TestQemuNodesRoutes: "type": "nio_udp", "lport": 4242, "rport": 4343, - "rhost": "127.0.0.1" + "rhost": "127.0.0.1", + "filters": {"packet_loss": 10} } await compute_client.put( @@ -360,9 +361,11 @@ class TestQemuNodesRoutes: port_number="0" ) - await compute_client.post(url, json=params) - params["filters"] = {} - + response = await compute_client.post(url, json=params) + assert response.status_code == status.HTTP_201_CREATED + assert response.json()["filters"] == {"packet_loss": 10} + params["filters"].clear() + url = app.url_path_for( "compute:update_qemu_node_nio", project_id=qemu_vm["project_id"], @@ -373,6 +376,7 @@ class TestQemuNodesRoutes: response = await compute_client.put(url, json=params) assert response.status_code == status.HTTP_201_CREATED assert response.json()["type"] == "nio_udp" + assert response.json()["filters"] == {} async def test_qemu_delete_nio(self, app: FastAPI, compute_client: AsyncClient, qemu_vm: dict) -> None: diff --git a/tests/api/routes/compute/test_vpcs_nodes.py b/tests/api/routes/compute/test_vpcs_nodes.py index 0bf987817..294ab7df8 100644 --- a/tests/api/routes/compute/test_vpcs_nodes.py +++ b/tests/api/routes/compute/test_vpcs_nodes.py @@ -128,7 +128,8 @@ class TestVPCSNodesRoutes: "type": "nio_udp", "lport": 4242, "rport": 4343, - "rhost": "127.0.0.1" + "rhost": "127.0.0.1", + "filters": {"packet_loss": 10} } url = app.url_path_for("compute:create_vpcs_node_nio", @@ -140,8 +141,9 @@ class TestVPCSNodesRoutes: with asyncio_patch("gns3server.compute.vpcs.vpcs_vm.VPCSVM.add_ubridge_udp_connection"): response = await compute_client.post(url, json=params) assert response.status_code == status.HTTP_201_CREATED - - params["filters"] = {} + assert response.json()["filters"] == {"packet_loss": 10} + params["filters"].clear() + url = app.url_path_for("compute:update_vpcs_node_nio", project_id=vm["project_id"], node_id=vm["node_id"], @@ -150,7 +152,7 @@ class TestVPCSNodesRoutes: response = await compute_client.put(url, json=params) assert response.status_code == status.HTTP_201_CREATED assert response.json()["type"] == "nio_udp" - + assert response.json()["filters"] == {} async def test_vpcs_delete_nio(self, app: FastAPI, compute_client: AsyncClient, vm: dict) -> None: