ia64/xen-unstable

changeset 12101:8728365bac33

[XEND] Fix XenAPI Host interface so that get_record works.

Signed-off-by: Alastair Tse <atse@xensource.com>
author Alastair Tse <atse@xensource.com>
date Thu Oct 05 19:13:52 2006 +0100 (2006-10-05)
parents 8e5e7399e9b5
children 6f0b467a92c6
files tools/python/xen/xend/XendAPI.py tools/python/xen/xend/XendDomain.py tools/python/xen/xend/XendNode.py
line diff
     1.1 --- a/tools/python/xen/xend/XendAPI.py	Thu Oct 05 18:48:54 2006 +0100
     1.2 +++ b/tools/python/xen/xend/XendAPI.py	Thu Oct 05 19:13:52 2006 +0100
     1.3 @@ -382,8 +382,8 @@ class XendAPI:
     1.4      def host_get_record(self, session, host_ref):
     1.5          node = XendNode.instance()
     1.6          dom = XendDomain.instance()
     1.7 -        record = {'name/label': node.name,
     1.8 -                  'name/description': '',
     1.9 +        record = {'name_label': node.name,
    1.10 +                  'name_description': '',
    1.11                    'software_version': node.xen_version(),
    1.12                    'resident_VMs': dom.get_domain_refs(),
    1.13                    'host_CPUs': node.get_host_cpu_refs()}
     2.1 --- a/tools/python/xen/xend/XendDomain.py	Thu Oct 05 18:48:54 2006 +0100
     2.2 +++ b/tools/python/xen/xend/XendDomain.py	Thu Oct 05 19:13:52 2006 +0100
     2.3 @@ -549,7 +549,7 @@ class XendDomain:
     2.4          result = []
     2.5          try:
     2.6              self.domains_lock.acquire()
     2.7 -            result = [d.getVMRef() for d in self.domains]
     2.8 +            result = [d.get_uuid() for d in self.domains.values()]
     2.9          finally:
    2.10              self.domains_lock.release()
    2.11          return result
     3.1 --- a/tools/python/xen/xend/XendNode.py	Thu Oct 05 18:48:54 2006 +0100
     3.2 +++ b/tools/python/xen/xend/XendNode.py	Thu Oct 05 19:13:52 2006 +0100
     3.3 @@ -44,7 +44,7 @@ class XendNode:
     3.4                          'host': self.uuid,
     3.5                          'number': i,
     3.6                          'features': cpu_features}
     3.7 -            self.cpus[uuid] = cpu_info
     3.8 +            self.cpus[cpu_uuid] = cpu_info
     3.9  
    3.10      def shutdown(self):
    3.11          return 0