aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgrakiss <grakiss.wanglei@huawei.com>2015-12-31 09:31:31 +0800
committermei mei <meimei@huawei.com>2016-01-04 01:52:13 +0000
commit3a65e3e4e78e00d9d46a0909b6713a726f9a9602 (patch)
treef2523b67896fbb9aa11d1eaed5a3181186948001
parent91753df2c0b3e58bea62716a48e9a74bd9d43b45 (diff)
Update cinder volume quota for new tenant 'vIMS'
Change-Id: I26aad4f3989c89a62f66add85e0d88b7fd274425 Signed-off-by: grakiss <grakiss.wanglei@huawei.com>
-rw-r--r--testcases/functest_utils.py13
-rw-r--r--testcases/vIMS/CI/vIMS.py12
2 files changed, 25 insertions, 0 deletions
diff --git a/testcases/functest_utils.py b/testcases/functest_utils.py
index 88c00858e..fe0b3be74 100644
--- a/testcases/functest_utils.py
+++ b/testcases/functest_utils.py
@@ -321,6 +321,19 @@ def update_sg_quota(neutron_client, tenant_id, sg_quota, sg_rule_quota):
print "Error:", sys.exc_info()[0]
return False
+def update_cinder_quota(cinder_client, tenant_id, vols_quota, snapshots_quota,gigabytes_quota):
+ quotas_values = {
+ "volumes": vols_quota,
+ "snapshots": snapshots_quota,
+ "gigabytes": gigabytes_quota
+ }
+
+ try:
+ quotas_default=cinder_client.quotas.update(tenant_id,**quotas_values)
+ return True
+ except:
+ print "Error:", sys.exc_info()[0]
+ return False
def get_private_net(neutron_client):
# Checks if there is an existing private network
diff --git a/testcases/vIMS/CI/vIMS.py b/testcases/vIMS/CI/vIMS.py
index 12fb775a6..5a3003fe8 100644
--- a/testcases/vIMS/CI/vIMS.py
+++ b/testcases/vIMS/CI/vIMS.py
@@ -242,6 +242,18 @@ def main():
logger.error("Failed to update security group quota for tenant %s" %TENANT_NAME)
exit(-1)
+ logger.info("Update cinder quota for this tenant")
+ from cinderclient import client as cinderclient
+
+ creds_cinder = functest_utils.get_credentials("cinder")
+ cinder_client = cinderclient.Client('1',creds_cinder['username'],
+ creds_cinder['api_key'],
+ creds_cinder['project_id'],
+ creds_cinder['auth_url'],
+ service_type="volume")
+ if not functest_utils.update_cinder_quota(cinder_client,tenant_id,20,50,1500):
+ logger.error("Failed to update cinder quota for tenant %s" % TENANT_NAME)
+ exit(-1)
################ CLOUDIFY INITIALISATION ################