summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGary Wu <gary.i.wu@huawei.com>2018-09-05 20:19:26 +0000
committerGerrit Code Review <gerrit@onap.org>2018-09-05 20:19:26 +0000
commit9eaf4c111c856b8ad60e9ba92d9f9b94f619412d (patch)
tree8744778f6c7b92ea295a534d14a67623fbc90218
parent01725a8d58667825e628bca495d2fbbdb1f95392 (diff)
parent00f125e0ace23eefab956fcb4a0d8084fa551d03 (diff)
Merge "Password Encryption and Logging"
-rw-r--r--robot/resources/asdc_interface.robot4
-rw-r--r--robot/resources/openstack/keystone_interface.robot7
-rwxr-xr-xrunTags.sh1
3 files changed, 8 insertions, 4 deletions
diff --git a/robot/resources/asdc_interface.robot b/robot/resources/asdc_interface.robot
index 9dc3254e..3e33fded 100644
--- a/robot/resources/asdc_interface.robot
+++ b/robot/resources/asdc_interface.robot
@@ -423,13 +423,13 @@ Run ASDC Health Check
${uuid}= Generate UUID
${headers}= Create Dictionary Accept=application/json Content-Type=application/json X-TransactionId=${GLOBAL_APPLICATION_ID}-${uuid} X-FromAppId=${GLOBAL_APPLICATION_ID}
${resp}= Get Request asdc ${ASDC_HEALTH_CHECK_PATH} headers=${headers}
- Should Be Equal As Strings ${resp.status_code} 200
+ Should Be Equal As Strings ${resp.status_code} 200 SDC DOWN
${SDC_DE_HEALTH}= Catenate DOWN
@{ITEMS}= Copy List ${resp.json()['componentsInfo']}
:FOR ${ELEMENT} IN @{ITEMS}
\ Log ${ELEMENT['healthCheckStatus']}
\ ${SDC_DE_HEALTH} Set Variable If (('DE' in '${ELEMENT['healthCheckComponent']}') and ('${ELEMENT['healthCheckStatus']}' == 'UP')) or ('${SDC_DE_HEALTH}'=='UP') UP
- Should Be Equal As Strings ${SDC_DE_HEALTH} UP
+ Should Be Equal As Strings ${SDC_DE_HEALTH} UP SDC_DE DOWN
Run ASDC Get Request
[Documentation] Runs an ASDC get request
[Arguments] ${data_path} ${user}=${ASDC_DESIGNER_USER_ID} ${MY_ASDC_BE_ENDPOINT}=${ASDC_BE_ENDPOINT}
diff --git a/robot/resources/openstack/keystone_interface.robot b/robot/resources/openstack/keystone_interface.robot
index 4749eb08..b18674f7 100644
--- a/robot/resources/openstack/keystone_interface.robot
+++ b/robot/resources/openstack/keystone_interface.robot
@@ -54,7 +54,10 @@ Set Openstack Credentials
[Return] ${user} ${pass}
Get Openstack Credentials
- [Return] ${GLOBAL_INJECTED_OPENSTACK_USERNAME} ${GLOBAL_INJECTED_OPENSTACK_PASSWORD}
+ [Documentation] Returns the Decripted Password and openstack username using same api_key.txt as SO
+ ${DECRYPTED_OPENSTACK_PASSWORD}= Run echo -n ${GLOBAL_INJECTED_OPENSTACK_API_KEY} | xxd -r -p | openssl enc -aes-128-ecb -d -nopad -nosalt -K aa3871669d893c7fb8abbcda31b88b4f | tr -d '\x08'
+ [Return] ${GLOBAL_INJECTED_OPENSTACK_USERNAME} ${DECRYPTED_OPENSTACK_PASSWORD}
+
Get Keystone Url And Path
[Documentation] Handle arbitrary keystone identiit url. Add v2.0 if not present.
@@ -63,4 +66,4 @@ Get Keystone Url And Path
${version}= Evaluate ''
${version}= Set Variable If '${OPENSTACK_KEYSTONE_API_VERSION}' not in '${pieces.path}' ${OPENSTACK_KEYSTONE_API_VERSION} ${version}
${path}= Catenate ${pieces.path}${version}
- [Return] ${url} ${path} \ No newline at end of file
+ [Return] ${url} ${path}
diff --git a/runTags.sh b/runTags.sh
index 08ffe531..57215d17 100755
--- a/runTags.sh
+++ b/runTags.sh
@@ -21,6 +21,7 @@ OUTPUT_FOLDER=${OUTPUT_FOLDER:-$DEFAULT_OUTPUT_FOLDER}
VARIABLEFILES=
LISTENERS=
+VARIABLES="--removekeywords name:keystone_interface.*"
## Single argument, it is an include tag
if [ $# -eq 1 ]; then