Merge branch 'GNS3:3.0' into 3.0

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)

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)

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)

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)

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)

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()
 

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()
 

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)

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)

gns3server/api/routes/controller/projects.py

@@ -113,6 +113,7 @@ async def get_projects(
 )
 async def create_project(
         project_data: schemas.ProjectCreate,
+        current_user: schemas.User = Depends(get_current_active_user),
 ) -> schemas.Project:
     """
     Create a new project.
@@ -121,7 +122,9 @@ async def create_project(
     """
 
     controller = Controller.instance()
-    project = await controller.add_project(**jsonable_encoder(project_data, exclude_unset=True))
+    project_dict = jsonable_encoder(project_data, exclude_unset=True)
+    project_dict["created_by"] = current_user.username
+    project = await controller.add_project(**project_dict)
     return project.asdict()