Add CSIT for ACM in docker

Included policy particiant tests in docker.
Http and Kubernetes will be tested in kubernetes env.

Issue-ID: POLICY-4541
Signed-off-by: zrrmmua <ramesh.murugan.iyer@est.tech>
Change-Id: I2dcc294d9127307ef74a0f47791aed9d641b37f2

4 files changed, 22 insertions, 19 deletions

diff --git a/compose/config/clamp/HttpParticipantParameters.yaml b/compose/config/clamp/HttpParticipantParameters.yaml
index 038e97af..878eed75 100644
--- a/compose/config/clamp/HttpParticipantParameters.yaml
+++ b/compose/config/clamp/HttpParticipantParameters.yaml
@@ -14,12 +14,7 @@ participant:
   intermediaryParameters:
     reportingTimeIntervalMs: 120000
     description: Participant Description
-    participantId:
-      name: HttpParticipant0
-      version: 1.0.0
-    participantType:
-      name: org.onap.policy.clamp.acm.HttpParticipant
-      version: 2.3.4
+    participantId: 101c62b3-8918-41b9-a747-d21eb79c6c01
     clampAutomationCompositionTopics:
       topicSources:
         - topic: POLICY-ACRUNTIME-PARTICIPANT
@@ -34,6 +29,9 @@ participant:
             - ${topicServer:message-router}
           topicCommInfrastructure: dmaap
           useHttps: false
+    participantSupportedElementTypes:
+      - typeName: org.onap.policy.clamp.acm.HttpAutomationCompositionElement
+        typeVersion: 1.0.0
 management:
   endpoints:
     web:
diff --git a/compose/config/clamp/KubernetesParticipantParameters.yaml b/compose/config/clamp/KubernetesParticipantParameters.yaml
index d9c3326f..3449a5d1 100644
--- a/compose/config/clamp/KubernetesParticipantParameters.yaml
+++ b/compose/config/clamp/KubernetesParticipantParameters.yaml
@@ -17,12 +17,7 @@ participant:
   intermediaryParameters:
     reportingTimeIntervalMs: 120000
     description: Participant Description
-    participantId:
-      name: K8sParticipant0
-      version: 1.0.0
-    participantType:
-      name: org.onap.policy.clamp.acm.KubernetesParticipant
-      version: 2.3.4
+    participantId: 101c62b3-8918-41b9-a747-d21eb79c6c02
     clampAutomationCompositionTopics:
       topicSources:
         -
@@ -39,6 +34,9 @@ participant:
             - ${topicServer:message-router}
           topicCommInfrastructure: dmaap
           useHttps: false
+    participantSupportedElementTypes:
+      - typeName: org.onap.policy.clamp.acm.K8SMicroserviceAutomationCompositionElement
+        typeVersion: 1.0.0
 
 management:
   endpoints:
diff --git a/compose/config/clamp/PolicyParticipantParameters.yaml b/compose/config/clamp/PolicyParticipantParameters.yaml
index 8db98a78..443a0cae 100644
--- a/compose/config/clamp/PolicyParticipantParameters.yaml
+++ b/compose/config/clamp/PolicyParticipantParameters.yaml
@@ -30,12 +30,7 @@ participant:
   intermediaryParameters:
     reportingTimeIntervalMs: 120000
     description: Participant Description
-    participantId:
-      name: org.onap.PM_Policy
-      version: 1.0.0
-    participantType:
-      name: org.onap.policy.clamp.acm.PolicyParticipant
-      version: 2.3.1
+    participantId: 101c62b3-8918-41b9-a747-d21eb79c6c03
     clampAutomationCompositionTopics:
       topicSources:
         -
@@ -52,6 +47,9 @@ participant:
             - ${topicServer:message-router}
           topicCommInfrastructure: dmaap
           useHttps: false
+    participantSupportedElementTypes:
+      - typeName: org.onap.policy.clamp.acm.PolicyAutomationCompositionElement
+        typeVersion: 1.0.0
 management:
   endpoints:
     web:
diff --git a/compose/docker-compose.yml b/compose/docker-compose.yml
index 429e9889..dfb6b641 100644
--- a/compose/docker-compose.yml
+++ b/compose/docker-compose.yml
@@ -242,6 +242,10 @@ services:
       depends_on:
        - mariadb
        - simulator
+       - policy-clamp-ac-http-ppnt
+       - policy-clamp-ac-k8s-ppnt
+       - policy-clamp-ac-pf-ppnt
+       - apex-pdp
       hostname: policy-clamp-runtime-acm
       ports:
        - ${ACM_PORT}:6969
@@ -253,8 +257,13 @@ services:
       command: [
         '-c', './acm-runtime.sh',
         'mariadb', '3306',
-        'message-router', '3904'
+        'message-router', '3904',
+        'policy-clamp-ac-http-ppnt', '6969',
+        'policy-clamp-ac-k8s-ppnt', '6969',
+        'policy-clamp-ac-pf-ppnt', '6969',
+        'apex-pdp', '6969'
         ]
+
    policy-clamp-ac-http-ppnt:
       image: ${CONTAINER_LOCATION}onap/policy-clamp-ac-http-ppnt:${POLICY_CLAMP_VERSION}
       container_name: policy-clamp-ac-http-ppnt