6 files changed, 82 insertions, 6 deletions
diff --git a/test/csit/plans/music/music-test-plan/teardown.sh b/test/csit/plans/music/music-test-plan/teardown.sh
index a5f74238c..e05ef9d1c 100755
--- a/test/csit/plans/music/music-test-plan/teardown.sh
+++ b/test/csit/plans/music/music-test-plan/teardown.sh
@@ -36,14 +36,18 @@ echo "#";
 echo "# music scripts docker containers killing";
 echo "#";
 echo "##########################################################";
-docker stop music-tomcat 
-docker stop music-war 
-docker stop music-zk 
+docker stop music-tomcat
+docker stop music-war
+docker stop music-zk
+docker stop music-job
+docker stop music-casstest
 docker stop music-db
 
-docker rm music-zk 
-docker rm music-tomcat 
-docker rm music-war 
+docker rm music-zk
+docker rm music-tomcat
+docker rm music-war
+docker rm music-job
+docker rm music-casstest
 docker rm music-db
 
 docker network rm music-net;
diff --git a/test/csit/plans/policy/distribution/setup.sh b/test/csit/plans/policy/distribution/setup.sh
new file mode 100644
index 000000000..9b894e3d2
--- /dev/null
+++ b/test/csit/plans/policy/distribution/setup.sh
@@ -0,0 +1,31 @@
+#!/bin/bash
+# ============LICENSE_START=======================================================
+#  Copyright (C) 2018 Ericsson. All rights reserved.
+# ================================================================================
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# SPDX-License-Identifier: Apache-2.0
+# ============LICENSE_END=========================================================
+
+docker run -d --name policy-distribution -p 6969:6969 -it nexus3.onap.org:10001/onap/policy-distribution:2.0.0-SNAPSHOT-latest 
+
+POLICY_DISTRIBUTION_IP=`get-instance-ip.sh policy-distribution`
+echo DISTRIBUTION IP IS ${POLICY_DISTRIBUTION_IP}
+Wait for initialization
+for i in {1..10}; do
+   curl -sS ${POLICY_DISTRIBUTION_IP}:6969 && break
+   echo sleep $i
+   sleep $i
+done
+
+ROBOT_VARIABLES="-v POLICY_DISTRIBUTION_IP:${POLICY_DISTRIBUTION_IP}"
diff --git a/test/csit/plans/policy/distribution/teardown.sh b/test/csit/plans/policy/distribution/teardown.sh
new file mode 100644
index 000000000..562df6b34
--- /dev/null
+++ b/test/csit/plans/policy/distribution/teardown.sh
@@ -0,0 +1,20 @@
+#!/bin/bash
+# ============LICENSE_START=======================================================
+#  Copyright (C) 2018 Ericsson. All rights reserved.
+# ================================================================================
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# SPDX-License-Identifier: Apache-2.0
+# ============LICENSE_END=========================================================
+
+kill-instance.sh policy-distribution
diff --git a/test/csit/plans/policy/distribution/testplan.txt b/test/csit/plans/policy/distribution/testplan.txt
new file mode 100644
index 000000000..6f74cce4c
--- /dev/null
+++ b/test/csit/plans/policy/distribution/testplan.txt
@@ -0,0 +1,3 @@
+# Test suites are relative paths under [integration.git]/test/csit/tests/.
+# Place the suites in run order.
+policy/distribution/distribution-test.robot
diff --git a/test/csit/tests/common.robot b/test/csit/tests/common.robot
index 8af66a5df..f0dea2552 100644
--- a/test/csit/tests/common.robot
+++ b/test/csit/tests/common.robot
@@ -1,6 +1,7 @@
 #Robot functions that will be shared also with other tests
 *** Settings ***
 Library     OperatingSystem
+Library     HttpLibrary.HTTP
 
 *** Keywords ***
 json_from_file
diff --git a/test/csit/tests/policy/distribution/distribution-test.robot b/test/csit/tests/policy/distribution/distribution-test.robot
new file mode 100644
index 000000000..1b9fa212b
--- /dev/null
+++ b/test/csit/tests/policy/distribution/distribution-test.robot
@@ -0,0 +1,17 @@
+*** Settings ***
+Library     Collections
+Library     RequestsLibrary
+Library     OperatingSystem
+Library     json
+
+*** Test Cases ***
+Healthcheck
+     [Documentation]    Runs Policy Distribution Health check
+     ${auth}=    Create List    healthcheck    zb!XztG34 
+     Log    Creating session http://${POLICY_DISTRIBUTION_IP}:6969
+     ${session}=    Create Session      policy  http://${POLICY_DISTRIBUTION_IP}:6969   auth=${auth}
+     ${headers}=  Create Dictionary     Accept=application/json    Content-Type=application/json
+     ${resp}=   Get Request     policy  /healthcheck     headers=${headers}
+     Log    Received response from policy ${resp.text}
+     Should Be Equal As Strings    ${resp.status_code}     200
+     Should Be Equal As Strings    ${resp.json()['code']}  200