Merge lp:~rvb/maas/cpu_count-bug-1272326 into lp:~maas-committers/maas/trunk

[Raphaël Badin]

Fix MAAS' cpu count detection.

The xpath expression now takes into account the declared number of "threads" for a processor, while still counting as one processor those that do not declare their number of threads.

[Andres Rodriguez (andreserl)]

lgtm!

Thanks for the patch! This is awesome!

review: Approve

=== modified file 'src/metadataserver/models/commissioningscript.py'
--- src/metadataserver/models/commissioningscript.py	2013-12-02 13:57:39 +0000
+++ src/metadataserver/models/commissioningscript.py	2014-01-28 10:41:12 +0000
@@ -116,10 +116,15 @@
     """)
 
 
+# Count the processors which do not declare their number of 'threads'
+# as 1 processor.
 _xpath_processor_count = """\
-    count(//node[@id='core']/
-        node[@class='processor'][not(@disabled)])
-"""
+    sum(//node[@id='core']/
+        node[@class='processor']
+            [not(@disabled)]//setting[@id='threads']/@value) +
+    count(//node[@id='core']/node[@class='processor']
+        [not(@disabled)][not(configuration/setting[@id='threads'])])"""
+
 
 # Some machines have a <size> element in their memory <node> with the total
 # amount of memory, and other machines declare the size of the memory in

=== modified file 'src/metadataserver/models/tests/test_commissioningscript.py'
--- src/metadataserver/models/tests/test_commissioningscript.py	2014-01-20 09:01:25 +0000
+++ src/metadataserver/models/tests/test_commissioningscript.py	2014-01-28 10:41:12 +0000
@@ -461,6 +461,24 @@
         node = reload_object(node)
         self.assertEqual(2, node.cpu_count)
 
+    def test_cpu_count_counts_multi_cores(self):
+        node = factory.make_node()
+        xmlbytes = dedent("""\
+        <node id="core">
+           <node id="cpu:0" class="processor">
+             <configuration>
+               <setting id="cores" value="2" />
+               <setting id="enabledcores" value="2" />
+               <setting id="threads" value="4" />
+             </configuration>
+           </node>
+           <node id="cpu:1" class="processor"/>
+        </node>
+        """).encode("utf-8")
+        update_hardware_details(node, xmlbytes, 0)
+        node = reload_object(node)
+        self.assertEqual(5, node.cpu_count)
+
     def test_cpu_count_skips_disabled_cpus(self):
         node = factory.make_node()
         xmlbytes = dedent("""\