diff options
| author |   rameshiyer27 <ramesh.murugan.iyer@est.tech> | 2022-06-20 10:45:28 +0100 |
|---|---|---|
| committer | rameshiyer27 <ramesh.murugan.iyer@est.tech> | 2022-06-21 11:16:34 +0100 |
| commit | 6f40c0dc91bd115e2935ccbfc11c50d1c8f40fbe (patch) | |
| tree | 7704139e4ea17e1338a8bb7c76294f3c9a2bab3e /runtime-acm | |
| parent | 606853eb526ee836c436f29acb3edfc6ed7f63f2 (diff) | |
Update service template for PMSH usecase with ACM
Issue-ID: POLICY-4240
Signed-off-by: zrrmmua <ramesh.murugan.iyer@est.tech>
Change-Id: I169551637a48bcf5f4f7dc42dadbdc13a769f016
Diffstat (limited to 'runtime-acm')
3 files changed, 15 insertions, 33 deletions
diff --git a/runtime-acm/src/test/java/org/onap/policy/clamp/acm/runtime/commissioning/CommissioningProviderTest.java b/runtime-acm/src/test/java/org/onap/policy/clamp/acm/runtime/commissioning/CommissioningProviderTest.java index 152171f9e..698439d35 100644 --- a/runtime-acm/src/test/java/org/onap/policy/clamp/acm/runtime/commissioning/CommissioningProviderTest.java +++ b/runtime-acm/src/test/java/org/onap/policy/clamp/acm/runtime/commissioning/CommissioningProviderTest.java @@ -139,7 +139,7 @@ class CommissioningProviderTest { Map<String, ToscaNodeTemplate> nodeTemplates = returnedServiceTemplate.getToscaTopologyTemplate().getNodeTemplates(); - assertThat(nodeTemplates).hasSize(8); + assertThat(nodeTemplates).hasSize(7); } /** @@ -168,7 +168,7 @@ class CommissioningProviderTest { assertThat(returnedServiceTemplate).isNotNull(); ToscaServiceTemplate parsedServiceTemplate = CODER.decode(returnedServiceTemplate, ToscaServiceTemplate.class); - assertThat(parsedServiceTemplate.getToscaTopologyTemplate().getNodeTemplates()).hasSize(8); + assertThat(parsedServiceTemplate.getToscaTopologyTemplate().getNodeTemplates()).hasSize(7); } /** diff --git a/runtime-acm/src/test/java/org/onap/policy/clamp/acm/runtime/commissioning/rest/CommissioningControllerTest.java b/runtime-acm/src/test/java/org/onap/policy/clamp/acm/runtime/commissioning/rest/CommissioningControllerTest.java index cd6823257..5aa2f5a53 100644 --- a/runtime-acm/src/test/java/org/onap/policy/clamp/acm/runtime/commissioning/rest/CommissioningControllerTest.java +++ b/runtime-acm/src/test/java/org/onap/policy/clamp/acm/runtime/commissioning/rest/CommissioningControllerTest.java @@ -166,7 +166,7 @@ class CommissioningControllerTest extends CommonRestController { Map<String, ToscaNodeTemplate> commonProperties = rawresp.readEntity(Map.class); assertNotNull(commonProperties); - assertThat(commonProperties).hasSize(5); + assertThat(commonProperties).hasSize(4); } @Test diff --git a/runtime-acm/src/test/resources/rest/acm/AutomationCompositionsSmoke.json b/runtime-acm/src/test/resources/rest/acm/AutomationCompositionsSmoke.json index 72bdead66..60ea7959c 100644 --- a/runtime-acm/src/test/resources/rest/acm/AutomationCompositionsSmoke.json +++ b/runtime-acm/src/test/resources/rest/acm/AutomationCompositionsSmoke.json @@ -18,34 +18,16 @@ "version": "1.2.3" }, "participantId": { - "name": "org.onap.dcae.acm.DCAEMicroserviceAutomationCompositionParticipant", - "version": "2.3.4" + "name": "HttpParticipant0", + "version": "1.0.0" }, "participantType": { - "name": "org.onap.dcae.acm.DCAEMicroserviceAutomationCompositionParticipant", + "name": "org.onap.policy.clamp.acm.HttpParticipant", "version": "2.3.4" }, "state": "UNINITIALISED", "orderedState": "UNINITIALISED", - "description": "DCAE Automation Composition Element for the PMSH instance 0 automation composition" - }, - "709c62b3-8918-41b9-a747-d21eb79c6c21": { - "id": "709c62b3-8918-41b9-a747-d21eb79c6c21", - "definition": { - "name": "org.onap.domain.pmsh.PMSH_MonitoringPolicyAutomationCompositionElement", - "version": "1.2.3" - }, - "participantId": { - "name": "org.onap.policy.acm.PolicyAutomationCompositionParticipant", - "version": "2.3.1" - }, - "participantType": { - "name": "org.onap.policy.acm.PolicyAutomationCompositionParticipant", - "version": "2.3.1" - }, - "state": "UNINITIALISED", - "orderedState": "UNINITIALISED", - "description": "Monitoring Policy Automation Composition Element for the PMSH instance 0 automation composition" + "description": "Http Automation Composition Element for the PMSH instance 0 automation composition" }, "709c62b3-8918-41b9-a747-d21eb79c6c22": { "id": "709c62b3-8918-41b9-a747-d21eb79c6c22", @@ -54,11 +36,11 @@ "version": "1.2.3" }, "participantId": { - "name": "org.onap.policy.acm.PolicyAutomationCompositionParticipant", - "version": "2.3.1" + "name": "org.onap.PM_Policy", + "version": "1.0.0" }, "participantType": { - "name": "org.onap.policy.acm.PolicyAutomationCompositionParticipant", + "name": "org.onap.policy.clamp.acm.PolicyParticipant", "version": "2.3.1" }, "state": "UNINITIALISED", @@ -72,16 +54,16 @@ "version": "1.2.3" }, "participantId": { - "name": "org.onap.ccsdk.cds.acm.CdsAutomationCompositionParticipant", - "version": "2.2.1" + "name": "K8sParticipant0t", + "version": "1.0.0" }, "participantType": { - "name": "org.onap.ccsdk.cds.acm.CdsAutomationCompositionParticipant", - "version": "2.2.1" + "name": "org.onap.policy.clamp.acm.KubernetesParticipant", + "version": "2.3.4" }, "state": "UNINITIALISED", "orderedState": "UNINITIALISED", - "description": "CDS Automation Composition Element for the PMSH instance 0 automation composition" + "description": "K8s Automation Composition Element for the PMSH instance 0 automation composition" } } }, |