Create and apply networks

Core-i99 · Core-i99 · commit 92d7570285bb · 2025-11-23T20:36:30.000+01:00
diff --git a/backend/vm_manager/network.py b/backend/vm_manager/network.py
@@ -2,6 +2,7 @@
 from pydantic import BaseModel, ConfigDict
 from db import get_session
 import libvirt
+from host_manager import libvirt_connection
 
 
 class LibvirtNetworkBridge(SQLModel, table=True):
@@ -23,6 +24,14 @@ class LibvirtNetworkBridgeResponse(BaseModel):
     active: bool
 
 
+class LibvirtNetworkBridgeApplyResponse(BaseModel):
+    model_config = ConfigDict(from_attributes=True)
+    checked: int
+    removed: int
+    defined: int
+    started: int
+    errors: list[str]
+
 class LibvirtNetworkCustom(SQLModel, table=True):
     __tablename__ = "libvirtnetworkcustom"
     id: int | None = Field(primary_key=True)
@@ -47,15 +56,13 @@ def get_network_bridge(id: int) -> LibvirtNetworkBridgeResponse | None:
         statement = select(LibvirtNetworkBridge).where(LibvirtNetworkBridge.id == id)
         result = session.exec(statement).first()
         if result:
-            # Check if active in libvirt
-            conn = libvirt.open(None)
+            # Check if active in libvirt using shared connection
             try:
+                conn = libvirt_connection.connection
                 network = conn.networkLookupByName(result.name)
                 active = network.isActive() == 1
             except libvirt.libvirtError:
                 active = False
-            finally:
-                conn.close()
             return LibvirtNetworkBridgeResponse(
                 id=result.id,
                 name=result.name,
@@ -128,15 +135,13 @@ def get_network_custom(id: int) -> LibvirtNetworkCustomResponse | None:
         statement = select(LibvirtNetworkCustom).where(LibvirtNetworkCustom.id == id)
         result = session.exec(statement).first()
         if result:
-            # Check if active in libvirt
-            conn = libvirt.open(None)
+            # Check if active in libvirt using shared connection
             try:
+                conn = libvirt_connection.connection
                 network = conn.networkLookupByName(result.name)
                 active = network.isActive() == 1
             except libvirt.libvirtError:
                 active = False
-            finally:
-                conn.close()
             return LibvirtNetworkCustomResponse(
                 id=result.id,
                 name=result.name,
@@ -202,3 +207,95 @@ def delete_network_custom(id: int) -> bool:
             session.commit()
             return True
     return False
+
+
+def apply_network_bridges() -> LibvirtNetworkBridgeApplyResponse:
+    """Apply network bridge settings from the database to libvirt.
+
+    For every bridge entry in the database:
+    - If a libvirt network with the same name exists, destroy and undefine it.
+    - Define a new network XML for the bridge and register it with libvirt.
+    - If the DB entry has `autostart=True`, set autostart and start the network.
+
+    Returns a summary dict with counts and any errors encountered.
+    """
+    summary = {
+        "checked": 0,
+        "removed": 0,
+        "defined": 0,
+        "started": 0,
+        "errors": [],
+    }
+
+    try:
+        conn = libvirt_connection.connection
+    except Exception as e:
+        summary["errors"].append(f"failed-to-get-libvirt-connection:{e}")
+        return summary
+
+    with get_session() as session:
+            stmt = select(LibvirtNetworkBridge)
+            bridges = session.exec(stmt).all()
+            for b in bridges:
+                summary["checked"] += 1
+                # Remove existing definition if present
+                try:
+                    try:
+                        existing = conn.networkLookupByName(b.name)
+                    except libvirt.libvirtError:
+                        existing = None
+
+                    if existing is not None:
+                        try:
+                            if existing.isActive() == 1:
+                                existing.destroy()
+                        except libvirt.libvirtError as e:
+                            # record but continue
+                            summary["errors"].append(f"destroy:{b.name}:{e}")
+                        try:
+                            existing.undefine()
+                            summary["removed"] += 1
+                        except libvirt.libvirtError as e:
+                            summary["errors"].append(f"undefine:{b.name}:{e}")
+
+                    # Build network XML for a bridged network
+                    xml = (
+                        f"<network>"
+                        f"<name>{b.name}</name>"
+                        f"<forward mode='bridge'/>"
+                        f"<bridge name='{b.bridge_name}'/>"
+                        f"</network>"
+                    )
+
+                    try:
+                        net = conn.networkDefineXML(xml)
+                        if net is None:
+                            summary["errors"].append(f"define-failed:{b.name}")
+                        else:
+                            summary["defined"] += 1
+                            # Set autostart and start if requested
+                            if b.autostart:
+                                try:
+                                    net.setAutostart(1)
+                                except libvirt.libvirtError as e:
+                                    summary["errors"].append(f"set-autostart:{b.name}:{e}")
+                                try:
+                                    if net.isActive() != 1:
+                                        net.create()
+                                    summary["started"] += 1
+                                except libvirt.libvirtError as e:
+                                    summary["errors"].append(f"start:{b.name}:{e}")
+                    except libvirt.libvirtError as e:
+                        summary["errors"].append(f"defineXML:{b.name}:{e}")
+
+                except Exception as e:
+                    # Catch-all per-bridge to avoid aborting the whole operation
+                    summary["errors"].append(f"unexpected:{b.name}:{e}")
+                    continue
+    return LibvirtNetworkBridgeApplyResponse(
+        checked=summary["checked"],
+        removed=summary["removed"],
+        defined=summary["defined"],
+        started=summary["started"],
+        errors=summary["errors"],
+    )
diff --git a/backend/vm_manager/routes.py b/backend/vm_manager/routes.py
@@ -6,6 +6,7 @@
 from .vmbasic import VirtualMachineBasic, VirtualMachineBasicTemplate, OvmfPath, VirtualMachineXmlTemplate, VirtualMachineDeviceDiskFile, VirtualMachineDeviceNetwork, VirtualMachineDeviceDiskBlock, VirtualMachineDeviceDiskIscsi, VirtualMachineDevicePci
 from .network import (
     LibvirtNetworkBridge,
+    LibvirtNetworkBridgeApplyResponse,
     LibvirtNetworkBridgeResponse,
     LibvirtNetworkCustom,
     LibvirtNetworkCustomResponse,
@@ -14,6 +15,7 @@
     update_network_bridge,
     delete_network_bridge,
     create_network_bridge,
+    apply_network_bridges,
     get_network_custom,
     get_network_custom_all,
     update_network_custom,
@@ -215,6 +217,16 @@ async def api_vm_network_bridge_delete(bridge_id: int, username: str = Depends(c
         raise HTTPException(status_code=404, detail="Network bridge not found")
     return
 
+
+@router.post("/network/bridge/apply", response_model=LibvirtNetworkBridgeApplyResponse)
+async def api_vm_network_bridges_apply(username: str = Depends(check_auth)):
+    """Apply all network bridge settings from the database to libvirt."""
+    try:
+        result = apply_network_bridges()
+    except Exception as e:
+        raise HTTPException(status_code=500, detail=str(e))
+    return result
+
 @router.get("/network/custom", response_model=list[LibvirtNetworkCustomResponse])
 async def api_vm_network_customs_get(username: str = Depends(check_auth)):
     return get_network_custom_all()
diff --git a/frontend/src/composables/useApi.ts b/frontend/src/composables/useApi.ts
@@ -188,6 +188,12 @@ export function useApi() {
         return data
       },
 
+      async applyBridgeNetworks() {
+        const { data, error } = await client.POST('/api/vm/network/bridge/apply')
+        if (error) throw error
+        return data
+      },
+
       async getCustomNetworks() {
         const { data, error } = await client.GET('/api/vm/network/custom')
         if (error) throw error
diff --git a/frontend/src/pages/vm/NetworkOverviewPage.vue b/frontend/src/pages/vm/NetworkOverviewPage.vue
@@ -32,6 +32,15 @@
         >
           <ToolTip content="Add" />
         </q-btn>
+        <q-btn
+          flat
+          round
+          color="primary"
+          icon="mdi-play-circle"
+          @click="applyBridgeNetworks"
+        >
+          <ToolTip content="Apply" />
+        </q-btn>
         <q-btn
           flat
           round
@@ -99,7 +108,8 @@
   <q-dialog v-model="networkBridgeEditDialog">
     <q-card style="min-width: 70vw">
       <q-card-section class="row items-center q-pb-none">
-        <div class="text-h6">Edit bridge network '{{ editedBridge.name }}'</div>
+        <div v-if="editedBridge && editedBridge.id" class="text-h6">Edit bridge network '{{ editedBridge.name }}'</div>
+        <div v-else class="text-h6">Create bridge network</div>
         <q-space />
         <q-btn icon="close" flat round dense @click="networkBridgeEditDialog = false" />
       </q-card-section>
@@ -131,7 +141,8 @@
   <q-dialog v-model="networkCustomEditDialog">
     <q-card style="min-width: 70vw">
       <q-card-section class="row items-center q-pb-none">
-        <div class="text-h6">Edit custom network '{{ editedCustom.name }}'</div>
+        <div v-if="editedCustom && editedCustom.id" class="text-h6">Edit custom network '{{ editedCustom.name }}'</div>
+        <div v-else class="text-h6">Create custom network</div>
         <q-space />
         <q-btn icon="close" flat round dense @click="networkCustomEditDialog = false" />
       </q-card-section>
@@ -163,6 +174,33 @@
   <ErrorDialog ref="errorDialog" />
   <ConfirmDialog ref="confirmDialog" />
   <ToolTip ref="toolTip" />
+  <q-dialog v-model="applyResultDialog">
+    <q-card>
+      <q-card-section class="row items-center q-pb-none">
+        <div class="text-h6">Apply Result</div>
+        <q-space />
+        <q-btn icon="close" flat round dense v-close-popup @click="applyResultDialog = false" />
+      </q-card-section>
+      <q-separator color="transparent" spaced="lg" inset />
+      <q-card-section class="q-pt-none">
+        <div v-if="applyResult">
+          <div>Checked: {{ applyResult.checked }}</div>
+          <div>Removed: {{ applyResult.removed }}</div>
+          <div>Defined: {{ applyResult.defined }}</div>
+          <div>Started: {{ applyResult.started }}</div>
+          <div v-if="applyResult.errors && applyResult.errors.length">
+            <div class="q-mt-sm text-subtitle2">Errors:</div>
+            <ul>
+              <li v-for="(err, idx) in applyResult.errors" :key="idx">{{ err }}</li>
+            </ul>
+          </div>
+        </div>
+      </q-card-section>
+      <q-card-actions align="right">
+        <q-btn flat label="Close" color="primary" @click="applyResultDialog = false" />
+      </q-card-actions>
+    </q-card>
+  </q-dialog>
 </template>
 
 <script>
@@ -223,6 +261,8 @@ export default {
       ],
       networkBridgesLoading: false,
       networkBridgesSelected: [],
+      applyResultDialog: false,
+      applyResult: null,
 
       networkCustomEditDialog: false,
       editedCustom: {},
@@ -456,6 +496,28 @@ export default {
         })
     },
 
+    applyBridgeNetworks() {
+      this.$refs.confirmDialog.show(
+        'Apply bridge networks',
+        ['This will remove any existing libvirt definitions for the bridges and (re)define and start networks configured in the database. Continue?'],
+        () => {
+          const api = useApi()
+          api.vm
+            .applyBridgeNetworks()
+            .then((res) => {
+              this.applyResult = res
+              this.applyResultDialog = true
+              // refresh data after applying
+              this.getData()
+            })
+            .catch((error) => {
+              this.$refs.errorDialog.show('Error applying bridge networks', [error?.detail || error.message])
+            })
+        },
+        () => {}
+      )
+    },
+
   },
   mounted() {
     this.getData()
diff --git a/frontend/src/types/api.d.ts b/frontend/src/types/api.d.ts
@@ -196,6 +196,26 @@ export interface paths {
         patch?: never;
         trace?: never;
     };
+    "/api/vm/network/bridge/apply": {
+        parameters: {
+            query?: never;
+            header?: never;
+            path?: never;
+            cookie?: never;
+        };
+        get?: never;
+        put?: never;
+        /**
+         * Api Vm Network Bridges Apply
+         * @description Apply all network bridge settings from the database to libvirt.
+         */
+        post: operations["api_vm_network_bridges_apply_api_vm_network_bridge_apply_post"];
+        delete?: never;
+        options?: never;
+        head?: never;
+        patch?: never;
+        trace?: never;
+    };
     "/api/vm/network/custom": {
         parameters: {
             query?: never;
@@ -1119,6 +1139,19 @@ export interface components {
              */
             autostart: boolean;
         };
+        /** LibvirtNetworkBridgeApplyResponse */
+        LibvirtNetworkBridgeApplyResponse: {
+            /** Checked */
+            checked: number;
+            /** Removed */
+            removed: number;
+            /** Defined */
+            defined: number;
+            /** Started */
+            started: number;
+            /** Errors */
+            errors: string[];
+        };
         /** LibvirtNetworkBridgeResponse */
         LibvirtNetworkBridgeResponse: {
             /** Id */
@@ -1962,6 +1995,26 @@ export interface operations {
             };
         };
     };
+    api_vm_network_bridges_apply_api_vm_network_bridge_apply_post: {
+        parameters: {
+            query?: never;
+            header?: never;
+            path?: never;
+            cookie?: never;
+        };
+        requestBody?: never;
+        responses: {
+            /** @description Successful Response */
+            200: {
+                headers: {
+                    [name: string]: unknown;
+                };
+                content: {
+                    "application/json": components["schemas"]["LibvirtNetworkBridgeApplyResponse"];
+                };
+            };
+        };
+    };
     api_vm_network_customs_get_api_vm_network_custom_get: {
         parameters: {
             query?: never;
