aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorAndreas Geissler <andreas-geissler@telekom.de>2022-10-24 14:26:35 +0200
committerLukasz Rajewski <lukasz.rajewski@t-mobile.pl>2023-02-15 22:27:49 +0100
commitcb795c01df747f872f5985ba318eefdddea57507 (patch)
tree378750d7a62ba272decdac166dc4d305b6918206 /test
parentf4bfac20ab2aaed86846da037db986d3d1dcb6f2 (diff)
[OSDF] Enable OSDF in ServiceMesh deployment
In case AAF is disabled the secret loading via AAF-SMS should not be called Issue-ID: OPTFRA-1099 Signed-off-by: Andreas Geissler <andreas-geissler@telekom.de> Signed-off-by: Lukasz Rajewski <lukasz.rajewski@t-mobile.pl> Change-Id: Ifca03215a36705b1c160b2cbf708389bd2162301
Diffstat (limited to 'test')
-rwxr-xr-xtest/functest/simulators/build_sim_image.sh6
-rwxr-xr-xtest/functest/simulators/simulated-config/opteng_config.yaml2
-rwxr-xr-xtest/functest/simulators/start_sim.sh2
3 files changed, 7 insertions, 3 deletions
diff --git a/test/functest/simulators/build_sim_image.sh b/test/functest/simulators/build_sim_image.sh
index 6a71d3c..561db19 100755
--- a/test/functest/simulators/build_sim_image.sh
+++ b/test/functest/simulators/build_sim_image.sh
@@ -31,6 +31,10 @@ SIMULATORS_DIR=$FUNC_TEST_DIR/simulators
OSDF_DIR=$(dirname $TEST_DIR)
DOCKER_DIR=$SIMULATORS_DIR/tmp_docker
+echo "Before Docker Build"
+cat $OSDF_DIR/requirements-sim.txt
+echo $OSDF_DIR
+
mkdir -p $DOCKER_DIR/sim/osdf/policy/response-payloads/pdp-has-vcpe-good
cp $SIMULATORS_DIR/Dockerfile $DOCKER_DIR/.
@@ -47,7 +51,7 @@ cp -r $SIMULATORS_DIR/aai $DOCKER_DIR/sim
cp $TEST_DIR/policy-local-files/*.json $DOCKER_DIR/sim/policy/response-payloads/pdp-has-vcpe-good
cp $TEST_DIR/placement-tests/policy_response.json $DOCKER_DIR/sim/policy/response-payloads/
cp $SIMULATORS_DIR/oof_dependencies_simulators.py $DOCKER_DIR/sim/oof_dependencies_simulators.py
-cp $OSDF_DIR/requirements.txt $DOCKER_DIR
+cp $OSDF_DIR/requirements-sim.txt $DOCKER_DIR/requirements.txt
cp -r $SIMULATORS_DIR/start_sim.sh $DOCKER_DIR/
cd $DOCKER_DIR
diff --git a/test/functest/simulators/simulated-config/opteng_config.yaml b/test/functest/simulators/simulated-config/opteng_config.yaml
index 4a7e57d..0dfb536 100755
--- a/test/functest/simulators/simulated-config/opteng_config.yaml
+++ b/test/functest/simulators/simulated-config/opteng_config.yaml
@@ -22,4 +22,4 @@ osdfDatabasePassword: osdf
osdfDatabasePort: 3306
#key
-appkey: os35@rrtky400fdntc#001t5 \ No newline at end of file
+appkey: os35@rrtky400fdntc#001t5
diff --git a/test/functest/simulators/start_sim.sh b/test/functest/simulators/start_sim.sh
index 1d17d65..f5935da 100755
--- a/test/functest/simulators/start_sim.sh
+++ b/test/functest/simulators/start_sim.sh
@@ -1,4 +1,4 @@
#!/usr/bin/env bash
cd /sim
-python oof_dependencies_simulators.py > simulator-logs 2>&1 \ No newline at end of file
+python oof_dependencies_simulators.py