From 57c696d6279d27a4dc2edee0b77814631e75443f Mon Sep 17 00:00:00 2001 From: Andrew Melton Date: Thu, 31 Jan 2013 13:46:04 -0500 Subject: [PATCH] Allowing for delete events before launches --- stacktach/db.py | 3 +++ stacktach/models.py | 16 ++++++++++++---- stacktach/tests.py | 20 +++++++------------- stacktach/views.py | 16 ++++++++++------ tests/unit/test_stacktach.py | 27 +++++++++++++-------------- 5 files changed, 45 insertions(+), 37 deletions(-) diff --git a/stacktach/db.py b/stacktach/db.py index 1d31a2e..f548b9d 100644 --- a/stacktach/db.py +++ b/stacktach/db.py @@ -33,6 +33,9 @@ def get_or_create_instance_usage(**kwargs): def get_instance_usage(**kwargs): return models.InstanceUsage.objects.get(**kwargs) +def create_instance_delete(**kwargs): + return models.InstanceDeletes(**kwargs) + def create_instance_exists(**kwargs): return models.InstanceExists(**kwargs) diff --git a/stacktach/models.py b/stacktach/models.py index ca2ea94..11d56f0 100644 --- a/stacktach/models.py +++ b/stacktach/models.py @@ -72,18 +72,26 @@ class Lifecycle(models.Model): class InstanceUsage(models.Model): instance = models.CharField(max_length=50, null=True, blank=True, db_index=True) - #launched_at = models.IntegerField(null=True, db_index=True) launched_at = models.DecimalField(null=True, max_digits=20, decimal_places=6) - #deleted_at = models.IntegerField(null=True, db_index=True) - deleted_at = models.DecimalField(null=True, max_digits=20, - decimal_places=6) request_id = models.CharField(max_length=50, null=True, blank=True, db_index=True) instance_type_id = models.CharField(max_length=50, null=True, blank=True, db_index=True) + + +class InstanceDeletes(models.Model): + instance = models.CharField(max_length=50, null=True, + blank=True, db_index=True) + launched_at = models.DecimalField(null=True, max_digits=20, + decimal_places=6) + deleted_at = models.DecimalField(null=True, max_digits=20, + decimal_places=6) + raw = models.ForeignKey(RawData, null=True) + + class InstanceExists(models.Model): PENDING = 'pending' VERIFIED = 'verified' diff --git a/stacktach/tests.py b/stacktach/tests.py index b3a318e..9930695 100644 --- a/stacktach/tests.py +++ b/stacktach/tests.py @@ -492,14 +492,6 @@ class ViewsUsageTestCase(unittest.TestCase): def test_process_delete(self): launched_str = '2012-12-21 06:34:50.123' launched = views.str_time_to_unix(launched_str) - values = { - 'instance': INSTANCE_ID_1, - 'request_id': REQUEST_ID_1, - 'instance_type_id': '1', - 'launched_at': launched, - } - InstanceUsage(**values).save() - deleted_str = '2012-12-21 12:34:50.123' deleted = views.str_time_to_unix(deleted_str) json = test_utils.make_delete_end_json(launched_str, deleted_str) @@ -508,10 +500,13 @@ class ViewsUsageTestCase(unittest.TestCase): views._process_delete(raw) - usages = InstanceUsage.objects.all() - self.assertEqual(len(usages), 1) - usage = usages[0] - self.assertEqual(usage.deleted_at, deleted) + delete = InstanceDeletes.objects.all() + self.assertEqual(len(delete), 1) + delete = delete[0] + self.assertEqual(delete.instance, INSTANCE_ID_1) + self.assertEqual(delete.launched_at, launched) + self.assertEqual(delete.deleted_at, deleted) + self.assertEqual(delete.raw.id, raw.id) def test_process_exists(self): launched_str = '2012-12-21 06:34:50.123' @@ -556,7 +551,6 @@ class ViewsUsageTestCase(unittest.TestCase): 'request_id': REQUEST_ID_1, 'instance_type_id': '1', 'launched_at': launched, - 'deleted_at': deleted, } InstanceUsage(**values).save() diff --git a/stacktach/views.py b/stacktach/views.py index 55fc520..eb67e38 100644 --- a/stacktach/views.py +++ b/stacktach/views.py @@ -254,12 +254,16 @@ def _process_delete(raw): notif = json.loads(raw.json) payload = notif[1]['payload'] instance_id = payload['instance_id'] - launched_at = payload['launched_at'] - launched_at = str_time_to_unix(launched_at) - instance = STACKDB.get_instance_usage(instance=instance_id, - launched_at=launched_at) - instance.deleted_at = str_time_to_unix(payload['deleted_at']) - STACKDB.save(instance) + launched_at = str_time_to_unix(payload['launched_at']) + deleted_at = str_time_to_unix(payload['deleted_at']) + values = { + 'instance': instance_id, + 'launched_at': launched_at, + 'deleted_at': deleted_at, + 'raw': raw + } + delete = STACKDB.create_instance_delete(**values) + STACKDB.save(delete) def _process_exists(raw): diff --git a/tests/unit/test_stacktach.py b/tests/unit/test_stacktach.py index 56774db..9fa9e52 100644 --- a/tests/unit/test_stacktach.py +++ b/tests/unit/test_stacktach.py @@ -508,23 +508,22 @@ class StacktackUsageParsingTestCase(unittest.TestCase): event = 'compute.instance.delete.end' raw = utils.create_raw(self.mox, delete_decimal, event=event, json_str=json_str) - usage = self.mox.CreateMockAnything() - usage.instance = INSTANCE_ID_1 - usage.request_id = REQUEST_ID_1 - usage.instance_type_id = '1' - usage.launched_at = launch_decimal - views.STACKDB.get_instance_usage(instance=INSTANCE_ID_1, - launched_at=launch_decimal)\ - .AndReturn(usage) - views.STACKDB.save(usage) + delete = self.mox.CreateMockAnything() + delete.instance = INSTANCE_ID_1 + delete.launched_at = launch_decimal + delete.deleted_at = delete_decimal + views.STACKDB.create_instance_delete(instance=INSTANCE_ID_1, + launched_at=launch_decimal, + deleted_at=delete_decimal, + raw=raw)\ + .AndReturn(delete) + views.STACKDB.save(delete) self.mox.ReplayAll() views._process_delete(raw) - self.assertEqual(usage.instance, INSTANCE_ID_1) - self.assertEqual(usage.request_id, REQUEST_ID_1) - self.assertEqual(usage.instance_type_id, '1') - self.assertEqual(usage.launched_at, launch_decimal) - self.assertEqual(usage.deleted_at, delete_decimal) + self.assertEqual(delete.instance, INSTANCE_ID_1) + self.assertEqual(delete.launched_at, launch_decimal) + self.assertEqual(delete.deleted_at, delete_decimal) self.mox.VerifyAll() def test_process_exists(self):