Raising errors if a snapshot still exists

Lib/helper.py

@@ -174,6 +174,18 @@ def dumpXML(self, path):
 
         #call getDisk to get the disks to do snapshot
         return dumpXML(domain, path)
+
+    def hasCurrentSnapshot(self):
+        """call hasCurrentSnapshot on domain class attribute"""
+
+        #get my domain
+        domain = self.getDomain()
+
+        if domain.hasCurrentSnapshot() == 0:
+            return False
+
+        else:
+            return True
 
     def getSnapshotXML(self):
         """Since I need to do a Snapshot with a XML file, I will create an XML to call
@@ -314,8 +326,8 @@ def __snapshotDelete(self):
 
 #from https://bitbucket.org/russellballestrini/virt-back
 def rotate( target, retention = 3 ):
-
     """file rotation routine"""
+
     for i in range( retention-2, 0, -1 ): # count backwards
         old_name = "%s.%s" % ( target, i )
         new_name = "%s.%s" % ( target, i + 1 )

TODO

@@ -4,4 +4,3 @@
 * verbosity level
 * copy CD-rom data
 * testing wrong configurations
-* Snapshotting only a defined domain

kvmBackup.py

@@ -101,6 +101,13 @@ def filterDomains(domains, user_domains):
 def backup(domain, parameters, backupdir):
     """Do all the operation needed for backup"""
 
+    # create a snapshot instance
+    snapshot = helper.Snapshot(domain)
+
+    # check if no snapshot are defined
+    if snapshot.hasCurrentSnapshot() is True:
+        raise Exception, "Domain '%s' has already a snapshot" %(domain)
+
     #changing directory
     olddir = os.getcwd()
     workdir = os.path.join(backupdir, domain)
@@ -135,9 +142,6 @@ def backup(domain, parameters, backupdir):
 
     tar = tarfile.open( tar_path, tar_mode )
 
-    #create a snapshot instance
-    snapshot = helper.Snapshot(domain)
-
     #call dumpXML
     xml_files = snapshot.dumpXML(path=datadir)
 
@@ -159,7 +163,7 @@ def backup(domain, parameters, backupdir):
     #call snapshot
     snapshot.callSnapshot()
 
-    logger.info("Adding image files for '%s' to archive %'s'" %(domain, tar_path))
+    logger.info("Adding image files for '%s' to archive '%s'" %(domain, tar_path))
 
     #copying file
     for disk, source in snapshot.disks.iteritems():
@@ -210,6 +214,9 @@ def backup(domain, parameters, backupdir):
     #logging notice
     sys.stderr.write(notice)
     sys.stderr.flush()
+
+    # a flat to test if there were errors
+    flag_errors = False
 
     #Starting software
     logger.info("Starting '%s'" %(prog_name))
@@ -257,7 +264,13 @@ def backup(domain, parameters, backupdir):
                 domain_backup = True
 
                 #do backup stuff
-                backup(domain_name, parameters, backupdir)
+                try:
+                    backup(domain_name, parameters, backupdir)
+
+                except Exception, message:
+                    logger.exception(message)
+                    logger.error("Domain '%s' was not backed up" %(domain_name))
+                    flag_errors = True
 
                 #breaking cicle
                 break
@@ -266,4 +279,7 @@ def backup(domain, parameters, backupdir):
             logger.debug("Ignoring '%s' domain" %(domain_name))
 
     #end of the program
-    logger.info("'%s' completed successfully" %(prog_name))
+    if flag_errors is False:
+        logger.info("'%s' completed successfully" %(prog_name))
+    else:
+        logger.warn("'%s' completed with error(s)" %(prog_name))