rp create and delete

balancer/util.py

@@ -11,6 +11,7 @@ from fastapi import HTTPException
 import requests
 import requests
 import json
 import json
 from core.models import ResourcePoolSchema
 from core.models import ResourcePoolSchema
+from sredis.models import ResourcePool
 import logging
 import logging
 
 
 logger = logging.getLogger(__name__)
 logger = logging.getLogger(__name__)
@@ -97,14 +98,14 @@ def create_rp(username: str, rp: ResourcePoolSchema):
         for dc, cnt in rp.manual.items():
         for dc, cnt in rp.manual.items():
             for _ in range(cnt):
             for _ in range(cnt):
                 try:
                 try:
-                    create_vm_from_template(
+                    body = create_vm_from_template(
                         dc,
                         dc,
                         username,
                         username,
                         name=f"{rp.rpname} #{id}",
                         name=f"{rp.rpname} #{id}",
                         template_name=rp.from_template,
                         template_name=rp.from_template,
                     )
                     )
 
 
-                    save_rpvm(rp.rpname, username, dc, id, rp.key)
+                    save_rpvm(rp.rpname, username, dc, body["id"], rp.key)
 
 
                     id += 1
                     id += 1
                 except Exception:
                 except Exception:
@@ -119,14 +120,14 @@ def create_rp(username: str, rp: ResourcePoolSchema):
             cnt = int(frac * ram / details["ram_size"])
             cnt = int(frac * ram / details["ram_size"])
             for _ in range(cnt):
             for _ in range(cnt):
                 try:
                 try:
-                    create_vm_from_template(
+                    body = create_vm_from_template(
                         dc,
                         dc,
                         username,
                         username,
                         name=f"{rp.rpname} #{id}",
                         name=f"{rp.rpname} #{id}",
                         template_name=rp.from_template,
                         template_name=rp.from_template,
                     )
                     )
 
 
-                    save_rpvm(rp.rpname, username, dc, id, rp.key)
+                    save_rpvm(rp.rpname, username, dc, body["id"], rp.key)
 
 
                     id += 1
                     id += 1
                 except Exception:
                 except Exception:
@@ -135,6 +136,22 @@ def create_rp(username: str, rp: ResourcePoolSchema):
     return id, errors
     return id, errors
 
 
 
 
+def delete_rp(username: str, rpname: str):
+    rpvm = ResourcePool.find(ResourcePool.rpname == rpname).first()
+    while rpvm:
+        if rpvm.owner != username:
+            raise HTTPException(
+                tatus_code=401,
+                detail=f"Cannot delete this resourcepool",
+            )
+        proxy_datacenters(f"dashboard/acpi/vm/{rpvm.id}/", 
+                          username, 
+                          "DELETE", 
+                          datacenter=rpvm.datacenter)
+        rpvm.delete()
+        rpvm = ResourcePool.find(ResourcePool.rpname == rpname).first()
+
+
 def check_template_details_from_name(template_name, username):
 def check_template_details_from_name(template_name, username):
     dcs = get_all_datacenter()
     dcs = get_all_datacenter()
 
 

main.py

 from fastapi import FastAPI, Response, Body, Depends
 from fastapi import FastAPI, Response, Body, Depends
 import os
 import os
 from typing import List
 from typing import List
-from balancer.util import get_vm_from_rp, proxy_datacenters, create_rp
+from balancer.util import delete_rp, get_vm_from_rp, proxy_datacenters, create_rp
 from sredis.sredis import (
 from sredis.sredis import (
     check_user,
     check_user,
     create_puser,
     create_puser,
@@ -97,10 +97,16 @@ def proxy_post_ff(
 
 
 @app.post("/createrp/")
 @app.post("/createrp/")
 def create_resource_pool(
 def create_resource_pool(
-    username=Depends(get_current_user), rp: ResourcePoolSchema = Body(...)
+    username=Depends(admin_user), rp: ResourcePoolSchema = Body(...)
 ):
 ):
     create_rp(username, rp)
     create_rp(username, rp)
 
 
+@app.delete("/deleterp/")
+def create_resource_pool(
+    username=Depends(admin_user), rpname: str = ""
+):
+    delete_rp(username, rpname)
+
 
 
 @app.post("/rp/")
 @app.post("/rp/")
 def get_vm_from_pool(
 def get_vm_from_pool(

sredis/sredis.py

@@ -243,4 +243,4 @@ def pop_vm(rpname, key):
         vm = rpvm.datacenter, rpvm.id
         vm = rpvm.datacenter, rpvm.id
         rpvm.delete()
         rpvm.delete()
         return vm
         return vm
-    return None
+    return None
\ No newline at end of file