DCAEGEN2-1448 master hvves testsuite fix

DCAEGEN2-1448 master hvves testsuite fix

Change-Id: I149c8b6cbe8945cd8f82523975b4e83b41e239f1
Issue-ID: DCAEGEN2-1448
Signed-off-by: marekpl <marek.pondel@nokia.com>

1 files changed, 9 insertions, 12 deletions

diff --git a/robot/resources/test_templates/hvves_template.robot b/robot/resources/test_templates/hvves_template.robot
index 8b590788..622cacb0 100644
--- a/robot/resources/test_templates/hvves_template.robot
+++ b/robot/resources/test_templates/hvves_template.robot
@@ -2,7 +2,6 @@
 Documentation   Template contains stuff for HV-VES use case.
 Library     OperatingSystem
 Library     Rammbock
-Library     KafkaLibrary
 Library     BuiltIn
 Library     Collections
 Library     HttpLibrary.HTTP
@@ -14,13 +13,16 @@ ${security_protocol}    SASL_PLAINTEXT
 ${sasl_mechanisms}    PLAIN
 
 *** Keywords ***
-Check Message Via Message Router Api
+Check Message Router Api
     [Documentation]    Checks message via message router API.
-    [Arguments]    ${message_router}    ${message_router_port}    ${topic}    ${state}
-    ${response}=    GET    http://${message_router}:${message_router_port}/events/${topic}/1/1
-    ${body}=    Get Response Body
-    Run Keyword If    '${state}'=='before'    Should Be Equal    ${body}    []
-    Run Keyword If    '${state}'=='after'    Should Not Be Equal    ${body}    []
+    [Arguments]    ${message_router}    ${message_router_port}    ${topic}
+    ${status}    ${response}=    Run Keyword And Ignore Error    GET    http://${message_router}:${message_router_port}/events/${topic}/1/1
+    ${response_code}=    Get Response Status
+    ${response_body}=    Get Response Body
+    Run Keyword If    '${status}'=='FAIL'    Should Start With    ${response_code}    404
+    Run Keyword If    '${status}'=='FAIL'    Log    Topic ${topic} does not exist.
+    Run Keyword If    '${status}'=='PASS'    Should Start With    ${response_code}    200
+    Run Keyword If    '${status}'=='PASS'    Log    Topic ${topic} exists.
 
 Check If Topic Exists
     [Documentation]      Checks if specific topic exists on kafka.
@@ -50,11 +52,6 @@ Start HV-VES TCP Client And Send Message
     New Message     HvVesMessage    protocol=WireTransferProtocol
     Client Sends Message
 
-Download VesEvent Proto File
-    [Documentation]     Download proto file.
-    [Arguments]     ${path}
-    Run     wget "https://gerrit.onap.org/r/gitweb?p=dcaegen2/collectors/hv-ves.git;a=blob_plain;f=hv-collector-domain/src/main/proto/event/VesEvent.proto;hb=HEAD" -O ${path}/VesEvent.proto
-
 Decode Last Message From Topic
     [Documentation]     Decode last message from Kafka topic.
     [Arguments]     ${kafka_server}     ${kafka_port}     ${kafka_topic}    ${sec_protocol}    ${mechanisms}    ${username}    ${password}