From af2cae27930a3983c96a0b1705f828d65d4829cd Mon Sep 17 00:00:00 2001 From: Soren Hansen Date: Wed, 16 Mar 2011 12:18:15 +0100 Subject: Fix a couple of things that assume that libvirt == kvm/qemu. --- bin/nova-manage | 4 +++- nova/virt/libvirt_conn.py | 42 +++++++++++++++++++++++++++--------------- 2 files changed, 30 insertions(+), 16 deletions(-) diff --git a/bin/nova-manage b/bin/nova-manage index 2b42dfff5..c84891619 100755 --- a/bin/nova-manage +++ b/bin/nova-manage @@ -574,7 +574,9 @@ class VmCommands(object): ctxt = context.get_admin_context() instance_id = ec2utils.ec2_id_to_id(ec2_id) - if FLAGS.connection_type != 'libvirt': + if (FLAGS.connection_type != 'libvirt' or + (FLAGS.connection_type == 'libvirt' and + FLAGS.libvirt_type not in ['kvm', 'qemu'])): msg = _('Only KVM is supported for now. Sorry!') raise exception.Error(msg) diff --git a/nova/virt/libvirt_conn.py b/nova/virt/libvirt_conn.py index 7994e9547..96463d0f2 100644 --- a/nova/virt/libvirt_conn.py +++ b/nova/virt/libvirt_conn.py @@ -991,23 +991,35 @@ class LibvirtConnection(object): + xml.serialize()) cpu_info = dict() - cpu_info['arch'] = xml.xpathEval('//cpu/arch')[0].getContent() - cpu_info['model'] = xml.xpathEval('//cpu/model')[0].getContent() - cpu_info['vendor'] = xml.xpathEval('//cpu/vendor')[0].getContent() - topology_node = xml.xpathEval('//cpu/topology')[0].get_properties() + arch_nodes = xml.xpathEval('//cpu/arch') + if len(arch_nodes): + cpu_info['arch'] = arch_nodes[0].getContent() + + model_nodes = xml.xpathEval('//cpu/model') + if len(model_nodes): + cpu_info['model'] = model_nodes[0].getContent() + + vendor_nodes = xml.xpathEval('//cpu/vendor') + if len(vendor_nodes): + cpu_info['vendor'] = vendor_nodes[0].getContent() + + topology_nodes = xml.xpathEval('//cpu/topology') topology = dict() - while topology_node != None: - name = topology_node.get_name() - topology[name] = topology_node.getContent() - topology_node = topology_node.get_next() - - keys = ['cores', 'sockets', 'threads'] - tkeys = topology.keys() - if list(set(tkeys)) != list(set(keys)): - ks = ', '.join(keys) - raise exception.Invalid(_("Invalid xml: topology(%(topology)s) " - "must have %(ks)s") % locals()) + if len(topology_nodes): + topology_node = topology_nodes[0].get_properties() + while topology_node != None: + name = topology_node.get_name() + topology[name] = topology_node.getContent() + topology_node = topology_node.get_next() + + keys = ['cores', 'sockets', 'threads'] + tkeys = topology.keys() + if list(set(tkeys)) != list(set(keys)): + ks = ', '.join(keys) + raise exception.Invalid(_("Invalid xml: topology(%(topology)s) " + "must have %(ks)s") % locals()) + feature_nodes = xml.xpathEval('//cpu/feature') features = list() -- cgit From c85e8fc2d61368b15e4deafb4ae3b723777cf2b0 Mon Sep 17 00:00:00 2001 From: Soren Hansen Date: Thu, 17 Mar 2011 11:37:50 +0100 Subject: Make error message match the check. --- bin/nova-manage | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/nova-manage b/bin/nova-manage index c84891619..b4b75d6b3 100755 --- a/bin/nova-manage +++ b/bin/nova-manage @@ -577,7 +577,7 @@ class VmCommands(object): if (FLAGS.connection_type != 'libvirt' or (FLAGS.connection_type == 'libvirt' and FLAGS.libvirt_type not in ['kvm', 'qemu'])): - msg = _('Only KVM is supported for now. Sorry!') + msg = _('Only KVM and QEmu are supported for now. Sorry!') raise exception.Error(msg) if (FLAGS.volume_driver != 'nova.volume.driver.AOEDriver' and \ -- cgit From ca50fdd2e013a9016b06a9d0263b980a062d5987 Mon Sep 17 00:00:00 2001 From: Soren Hansen Date: Thu, 17 Mar 2011 16:27:08 +0100 Subject: Just use 'if foo' instead of 'if len(foo)'. It will fail as spectacularly if its not acting on a sequence anyways. --- nova/virt/libvirt_conn.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nova/virt/libvirt_conn.py b/nova/virt/libvirt_conn.py index 96463d0f2..70a76b897 100644 --- a/nova/virt/libvirt_conn.py +++ b/nova/virt/libvirt_conn.py @@ -993,20 +993,20 @@ class LibvirtConnection(object): cpu_info = dict() arch_nodes = xml.xpathEval('//cpu/arch') - if len(arch_nodes): + if arch_nodes: cpu_info['arch'] = arch_nodes[0].getContent() model_nodes = xml.xpathEval('//cpu/model') - if len(model_nodes): + if model_nodes: cpu_info['model'] = model_nodes[0].getContent() vendor_nodes = xml.xpathEval('//cpu/vendor') - if len(vendor_nodes): + if vendor_nodes: cpu_info['vendor'] = vendor_nodes[0].getContent() topology_nodes = xml.xpathEval('//cpu/topology') topology = dict() - if len(topology_nodes): + if topology_nodes: topology_node = topology_nodes[0].get_properties() while topology_node != None: name = topology_node.get_name() -- cgit From d70bbdf43c4cba5a0b9c0ab93ff06031a2604db6 Mon Sep 17 00:00:00 2001 From: Soren Hansen Date: Thu, 17 Mar 2011 21:03:11 +0100 Subject: I suck at merging. --- nova/virt/libvirt_conn.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nova/virt/libvirt_conn.py b/nova/virt/libvirt_conn.py index 998615fe9..7d6501406 100644 --- a/nova/virt/libvirt_conn.py +++ b/nova/virt/libvirt_conn.py @@ -1004,7 +1004,7 @@ class LibvirtConnection(object): if vendor_nodes: cpu_info['vendor'] = vendor_nodes[0].getContent() - topology_nodes = xml.xpathEval('//cpu/topology') + topology_nodes = xml.xpathEval('//host/cpu/topology') topology = dict() if topology_nodes: topology_node = topology_nodes[0].get_properties() -- cgit From c89a477aa97bb4d716180cadd889ff98123625e4 Mon Sep 17 00:00:00 2001 From: Soren Hansen Date: Thu, 17 Mar 2011 21:06:55 +0100 Subject: pep8 --- nova/virt/libvirt_conn.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nova/virt/libvirt_conn.py b/nova/virt/libvirt_conn.py index 7d6501406..ce54af498 100644 --- a/nova/virt/libvirt_conn.py +++ b/nova/virt/libvirt_conn.py @@ -1017,9 +1017,9 @@ class LibvirtConnection(object): tkeys = topology.keys() if list(set(tkeys)) != list(set(keys)): ks = ', '.join(keys) - raise exception.Invalid(_("Invalid xml: topology(%(topology)s) " - "must have %(ks)s") % locals()) - + raise exception.Invalid(_("Invalid xml: topology" + "(%(topology)s) must have " + "%(ks)s") % locals()) feature_nodes = xml.xpathEval('//host/cpu/feature') features = list() -- cgit From cf648ea89015818a3ec7c8d6d59b50f8ed3604f7 Mon Sep 17 00:00:00 2001 From: Soren Hansen Date: Thu, 17 Mar 2011 22:23:35 +0100 Subject: Fix mis-merge --- nova/virt/libvirt_conn.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nova/virt/libvirt_conn.py b/nova/virt/libvirt_conn.py index 2f6948556..e80b9fbdf 100644 --- a/nova/virt/libvirt_conn.py +++ b/nova/virt/libvirt_conn.py @@ -1015,7 +1015,7 @@ class LibvirtConnection(object): keys = ['cores', 'sockets', 'threads'] tkeys = topology.keys() - if list(set(tkeys)) != list(set(keys)): + if set(tkeys) != set(keys): ks = ', '.join(keys) raise exception.Invalid(_("Invalid xml: topology" "(%(topology)s) must have " -- cgit