aboutsummaryrefslogtreecommitdiffstats
path: root/functest/opnfv_tests/openstack/shaker
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2018-07-17 13:19:54 +0200
committerCédric Ollivier <cedric.ollivier@orange.com>2018-07-17 14:09:24 +0200
commit8e96ddfb6a6548a9a7a9b4a686e01378425a1cd8 (patch)
tree4cc932a83942c8c8d97e32e298341ae868d373c1 /functest/opnfv_tests/openstack/shaker
parent6812e47c760a202c920271bcc87b3d183b2f61e1 (diff)
Leverage cloudify_ims on Cloudify
It also defines 2 new methods to avoid duplicating code: - TenantNetwork1.get_public_auth_url() - VmReady1.publish_image_alt() Shaker and Tempest are updated as well. Change-Id: Ie9095c57c580b95f067d5a8275ad71818b4df335 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'functest/opnfv_tests/openstack/shaker')
-rw-r--r--functest/opnfv_tests/openstack/shaker/shaker.py6
1 files changed, 1 insertions, 5 deletions
diff --git a/functest/opnfv_tests/openstack/shaker/shaker.py b/functest/opnfv_tests/openstack/shaker/shaker.py
index ca405ae55..4bf340344 100644
--- a/functest/opnfv_tests/openstack/shaker/shaker.py
+++ b/functest/opnfv_tests/openstack/shaker/shaker.py
@@ -51,11 +51,7 @@ class Shaker(singlevm.SingleVm2):
- 1 on operation error
"""
assert self.ssh
- keystone_id = self.orig_cloud.search_services('keystone')[0].id
- self.__logger.debug("keystone id: %s", keystone_id)
- endpoint = self.orig_cloud.search_endpoints(
- filters={'interface': 'public',
- 'service_id': keystone_id})[0].url
+ endpoint = self.get_public_auth_url(self.orig_cloud)
self.__logger.debug("keystone endpoint: %s", endpoint)
self.orig_cloud.grant_role(
"admin", user=self.project.user.id,