Skip to content
Snippets Groups Projects
Commit 3f7689a3 authored by Hahn Axel (hahn)'s avatar Hahn Axel (hahn)
Browse files

Merge branch 'update-confighandler' into 'master'

director-cli: fix json key for service link

See merge request !36
parents 5cddb393 bf7a99e7
No related branches found
No related tags found
1 merge request!36director-cli: fix json key for service link
...@@ -22,10 +22,11 @@ ...@@ -22,10 +22,11 @@
# 2023-02-17 v0.7 ah check inc_getconfig.sh exists and hostname -f has a value # 2023-02-17 v0.7 ah check inc_getconfig.sh exists and hostname -f has a value
# 2023-10-25 v0.8 ah generate json with "jo"; optimze http requests on services; parallel service function call # 2023-10-25 v0.8 ah generate json with "jo"; optimze http requests on services; parallel service function call
# 2023-11-02 v0.9 ah fix json genration for multiple ports # 2023-11-02 v0.9 ah fix json genration for multiple ports
# 2023-11-03 v0.10 ah fix json key for service link
# ====================================================================== # ======================================================================
_version="0.9" _version="0.10"
which curl >/dev/null || exit 1 which curl >/dev/null || exit 1
which jo >/dev/null || exit 1 which jo >/dev/null || exit 1
...@@ -172,11 +173,11 @@ hostDefaultgroups="groups[]=iml groups[]=iml-server" ...@@ -172,11 +173,11 @@ hostDefaultgroups="groups[]=iml groups[]=iml-server"
function _generateJsonForSvclink(){ function _generateJsonForSvclink(){
local JSONPARAMS=" local JSONPARAMS="
object_name="\"${IDC_svcathost__obj_name}\"" object_name="\"${IDC_svcathost__obj_name}\""
check_type=object object_type=object
host=${MY_NAME} host=${MY_NAME}
imports[]="\"${IDC_service__obj_name}\"" imports[]="\"${IDC_service__obj_name}\""
" "
echo "JSONPARAMS" echo "$JSONPARAMS"
} }
# ............................................................ # ............................................................
...@@ -334,6 +335,7 @@ hostDefaultgroups="groups[]=iml groups[]=iml-server" ...@@ -334,6 +335,7 @@ hostDefaultgroups="groups[]=iml groups[]=iml-server"
http.makeRequest "$_sMethod" "$_sUrl" "$_jsondata" http.makeRequest "$_sMethod" "$_sUrl" "$_jsondata"
if $_bStopOnError && http.isServerError >/dev/null; then if $_bStopOnError && http.isServerError >/dev/null; then
echo "CRITICAL ERROR: Director API request failed with a server error $_sMethod $_sUrl" echo "CRITICAL ERROR: Director API request failed with a server error $_sMethod $_sUrl"
http.getResponse
exit 1 exit 1
fi fi
if [ $_bShowResponse = true ]; then if [ $_bShowResponse = true ]; then
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment