[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 <andreas-geissler@telekom.de>
Change-Id: I355ad9b1f7c3c58a7b1fe222da9bc5b42a620e49

5 files changed, 11 insertions, 26 deletions

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 8265772e..d52b4c2f 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -47,7 +47,7 @@ RUN apt-get update \
             xxd  \
             wget vim  \
             python3.8 python3.8-dev python3-pip && \
-    ln -s /usr/bin/python3 /usr/bin/python &&  \
+    ln -s /usr/bin/python3 /usr/bin/python && \
     mkdir -p /var/opt/ONAP && \
     pip3 install --no-cache-dir -r requirements.txt && \
     pip3 install --no-cache-dir \
diff --git a/robot/assets/dcae/hvves_test_config.yaml b/robot/assets/dcae/hvves_test_config.yaml
index bd86c1be..b62b9bce 100644
--- a/robot/assets/dcae/hvves_test_config.yaml
+++ b/robot/assets/dcae/hvves_test_config.yaml
@@ -6,46 +6,31 @@ data:
     security.keys.keyStorePasswordFile: /dev/null
     security.keys.trustStoreFile: /tmp/ca.p12
     security.keys.trustStorePasswordFile: /dev/null
-    security.sslDisable: false
+    security.sslDisable: true
     server.idleTimeoutSec: 300
     server.listenPort: 6061
     streams_publishes:
       perf3gpp:
-        aaf_credentials:
-          password: ${AAF_PASSWORD}
-          username: ${AAF_USER}
         kafka_info:
           bootstrap_servers: placeholder
           topic_name: HV_VES_PERF3GPP
         type: kafka
       ves-3gpp-fault-supervision:
-        aaf_credentials:
-          password: ${AAF_PASSWORD}
-          username: ${AAF_USER}
         kafka_info:
           bootstrap_servers: placeholder
           topic_name: SEC_3GPP_FAULTSUPERVISION_OUTPUT
         type: kafka
       ves-3gpp-heartbeat:
-        aaf_credentials:
-          password: ${AAF_PASSWORD}
-          username: ${AAF_USER}
         kafka_info:
           bootstrap_servers: placeholder
           topic_name: SEC_3GPP_HEARTBEAT_OUTPUT
         type: kafka
       ves-3gpp-performance-assurance:
-        aaf_credentials:
-          password: ${AAF_PASSWORD}
-          username: ${AAF_USER}
         kafka_info:
           bootstrap_servers: placeholder
           topic_name: SEC_3GPP_PERFORMANCEASSURANCE_OUTPUT
         type: kafka
       ves-3gpp-provisioning:
-        aaf_credentials:
-          password: ${AAF_PASSWORD}
-          username: ${AAF_USER}
         kafka_info:
           bootstrap_servers: placeholder
           topic_name: SEC_3GPP_PROVISIONING_OUTPUT
diff --git a/robot/resources/dcae/ves_interface.robot b/robot/resources/dcae/ves_interface.robot
index b20b410d..5cf081b7 100644
--- a/robot/resources/dcae/ves_interface.robot
+++ b/robot/resources/dcae/ves_interface.robot
@@ -8,7 +8,7 @@ ${INVENTORY_SERVER}                                 ${GLOBAL_INVENTORY_SERVER_PR
 ${DEPLOYMENT_SERVER}                                ${GLOBAL_DEPLOYMENT_HANDLER_SERVER_PROTOCOL}://${GLOBAL_DEPLOYMENT_HANDLER_SERVER_NAME}:${GLOBAL_DEPLOYMENT_HANDLER_SERVER_PORT}
 ${DR_ENDPOINT}                                      ${GLOBAL_DMAAP_DR_PROV_SERVER_PROTOCOL}://${GLOBAL_INJECTED_DMAAP_DR_PROV_IP_ADDR}:${GLOBAL_DMAAP_DR_PROV_SERVER_PORT}
 ${DMAAP_BC_SERVER}                                  ${GLOBAL_BC_SERVER_PROTOCOL}://${GLOBAL_INJECTED_BC_IP_ADDR}:${GLOBAL_BC_HTTPS_SERVER_PORT}
-${VES_HEALTH_CHECK_PATH}                            ${GLOBAL_DCAE_VES_HTTPS_PROTOCOL}://${GLOBAL_INJECTED_DCAE_VES_HOST}:${GLOBAL_DCAE_VES_HTTPS_SERVER_PORT}
+${VES_HEALTH_CHECK_PATH}                            ${GLOBAL_DCAE_VES_PROTOCOL}://${GLOBAL_INJECTED_DCAE_VES_HOST}:${GLOBAL_DCAE_VES_SERVER_PORT}
 ${MR_PUBLISH_TEMPLATE}                              mr/mr_publish.jinja
 ${ves7_valid_json}                                  ${EXECDIR}/robot/assets/dcae/ves7_valid.json
 ${FaultSupervision_json}                            ${EXECDIR}/robot/assets/dcae/ves_stdnDefined_3GPP-FaultSupervision.json
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