Code Review
/
domino.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Add domino package
[domino.git]
/
tests
/
run.sh
diff --git
a/tests/run.sh
b/tests/run.sh
index
d9dec64
..
3971009
100755
(executable)
--- a/
tests/run.sh
+++ b/
tests/run.sh
@@
-24,13
+24,14
@@
client1_log=./tests/logdata/client1.log
client2_log=./tests/logdata/client2.log
server_log=./tests/logdata/server.log
client2_log=./tests/logdata/client2.log
server_log=./tests/logdata/server.log
+
start_server() {
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() {
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
}
kill $(pgrep -f "python DominoServer.py")
#cat server.log
}
@@
-110,37
+111,42
@@
start_client2
sleep 1
echo "Test Heartbeat"
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"
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
-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
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
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
-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
-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"
-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
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
-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
#echo "Stopping Domino Client 1..."
#stop_client1
@@
-172,4
+178,4
@@
fi
set -e
echo "done"
set -e
echo "done"
-
+exit 0