Merge "Rename optf base dir to optf-has"
diff --git a/test/csit/plans/music/music-test-plan/setup.sh b/test/csit/plans/music/music-test-plan/setup.sh
index 228aa1f..900ccf6 100755
--- a/test/csit/plans/music/music-test-plan/setup.sh
+++ b/test/csit/plans/music/music-test-plan/setup.sh
@@ -46,7 +46,7 @@
 echo "# music docker containers spinoff";
 
 
-docker volume create music-vol
+docker volume create --name music-vol
 docker run -d --name music-war -v music-vol:/app nexus3.onap.org:10001/onap/music/music:latest
 docker run -d --name music-db -p 7000:7000 -p 7001:7001 -p 7199:7199 -p 9042:9042 -p 9160:9160 nexus3.onap.org:10001/onap/music/cassandra_music:latest
 docker run -d --name music-zk -p 2181:2181 -p 2888:2888 -p 3888:3888 nexus3.onap.org:10001/library/zookeeper:3.4
@@ -61,10 +61,12 @@
 ${WORKSPACE}/test/csit/scripts/music/music-scripts/wait_for_port.sh ${CASSA_IP} 9042
 
 docker run -d --name music-tomcat -p 8080:8080 -v music-vol:/usr/local/tomcat/webapps -v ${MUSIC_PROPERTIES}:/opt/app/music/etc:ro -v ${MUSIC_LOGS}:/opt/app/music/logs nexus3.onap.org:10001/library/tomcat:8.0
+sleep 10
 
 TOMCAT_IP=`docker inspect --format '{{ .NetworkSettings.Networks.bridge.IPAddress}}' music-tomcat`
 echo "TOMCAT_IP=${TOMCAT_IP}"
 
+${WORKSPACE}/test/csit/scripts/music/music-scripts/wait_for_port.sh ${TOMCAT_IP} 8080
 
 
 --- old part: it will be removed
@@ -80,7 +82,7 @@
 # add here all ROBOT_VARIABLES settings
 #
 echo "# music robot variables settings";
-ROBOT_VARIABLES="-v MUSIC_HOSTNAME:http://localhost -v MUSIC_PORT:8080 -v COND_HOSTNAME:http://localhost -v COND_PORT:8091"
+ROBOT_VARIABLES="-v MUSIC_HOSTNAME:http://${TOMCAT_IP} -v MUSIC_PORT:8080 -v COND_HOSTNAME:http://localhost -v COND_PORT:8091"
 
 echo ${ROBOT_VARIABLES}
 
diff --git a/test/csit/plans/music/music-test-plan/teardown.sh b/test/csit/plans/music/music-test-plan/teardown.sh
index 0806eb2..315be04 100755
--- a/test/csit/plans/music/music-test-plan/teardown.sh
+++ b/test/csit/plans/music/music-test-plan/teardown.sh
@@ -24,13 +24,24 @@
 echo "# music scripts docker containers killing";
 echo "#";
 echo "##########################################################";
-kill-instance.sh music-tomcat
-kill-instance.sh music-war
-kill-instance.sh music-zk
-kill-instance.sh music-db
+docker stop music-tomcat 
+docker stop music-war 
+docker stop music-zk 
+docker stop music-db
+
+docker rm music-zk 
+docker rm music-tomcat 
+docker rm music-war 
+docker rm music-db
+
 docker volume rm music-vol
 
-rm -Rf /tmp/music
+echo "dump music.log files"
+ls -alF /tmp/music
+ls -alF /tmp/music/properties
+cat /tmp/music/logs/MUSIC/music.log
+
+#rm -Rf /tmp/music
 
 
 
diff --git a/test/csit/scripts/music/music-properties/music.properties b/test/csit/scripts/music/music-properties/music.properties
index a26fc03..02fb52d 100644
--- a/test/csit/scripts/music/music-properties/music.properties
+++ b/test/csit/scripts/music/music-properties/music.properties
@@ -5,8 +5,8 @@
 #######################################
 # Optional current values are defaults
 #######################################
-#zookeeper.host=localhost
-#cassandra.host=localhost
+zookeeper.host=music-zk
+cassandra.host=music-db
 #music.ip=localhost
 #debug=true
 #music.rest.ip=localhost
diff --git a/test/csit/tests/dcaegen2/testcases/dcae_ves.robot b/test/csit/tests/dcaegen2/testcases/dcae_ves.robot
index eee6ea5..47ce5f1 100644
--- a/test/csit/tests/dcaegen2/testcases/dcae_ves.robot
+++ b/test/csit/tests/dcaegen2/testcases/dcae_ves.robot
@@ -75,12 +75,13 @@
 
 Publish VES VoLTE Fault Batch Events
     [Tags]    DCAE-VESC-R1
-    [Documentation]   Post batched events and expect 202 Response 
+    [Documentation]   Post batched events and expect 200 Response 
     ${evtdata}=   Get Event Data From File   ${EVENT_BATCH_DATA_FILE}
     ${headers}=   Create Header From String    ${HEADER_STRING}
     ${resp}=  Publish Event To VES Collector No Auth    ${VESC_URL}  ${VES_BATCH_EVENT_PATH}  ${headers}  ${evtdata}
     Should Be Equal As Strings 	${resp.status_code} 	200
-    ${ret}=  DMaaP Message Receive    ab305d54-85b4-a31b-7db2-fb6b9e546016
+    #${ret}=  DMaaP Message Receive    ab305d54-85b4-a31b-7db2-fb6b9e546016
+    ${ret}=  DMaaP Message Receive    ab305d54-85b4-a31b-7db2-fb6b9e546025
     Should Be Equal As Strings    ${ret}    true    
     
     
@@ -118,16 +119,16 @@
     Should Be Equal As Strings 	${resp.status_code} 	404
     
     
-Enable VESC HTTPS And Basic Auth
-    [Tags]    DCAE-VESC-R1
-    [Documentation]    Enable VESC Https and Authentication, Disable Http and Run Health Check
-    Enable VESC Https Auth
-    
-    ${auth}=  Create List  ${VESC_HTTPS_USER}   ${VESC_HTTPS_PD}
-    ${session}=    Create Session 	dcaegen2-r1 	${VESC_URL_HTTPS}    auth=${auth}   disable_warnings=1
-    ${headers}=  Create Dictionary     Accept=*/*    X-FromAppId=${GLOBAL_APPLICATION_ID}
-    ${resp}= 	Get Request 	dcaegen2-r1 	/healthcheck        headers=${headers}
-    Should Be Equal As Strings 	${resp.status_code} 	200
+#Enable VESC HTTPS And Basic Auth
+    #[Tags]    DCAE-VESC-R1
+    #[Documentation]    Enable VESC Https and Authentication, Disable Http and Run Health Check
+    #Enable VESC Https Auth
+    #
+    #${auth}=  Create List  ${VESC_HTTPS_USER}   ${VESC_HTTPS_PD}
+    #${session}=    Create Session 	dcaegen2-r1 	${VESC_URL_HTTPS}    auth=${auth}   disable_warnings=1
+    #${headers}=  Create Dictionary     Accept=*/*    X-FromAppId=${GLOBAL_APPLICATION_ID}
+    #${resp}= 	Get Request 	dcaegen2-r1 	/healthcheck        headers=${headers}
+    #Should Be Equal As Strings 	${resp.status_code} 	200
 
 Publish Single VES Fault Event Over HTTPS
     [Tags]    DCAE-VESC-R1
@@ -164,7 +165,8 @@
     ${headers}=   Create Header From String    ${HEADER_STRING}
     ${resp}=  Publish Event To VES Collector  ${VESC_URL_HTTPS}  ${VES_BATCH_EVENT_PATH}  ${headers}  ${evtdata}  ${VESC_HTTPS_USER}  ${VESC_HTTPS_PD}
     Should Be Equal As Strings 	${resp.status_code} 	200
-    ${ret}=  DMaaP Message Receive    ab305d54-85b4-a31b-7db2-fb6b9e546016
+    #${ret}=  DMaaP Message Receive    ab305d54-85b4-a31b-7db2-fb6b9e546016
+    ${ret}=  DMaaP Message Receive    ab305d54-85b4-a31b-7db2-fb6b9e546025
     Should Be Equal As Strings    ${ret}    true
 
 
diff --git a/test/csit/tests/music/music-suite/music-test.robot b/test/csit/tests/music/music-suite/music-test.robot
index 4af4ebc..2780610 100644
--- a/test/csit/tests/music/music-suite/music-test.robot
+++ b/test/csit/tests/music/music-suite/music-test.robot
@@ -46,16 +46,6 @@
     Should Be Equal As Integers    ${rc}    0
     Should Contain    ${output}    music-war
 
-Get Music Version
-    [Documentation]    It sends a REST GET request to retrieve the Music.war version
-    Create Session   musicaas            ${MUSIC_HOSTNAME}:${MUSIC_PORT}
-    &{headers}=      Create Dictionary    Content-Type=application/json  Accept=application/json 
-    ${resp}=         Get Request        musicaas   /MUSIC/rest/v2/version     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 ***
 
diff --git a/version-manifest/src/main/resources/java-manifest.csv b/version-manifest/src/main/resources/java-manifest.csv
index 4dac75c..41b4cdb 100644
--- a/version-manifest/src/main/resources/java-manifest.csv
+++ b/version-manifest/src/main/resources/java-manifest.csv
@@ -101,7 +101,7 @@
 org.onap.multicloud.openstack.vmware,vesagent,1.0.0
 org.onap.multicloud.openstack.vmware,vio,1.0.0
 org.onap.multicloud.openstack,windriver,1.0.0
-org.onap.oparent,oparent,0.1.1
+org.onap.oparent,oparent,1.1.0
 org.onap.policy.common,common-modules,1.1.1
 org.onap.policy.drools-applications,drools-pdp-apps,1.1.1
 org.onap.policy.drools-pdp,drools-pdp,1.1.1