Update CSIT for MUSIC distributed KV store

This patch makes minor updates to the recently merged music
distributed KV store CSIT tests.

Change-Id: I2d210ae318e1d516e71ddead044af4ee30242228
Issue-ID: INT-446
Signed-off-by: Shashank Kumar Shankar <shashank.kumar.shankar@intel.com>

3 files changed, 34 insertions, 18 deletions

diff --git a/test/csit/plans/music/music-distributed-kv-store-test-plan/setup.sh b/test/csit/plans/music/music-distributed-kv-store-test-plan/setup.sh
index 0a74e0d22..88becf69e 100644
--- a/test/csit/plans/music/music-distributed-kv-store-test-plan/setup.sh
+++ b/test/csit/plans/music/music-distributed-kv-store-test-plan/setup.sh
@@ -19,7 +19,9 @@
 source ${SCRIPTS}/common_functions.sh
 
 # Initial Configuration.
-CONSUL_IP="localhost"
+DATASTORE="consul"
+DATASTORE_IP="localhost"
+
 MOUNTPATH="/dkv_mount_path/configs/"
 DEFAULT_CONFIGS=$(pwd)/mountpath/default
 
@@ -38,10 +40,16 @@ key2=value2
 EOF
 popd
 
-docker run -e CONSUL_IP=$CONSUL_IP -e MOUNTPATH=$MOUNTPATH -it \
+docker login -u docker -p docker nexus3.onap.org:10001
+docker pull nexus3.onap.org:10001/onap/music/distributed-kv-store
+docker run -e DATASTORE=$DATASTORE -e DATASTORE_IP=$DATASTORE_IP -e MOUNTPATH=$MOUNTPATH -d \
            --name dkv \
            -v $DEFAULT_CONFIGS:/dkv_mount_path/configs/default \
-           -p 8200:8200 -p 8080:8080 nexus3.onap.org:10003/onap/music/distributed-kv-store
+           -p 8200:8200 -p 8080:8080 nexus3.onap.org:10001/onap/music/distributed-kv-store
+
+
+echo "###### WAITING FOR DISTRIBUTED KV STORE CONTAINER TO COME UP"
+sleep 10
 
 #
 # add here all ROBOT_VARIABLES settings
diff --git a/test/csit/plans/music/music-distributed-kv-store-test-plan/teardown.sh b/test/csit/plans/music/music-distributed-kv-store-test-plan/teardown.sh
index 93067df44..0abf3a62d 100644
--- a/test/csit/plans/music/music-distributed-kv-store-test-plan/teardown.sh
+++ b/test/csit/plans/music/music-distributed-kv-store-test-plan/teardown.sh
@@ -15,6 +15,7 @@
 # limitations under the License.
 #
 
-docker stop nexus3.onap.org:10003/onap/music/distributed-kv-store
-docker rm nexus3.onap.org:10003/onap/music/distributed-kv-store
-docker rmi nexus3.onap.org:10003/onap/music/distributed-kv-store
+rm -rf mountpath
+docker stop dkv
+docker rm dkv
+docker rmi nexus3.onap.org:10001/onap/music/distributed-kv-store
diff --git a/test/csit/tests/music/music-distributed-kv-store-suite/music-distributed-kv-store-test.robot b/test/csit/tests/music/music-distributed-kv-store-suite/music-distributed-kv-store-test.robot
index bf97fbf67..de26e5f6e 100644
--- a/test/csit/tests/music/music-distributed-kv-store-suite/music-distributed-kv-store-test.robot
+++ b/test/csit/tests/music/music-distributed-kv-store-suite/music-distributed-kv-store-test.robot
@@ -3,14 +3,21 @@ Library       OperatingSystem
 Library       RequestsLibrary
 Library       json
 
-Check Distributed KV Store API Docker Container
+*** Variables ***
+${MESSAGE}    {"ping": "ok"}
+
+#global variables
+${generatedAID}
+
+*** Test Cases ***
+DKV Check Distributed KV Store API Docker Container
     [Documentation]    Checks if DKV docker container is running
     ${rc}    ${output}=    Run and Return RC and Output    docker ps
     Log To Console              *********************
     Log To Console              retrurn_code = ${rc}
     Log To Console              output = ${output}
     Should Be Equal As Integers    ${rc}    0
-    Should Contain    ${output}    nexus3.onap.org:10003/onap/music/distributed-kv-store
+    Should Contain    ${output}    nexus3.onap.org:10001/onap/music/distributed-kv-store
 
 DKV LoadDefaultProperties
     [Documentation]    Loads default configuration files into Consul
@@ -32,15 +39,15 @@ DKV FetchDefaultProperties
     Log To Console              body = ${resp.text}
     Should Be Equal As Integers    ${resp.status_code}    200
 
-DKV RegisterDomain
-    [Documentation]  Send a POST request to create a domain
-    Create Session   dkv            ${DKV_HOSTNAME}:${DKV_PORT}
-    ${data}=         Get Binary File     ${CURDIR}${/}data${/}register_domain.json
-    &{headers}=      Create Dictionary  Content-Type=application/json  Accept=application/json
-    ${resp}=         Post Request       dkv   v1/register   data=${data}    headers=${headers}
-    Log To Console              *********************
-    Log To Console              response = ${resp}
-    Log To Console              body = ${resp.text}
-    Should Be Equal As Integers    ${resp.status_code}    200
+#DKV RegisterDomain
+#    [Documentation]  Send a POST request to create a domain
+#    Create Session   dkv            ${DKV_HOSTNAME}:${DKV_PORT}
+#    ${data}=         Get Binary File     ${CURDIR}${/}data${/}register_domain.json
+#    &{headers}=      Create Dictionary  Content-Type=application/json  Accept=application/json
+#    ${resp}=         Post Request       dkv   v1/register   data=${data}    headers=${headers}
+#    Log To Console              *********************
+#    Log To Console              response = ${resp}
+#    Log To Console              body = ${resp.text}
+#    Should Be Equal As Integers    ${resp.status_code}    200
 
 *** Keywords ***