aboutsummaryrefslogtreecommitdiffstats
path: root/plans
diff options
context:
space:
mode:
authorMorgan Richomme <morgan.richomme@orange.com>2021-04-27 14:23:36 +0000
committerGerrit Code Review <gerrit@onap.org>2021-04-27 14:23:36 +0000
commit5e30f7ab894a35be1e8753fd418ac1c8b17a752c (patch)
tree867e8bcaef985799ea5dcdb0c774f18d0cb12edc /plans
parentdf09be8a4193be442fcad964ec5641b8ef208772 (diff)
parenta894fb23cb8555aa3ee49191eabe922b496ef9f4 (diff)
Merge "Add new fields to config file in slice-analysis and remove unused files"
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
4 files changed, 3 insertions, 4 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: