summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosh Kearney <josh.kearney@rackspace.com>2010-12-21 15:46:44 -0600
committerJosh Kearney <josh.kearney@rackspace.com>2010-12-21 15:46:44 -0600
commit555bea30cddfd32c42b6d7453b5afd2e7fcfb7f2 (patch)
tree181fb7bef399353fd501b18f77543bc02fce6307
parent7da5fdf45add8e5c049321c5553f98229446e6b9 (diff)
downloadnova-555bea30cddfd32c42b6d7453b5afd2e7fcfb7f2.tar.gz
nova-555bea30cddfd32c42b6d7453b5afd2e7fcfb7f2.tar.xz
nova-555bea30cddfd32c42b6d7453b5afd2e7fcfb7f2.zip
Filter templates and dom0 from list_instances()
-rw-r--r--nova/virt/xenapi/vmops.py8
1 files changed, 6 insertions, 2 deletions
diff --git a/nova/virt/xenapi/vmops.py b/nova/virt/xenapi/vmops.py
index 5b9495b67..3b00ce8bf 100644
--- a/nova/virt/xenapi/vmops.py
+++ b/nova/virt/xenapi/vmops.py
@@ -45,8 +45,12 @@ class VMOps(object):
def list_instances(self):
"""List VM instances"""
- return [self._session.get_xenapi().VM.get_name_label(vm) \
- for vm in self._session.get_xenapi().VM.get_all()]
+ vms = []
+ for vm in self._session.get_xenapi().VM.get_all():
+ rec = self._session.get_xenapi().VM.get_record(vm)
+ if not rec["is_a_template"] and not rec["is_control_domain"]:
+ vms.append(rec["name_label"])
+ return vms
def spawn(self, instance):
"""Create VM instance"""