Verify alignment with Definition of TOSCA Control Loop Types

Issue-ID: POLICY-3612
Change-Id: I818f80cdc1db98752a7791ef4aba7377add66516
Signed-off-by: FrancescoFioraEst <francesco.fiora@est.tech>

2 files changed, 32 insertions, 8 deletions

diff --git a/common/src/test/resources/examples/controlloop/KubernetesHelm.yaml b/common/src/test/resources/examples/controlloop/KubernetesHelm.yaml
index 2a5f76082..9b0f449d3 100644
--- a/common/src/test/resources/examples/controlloop/KubernetesHelm.yaml
+++ b/common/src/test/resources/examples/controlloop/KubernetesHelm.yaml
@@ -42,9 +42,20 @@ node_types:
       provider:
         type: string
         requred: false
-      participant_id:
+      participantType:
         type: onap.datatypes.ToscaConceptIdentifier
         requred: true
+      startPhase:
+        type: integer
+        required: false
+        constraints:
+        - greater-or-equal: 0
+        metadata:
+            common: true
+        description: A value indicating the start phase in which this control loop element will be started, the
+                     first start phase is zero. Control Loop Elements are started in their start_phase order and stopped
+                     in reverse start phase order. Control Loop Elements with the same start phase are started and
+                     stopped simultaneously
   org.onap.policy.clamp.controlloop.ControlLoop:
     version: 1.0.1
     derived_from: tosca.nodetypes.Root
@@ -94,9 +105,10 @@ topology_template:
       description: Control loop element for the K8S microservice for Postgres
       properties:
         provider: ONAP
-        participant_id:
+        participantType:
           name: org.onap.k8s.controlloop.K8SControlLoopParticipant
           version: 2.3.4
+        startPhase: 2
         chart:
           apiVersion: v1
           description: ONAP Postgres Server
@@ -129,9 +141,10 @@ topology_template:
       description: Control loop element for the K8S microservice for Hello World
       properties:
         provider: ONAP
-        participant_id:
+        participantType:
           name: org.onap.k8s.controlloop.K8SControlLoopParticipant
           version: 2.3.4
+        startPhase: 2
         chart:
           apiVersion: v1
           name: helloworld
diff --git a/common/src/test/resources/examples/controlloop/PMSubscriptionHandling.yaml b/common/src/test/resources/examples/controlloop/PMSubscriptionHandling.yaml
index 5628b0ac5..8e8f3cd39 100644
--- a/common/src/test/resources/examples/controlloop/PMSubscriptionHandling.yaml
+++ b/common/src/test/resources/examples/controlloop/PMSubscriptionHandling.yaml
@@ -317,9 +317,20 @@ node_types:
       provider:
         type: string
         required: false
-      participant_id:
+      participantType:
         type: onap.datatypes.ToscaConceptIdentifier
         required: true
+      startPhase:
+        type: integer
+        required: false
+        constraints:
+        - greater-or-equal: 0
+        metadata:
+            common: true
+        description: A value indicating the start phase in which this control loop element will be started, the
+                     first start phase is zero. Control Loop Elements are started in their start_phase order and stopped
+                     in reverse start phase order. Control Loop Elements with the same start phase are started and
+                     stopped simultaneously
   org.onap.policy.clamp.controlloop.ControlLoop:
     version: 1.0.1
     derived_from: tosca.nodetypes.Root
@@ -407,7 +418,7 @@ topology_template:
       description: Control loop element for the DCAE microservice for Performance Management Subscription Handling
       properties:
         provider: Ericsson
-        participant_id:
+        participantType:
           name: org.onap.dcae.controlloop.DCAEMicroserviceControlLoopParticipant
           version: 2.3.4
         dcae_blueprint:
@@ -631,7 +642,7 @@ topology_template:
       description: Control loop element for the monitoring policy for Performance Management Subscription Handling
       properties:
         provider: Ericsson
-        participant_id:
+        participantType:
           name: org.onap.policy.controlloop.PolicyControlLoopParticipant
           version: 2.3.1
         policy_type_id:
@@ -646,7 +657,7 @@ topology_template:
       description: Control loop element for the operational policy for Performance Management Subscription Handling
       properties:
         provider: Ericsson
-        participant_id:
+        participantType:
           name: org.onap.policy.controlloop.PolicyControlLoopParticipant
           version: 2.2.1
         policy_type_id:
@@ -661,7 +672,7 @@ topology_template:
       description: Control loop element for CDS for Performance Management Subscription Handling
       properties:
         provider: Ericsson
-        participant_id:
+        participantType:
           name: org.onap.ccsdk.cds.controlloop.CdsControlLoopParticipant
           version: 3.2.1
         cds_blueprint_id: