fix for new computing resource records

sdayu · Aug 1, 2014 · f1a4f2f · f1a4f2f
1 parent b9b86f7
commit f1a4f2f
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 10 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,3 +2,5 @@
 *.pyc
 *.egg*
 __pycache__
+.*project
+.settings
diff --git a/nokkhumapi/models b/nokkhumapi/models
diff --git a/nokkhumapi/views/admin/compute_nodes.py b/nokkhumapi/views/admin/compute_nodes.py
@@ -33,6 +33,8 @@ def show(self):
             return dict(compute_node=dict(
                                           host='Unavailable'
                                           ))
+
+        resource = compute_node.get_current_resources()
         return dict(
             compute_node=dict(
                 id=compute_node.id,
@@ -46,19 +48,19 @@ def show(self):
                 system=compute_node.system,
                 machine=compute_node.machine,
                 cpu=dict(
-                    count=compute_node.cpu.count,
-                    used=compute_node.cpu.used,
-                    used_per_cpu=compute_node.cpu.used_per_cpu
+                    count=resource.cpu.count if resource else 0,
+                    used=resource.cpu.used if resource else 0,
+                    used_per_cpu=resource.cpu.used_per_cpu if resource else 0
                     ),
                 memory=dict(
-                    total=compute_node.memory.total,
-                    used=compute_node.memory.used,
-                    free=compute_node.memory.free,
+                    total=resource.memory.total if resource else 0,
+                    used=resource.memory.used if resource else 0,
+                    free=resource.memory.free if resource else 0,
                     ),
                 disk=dict(
-                    total=compute_node.disk.total,
-                    used=compute_node.disk.used,
-                    free=compute_node.disk.free,
+                    total=resource.disk.total if resource else 0,
+                    used=resource.disk.used if resource else 0,
+                    free=resource.disk.free if resource else 0,
                     ),
                 extra=compute_node.extra
                 )
+19 −5		__init__.py
+3 −2		billing.py
+38 −30		cameras.py
+92 −52		compute_nodes.py
+9 −8		facetrainings.py
+14 −10		forums.py
+20 −13		groups.py
+9 −7		image_processors.py
+15 −12		notification.py
+60 −49		processors.py
+26 −18		projects.py
+25 −20		report.py
+39 −31		users.py