diff --git a/app/__init__.py b/app/__init__.py index e49b8c3e..c1f21ac2 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -408,7 +408,7 @@ def managevm(op=None, infid=None, vmid=None): vminfo.systems[0].addFeature(Feature("cpu.count", ">=", cpu), conflict="other", missing="other") vminfo.systems[0].delValue("memory.size") - vminfo.systems[0].addFeature(Feature("memory.size", ">=", memory, "GB"), + vminfo.systems[0].addFeature(Feature("memory.size", ">=", memory, "GiB"), conflict="other", missing="other") if gpu > 0: vminfo.systems[0].delValue("gpu.count") @@ -417,7 +417,7 @@ def managevm(op=None, infid=None, vmid=None): if disk_size > 0: vminfo.systems[0].delValue("disks.free_size") vminfo.systems[0].delValue("disks.0.free_size") - vminfo.systems[0].addFeature(Feature("disks.free_size", ">=", disk_size, "GB"), + vminfo.systems[0].addFeature(Feature("disks.free_size", ">=", disk_size, "GiB"), conflict="other", missing="other") response = im.resize_vm(infid, vmid, str(vminfo), auth_data) else: diff --git a/app/tests/test_app.py b/app/tests/test_app.py index cc9fa0a6..087cfb03 100644 --- a/app/tests/test_app.py +++ b/app/tests/test_app.py @@ -41,7 +41,7 @@ def get_response(url, params=None, **kwargs): elif url == "/im/infrastructures/infid/vms/0": resp.ok = True resp.status_code = 200 - resp.text = "system front (cpu.count = 1 and memory.size = 512 MB)" + resp.text = "system front (cpu.count = 1 and memory.size = 512 MiB)" radl = {"class": "system", "cpu.arch": "x86_64", "cpu.count_min": 1, diff --git a/requirements.txt b/requirements.txt index 0ea99b47..56d3b983 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,7 +5,7 @@ requests==2.32.2 PyYAML==6.0.2 packaging==24.1 xmltodict==0.13.0 -radl==1.3.2 +radl==1.3.4 cryptography==43.0.1 apscheduler==3.10.4 # 3.8.1 version fails Flask-APScheduler==1.13.1