From ee5d337468ebeb98f8d56778cb5b17996be357ca Mon Sep 17 00:00:00 2001
From: Pawel <pawel.kasperkiewicz@nokia.com>
Date: Wed, 30 Sep 2020 15:51:47 +0200
Subject: Adjust PNF simulator to use CertService from OOM repo

Issue-ID: INT-1730
Signed-off-by: Pawel <pawel.kasperkiewicz@nokia.com>
Change-Id: Ica77a1099847e3b4c2670b6567416de75d6e2f45
---
 .../docker-compose-certservice.yml                 | 34 +++++++++++-----------
 1 file changed, 17 insertions(+), 17 deletions(-)

(limited to 'sanitycheck/pnfsimulator-secured/docker-compose-certservice.yml')

diff --git a/sanitycheck/pnfsimulator-secured/docker-compose-certservice.yml b/sanitycheck/pnfsimulator-secured/docker-compose-certservice.yml
index 4548f04..e7d4cb6 100644
--- a/sanitycheck/pnfsimulator-secured/docker-compose-certservice.yml
+++ b/sanitycheck/pnfsimulator-secured/docker-compose-certservice.yml
@@ -10,37 +10,37 @@ networks:
 
 services:
 
-  aaf-cert-service:
-    image: nexus3.onap.org:10003/onap/org.onap.aaf.certservice.aaf-certservice-api:latest
+  oom-cert-service:
+    image: nexus3.onap.org:10001/onap/org.onap.oom.platform.cert-service.oom-certservice-api:2.1.0
     volumes:
-      - ./certservice/certservice-resources/cmpServers.json:/etc/onap/aaf/certservice/cmpServers.json
-      - ./certservice/certs/truststore.jks:/etc/onap/aaf/certservice/certs/truststore.jks
-      - ./certservice/certs/root.crt:/etc/onap/aaf/certservice/certs/root.crt
-      - ./certservice/certs/certServiceServer-keystore.jks:/etc/onap/aaf/certservice/certs/certServiceServer-keystore.jks
-      - ./certservice/certs/certServiceServer-keystore.p12:/etc/onap/aaf/certservice/certs/certServiceServer-keystore.p12
-    container_name: aafcert-service
+      - ./certservice/certservice-resources/cmpServers.json:/etc/onap/oom/certservice/cmpServers.json
+      - ./certservice/certs/truststore.jks:/etc/onap/oom/certservice/certs/truststore.jks
+      - ./certservice/certs/root.crt:/etc/onap/oom/certservice/certs/root.crt
+      - ./certservice/certs/certServiceServer-keystore.jks:/etc/onap/oom/certservice/certs/certServiceServer-keystore.jks
+      - ./certservice/certs/certServiceServer-keystore.p12:/etc/onap/oom/certservice/certs/certServiceServer-keystore.p12
+    container_name: oomcert-service
     ports:
       - "8443:8443"
     healthcheck:
-      test: ["CMD-SHELL", "curl https://localhost:8443/actuator/health --cacert /etc/onap/aaf/certservice/certs/root.crt --cert-type p12 --cert /etc/onap/aaf/certservice/certs/certServiceServer-keystore.p12 --pass secret"]
+      test: ["CMD-SHELL", "curl https://localhost:8443/actuator/health --cacert /etc/onap/oom/certservice/certs/root.crt --cert-type p12 --cert /etc/onap/oom/certservice/certs/certServiceServer-keystore.p12 --pass secret"]
       interval: 10s
       timeout: 3s
       retries: 15
     networks:
       - certservice-network
 
-  aaf-cert-client:
-    image: nexus3.onap.org:10003/onap/org.onap.aaf.certservice.aaf-certservice-client:latest
-    container_name: aafcert-client
+  oom-cert-client:
+    image: nexus3.onap.org:10001/onap/org.onap.oom.platform.cert-service.oom-certservice-client:2.1.0
+    container_name: oomcert-client
     env_file: ./certservice/client-resources/client-configuration.env
     networks:
       - certservice-network
     volumes:
     - ./certservice/client-resources/client-volume:/var/certs:rw
-    - ./certservice/certs/truststore.jks:/etc/onap/aaf/certservice/certs/truststore.jks
-    - ./certservice/certs/certServiceClient-keystore.jks:/etc/onap/aaf/certservice/certs/certServiceClient-keystore.jks
+    - ./certservice/certs/truststore.jks:/etc/onap/oom/certservice/certs/truststore.jks
+    - ./certservice/certs/certServiceClient-keystore.jks:/etc/onap/oom/certservice/certs/certServiceClient-keystore.jks
     depends_on:
-      aaf-cert-service:
+      oom-cert-service:
         condition: service_healthy
 
   mongo:
@@ -76,8 +76,8 @@ services:
       - pnf-simulator-network
     command: bash -c "
       while [[ $$(ls -1 /app/store | wc -l) != '4' ]]; do echo 'Waiting for certs...'; sleep 3; done
-      && mv /app/store/truststore.jks /app/store/trust.jks
-      && mv /app/store/keystore.jks /app/store/cert.p12
+      && cp /app/store/truststore.jks /app/store/trust.jks
+      && cp /app/store/keystore.jks /app/store/cert.p12
       && export CLIENT_CERT_PASS=$$(cat /app/store/keystore.pass)
       && export TRUST_CERT_PASS=$$(cat /app/store/truststore.pass)
       && java -Dspring.config.location=file:/app/application.properties  -cp /app/libs/*:/app/pnf-simulator.jar org.onap.pnfsimulator.Main
-- 
cgit 1.2.3-korg