openstack
/
tempest
Code Issues Proposed changes

Merge "Use quota_set instead of default_quota_set"

This commit is contained in:
Jenkins 2016-09-02 10:21:55 +00:00 committed by Gerrit Code Review
parent cfc71db51f fbb29cde6e
commit afe504bdd2
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tempest/api/compute/admin/test_servers_negative.py
View File

@ -34,6 +34,7 @@ class ServersAdminNegativeTestJSON(base.BaseV2ComputeAdminTest):
cls.client = cls.os_adm.servers_client
cls.non_adm_client = cls.servers_client
cls.flavors_client = cls.os_adm.flavors_client
cls.quotas_client = cls.os_adm.quotas_client
@classmethod
def resource_setup(cls):
@ -64,8 +65,8 @@ class ServersAdminNegativeTestJSON(base.BaseV2ComputeAdminTest):
self.useFixture(fixtures.LockFixture('compute_quotas'))
flavor_name = data_utils.rand_name("flavor")
flavor_id = self._get_unused_flavor_id()
quota_set = (self.quotas_client.show_default_quota_set(self.tenant_id)
['quota_set'])
quota_set = self.quotas_client.show_quota_set(
self.tenant_id)['quota_set']
ram = int(quota_set['ram'])
if ram == -1:
raise self.skipException("default ram quota set is -1,"
@ -93,8 +94,8 @@ class ServersAdminNegativeTestJSON(base.BaseV2ComputeAdminTest):
flavor_name = data_utils.rand_name("flavor")
flavor_id = self._get_unused_flavor_id()
ram = 512
quota_set = (self.quotas_client.show_default_quota_set(self.tenant_id)
['quota_set'])
quota_set = self.quotas_client.show_quota_set(
self.tenant_id)['quota_set']
vcpus = int(quota_set['cores'])
if vcpus == -1:
raise self.skipException("default cores quota set is -1,"