summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--docker/Dockerfile5
-rw-r--r--robot/resources/dcae/hvves.robot5
-rw-r--r--robot/resources/test_templates/cmpv2.robot4
-rw-r--r--robot/testsuites/hvves.robot23
4 files changed, 8 insertions, 29 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile
index bd5b10b4..c8e97dc0 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -55,7 +55,10 @@ RUN apt-get update \
git clone --depth 1 https://$DEMO_REPO -b $DEMO_TAG /var/opt/ONAP/demo && \
chmod +x /usr/local/bin/kubectl && \
chmod 700 get_helm.sh && \
- ./get_helm.sh --version $HELM_VERSION
+ ./get_helm.sh --version $HELM_VERSION && \
+ mkdir -p /app && \
+ cp /var/opt/ONAP/setup-hvves.sh /app
+
RUN python3.7 -m pip install --no-cache-dir setuptools wheel
RUN python3.7 -m pip install --no-cache-dir virtualenv
diff --git a/robot/resources/dcae/hvves.robot b/robot/resources/dcae/hvves.robot
index c460422e..78a86b68 100644
--- a/robot/resources/dcae/hvves.robot
+++ b/robot/resources/dcae/hvves.robot
@@ -47,13 +47,13 @@ Send Message
[Documentation] Sends message to HV-VES over TCP.
[Arguments] ${hvves_server_ip} ${hvves_server_port}
${msg}= Convert To Bytes ${HVVES_MESSAGE}
- Send Binary Data ${hvves_server_ip} ${hvves_server_port} ${msg}
+ Wait Until Keyword Succeeds 300 sec 15 sec Send Binary Data ${hvves_server_ip} ${hvves_server_port} ${msg}
Send Message Over Ssl
[Documentation] Sends message to HV-VES over TCP wih SSL enabled.
[Arguments] ${hvves_server_ip} ${hvves_server_port}
${msg}= Convert To Bytes ${HVVES_MESSAGE}
- Send Binary Data ${hvves_server_ip} ${hvves_server_port} ${msg} ${TRUE} ${TRUE} ${CA_CERT} ${CLIENT_CERT} ${CLIENT_KEY}
+ Wait Until Keyword Succeeds 300 sec 15 sec Send Binary Data ${hvves_server_ip} ${hvves_server_port} ${msg} ${TRUE} ${TRUE} ${CA_CERT} ${CLIENT_CERT} ${CLIENT_KEY}
Decode Last Message From Topic
[Documentation] Decode last message from Kafka topic.
@@ -77,7 +77,6 @@ Set Test Config
Wait Until Keyword Succeeds 2 min 5 sec Check If Config Is Applied ${TEST_TRUSTSTORE_PASS_PATH}
Sleep 5s
-
Check If Config Is Applied
[Documentation] Checks if the config is applied.
[Arguments] ${truststore_pass_path}
diff --git a/robot/resources/test_templates/cmpv2.robot b/robot/resources/test_templates/cmpv2.robot
index 3c948846..f728eaa0 100644
--- a/robot/resources/test_templates/cmpv2.robot
+++ b/robot/resources/test_templates/cmpv2.robot
@@ -45,11 +45,11 @@ Install VES Client
Install VES collector with CMPv2
${override} = Set Variable -f ${CMPv2_helm_values}/ves_correct_sans_cmpv2.yaml --debug
- Install helm charts chart-museum dcae-ves-collector ${ONAP_HELM_RELEASE}-dcae-ves-cmpv2-cert-corect-sans 3m ${override}
+ Install helm charts chart-museum dcae-ves-collector ${ONAP_HELM_RELEASE}-dcae-ves-cmpv2-cert-corect-sans 6m ${override}
Install VES collector with CMPv2 and wrong SANs
${override} = Set Variable -f ${CMPv2_helm_values}/ves_wrong_sans_cmpv2.yaml --debug
- Install helm charts chart-museum dcae-ves-collector ${ONAP_HELM_RELEASE}-dcae-ves-cmpv2-cert-wrong-sans 3m ${override}
+ Install helm charts chart-museum dcae-ves-collector ${ONAP_HELM_RELEASE}-dcae-ves-cmpv2-cert-wrong-sans 6m ${override}
VES Client send single VES event
[Arguments] ${event} ${ves_host} ${ves_port} ${pnf_sim_host} ${pnf_sim_port} ${http_reposnse_code}=202
diff --git a/robot/testsuites/hvves.robot b/robot/testsuites/hvves.robot
deleted file mode 100644
index 417454ac..00000000
--- a/robot/testsuites/hvves.robot
+++ /dev/null
@@ -1,23 +0,0 @@
-*** Settings ***
-Documentation HV-VES 'Sunny Scenario' Robot Framework test - message is sent to the collector and Kafka topic is checked if the message has been published. Content is decoded and checked.
-Default Tags hvves ete
-Test Timeout 5m
-Resource ../resources/global_properties.robot
-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 SSL test case
- Set Test Config
- Send Message Over Ssl ${GLOBAL_DCAE_HVVES_SERVER_NAME} ${GLOBAL_DCAE_HVVES_SERVER_PORT}
- 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}
- Check Message Router Api ${GLOBAL_DMAAP_MESSAGE_ROUTER_SERVER_NAME} ${GLOBAL_DMAAP_MESSAGE_ROUTER_SERVER_PORT} ${HVVES_KAFKA_TOPIC_SSL}
- ${msg}= 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}
- ${results}= Compare File To Message ${EXECDIR}/robot/assets/dcae/hvves_msg.raw ${msg}
- Should Be True ${results}
- [Teardown] Set Old Config