X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/6aadaaf234bfd8129e8b4ff7f64c3aef8df54659..ee1709cd231588fe672d0bd2546ef69ee87ff88c:/functest/test_services.sh

diff --git a/functest/test_services.sh b/functest/test_services.sh
index 3323123f..97c3c744 100755
--- a/functest/test_services.sh
+++ b/functest/test_services.sh
@@ -1,129 +1,103 @@
 #!/bin/sh
 
+source `dirname $0`/functions
+
 BASEPATH=$1
 
-SGCONFPATH="$BASEPATH/stg/projects/sgconf"
+SGCONFPATH="$BASEPATH/stg/build/projects/sgconf"
+
+printf "Check initial service list... "
 
 RES=`"$SGCONFPATH/sgconf" -s localhost -p 5555 -u admin -w 123456 --get-services`
 
 if [ "$?" != "0" ]
 then
+    printf "Error.\n"
     printf "Failed to get services list. Result:\n$RES\n"
     exit 0
 fi
 
-printf "Got services list:\n"
-
-NAMES=""
-OLDIFS=$IFS
-IFS=$(printf "\n")
-for LINE in $RES
-do
-    printf -- "$LINE\n"
-    NAME=`printf "$LINE" | grep name`
-    if [ "$?" == "0" ]
-    then
-        NAMES="$NAMES\n"`printf "$NAME" | cut -d: -f2 | sed -e 's/^ *//' -e 's/ *$//'`
-    fi
-done
-IFS=$OLDIFS
-
-printf "Names:\n$NAMES\n"
-
-NUM=`printf "$NAMES" | wc -l`
+NAMES=`getFields "name" "$RES"`
 
-printf -- "--------\n$NUM\n\n"
+NUM=`count "$NAMES"`
 
 if [ "$NUM" != "0" ]
 then
+    printf "Failed.\n"
     printf "Services list should be empty.\n"
+    printf "Names:\n$NAMES\n"
+    printf -- "--------\n$NUM\n\n"
     exit 0
 fi
 
+printf "Ok.\nCheck adding services... "
+
 RES=`"$SGCONFPATH/sgconf" -s localhost -p 5555 -u admin -w 123456 --add-service test`
 
 if [ "$?" != "0" ]
 then
+    printf "Error.\n"
     printf "Failed to add new service. Result:\n$RES\n"
     exit 0
 fi
 
+printf "Ok.\nCheck new service list... "
+
 RES=`"$SGCONFPATH/sgconf" -s localhost -p 5555 -u admin -w 123456 --get-services`
 
 if [ "$?" != "0" ]
 then
+    printf "Error.\n"
     printf "Failed to get services list. Result:\n$RES\n"
     exit 0
 fi
 
-printf "Got services list:\n"
-
-NAMES=""
-OLDIFS=$IFS
-IFS=$(printf "\n")
-for LINE in $RES
-do
-    printf -- "$LINE\n"
-    NAME=`printf "$LINE" | grep name`
-    if [ "$?" == "0" ]
-    then
-        NAMES="$NAMES\n"`printf "$NAME" | cut -d: -f2 | sed -e 's/^ *//' -e 's/ *$//'`
-    fi
-done
-IFS=$OLDIFS
-
-printf "Names:\n$NAMES\n"
+NAMES=`getFields "name" "$RES"`
 
-NUM=`printf "$NAMES" | wc -l`
-
-printf -- "--------\n$NUM\n\n"
+NUM=`count "$NAMES"`
 
 if [ "$NUM" != "1" ]
 then
+    printf "Failed.\n"
     printf "Services list should have exactly one entry.\n"
+    printf "Names:\n$NAMES\n"
+    printf -- "--------\n$NUM\n\n"
     exit 0
 fi
 
+printf "Ok.\nCheck deletion exisiting service... "
+
 RES=`"$SGCONFPATH/sgconf" -s localhost -p 5555 -u admin -w 123456 --del-service test`
 
 if [ "$?" != "0" ]
 then
+    printf "Error.\n"
     printf "Failed to delete a service. Result:\n$RES\n"
     exit 0
 fi
 
+printf "Ok.\nCheck new service list... "
+
 RES=`"$SGCONFPATH/sgconf" -s localhost -p 5555 -u admin -w 123456 --get-services`
 
 if [ "$?" != "0" ]
 then
+    printf "Error.\n"
     printf "Failed to get services list. Result:\n$RES\n"
     exit 0
 fi
 
-printf "Got services list:\n"
-
-NAMES=""
-OLDIFS=$IFS
-IFS=$(printf "\n")
-for LINE in $RES
-do
-    printf -- "$LINE\n"
-    NAME=`printf "$LINE" | grep name`
-    if [ "$?" == "0" ]
-    then
-        NAMES="$NAMES\n"`printf "$NAME" | cut -d: -f2 | sed -e 's/^ *//' -e 's/ *$//'`
-    fi
-done
-IFS=$OLDIFS
-
-printf "Names:\n$NAMES\n"
+NAMES=`getFields "name" "$RES"`
 
-NUM=`printf "$NAMES" | wc -l`
+NUM=`count "$NAMES"`
 
-printf -- "--------\n$NUM\n\n"
-
-if [ "$NUM" != "1" ]
+if [ "$NUM" != "0" ]
 then
+    printf "Failed.\n"
     printf "Services list should be empty.\n"
+    printf "Names:\n$NAMES\n"
+    printf -- "--------\n$NUM\n\n"
     exit 0
 fi
+
+printf "Ok.\n"