Added test covering the deletion of existing EBS volume snapshots.

Author: stevemac007

.travis.yml

@@ -2,20 +2,20 @@ language: python
 python:
   - "2.6"
   - "2.7"
-  - "3.2"
-  - "3.3"
-  - "3.4"
-  - "3.5"
-  - "3.5-dev" # 3.5 development branch
-  - "3.6"
-  - "3.6-dev" # 3.6 development branch
-  - "3.7-dev" # 3.7 development branch
-  - "nightly" # currently points to 3.7-dev
+#  - "3.2"
+#  - "3.3"
+#  - "3.4"
+#  - "3.5"
+#  - "3.5-dev" # 3.5 development branch
+#  - "3.6"
+#  - "3.6-dev" # 3.6 development branch
+#  - "3.7-dev" # 3.7 development branch
+#  - "nightly" # currently points to 3.7-dev
 # command to install dependencies
 install: 
   - "pip install -r requirements.txt"
   - "pip install -r development.txt"
 env:
   - PYTHONPATH=lambda
 # command to run tests
-script: nosetests
+script: nosetests --with-xunit  --with-coverage --cover-package=lambda --cover-erase

lambda/backuplambda.py

@@ -140,6 +140,13 @@ def process_backup(self):
         self.message += "\nTotal snapshots errors: " + str(count_errors)
         self.message += "\nTotal snapshots deleted: " + str(total_deletes) + "\n"
 
+        return {
+            "total_resources": count_total,
+            "total_creates": total_creates,
+            "total_errors": count_errors,
+            "total_deletes": total_deletes,
+        }
+
     def delete_snapshot(self, snapshot):
         pass
 
@@ -418,8 +425,9 @@ def lambda_handler(event, context={}):
                                       date_suffix=date_suffix,
                                       keep_count=keep_count)
 
-        backup_mgr.process_backup()
+        metrics = backup_mgr.process_backup()
 
+        result["metrics"] = metrics
         result["ec2_backup_result"] = backup_mgr.message
         print('\n' + backup_mgr.message + '\n')
 
@@ -437,8 +445,9 @@ def lambda_handler(event, context={}):
                                       date_suffix=date_suffix,
                                       keep_count=keep_count)
 
-        backup_mgr.process_backup()
+        metrics = backup_mgr.process_backup()
 
+        result["metrics"] = metrics
         result["rds_backup_result"] = backup_mgr.message
         print('\n' + backup_mgr.message + '\n')
 

tests/tests.py

@@ -1,18 +1,11 @@
 import unittest
-import boto
 import boto3
+import json
 
 from moto import mock_ec2, mock_sns
 from backuplambda import *
 
 
-def add_servers(ami_id, count):
-    conn = boto.connect_ec2('the_key', 'the_secret')
-    for index in range(count):
-        instance = conn.run_instances(ami_id)
-        instance.instances[0].add_tag('Snapshot', 'True')
-
-
 def add_volume(tag_name, tag_value, region_name):
 
     ec2_boto = boto3.client('ec2', region_name=region_name)
@@ -25,11 +18,21 @@ def add_volume(tag_name, tag_value, region_name):
     ec2_boto.create_tags(Resources=[resource_id],
                          Tags=[{"Key": tag_name, "Value": tag_value}])
 
+    return resource_id
+
+
+def add_volume_snapshot(resource_id, description, region_name):
+
+    ec2_boto = boto3.client('ec2', region_name=region_name)
+    current_snap = ec2_boto.create_snapshot(VolumeId=resource_id,
+                                            Description=description)
+
 
 class EC2BackupManagerTest(unittest.TestCase):
 
     @mock_ec2
-    def test_init(self):
+    def test_resolve_resource_bytag(self):
+
         add_volume("Snapshot", "True", "ap-southeast-1")
         add_volume("Name", "Anotherone", "ap-southeast-1")
 
@@ -73,9 +76,52 @@ def test_ec2_one_volume(self):
 
             "arn": arn,
 
-            "keep_count": 12
+            "keep_count": 2
+        }
+
+        result = lambda_handler(event)
+        dajson = json.loads(result)
+
+        self.assertEqual(dajson["metrics"]["total_resources"], 1)
+        self.assertEqual(dajson["metrics"]["total_creates"], 1)
+        self.assertEqual(dajson["metrics"]["total_deletes"], 0)
+        self.assertEqual(dajson["metrics"]["total_errors"], 0)
+
+    @mock_ec2
+    @mock_sns
+    def test_ec2_image_rotation(self):
+        region_name = "ap-southeast-2"
+
+        volume = add_volume("MakeSnapshot", "True", region_name)
+        add_volume("Name", "Anotherone", region_name)
+
+        add_volume_snapshot(volume, description="day_snapshot-1", region_name=region_name)
+        add_volume_snapshot(volume, description="day_snapshot-2", region_name=region_name)
+
+        sns_boto = boto3.client('sns', region_name=region_name)
+
+        response = sns_boto.create_topic(Name="datopic")
+        arn = response["TopicArn"]
+
+        event = {
+            "period_label": "day",
+            "period_format": "%a%H",
+
+            "ec2_region_name": region_name,
+            # "rds_region_name": region_name,
+
+            "tag_name": "MakeSnapshot",
+            "tag_value": "True",
+
+            "arn": arn,
+
+            "keep_count": 1
         }
 
         result = lambda_handler(event)
+        dajson = json.loads(result)
 
-        print result
+        self.assertEqual(dajson["metrics"]["total_resources"], 1)
+        self.assertEqual(dajson["metrics"]["total_creates"], 1)
+        self.assertEqual(dajson["metrics"]["total_deletes"], 2)
+        self.assertEqual(dajson["metrics"]["total_errors"], 0)