summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorshangxdy <shang.xiaodong@zte.com.cn>2017-10-09 16:46:08 +0800
committershangxdy <shang.xiaodong@zte.com.cn>2017-10-09 17:13:05 +0800
commit79923230d9636c426493505868ba228ba5931896 (patch)
tree4b9a9ea033f1d12e6fcef6227257ffb7ba67b684
parent8eab0db0e6a05ea5535988f3020328d7ae0ecba2 (diff)
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 <shang.xiaodong@zte.com.cn>
-rwxr-xr-xtests/functest_run.sh6
-rw-r--r--tosca2heat/heat-translator/translator/__init__.py2
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()