From 9e8270d05c80712d579b627d46964bcf99458228 Mon Sep 17 00:00:00 2001 From: shangxdy Date: Mon, 9 Oct 2017 16:46:08 +0800 Subject: Fix test for apex Currently the test in apex is error, the patch will fix it. JIRA: PARSER-160 Change-Id: I0c290f7819468e1f400f1610fc87bceb72086b92 Signed-off-by: shangxdy --- tests/functest_run.sh | 6 +++--- tosca2heat/heat-translator/translator/__init__.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/functest_run.sh b/tests/functest_run.sh index abd0ece..3afbd56 100755 --- a/tests/functest_run.sh +++ b/tests/functest_run.sh @@ -104,17 +104,17 @@ create_parser_user_and_project() { } # 3. grant role for parser user - openstack ${debug} role list --user ${PARSER_USER} --project ${PARSER_PROJECT} \ + openstack ${debug} role assignment list --user ${PARSER_USER} --project ${PARSER_PROJECT} \ | grep -qow ${PARSER_ROLE} && { echo " User ${PARSER_USER} has role ${PARSER_ROLE} in project ${PARSER_PROJECT}, doesn't create." } || { openstack ${debug} role add ${PARSER_ROLE} --user ${PARSER_USER} \ --project ${PARSER_PROJECT} - echo " Grant user ${PARSER_USER} the role ${PARSER_ROLE} in project ${PARSER_PROJECT} successful." + echo " Grant user ${PARSER_USER} the role of ${PARSER_ROLE} in project ${PARSER_PROJECT} successful." openstack ${debug} role list | grep -qow heat_stack_owner && { openstack ${debug} role add heat_stack_owner --user ${PARSER_USER} \ --project ${PARSER_PROJECT} - echo " Grant user ${PARSER_USER} the role heat_stack_owner in project ${PARSER_PROJECT} successful." + echo " Grant user ${PARSER_USER} the role of heat_stack_owner in project ${PARSER_PROJECT} successful." } } diff --git a/tosca2heat/heat-translator/translator/__init__.py b/tosca2heat/heat-translator/translator/__init__.py index 3c2a807..aab5d8c 100644 --- a/tosca2heat/heat-translator/translator/__init__.py +++ b/tosca2heat/heat-translator/translator/__init__.py @@ -16,4 +16,4 @@ import pbr.version __version__ = pbr.version.VersionInfo( - 'heat-translator').version_string() + 'nfv-heattranslator').version_string() -- cgit 1.2.3-korg