diff --git a/reports/glance_usage_audit.py b/reports/glance_usage_audit.py index 7588d7f..5e50167 100644 --- a/reports/glance_usage_audit.py +++ b/reports/glance_usage_audit.py @@ -176,7 +176,7 @@ def store_results(start, end, summary, details): 'created': dt.dt_to_decimal(datetime.datetime.utcnow()), 'period_start': start, 'period_end': end, - 'version': 4, + 'version': 6, 'name': 'glance usage audit' } diff --git a/reports/nova_usage_audit.py b/reports/nova_usage_audit.py index 5afebbd..b4ed71c 100644 --- a/reports/nova_usage_audit.py +++ b/reports/nova_usage_audit.py @@ -224,7 +224,7 @@ def store_results(start, end, summary, details): 'created': dt.dt_to_decimal(datetime.datetime.utcnow()), 'period_start': start, 'period_end': end, - 'version': 5, + 'version': 6, 'name': 'nova usage audit' } diff --git a/reports/usage_audit.py b/reports/usage_audit.py index 284c57d..4d62ac4 100644 --- a/reports/usage_audit.py +++ b/reports/usage_audit.py @@ -9,8 +9,11 @@ def _status_queries(exists_query): fail = exists_query.filter(status=models.InstanceExists.FAILED) pending = exists_query.filter(status=models.InstanceExists.PENDING) verifying = exists_query.filter(status=models.InstanceExists.VERIFYING) - - return verified, reconciled, fail, pending, verifying + sent_unverified = exists_query.filter(status=models.InstanceExists.SENT_UNVERIFIED) + sent_failed = exists_query.filter(status=models.InstanceExists.VERIFYING) + sent_verifying = exists_query.filter(status=models.InstanceExists.SENT_VERIFYING) + return verified, reconciled, fail, pending, verifying, sent_unverified, \ + sent_failed, sent_verifying def _send_status_queries(exists_query): @@ -28,7 +31,8 @@ def _send_status_queries(exists_query): def _audit_for_exists(exists_query): (verified, reconciled, - fail, pending, verifying) = _status_queries(exists_query) + fail, pending, verifying, sent_unverified, + sent_failed, sent_verifying) = _status_queries(exists_query) (success, unsent, redirect, client_error, server_error) = _send_status_queries(verified) @@ -43,6 +47,9 @@ def _audit_for_exists(exists_query): 'failed': fail.count(), 'pending': pending.count(), 'verifying': verifying.count(), + 'sent_unverified': sent_unverified.count(), + 'sent_failed': sent_failed.count(), + 'sent_verifying': sent_verifying.count(), 'send_status': { 'success': success.count(), 'unsent': unsent.count(),