diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-12-13 07:14:25 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-12-13 07:14:25 +0000 |
| commit | 62b38931c557d1e0ab0fc15d3cbfbb52fbd55b6a (patch) | |
| tree | 0d1df6ddf1aa2dbaaa03865545ef001023cfb1d5 | |
| parent | 5f575d8b9ced29e6c467f552e08d9d971b320d01 (diff) | |
| parent | e2bf709a7f1b5a375e359f4a75512c76b36216a7 (diff) | |
Merge "Add support for parsing the <uuid> from libvirt host capabilities"
| -rw-r--r-- | nova/tests/test_libvirt_config.py | 2 | ||||
| -rw-r--r-- | nova/virt/libvirt/config.py | 5 |
2 files changed, 7 insertions, 0 deletions
diff --git a/nova/tests/test_libvirt_config.py b/nova/tests/test_libvirt_config.py index 567c39e50..29f5782d3 100644 --- a/nova/tests/test_libvirt_config.py +++ b/nova/tests/test_libvirt_config.py @@ -63,6 +63,7 @@ class LibvirtConfigCapsTest(LibvirtConfigBaseTest): xmlin = """ <capabilities> <host> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> <cpu> <arch>x86_64</arch> <model>Opteron_G3</model> @@ -86,6 +87,7 @@ class LibvirtConfigCapsTest(LibvirtConfigBaseTest): obj.parse_str(xmlin) self.assertEqual(type(obj.host), config.LibvirtConfigCapsHost) + self.assertEqual(obj.host.uuid, "c7a5fdbd-edaf-9455-926a-d65c16db1809") xmlout = obj.to_xml() diff --git a/nova/virt/libvirt/config.py b/nova/virt/libvirt/config.py index 14d940269..7e27f3925 100644 --- a/nova/virt/libvirt/config.py +++ b/nova/virt/libvirt/config.py @@ -106,6 +106,7 @@ class LibvirtConfigCapsHost(LibvirtConfigObject): **kwargs) self.cpu = None + self.uuid = None def parse_dom(self, xmldoc): super(LibvirtConfigCapsHost, self).parse_dom(xmldoc) @@ -115,10 +116,14 @@ class LibvirtConfigCapsHost(LibvirtConfigObject): cpu = LibvirtConfigCPU() cpu.parse_dom(c) self.cpu = cpu + elif c.tag == "uuid": + self.uuid = c.text def format_dom(self): caps = super(LibvirtConfigCapsHost, self).format_dom() + if self.uuid: + caps.append(self._text_node("uuid", self.uuid)) if self.cpu: caps.append(self.cpu.format_dom()) |