From a894fb23cb8555aa3ee49191eabe922b496ef9f4 Mon Sep 17 00:00:00 2001 From: Niranjana Date: Mon, 12 Apr 2021 13:59:26 +0000 Subject: Add new fields to config file in slice-analysis and remove unused files Issue-ID: DCAEGEN2-2623 Signed-off-by: Niranjana Change-Id: Id869f721efe7a5a658b77ff78b18efe0e4751f22 --- .../testsuites/config/sliceanalysisms/config_all.json | 3 +++ .../testsuites/config/sliceanalysisms/trust.jks | Bin 1413 -> 0 bytes .../testsuites/config/sliceanalysisms/trust.pass | 1 - .../testsuites/docker-compose.yaml | 3 --- 4 files changed, 3 insertions(+), 4 deletions(-) delete mode 100644 plans/dcaegen2-services-slice-analysis-ms/testsuites/config/sliceanalysisms/trust.jks delete mode 100644 plans/dcaegen2-services-slice-analysis-ms/testsuites/config/sliceanalysisms/trust.pass (limited to 'plans/dcaegen2-services-slice-analysis-ms/testsuites') 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 Binary files a/plans/dcaegen2-services-slice-analysis-ms/testsuites/config/sliceanalysisms/trust.jks and /dev/null 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: -- cgit 1.2.3-korg