38ada0d8b4
Currently compute instance_usage_audit_log_client returns Response by removing top key from Response. For example- return service_client.ResponseBody(resp, body['instance_usage_audit_log']) As service clients are in direction to move to Tempest-lib, all service clients should return Response without any truncation. One good example is Resource pagination links which are lost with current way of return value. Resource pagination links are present in parallel (not inside) to top key of Response. This patch makes compute instance_usage_audit_log_client to return complete Response body. Change-Id: I11038a3b5e263918c150bbb304ae40a905329bef Implements: blueprint method-return-value-and-move-service-clients-to-lib
58 lines
2.4 KiB
Python
58 lines
2.4 KiB
Python
# Copyright 2013 IBM Corporation
|
|
# All Rights Reserved.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
|
|
import datetime
|
|
|
|
from six.moves.urllib import parse as urllib
|
|
|
|
from tempest.api.compute import base
|
|
from tempest import test
|
|
|
|
|
|
class InstanceUsageAuditLogTestJSON(base.BaseV2ComputeAdminTest):
|
|
|
|
@classmethod
|
|
def setup_clients(cls):
|
|
super(InstanceUsageAuditLogTestJSON, cls).setup_clients()
|
|
cls.adm_client = cls.os_adm.instance_usages_audit_log_client
|
|
|
|
@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()
|
|
["instance_usage_audit_logs"])
|
|
expected_items = ['total_errors', 'total_instances', 'log',
|
|
'num_hosts_running', 'num_hosts_done',
|
|
'num_hosts', 'hosts_not_run', 'overall_status',
|
|
'period_ending', 'period_beginning',
|
|
'num_hosts_not_run']
|
|
for item in expected_items:
|
|
self.assertIn(item, body)
|
|
|
|
@test.idempotent_id('6e40459d-7c5f-400b-9e83-449fbc8e7feb')
|
|
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(
|
|
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',
|
|
'hosts_not_run', 'overall_status', 'period_ending',
|
|
'period_beginning', 'num_hosts_not_run']
|
|
for item in expected_items:
|
|
self.assertIn(item, body)
|