capacity limiter and general cleanup

capsulflask/virt_model.py

@@ -9,7 +9,7 @@ from subprocess import run
 from capsulflask.db import get_model
 
 def validate_capsul_id(id):
-  if not re.match(r"^capsul-[a-z0-9]{10}$", id):
+  if not re.match(r"^(cvm|capsul)-[a-z0-9]{10}$", id):
     raise ValueError(f"vm id \"{id}\" must match \"^capsul-[a-z0-9]{{10}}$\"")
 
 class VirtualMachine:
@@ -19,6 +19,9 @@ class VirtualMachine:
     self.ipv6 = ipv6
 
 class VirtualizationInterface:
+  def capacity_avaliable(self, additional_ram_bytes: int) -> bool:
+    pass
+
   def get(self, id: str) -> VirtualMachine:
     pass
 
@@ -32,6 +35,9 @@ class VirtualizationInterface:
     pass
 
 class MockVirtualization(VirtualizationInterface):
+  def capacity_avaliable(self, additional_ram_bytes):
+    return True
+
   def get(self, id):
     validate_capsul_id(id)
     return VirtualMachine(id, ipv4="1.1.1.1")
@@ -63,6 +69,27 @@ class ShellScriptVirtualization(VirtualizationInterface):
         {completedProcess.stderr}
       """)
 
+  def capacity_avaliable(self, additional_ram_bytes):
+    my_args=[join(current_app.root_path, 'shell_scripts/capacity-avaliable.sh'), additional_ram_bytes]
+    completedProcess = run(my_args, capture_output=True)
+
+    if completedProcess.returncode != 0:
+      print(f"""
+      capacity-avaliable.sh exited {completedProcess.returncode} with
+        stdout:
+        {completedProcess.stdout}
+        stderr:
+        {completedProcess.stderr}
+      """)
+      return False
+
+    lines = completedProcess.stdout.splitlines()
+    if not lines[len(lines)-1] == "yes":
+      print("capacity-avaliable.sh exited 0 but did not return \"yes\" ")
+      return False
+
+    return True
+
   def get(self, id):
     validate_capsul_id(id)
     completedProcess = run([join(current_app.root_path, 'shell_scripts/get.sh'), id], capture_output=True)
@@ -75,7 +102,7 @@ class ShellScriptVirtualization(VirtualizationInterface):
     return VirtualMachine(id, ipv4=lines[0])
 
   def list_ids(self) -> list:
-    completedProcess = run([join(current_app.root_path, 'shell_scripts/list_ids.sh')], capture_output=True)
+    completedProcess = run([join(current_app.root_path, 'shell_scripts/list-ids.sh')], capture_output=True)
     self.validate_completed_process(completedProcess)
     return completedProcess.stdout.splitlines()