aboutsummaryrefslogtreecommitdiffstats
path: root/plans
diff options
context:
space:
mode:
Diffstat (limited to 'plans')
-rw-r--r--plans/dcaegen2-services-slice-analysis-ms/testsuites/config/sliceanalysisms/config_all.json3
-rw-r--r--plans/dcaegen2-services-slice-analysis-ms/testsuites/config/sliceanalysisms/trust.jksbin1413 -> 0 bytes
-rw-r--r--plans/dcaegen2-services-slice-analysis-ms/testsuites/config/sliceanalysisms/trust.pass1
-rw-r--r--plans/dcaegen2-services-slice-analysis-ms/testsuites/docker-compose.yaml3
-rw-r--r--plans/multicloud-fcaps/functionality1/setup.sh2
5 files changed, 4 insertions, 5 deletions
diff --git a/plans/dcaegen2-services-slice-analysis-ms/testsuites/config/sliceanalysisms/config_all.json b/plans/dcaegen2-services-slice-analysis-ms/testsuites/config/sliceanalysisms/config_all.json
index b084b57d..75938019 100644
--- a/plans/dcaegen2-services-slice-analysis-ms/testsuites/config/sliceanalysisms/config_all.json
+++ b/plans/dcaegen2-services-slice-analysis-ms/testsuites/config/sliceanalysisms/config_all.json
@@ -64,6 +64,9 @@
"sliceanalysisms.pollingTimeout": 60,
"sliceanalysisms.cid": "sliceanalysisms-cid",
"sliceanalysisms.configDb.service": "http://configdb_sim:5000",
+ "sliceanalysisms.aai.url": "http://configdb_sim:5000/aai/v21",
+ "sliceanalysisms.cps.url": "http://configdb_sim:5000",
+ "sliceanalysisms.configDbEnabled": "true",
"service_calls": {
"policy-req": []
},
diff --git a/plans/dcaegen2-services-slice-analysis-ms/testsuites/config/sliceanalysisms/trust.jks b/plans/dcaegen2-services-slice-analysis-ms/testsuites/config/sliceanalysisms/trust.jks
deleted file mode 100644
index 33d9c569..00000000
--- a/plans/dcaegen2-services-slice-analysis-ms/testsuites/config/sliceanalysisms/trust.jks
+++ /dev/null
Binary files differ
diff --git a/plans/dcaegen2-services-slice-analysis-ms/testsuites/config/sliceanalysisms/trust.pass b/plans/dcaegen2-services-slice-analysis-ms/testsuites/config/sliceanalysisms/trust.pass
deleted file mode 100644
index 86edc20c..00000000
--- a/plans/dcaegen2-services-slice-analysis-ms/testsuites/config/sliceanalysisms/trust.pass
+++ /dev/null
@@ -1 +0,0 @@
-YPHcOFZP}sptD;*RV8N!46rG \ No newline at end of file
diff --git a/plans/dcaegen2-services-slice-analysis-ms/testsuites/docker-compose.yaml b/plans/dcaegen2-services-slice-analysis-ms/testsuites/docker-compose.yaml
index cac148c3..e593b4d2 100644
--- a/plans/dcaegen2-services-slice-analysis-ms/testsuites/docker-compose.yaml
+++ b/plans/dcaegen2-services-slice-analysis-ms/testsuites/docker-compose.yaml
@@ -87,9 +87,6 @@ services:
- "8080:8080"
volumes:
- ./config/sliceanalysisms/config_all.json:/etc/config_all.json
- - ./config/sliceanalysisms/trust12.jks:/opt/app/sliceanalysisms/etc/cert/trust.jks
- - ./config/sliceanalysisms/trust.pass:/opt/app/sliceanalysisms/etc/cert/trust.pass
- # - ./config/sliceanalysisms/trust.jks:/opt/app/sliceanalysisms/etc/cert/trustjss.jks
depends_on:
- postgres
networks:
diff --git a/plans/multicloud-fcaps/functionality1/setup.sh b/plans/multicloud-fcaps/functionality1/setup.sh
index 328329f2..31613226 100644
--- a/plans/multicloud-fcaps/functionality1/setup.sh
+++ b/plans/multicloud-fcaps/functionality1/setup.sh
@@ -16,7 +16,7 @@
# Start all process required for executing test case
source ${SCRIPTS}/common_functions.sh
-MULTICLOUD_DOCKER_VERSION=1.4.1
+MULTICLOUD_DOCKER_VERSION=1.5.6
# start multicloud-fcaps
docker run -d --name multicloud-fcaps nexus3.onap.org:10001/onap/multicloud/openstack-fcaps:$MULTICLOUD_DOCKER_VERSION
SERVICE_IP=`get-instance-ip.sh multicloud-fcaps`