Move schemas between compute and controller subpackages

gns3server/api/routes/compute/__init__.py

@@ -138,35 +138,103 @@ async def http_exception_handler(request: Request, exc: StarletteHTTPException):
     )
 
 
-compute_api.include_router(capabilities.router, tags=["Capabilities"])
-compute_api.include_router(compute.router, tags=["Compute"])
-compute_api.include_router(notifications.router, tags=["Notifications"])
-compute_api.include_router(projects.router, tags=["Projects"])
-compute_api.include_router(images.router, tags=["Images"])
 compute_api.include_router(
-    atm_switch_nodes.router, prefix="/projects/{project_id}/atm_switch/nodes", tags=["ATM switch"]
+    capabilities.router,
+    tags=["Capabilities"]
 )
-compute_api.include_router(cloud_nodes.router, prefix="/projects/{project_id}/cloud/nodes", tags=["Cloud nodes"])
-compute_api.include_router(docker_nodes.router, prefix="/projects/{project_id}/docker/nodes", tags=["Docker nodes"])
+
 compute_api.include_router(
-    dynamips_nodes.router, prefix="/projects/{project_id}/dynamips/nodes", tags=["Dynamips nodes"]
+    compute.router,
+    tags=["Compute"]
+)
+
+compute_api.include_router(
+    notifications.router,
+    tags=["Notifications"]
+)
+
+compute_api.include_router(
+    projects.router,
+    tags=["Projects"]
+)
+
+compute_api.include_router(
+    images.router,
+    tags=["Images"]
+)
+
+compute_api.include_router(
+    atm_switch_nodes.router,
+    prefix="/projects/{project_id}/atm_switch/nodes",
+    tags=["ATM switch"]
 )
 compute_api.include_router(
-    ethernet_hub_nodes.router, prefix="/projects/{project_id}/ethernet_hub/nodes", tags=["Ethernet hub nodes"]
+    cloud_nodes.router,
+    prefix="/projects/{project_id}/cloud/nodes",
+    tags=["Cloud nodes"]
 )
+
 compute_api.include_router(
-    ethernet_switch_nodes.router, prefix="/projects/{project_id}/ethernet_switch/nodes", tags=["Ethernet switch nodes"]
+    docker_nodes.router,
+    prefix="/projects/{project_id}/docker/nodes",
+    tags=["Docker nodes"]
 )
+
+compute_api.include_router(
+    dynamips_nodes.router,
+    prefix="/projects/{project_id}/dynamips/nodes",
+    tags=["Dynamips nodes"]
+)
+
+compute_api.include_router(
+    ethernet_hub_nodes.router,
+    prefix="/projects/{project_id}/ethernet_hub/nodes",
+    tags=["Ethernet hub nodes"]
+)
+
+compute_api.include_router(
+    ethernet_switch_nodes.router,
+    prefix="/projects/{project_id}/ethernet_switch/nodes",
+    tags=["Ethernet switch nodes"]
+)
+
 compute_api.include_router(
     frame_relay_switch_nodes.router,
     prefix="/projects/{project_id}/frame_relay_switch/nodes",
-    tags=["Frame Relay switch nodes"],
+    tags=["Frame Relay switch nodes"]
 )
-compute_api.include_router(iou_nodes.router, prefix="/projects/{project_id}/iou/nodes", tags=["IOU nodes"])
-compute_api.include_router(nat_nodes.router, prefix="/projects/{project_id}/nat/nodes", tags=["NAT nodes"])
-compute_api.include_router(qemu_nodes.router, prefix="/projects/{project_id}/qemu/nodes", tags=["Qemu nodes"])
+
 compute_api.include_router(
-    virtualbox_nodes.router, prefix="/projects/{project_id}/virtualbox/nodes", tags=["VirtualBox nodes"]
+    iou_nodes.router,
+    prefix="/projects/{project_id}/iou/nodes",
+    tags=["IOU nodes"])
+
+compute_api.include_router(
+    nat_nodes.router,
+    prefix="/projects/{project_id}/nat/nodes",
+    tags=["NAT nodes"]
+)
+
+compute_api.include_router(
+    qemu_nodes.router,
+    prefix="/projects/{project_id}/qemu/nodes",
+    tags=["Qemu nodes"]
+)
+
+compute_api.include_router(
+    virtualbox_nodes.router,
+    prefix="/projects/{project_id}/virtualbox/nodes",
+    tags=["VirtualBox nodes"]
+)
+
+compute_api.include_router(
+    vmware_nodes.router,
+    prefix="/projects/{project_id}/vmware/nodes",
+    tags=["VMware nodes"]
+)
+
+compute_api.include_router(
+    vpcs_nodes.router,
+    prefix="/projects/{project_id}/vpcs/nodes",
+    tags=["VPCS nodes"]
 )
-compute_api.include_router(vmware_nodes.router, prefix="/projects/{project_id}/vmware/nodes", tags=["VMware nodes"])
-compute_api.include_router(vpcs_nodes.router, prefix="/projects/{project_id}/vpcs/nodes", tags=["VPCS nodes"])

gns3server/api/routes/compute/virtualbox_nodes.py

@@ -149,11 +149,6 @@ async def start_virtualbox_node(node: VirtualBoxVM = Depends(dep_node)):
     Start a VirtualBox node.
     """
 
-    if await node.check_hw_virtualization():
-        pm = ProjectManager.instance()
-        if pm.check_hardware_virtualization(node) is False:
-            pass  # FIXME: check this
-            # raise ComputeError("Cannot start VM with hardware acceleration (KVM/HAX) enabled because hardware virtualization (VT-x/AMD-V) is already used by another software like VMware or VirtualBox")
     await node.start()
 
 

gns3server/api/routes/compute/vmware_nodes.py

@@ -117,11 +117,6 @@ async def start_vmware_node(node: VMwareVM = Depends(dep_node)):
     Start a VMware node.
     """
 
-    if node.check_hw_virtualization():
-        pm = ProjectManager.instance()
-        if pm.check_hardware_virtualization(node) is False:
-            pass  # FIXME: check this
-            # raise ComputeError("Cannot start VM with hardware acceleration (KVM/HAX) enabled because hardware virtualization (VT-x/AMD-V) is already used by another software like VMware or VirtualBox")
     await node.start()
 
 

gns3server/api/routes/controller/nodes.py

@@ -108,7 +108,7 @@ async def dep_node(node_id: UUID, project: Project = Depends(dep_project)):
         409: {"model": schemas.ErrorMessage, "description": "Could not create node"},
     },
 )
-async def create_node(node_data: schemas.Node, project: Project = Depends(dep_project)):
+async def create_node(node_data: schemas.NodeCreate, project: Project = Depends(dep_project)):
     """
     Create a new node.
     """