CapabilitiesParser: Break out CPU into its own class

Author: crobinso

tests/capabilities-xml/libvirt-0.7.6-qemu-caps.xml

@@ -4,7 +4,7 @@
     <cpu>
       <arch>x86_64</arch>
       <model>core2duo</model>
-      <topology sockets='1' cores='2' threads='1'/>
+      <topology sockets='7' cores='5' threads='3'/>
       <feature name='lahf_lm'/>
       <feature name='xtpr'/>
       <feature name='cx16'/>

tests/capabilities.py

@@ -157,6 +157,11 @@ def testCapsCPUFeaturesNewSyntax(self):
         for f in feature_dict.keys():
             self.assertEquals(caps.host.features[f], feature_dict[f])
 
+        self.assertEquals(caps.host.cpu.model, "core2duo")
+        self.assertEquals(caps.host.cpu.threads, "3")
+        self.assertEquals(caps.host.cpu.cores, "5")
+        self.assertEquals(caps.host.cpu.sockets, "7")
+
     def testCapsUtilFuncs(self):
         new_caps = self._buildCaps("libvirt-0.7.6-qemu-caps.xml")
         new_caps_no_kvm = self._buildCaps(

virtinst/CapabilitiesParser.py

@@ -100,50 +100,82 @@ def _extractFeature(self, feature, d, n):
             else:
                 d[feature] |= FEATURE_ON
 
-class Host(object):
-    def __init__(self, node = None):
+class CPU(object):
+    def __init__(self, node=None):
         # e.g. "i686" or "x86_64"
         self.arch = None
-
+        self.model = None
+        self.sockets = 1
+        self.cores = 1
+        self.threads = 1
         self.features = CapabilityFeatures()
+
+        if not node is None:
+            self.parseXML(node)
+
+    def parseXML(self, node):
+        newstyle_features = False
+
+        child = node.children
+        while child:
+            # Do a first pass to try and detect new style features
+            if child.name == "feature":
+                newstyle_features = True
+                break
+            child = child.next
+
+        if newstyle_features:
+            self.features = CapabilityFeatures(node)
+
+        child = node.children
+        while child:
+            if child.name == "arch":
+                self.arch = child.content
+            elif child.name == "model":
+                self.model = child.content
+            elif child.name == "topology":
+                self.sockets = xpathString(child, "@sockets") or 1
+                self.cores = xpathString(child, "@cores") or 1
+                self.threads = xpathString(child, "@threads") or 1
+
+            elif child.name == "features" and not newstyle_features:
+                self.features = CapabilityFeatures(child)
+
+            child = child.next
+
+class Host(object):
+    def __init__(self, node = None):
+        self.cpu = CPU()
         self.topology = None
         self.secmodel = None
 
         if not node is None:
             self.parseXML(node)
 
+    # Back compat for CPU class
+    def get_arch(self):
+        return self.cpu.arch
+    def set_arch(self, val):
+        self.cpu.arch = val
+    arch = property(get_arch, set_arch)
+
+    def get_features(self):
+        return self.cpu.features
+    def set_features(self, val):
+        self.cpu.features = val
+    features = property(get_features, set_features)
+
     def parseXML(self, node):
         child = node.children
-        newstyle_features = False
         while child:
             if child.name == "topology":
                 self.topology = Topology(child)
 
             if child.name == "secmodel":
                 self.secmodel = SecurityModel(child)
 
-            if child.name != "cpu":
-                child = child.next
-                continue
-
-            # Do a first pass to try and detect new style features
-            n = child.children
-            while n:
-                if n.name == "feature":
-                    newstyle_features = True
-                    break
-                n = n.next
-
-            if newstyle_features:
-                self.features = CapabilityFeatures(child)
-
-            n = child.children
-            while n:
-                if n.name == "arch":
-                    self.arch = n.content
-                elif n.name == "features" and not newstyle_features:
-                    self.features = CapabilityFeatures(n)
-                n = n.next
+            if child.name == "cpu":
+                self.cpu = CPU(child)
 
             child = child.next