From 8ada98c692ed16383e00b53f538b4f9f684301e5 Mon Sep 17 00:00:00 2001 From: Andreas Geissler Date: Fri, 3 Feb 2023 13:28:42 +0100 Subject: [AAF] Adapt the tests for the AAF removal repair the VES test, HVVES test remove AAF from Healthcheck and repair DMAAP health check Issue-ID: TEST-390 Signed-off-by: Andreas Geissler Change-Id: I355ad9b1f7c3c58a7b1fe222da9bc5b42a620e49 --- robot/testsuites/health-check.robot | 6 +++--- robot/testsuites/hvves-ci.robot | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'robot/testsuites') diff --git a/robot/testsuites/health-check.robot b/robot/testsuites/health-check.robot index 595e7906..7609854c 100644 --- a/robot/testsuites/health-check.robot +++ b/robot/testsuites/health-check.robot @@ -10,7 +10,7 @@ Resource ../resources/aai/aai_interface.robot Resource ../resources/policy_interface.robot Resource ../resources/sdc_interface.robot Resource ../resources/portal_interface.robot -Resource ../resources/dmaao/mr_interface.robot +Resource ../resources/dmaap/mr_interface.robot Resource ../resources/dmaap/bc_interface.robot Resource ../resources/aaf_interface.robot Resource ../resources/msb_interface.robot @@ -42,11 +42,11 @@ Enhanced A&AI Health Check Run Traversal API AAI Inventory check Basic AAF Health Check - [Tags] health health-aaf + [Tags] health-aaf Run AAF Health Check Basic AAF SMS Health Check - [Tags] health health-aaf + [Tags] health-aaf Run SMS Health Check Basic CLI Health Check diff --git a/robot/testsuites/hvves-ci.robot b/robot/testsuites/hvves-ci.robot index 5cd4788b..5146f50a 100644 --- 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 -- cgit 1.2.3-korg