X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=plans%2Fpolicy%2Fdrools-pdp%2Fsetup.sh;h=6b951356cc80a61c5c19051d0d72ed3bc2a02930;hb=00532428c0b83065a8ae87eaa2de579c3918d984;hp=459805be756dabbde33dc739aca5cc67110514b2;hpb=8d43285f32048a09429aff6b9326959fb8cd52b8;p=integration%2Fcsit.git

diff --git a/plans/policy/drools-pdp/setup.sh b/plans/policy/drools-pdp/setup.sh
index 459805be..6b951356 100755
--- a/plans/policy/drools-pdp/setup.sh
+++ b/plans/policy/drools-pdp/setup.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
-#
-# Copyright 2017 AT&T Intellectual Property. All rights reserved.
-#
+# ============LICENSE_START=======================================================
+# Copyright 2017-2020 AT&T Intellectual Property. 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
@@ -14,17 +14,36 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-# Place the scripts in run order:
-source ${SCRIPTS}/common_functions.sh
+# SPDX-License-Identifier: Apache-2.0
+# ============LICENSE_END=========================================================
+
+# OS upgrades
+
+echo "Uninstall docker-py and reinstall docker."
+pip uninstall -y docker-py
+pip uninstall -y docker
+pip install -U docker==2.7.0
+
+# Component Versions
+
+source ${SCRIPTS}/policy/config/policy-csit.conf
+
+sudo apt-get -y install libxml2-utils
+
+source ${SCRIPTS}/policy/detmVers.sh
+
+docker-compose -f ${SCRIPTS}/policy/docker-compose-all.yml up -d drools
+
+POLICY_DROOLS_IP=`get-instance-ip.sh drools`
+MARIADB_IP=`get-instance-ip.sh mariadb`
+
+echo DROOLS IP IS ${POLICY_DROOLS_IP}
+echo MARIADB IP IS ${MARIADB_IP}
 
-source ${WORKSPACE}/scripts/policy/drools-pdp-script.sh
+# wait for the app to start up - looking for telemtry service on port 9696
+${SCRIPTS}/policy/wait_for_port.sh ${POLICY_DROOLS_IP} 9696
 
-# Pass any variables required by Robot test suites in ROBOT_VARIABLES
-ROBOT_VARIABLES="-v IP:${IP} -v POLICY_IP:${POLICY_IP} -v PDP_IP:${PDP_IP} -v DOCKER_IP:${DOCKER_IP}" 
-export PDP_IP=${PDP_IP}
-export POLICY_IP=${POLICY_IP}
-export DOCKER_IP=${DOCKER_IP}
+# give enough time for the controllers to come up
+sleep 15
 
-#Get current IP of VM
-HOST_IP=$(ip route get 8.8.8.8 | awk '/8.8.8.8/ {print $NF}')
-export HOST_IP=${HOST_IP}
+ROBOT_VARIABLES="-v POLICY_DROOLS_IP:${POLICY_DROOLS_IP}"