5265787b67
Currently compute quota_classes_client and quotas_client returns Response by removing top key from Response. For example- return service_client.ResponseBody(resp, body['quota_set']) 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 quota_classes_client and quotas_client to return complete Response body. Change-Id: Idd8afb1bcfc1b0165b1e967a991d4705ff182249 Implements: blueprint method-return-value-and-move-service-clients-to-lib
87 lines
3.7 KiB
Python
87 lines
3.7 KiB
Python
# Copyright 2012 OpenStack Foundation
|
|
# 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.
|
|
|
|
from tempest.api.compute import base
|
|
from tempest.common import tempest_fixtures as fixtures
|
|
from tempest import test
|
|
|
|
|
|
class QuotasTestJSON(base.BaseV2ComputeTest):
|
|
|
|
@classmethod
|
|
def skip_checks(cls):
|
|
super(QuotasTestJSON, cls).skip_checks()
|
|
if not test.is_extension_enabled('os-quota-sets', 'compute'):
|
|
msg = "quotas extension not enabled."
|
|
raise cls.skipException(msg)
|
|
|
|
def setUp(self):
|
|
# NOTE(mriedem): Avoid conflicts with os-quota-class-sets tests.
|
|
self.useFixture(fixtures.LockFixture('compute_quotas'))
|
|
super(QuotasTestJSON, self).setUp()
|
|
|
|
@classmethod
|
|
def setup_clients(cls):
|
|
super(QuotasTestJSON, cls).setup_clients()
|
|
cls.client = cls.quotas_client
|
|
|
|
@classmethod
|
|
def resource_setup(cls):
|
|
super(QuotasTestJSON, cls).resource_setup()
|
|
cls.tenant_id = cls.client.tenant_id
|
|
cls.user_id = cls.client.user_id
|
|
cls.default_quota_set = set(('injected_file_content_bytes',
|
|
'metadata_items', 'injected_files',
|
|
'ram', 'floating_ips',
|
|
'fixed_ips', 'key_pairs',
|
|
'injected_file_path_bytes',
|
|
'instances', 'security_group_rules',
|
|
'cores', 'security_groups'))
|
|
|
|
@test.idempotent_id('f1ef0a97-dbbb-4cca-adc5-c9fbc4f76107')
|
|
def test_get_quotas(self):
|
|
# User can get the quota set for it's tenant
|
|
expected_quota_set = self.default_quota_set | set(['id'])
|
|
quota_set = self.client.show_quota_set(self.tenant_id)['quota_set']
|
|
self.assertEqual(quota_set['id'], self.tenant_id)
|
|
for quota in expected_quota_set:
|
|
self.assertIn(quota, quota_set.keys())
|
|
|
|
# get the quota set using user id
|
|
quota_set = self.client.show_quota_set(self.tenant_id,
|
|
self.user_id)['quota_set']
|
|
self.assertEqual(quota_set['id'], self.tenant_id)
|
|
for quota in expected_quota_set:
|
|
self.assertIn(quota, quota_set.keys())
|
|
|
|
@test.idempotent_id('9bfecac7-b966-4f47-913f-1a9e2c12134a')
|
|
def test_get_default_quotas(self):
|
|
# User can get the default quota set for it's tenant
|
|
expected_quota_set = self.default_quota_set | set(['id'])
|
|
quota_set = (self.client.show_default_quota_set(self.tenant_id)
|
|
['quota_set'])
|
|
self.assertEqual(quota_set['id'], self.tenant_id)
|
|
for quota in expected_quota_set:
|
|
self.assertIn(quota, quota_set.keys())
|
|
|
|
@test.idempotent_id('cd65d997-f7e4-4966-a7e9-d5001b674fdc')
|
|
def test_compare_tenant_quotas_with_default_quotas(self):
|
|
# Tenants are created with the default quota values
|
|
defualt_quota_set = \
|
|
self.client.show_default_quota_set(self.tenant_id)['quota_set']
|
|
tenant_quota_set = (self.client.show_quota_set(self.tenant_id)
|
|
['quota_set'])
|
|
self.assertEqual(defualt_quota_set, tenant_quota_set)
|