openstack/deb-tempest
Code Issues Proposed changes

Merge "Return complete response from instance usage client"

Browse Source
This commit is contained in:
Jenkins
2015-08-25 05:49:25 +00:00
committed by Gerrit Code Review
parent 339af5a27c 38ada0d8b4
commit 32ab1798a7
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tempest/api/compute/admin/test_instance_usage_audit_log.py
View File

@@ -31,7 +31,8 @@ class InstanceUsageAuditLogTestJSON(base.BaseV2ComputeAdminTest):
@test.idempotent_id('25319919-33d9-424f-9f99-2c203ee48b9d')
def test_list_instance_usage_audit_logs(self):
# list instance usage audit logs
body = self.adm_client.list_instance_usage_audit_logs()
body = (self.adm_client.list_instance_usage_audit_logs()
["instance_usage_audit_logs"])
expected_items = ['total_errors', 'total_instances', 'log',
'num_hosts_running', 'num_hosts_done',
'num_hosts', 'hosts_not_run', 'overall_status',
@@ -44,8 +45,9 @@ class InstanceUsageAuditLogTestJSON(base.BaseV2ComputeAdminTest):
def test_get_instance_usage_audit_log(self):
# Get instance usage audit log before specified time
now = datetime.datetime.now()
body = self.adm_client.show_instance_usage_audit_log(
body = (self.adm_client.show_instance_usage_audit_log(
urllib.quote(now.strftime("%Y-%m-%d %H:%M:%S")))
["instance_usage_audit_log"])
expected_items = ['total_errors', 'total_instances', 'log',
'num_hosts_running', 'num_hosts_done', 'num_hosts',

6
tempest/services/compute/json/instance_usage_audit_log_client.py
View File

@@ -28,13 +28,11 @@ class InstanceUsagesAuditLogClient(service_client.ServiceClient):
body = json.loads(body)
self.validate_response(schema.list_instance_usage_audit_log,
resp, body)
return service_client.ResponseBody(resp,
body["instance_usage_audit_logs"])
return service_client.ResponseBody(resp, body)
def show_instance_usage_audit_log(self, time_before):
url = 'os-instance_usage_audit_log/%s' % time_before
resp, body = self.get(url)
body = json.loads(body)
self.validate_response(schema.get_instance_usage_audit_log, resp, body)
return service_client.ResponseBody(resp,
body["instance_usage_audit_log"])
return service_client.ResponseBody(resp, body)