Merge lp:~soren/nova/stuff into lp:~hudson-openstack/nova/trunk

[Soren Hansen]

Comparisons to None should not use == or !=.

Stop converting sets to lists before comparing them. They might be in different order after being list()ified.

Fixes a couple of things that were raised in (but unrelated to) https://code.launchpad.net/~soren/nova/libvirt-is-more-than-kvm-and-qemu/+merge/53610

[Josh Kearney (jk0)]

Good catch.

review: Approve

[Rick Harris (rconradharris)]

Good stuff.

review: Approve

=== modified file 'nova/virt/libvirt_conn.py'
--- nova/virt/libvirt_conn.py	2011-03-16 19:26:41 +0000
+++ nova/virt/libvirt_conn.py	2011-03-17 10:47:33 +0000
@@ -998,14 +998,14 @@
         topology_node = xml.xpathEval('//host/cpu/topology')[0]\
                         .get_properties()
         topology = dict()
-        while topology_node != None:
+        while topology_node:
             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)):
+        if set(tkeys) != set(keys):
             ks = ', '.join(keys)
             raise exception.Invalid(_("Invalid xml: topology(%(topology)s) "
                                       "must have %(ks)s") % locals())