X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Fusecases%2Foruclosedlooprecovery%2Fscriptversion%2Fdocker-compose-controlloop%2Fdocker-compose.yml;h=80d5186f6fe4a5367b8dff6da369260b83f23bb5;hb=20e8eef0dffc9c748439470ed91b601fffd1a9c3;hp=47fab679ca4945d44af42ff1e162f609a3c31474;hpb=443d4728b1930a96ca174e6940c95558f7806684;p=nonrtric.git

diff --git a/test/usecases/oruclosedlooprecovery/scriptversion/docker-compose-controlloop/docker-compose.yml b/test/usecases/oruclosedlooprecovery/scriptversion/docker-compose-controlloop/docker-compose.yml
index 47fab679..80d5186f 100644
--- a/test/usecases/oruclosedlooprecovery/scriptversion/docker-compose-controlloop/docker-compose.yml
+++ b/test/usecases/oruclosedlooprecovery/scriptversion/docker-compose-controlloop/docker-compose.yml
@@ -35,7 +35,7 @@ services:
       expose:
        - 3306
    controlloop-runtime:
-      image: nexus3.onap.org:10001/onap/policy-controlloop-runtime:6.1.2-SNAPSHOT
+      image: nexus3.onap.org:10001/onap/policy-clamp-cl-runtime:6.1.3
       container_name: controlloop-runtime
       depends_on:
        - mariadb
@@ -45,28 +45,57 @@ services:
       expose:
        - 6969
       volumes:
-       - ./config/ks.jks:/opt/app/policy/clamp/etc/ssl/policy-keystore.jks:ro
+       - ./config/ks.jks:/opt/app/policy/clamp/etc/ssl/policy-keystore:ro
+       - ./wait_for_port.sh:/opt/app/policy/clamp/bin/wait_for_port.sh:ro
       environment:
        - TOPICSERVER=onap-dmaap
        - MARIADB_HOST=mariadb
        - MARIADB_PORT=3306
+       - KEYSTORE=/opt/app/policy/clamp/etc/ssl/policy-keystore
+       - KEYSTORE_PASSWD=Pol1cy_0nap
+       - RUNTIME_TOPICPARAMETERGROUP_TOPICSOURCES_0_TOPIC=POLICY-CLRUNTIME-PARTICIPANT
+       - RUNTIME_TOPICPARAMETERGROUP_TOPICSOURCES_0_SERVERS_0=onap-dmaap
+       - RUNTIME_TOPICPARAMETERGROUP_TOPICSOURCES_0_TOPICCOMMINFRASTRUCTURE=dmaap
+       - RUNTIME_TOPICPARAMETERGROUP_TOPICSOURCES_0_FETCHTIMEOUT=15000
+       - RUNTIME_TOPICPARAMETERGROUP_TOPICSOURCES_0_USEHTTPS=false
+       - RUNTIME_TOPICPARAMETERGROUP_TOPICSINKS_0_TOPIC=POLICY-CLRUNTIME-PARTICIPANT
+       - RUNTIME_TOPICPARAMETERGROUP_TOPICSINKS_0_SERVERS_0=onap-dmaap
+       - RUNTIME_TOPICPARAMETERGROUP_TOPICSINKS_0_TOPICCOMMINFRASTRUCTURE=dmaap
+       - RUNTIME_TOPICPARAMETERGROUP_TOPICSINKS_0_FETCHTIMEOUT=15000
+       - RUNTIME_TOPICPARAMETERGROUP_TOPICSINKS_0_USEHTTPS=false
+      entrypoint: /opt/app/policy/clamp/bin/wait_for_port.sh
+      command: [
+        '-c', '/opt/app/policy/clamp/bin/controlloop-runtime.sh',
+        'mariadb', '3306',
+        'onap-dmaap', '3904'
+        ]
    k8s-participant:
-      image: nexus3.onap.org:10001/onap/kubernetes-participant:6.1.2-SNAPSHOT
+      image: nexus3.onap.org:10001/onap/policy-clamp-cl-k8s-ppnt:6.1.3
       container_name: k8s-participant
       depends_on:
        - mariadb
        - controlloop-runtime
-       - chartmuseum
       hostname: k8s-participant
       volumes:
-       - ./config/ks.jks:/opt/app/policy/clamp/etc/ssl/policy-keystore.jks:ro
+       - ./config/ks.jks:/opt/app/policy/clamp/etc/ssl/policy-keystore:ro
        - ./../helm:/home/policy/helm
+       - ./wait_for_port.sh:/opt/app/policy/clamp/bin/wait_for_port.sh:ro
        - <PATH TO kube-config>:/home/policy/.kube/config:ro
       environment:
        - TOPICSERVER=onap-dmaap
-       - KEYSTORE=/opt/app/policy/clamp/etc/ssl/policy-keystore.jks
+       - KEYSTORE=/opt/app/policy/clamp/etc/ssl/policy-keystore
        - KEYSTORE_PASSWD=Pol1cy_0nap
-      entrypoint: sh -c "/home/policy/helm/chartmuseum_init.sh && /opt/app/policy/clamp/bin/kubernetes-participant.sh"
+       - PARTICIPANT_INTERMEDIARYPARAMETERS_CLAMPCONTROLLOOPTOPICS_TOPICSOURCES_0_TOPIC=POLICY-CLRUNTIME-PARTICIPANT
+       - PARTICIPANT_INTERMEDIARYPARAMETERS_CLAMPCONTROLLOOPTOPICS_TOPICSOURCES_0_SERVERS_0=onap-dmaap
+       - PARTICIPANT_INTERMEDIARYPARAMETERS_CLAMPCONTROLLOOPTOPICS_TOPICSOURCES_0_TOPICCOMMINFRASTRUCTURE=dmaap
+       - PARTICIPANT_INTERMEDIARYPARAMETERS_CLAMPCONTROLLOOPTOPICS_TOPICSOURCES_0_FETCHTIMEOUT=15000
+       - PARTICIPANT_INTERMEDIARYPARAMETERS_CLAMPCONTROLLOOPTOPICS_TOPICSOURCES_0_USEHTTPS=false
+       - PARTICIPANT_INTERMEDIARYPARAMETERS_CLAMPCONTROLLOOPTOPICS_TOPICSINKS_0_TOPIC=POLICY-CLRUNTIME-PARTICIPANT
+       - PARTICIPANT_INTERMEDIARYPARAMETERS_CLAMPCONTROLLOOPTOPICS_TOPICSINKS_0_SERVERS_0=onap-dmaap
+       - PARTICIPANT_INTERMEDIARYPARAMETERS_CLAMPCONTROLLOOPTOPICS_TOPICSINKS_0_TOPICCOMMINFRASTRUCTURE=dmaap
+       - PARTICIPANT_INTERMEDIARYPARAMETERS_CLAMPCONTROLLOOPTOPICS_TOPICSINKS_0_FETCHTIMEOUT=15000
+       - PARTICIPANT_INTERMEDIARYPARAMETERS_CLAMPCONTROLLOOPTOPICS_TOPICSINKS_0_USEHTTPS=false
+      entrypoint: sh -c "/opt/app/policy/clamp/bin/wait_for_port.sh controlloop-runtime 6969 && /home/policy/helm/chartmuseum_init.sh && /opt/app/policy/clamp/bin/kubernetes-participant.sh"
    chartmuseum:
       image: ghcr.io/helm/chartmuseum:v0.13.1
       container_name: chartmuseum