summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinda Wang <wangwulin@huawei.com>2017-09-05 03:51:06 +0000
committerLinda Wang <wangwulin@huawei.com>2017-09-05 07:12:37 +0000
commit96357c54369a04f2b5d117573cf3fd3478d63623 (patch)
tree595c048eacc2076aaa4d4f4be7168ff6915a5974
parentbbe21a39bb86d1c548728ba3aaf98bb2a9419ec3 (diff)
Fix the cloudify_ims update quotas error
Change-Id: I62376dd02dd95ebff54c1ebf963267c6534181ed Signed-off-by: Linda Wang <wangwulin@huawei.com>
-rw-r--r--functest/core/vnf.py3
-rw-r--r--functest/opnfv_tests/vnf/ims/cloudify_ims.py8
2 files changed, 5 insertions, 6 deletions
diff --git a/functest/core/vnf.py b/functest/core/vnf.py
index bbdd80a00..868b8b48f 100644
--- a/functest/core/vnf.py
+++ b/functest/core/vnf.py
@@ -120,10 +120,9 @@ class VnfOnBoarding(base.TestCase):
UserSettings(
name=self.tenant_name,
password=self.tenant_name))
- user_creator.create()
self.created_object.append(user_creator)
- project_creator.assoc_user(user_creator.user_settings)
+ project_creator.assoc_user(user_creator.create())
self.snaps_creds = user_creator.get_os_creds(self.tenant_name)
diff --git a/functest/opnfv_tests/vnf/ims/cloudify_ims.py b/functest/opnfv_tests/vnf/ims/cloudify_ims.py
index b98cbe9ae..c8c2c509c 100644
--- a/functest/opnfv_tests/vnf/ims/cloudify_ims.py
+++ b/functest/opnfv_tests/vnf/ims/cloudify_ims.py
@@ -103,15 +103,15 @@ class CloudifyIms(clearwater_ims_base.ClearwaterOnBoardingBase):
network_quotas = self.os_project.get_network_quotas()
for key, value in (
- self.orchestrator['requirements']['compute_quotas'].items()):
+ self.vnf['requirements']['compute_quotas'].items()):
setattr(compute_quotas, key, value)
for key, value in (
- self.orchestrator['requirements']['network_quotas'].items()):
+ self.vnf['requirements']['network_quotas'].items()):
setattr(network_quotas, key, value)
- compute_quotas = self.project_ims.update_compute_quotas(compute_quotas)
- network_quotas = self.project_ims.update_network_quotas(network_quotas)
+ compute_quotas = self.os_project.update_compute_quotas(compute_quotas)
+ network_quotas = self.os_project.update_network_quotas(network_quotas)
# needs some images
self.__logger.info("Upload some OS images if it doesn't exist")