aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKrzysztof Opasiak <k.opasiak@samsung.com>2018-11-23 16:31:54 +0100
committerKrzysztof Opasiak <k.opasiak@samsung.com>2018-11-23 16:41:13 +0100
commit76e856209a5389cc12d6b063ed29f46664387d96 (patch)
tree4b1f983fd846ab3b5a5b30e414729efefabdb751
parent9da32fdfc691e4f5df8f26607c5665b7a5063199 (diff)
Remove copy-paste code to avoid duplication
Issue-ID: INT-691 Change-Id: Iedfb7f1f6121623f2c1b6154f915780acc87efbf Signed-off-by: Krzysztof Opasiak <k.opasiak@samsung.com>
-rwxr-xr-xonap-offline/bash/tools/common-functions.sh55
1 files changed, 24 insertions, 31 deletions
diff --git a/onap-offline/bash/tools/common-functions.sh b/onap-offline/bash/tools/common-functions.sh
index 53e8035..3074806 100755
--- a/onap-offline/bash/tools/common-functions.sh
+++ b/onap-offline/bash/tools/common-functions.sh
@@ -151,6 +151,13 @@ update_hosts() {
fi
}
+# Save variable to local config
+# $1 - Variable name
+# $2 - variable value
+save_to_local_cfg() {
+ echo "$1='$2'" >> ./local_repo.conf
+}
+
get_cfg_val() {
name="$1"
shift
@@ -164,7 +171,7 @@ get_cfg_val() {
value=$(eval "echo \$${name}")
done
- echo "${name}='${value}'" >> ./local_repo.conf
+ save_to_local_cfg "${name}" "${value}"
fi
}
@@ -173,38 +180,24 @@ get_configuration() {
. ./local_repo.conf
fi
- if [ -z "${NEXUS_FQDN}" ]; then
- NEXUS_FQDN="nexus.$HOSTNAME"
- echo "NEXUS_FQDN='${NEXUS_FQDN}'" >> ./local_repo.conf
- fi
-
- if [ -z "${ONAP_SCALE}" ]; then
- ONAP_SCALE=full
- echo "ONAP_SCALE='${ONAP_SCALE}'" >> ./local_repo.conf
- fi
-
+ # Optional Variables
+ declare -A default_value=(
+ ["NEXUS_FQDN"]="nexus.$HOSTNAME"
+ ["ONAP_SCALE"]=full
# nexus should be configured using those default entries
# if it was not put the correct inputs instead
- if [ -z "${NPM_USERNAME}" ]; then
- NPM_USERNAME="${NEXUS_USERNAME}"
- echo "NPM_USERNAME='${NPM_USERNAME}'" >> ./local_repo.conf
- fi
-
- if [ -z "${NPM_PASSWORD}" ]; then
- NPM_PASSWORD="${NEXUS_PASSWORD}"
- echo "NPM_PASSWORD='${NPM_PASSWORD}'" >> ./local_repo.conf
- fi
-
- if [ -z "${NPM_EMAIL}" ]; then
- NPM_EMAIL="$NEXUS_EMAIL"
- echo "NPM_EMAIL='${NPM_EMAIL}'" >> ./local_repo.conf
- fi
-
- export NEXUS_FQDN
- export ONAP_SCALE
- export NPM_USERNAME
- export NPM_PASSWORD
- export NPM_EMAIL
+ ["NPM_USERNAME"]="${NEXUS_USERNAME}"
+ ["NPM_PASSWORD"]="${NEXUS_PASSWORD}"
+ ["NPM_EMAIL"]="${NPM_EMAIL}"
+ )
+
+ for VAR in "${!default_value[@]}"; do
+ if [ -z "${!VAR}" ]; then
+ eval $VAR=${default_value[${VAR}]}
+ save_to_local_cfg "$VAR" "${!VAR}"
+ fi
+ export $VAR
+ done
NODE_USERNAME="root"