Code Review
/
nonrtric.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Remove DMaaP Mediator Producer from repo
[nonrtric.git]
/
test
/
common
/
dmaapmed_api_functions.sh
diff --git
a/test/common/dmaapmed_api_functions.sh
b/test/common/dmaapmed_api_functions.sh
index
35280a4
..
c9c9c15
100644
(file)
--- a/
test/common/dmaapmed_api_functions.sh
+++ b/
test/common/dmaapmed_api_functions.sh
@@
-79,7
+79,7
@@
__DMAAPMED_kube_delete_all() {
# args: <log-dir> <file-prexix>
__DMAAPMED_store_docker_logs() {
if [ $RUNMODE == "KUBE" ]; then
# args: <log-dir> <file-prexix>
__DMAAPMED_store_docker_logs() {
if [ $RUNMODE == "KUBE" ]; then
- kubectl logs -l "autotest=DMAAPMED" -n $KUBE_NONRTRIC_NAMESPACE --tail=-1 > $1$2_dmaapmediator.log 2>&1
+ kubectl
$KUBECONF
logs -l "autotest=DMAAPMED" -n $KUBE_NONRTRIC_NAMESPACE --tail=-1 > $1$2_dmaapmediator.log 2>&1
else
docker logs $DMAAP_MED_APP_NAME > $1$2_dmaapmediator.log 2>&1
fi
else
docker logs $DMAAP_MED_APP_NAME > $1$2_dmaapmediator.log 2>&1
fi
@@
-104,6
+104,12
@@
__DMAAPMED_statisics_setup() {
fi
}
fi
}
+# Check application requirements, e.g. helm, the the test needs. Exit 1 if req not satisfied
+# args: -
+__DMAAPMED_test_requirements() {
+ :
+}
+
#######################################################
# Set http as the protocol to use for all communication to the Dmaap mediator
#######################################################
# Set http as the protocol to use for all communication to the Dmaap mediator
@@
-159,7
+165,7
@@
__dmaapmed_export_vars() {
export DMAAP_MED_DATA_MOUNT_PATH
export DMAAP_MED_HOST_MNT_DIR
export DMAAP_MED_DATA_MOUNT_PATH
export DMAAP_MED_HOST_MNT_DIR
- export DMAAP_MED_DATA_FILE
+ export DMAAP_MED_
CONTR_
DATA_FILE
export DMAAP_MED_DATA_CONFIGMAP_NAME=$DMAAP_MED_APP_NAME"-data"
if [ $1 == "PROXY" ]; then
export DMAAP_MED_DATA_CONFIGMAP_NAME=$DMAAP_MED_APP_NAME"-data"
if [ $1 == "PROXY" ]; then
@@
-182,6
+188,8
@@
__dmaapmed_export_vars() {
export DMAAP_MED_CONF_SELF_HOST=$(echo $DMAAP_MED_SERVICE_PATH | cut -d: -f1-2)
export DMAAP_MED_CONF_SELF_PORT=$(echo $DMAAP_MED_SERVICE_PATH | cut -d: -f3)
export MR_SERVICE_PATH
export DMAAP_MED_CONF_SELF_HOST=$(echo $DMAAP_MED_SERVICE_PATH | cut -d: -f1-2)
export DMAAP_MED_CONF_SELF_PORT=$(echo $DMAAP_MED_SERVICE_PATH | cut -d: -f3)
export MR_SERVICE_PATH
+ export MR_KAFKA_SERVICE_PATH
+
}
# Start the Dmaap mediator
}
# Start the Dmaap mediator
@@
-227,7
+235,7
@@
start_dmaapmed() {
__dmaapmed_export_vars $1
# Create config map for data
__dmaapmed_export_vars $1
# Create config map for data
- data_json=$PWD/tmp/$DMAAP_MED_DATA_FILE
+ data_json=$PWD/tmp/$DMAAP_MED_
CONTR_
DATA_FILE
if [ $# -lt 2 ]; then
#create empty dummy file
echo "{}" > $data_json
if [ $# -lt 2 ]; then
#create empty dummy file
echo "{}" > $data_json
@@
-262,7
+270,7
@@
start_dmaapmed() {
__dmaapmed_export_vars $1
__dmaapmed_export_vars $1
- dest_file=$SIM_GROUP/$DMAAP_MED_COMPOSE_DIR/$DMAAP_MED_HOST_MNT_DIR/$DMAAP_MED_DATA_FILE
+ dest_file=$SIM_GROUP/$DMAAP_MED_COMPOSE_DIR/$DMAAP_MED_HOST_MNT_DIR/$DMAAP_MED_
CONTR_
DATA_FILE
envsubst < $2 > $dest_file
envsubst < $2 > $dest_file