summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoanna Jeremicz <joanna.jeremicz@nokia.com>2021-09-13 08:03:43 +0200
committerJoanna Jeremicz <joanna.jeremicz@nokia.com>2021-09-13 08:07:09 +0200
commit109764dc68bf3caea9c3e1b8e08f3c37010fc48a (patch)
tree2e512d59cb58e76d80f98853dbce0a1005862e0a
parent9ffedfe2e6ec38a987faaef578344e391117864d (diff)
Use configMap instead of Consul to configure hv-ves
- Fix "integration-dcae-hv-ves-collector-application-config-configmap not found" issue Find the config map real name Issue-ID: DCAEGEN2-2718 Signed-off-by: Joanna Jeremicz <joanna.jeremicz@nokia.com> Change-Id: I4e4f17ba6d4c880c7bc38ad0ff4b64229f4700c7
-rw-r--r--robot/resources/dcae/hvves.robot8
1 files changed, 4 insertions, 4 deletions
diff --git a/robot/resources/dcae/hvves.robot b/robot/resources/dcae/hvves.robot
index 5db9a0d8..c460422e 100644
--- a/robot/resources/dcae/hvves.robot
+++ b/robot/resources/dcae/hvves.robot
@@ -18,12 +18,13 @@ ${CLIENT_KEY} /tmp/client.key
${PREV_CM_FILE} /tmp/prevCm.json
${CURRENT_CONFIG_FILE} /tmp/currentConfig.yaml
${COPY_CURRENT_CONFIG} kubectl -n onap cp $(kubectl -n onap get --no-headers pods -l app.kubernetes.io/name=dcae-hv-ves-collector --field-selector status.phase=Running -o custom-columns=NAME:.metadata.name):/app-config-input/..data/application_config.yaml ${CURRENT_CONFIG_FILE}
-${GET_PREFIX} echo "%{HOSTNAME}" | awk -F- '{print $1}'
-${NO_PREFIX_CM_NAME} -dcae-hv-ves-collector-application-config-configmap
${GET_TRUSTSTORE_PASS_PATH} cat ${CURRENT_CONFIG_FILE} | grep security.keys.trustStorePasswordFile
${TEST_TRUSTSTORE_PASS_PATH} security.keys.trustStorePasswordFile: /dev/null
${TEST_CONFIG_YAML_PATH} ${EXECDIR}/robot/assets/dcae/hvves_test_config.yaml
+${GET_CM_NAME} kubectl -n onap get --no-headers cm -l app.kubernetes.io/name=dcae-hv-ves-collector -o custom-columns=NAME:.metadata.name | grep application-config-configmap
+
+
*** Keywords ***
Check Message Router Api
@@ -104,9 +105,8 @@ Save Configuration From Config Map
Get Config Map Name
[Documentation] Retrieves HV-VES Config Map name
- ${rc} ${cm_prefix} = Run and Return RC and Output ${GET_PREFIX}
+ ${rc} ${cm_name} = Run and Return RC and Output ${GET_CM_NAME}
Should Be Equal As Integers ${rc} 0
- ${cm_name} = Catenate SEPARATOR= ${cm_prefix} ${NO_PREFIX_CM_NAME}
[Return] ${cm_name}
Set Old Config