diff --git a/app/routes/export.py b/app/routes/export.py index 9bfd56f..34fe0eb 100644 --- a/app/routes/export.py +++ b/app/routes/export.py @@ -9,11 +9,18 @@ router = APIRouter() # Helper functions for conversions def convert_cpu_to_millicores(cpu): - if "n" in cpu: + """ + Convert CPU usage to millicores (m). + Handles units: n (nano), u (micro), m (milli), or none (cores). + """ + if "n" in cpu: # Convert nanocores to millicores return int(cpu.replace("n", "")) / 1e6 - elif "m" in cpu: + elif "u" in cpu: # Convert microcores to millicores + return int(cpu.replace("u", "")) / 1e3 + elif "m" in cpu: # Already in millicores return int(cpu.replace("m", "")) - return float(cpu) * 1000 + return float(cpu) * 1000 # Convert cores to millicores + def convert_memory_to_mib(memory): if "Ki" in memory: diff --git a/app/routes/k8s.py b/app/routes/k8s.py index 945f157..0938f61 100644 --- a/app/routes/k8s.py +++ b/app/routes/k8s.py @@ -51,11 +51,18 @@ def fetch_k8s_data_with_usage(): def convert_cpu_to_millicores(cpu): - if "n" in cpu: + """ + Convert CPU usage to millicores (m). + Handles units: n (nano), u (micro), m (milli), or none (cores). + """ + if "n" in cpu: # Convert nanocores to millicores return int(cpu.replace("n", "")) / 1e6 - elif "m" in cpu: + elif "u" in cpu: # Convert microcores to millicores + return int(cpu.replace("u", "")) / 1e3 + elif "m" in cpu: # Already in millicores return int(cpu.replace("m", "")) - return float(cpu) * 1000 # Use float to ensure compatibility + return float(cpu) * 1000 # Convert cores to millicores + def convert_memory_to_mib(memory): if "Ki" in memory: