[HV-VES] Improve hv-ves suite

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

diff --git a/robot/testsuites/hvves-ci.robot b/robot/testsuites/hvves-ci.robot
index 5146f50..0413bb3 100644 (file)
--- a/robot/testsuites/hvves-ci.robot
+++ b/robot/testsuites/hvves-ci.robot
@@ -7,22 +7,11 @@ Resource    ../resources/dcae/hvves.robot
 Library    OperatingSystem
 Library    ONAPLibrary.Protobuf
 
-*** Variable ***
-${HVVES_KAFKA_TOPIC}    HV_VES_PERF3GPP
-${HVVES_KAFKA_TOPIC_SSL}    HV_VES_PERF3GPP_SSL
-
 *** Test Cases ***
 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    ${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}    ${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}
+    ${status}    ${data}=    Run Keyword And Ignore Error   Variable Should Exist    ${GLOBAL_KAFKA_BOOTSTRAP_SERVICE}
+    Send Message    ${GLOBAL_DCAE_HVVES_SERVER_NAME}        ${GLOBAL_DCAE_HVVES_SERVER_PORT}
+    Sleep   10s
+    ${msg}=  Run Keyword  Decode Last Message From Topic    ${GLOBAL_KAFKA_BOOTSTRAP_SERVICE}   HV_VES_PERF3GPP  ${GLOBAL_KAFKA_USER}
     ${results}=    Compare File To Message    ${EXECDIR}/robot/assets/dcae/hvves_msg.raw    ${msg}
     Should Be True    ${results}
-    [Teardown]      Set Old Config