diff options
| -rw-r--r-- | robot/resources/dcae/hvves.robot | 7 | ||||
| -rw-r--r-- | robot/resources/uui_interface.robot | 4 | ||||
| -rw-r--r-- | robot/testsuites/hvves-ci.robot | 2 |
3 files changed, 4 insertions, 9 deletions
diff --git a/robot/resources/dcae/hvves.robot b/robot/resources/dcae/hvves.robot index 9d90b798..06eb473b 100644 --- a/robot/resources/dcae/hvves.robot +++ b/robot/resources/dcae/hvves.robot @@ -11,8 +11,6 @@ Library ONAPLibrary.Kafka *** Variables *** ${HVVES_MESSAGE} \xaa\x01\x00\x00\x00\x00\x00\x01\x00\x00\x01'\n\x94\x02\n\x0esample-version\x12\x08perf3gpp\x18\x01 \x01*\nperf3GPP222\x11sample-event-name:\x11sample-event-type@\xf1\x9a\xfd\xdd\x05H\xf1\x9a\xfd\xdd\x05R\x15sample-nf-naming-codeZ\x16sample-nfc-naming-codeb\x15sample-nf-vendor-namej\x1asample-reporting-entity-idr\x1csample-reporting-entity-namez\x10sample-source-id\x82\x01\x0fsample-xnf-name\x8a\x01\tUTC+02:00\x92\x01\x057.0.2\x12\x0etest test test -${KAFKA_GET_PASSWORD} kubectl -n onap get secret strimzi-kafka-admin -o jsonpath="{.data.password}" | base64 -d - *** Keywords *** Send Message [Documentation] Sends message to HV-VES over TCP. @@ -23,9 +21,6 @@ Send Message Decode Last Message From Topic [Documentation] Decode last message from Kafka topic. [Arguments] ${kafka_server} ${kafka_topic} ${username} - ${command_output} = Run And Return Rc And Output ${KAFKA_GET_PASSWORD} - Should Be Equal As Integers ${command_output[0]} 0 - ${password} Set Variable ${command_output[1]} - Connect kafka ${kafka_server} ${username} ${password} SCRAM-SHA-512 + Connect kafka ${kafka_server} ${username} %{KAFKA_PASSWORD} SCRAM-SHA-512 ${msg}= Consume kafka ${kafka_topic} [Return] ${msg} diff --git a/robot/resources/uui_interface.robot b/robot/resources/uui_interface.robot index 0b0e15e9..98153b4c 100644 --- a/robot/resources/uui_interface.robot +++ b/robot/resources/uui_interface.robot @@ -6,7 +6,7 @@ Library Collections Resource global_properties.robot *** Variables *** -${UUI_HEALTH_CHECK_PATH} /api/usecaseui-server/v1/ +${UUI_HEALTH_CHECK_PATH} /api/usecaseui-server/v1/actuator/health ${UUI_ENDPOINT} ${GLOBAL_UUI_SERVER_PROTOCOL}://${GLOBAL_INJECTED_UUI_IP_ADDR}:${GLOBAL_UUI_SERVER_PORT} @@ -20,7 +20,7 @@ Run UUI Get Request [Documentation] Runs UUI Get request [Arguments] ${data_path} ${session}= Create Session session ${UUI_ENDPOINT} - ${resp}= Get Request session ${data_path} + ${resp}= GET On Session session ${data_path} Should Be Equal As Integers ${resp.status_code} 200 Log Received response from UUI ${resp.text} [Return] ${resp} diff --git a/robot/testsuites/hvves-ci.robot b/robot/testsuites/hvves-ci.robot index 0413bb33..3cb5539d 100644 --- a/robot/testsuites/hvves-ci.robot +++ b/robot/testsuites/hvves-ci.robot @@ -11,7 +11,7 @@ Library ONAPLibrary.Protobuf HV-VES test case ${status} ${data}= Run Keyword And Ignore Error Variable Should Exist ${GLOBAL_KAFKA_BOOTSTRAP_SERVICE} Send Message ${GLOBAL_DCAE_HVVES_SERVER_NAME} ${GLOBAL_DCAE_HVVES_SERVER_PORT} - Sleep 10s + Sleep 2s ${msg}= Run Keyword Decode Last Message From Topic ${GLOBAL_KAFKA_BOOTSTRAP_SERVICE} HV_VES_PERF3GPP ${GLOBAL_KAFKA_USER} ${results}= Compare File To Message ${EXECDIR}/robot/assets/dcae/hvves_msg.raw ${msg} Should Be True ${results} |