client/tools/rhn-virtualization/virtualization/localvdsm.py | 2 +-
client/tools/rhn-virtualization/virtualization/poller.py | 11 +++++++++--
2 files changed, 10 insertions(+), 3 deletions(-)
New commits:
commit e83e9e8c1e21374ac97a533db02d467f307fdc18
Author: Pradeep Kilambi <pkilambi(a)redhat.com>
Date: Mon Oct 5 10:46:21 2009 -0400
missing commits from sat.git
diff --git a/client/tools/rhn-virtualization/virtualization/localvdsm.py b/client/tools/rhn-virtualization/virtualization/localvdsm.py
index b5febbd..71feb48 100644
--- a/client/tools/rhn-virtualization/virtualization/localvdsm.py
+++ b/client/tools/rhn-virtualization/virtualization/localvdsm.py
@@ -29,7 +29,7 @@ def getTrustStorePath():
return tsPath
def getLocalVdsName(tsPath):
- p = subprocess.Popen(['openssl', 'x509', '-noout', '-subject', '-in',
+ p = subprocess.Popen(['/usr/bin/openssl', 'x509', '-noout', '-subject', '-in',
'%s/certs/vdsmcert.pem' % tsPath],
stdout=subprocess.PIPE, close_fds=True)
out, err = p.communicate()
diff --git a/client/tools/rhn-virtualization/virtualization/poller.py b/client/tools/rhn-virtualization/virtualization/poller.py
index c918a63..44aa232 100644
--- a/client/tools/rhn-virtualization/virtualization/poller.py
+++ b/client/tools/rhn-virtualization/virtualization/poller.py
@@ -139,7 +139,11 @@ def poll_through_vdsm():
# VDSM raised an exception we're done here
return {}
# Extract list of vm's. True returns full list
- domains = server.list(True)
+ try:
+ domains = server.list(True)
+ except:
+ # Something went wrong in vdsm, exit
+ return {}
if not len(domains['vmList']):
# No domains, exit.
@@ -156,11 +160,14 @@ def poll_through_vdsm():
# This is gonna be fully virt as its managed by VDSM
virt_type = VirtualizationType.FULLY
+ #Memory
+ memory = int(domain['memSize'] * 1024);
+
properties = {
PropertyType.NAME : domain['vmName'],
PropertyType.UUID : uuid,
PropertyType.TYPE : virt_type,
- PropertyType.MEMORY : domain['memSize'], # current memory
+ PropertyType.MEMORY : memory, # current memory
PropertyType.VCPUS : domain['smp'],
PropertyType.STATE : status}