[AAF] Adapt the tests for the AAF removal

[testsuite.git] / robot / testsuites / hvves-ci.robot

diff --git a/robot/testsuites/hvves-ci.robot b/robot/testsuites/hvves-ci.robot
index 5cd4788..5146f50 100644 (file)
--- a/robot/testsuites/hvves-ci.robot
+++ b/robot/testsuites/hvves-ci.robot
@@ -12,17 +12,17 @@ ${HVVES_KAFKA_TOPIC}    HV_VES_PERF3GPP
 ${HVVES_KAFKA_TOPIC_SSL}    HV_VES_PERF3GPP_SSL
 
 *** Test Cases ***
-HV-VES SSL test case
+HV-VES test case
     [Setup]    Run Process    /app/setup-hvves.sh    shell=yes
     ${status}    ${data}=    Run Keyword And Ignore Error   Variable Should Exist    ${GLOBAL_KAFKA_BOOTSTRAP_SERVICE }
     Run Keyword If   "${status}"=="FAIL"  Set Test Config  message-router-kafka:9092
     ...   ELSE   Set Test Config   ${GLOBAL_KAFKA_BOOTSTRAP_SERVICE }
-    Send Message Over Ssl    ${GLOBAL_DCAE_HVVES_SERVER_NAME}    ${GLOBAL_DCAE_HVVES_SERVER_PORT}
-    Run Keyword If   "${status}"=="FAIL"  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}
+    Send Message    ${GLOBAL_DCAE_HVVES_SERVER_NAME}    ${GLOBAL_DCAE_HVVES_SERVER_PORT}
+    Run Keyword If   "${status}"=="FAIL"  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}
     Run Keyword If   "${status}"=="FAIL"  Check Message Router Api    ${GLOBAL_DMAAP_MESSAGE_ROUTER_SERVER_NAME}    ${GLOBAL_DMAAP_MESSAGE_ROUTER_SERVER_PORT}    ${HVVES_KAFKA_TOPIC_SSL}
     ${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}  ${GLOBAL_KAFKA_USER }
+    ${msg}=  Run Keyword If   "${status}"=="FAIL"   Decode Last Message From Topic    ${GLOBAL_DMAAP_KAFKA_SERVER_NAME}    ${GLOBAL_DMAAP_KAFKA_SERVER_PORT}    ${HVVES_KAFKA_TOPIC}    ${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}  ${GLOBAL_KAFKA_USER}
     ${results}=    Compare File To Message    ${EXECDIR}/robot/assets/dcae/hvves_msg.raw    ${msg}
     Should Be True    ${results}
     [Teardown]      Set Old Config