aboutsummaryrefslogtreecommitdiffstats
path: root/csit/xacml-pdp/plans
diff options
context:
space:
mode:
Diffstat (limited to 'csit/xacml-pdp/plans')
-rw-r--r--csit/xacml-pdp/plans/setup.sh31
-rw-r--r--csit/xacml-pdp/plans/teardown.sh6
2 files changed, 21 insertions, 16 deletions
diff --git a/csit/xacml-pdp/plans/setup.sh b/csit/xacml-pdp/plans/setup.sh
index 718d5123..c99a0318 100644
--- a/csit/xacml-pdp/plans/setup.sh
+++ b/csit/xacml-pdp/plans/setup.sh
@@ -1,7 +1,7 @@
#!/bin/bash
# ============LICENSE_START=======================================================
# Copyright (C) 2020-2021 AT&T Intellectual Property. All rights reserved.
-# Modification Copyright 2021. Nordix Foundation.
+# Modifications Copyright 2021-2022 Nordix Foundation.
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -17,7 +17,6 @@
#
# SPDX-License-Identifier: Apache-2.0
# ============LICENSE_END=========================================================
-source ${SCRIPTS}/get-branch-mariadb.sh
echo "Uninstall docker-py and reinstall docker."
python3 -m pip uninstall -y docker-py
@@ -25,30 +24,30 @@ python3 -m pip uninstall -y docker
python3 -m pip install -U docker
sudo apt-get -y install libxml2-utils
-bash ${SCRIPTS}/get-models-examples.sh
-source ${SCRIPTS}/detmVers.sh
+source "${SCRIPTS}"/get-versions.sh
+bash "${SCRIPTS}"/get-models-examples.sh
-docker-compose -f ${SCRIPTS}/docker-compose-all.yml up -d xacml-pdp
+docker-compose -f "${SCRIPTS}"/docker-compose-all.yml up -d xacml-pdp
unset http_proxy https_proxy
-POLICY_API_IP=`get-instance-ip.sh policy-api`
-MARIADB_IP=`get-instance-ip.sh mariadb`
-POLICY_PDPX_IP=`get-instance-ip.sh policy-xacml-pdp`
-SIM_IP=`get-instance-ip.sh simulator`
-POLICY_PAP_IP=`get-instance-ip.sh policy-pap`
+POLICY_API_IP=$(get-instance-ip.sh policy-api)
+MARIADB_IP=$(get-instance-ip.sh mariadb)
+POLICY_PDPX_IP=$(get-instance-ip.sh policy-xacml-pdp)
+SIM_IP=$(get-instance-ip.sh simulator)
+POLICY_PAP_IP=$(get-instance-ip.sh policy-pap)
export SIM_IP
-echo PDP IP IS ${POLICY_PDPX_IP}
-echo API IP IS ${POLICY_API_IP}
-echo PAP IP IS ${POLICY_PAP_IP}
-echo MARIADB IP IS ${MARIADB_IP}
-echo SIM_IP IS ${SIM_IP}
+echo PDP IP IS "${POLICY_PDPX_IP}"
+echo API IP IS "${POLICY_API_IP}"
+echo PAP IP IS "${POLICY_PAP_IP}"
+echo MARIADB IP IS "${MARIADB_IP}"
+echo SIM_IP IS "${SIM_IP}"
# wait for the app to start up
-${SCRIPTS}/wait_for_port.sh ${POLICY_PDPX_IP} 6969
+"${SCRIPTS}"/wait_for_port.sh "${POLICY_PDPX_IP}" 6969
DATA2=${WORKSPACE}/models/models-examples/src/main/resources/policies
diff --git a/csit/xacml-pdp/plans/teardown.sh b/csit/xacml-pdp/plans/teardown.sh
index e101973f..3e2fc5f7 100644
--- a/csit/xacml-pdp/plans/teardown.sh
+++ b/csit/xacml-pdp/plans/teardown.sh
@@ -1,6 +1,7 @@
#!/bin/bash
# ============LICENSE_START=======================================================
# Copyright (C) 2019-2021 AT&T Intellectual Property. All rights reserved.
+# Modifications copyright (c) 2022 Nordix Foundation.
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -17,4 +18,9 @@
# SPDX-License-Identifier: Apache-2.0
# ============LICENSE_END=========================================================
+docker logs policy-api
+docker logs simulator
+docker logs policy-pap
+docker logs xacml-pdp
+
docker-compose -f ${SCRIPTS}/docker-compose-all.yml down -v