Code Review
/
nonrtric.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Fetch of authorization token
[nonrtric.git]
/
test
/
common
/
ngw_api_functions.sh
diff --git
a/test/common/ngw_api_functions.sh
b/test/common/ngw_api_functions.sh
index
9e29278
..
a1e6145
100644
(file)
--- a/
test/common/ngw_api_functions.sh
+++ b/
test/common/ngw_api_functions.sh
@@
-79,7
+79,7
@@
__NGW_kube_delete_all() {
# args: <log-dir> <file-prexix>
__NGW_store_docker_logs() {
if [ $RUNMODE == "KUBE" ]; then
# args: <log-dir> <file-prexix>
__NGW_store_docker_logs() {
if [ $RUNMODE == "KUBE" ]; then
- kubectl logs -l "autotest=NGW" -n $KUBE_NONRTRIC_NAMESPACE --tail=-1 > $1$2_gateway.log 2>&1
+ kubectl
$KUBECONF
logs -l "autotest=NGW" -n $KUBE_NONRTRIC_NAMESPACE --tail=-1 > $1$2_gateway.log 2>&1
else
docker logs $NRT_GATEWAY_APP_NAME > $1$2_gateway.log 2>&1
fi
else
docker logs $NRT_GATEWAY_APP_NAME > $1$2_gateway.log 2>&1
fi
@@
-104,6
+104,12
@@
__NGW_statisics_setup() {
fi
}
fi
}
+# Check application requirements, e.g. helm, the the test needs. Exit 1 if req not satisfied
+# args: -
+__NGW_test_requirements() {
+ :
+}
+
#######################################################
#######################################################
@@
-198,12
+204,12
@@
__gateway_export_vars() {
export NRT_GATEWAY_COMPOSE_DIR
if [ $RUNMODE == "KUBE" ]; then
export NRT_GATEWAY_COMPOSE_DIR
if [ $RUNMODE == "KUBE" ]; then
- export
POLICY_AGENT
_EXTERNAL_SECURE_PORT
+ export
A1PMS
_EXTERNAL_SECURE_PORT
export ICS_EXTERNAL_SECURE_PORT
export ICS_EXTERNAL_SECURE_PORT
- export
POLICY_AGENT_DOMAIN_NAME=$POLICY_AGENT
_APP_NAME.$KUBE_NONRTRIC_NAMESPACE
+ export
A1PMS_DOMAIN_NAME=$A1PMS
_APP_NAME.$KUBE_NONRTRIC_NAMESPACE
export ICS_DOMAIN_NAME=$ICS_APP_NAME.$KUBE_NONRTRIC_NAMESPACE
else
export ICS_DOMAIN_NAME=$ICS_APP_NAME.$KUBE_NONRTRIC_NAMESPACE
else
- export
POLICY_AGENT_DOMAIN_NAME=$POLICY_AGENT
_APP_NAME
+ export
A1PMS_DOMAIN_NAME=$A1PMS
_APP_NAME
export ICS_DOMAIN_NAME=$ICS_APP_NAME
fi
}
export ICS_DOMAIN_NAME=$ICS_APP_NAME
fi
}
@@
-297,16
+303,16
@@
start_gateway() {
}
}
-# API Test function: V2 GET /status towards PMS
+# API Test function: V2 GET /status towards
A1
PMS
# args: <response-code>
# (Function for test scripts)
# args: <response-code>
# (Function for test scripts)
-gateway_pms_get_status() {
+gateway_
a1
pms_get_status() {
__log_test_start $@
if [ $# -ne 1 ]; then
__print_err "<response-code>" $@
return 1
fi
__log_test_start $@
if [ $# -ne 1 ]; then
__print_err "<response-code>" $@
return 1
fi
- query=$PMS_API_PREFIX"/v2/status"
+ query=$
A1
PMS_API_PREFIX"/v2/status"
res="$(__do_curl_to_api NGW GET $query)"
status=${res:${#res}-3}
res="$(__do_curl_to_api NGW GET $query)"
status=${res:${#res}-3}