aboutsummaryrefslogtreecommitdiffstats
path: root/csit/resources/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'csit/resources/scripts')
-rwxr-xr-x[-rw-r--r--]csit/resources/scripts/get-cluster-info.sh0
-rwxr-xr-xcsit/resources/scripts/prepare-robot-env.sh2
-rwxr-xr-xcsit/resources/scripts/run-test.sh29
-rwxr-xr-xcsit/resources/scripts/setup-drools-applications.sh3
-rwxr-xr-xcsit/resources/scripts/setup-xacml-pdp.sh4
5 files changed, 21 insertions, 17 deletions
diff --git a/csit/resources/scripts/get-cluster-info.sh b/csit/resources/scripts/get-cluster-info.sh
index efe0f517..efe0f517 100644..100755
--- a/csit/resources/scripts/get-cluster-info.sh
+++ b/csit/resources/scripts/get-cluster-info.sh
diff --git a/csit/resources/scripts/prepare-robot-env.sh b/csit/resources/scripts/prepare-robot-env.sh
index aeab5cd0..fe8dbd94 100755
--- a/csit/resources/scripts/prepare-robot-env.sh
+++ b/csit/resources/scripts/prepare-robot-env.sh
@@ -42,7 +42,7 @@ python3 -m pip -qq freeze
# install eteutils
mkdir -p "${ROBOT_VENV}"/src/onap
rm -rf "${ROBOT_VENV}"/src/onap/testsuite
-python3 -m pip install -qq --upgrade --extra-index-url="https://nexus3.onap.org/repository/PyPi.staging/simple" 'robotframework-onap==0.5.1.*' --pre
+python3 -m pip install -qq --upgrade --extra-index-url="https://nexus3.onap.org/repository/PyPi.staging/simple" 'robotframework-onap==0.6.0.*' --pre
echo "Uninstall docker-py and reinstall docker."
python3 -m pip uninstall -y -qq docker-py
diff --git a/csit/resources/scripts/run-test.sh b/csit/resources/scripts/run-test.sh
index 977bef75..b8b6857a 100755
--- a/csit/resources/scripts/run-test.sh
+++ b/csit/resources/scripts/run-test.sh
@@ -22,20 +22,25 @@
ROBOT_FILE=$1
echo "Invoking the robot tests from: $1"
-export DEFAULT_PORT=6969
-export DATA=/opt/robotworkspace/models/models-examples/src/main/resources/policies
-export NODETEMPLATES=/opt/robotworkspace/models/models-examples/src/main/resources/nodetemplates
-export POLICY_RUNTIME_ACM_IP=policy-clamp-runtime-acm:${DEFAULT_PORT}
-export POLICY_API_IP=policy-api:${DEFAULT_PORT}
-export POLICY_PAP_IP=policy-pap:${DEFAULT_PORT}
-export APEX_IP=policy-apex-pdp:${DEFAULT_PORT}
-export DMAAP_IP=message-router:3904
-export SIMULATOR_IP=message-router
-export PROMETHEUS_IP=prometheus:9090
+DEFAULT_PORT=6969
+DATA=/opt/robotworkspace/models/models-examples/src/main/resources/policies
+NODETEMPLATES=/opt/robotworkspace/models/models-examples/src/main/resources/nodetemplates
+
+POLICY_RUNTIME_ACM_IP=policy-clamp-runtime-acm:${DEFAULT_PORT}
+POLICY_API_IP=policy-api:${DEFAULT_PORT}
+POLICY_PAP_IP=policy-pap:${DEFAULT_PORT}
+APEX_IP=policy-apex-pdp:${DEFAULT_PORT}
+POLICY_PDPX_IP=policy-xacml-pdp:${DEFAULT_PORT}
+
+DMAAP_IP=message-router:3904
+APEX_EVENTS_IP=policy-apex-pdp:23324
+PROMETHEUS_IP=prometheus:9090
export ROBOT_VARIABLES=
-ROBOT_VARIABLES="-v DATA:$DATA -v NODETEMPLATES:$NODETEMPLATES -v POLICY_RUNTIME_ACM_IP:$POLICY_RUNTIME_ACM_IP -v POLICY_API_IP:$POLICY_API_IP
--v POLICY_PAP_IP:$POLICY_PAP_IP -v APEX_IP:$APEX_IP -v DMAAP_IP:$DMAAP_IP -v SIMULATOR_IP:$SIMULATOR_IP -v PROMETHEUS_IP:${PROMETHEUS_IP}"
+ROBOT_VARIABLES="-v DATA:$DATA -v NODETEMPLATES:$NODETEMPLATES -v POLICY_API_IP:$POLICY_API_IP
+-v POLICY_RUNTIME_ACM_IP:$POLICY_RUNTIME_ACM_IP -v POLICY_PAP_IP:$POLICY_PAP_IP -v APEX_IP:$APEX_IP
+-v APEX_EVENTS_IP:$APEX_EVENTS_IP -v DMAAP_IP:$DMAAP_IP -v PROMETHEUS_IP:${PROMETHEUS_IP}
+-v POLICY_PDPX_IP:$POLICY_PDPX_IP"
echo "Run Robot test"
echo ROBOT_VARIABLES="${ROBOT_VARIABLES}"
diff --git a/csit/resources/scripts/setup-drools-applications.sh b/csit/resources/scripts/setup-drools-applications.sh
index 189fa6c9..6e699776 100755
--- a/csit/resources/scripts/setup-drools-applications.sh
+++ b/csit/resources/scripts/setup-drools-applications.sh
@@ -25,7 +25,6 @@ source "${WORKSPACE}"/compose/start-compose.sh drools-apps
sleep 10
unset http_proxy https_proxy
-export DMAAP_IP="localhost:${DMAAP_PORT}"
export SUITES="drools-applications-test.robot"
# wait for the app to start up
@@ -36,4 +35,4 @@ sleep 15
ROBOT_VARIABLES="-v DATA:${DATA} -v DROOLS_IP:localhost:${DROOLS_APPS_PORT}
-v DROOLS_IP_2:localhost:${DROOLS_APPS_TELEMETRY_PORT} -v POLICY_API_IP:localhost:${API_PORT}
--v POLICY_PAP_IP:localhost:${PAP_PORT}"
+-v POLICY_PAP_IP:localhost:${PAP_PORT} -v DMAAP_IP:localhost:${DMAAP_PORT}"
diff --git a/csit/resources/scripts/setup-xacml-pdp.sh b/csit/resources/scripts/setup-xacml-pdp.sh
index 53c44cbd..251cb29c 100755
--- a/csit/resources/scripts/setup-xacml-pdp.sh
+++ b/csit/resources/scripts/setup-xacml-pdp.sh
@@ -25,11 +25,11 @@ source "${WORKSPACE}"/compose/start-compose.sh xacml-pdp
sleep 10
unset http_proxy https_proxy
-export DMAAP_IP="localhost:${DMAAP_PORT}"
export SUITES="xacml-pdp-test.robot"
# wait for the app to start up
"${SCRIPTS}"/wait_for_rest.sh localhost "${XACML_PORT}"
ROBOT_VARIABLES="-v DATA:${DATA} -v POLICY_PDPX_IP:localhost:${XACML_PORT}
--v POLICY_API_IP:localhost:${API_PORT} -v POLICY_PAP_IP:localhost:${PAP_PORT}"
+-v POLICY_API_IP:localhost:${API_PORT} -v POLICY_PAP_IP:localhost:${PAP_PORT}
+-v DMAAP_IP:localhost:${DMAAP_PORT}"