From 223de7a0a49cbf4e15fefc53c6542330b71db353 Mon Sep 17 00:00:00 2001 From: Andrew Melton Date: Mon, 8 Jul 2013 16:07:29 -0400 Subject: [PATCH] Fixing up verification with an InstanceReconcile --- stacktach/reconciler/utils.py | 10 +++++----- verifier/dbverifier.py | 5 ++++- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/stacktach/reconciler/utils.py b/stacktach/reconciler/utils.py index 26d0ac4..843d8e2 100644 --- a/stacktach/reconciler/utils.py +++ b/stacktach/reconciler/utils.py @@ -5,10 +5,10 @@ def empty_reconciler_instance(): 'launched_at': None, 'deleted': False, 'deleted_at': None, - 'instance_type_ud': None, - 'os_architecture': None, - 'os_distro': None, - 'os_version': None, - 'rax_options': None, + 'instance_type_id': None, + 'os_architecture': '', + 'os_distro': '', + 'os_version': '', + 'rax_options': '', } return r_instance diff --git a/verifier/dbverifier.py b/verifier/dbverifier.py index 2c76e89..1eab51c 100644 --- a/verifier/dbverifier.py +++ b/verifier/dbverifier.py @@ -260,7 +260,10 @@ def _verify_with_reconciled_data(exist, ex): _verify_for_launch(exist, launch=reconcile, launch_type="InstanceReconcile") - _verify_for_delete(exist, delete=reconcile, + delete = None + if reconcile.deleted_at is not None: + delete = reconcile + _verify_for_delete(exist, delete=delete, delete_type="InstanceReconcile")