generate unique snapshot names and support use shapshots on exteranl object

Author: 0lvin

cloudify_libvirt/common.py

@@ -81,7 +81,7 @@ def get_backupname(kwargs):
         raise cfy_exc.NonRecoverableError(
             'Backup name must be provided.'
         )
-    return kwargs["snapshot_name"]
+    return "{}-{}".format(ctx.instance.id, kwargs["snapshot_name"])
 
 
 def get_backupdir(kwargs):

cloudify_libvirt/tests/test_domain.py

@@ -587,7 +587,7 @@ def _check_create_backups(self, _ctx, connect, domain, snapshot, raw_case):
                     ):
                         with self.assertRaisesRegexp(
                             NonRecoverableError,
-                            "Backup snapshot_name already exists."
+                            "Backup node_name-snapshot_name already exists."
                         ):
                             domain_tasks.snapshot_create(
                                 ctx=_ctx,
@@ -681,7 +681,7 @@ def _check_apply_backups(self, _ctx, connect, domain, raw_case):
             ):
                 with self.assertRaisesRegexp(
                     NonRecoverableError,
-                    "No backups found with name: snapshot_name."
+                    "No backups found with name: node_name-snapshot_name."
                 ):
                     domain_tasks.snapshot_apply(ctx=_ctx,
                                                 snapshot_name='snapshot_name',
@@ -776,7 +776,7 @@ def _check_delete_backups(self, _ctx, connect, raw_case):
             ):
                 with self.assertRaisesRegexp(
                     NonRecoverableError,
-                    "No backups found with name: snapshot_name."
+                    "No backups found with name: node_name-snapshot_name."
                 ):
                     domain_tasks.snapshot_delete(ctx=_ctx,
                                                  snapshot_name='snapshot_name',
@@ -847,8 +847,9 @@ def test_snapshot_delete(self):
         ):
             with self.assertRaisesRegexp(
                 NonRecoverableError,
-                "Sub snapshots \['snapshot-'\] found for snapshot_name."
-                " You should remove subsnaphots before remove current."
+                "Sub snapshots \['snapshot-'\] found for "
+                "node_name-snapshot_name. You should remove subsnaphots before"
+                " remove current."
             ):
                 domain_tasks.snapshot_delete(ctx=_ctx,
                                              snapshot_name='snapshot_name',

cloudify_libvirt/tests/test_network.py

@@ -221,7 +221,8 @@ def _create_fake_network_backup(self):
         _ctx.instance.runtime_properties['resource_id'] = 'resource'
         _ctx.instance.runtime_properties['params'] = {}
         _ctx.node.properties['params'] = {}
-        _ctx.instance.runtime_properties["backups"] = {"backup": "<xml/>"}
+        _ctx.instance.runtime_properties["backups"] = {
+            "node_name-backup": "<xml/>"}
         return _ctx, connect, network
 
     def test_snapshot_apply(self):
@@ -242,7 +243,7 @@ def test_snapshot_apply(self):
         ):
             with self.assertRaisesRegexp(
                 NonRecoverableError,
-                "No snapshots found with name: backup!."
+                "No snapshots found with name: node_name-backup!."
             ):
                 network_tasks.snapshot_apply(
                     ctx=_ctx, snapshot_name="backup!",
@@ -270,7 +271,7 @@ def test_snapshot_apply(self):
             ):
                 with self.assertRaisesRegexp(
                     NonRecoverableError,
-                    "No backups found with name: backup!."
+                    "No backups found with name: node_name-backup!."
                 ):
                     network_tasks.snapshot_apply(
                         ctx=_ctx, snapshot_name="backup!",
@@ -314,7 +315,7 @@ def test_snapshot_create(self):
         ):
             with self.assertRaisesRegexp(
                 NonRecoverableError,
-                "Snapshot backup already exists."
+                "Snapshot node_name-backup already exists."
             ):
                 network_tasks.snapshot_create(ctx=_ctx, snapshot_name="backup",
                                               snapshot_incremental=True)
@@ -330,7 +331,7 @@ def test_snapshot_create(self):
                                           snapshot_incremental=True)
         self.assertEqual(
             _ctx.instance.runtime_properties["backups"],
-            {"backup": "<network/>"})
+            {"node_name-backup": "<network/>"})
 
         # check create snapshot
         with mock.patch(
@@ -353,7 +354,7 @@ def test_snapshot_create(self):
                     ):
                         with self.assertRaisesRegexp(
                             NonRecoverableError,
-                            "Backup backup already exists."
+                            "Backup node_name-backup already exists."
                         ):
                             network_tasks.snapshot_create(
                                 ctx=_ctx, snapshot_name="backup",
@@ -384,14 +385,14 @@ def test_snapshot_delete(self):
         ):
             with self.assertRaisesRegexp(
                 NonRecoverableError,
-                "No snapshots found with name: backup!."
+                "No snapshots found with name: node_name-backup!."
             ):
                 network_tasks.snapshot_delete(
                     ctx=_ctx, snapshot_name="backup!",
                     snapshot_incremental=True)
         self.assertEqual(
             _ctx.instance.runtime_properties["backups"],
-            {"backup": "<xml/>"})
+            {'node_name-backup': "<xml/>"})
 
         # remove snapshot
         _ctx, connect, network = self._create_fake_network_backup()
@@ -415,7 +416,7 @@ def test_snapshot_delete(self):
             ):
                 with self.assertRaisesRegexp(
                     NonRecoverableError,
-                    "No backups found with name: backup!."
+                    "No backups found with name: node_name-backup!."
                 ):
                     network_tasks.snapshot_delete(
                         ctx=_ctx, snapshot_name="backup!",
@@ -458,7 +459,8 @@ def test_delete(self):
         # delete with error
         _ctx = self._create_ctx()
         _ctx.instance.runtime_properties['resource_id'] = 'resource'
-        _ctx.instance.runtime_properties["backups"] = {"backup": "<xml/>"}
+        _ctx.instance.runtime_properties["backups"] = {
+            "node_name-backup": "<xml/>"}
 
         network = mock.Mock()
         network.destroy = mock.Mock(return_value=-1)