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, 51 insertions, 93 deletions

diff --git a/models/src/test/java/org/onap/policy/clamp/models/acm/persistence/concepts/JpaAutomationCompositionTest.java b/models/src/test/java/org/onap/policy/clamp/models/acm/persistence/concepts/JpaAutomationCompositionTest.java
index 30e225995..0f10c8c03 100644
--- a/models/src/test/java/org/onap/policy/clamp/models/acm/persistence/concepts/JpaAutomationCompositionTest.java
+++ b/models/src/test/java/org/onap/policy/clamp/models/acm/persistence/concepts/JpaAutomationCompositionTest.java
@@ -60,6 +60,10 @@ class JpaAutomationCompositionTest {
         }).hasMessageMatching("copyConcept is marked .*ull but is null");
 
         assertThatThrownBy(() -> {
+            new JpaAutomationComposition((AutomationComposition) null);
+        }).hasMessageMatching("authorativeConcept is marked .*ull but is null");
+
+        assertThatThrownBy(() -> {
             new JpaAutomationComposition(null, null, null, null, null, null, null);
         }).hasMessageMatching(NULL_INSTANCE_ID_ERROR);
 
@@ -211,11 +215,6 @@ class JpaAutomationCompositionTest {
         testJpaAutomationComposition.setDescription(null);
         assertEquals(0, testJpaAutomationComposition.compareTo(otherJpaAutomationComposition));
 
-        testJpaAutomationComposition.setPrimed(true);
-        assertNotEquals(0, testJpaAutomationComposition.compareTo(otherJpaAutomationComposition));
-        testJpaAutomationComposition.setPrimed(false);
-        assertEquals(0, testJpaAutomationComposition.compareTo(otherJpaAutomationComposition));
-
         assertEquals(testJpaAutomationComposition, new JpaAutomationComposition(testJpaAutomationComposition));
     }
 
diff --git a/models/src/test/java/org/onap/policy/clamp/models/acm/utils/AcmUtilsTest.java b/models/src/test/java/org/onap/policy/clamp/models/acm/utils/AcmUtilsTest.java
index 413139999..c16beaf87 100644
--- a/models/src/test/java/org/onap/policy/clamp/models/acm/utils/AcmUtilsTest.java
+++ b/models/src/test/java/org/onap/policy/clamp/models/acm/utils/AcmUtilsTest.java
@@ -39,6 +39,8 @@ import java.util.UUID;
 import org.junit.jupiter.api.Test;
 import org.onap.policy.clamp.models.acm.concepts.AutomationComposition;
 import org.onap.policy.clamp.models.acm.concepts.AutomationCompositionElement;
+import org.onap.policy.clamp.models.acm.concepts.DeployState;
+import org.onap.policy.clamp.models.acm.concepts.LockState;
 import org.onap.policy.clamp.models.acm.concepts.ParticipantDeploy;
 import org.onap.policy.clamp.models.acm.document.concepts.DocToscaServiceTemplate;
 import org.onap.policy.common.utils.coder.StandardCoder;
@@ -58,6 +60,15 @@ class AcmUtilsTest {
     private static final String TOSCA_TEMPLATE_YAML = "clamp/acm/pmsh/funtional-pmsh-usecase.yaml";
 
     @Test
+    void testIsInTransitionalState() {
+        assertThat(AcmUtils.isInTransitionalState(DeployState.DEPLOYED, LockState.LOCKED)).isFalse();
+        assertThat(AcmUtils.isInTransitionalState(DeployState.DEPLOYING, LockState.NONE)).isTrue();
+        assertThat(AcmUtils.isInTransitionalState(DeployState.UNDEPLOYING, LockState.NONE)).isTrue();
+        assertThat(AcmUtils.isInTransitionalState(DeployState.DEPLOYED, LockState.LOCKING)).isTrue();
+        assertThat(AcmUtils.isInTransitionalState(DeployState.DEPLOYED, LockState.UNLOCKING)).isTrue();
+    }
+
+    @Test
     void testCommonUtilsParticipantUpdate() {
         var acElement = new AutomationCompositionElement();
         List<ParticipantDeploy> participantUpdates = new ArrayList<>();
@@ -111,10 +122,9 @@ class AcmUtilsTest {
 
     @Test
     void testCommonUtilsServiceTemplate() {
-        var acElement = new AutomationCompositionElement();
         var toscaServiceTemplate = getDummyToscaServiceTemplate();
-        AcmUtils.setAcPolicyInfo(acElement, toscaServiceTemplate);
-        assertEquals(getDummyToscaDataTypeMap(), acElement.getToscaServiceTemplateFragment().getDataTypes());
+        var toscaServiceTemplateFragment = AcmUtils.getToscaServiceTemplateFragment(toscaServiceTemplate);
+        assertEquals(getDummyToscaDataTypeMap(), toscaServiceTemplateFragment.getDataTypes());
     }
 
     @Test
@@ -122,9 +132,10 @@ class AcmUtilsTest {
         var toscaServiceTemplate = getDummyToscaServiceTemplate();
         toscaServiceTemplate.setPolicyTypes(null);
         toscaServiceTemplate.getToscaTopologyTemplate().setPolicies(null);
-        AutomationCompositionElement acElement = new AutomationCompositionElement();
-        AcmUtils.setAcPolicyInfo(new AutomationCompositionElement(), toscaServiceTemplate);
-        assertNull(acElement.getToscaServiceTemplateFragment());
+        var toscaServiceTemplateFragment = AcmUtils.getToscaServiceTemplateFragment(toscaServiceTemplate);
+        assertNull(toscaServiceTemplateFragment.getPolicyTypes());
+        assertNull(toscaServiceTemplateFragment.getToscaTopologyTemplate());
+        assertNull(toscaServiceTemplateFragment.getDataTypes());
     }
 
     @Test
diff --git a/models/src/test/resources/providers/TestAutomationCompositions.json b/models/src/test/resources/providers/TestAutomationCompositions.json
index bf1d76fbc..24f5a4870 100644
--- a/models/src/test/resources/providers/TestAutomationCompositions.json
+++ b/models/src/test/resources/providers/TestAutomationCompositions.json
@@ -3,8 +3,8 @@
         {
             "compositionId": "709c62b3-8918-41b9-a747-e21eb79c6c40",
             "instanceId": "809c62b3-8918-41b9-a748-e21eb79c6c89",
-            "state": "UNINITIALISED",
-            "orderedState": "UNINITIALISED",
+            "deployState": "UNDEPLOYED",
+            "lockState": "NONE",
             "elements": {
                 "709c62b3-8918-41b9-a747-e21eb79c6c20": {
                     "id": "709c62b3-8918-41b9-a747-e21eb79c6c20",
@@ -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-e21eb79c6c21": {
@@ -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 element for the PMSH instance 0 automation composition"
                 },
                 "709c62b3-8918-41b9-a747-e21eb79c6c22": {
@@ -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 element for the PMSH instance 0 automation composition"
                 },
                 "709c62b3-8918-41b9-a747-e21eb79c6c23": {
@@ -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"
                 }
             },
@@ -70,8 +54,8 @@
         {
             "compositionId": "709c62b3-8918-41b9-a747-e21eb79c6c40",
             "instanceId": "809c62b3-8918-41b9-a748-e21eb79c6c90",
-            "state": "UNINITIALISED",
-            "orderedState": "UNINITIALISED",
+            "deployState": "UNDEPLOYED",
+            "lockState": "NONE",
             "elements": {
                 "709c62b3-8918-41b9-a747-e21eb79c6c24": {
                     "id": "709c62b3-8918-41b9-a747-e21eb79c6c24",
@@ -79,12 +63,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 1 automation composition"
                 },
                 "709c62b3-8918-41b9-a747-e21eb79c6c25": {
@@ -93,12 +73,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 element for the PMSH instance 1 automation composition"
                 },
                 "709c62b3-8918-41b9-a747-e21eb79c6c26": {
@@ -107,12 +83,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 element for the PMSH instance 1 automation composition"
                 },
                 "709c62b3-8918-41b9-a747-e21eb79c6c27": {
@@ -121,12 +93,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 element for the PMSH instance 1 automation composition"
                 }
             },
diff --git a/models/src/test/resources/providers/TestParticipant.json b/models/src/test/resources/providers/TestParticipant.json
index 2f4f910f1..689c6a2b2 100644
--- a/models/src/test/resources/providers/TestParticipant.json
+++ b/models/src/test/resources/providers/TestParticipant.json
@@ -8,10 +8,6 @@
   "participantState": "ON_LINE",
   "description": "A dummy PMSH participant1",
   "participantId": "82fd8ef9-1d1e-4343-9b28-7f9564ee3de6",
-  "participantType":{
-    "name": "org.onap.domain.pmsh.PolicyAutomationCompositionDefinition",
-    "version": "1.0.0"
-  },
   "participantSupportedElementTypes": {
     "68fe8c61-7629-4be7-99d8-18bc6a92d178": {
       "id": "68fe8c61-7629-4be7-99d8-18bc6a92d178",
diff --git a/models/src/test/resources/providers/UpdateAutomationCompositions.json b/models/src/test/resources/providers/UpdateAutomationCompositions.json
index f118ea799..9681ef247 100644
--- a/models/src/test/resources/providers/UpdateAutomationCompositions.json
+++ b/models/src/test/resources/providers/UpdateAutomationCompositions.json
@@ -7,8 +7,8 @@
                 "name": "org.onap.domain.pmsh.PMSHAutomationCompositionDefinition",
                 "version": "1.0.0"
             },
-            "state": "RUNNING",
-            "orderedState": "RUNNING",
+            "deployState": "UNDEPLOYED",
+            "lockState": "NONE",
             "description": "PMSH automation composition instance 0",
             "elements": {
                 "709c62b3-8918-41b9-a747-d21eb79c6c20": {
@@ -17,12 +17,8 @@
                         "name": "org.onap.domain.pmsh.PMSH_DCAEMicroservice",
                         "version": "1.2.3"
                     },
-                    "participantType": {
-                        "name": "org.onap.dcae.acm.DCAEMicroserviceAutomationCompositionParticipant",
-                        "version": "2.3.4"
-                    },
-                    "state": "RUNNING",
-                    "orderedState": "RUNNING",
+                    "deployState": "UNDEPLOYED",
+                    "lockState": "NONE",
                     "description": "DCAE element for the PMSH instance 0 automation composition"
                 },
                 "709c62b3-8918-41b9-a747-d21eb79c6c21": {
@@ -31,12 +27,8 @@
                         "name": "org.onap.domain.pmsh.PMSH_MonitoringPolicyAutomationCompositionElement",
                         "version": "1.2.3"
                     },
-                    "participantType": {
-                        "name": "org.onap.policy.acm.PolicyAutomationCompositionParticipant",
-                        "version": "2.3.1"
-                    },
-                    "state": "RUNNING",
-                    "orderedState": "RUNNING",
+                    "deployState": "UNDEPLOYED",
+                    "lockState": "NONE",
                     "description": "Monitoring Policy element for the PMSH instance 0 automation composition"
                 },
                 "709c62b3-8918-41b9-a747-d21eb79c6c22": {
@@ -45,12 +37,8 @@
                         "name": "org.onap.domain.pmsh.PMSH_OperationalPolicyAutomationCompositionElement",
                         "version": "2.3.1"
                     },
-                    "participantType": {
-                        "name": "org.onap.policy.acm.PolicyAutomationCompositionParticipant",
-                        "version": "1.0.0"
-                    },
-                    "state": "RUNNING",
-                    "orderedState": "RUNNING",
+                    "deployState": "UNDEPLOYED",
+                    "lockState": "NONE",
                     "description": "Operational Policy element for the PMSH instance 0 automation composition"
                 },
                 "709c62b3-8918-41b9-a747-d21eb79c6c23": {
@@ -59,12 +47,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": "RUNNING",
-                    "orderedState": "RUNNING",
+                    "deployState": "UNDEPLOYED",
+                    "lockState": "NONE",
                     "description": "CDS element for the PMSH instance 0 automation composition"
                 }
             }