aetherscale

commit f591c62eb342080bba77d8867865648b2af5a467
parent 43632e73cc91434ae32069ccf49a6275c09c78ae
Author: Stefan Koch <programming@stefan-koch.name>
Date:   Sun, 31 Jan 2021 11:49:06 +0100

delete VM setup script folder on deletion of VM

Diffstat:
M
aetherscale/computing.py
 | 
38
++++++++------------------------------
M
aetherscale/paths.py
 | 
33
+++++++++++++++++++++++++++++++++

2 files changed, 41 insertions(+), 30 deletions(-)
diff --git a/aetherscale/computing.py b/aetherscale/computing.py
@@ -1,4 +1,3 @@
-import enum
 import logging
 import json
 import os
@@ -8,12 +7,16 @@ import psutil
 import random
 import re
 import shlex
+import shutil
 import string
 import subprocess
 import sys
 import tempfile
 from typing import List, Optional, Dict, Any, Callable, Tuple, Iterator
 
+from aetherscale.paths import \
+    user_image_path, qemu_socket_monitor, qemu_socket_guest_agent, \
+    resource_config_path, ResourceType
 from . import networking
 from .qemu import image, runtime
 from .qemu.exceptions import QemuException
@@ -35,18 +38,6 @@ RADVD_SERVICE_NAME = 'aetherscale-radvd.service'
 logging.basicConfig(level=config.LOG_LEVEL)
 
 
-def user_image_path(vm_id: str) -> Path:
-    return config.USER_IMAGE_FOLDER / f'{vm_id}.qcow2'
-
-
-def qemu_socket_monitor(vm_id: str) -> Path:
-    return Path(f'/tmp/aetherscale-qmp-{vm_id}.sock')
-
-
-def qemu_socket_guest_agent(vm_id: str) -> Path:
-    return Path(f'/tmp/aetherscale-qga-{vm_id}.sock')
-
-
 def create_user_image(vm_id: str, image_name: str) -> Path:
     base_image = config.BASE_IMAGE_FOLDER / f'{image_name}.qcow2'
     if not base_image.is_file():
@@ -63,23 +54,6 @@ def create_user_image(vm_id: str, image_name: str) -> Path:
     return user_image
 
 
-class ResourceType(enum.Enum):
-    VM = enum.auto()
-    VPN = enum.auto()
-
-
-def resource_config_path(
-        resource_type: ResourceType, resource_name: str) -> Path:
-    if resource_type == ResourceType.VM:
-        resource_folder = 'vm'
-    elif resource_type == ResourceType.VPN:
-        resource_folder = 'vpn'
-    else:
-        raise ValueError(f'Unknown resource type {resource_type}')
-
-    return config.AETHERSCALE_CONFIG_DIR / resource_folder / resource_name
-
-
 def setup_script_path(resource_folder: Path, tap_name: str) -> Path:
     return resource_folder / f'{tap_name}-setup.sh'
 
@@ -340,6 +314,10 @@ class ComputingHandler:
         self.service_manager.uninstall_service(unit_name)
         user_image.unlink()
 
+        # once we delete the VM, we don't need its setup scripts anymore
+        resource_folder = resource_config_path(ResourceType.VM, vm_id)
+        shutil.rmtree(resource_folder)
+
         yield {
             'status': 'deleted',
             'vm-id': vm_id,
diff --git a/aetherscale/paths.py b/aetherscale/paths.py
@@ -0,0 +1,33 @@
+import enum
+from pathlib import Path
+
+from aetherscale import config
+
+
+class ResourceType(enum.Enum):
+    VM = enum.auto()
+    VPN = enum.auto()
+
+
+def user_image_path(vm_id: str) -> Path:
+    return config.USER_IMAGE_FOLDER / f'{vm_id}.qcow2'
+
+
+def qemu_socket_monitor(vm_id: str) -> Path:
+    return Path(f'/tmp/aetherscale-qmp-{vm_id}.sock')
+
+
+def qemu_socket_guest_agent(vm_id: str) -> Path:
+    return Path(f'/tmp/aetherscale-qga-{vm_id}.sock')
+
+
+def resource_config_path(
+        resource_type: ResourceType, resource_name: str) -> Path:
+    if resource_type == ResourceType.VM:
+        resource_folder = 'vm'
+    elif resource_type == ResourceType.VPN:
+        resource_folder = 'vpn'
+    else:
+        raise ValueError(f'Unknown resource type {resource_type}')
+
+    return config.AETHERSCALE_CONFIG_DIR / resource_folder / resource_name