Fixing up verification with an InstanceReconcile

This commit is contained in:
Andrew Melton 2013-07-08 16:07:29 -04:00
parent 191b2316f6
commit 223de7a0a4
2 changed files with 9 additions and 6 deletions

View File

@ -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

View File

@ -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")