[Kimchi-devel] [PATCH] [Kimchi 1/2] Always update snapshot XML with new name and UUID

[Lucio Correia]

When a guest with snapshots is renamed, and afterwards
guest is reverted to a snapshot created before the name
change, the guest is also renamed back. This patch fixes
this issue by updating snapshot XML when guest is renamed.

Signed-off-by: Lucio Correia <luciojhc at linux.vnet.ibm.com>
---
 model/vms.py | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/model/vms.py b/model/vms.py
index b0b4eb2..3b09909 100644
--- a/model/vms.py
+++ b/model/vms.py
@@ -97,6 +97,8 @@ XPATH_DOMAIN_DEV_CPU_ID = '/domain/devices/spapr-cpu-socket/@id'
 XPATH_CPU = './cpu'
 XPATH_NAME = './name'
 XPATH_NUMA_CELL = './cpu/numa/cell'
+XPATH_SNAP_VM_NAME = './domain/name'
+XPATH_SNAP_VM_UUID = './domain/uuid'
 XPATH_TOPOLOGY = './cpu/topology'
 XPATH_VCPU = './vcpu'
 XPATH_MAX_MEMORY = './maxMemory'
@@ -728,7 +730,15 @@ class VMModel(object):
             if info['current']:
                 flags |= libvirt.VIR_DOMAIN_SNAPSHOT_CREATE_CURRENT
 
-            dom.snapshotCreateXML(info['xml'], flags)
+            # Snapshot XML contains the VM xml from the time it was created.
+            # Thus VM name and uuid must be updated to current ones. Otherwise,
+            # when reverted, the vm name will be inconsistent.
+            xml = info['xml']
+            xml = xml_item_update(xml, XPATH_SNAP_VM_NAME, dom.name(), None)
+            xml = xml_item_update(xml, XPATH_SNAP_VM_UUID, dom.UUIDString(),
+                                  None)
+
+            dom.snapshotCreateXML(xml, flags)
 
     def _update_metadata_name(self, dom, nonascii_name):
         if nonascii_name is not None:
-- 
1.9.1