Auto Generated INFO.yaml file

[domino.git] / tests / run.sh

diff --git a/tests/run.sh b/tests/run.sh
index 54d47b7..3971009 100755 (executable)
--- a/tests/run.sh
+++ b/tests/run.sh
@@ -20,17 +20,18 @@ LOGLEVEL=DEBUG
 toscafile_test1=./tosca-templates/tosca_helloworld_nfv.yaml
 test1_reffile1=./tests/refdata/test1_client1.ref
 test1_reffile2=./tests/refdata/test1_client2.ref
-test1_reffile3=./tests/refdata/test1_server.ref
 client1_log=./tests/logdata/client1.log
 client2_log=./tests/logdata/client2.log
+server_log=./tests/logdata/server.log
+
 
 start_server() {
-  pgrep -f "python DominoServer.py" && return 0  
+  pgrep -f "python DominoServer.py" && return 0
   python DominoServer.py --log "$LOGLEVEL" > "$server_log" 2>&1 &
 }
 
 stop_server() {
-  pgrep -f "python DominoServer.py" || return 0  
+  pgrep -f "python DominoServer.py" || return 0
   kill $(pgrep -f "python DominoServer.py")
   #cat server.log
 }
@@ -73,13 +74,13 @@ cleanup() {
   echo "Stopping Domino Server..."
   stop_server
 
-#  if [ -f file1 ]; then
-#    rm file1
-#  fi
+  if [ -f file1 ]; then
+    rm file1
+  fi
 
-#  if [ -f file2 ]; then
-#    rm file2
-#  fi
+  if [ -f file2 ]; then
+    rm file2
+  fi
 }
 
 echo "domino/tests/run.sh has been executed."
@@ -110,37 +111,42 @@ start_client2
 sleep 1
 
 echo "Test Heartbeat"
-python domino-cli.py $CLIENT1_CLIPORT heartbeat
+python domino_cli.py $CLIENT1_CLIPORT heartbeat
 sleep 1
 
 echo "Test Subscribe API"
-python domino-cli.py $CLIENT1_CLIPORT subscribe -t hot \
+python domino_cli.py $CLIENT1_CLIPORT subscribe -t hot \
        -l tosca.policies.Placement:properties:region:nova-1  
 sleep 1
-python domino-cli.py $CLIENT1_CLIPORT subscribe -t dummy1,dummy2 --top OVERWRITE
+python domino_cli.py $CLIENT1_CLIPORT subscribe -t dummy1,dummy2 --top OVERWRITE
 sleep 1
-python domino-cli.py $CLIENT1_CLIPORT subscribe -t dummy1,dummy2 --top DELETE
+python domino_cli.py $CLIENT1_CLIPORT subscribe -t dummy1,dummy2 --top DELETE
 sleep 1
-python domino-cli.py $CLIENT1_CLIPORT subscribe \
+python domino_cli.py $CLIENT1_CLIPORT subscribe \
         -l tosca.policies.Placement:properties:region:nova-2
 sleep 1
-python domino-cli.py $CLIENT1_CLIPORT subscribe \
+python domino_cli.py $CLIENT1_CLIPORT subscribe \
        -l tosca.policies.Placement:properties:region:nova-3 \
        --lop OVERWRITE
 sleep 1
-python domino-cli.py $CLIENT1_CLIPORT subscribe \
+python domino_cli.py $CLIENT1_CLIPORT subscribe \
         -l tosca.policies.Placement:properties:region:nova-3 \
        --lop DELETE
 sleep 1
 
 echo "Test Publish API"
-python domino-cli.py $CLIENT1_CLIPORT publish -t "$toscafile_test1" 
+python domino_cli.py $CLIENT1_CLIPORT publish -t "$toscafile_test1" 
 
 sleep 1
-python domino-cli.py $CLIENT1_CLIPORT subscribe \
+python domino_cli.py $CLIENT1_CLIPORT subscribe \
         -l tosca.policies.Placement.Geolocation:properties:region:us-west-1
 sleep 1
-python domino-cli.py $CLIENT2_CLIPORT publish -t "$toscafile_test1"
+python domino_cli.py $CLIENT2_CLIPORT publish -t "$toscafile_test1"
+sleep 1
+TUID=$(python domino_cli.py $CLIENT2_CLIPORT list-tuids | cut -c3-34)
+echo $TUID
+sleep 1
+python domino_cli.py $CLIENT2_CLIPORT publish -t "$toscafile_test1" -k "$TUID"
 
 #echo "Stopping Domino Client 1..."
 #stop_client1
@@ -172,4 +178,4 @@ fi
 set -e
 
 echo "done"
-
+exit 0