X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=common%2Fscripts%2Fapplication-lifecycle.sh;h=b54bb58f62c6f98e10bbd1346b0f32e8be8bf0d2;hb=d1aec4dfa14a272de5925edeb18715a4be377639;hp=998391d60b5a5ceabbba3cef77d16491a029ce56;hpb=e1829b0d4d0de7faf73515d053ecff2ba229a895;p=src%2Fqa-testdefinitions.git

diff --git a/common/scripts/application-lifecycle.sh b/common/scripts/application-lifecycle.sh
index 998391d..b54bb58 100755
--- a/common/scripts/application-lifecycle.sh
+++ b/common/scripts/application-lifecycle.sh
@@ -104,11 +104,11 @@ do
 	fi
 
 	echo "DEBUG: check presence of $WGTNAME"
-	NAMEID=$(grep id\\\":\\\"${WGTNAME}@ $LIST | cut -d\" -f4 | cut -d\\ -f1)
+	NAMEID=$(grep id\\\":\\\"${WGTNAME} $LIST | cut -d\" -f4 | cut -d\\ -f1)
 	if [ ! -z "$NAMEID" ];then
 		echo "DEBUG: $WGTNAME already installed as $NAMEID"
 		# need to kill then deinstall
-		afm-util ps | grep -q $WGTNAME
+		afm-util ps --all | grep -q $WGTNAME
 		if [ $? -eq 0 ];then
 			echo "DEBUG: kill $WGTNAME"
 			afm-util kill $WGTNAME
@@ -148,7 +148,7 @@ do
 		lava-test-case afm-util-install-$WGTNAME --result pass
 	fi
 	# message is like \"added\":\"mediaplayer@0.1\"
-	NAMEID=$(grep d\\\":\\\"${WGTNAME}@ $OUT | cut -d\" -f4 | cut -d\\ -f1)
+	NAMEID=$(grep d\\\":\\\"${WGTNAME} $OUT | cut -d\" -f4 | cut -d\\ -f1)
 	if [ -z "$NAMEID" ];then
 		echo "ERROR: Cannot get nameid"
 		continue
@@ -174,7 +174,7 @@ do
 		echo "DEBUG: end of list"
 	fi
 
-	afm-util info $NAMEID
+	do_afm_util info $NAMEID
 	if [ $? -ne 0 ];then
 		echo "ERROR: afm-util info"
 		lava-test-case afm-util-info-$WGTNAME --result fail
@@ -204,7 +204,7 @@ do
 
 	echo "DEBUG: Get RID for $NAMEID"
 	PSLIST="pslist"
-	afm-util ps > $PSLIST
+	afm-util ps --all > $PSLIST
 	if [ $? -ne 0 ];then
 		echo "ERROR: afm-util ps"
 		lava-test-case afm-util-ps-$WGTNAME --result fail
@@ -217,7 +217,7 @@ do
 	RID="$(cat rid)"
 
 	echo "DEBUG: status $NAMEID ($RID)"
-	afm-util status $RID
+	do_afm_util status $RID
 	if [ $? -ne 0 ];then
 		echo "ERROR: afm-util status"
 		lava-test-case afm-util-status-$WGTNAME --result fail
@@ -227,7 +227,7 @@ do
 	fi
 
 	echo "DEBUG: kill $NAMEID ($RID)"
-	afm-util kill $NAMEID
+	do_afm_util kill $NAMEID
 	if [ $? -ne 0 ];then
 		echo "ERROR: afm-util kill"
 		lava-test-case afm-util-kill-$WGTNAME --result fail