diff --git a/tools/python/xen/xend/XendDomain.py b/tools/python/xen/xend/XendDomain.py index 3959b2e917..080fc4ae8b 100644 --- a/tools/python/xen/xend/XendDomain.py +++ b/tools/python/xen/xend/XendDomain.py @@ -75,8 +75,26 @@ class XendDomain: @return: domain objects """ + self.refresh() return self.domains.values() - + + def list_sorted(self): + """Get list of domain objects, sorted by name. + + @return: domain objects + """ + doms = self.list() + doms.sort(lambda x, y: cmp(x.name, y.name)) + return doms + + def list_names(self): + """Get list of domain names. + + @return: domain names + """ + doms = self.list_sorted() + return map(lambda x: x.name, doms) + def onVirq(self, event, val): """Event handler for virq. """ @@ -265,24 +283,6 @@ class XendDomain: else: self._delete_domain(id) - def domain_ls(self): - """Get list of domain names. - - @return: domain names - """ - self.refresh() - doms = self.domains.values() - doms.sort(lambda x, y: cmp(x.name, y.name)) - return map(lambda x: x.name, doms) - - def domain_ls_ids(self): - """Get list of domain ids. - - @return: domain names - """ - self.refresh() - return self.domains.keys() - def domain_create(self, config): """Create a domain from a configuration. diff --git a/tools/python/xen/xend/server/SrvDomainDir.py b/tools/python/xen/xend/server/SrvDomainDir.py index 613841ddff..2b5f873fd3 100644 --- a/tools/python/xen/xend/server/SrvDomainDir.py +++ b/tools/python/xen/xend/server/SrvDomainDir.py @@ -146,11 +146,10 @@ class SrvDomainDir(SrvDir): if not url.endswith('/'): url += '/' if use_sxp: - domains = self.xd.domain_ls() + domains = self.xd.list_names() sxp.show(domains, out=req) else: - domains = self.xd.list() - domains.sort(lambda x, y: cmp(x.name, y.name)) + domains = self.xd.list_sorted() req.write('