From 3e57427bf2596be7fd389d27c9f7c08c7a4a265f Mon Sep 17 00:00:00 2001 From: Denis Makogon Date: Wed, 23 Jul 2014 14:36:20 +0300 Subject: [PATCH] Fix exercises for Trove Reasons: - trove.sh should use native python client to exercise Trove API Changes: - adding datastore and datastore version exercises Change-Id: I041465e5bda6ad9ec3f597ecc290612b8baef09c Closes-Bug: #1346743 --- exercises/trove.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/exercises/trove.sh b/exercises/trove.sh index d48d5fec99..053f872361 100755 --- a/exercises/trove.sh +++ b/exercises/trove.sh @@ -35,8 +35,12 @@ source $TOP_DIR/exerciserc is_service_enabled trove || exit 55 -# can we get a list versions -curl http://$SERVICE_HOST:8779/ 2>/dev/null | grep -q 'versions' || die $LINENO "Trove API not functioning!" +# can try to get datastore id +DSTORE_ID=$(trove datastore-list | tail -n +4 |head -3 | get_field 1) +die_if_not_set $LINENO DSTORE_ID "Trove API not functioning!" + +DV_ID=$(trove datastore-version-list $DSTORE_ID | tail -n +4 | get_field 1) +die_if_not_set $LINENO DV_ID "Trove API not functioning!" set +o xtrace echo "*********************************************************************"