Merge "Refactor POST and PUT Automation Composition"

1 files changed, 57 insertions, 129 deletions

diff --git a/runtime-acm/src/test/resources/rest/acm/AutomationCompositionElementsNotFound.json b/runtime-acm/src/test/resources/rest/acm/AutomationCompositionElementsNotFound.json
index 7e1107c0a..ccfd587a4 100644
--- a/runtime-acm/src/test/resources/rest/acm/AutomationCompositionElementsNotFound.json
+++ b/runtime-acm/src/test/resources/rest/acm/AutomationCompositionElementsNotFound.json
@@ -1,142 +1,70 @@
 {
-    "automationCompositionList": [
-        {
-            "name": "PMSHInstance0",
-            "version": "1.0.1",
+    "name": "PMSHInstance0",
+    "version": "1.0.1",
+    "compositionId": "709c62b3-8918-41b9-a747-d21eb79c6c40",
+    "state": "UNINITIALISED",
+    "orderedState": "UNINITIALISED",
+    "description": "PMSH automation composition instance 0",
+    "elements": {
+        "709c62b3-8918-41b9-a747-d21eb79c6c20": {
+            "id": "709c62b3-8918-41b9-a747-d21eb79c6c20",
             "definition": {
-                "name": "org.onap.domain.pmsh.PMSHAutomationCompositionDefinition",
+                "name": "org.onap.domain.pmsh.DCAEMicroservice",
                 "version": "1.2.3"
             },
+            "participantType": {
+                "name": "org.onap.dcae.acm.DCAEMicroserviceAutomationCompositionParticipant",
+                "version": "2.3.4"
+            },
             "state": "UNINITIALISED",
             "orderedState": "UNINITIALISED",
-            "description": "PMSH automation composition instance 0",
-            "elements": {
-                "709c62b3-8918-41b9-a747-d21eb79c6c20": {
-                    "id": "709c62b3-8918-41b9-a747-d21eb79c6c20",
-                    "definition": {
-                        "name": "org.onap.domain.pmsh.DCAEMicroservice",
-                        "version": "1.2.3"
-                    },
-                    "participantType": {
-                        "name": "org.onap.dcae.acm.DCAEMicroserviceAutomationCompositionParticipant",
-                        "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"
-                    },
-                    "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"
-                },
-                "709c62b3-8918-41b9-a747-d21eb79c6c22": {
-                    "id": "709c62b3-8918-41b9-a747-d21eb79c6c22",
-                    "definition": {
-                        "name": "org.onap.domain.pmsh.PMSH_OperationalPolicyAutomationCompositionElement",
-                        "version": "1.2.3"
-                    },
-                    "participantType": {
-                        "name": "org.onap.policy.acm.PolicyAutomationCompositionParticipant",
-                        "version": "2.3.1"
-                    },
-                    "state": "UNINITIALISED",
-                    "orderedState": "UNINITIALISED",
-                    "description": "Operational Policy Automation Composition Element for the PMSH instance 0 automation composition"
-                },
-                "709c62b3-8918-41b9-a747-d21eb79c6c23": {
-                    "id": "709c62b3-8918-41b9-a747-d21eb79c6c23",
-                    "definition": {
-                        "name": "org.onap.domain.pmsh.PMSH_CDS_AutomationCompositionElement",
-                        "version": "1.2.3"
-                    },
-                    "participantType": {
-                        "name": "org.onap.ccsdk.cds.acm.CdsAutomationCompositionParticipant",
-                        "version": "2.2.1"
-                    },
-                    "state": "UNINITIALISED",
-                    "orderedState": "UNINITIALISED",
-                    "description": "CDS Automation Composition Element for the PMSH instance 0 automation composition"
-                }
-            }
+            "description": "DCAE Automation Composition Element for the PMSH instance 0 automation composition"
         },
-        {
-            "name": "PMSHInstance1",
-            "version": "1.0.1",
+        "709c62b3-8918-41b9-a747-d21eb79c6c21": {
+            "id": "709c62b3-8918-41b9-a747-d21eb79c6c21",
             "definition": {
-                "name": "org.onap.domain.pmsh.PMSHAutomationCompositionDefinition",
+                "name": "org.onap.domain.pmsh.PMSH_MonitoringPolicyAutomationCompositionElement",
                 "version": "1.2.3"
             },
+            "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"
+        },
+        "709c62b3-8918-41b9-a747-d21eb79c6c22": {
+            "id": "709c62b3-8918-41b9-a747-d21eb79c6c22",
+            "definition": {
+                "name": "org.onap.domain.pmsh.PMSH_OperationalPolicyAutomationCompositionElement",
+                "version": "1.2.3"
+            },
+            "participantType": {
+                "name": "org.onap.policy.acm.PolicyAutomationCompositionParticipant",
+                "version": "2.3.1"
+            },
+            "state": "UNINITIALISED",
+            "orderedState": "UNINITIALISED",
+            "description": "Operational Policy Automation Composition Element for the PMSH instance 0 automation composition"
+        },
+        "709c62b3-8918-41b9-a747-d21eb79c6c23": {
+            "id": "709c62b3-8918-41b9-a747-d21eb79c6c23",
+            "definition": {
+                "name": "org.onap.domain.pmsh.PMSH_OperationalPolicyAutomationCompositionElement",
+                "version": "1.2.3"
+            },
+            "participantId": {
+                "name": "org.onap.PM_Policy",
+                "version": "1.0.0"
+            },
+            "participantType": {
+                "name": "org.onap.policy.clamp.acm.PolicyParticipant",
+                "version": "2.3.1"
+            },
             "state": "UNINITIALISED",
             "orderedState": "UNINITIALISED",
-            "description": "PMSH automation composition instance 1",
-            "elements": {
-                "709c62b3-8918-41b9-a747-d21eb79c6c24": {
-                    "id": "709c62b3-8918-41b9-a747-e21eb79c6c24",
-                    "definition": {
-                        "name": "org.onap.domain.pmsh.DCAEMicroservice",
-                        "version": "1.2.3"
-                    },
-                    "participantType": {
-                        "name": "org.onap.dcae.acm.DCAEMicroserviceAutomationCompositionParticipant",
-                        "version": "2.3.4"
-                    },
-                    "state": "UNINITIALISED",
-                    "orderedState": "UNINITIALISED",
-                    "description": "DCAE Automation Composition Element for the PMSH instance 1 automation composition"
-                },
-                "709c62b3-8918-41b9-a747-d21eb79c6c25": {
-                    "id": "709c62b3-8918-41b9-a747-e21eb79c6c25",
-                    "definition": {
-                        "name": "org.onap.domain.pmsh.PMSH_MonitoringPolicyAutomationCompositionElement",
-                        "version": "1.2.3"
-                    },
-                    "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 1 automation composition"
-                },
-                "709c62b3-8918-41b9-a747-d21eb79c6c26": {
-                    "id": "709c62b3-8918-41b9-a747-e21eb79c6c26",
-                    "definition": {
-                        "name": "org.onap.domain.pmsh.PMSH_OperationalPolicyAutomationCompositionElement",
-                        "version": "1.2.3"
-                    },
-                    "participantType": {
-                        "name": "org.onap.policy.acm.PolicyAutomationCompositionParticipant",
-                        "version": "2.3.1"
-                    },
-                    "state": "UNINITIALISED",
-                    "orderedState": "UNINITIALISED",
-                    "description": "Operational Policy Automation Composition Element for the PMSH instance 1 automation composition"
-                },
-                "709c62b3-8918-41b9-a747-d21eb79c6c27": {
-                    "id": "709c62b3-8918-41b9-a747-e21eb79c6c27",
-                    "definition": {
-                        "name": "org.onap.domain.pmsh.PMSH_CDS_AutomationCompositionElement",
-                        "version": "1.2.3"
-                    },
-                    "participantType": {
-                        "name": "org.onap.ccsdk.cds.acm.CdsAutomationCompositionParticipant",
-                        "version": "2.2.1"
-                    },
-                    "state": "UNINITIALISED",
-                    "orderedState": "UNINITIALISED",
-                    "description": "CDS Automation Composition Element for the PMSH instance 1 automation composition"
-                }
-            }
+            "description": "CDS Automation Composition Element for the PMSH instance 0 automation composition"
         }
-    ]
-}
+    }
+}
\ No newline at end of file