Update

Author: Core-i99

backend/insert_vm.py

@@ -4,8 +4,10 @@
 
 if __name__ == "__main__":
     xml_template = None
+    xml_template_2 = None
     with get_session() as session:
         xml_template = session.exec(select(VirtualMachineXmlTemplate).where(VirtualMachineXmlTemplate.name == "Basic VM")).first()
+        xml_template_2 = session.exec(select(VirtualMachineXmlTemplate).where(VirtualMachineXmlTemplate.name == "Basic VM USB2")).first()
 
     ovmf_path = None
     with get_session() as session:
@@ -74,7 +76,7 @@
         memory_min=1*1024*1024*1024,
         memory_max=1*1024*1024*1024,
         video_type=VirtualMachineBasicVideoTypes.QXL,
-        xml_template=xml_template
+        xml_template=xml_template_2
     )
 
     with get_session() as session:

backend/insert_vm_templates.py

@@ -15,6 +15,7 @@ def insert_vm_templates():
 <os>
     <type arch='x86_64' machine='{%machine_type%}'>hvm</type>
     {%loader%}
+    <bootmenu enable="yes"/>
 </os>
 <features>
     <acpi/>
@@ -44,6 +45,60 @@ def insert_vm_templates():
     {%graphics%}
     {%video%}
 </devices>
+</domain>""")
+    
+    xml_template_2 = VirtualMachineXmlTemplate(
+        name="Basic VM USB2",
+        description="Basic VM with USB2",
+        content=
+"""<domain type='kvm'>
+<name>{%name%}</name>
+<memory unit='B'>{%memory_max%}</memory>
+<currentMemory unit='B'>{%memory_min%}</currentMemory>
+<vcpu placement='static' current='{%vcpu_current%}'>{%vcpu%}</vcpu>
+<os>
+    <type arch='x86_64' machine='{%machine_type%}'>hvm</type>
+    {%loader%}
+    <bootmenu enable="yes"/>
+</os>
+<features>
+    <acpi/>
+    <apic/>
+    <hyperv mode='custom'>
+    <relaxed state='on'/>
+    <vapic state='on'/>
+    <spinlocks state='on' retries='8191'/>
+    </hyperv>
+    <vmport state='off'/>
+</features>
+<cpu mode='{%cpu_model%}' check='partial'/>
+<clock offset='utc'/>
+<on_poweroff>destroy</on_poweroff>
+<on_reboot>restart</on_reboot>
+<on_crash>destroy</on_crash>
+<devices>
+    <emulator>{%qemu_path%}</emulator>
+    {%devices_disk_file%}
+    {%devices_network%}
+    <controller type='pci' index='0' model='pcie-root'/>
+    <controller type="usb" index="0" model="ich9-ehci1"/>
+    <controller type="usb" index="0" model="ich9-uhci1">
+      <master startport="0"/>
+    </controller>
+    <controller type="usb" index="0" model="ich9-uhci2">
+      <master startport="2"/>
+    </controller>
+    <controller type="usb" index="0" model="ich9-uhci3">
+      <master startport="4"/>
+    </controller>
+    <input type='tablet' bus='usb'>
+    <address type='usb' bus='0' port='1'/>
+    </input>
+    <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
+    {%graphics%}
+    {%video%}
+</devices>
 </domain>""")
 
     # OVMF_path is the OVMF path in the database with name "OVMF"
@@ -70,7 +125,7 @@ def insert_vm_templates():
         ovmf_path=ovmf_path,
         memory_min=2*1024*1024*1024,
         memory_max=4*1024*1024*1024,
-        video_type=VirtualMachineBasicVideoTypes.VIRTIO,
+        video_type=VirtualMachineBasicVideoTypes.QXL,
         vdisk_required=True,
         vdisk_type=VirtualMachineBasicVDiskTypes.QCOW2,
         vdisk_bus_type=VirtualMachineBasicDiskBusTypes.SATA,
@@ -82,9 +137,39 @@ def insert_vm_templates():
         xml_template=xml_template
     )
 
+    vm_template_2 = VirtualMachineBasicTemplate(
+        name="Windows 7",
+        description="Windows 7",
+        cpu_model="host-passthrough",
+        vcpu=2,
+        vcpu_current=2,
+        vcpu_custom_topology=False,
+        vcpu_custom_topology_sockets=None,
+        vcpu_custom_topology_dies=None,
+        vcpu_custom_topology_cores=None,
+        vcpu_custom_topology_threads=None,
+        machine_type="pc-q35-7.2",
+        bios_type=VirtualMachineBasicBiosTypes.OVMF,
+        ovmf_path=ovmf_path,
+        memory_min=2*1024*1024*1024,
+        memory_max=4*1024*1024*1024,
+        video_type=VirtualMachineBasicVideoTypes.QXL,
+        vdisk_required=True,
+        vdisk_type=VirtualMachineBasicVDiskTypes.QCOW2,
+        vdisk_bus_type=VirtualMachineBasicDiskBusTypes.SATA,
+        vdisk_min_size=40*1024*1024*1024,
+        network_interface_required=True,
+        network_interface_type=VirtualMachineBasicNetworkTypes.E1000,
+        cdrom_required=True,
+        cdrom_bus_type=VirtualMachineBasicDiskBusTypes.SATA,
+        xml_template=xml_template_2
+    )
+
     with get_session() as session:
         session.add(xml_template)
+        session.add(xml_template_2)
         session.add(vm_template)
+        session.add(vm_template_2)
         session.commit()
 
 if __name__ == "__main__":

backend/vm_manager/vmManagerException.py backend/vm_manager/VmException.pybackend/vm_manager/vmManagerException.py renamed to backend/vm_manager/VmException.py

@@ -1,4 +1,4 @@
-class VmManagerException(Exception):
+class VmException(Exception):
     def __init__(self, message):
         self.message = message
         super().__init__(self.message)

backend/vm_manager/routes.py

@@ -1,9 +1,9 @@
-from .VmManagerException import VmManagerException
+from .VmException import VmException
 from fastapi import APIRouter, Depends, HTTPException
 from auth_manager.auth import check_auth
 from db.database import get_session
 from sqlmodel import select
-from .vmbasic import VirtualMachineBasic, VirtualMachineBasicTemplate, OvmfPath, VirtualMachineBasicConfig, VirtualMachineXmlTemplate, VirtualMachineDeviceDiskFile, VirtualMachineDeviceNetwork, VirtualMachineDeviceDiskBlock
+from .vmbasic import VirtualMachineBasic, VirtualMachineBasicTemplate, OvmfPath, VirtualMachineBasicLibvirtConfig, VirtualMachineXmlTemplate, VirtualMachineDeviceDiskFile, VirtualMachineDeviceNetwork, VirtualMachineDeviceDiskBlock, get_vm_networks
 
 router = APIRouter()
 
@@ -34,13 +34,17 @@ async def api_vm_xml_template_get(xml_template_id: int, username: str = Depends(
         if xml_template is None:
             raise HTTPException(status_code=404, detail="XML Template not found")
         return xml_template
-    
+
+@router.get("/networks")
+async def api_vm_networks_get(username: str = Depends(check_auth)):
+    return get_vm_networks()
+
 @router.get("/")
 async def api_vm_get(username: str = Depends(check_auth)):
     with get_session() as session:
         vms = session.exec(select(VirtualMachineBasic)).all()
 
-        vms = [VirtualMachineBasicConfig(vm).to_dict() for vm in vms]
+        vms = [VirtualMachineBasicLibvirtConfig(vm).to_dict() for vm in vms]
         return vms
 
 @router.get("/{vm_id}")
@@ -49,7 +53,7 @@ async def api_vm_get_id(vm_id: int, username: str = Depends(check_auth)):
         vm = session.exec(select(VirtualMachineBasic).where(VirtualMachineBasic.id == vm_id)).first()
         if vm is None:
             raise HTTPException(status_code=404, detail="VM not found")
-        return VirtualMachineBasicConfig(vm).to_dict()
+        return VirtualMachineBasicLibvirtConfig(vm).to_dict()
 
 @router.delete("/{vm_id}")
 async def api_vm_delete(vm_id: int, username: str = Depends(check_auth)):
@@ -58,20 +62,45 @@ async def api_vm_delete(vm_id: int, username: str = Depends(check_auth)):
         if vm is None:
             raise HTTPException(status_code=404, detail="VM not found")
         try:
-            VirtualMachineBasicConfig(vm).remove()
+            VirtualMachineBasicLibvirtConfig(vm).remove()
         except Exception as e:
             raise HTTPException(status_code=500, detail=str(e))
         session.delete(vm)
         session.commit()
 
+@router.put("/{vm_id}")
+async def api_vm_update(vm_id: int, vm: VirtualMachineBasic, username: str = Depends(check_auth)):
+    with get_session() as session:
+        old_vm = session.exec(select(VirtualMachineBasic).where(VirtualMachineBasic.id == vm_id)).first()
+        if old_vm is None:
+            raise HTTPException(status_code=404, detail="VM not found")
+        old_vm.name = vm.name
+        old_vm.autostart = vm.autostart
+        old_vm.cpu_model = vm.cpu_model
+        old_vm.vcpu = vm.vcpu
+        old_vm.vcpu_current = vm.vcpu_current
+        old_vm.vcpu_custom_topology = vm.vcpu_custom_topology
+        old_vm.vcpu_custom_topology_sockets = vm.vcpu_custom_topology_sockets
+        old_vm.vcpu_custom_topology_dies = vm.vcpu_custom_topology_dies
+        old_vm.vcpu_custom_topology_cores = vm.vcpu_custom_topology_cores
+        old_vm.vcpu_custom_topology_threads = vm.vcpu_custom_topology_threads
+        old_vm.memory_min = vm.memory_min
+        old_vm.memory_max = vm.memory_max
+        old_vm.video_type = vm.video_type
+        session.commit()
+        return
+
 @router.post("/{vm_id}/start")
 async def api_vm_start(vm_id: int, username: str = Depends(check_auth)):
     with get_session() as session:
         vm = session.exec(select(VirtualMachineBasic).where(VirtualMachineBasic.id == vm_id)).first()
         if vm is None:
             raise HTTPException(status_code=404, detail="VM not found")
         print(f"Starting VM {vm_id}")
-        VirtualMachineBasicConfig(vm).start()
+        try:
+            VirtualMachineBasicLibvirtConfig(vm).start()
+        except VmException as e:
+            raise HTTPException(status_code=500, detail=str(e))
         return
 
 @router.post("/{vm_id}/shutdown")
@@ -81,7 +110,7 @@ async def api_vm_shutdown(vm_id: int, username: str = Depends(check_auth)):
         if vm is None:
             raise HTTPException(status_code=404, detail="VM not found")
         print(f"Shutting down VM {vm_id}")
-        VirtualMachineBasicConfig(vm).shutdown()
+        VirtualMachineBasicLibvirtConfig(vm).shutdown()
         return
 
 @router.post("/{vm_id}/forcestop")
@@ -91,7 +120,7 @@ async def api_vm_forcestop(vm_id: int, username: str = Depends(check_auth)):
         if vm is None:
             raise HTTPException(status_code=404, detail="VM not found")
         print(f"Force stopping VM {vm_id}")
-        VirtualMachineBasicConfig(vm).forcestop()
+        VirtualMachineBasicLibvirtConfig(vm).forcestop()
         return
 
 @router.post("/{vm_id}/reset")
@@ -101,10 +130,9 @@ async def api_vm_reset(vm_id: int, username: str = Depends(check_auth)):
         if vm is None:
             raise HTTPException(status_code=404, detail="VM not found")
         print(f"Resetting VM {vm_id}")
-        VirtualMachineBasicConfig(vm).reset()
+        VirtualMachineBasicLibvirtConfig(vm).reset()
         return
 
-# /devices actions
 @router.delete("/{vm_id}/devices/network/{device_id}")
 async def api_vm_delete_device_network(vm_id: int, device_id: int, username: str = Depends(check_auth)):
     with get_session() as session:
@@ -114,6 +142,19 @@ async def api_vm_delete_device_network(vm_id: int, device_id: int, username: str
         session.delete(network_device)
         session.commit()
 
+@router.post("/{vm_id}/devices/network")
+async def api_vm_add_device_network(vm_id: int, device: VirtualMachineDeviceNetwork, username: str = Depends(check_auth)):
+    print(f"Adding network device {device}")
+    with get_session() as session:
+        vm = session.exec(select(VirtualMachineBasic).where(VirtualMachineBasic.id == vm_id)).first()
+        if vm is None:
+            raise HTTPException(status_code=404, detail="VM not found")
+        device.vm = vm
+        session.add(device)
+        session.commit()
+        return device
+    return
+
 @router.delete("/{vm_id}/devices/disk-file/{device_id}")
 async def api_vm_delete_device_disk_file(vm_id: int, device_id: int, username: str = Depends(check_auth)):
     with get_session() as session:
@@ -123,6 +164,19 @@ async def api_vm_delete_device_disk_file(vm_id: int, device_id: int, username: s
         session.delete(disk_device_file)
         session.commit()
 
+@router.post("/{vm_id}/devices/disk-file")
+async def api_vm_add_device_disk_file(vm_id: int, device: VirtualMachineDeviceDiskFile, username: str = Depends(check_auth)):
+    print(f"Adding disk device {device}")
+    with get_session() as session:
+        vm = session.exec(select(VirtualMachineBasic).where(VirtualMachineBasic.id == vm_id)).first()
+        if vm is None:
+            raise HTTPException(status_code=404, detail="VM not found")
+        device.vm = vm
+        session.add(device)
+        session.commit()
+        return device
+    return
+
 @router.delete("/{vm_id}/devices/disk-block/{device_id}")
 async def api_vm_delete_device_disk_block(vm_id: int, device_id: int, username: str = Depends(check_auth)):
     with get_session() as session:
@@ -132,18 +186,15 @@ async def api_vm_delete_device_disk_block(vm_id: int, device_id: int, username:
         session.delete(disk_device_block)
         session.commit()
 
-@router.post("/{vm_id}/devices/network")
-async def api_vm_add_device_network(vm_id: int, device: VirtualMachineDeviceNetwork, username: str = Depends(check_auth)):
-    print(f"Adding network device {device}")
-    # with get_session() as session:
-    #     vm = session.exec(select(VirtualMachineBasic).where(VirtualMachineBasic.id == vm_id)).first()
-    #     if vm is None:
-    #         raise HTTPException(status_code=404, detail="VM not found")
-    #     device.vm = vm
-    #     session.add(device)
-    #     session.commit()
-    #     return device
+@router.post("/{vm_id}/devices/disk-block")
+async def api_vm_add_device_disk_block(vm_id: int, device: VirtualMachineDeviceDiskBlock, username: str = Depends(check_auth)):
+    print(f"Adding disk device {device}")
+    with get_session() as session:
+        vm = session.exec(select(VirtualMachineBasic).where(VirtualMachineBasic.id == vm_id)).first()
+        if vm is None:
+            raise HTTPException(status_code=404, detail="VM not found")
+        device.vm = vm
+        session.add(device)
+        session.commit()
+        return device
     return
-
-    
-