[Xen-changelog] [xen-unstable] [XEND] Fix XenAPI Host interface so that get_record works.

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Alastair Tse <atse@xxxxxxxxxxxxx>
# Node ID 8728365bac33d5454e5a3f708522d470da589a68
# Parent  8e5e7399e9b54b41ba0eac221b4dd84345592fb0
[XEND] Fix XenAPI Host interface so that get_record works.

Signed-off-by: Alastair Tse <atse@xxxxxxxxxxxxx>
---
 tools/python/xen/xend/XendAPI.py    |    4 ++--
 tools/python/xen/xend/XendDomain.py |    2 +-
 tools/python/xen/xend/XendNode.py   |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff -r 8e5e7399e9b5 -r 8728365bac33 tools/python/xen/xend/XendAPI.py
--- a/tools/python/xen/xend/XendAPI.py  Thu Oct 05 18:48:54 2006 +0100
+++ b/tools/python/xen/xend/XendAPI.py  Thu Oct 05 19:13:52 2006 +0100
@@ -382,8 +382,8 @@ class XendAPI:
     def host_get_record(self, session, host_ref):
         node = XendNode.instance()
         dom = XendDomain.instance()
-        record = {'name/label': node.name,
-                  'name/description': '',
+        record = {'name_label': node.name,
+                  'name_description': '',
                   'software_version': node.xen_version(),
                   'resident_VMs': dom.get_domain_refs(),
                   'host_CPUs': node.get_host_cpu_refs()}
diff -r 8e5e7399e9b5 -r 8728365bac33 tools/python/xen/xend/XendDomain.py
--- a/tools/python/xen/xend/XendDomain.py       Thu Oct 05 18:48:54 2006 +0100
+++ b/tools/python/xen/xend/XendDomain.py       Thu Oct 05 19:13:52 2006 +0100
@@ -549,7 +549,7 @@ class XendDomain:
         result = []
         try:
             self.domains_lock.acquire()
-            result = [d.getVMRef() for d in self.domains]
+            result = [d.get_uuid() for d in self.domains.values()]
         finally:
             self.domains_lock.release()
         return result
diff -r 8e5e7399e9b5 -r 8728365bac33 tools/python/xen/xend/XendNode.py
--- a/tools/python/xen/xend/XendNode.py Thu Oct 05 18:48:54 2006 +0100
+++ b/tools/python/xen/xend/XendNode.py Thu Oct 05 19:13:52 2006 +0100
@@ -44,7 +44,7 @@ class XendNode:
                         'host': self.uuid,
                         'number': i,
                         'features': cpu_features}
-            self.cpus[uuid] = cpu_info
+            self.cpus[cpu_uuid] = cpu_info
 
     def shutdown(self):
         return 0

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog