X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=tests%2Fdcaegen2-collectors-hv-ves%2Ftestcases%2F__init__.robot;h=5c8258f3e9a1dcb28f24dc04a211c69706c298b9;hb=70d73b28bf67092efc4c7983ac04ad759f5056e9;hp=54d3e1c885a2b0d72510979f1a86139385aba463;hpb=26ed3a83159b3de2d495b0b41495a826d7e8fd8a;p=integration%2Fcsit.git

diff --git a/tests/dcaegen2-collectors-hv-ves/testcases/__init__.robot b/tests/dcaegen2-collectors-hv-ves/testcases/__init__.robot
index 54d3e1c8..5c8258f3 100644
--- a/tests/dcaegen2-collectors-hv-ves/testcases/__init__.robot
+++ b/tests/dcaegen2-collectors-hv-ves/testcases/__init__.robot
@@ -1,7 +1,7 @@
 # ============LICENSE_START=======================================================
 # csit-dcaegen2-collectors-hv-ves
 # ================================================================================
-# Copyright (C) 2018-2019 NOKIA
+# Copyright (C) 2018-2021 NOKIA
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -18,9 +18,10 @@
 
 *** Settings ***
 Library       DcaeAppSimulatorLibrary
-Library       ConsulLibrary
 Library       VesHvContainersUtilsLibrary
 
+Resource      resources/common-keywords.robot
+
 Suite Setup       HV-VES Collector Suites Setup
 
 *** Keywords ***
@@ -32,25 +33,15 @@ HV-VES Collector Suites Setup
 
 
 Configure collector
-    ${CONSUL_API_ACCESS}=   Get Consul Api Access Url   ${HTTP_METHOD_URL}   ${CONSUL_CONTAINER_HOST}   ${CONSUL_CONTAINER_PORT}
-    ${CONSUL_API_URL}=  Catenate   SEPARATOR=   ${CONSUL_API_ACCESS}   ${CONSUL_VES_HV_CONFIGURATION_KEY_PATH}
-    Publish HV VES Configuration In Consul    ${CONSUL_API_URL}   ${VES_HV_CONFIGURATION_JSON_FILEPATH}
+    Set New Mounted Configuration    ${HV_VES_CONFIGURATION_JSON_FILEPATH}
 
 Configure Dcae App
-    ${DCAE_APP_API_ACCESS}=   Get Dcae App Api Access Url   ${HTTP_METHOD_URL}   ${DCAE_APP_CONTAINER_HOST}   ${DCAE_APP_CONTAINER_PORT}
-
-    ${DCAE_APP_API_MESSAGE_RESET_URL}=   Catenate   SEPARATOR=   ${DCAE_APP_API_ACCESS}   ${DCAE_APP_API_MESSAGES_RESET_PATH}
-    Set Suite Variable    ${DCAE_APP_API_MESSAGE_RESET_URL}    children=True
-
-    ${DCAE_APP_API_MESSAGES_COUNT_URL}=  Catenate   SEPARATOR=   ${DCAE_APP_API_ACCESS}   ${DCAE_APP_API_MESSAGES_COUNT_PATH}
-    Set Suite Variable    ${DCAE_APP_API_MESSAGES_COUNT_URL}    children=True
-
-    ${DCAE_APP_API_MESSAGES_VALIDATION_URL}=  Catenate   SEPARATOR=   ${DCAE_APP_API_ACCESS}   ${DCAE_APP_API_MESSAGES_VALIDATION_PATH}
-    Set Suite Variable    ${DCAE_APP_API_MESSAGES_VALIDATION_URL}    children=True
-
-    ${DCAE_APP_API_TOPIC_CONFIGURATION_URL}=  Catenate   SEPARATOR=   ${DCAE_APP_API_ACCESS}   ${DCAE_APP_API_TOPIC_CONFIGURATION_PATH}
     Wait until keyword succeeds   10 sec   5 sec
-    ...    Configure Dcae App Simulator To Consume Messages From Topics   ${DCAE_APP_API_TOPIC_CONFIGURATION_URL}  ${ROUTED_MESSAGES_TOPIC}
+    ...    Configure Dcae App Simulator To Consume Messages From Topics
+    ...    ${DEFAULT_PERF3GPP_TOPIC},${SECOND_PERF3GPP_TOPIC},${DEFAULT_STNDDEFINED_3GPP_HEARTBEAT_TOPIC}
+    Set Suite Variable   ${DEFAULT_PERF3GPP_TOPIC}   children=True
+    Set Suite Variable   ${SECOND_PERF3GPP_TOPIC}    children=True
+    Set Suite Variable   ${DEFAULT_STNDDEFINED_3GPP_HEARTBEAT_TOPIC}    children=True
 
 
 *** Variables ***
@@ -58,17 +49,11 @@ ${HTTP_METHOD_URL}                             http://
 
 ${CONSUL_CONTAINER_HOST}                       consul-server
 ${CONSUL_CONTAINER_PORT}                       8500
-${CONSUL_VES_HV_CONFIGURATION_KEY_PATH}        /v1/kv/dcae-hv-ves-collector
-
-${DCAE_APP_CONTAINER_HOST}                     dcae-app-simulator
-${DCAE_APP_CONTAINER_PORT}                     6063
-${DCAE_APP_API_TOPIC_CONFIGURATION_PATH}       /configuration/topics
-${DCAE_APP_API_MESSAGES_RESET_PATH}            /messages
-${DCAE_APP_API_MESSAGES_PATH}                  /messages/all
-${DCAE_APP_API_MESSAGES_COUNT_PATH}            ${DCAE_APP_API_MESSAGES_PATH}/count
-${DCAE_APP_API_MESSAGES_VALIDATION_PATH}       ${DCAE_APP_API_MESSAGES_PATH}/validate
+${CONSUL_HV_VES_CONFIGURATION_KEY_PATH}        /v1/kv/dcae-hv-ves-collector
 
-${ROUTED_MESSAGES_TOPIC}                       TEST_HV_VES_PERF3GPP
+${DEFAULT_PERF3GPP_TOPIC}                      TEST_HV_VES_PERF3GPP
+${SECOND_PERF3GPP_TOPIC}                       TEST_HV_VES_PERF3GPP_BUT_WITH_EXTRA_WORDS
+${DEFAULT_STNDDEFINED_3GPP_HEARTBEAT_TOPIC}    TEST_SEC_3GPP_HEARTBEAT_OUTPUT
 
-${VES_HV_RESOURCES}                            %{WORKSPACE}/tests/dcaegen2-collectors-hv-ves/testcases/resources
-${VES_HV_CONFIGURATION_JSON_FILEPATH}          ${VES_HV_RESOURCES}/ves-hv-configuration.json
+${HV_VES_RESOURCES}                            %{WORKSPACE}/tests/dcaegen2-collectors-hv-ves/testcases/resources
+${HV_VES_CONFIGURATION_JSON_FILEPATH}          ${HV_VES_RESOURCES}/hv-ves-configuration.yaml