[ROBOT] Adopt HVVES test case in order to work with strimzi kafka

Adopt HVVES test case in order to work with strimzi kafka.

Signed-off-by: Krzysztof Kuzmicki <krzysztof.kuzmicki@nokia.com>
Issue-ID: DMAAP-1705
Change-Id: I17dc3db51515f769cb215e63a9a47dfc8d014434

3 files changed, 56 insertions, 18 deletions

diff --git a/robot/assets/dcae/hvves_test_config.yaml b/robot/assets/dcae/hvves_test_config.yaml
index 8e0733c4..7ca4dbaf 100644
--- a/robot/assets/dcae/hvves_test_config.yaml
+++ b/robot/assets/dcae/hvves_test_config.yaml
@@ -1,20 +1,52 @@
 data:
   application_config.yaml: |
-    security.sslDisable: false
+    cbs.requestIntervalSec: 5
     logLevel: INFO
+    security.keys.keyStoreFile: /tmp/server.p12
+    security.keys.keyStorePasswordFile: /dev/null
     security.keys.trustStoreFile: /tmp/ca.p12
-    server.listenPort: 6061
+    security.keys.trustStorePasswordFile: /dev/null
+    security.sslDisable: false
     server.idleTimeoutSec: 300
-    cbs.requestIntervalSec: 5
+    server.listenPort: 6061
     streams_publishes:
       perf3gpp:
+        aaf_credentials:
+          password: ${AAF_PASSWORD}
+          username: ${AAF_USER}
+        kafka_info:
+          bootstrap_servers: message-router-kafka:9092
+          topic_name: HV_VES_PERF3GPP
         type: kafka
+      ves-3gpp-fault-supervision:
         aaf_credentials:
-          username: admin
-          password: admin_secret
+          password: ${AAF_PASSWORD}
+          username: ${AAF_USER}
         kafka_info:
           bootstrap_servers: message-router-kafka:9092
-          topic_name: HV_VES_PERF3GPP_SSL
-    security.keys.keyStoreFile: /tmp/server.p12
-    security.keys.trustStorePasswordFile: /dev/null
-    security.keys.keyStorePasswordFile: /dev/null
+          topic_name: SEC_3GPP_FAULTSUPERVISION_OUTPUT
+        type: kafka
+      ves-3gpp-heartbeat:
+        aaf_credentials:
+          password: ${AAF_PASSWORD}
+          username: ${AAF_USER}
+        kafka_info:
+          bootstrap_servers: message-router-kafka:9092
+          topic_name: SEC_3GPP_HEARTBEAT_OUTPUT
+        type: kafka
+      ves-3gpp-performance-assurance:
+        aaf_credentials:
+          password: ${AAF_PASSWORD}
+          username: ${AAF_USER}
+        kafka_info:
+          bootstrap_servers: message-router-kafka:9092
+          topic_name: SEC_3GPP_PERFORMANCEASSURANCE_OUTPUT
+        type: kafka
+      ves-3gpp-provisioning:
+        aaf_credentials:
+          password: ${AAF_PASSWORD}
+          username: ${AAF_USER}
+        kafka_info:
+          bootstrap_servers: message-router-kafka:9092
+          topic_name: SEC_3GPP_PROVISIONING_OUTPUT
+        type: kafka
diff --git a/robot/resources/dcae/hvves.robot b/robot/resources/dcae/hvves.robot
index 78a86b68..89de8250 100644
--- a/robot/resources/dcae/hvves.robot
+++ b/robot/resources/dcae/hvves.robot
@@ -16,15 +16,13 @@ ${CLIENT_CERT}    /tmp/client.pem
 ${CLIENT_KEY}    /tmp/client.key
 
 ${PREV_CM_FILE}                   /tmp/prevCm.json
-${CURRENT_CONFIG_FILE}            /tmp/currentConfig.yaml
+${CURRENT_CONFIG_FILE}            /tmp/xz.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_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
-
-
+${KAFKA_GET_PASSWORD}             kubectl -n onap get secret strimzi-kafka-admin -o jsonpath="{.data.password}" | base64 --decode
 
 *** Keywords ***
 Check Message Router Api
@@ -62,6 +60,16 @@ Decode Last Message From Topic
     ${msg}=     Consume    kafka    ${kafka_topic}
     [Return]    ${msg}
 
+Decode Last Message From Topic STRIMZI User
+    [Documentation]     Decode last message from Kafka topic using STRIMZI User.
+    [Arguments]     ${kafka_server}   ${kafka_topic}    ${username}
+    ${command_output} =                 Run And Return Rc And Output        ${KAFKA_GET_PASSWORD}
+    Should Be Equal As Integers         ${command_output[0]}                0
+    ${password}   Set Variable  ${command_output[1]}
+    Connect    kafka    ${kafka_server}    ${username}    ${password}   SCRAM-SHA-512
+    ${msg}=     Consume    kafka    ${kafka_topic}
+    [Return]    ${msg}
+
 Set Test Config
     [Documentation]     Changes HV-VES config.
 
@@ -80,13 +88,10 @@ Set Test Config
 Check If Config Is Applied
     [Documentation]    Checks if the config is applied.
     [Arguments]        ${truststore_pass_path}
-
     ${rc} =                                    Run and Return RC                              ${COPY_CURRENT_CONFIG}
     Should Be Equal As Integers                ${rc}                                          0
-
     ${rc}      ${current_trust_pass_path} =    Run and Return RC and Output                   ${GET_TRUSTSTORE_PASS_PATH}
     Should Be Equal As Integers                ${rc}                                          0
-
     Should Be Equal As Strings                 ${truststore_pass_path}                        ${current_trust_pass_path}
 
 Save Configuration From Config Map
@@ -96,7 +101,6 @@ Save Configuration From Config Map
     ${rc}    ${prev_conf} =                    Run and Return RC and Output                   kubectl -n onap get cm ${cm_name} -o json
     Should Be Equal As Integers                ${rc}                                          0
     Create File                                ${PREV_CM_FILE}                                ${prev_conf}
-
     ${rc}    ${prev_conf_yaml} =               Run and Return RC and Output                   kubectl -n onap get cm ${cm_name} -o jsonpath="{.data.application_config\\.yaml}"
     Should Be Equal As Integers                ${rc}                                          0
     Set Environment Variable                   OLD_CONFIG_YAML                                ${prev_conf_yaml}
diff --git a/robot/testsuites/hvves-ci.robot b/robot/testsuites/hvves-ci.robot
index 0e08ff6e..05b05ce0 100644
--- a/robot/testsuites/hvves-ci.robot
+++ b/robot/testsuites/hvves-ci.robot
@@ -18,7 +18,9 @@ HV-VES SSL test case
     Send Message Over Ssl    ${GLOBAL_DCAE_HVVES_SERVER_NAME}    ${GLOBAL_DCAE_HVVES_SERVER_PORT}
     Wait Until Keyword Succeeds    10s    2s    Check If Topic Exists    ${GLOBAL_DMAAP_MESSAGE_ROUTER_SERVER_NAME}    ${GLOBAL_DMAAP_MESSAGE_ROUTER_SERVER_PORT}    ${HVVES_KAFKA_TOPIC_SSL}
     Check Message Router Api    ${GLOBAL_DMAAP_MESSAGE_ROUTER_SERVER_NAME}    ${GLOBAL_DMAAP_MESSAGE_ROUTER_SERVER_PORT}    ${HVVES_KAFKA_TOPIC_SSL}
-    ${msg}=    Decode Last Message From Topic    ${GLOBAL_DMAAP_KAFKA_SERVER_NAME}    ${GLOBAL_DMAAP_KAFKA_SERVER_PORT}    ${HVVES_KAFKA_TOPIC_SSL}    ${GLOBAL_DMAAP_KAFKA_JAAS_USERNAME}    ${GLOBAL_DMAAP_KAFKA_JAAS_PASSWORD}
+    ${status}    ${data}=    Run Keyword And Ignore Error   Variable Should Exist    ${GLOBAL_KAFKA_BOOTSTRAP_SERVICE }
+    ${msg}=  Run Keyword If   "${status}"=="FAIL"   Decode Last Message From Topic    ${GLOBAL_DMAAP_KAFKA_SERVER_NAME}    ${GLOBAL_DMAAP_KAFKA_SERVER_PORT}    ${HVVES_KAFKA_TOPIC_SSL}    ${GLOBAL_DMAAP_KAFKA_JAAS_USERNAME}    ${GLOBAL_DMAAP_KAFKA_JAAS_PASSWORD}
+    ...   ELSE    Decode Last Message From Topic STRIMZI User    ${GLOBAL_KAFKA_BOOTSTRAP_SERVICE}   ${HVVES_KAFKA_TOPIC_SSL}  ${GLOBAL_KAFKA_USER }
     ${results}=    Compare File To Message    ${EXECDIR}/robot/assets/dcae/hvves_msg.raw    ${msg}
     Should Be True    ${results}
     [Teardown]      Set Old Config