From 3a856e2522067ade18246f78e6554b3fa7edc9fe Mon Sep 17 00:00:00 2001
From: Guba Sándor <guba.sandor@cloud.bme.hu>
Date: Thu, 20 Mar 2014 13:28:43 +0100
Subject: [PATCH] node: added info property instead of ram, cpu, arch
Need new vmdriver
---
circle/vm/models/node.py | 21 ++++++---------------
1 file changed, 6 insertions(+), 15 deletions(-)
diff --git a/circle/vm/models/node.py b/circle/vm/models/node.py
index 0992882..c6da593 100644
--- a/circle/vm/models/node.py
+++ b/circle/vm/models/node.py
@@ -85,13 +85,13 @@ class Node(TimeStampedModel):
@node_available
@method_cache(300)
- def get_num_cores(self):
- """Number of CPU threads available to the virtual machines.
- """
-
- return self.remote_query(vm_tasks.get_core_num, default=0)
+ def get_info(self):
+ return self.remote_query(vm_tasks.get_info,
+ default={'cpu': '',
+ 'ram': '0',
+ 'arch': ''})
- num_cores = property(get_num_cores)
+ info = property(get_info)
STATES = {False: {False: ('OFFLINE', _('offline')),
True: ('DISABLED', _('disabled'))},
@@ -144,15 +144,6 @@ class Node(TimeStampedModel):
self.get_num_cores(invalidate_cache=True)
self.get_ram_size(invalidate_cache=True)
- @node_available
- @method_cache(300)
- def get_ram_size(self):
- """Bytes of total memory in the node.
- """
- return self.remote_query(vm_tasks.get_ram_size, default=0)
-
- ram_size = property(get_ram_size)
-
@property
@node_available
def ram_size_with_overcommit(self):
--
libgit2 0.26.0