Code Review
/
nonrtric.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Update Use Cases rst page
[nonrtric.git]
/
test
/
common
/
mr_api_functions.sh
diff --git
a/test/common/mr_api_functions.sh
b/test/common/mr_api_functions.sh
index
2002131
..
3e00ec3
100755
(executable)
--- a/
test/common/mr_api_functions.sh
+++ b/
test/common/mr_api_functions.sh
@@
-173,7
+173,7
@@
__DMAAPMR_store_docker_logs() {
kubectl logs -n $KUBE_ONAP_NAMESPACE $podname --tail=-1 > $1$2_$podname.log 2>&1
done
else
kubectl logs -n $KUBE_ONAP_NAMESPACE $podname --tail=-1 > $1$2_$podname.log 2>&1
done
else
- docker logs $MR_DMAAP_APP_NAME > $1$2mr.log 2>&1
+ docker logs $MR_DMAAP_APP_NAME > $1$2
_
mr.log 2>&1
docker logs $MR_KAFKA_APP_NAME > $1$2_mr_kafka.log 2>&1
docker logs $MR_ZOOKEEPER_APP_NAME > $1$2_mr_zookeeper.log 2>&1
fi
docker logs $MR_KAFKA_APP_NAME > $1$2_mr_kafka.log 2>&1
docker logs $MR_ZOOKEEPER_APP_NAME > $1$2_mr_zookeeper.log 2>&1
fi
@@
-273,7
+273,7
@@
use_mr_https() {
# args: <protocol> <internal-port> <external-port> <internal-secure-port> <external-secure-port>
__mr_set_protocoll() {
echo -e $BOLD"$MR_STUB_DISPLAY_NAME and $MR_DMAAP_DISPLAY_NAME protocol setting"$EBOLD
# args: <protocol> <internal-port> <external-port> <internal-secure-port> <external-secure-port>
__mr_set_protocoll() {
echo -e $BOLD"$MR_STUB_DISPLAY_NAME and $MR_DMAAP_DISPLAY_NAME protocol setting"$EBOLD
- echo -e " Using $BOLD
http
$EBOLD towards $MR_STUB_DISPLAY_NAME and $MR_DMAAP_DISPLAY_NAME"
+ echo -e " Using $BOLD
$1
$EBOLD towards $MR_STUB_DISPLAY_NAME and $MR_DMAAP_DISPLAY_NAME"
## Access to Dmaap mediator
## Access to Dmaap mediator
@@
-372,6
+372,9
@@
__dmaapmr_export_vars() {
export MR_KAFKA_SERVICE_PATH
export MR_ZOOKEEPER_SERVICE_PATH
export MR_KAFKA_SERVICE_PATH
export MR_ZOOKEEPER_SERVICE_PATH
+
+ export MR_KAFKA_KUBE_NODE_PORT
+ export MR_KAFKA_DOCKER_LOCALHOST_PORT
}
# Export env vars for config files, docker compose and kube resources
}
# Export env vars for config files, docker compose and kube resources
@@
-509,6
+512,9
@@
start_mr() {
__check_service_start $MR_DMAAP_APP_NAME $MR_DMAAP_PATH$MR_DMAAP_ALIVE_URL
__check_service_start $MR_DMAAP_APP_NAME $MR_DMAAP_PATH$MR_DMAAP_ALIVE_URL
+ echo " Kafka TCP node port $MR_KAFKA_KUBE_NODE_PORT"
+
+
if [ $# -gt 0 ]; then
if [ $(($#%3)) -eq 0 ]; then
while [ $# -gt 0 ]; do
if [ $# -gt 0 ]; then
if [ $(($#%3)) -eq 0 ]; then
while [ $# -gt 0 ]; do
@@
-608,6
+614,8
@@
start_mr() {
__check_service_start $MR_DMAAP_APP_NAME $MR_DMAAP_PATH$MR_DMAAP_ALIVE_URL
__check_service_start $MR_DMAAP_APP_NAME $MR_DMAAP_PATH$MR_DMAAP_ALIVE_URL
+ echo " Kafka TCP node port $MR_KAFKA_DOCKER_LOCALHOST_PORT"
+
if [ $# -gt 0 ]; then
if [ $(($#%3)) -eq 0 ]; then
while [ $# -gt 0 ]; do
if [ $# -gt 0 ]; then
if [ $(($#%3)) -eq 0 ]; then
while [ $# -gt 0 ]; do
@@
-621,10
+629,7
@@
start_mr() {
fi
fi
fi
fi
- echo " Current topics:"
- curlString="$MR_DMAAP_PATH/topics"
- result=$(__do_curl "$curlString")
- echo $result | indent2
+ dmaap_api_print_topics
fi
__mr_export_vars
fi
__mr_export_vars
@@
-711,6
+716,15
@@
__dmaap_pipeclean() {
return 1
}
return 1
}
+# Helper function to list the current topics in DMAAP MR
+# args: -
+dmaap_api_print_topics() {
+ echo " Current topics:"
+ curlString="$MR_DMAAP_PATH/topics"
+ result=$(__do_curl "$curlString")
+ echo $result | indent2
+}
+
### Generic test cases for varaible checking
### Generic test cases for varaible checking
@@
-893,7
+907,7
@@
mr_api_generate_json_payload_file() {
return 0
}
return 0
}
-# Create tet file for payload
+# Create te
x
t file for payload
# arg: <size-in-kb> <filename>
mr_api_generate_text_payload_file() {
__log_conf_start $@
# arg: <size-in-kb> <filename>
mr_api_generate_text_payload_file() {
__log_conf_start $@