Handle AC Element Instance Deployment and undeployment on ACM-R

Part of the implementation related to Deployment and undeployment,
missing part will be implemented in POLICY-4509.

push-upstream: POLICY-4506
Change-Id: Ie7ad2da6c0a3286938fc4993d70ee71caee833ba
Signed-off-by: FrancescoFioraEst <francesco.fiora@est.tech>

5 files changed, 44 insertions, 122 deletions

diff --git a/runtime-acm/src/test/resources/rest/acm/AutomationComposition.json b/runtime-acm/src/test/resources/rest/acm/AutomationComposition.json
index 77078e6eb..0e6988d9b 100644
--- a/runtime-acm/src/test/resources/rest/acm/AutomationComposition.json
+++ b/runtime-acm/src/test/resources/rest/acm/AutomationComposition.json
@@ -2,8 +2,8 @@
     "name": "PMSHInstance0",
     "version": "1.0.1",
     "compositionId": "709c62b3-8918-41b9-a747-d21eb79c6c40",
-    "state": "UNINITIALISED",
-    "orderedState": "UNINITIALISED",
+    "deployState": "UNDEPLOYED",
+    "lockState": "NONE",
     "description": "PMSH automation composition instance 0",
     "elements": {
         "709c62b3-8918-41b9-a747-d21eb79c6c20": {
@@ -12,13 +12,8 @@
                 "name": "org.onap.domain.database.PMSH_K8SMicroserviceAutomationCompositionElement",
                 "version": "1.2.3"
             },
-            "participantId": "101c62b3-8918-41b9-a747-d21eb79c6c02",
-            "participantType": {
-                "name": "org.onap.policy.clamp.acm.KubernetesParticipant",
-                "version": "2.3.4"
-            },
-            "state": "UNINITIALISED",
-            "orderedState": "UNINITIALISED",
+            "deployState": "UNDEPLOYED",
+            "lockState": "NONE",
             "description": "Automation composition element for the K8S microservice for PMSH"
         },
         "709c62b3-8918-41b9-a747-d21eb79c6c21": {
@@ -27,13 +22,8 @@
                 "name": "org.onap.domain.database.Http_PMSHMicroserviceAutomationCompositionElement",
                 "version": "1.2.3"
             },
-            "participantId": "101c62b3-8918-41b9-a747-d21eb79c6c01",
-            "participantType": {
-                "name": "org.onap.policy.clamp.acm.HttpParticipant",
-                "version": "2.3.4"
-            },
-            "state": "UNINITIALISED",
-            "orderedState": "UNINITIALISED",
+            "deployState": "UNDEPLOYED",
+            "lockState": "NONE",
             "description": "Automation composition element for the http requests of PMSH microservice"
         },
         "709c62b3-8918-41b9-a747-d21eb79c6c22": {
@@ -42,13 +32,8 @@
                 "name": "org.onap.domain.pmsh.PMSH_OperationalPolicyAutomationCompositionElement",
                 "version": "1.2.3"
             },
-            "participantId": "101c62b3-8918-41b9-a747-d21eb79c6c03",
-            "participantType": {
-                "name": "org.onap.policy.clamp.acm.PolicyParticipant",
-                "version": "2.3.1"
-            },
-            "state": "UNINITIALISED",
-            "orderedState": "UNINITIALISED",
+            "deployState": "UNDEPLOYED",
+            "lockState": "NONE",
             "description": "Automation composition element for the operational policy for Performance Management Subscription Handling"
         }
     }
diff --git a/runtime-acm/src/test/resources/rest/acm/AutomationCompositionElementsNotFound.json b/runtime-acm/src/test/resources/rest/acm/AutomationCompositionElementsNotFound.json
index 80facb29c..34ee3f69d 100644
--- a/runtime-acm/src/test/resources/rest/acm/AutomationCompositionElementsNotFound.json
+++ b/runtime-acm/src/test/resources/rest/acm/AutomationCompositionElementsNotFound.json
@@ -2,8 +2,8 @@
     "name": "PMSHInstance0",
     "version": "1.0.1",
     "compositionId": "709c62b3-8918-41b9-a747-d21eb79c6c40",
-    "state": "UNINITIALISED",
-    "orderedState": "UNINITIALISED",
+    "deployState": "UNDEPLOYED",
+    "lockState": "NONE",
     "description": "PMSH automation composition instance 0",
     "elements": {
         "709c62b3-8918-41b9-a747-d21eb79c6c20": {
@@ -12,12 +12,8 @@
                 "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",
+            "deployState": "UNDEPLOYED",
+            "lockState": "NONE",
             "description": "DCAE Automation Composition Element for the PMSH instance 0 automation composition"
         },
         "709c62b3-8918-41b9-a747-d21eb79c6c21": {
@@ -26,12 +22,8 @@
                 "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",
+            "deployState": "UNDEPLOYED",
+            "lockState": "NONE",
             "description": "Monitoring Policy Automation Composition Element for the PMSH instance 0 automation composition"
         },
         "709c62b3-8918-41b9-a747-d21eb79c6c22": {
@@ -40,12 +32,8 @@
                 "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",
+            "deployState": "UNDEPLOYED",
+            "lockState": "NONE",
             "description": "Operational Policy Automation Composition Element for the PMSH instance 0 automation composition"
         },
         "709c62b3-8918-41b9-a747-d21eb79c6c23": {
@@ -54,13 +42,8 @@
                 "name": "org.onap.domain.pmsh.PMSH_OperationalPolicyAutomationCompositionElement",
                 "version": "1.2.3"
             },
-            "participantId": "101c62b3-8918-41b9-a747-d21eb79c6c03",
-            "participantType": {
-                "name": "org.onap.policy.clamp.acm.PolicyParticipant",
-                "version": "2.3.1"
-            },
-            "state": "UNINITIALISED",
-            "orderedState": "UNINITIALISED",
+            "deployState": "UNDEPLOYED",
+            "lockState": "NONE",
             "description": "CDS Automation Composition Element for the PMSH instance 0 automation composition"
         }
     }
diff --git a/runtime-acm/src/test/resources/rest/acm/AutomationCompositionNotFound.json b/runtime-acm/src/test/resources/rest/acm/AutomationCompositionNotFound.json
index a17ba399a..9b3664294 100644
--- a/runtime-acm/src/test/resources/rest/acm/AutomationCompositionNotFound.json
+++ b/runtime-acm/src/test/resources/rest/acm/AutomationCompositionNotFound.json
@@ -2,8 +2,8 @@
     "name": "PMSHInstance0",
     "version": "1.0.1",
     "compositionId": "709c62b3-8918-41b9-a747-d21eb79c6c40",
-    "state": "UNINITIALISED",
-    "orderedState": "UNINITIALISED",
+    "deployState": "UNDEPLOYED",
+    "lockState": "NONE",
     "description": "PMSH automation composition instance 0",
     "elements": {
         "709c62b3-8918-41b9-a747-d21eb79c6c20": {
@@ -12,12 +12,8 @@
                 "name": "org.onap.domain.pmsh.PMSH_DCAEMicroservice",
                 "version": "1.2.3"
             },
-            "participantType": {
-                "name": "org.onap.dcae.acm.DCAEMicroserviceAutomationCompositionParticipant",
-                "version": "2.3.4"
-            },
-            "state": "UNINITIALISED",
-            "orderedState": "UNINITIALISED",
+            "deployState": "UNDEPLOYED",
+            "lockState": "NONE",
             "description": "DCAE Automation Composition Element for the PMSH instance 0 automation composition"
         },
         "709c62b3-8918-41b9-a747-d21eb79c6c21": {
@@ -26,12 +22,8 @@
                 "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",
+            "deployState": "UNDEPLOYED",
+            "lockState": "NONE",
             "description": "Monitoring Policy Automation Composition Element for the PMSH instance 0 automation composition"
         },
         "709c62b3-8918-41b9-a747-d21eb79c6c22": {
@@ -40,12 +32,8 @@
                 "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",
+            "deployState": "UNDEPLOYED",
+            "lockState": "NONE",
             "description": "Operational Policy Automation Composition Element for the PMSH instance 0 automation composition"
         },
         "709c62b3-8918-41b9-a747-d21eb79c6c23": {
@@ -54,12 +42,8 @@
                 "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",
+            "deployState": "UNDEPLOYED",
+            "lockState": "NONE",
             "description": "CDS Automation Composition Element for the PMSH instance 0 automation composition"
         }
     }
diff --git a/runtime-acm/src/test/resources/rest/acm/AutomationCompositionSmoke.json b/runtime-acm/src/test/resources/rest/acm/AutomationCompositionSmoke.json
index e66f3f68d..7a226ac92 100644
--- a/runtime-acm/src/test/resources/rest/acm/AutomationCompositionSmoke.json
+++ b/runtime-acm/src/test/resources/rest/acm/AutomationCompositionSmoke.json
@@ -2,8 +2,8 @@
     "name": "PMSHInstance0",
     "version": "1.0.1",
     "compositionId": "709c62b3-8918-41b9-a747-d21eb79c6c40",
-    "state": "UNINITIALISED",
-    "orderedState": "UNINITIALISED",
+    "deployState": "UNDEPLOYED",
+    "lockState": "NONE",
     "description": "PMSH automation composition instance 0",
     "elements": {
         "709c62b3-8918-41b9-a747-d21eb79c6c20": {
@@ -12,13 +12,8 @@
                 "name": "org.onap.domain.database.Http_PMSHMicroserviceAutomationCompositionElement",
                 "version": "1.2.3"
             },
-            "participantId": "101c62b3-8918-41b9-a747-d21eb79c6c01",
-            "participantType": {
-                "name": "org.onap.policy.clamp.acm.HttpParticipant",
-                "version": "2.3.4"
-            },
-            "state": "UNINITIALISED",
-            "orderedState": "UNINITIALISED",
+            "deployState": "UNDEPLOYED",
+            "lockState": "NONE",
             "description": "Http Automation Composition Element for the PMSH instance 0 automation composition"
         },
         "709c62b3-8918-41b9-a747-d21eb79c6c22": {
@@ -27,13 +22,8 @@
                 "name": "org.onap.domain.pmsh.PMSH_OperationalPolicyAutomationCompositionElement",
                 "version": "1.2.3"
             },
-            "participantId": "101c62b3-8918-41b9-a747-d21eb79c6c03",
-            "participantType": {
-                "name": "org.onap.policy.clamp.acm.PolicyParticipant",
-                "version": "2.3.1"
-            },
-            "state": "UNINITIALISED",
-            "orderedState": "UNINITIALISED",
+            "deployState": "UNDEPLOYED",
+            "lockState": "NONE",
             "description": "Operational Policy Automation Composition Element for the PMSH instance 0 automation composition"
         },
         "709c62b3-8918-41b9-a747-d21eb79c6c23": {
@@ -42,13 +32,8 @@
                 "name": "org.onap.domain.database.PMSH_K8SMicroserviceAutomationCompositionElement",
                 "version": "1.2.3"
             },
-            "participantId": "101c62b3-8918-41b9-a747-d21eb79c6c02",
-            "participantType": {
-                "name": "org.onap.policy.clamp.acm.KubernetesParticipant",
-                "version": "2.3.4"
-            },
-            "state": "UNINITIALISED",
-            "orderedState": "UNINITIALISED",
+            "deployState": "UNDEPLOYED",
+            "lockState": "NONE",
             "description": "K8s Automation Composition Element for the PMSH instance 0 automation composition"
         }
     }
diff --git a/runtime-acm/src/test/resources/rest/acm/AutomationCompositionUpdate.json b/runtime-acm/src/test/resources/rest/acm/AutomationCompositionUpdate.json
index d0372a342..37568fb19 100644
--- a/runtime-acm/src/test/resources/rest/acm/AutomationCompositionUpdate.json
+++ b/runtime-acm/src/test/resources/rest/acm/AutomationCompositionUpdate.json
@@ -2,8 +2,8 @@
     "name": "PMSHInstance0",
     "version": "1.0.1",
     "compositionId": "709c62b3-8918-41b9-a747-d21eb79c6c40",
-    "state": "UNINITIALISED",
-    "orderedState": "UNINITIALISED",
+    "deployState": "UNDEPLOYED",
+    "lockState": "NONE",
     "description": "PMSH automation composition instance 0",
     "elements": {
         "709c62b3-8918-41b9-a747-d21eb79c6c21": {
@@ -12,13 +12,8 @@
                 "name": "org.onap.domain.database.PMSH_K8SMicroserviceAutomationCompositionElement",
                 "version": "1.2.3"
             },
-            "participantId": "101c62b3-8918-41b9-a747-d21eb79c6c02",
-            "participantType": {
-                "name": "org.onap.policy.clamp.acm.KubernetesParticipant",
-                "version": "2.3.4"
-            },
-            "state": "UNINITIALISED",
-            "orderedState": "UNINITIALISED",
+            "deployState": "UNDEPLOYED",
+            "lockState": "NONE",
             "description": "Automation composition element for the K8S microservice for PMSH"
         },
         "709c62b3-8918-41b9-a747-d21eb79c6c22": {
@@ -27,13 +22,8 @@
                 "name": "org.onap.domain.database.Http_PMSHMicroserviceAutomationCompositionElement",
                 "version": "1.2.3"
             },
-            "participantId": "101c62b3-8918-41b9-a747-d21eb79c6c01",
-            "participantType": {
-                "name": "org.onap.policy.clamp.acm.HttpParticipant",
-                "version": "2.3.4"
-            },
-            "state": "UNINITIALISED",
-            "orderedState": "UNINITIALISED",
+            "deployState": "UNDEPLOYED",
+            "lockState": "NONE",
             "description": "Automation composition element for the operational policy for Performance Management Subscription Handling"
         },
         "709c62b3-8918-41b9-a747-d21eb79c6c23": {
@@ -42,13 +32,8 @@
                 "name": "org.onap.domain.pmsh.PMSH_OperationalPolicyAutomationCompositionElement",
                 "version": "1.2.3"
             },
-            "participantId": "101c62b3-8918-41b9-a747-d21eb79c6c03",
-            "participantType": {
-                "name": "org.onap.policy.clamp.acm.PolicyParticipant",
-                "version": "2.3.1"
-            },
-            "state": "UNINITIALISED",
-            "orderedState": "UNINITIALISED",
+            "deployState": "UNDEPLOYED",
+            "lockState": "NONE",
             "description": "Operational Policy Automation Composition Element for the PMSH instance 0 automation composition"
         }
     }