aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDR695H <dr695h@att.com>2019-06-18 17:16:25 -0400
committerDR695H <dr695h@att.com>2019-06-18 17:16:25 -0400
commit9d810d0f842705d1ff29684b489deb4188096879 (patch)
tree051f39929c61586aa8f711ce28323a3c409e1538
parentd92b007061e149fc733a52ca1e142358955fce42 (diff)
remove kafkacat use
kafkacat didnt work on windows and wasnt guranteed to be there Issue-ID: TEST-158 Change-Id: Ib30ff646fa595820328b7c51efa8d43c81cad12b Signed-off-by: DR695H <dr695h@att.com>
-rw-r--r--robot/resources/dcae/hvves.robot16
-rw-r--r--robot/testsuites/hvves.robot11
-rwxr-xr-xsetup.sh14
3 files changed, 13 insertions, 28 deletions
diff --git a/robot/resources/dcae/hvves.robot b/robot/resources/dcae/hvves.robot
index b7bfb232..07288a6e 100644
--- a/robot/resources/dcae/hvves.robot
+++ b/robot/resources/dcae/hvves.robot
@@ -10,10 +10,7 @@ Library ONAPLibrary.Kafka
Resource ../mr_interface.robot
*** 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
-${hvves_kafka_topic} HV_VES_PERF3GPP
-${security_protocol} SASL_PLAINTEXT
-${sasl_mechanisms} PLAIN
+${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
*** Keywords ***
Check Message Router Api
@@ -35,16 +32,13 @@ Check If Topic Exists
Start HV-VES TCP Client And Send Message
[Documentation] Starts HV-VES TCP client sends message to the collector.
[Arguments] ${hvves_server_ip} ${hvves_server_port}
- ${msg}= Convert To Bytes ${hvves_message}
+ ${msg}= Convert To Bytes ${${HVVES_MESSAGE}}
Send Binary Data ${hvves_server_ip} ${hvves_server_port} ${msg}
Decode Last Message From Topic
[Documentation] Decode last message from Kafka topic.
- [Arguments] ${kafka_server} ${kafka_port} ${kafka_topic} ${sec_protocol} ${mechanisms} ${username} ${password}
- Connect kakfa ${kafka_server}:${kafka_port}
- Consume kakfa ${kafka_topic}
- # TODO need to support sasl
- #${msg}= Run kafkacat -X security.protocol=${sec_protocol} -X sasl.mechanisms=${mechanisms} -X sasl.username=${username} -X sasl.password=${password} -D "" -o -1 -c 1
- ${msg}= Run kafkacat -C -b ${kafka_server}:${kafka_port} -t ${kafka_topic} -X security.protocol=${sec_protocol} -X sasl.mechanisms=${mechanisms} -X sasl.username=${username} -X sasl.password=${password} -D "" -o -1 -c 1
+ [Arguments] ${kafka_server} ${kafka_port} ${kafka_topic} ${username} ${password}
+ Connect kakfa ${kafka_server}:${kafka_port} ${username} ${password}
+ ${msg}= Consume kakfa ${kafka_topic}
[Return] ${msg}
diff --git a/robot/testsuites/hvves.robot b/robot/testsuites/hvves.robot
index 733719db..73ef1c10 100644
--- a/robot/testsuites/hvves.robot
+++ b/robot/testsuites/hvves.robot
@@ -7,12 +7,15 @@ Resource ../resources/dcae/hvves.robot
Library OperatingSystem
Library ONAPLibrary.Protobuf
+*** Variable ***
+${HVVES_KAFKA_TOPIC} HV_VES_PERF3GPP
+
*** Test Cases ***
HV-VES test case
- Check Message Router Api ${GLOBAL_DMAAP_MESSAGE_ROUTER_SERVER_NAME} ${GLOBAL_DMAAP_MESSAGE_ROUTER_SERVER_PORT} ${hvves_kafka_topic}
+ Check Message Router Api ${GLOBAL_DMAAP_MESSAGE_ROUTER_SERVER_NAME} ${GLOBAL_DMAAP_MESSAGE_ROUTER_SERVER_PORT} ${HVVES_KAFKA_TOPIC}
Start HV-VES TCP Client And Send Message ${GLOBAL_DCAE_HVVES_SERVER_NAME} ${GLOBAL_DCAE_HVVES_SERVER_PORT}
- Wait Until Keyword Succeeds 30s 5s Check If Topic Exists ${GLOBAL_DMAAP_MESSAGE_ROUTER_SERVER_NAME} ${GLOBAL_DMAAP_MESSAGE_ROUTER_SERVER_PORT} ${hvves_kafka_topic}
- Check Message Router Api ${GLOBAL_DMAAP_MESSAGE_ROUTER_SERVER_NAME} ${GLOBAL_DMAAP_MESSAGE_ROUTER_SERVER_PORT} ${hvves_kafka_topic}
- ${msg}= Decode Last Message From Topic ${GLOBAL_DMAAP_KAFKA_SERVER_NAME} ${GLOBAL_DMAAP_KAFKA_SERVER_PORT} ${hvves_kafka_topic} ${security_protocol} ${sasl_mechanisms} ${GLOBAL_DMAAP_KAFKA_JAAS_USERNAME} ${GLOBAL_DMAAP_KAFKA_JAAS_PASSWORD}
+ Wait Until Keyword Succeeds 30s 5s Check If Topic Exists ${GLOBAL_DMAAP_MESSAGE_ROUTER_SERVER_NAME} ${GLOBAL_DMAAP_MESSAGE_ROUTER_SERVER_PORT} ${HVVES_KAFKA_TOPIC}
+ Check Message Router Api ${GLOBAL_DMAAP_MESSAGE_ROUTER_SERVER_NAME} ${GLOBAL_DMAAP_MESSAGE_ROUTER_SERVER_PORT} ${HVVES_KAFKA_TOPIC}
+ ${msg}= 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}
${results}= Compare File To Message ${EXECDIR}/robot/assets/dcae/hvves_msg.raw ${msg}
Should Be True ${results} \ No newline at end of file
diff --git a/setup.sh b/setup.sh
index 3ed762a3..7972a0be 100755
--- a/setup.sh
+++ b/setup.sh
@@ -24,7 +24,6 @@ pip install \
'robotframework-requests==0.5.0' \
'robotframework-sshlibrary==3.3.0' \
'robotframework-ftplibrary==1.6' \
-'robotframework-pykafka==0.10' \
'robotframework-archivelibrary==0.4.0' \
'robotframework-onap==0.5'
@@ -94,15 +93,4 @@ else
unzip $CHROMEDRIVER_TARGET
fi
rm -rf $CHROMEDRIVER_TARGET
-fi
-
-#
-# Install kafkacat : https://github.com/edenhill/kafkacat
-#
-OS=`uname -s`
-case $OS in
- Darwin)
- brew install kafkacat ;;
- Linux)
- apt-get -y install kafkacat
-esac \ No newline at end of file
+fi \ No newline at end of file