From 91ec098aa05d210e51128a35263e8c8b11934a2d Mon Sep 17 00:00:00 2001 From: catborise Date: Thu, 18 May 2023 14:35:19 +0300 Subject: [PATCH 1/2] fix cpu_usage waiting for instance creation. --- computes/models.py | 2 +- vrtManager/hostdetails.py | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/computes/models.py b/computes/models.py index 86df52a..3f17254 100644 --- a/computes/models.py +++ b/computes/models.py @@ -51,7 +51,7 @@ class Compute(Model): @cached_property def cpu_usage(self): - return round(self.proxy.get_cpu_usage().get('usage')) + return round(self.proxy.get_cpu_usage(diff=False).get('usage')) @cached_property def ram_size(self): diff --git a/vrtManager/hostdetails.py b/vrtManager/hostdetails.py index 0b7c313..31aca86 100644 --- a/vrtManager/hostdetails.py +++ b/vrtManager/hostdetails.py @@ -27,7 +27,7 @@ class wvmHostDetails(wvmConnect): else: return {"total": None, "usage": None, "percent": None} - def get_cpu_usage(self): + def get_cpu_usage(self, diff=True): """ Function return cpu usage on node. """ @@ -43,6 +43,8 @@ class wvmHostDetails(wvmConnect): diff_idle = idle - prev_idle diff_total = total - prev_total diff_usage = (1000 * (diff_total - diff_idle) / diff_total + 5) / 10 + if not diff: + return {"usage": diff_usage} prev_total = total prev_idle = idle if num == 0: From 07d7a6d7527e845227bda2a3f0ccf60d1dad0649 Mon Sep 17 00:00:00 2001 From: catborise Date: Tue, 11 Jul 2023 11:14:56 +0300 Subject: [PATCH 2/2] update requirements --- conf/requirements.txt | 16 ++++++++-------- dev/requirements.txt | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/conf/requirements.txt b/conf/requirements.txt index c227892..31fede1 100644 --- a/conf/requirements.txt +++ b/conf/requirements.txt @@ -1,22 +1,22 @@ -Django==3.2.19 -django_bootstrap5==23.1 +Django==3.2.20 +django_bootstrap5==23.3 django-login-required-middleware==0.9.0 -django-otp==1.1.6 -django-icons==23.2 +django-otp==1.2.2 +django-icons==23.3 django-qr-code==3.1.1 gunicorn==20.1.0 libsass==0.22.0 -libvirt-python==9.3.0 -lxml==4.9.2 +libvirt-python==9.5.0 +lxml==4.9.3 qrcode==7.4.2 rwlock==0.0.7 websockify==0.10.0 zipp==3.13.0 ldap3==2.9.1 -python-engineio==4.4.1 +python-engineio==4.5.1 python-socketio==5.8.0 eventlet==0.33.3 djangorestframework==3.14.0 drf-nested-routers==0.93.4 -drf-yasg==1.21.5 +drf-yasg==1.21.6 markdown>=3.4.1 diff --git a/dev/requirements.txt b/dev/requirements.txt index 9e2fba3..bc65fd9 100644 --- a/dev/requirements.txt +++ b/dev/requirements.txt @@ -1,8 +1,8 @@ -r ../conf/requirements.txt -coverage==7.2.5 -django-debug-toolbar==4.0.0 +coverage==7.2.7 +django-debug-toolbar==4.1.0 pycodestyle==2.10.0 pyflakes==3.0.1 pylint==2.17.4 yapf==0.33.0 -black==23.3.0 +black==23.7.0