summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2017-12-05 07:11:21 +0000
committerGerrit Code Review <review@openstack.org>2017-12-05 07:11:21 +0000
commit3b73def029d26331aac41b1b7c19c9afa527cdde (patch)
tree0237dc9f65b0da889db0f6bfadafb89dac39e12b
parent60dea91a748824cb08c48d898323c01e4989b256 (diff)
parent6e1dc58b8ede0fbd2646408c70ef2868b1363fa4 (diff)
Merge "Fix murano-congress-devstack-dsvm job"
-rwxr-xr-xfunctionaltests/run_tests_common.sh2
-rw-r--r--murano/tests/functional/common/tempest_utils.py20
2 files changed, 12 insertions, 10 deletions
diff --git a/functionaltests/run_tests_common.sh b/functionaltests/run_tests_common.sh
index 2f97be1..852ec4b 100755
--- a/functionaltests/run_tests_common.sh
+++ b/functionaltests/run_tests_common.sh
@@ -5,7 +5,7 @@
5# How many seconds to wait for the API to be responding before giving up 5# How many seconds to wait for the API to be responding before giving up
6API_RESPONDING_TIMEOUT=20 6API_RESPONDING_TIMEOUT=20
7 7
8if ! timeout ${API_RESPONDING_TIMEOUT} sh -c "while ! curl -s http://127.0.0.1:8082/v1/ 2>/dev/null | grep -q 'Unauthorized' ; do sleep 1; done"; then 8if ! timeout ${API_RESPONDING_TIMEOUT} sh -c "while ! curl -s http://127.0.0.1/application-catalog/v1/ 2>/dev/null | grep -q 'Unauthorized' ; do sleep 1; done"; then
9 echo "Murano API failed to respond within ${API_RESPONDING_TIMEOUT} seconds" 9 echo "Murano API failed to respond within ${API_RESPONDING_TIMEOUT} seconds"
10 exit 1 10 exit 1
11fi 11fi
diff --git a/murano/tests/functional/common/tempest_utils.py b/murano/tests/functional/common/tempest_utils.py
index 425dc17..2d6be1a 100644
--- a/murano/tests/functional/common/tempest_utils.py
+++ b/murano/tests/functional/common/tempest_utils.py
@@ -13,8 +13,9 @@
13# under the License. 13# under the License.
14 14
15import congressclient.v1.client as cclient 15import congressclient.v1.client as cclient
16from keystoneauth1 import auth as ksauth 16from keystoneauth1 import identity
17from keystoneauth1 import session as ksasession 17from keystoneauth1 import session as ksasession
18import keystoneclient.v3 as ksclient
18from tempest import config 19from tempest import config
19 20
20import murano.tests.functional.common.utils as common_utils 21import murano.tests.functional.common.utils as common_utils
@@ -28,20 +29,21 @@ class TempestDeployTestMixin(common_utils.DeployTestMixin):
28 @staticmethod 29 @staticmethod
29 @common_utils.memoize 30 @common_utils.memoize
30 def keystone_client(): 31 def keystone_client():
31 return ksauth.identity.v2.Password( 32 return ksclient.Client(username=CONF.auth.admin_username,
32 auth_url=CONF.identity.uri, 33 password=CONF.auth.admin_password,
33 username=CONF.auth.admin_username, 34 tenant_name=CONF.auth.admin_project_name,
34 password=CONF.auth.admin_password, 35 auth_url=CONF.identity.uri_v3)
35 project_name=CONF.auth.admin_project_name)
36 36
37 @staticmethod 37 @staticmethod
38 @common_utils.memoize 38 @common_utils.memoize
39 def congress_client(): 39 def congress_client():
40 auth = ksauth.identity.v3.Password( 40 auth = identity.v3.Password(
41 auth_url=CONF.identity.uri, 41 auth_url=CONF.identity.uri_v3,
42 username=CONF.auth.admin_username, 42 username=CONF.auth.admin_username,
43 password=CONF.auth.admin_password, 43 password=CONF.auth.admin_password,
44 project_name=CONF.auth.admin_project_name) 44 project_name=CONF.auth.admin_project_name,
45 user_domain_name=CONF.auth.admin_domain_name,
46 project_domain_name=CONF.auth.admin_domain_name)
45 session = ksasession.Session(auth=auth) 47 session = ksasession.Session(auth=auth)
46 return cclient.Client(session=session, 48 return cclient.Client(session=session,
47 service_type='policy') 49 service_type='policy')