tests: Further improve ad server test

- create a common.sh file with settings
- create a test-remove-ad-server.sh script to be able to separately
  remove

Signed-off-by: Michael Adam <[email protected]>

Author: obnoxxx

tests/common.sh

@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+
+SCRIPT_DIR="$(cd "$(dirname "${0}")" && pwd)"
+BASE_DIR="$(cd "${SCRIPT_DIR}/.." && pwd)"
+
+AD_DEPLOYMENT_YAML="${SCRIPT_DIR}/files/samba-ad-server-deployment.yml"
+AD_DEPLOYMENT_NAME="samba-ad-server"
+
+KEEP=${KEEP:-0}
+
+_error() {
+	echo "$@"
+	exit 1
+}

tests/test-deploy-ad-server.sh

@@ -1,18 +1,11 @@
 #!/usr/bin/env bash
 
-
 SCRIPT_DIR="$(cd "$(dirname "${0}")" && pwd)"
-BASE_DIR="$(cd "${SCRIPT_DIR}/.." && pwd)"
-DEPLOYMENT_YAML="${BASE_DIR}/tests/files/samba-ad-server-deployment.yml"
-DEPLOYMENT_NAME="samba-ad-server"
 
-_error() {
-	echo "$@"
-	exit 1
-}
+source "${SCRIPT_DIR}/common.sh"
 
 echo "Creating ad server deployment..."
-ERROR_MSG=$(kubectl create -f "${DEPLOYMENT_YAML}" 2>&1 1>/dev/null)
+ERROR_MSG=$(kubectl create -f "${AD_DEPLOYMENT_YAML}" 2>&1 1>/dev/null)
 if [ $? -ne 0 ] ; then
 	if [[ "${ERROR_MSG}" =~ "AlreadyExists" ]] ; then
 		echo "Deployment exists already. Continuing."
@@ -23,7 +16,7 @@ fi
 
 kubectl get deployment
 
-replicaset="$(kubectl describe deployment ${DEPLOYMENT_NAME} | grep -s "NewReplicaSet:" | awk '{ print $2 }')"
+replicaset="$(kubectl describe deployment ${AD_DEPLOYMENT_NAME} | grep -s "NewReplicaSet:" | awk '{ print $2 }')"
 [ $? -eq 0 ] || _error "Error getting replicaset"
 
 podname="$(kubectl get pod | grep $replicaset | awk '{ print $1 }')"

tests/test-remove-ad-server.sh

@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+
+SCRIPT_DIR="$(cd "$(dirname "${0}")" && pwd)"
+
+source "${SCRIPT_DIR}/common.sh"
+
+if [ ${KEEP} -eq 1 ]; then
+	echo "keeping ad server deployment (KEEP=1)"
+	exit 0
+fi
+
+echo "removing ad server deployment..."
+kubectl delete deployment "${AD_DEPLOYMENT_NAME}"
+[ $? -eq 0 ] || _error "Error deleting deployment"
+echo
+echo "ad server deployment removed"

tests/test-samba-ad-server-kubernetes.sh

@@ -1,27 +1,17 @@
 #!/usr/bin/env bash
 
 SCRIPT_DIR="$(cd "$(dirname "${0}")" && pwd)"
-BASE_DIR="$(cd "${SCRIPT_DIR}/.." && pwd)"
-DEPLOYMENT_YAML="${BASE_DIR}/tests/files/samba-ad-server-deployment.yml"
-DEPLOYMENT_NAME="samba-ad-server"
 
-_error() {
-	echo "$@"
-	exit 1
-}
+source "${SCRIPT_DIR}/common.sh"
 
-. ${BASE_DIR}/tests/test-deploy-ad-server.sh
+source ${SCRIPT_DIR}/test-deploy-ad-server.sh
 
 kubectl exec "${podname}" -- samba-tool domain info 127.0.0.1
 [ $? -eq 0 ] || _error "Error listing domain info"
 echo
 
-if [ ${KEEP} -eq 0 ]; then
-	echo "removing ad server deployment again..."
-	kubectl delete deployment "samba-ad-server"
-	[ $? -eq 0 ] || _error "Error deleting deployment"
-	echo
-fi
+source ${SCRIPT_DIR}/test-remove-ad-server.sh
 
+echo
 echo "Success"
 exit 0