Update examples with new functionality

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

20 files changed, 2255 insertions, 2017 deletions

diff --git a/runtime-acm/src/main/resources/openapi/examples/getAllCompositionDefinitions.json b/runtime-acm/src/main/resources/openapi/examples/getAllCompositionDefinitions.json
index bef6791a3..cf424417b 100644..100755
--- a/runtime-acm/src/main/resources/openapi/examples/getAllCompositionDefinitions.json
+++ b/runtime-acm/src/main/resources/openapi/examples/getAllCompositionDefinitions.json
@@ -131,25 +131,6 @@
                                 "common": "true"
                             }
                         },
-                        "participant_id": {
-                            "name": "participant_id",
-                            "type": "onap.datatypes.ToscaConceptIdentifier",
-                            "type_version": "0.0.0",
-                            "required": true,
-                            "metadata": {
-                                "common": "true"
-                            }
-                        },
-                        "participantType": {
-                            "name": "participantType",
-                            "type": "onap.datatypes.ToscaConceptIdentifier",
-                            "type_version": "0.0.0",
-                            "description": "The identity of the participant type that hosts this type of Automation Composition Element",
-                            "required": true,
-                            "metadata": {
-                                "common": "true"
-                            }
-                        },
                         "startPhase": {
                             "name": "startPhase",
                             "type": "integer",
@@ -180,54 +161,6 @@
                             "metadata": {
                                 "common": "true"
                             }
-                        },
-                        "passiveToRunningTimeout": {
-                            "name": "passiveToRunningTimeout",
-                            "type": "integer",
-                            "type_version": "0.0.0",
-                            "description": "The maximum time in seconds to wait for a state chage from passive to running",
-                            "default": 60.0,
-                            "required": false,
-                            "constraints": [
-                                {
-                                    "greater_or_equal": "0"
-                                }
-                            ],
-                            "metadata": {
-                                "common": "true"
-                            }
-                        },
-                        "runningToPassiveTimeout": {
-                            "name": "runningToPassiveTimeout",
-                            "type": "integer",
-                            "type_version": "0.0.0",
-                            "description": "The maximum time in seconds to wait for a state chage from running to passive",
-                            "default": 60.0,
-                            "required": false,
-                            "constraints": [
-                                {
-                                    "greater_or_equal": "0"
-                                }
-                            ],
-                            "metadata": {
-                                "common": "true"
-                            }
-                        },
-                        "passiveToUninitializedTimeout": {
-                            "name": "passiveToUninitializedTimeout",
-                            "type": "integer",
-                            "type_version": "0.0.0",
-                            "description": "The maximum time in seconds to wait for a state chage from passive to uninitialized",
-                            "default": 60.0,
-                            "required": false,
-                            "constraints": [
-                                {
-                                    "greater_or_equal": "0"
-                                }
-                            ],
-                            "metadata": {
-                                "common": "true"
-                            }
                         }
                     },
                     "name": "org.onap.policy.clamp.acm.AutomationCompositionElement",
@@ -300,7 +233,7 @@
                         }
                     },
                     "name": "org.onap.policy.clamp.acm.HttpAutomationCompositionElement",
-                    "version": "1.0.1",
+                    "version": "1.0.0",
                     "derived_from": "org.onap.policy.clamp.acm.AutomationCompositionElement",
                     "metadata": {}
                 }
@@ -320,17 +253,9 @@
                     },
                     "onap.policy.clamp.ac.element.Http_StarterAutomationCompositionElement": {
                         "type": "org.onap.policy.clamp.acm.HttpAutomationCompositionElement",
-                        "type_version": "1.0.1",
+                        "type_version": "1.0.0",
                         "properties": {
                             "provider": "ONAP",
-                            "participant_id": {
-                                "name": "HttpParticipant0",
-                                "version": "1.0.0"
-                            },
-                            "participantType": {
-                                "name": "org.onap.policy.clamp.acm.HttpParticipant",
-                                "version": "2.3.4"
-                            },
                             "uninitializedToPassiveTimeout": 180,
                             "startPhase": 0,
                             "baseUrl": "http://acelement-starter:8084",
@@ -366,17 +291,9 @@
                     },
                     "onap.policy.clamp.ac.element.Http_BridgeAutomationCompositionElement": {
                         "type": "org.onap.policy.clamp.acm.HttpAutomationCompositionElement",
-                        "type_version": "1.0.1",
+                        "type_version": "1.0.0",
                         "properties": {
                             "provider": "ONAP",
-                            "participant_id": {
-                                "name": "HttpParticipant0",
-                                "version": "1.0.0"
-                            },
-                            "participantType": {
-                                "name": "org.onap.policy.clamp.acm.HttpParticipant",
-                                "version": "2.3.4"
-                            },
                             "uninitializedToPassiveTimeout": 180,
                             "startPhase": 0,
                             "baseUrl": "http://acelement-bridge:8084",
@@ -412,17 +329,9 @@
                     },
                     "onap.policy.clamp.ac.element.Http_SinkAutomationCompositionElement": {
                         "type": "org.onap.policy.clamp.acm.HttpAutomationCompositionElement",
-                        "type_version": "1.0.1",
+                        "type_version": "1.0.0",
                         "properties": {
                             "provider": "ONAP",
-                            "participant_id": {
-                                "name": "HttpParticipant0",
-                                "version": "1.0.0"
-                            },
-                            "participantType": {
-                                "name": "org.onap.policy.clamp.acm.HttpParticipant",
-                                "version": "2.3.4"
-                            },
                             "uninitializedToPassiveTimeout": 180,
                             "startPhase": 0,
                             "baseUrl": "http://acelement-sink:8084",
@@ -481,11 +390,14 @@
                         "metadata": {},
                         "description": "Automation composition for Demp"
                     }
-                }
+                },
+                "policies": []
             },
             "name": "tosca",
             "version": "1.0.0",
-            "metadata": {}
+            "metadata": {
+                "compositionId": "562ed027-2689-481a-b3a5-e284b1fbc33f"
+            }
         }
     ]
 }
\ No newline at end of file
diff --git a/runtime-acm/src/main/resources/openapi/examples/getAllCompositionDefinitions.yaml b/runtime-acm/src/main/resources/openapi/examples/getAllCompositionDefinitions.yaml
index 001e07d0d..2965738fc 100644..100755
--- a/runtime-acm/src/main/resources/openapi/examples/getAllCompositionDefinitions.yaml
+++ b/runtime-acm/src/main/resources/openapi/examples/getAllCompositionDefinitions.yaml
@@ -1,393 +1,340 @@
 service_templates:
-- tosca_definitions_version: tosca_simple_yaml_1_3
-  data_types:
-    onap.datatypes.ToscaConceptIdentifier:
-      properties:
-        name:
-          name: name
-          type: string
-          type_version: 0.0.0
-          required: true
-        version:
-          name: version
-          type: string
-          type_version: 0.0.0
-          required: true
-      name: onap.datatypes.ToscaConceptIdentifier
-      version: 0.0.0
-      derived_from: tosca.datatypes.Root
-      metadata: {}
-    org.onap.datatypes.policy.clamp.acm.httpAutomationCompositionElement.RestRequest:
-      properties:
-        restRequestId:
-          name: restRequestId
-          type: onap.datatypes.ToscaConceptIdentifier
-          type_version: 0.0.0
-          description: The name and version of a REST request to be sent to a REST
-            endpoint
-          required: true
-        httpMethod:
-          name: httpMethod
-          type: string
-          type_version: 0.0.0
-          description: The REST method to use
-          required: true
-          constraints:
-          - valid_values:
-            - POST
-            - PUT
-            - GET
-            - DELETE
-        path:
-          name: path
-          type: string
-          type_version: 0.0.0
-          description: The path of the REST request relative to the base URL
-          required: true
-        body:
-          name: body
-          type: string
-          type_version: 0.0.0
-          description: The body of the REST request for PUT and POST requests
-          required: false
-        expectedResponse:
-          name: expectedResponse
-          type: integer
-          type_version: 0.0.0
-          description: THe expected HTTP status code for the REST request
-          required: true
-          constraints: []
-      name: org.onap.datatypes.policy.clamp.acm.httpAutomationCompositionElement.RestRequest
-      version: 1.0.0
-      derived_from: tosca.datatypes.Root
-      metadata: {}
-    org.onap.datatypes.policy.clamp.acm.httpAutomationCompositionElement.ConfigurationEntity:
-      properties:
-        configurationEntityId:
-          name: configurationEntityId
-          type: onap.datatypes.ToscaConceptIdentifier
-          type_version: 0.0.0
-          description: The name and version of a Configuration Entity to be handled
-            by the HTTP Automation Composition Element
-          required: true
-        restSequence:
-          name: restSequence
-          type: list
-          type_version: 0.0.0
-          description: A sequence of REST commands to send to the REST endpoint
-          required: false
-          entry_schema:
-            type: org.onap.datatypes.policy.clamp.acm.httpAutomationCompositionElement.RestRequest
-            type_version: 1.0.0
-      name: org.onap.datatypes.policy.clamp.acm.httpAutomationCompositionElement.ConfigurationEntity
-      version: 1.0.0
-      derived_from: tosca.datatypes.Root
-      metadata: {}
-  node_types:
-    org.onap.policy.clamp.acm.Participant:
-      properties:
-        provider:
-          name: provider
-          type: string
-          type_version: 0.0.0
-          required: false
-      name: org.onap.policy.clamp.acm.Participant
-      version: 1.0.1
-      derived_from: tosca.nodetypes.Root
-      metadata: {}
-    org.onap.policy.clamp.acm.AutomationCompositionElement:
-      properties:
-        provider:
-          name: provider
-          type: string
-          type_version: 0.0.0
-          description: Specifies the organization that provides the automation composition
-            element
-          required: false
-          metadata:
-            common: 'true'
-        participant_id:
-          name: participant_id
-          type: onap.datatypes.ToscaConceptIdentifier
-          type_version: 0.0.0
-          required: true
-          metadata:
-            common: 'true'
-        participantType:
-          name: participantType
-          type: onap.datatypes.ToscaConceptIdentifier
-          type_version: 0.0.0
-          description: The identity of the participant type that hosts this type of
-            Automation Composition Element
-          required: true
-          metadata:
-            common: 'true'
-        startPhase:
-          name: startPhase
-          type: integer
-          type_version: 0.0.0
-          description: A value indicating the start phase in which this automation
-            composition element will be started, the first start phase is zero. Automation
-            Composition Elements are started in their start_phase order and stopped
-            in reverse start phase order. Automation Composition Elements with the
-            same start phase are started and stopped simultaneously
-          required: false
-          constraints:
-          - greater_or_equal: '0'
-          metadata:
-            common: 'true'
-        uninitializedToPassiveTimeout:
-          name: uninitializedToPassiveTimeout
-          type: integer
-          type_version: 0.0.0
-          description: The maximum time in seconds to wait for a state chage from
-            uninitialized to passive
-          default: 60.0
-          required: false
-          constraints:
-          - greater_or_equal: '0'
-          metadata:
-            common: 'true'
-        passiveToRunningTimeout:
-          name: passiveToRunningTimeout
-          type: integer
-          type_version: 0.0.0
-          description: The maximum time in seconds to wait for a state chage from
-            passive to running
-          default: 60.0
-          required: false
-          constraints:
-          - greater_or_equal: '0'
-          metadata:
-            common: 'true'
-        runningToPassiveTimeout:
-          name: runningToPassiveTimeout
-          type: integer
-          type_version: 0.0.0
-          description: The maximum time in seconds to wait for a state chage from
-            running to passive
-          default: 60.0
-          required: false
-          constraints:
-          - greater_or_equal: '0'
-          metadata:
-            common: 'true'
-        passiveToUninitializedTimeout:
-          name: passiveToUninitializedTimeout
-          type: integer
-          type_version: 0.0.0
-          description: The maximum time in seconds to wait for a state chage from
-            passive to uninitialized
-          default: 60.0
-          required: false
-          constraints:
-          - greater_or_equal: '0'
-          metadata:
-            common: 'true'
-      name: org.onap.policy.clamp.acm.AutomationCompositionElement
-      version: 1.0.1
-      derived_from: tosca.nodetypes.Root
-      metadata: {}
-    org.onap.policy.clamp.acm.AutomationComposition:
-      properties:
-        provider:
-          name: provider
-          type: string
-          type_version: 0.0.0
-          description: Specifies the organization that provides the automation composition
-            element
-          required: false
-          metadata:
-            common: 'true'
-        elements:
-          name: elements
-          type: list
-          type_version: 0.0.0
-          description: Specifies a list of automation composition element definitions
-            that make up this automation composition definition
-          required: true
-          entry_schema:
-            type: onap.datatypes.ToscaConceptIdentifier
-            type_version: 0.0.0
-          metadata:
-            common: 'true'
-      name: org.onap.policy.clamp.acm.AutomationComposition
-      version: 1.0.1
-      derived_from: tosca.nodetypes.Root
-      metadata: {}
-    org.onap.policy.clamp.acm.HttpAutomationCompositionElement:
-      properties:
-        baseUrl:
-          name: baseUrl
-          type: string
-          type_version: 0.0.0
-          description: The base URL to be prepended to each path, identifies the host
-            for the REST endpoints.
-          required: true
-        httpHeaders:
-          name: httpHeaders
-          type: map
-          type_version: 0.0.0
-          description: HTTP headers to send on REST requests
-          required: false
-          entry_schema:
-            type: string
-            type_version: 0.0.0
-        configurationEntities:
-          name: configurationEntities
-          type: map
-          type_version: 0.0.0
-          description: The connfiguration entities the Automation Composition Element
-            is managing and their associated REST requests
-          required: true
-          entry_schema:
-            type: org.onap.datatypes.policy.clamp.acm.httpAutomationCompositionElement.ConfigurationEntity
-            type_version: 1.0.0
-      name: org.onap.policy.clamp.acm.HttpAutomationCompositionElement
-      version: 1.0.1
-      derived_from: org.onap.policy.clamp.acm.AutomationCompositionElement
-      metadata: {}
-  topology_template:
-    node_templates:
-      org.onap.policy.clamp.acm.HttpParticipant:
-        type: org.onap.policy.clamp.acm.Participant
-        type_version: 1.0.1
-        properties:
-          provider: ONAP
-        name: org.onap.policy.clamp.acm.HttpParticipant
-        version: 2.3.4
-        metadata: {}
-        description: Participant for Http requests
-      onap.policy.clamp.ac.element.Http_StarterAutomationCompositionElement:
-        type: org.onap.policy.clamp.acm.HttpAutomationCompositionElement
-        type_version: 1.0.1
-        properties:
-          provider: ONAP
-          participant_id:
-            name: HttpParticipant0
-            version: 1.0.0
-          participantType:
-            name: org.onap.policy.clamp.acm.HttpParticipant
-            version: 2.3.4
-          uninitializedToPassiveTimeout: 180
-          startPhase: 0
-          baseUrl: http://acelement-starter:8084
-          httpHeaders:
-            Content-Type: application/json
-            Authorization: Basic cnVudGltZVVzZXI6emIhWHp0RzM0
-          configurationEntities:
-          - configurationEntityId:
-              name: onap.policy.clamp.ac.starter
-              version: 1.0.0
-            restSequence:
-            - restRequestId:
-                name: request1
-                version: 1.0.1
-              httpMethod: POST
-              path: /onap/policy/clamp/acelement/v2/activate
-              body: '{ "receiverId": { "name": "onap.policy.clamp.ac.startertobridge",
-                "version": "1.0.0" }, "timerMs": 4000, "elementType": "STARTER", "topicParameterGroup":
-                { "server": "message-router", "listenerTopic": "POLICY_UPDATE_MSG",
-                "publisherTopic": "AC_ELEMENT_MSG", "fetchTimeout": 15000, "topicCommInfrastructure":
-                "dmaap" } }'
-              expectedResponse: 201
-        name: onap.policy.clamp.ac.element.Http_StarterAutomationCompositionElement
-        version: 1.2.3
-        metadata: {}
-        description: Automation composition element for the http requests of AC Element
-          Starter microservice
-      onap.policy.clamp.ac.element.Http_BridgeAutomationCompositionElement:
-        type: org.onap.policy.clamp.acm.HttpAutomationCompositionElement
-        type_version: 1.0.1
-        properties:
-          provider: ONAP
-          participant_id:
-            name: HttpParticipant0
+    - tosca_definitions_version: tosca_simple_yaml_1_3
+      data_types:
+          onap.datatypes.ToscaConceptIdentifier:
+              properties:
+                  name:
+                      name: name
+                      type: string
+                      type_version: 0.0.0
+                      required: true
+                  version:
+                      name: version
+                      type: string
+                      type_version: 0.0.0
+                      required: true
+              name: onap.datatypes.ToscaConceptIdentifier
+              version: 0.0.0
+              derived_from: tosca.datatypes.Root
+              metadata: {}
+          org.onap.datatypes.policy.clamp.acm.httpAutomationCompositionElement.RestRequest:
+            properties:
+                restRequestId:
+                    name: restRequestId
+                    type: onap.datatypes.ToscaConceptIdentifier
+                    type_version: 0.0.0
+                    description:
+                        The name and version of a REST request to be sent to a REST
+                        endpoint
+                    required: true
+                httpMethod:
+                    name: httpMethod
+                    type: string
+                    type_version: 0.0.0
+                    description: The REST method to use
+                    required: true
+                    constraints:
+                        - valid_values:
+                              - POST
+                              - PUT
+                              - GET
+                              - DELETE
+                path:
+                    name: path
+                    type: string
+                    type_version: 0.0.0
+                    description: The path of the REST request relative to the base URL
+                    required: true
+                body:
+                    name: body
+                    type: string
+                    type_version: 0.0.0
+                    description: The body of the REST request for PUT and POST requests
+                    required: false
+                expectedResponse:
+                    name: expectedResponse
+                    type: integer
+                    type_version: 0.0.0
+                    description: THe expected HTTP status code for the REST request
+                    required: true
+                    constraints: []
+            name: org.onap.datatypes.policy.clamp.acm.httpAutomationCompositionElement.RestRequest
             version: 1.0.0
-          participantType:
-            name: org.onap.policy.clamp.acm.HttpParticipant
-            version: 2.3.4
-          uninitializedToPassiveTimeout: 180
-          startPhase: 0
-          baseUrl: http://acelement-bridge:8084
-          httpHeaders:
-            Content-Type: application/json
-            Authorization: Basic cnVudGltZVVzZXI6emIhWHp0RzM0
-          configurationEntities:
-          - configurationEntityId:
-              name: onap.policy.clamp.ac.bridge
-              version: 1.0.0
-            restSequence:
-            - restRequestId:
-                name: request2
-                version: 1.0.1
-              httpMethod: POST
-              path: /onap/policy/clamp/acelement/v2/activate
-              body: '{ "receiverId": { "name": "onap.policy.clamp.ac.bridgetosink",
-                "version": "1.0.0" }, "timerMs": 4000, "elementType": "BRIDGE", "topicParameterGroup":
-                { "server": "message-router", "listenerTopic": "POLICY_UPDATE_MSG",
-                "publisherTopic": "AC_ELEMENT_MSG", "fetchTimeout": 15000, "topicCommInfrastructure":
-                "dmaap" } }'
-              expectedResponse: 201
-        name: onap.policy.clamp.ac.element.Http_BridgeAutomationCompositionElement
-        version: 1.2.3
-        metadata: {}
-        description: Automation composition element for the http requests of AC Element
-          Bridge microservice
-      onap.policy.clamp.ac.element.Http_SinkAutomationCompositionElement:
-        type: org.onap.policy.clamp.acm.HttpAutomationCompositionElement
-        type_version: 1.0.1
-        properties:
-          provider: ONAP
-          participant_id:
-            name: HttpParticipant0
+            derived_from: tosca.datatypes.Root
+            metadata: {}
+          org.onap.datatypes.policy.clamp.acm.httpAutomationCompositionElement.ConfigurationEntity:
+            properties:
+                configurationEntityId:
+                    name: configurationEntityId
+                    type: onap.datatypes.ToscaConceptIdentifier
+                    type_version: 0.0.0
+                    description:
+                        The name and version of a Configuration Entity to be handled
+                        by the HTTP Automation Composition Element
+                    required: true
+                restSequence:
+                    name: restSequence
+                    type: list
+                    type_version: 0.0.0
+                    description: A sequence of REST commands to send to the REST endpoint
+                    required: false
+                    entry_schema:
+                        type: org.onap.datatypes.policy.clamp.acm.httpAutomationCompositionElement.RestRequest
+                        type_version: 1.0.0
+            name: org.onap.datatypes.policy.clamp.acm.httpAutomationCompositionElement.ConfigurationEntity
             version: 1.0.0
-          participantType:
-            name: org.onap.policy.clamp.acm.HttpParticipant
-            version: 2.3.4
-          uninitializedToPassiveTimeout: 180
-          startPhase: 0
-          baseUrl: http://acelement-sink:8084
-          httpHeaders:
-            Content-Type: application/json
-            Authorization: Basic cnVudGltZVVzZXI6emIhWHp0RzM0
-          configurationEntities:
-          - configurationEntityId:
-              name: onap.policy.clamp.ac.sink
+            derived_from: tosca.datatypes.Root
+            metadata: {}
+      node_types:
+          org.onap.policy.clamp.acm.Participant:
+              properties:
+                  provider:
+                      name: provider
+                      type: string
+                      type_version: 0.0.0
+                      required: false
+              name: org.onap.policy.clamp.acm.Participant
+              version: 1.0.1
+              derived_from: tosca.nodetypes.Root
+              metadata: {}
+          org.onap.policy.clamp.acm.AutomationCompositionElement:
+              properties:
+                  provider:
+                      name: provider
+                      type: string
+                      type_version: 0.0.0
+                      description:
+                          Specifies the organization that provides the automation composition
+                          element
+                      required: false
+                      metadata:
+                          common: "true"
+                  startPhase:
+                      name: startPhase
+                      type: integer
+                      type_version: 0.0.0
+                      description:
+                          A value indicating the start phase in which this automation
+                          composition element will be started, the first start phase is zero. Automation
+                          Composition Elements are started in their start_phase order and stopped
+                          in reverse start phase order. Automation Composition Elements with the
+                          same start phase are started and stopped simultaneously
+                      required: false
+                      constraints:
+                          - greater_or_equal: "0"
+                      metadata:
+                          common: "true"
+                  uninitializedToPassiveTimeout:
+                      name: uninitializedToPassiveTimeout
+                      type: integer
+                      type_version: 0.0.0
+                      description:
+                          The maximum time in seconds to wait for a state chage from
+                          uninitialized to passive
+                      default: 60.0
+                      required: false
+                      constraints:
+                          - greater_or_equal: "0"
+                      metadata:
+                          common: "true"
+              name: org.onap.policy.clamp.acm.AutomationCompositionElement
+              version: 1.0.1
+              derived_from: tosca.nodetypes.Root
+              metadata: {}
+          org.onap.policy.clamp.acm.AutomationComposition:
+              properties:
+                  provider:
+                      name: provider
+                      type: string
+                      type_version: 0.0.0
+                      description:
+                          Specifies the organization that provides the automation composition
+                          element
+                      required: false
+                      metadata:
+                          common: "true"
+                  elements:
+                      name: elements
+                      type: list
+                      type_version: 0.0.0
+                      description:
+                          Specifies a list of automation composition element definitions
+                          that make up this automation composition definition
+                      required: true
+                      entry_schema:
+                          type: onap.datatypes.ToscaConceptIdentifier
+                          type_version: 0.0.0
+                      metadata:
+                          common: "true"
+              name: org.onap.policy.clamp.acm.AutomationComposition
+              version: 1.0.1
+              derived_from: tosca.nodetypes.Root
+              metadata: {}
+          org.onap.policy.clamp.acm.HttpAutomationCompositionElement:
+              properties:
+                  baseUrl:
+                      name: baseUrl
+                      type: string
+                      type_version: 0.0.0
+                      description:
+                          The base URL to be prepended to each path, identifies the host
+                          for the REST endpoints.
+                      required: true
+                  httpHeaders:
+                      name: httpHeaders
+                      type: map
+                      type_version: 0.0.0
+                      description: HTTP headers to send on REST requests
+                      required: false
+                      entry_schema:
+                          type: string
+                          type_version: 0.0.0
+                  configurationEntities:
+                      name: configurationEntities
+                      type: map
+                      type_version: 0.0.0
+                      description:
+                          The connfiguration entities the Automation Composition Element
+                          is managing and their associated REST requests
+                      required: true
+                      entry_schema:
+                          type: org.onap.datatypes.policy.clamp.acm.httpAutomationCompositionElement.ConfigurationEntity
+                          type_version: 1.0.0
+              name: org.onap.policy.clamp.acm.HttpAutomationCompositionElement
               version: 1.0.0
-            restSequence:
-            - restRequestId:
-                name: request3
-                version: 1.0.1
-              httpMethod: POST
-              path: /onap/policy/clamp/acelement/v2/activate
-              body: '{ "receiverId": { "name": "onap.policy.clamp.ac.sink", "version":
-                "1.0.0" }, "timerMs": 4000, "elementType": "SINK", "topicParameterGroup":
-                { "server": "message-router", "listenerTopic": "POLICY_UPDATE_MSG",
-                "publisherTopic": "AC_ELEMENT_MSG", "fetchTimeout": 15000, "topicCommInfrastructure":
-                "dmaap" } }'
-              expectedResponse: 201
-        name: onap.policy.clamp.ac.element.Http_SinkAutomationCompositionElement
-        version: 1.2.3
-        metadata: {}
-        description: Automation composition element for the http requests of AC Element
-          Sink microservice
-      onap.policy.clamp.ac.element.AutomationCompositionDefinition:
-        type: org.onap.policy.clamp.acm.AutomationComposition
-        type_version: 1.0.1
-        properties:
-          provider: ONAP
-          elements:
-          - name: onap.policy.clamp.ac.element.Http_StarterAutomationCompositionElement
-            version: 1.2.3
-          - name: onap.policy.clamp.ac.element.Http_BridgeAutomationCompositionElement
-            version: 1.2.3
-          - name: onap.policy.clamp.ac.element.Http_SinkAutomationCompositionElement
-            version: 1.2.3
-        name: onap.policy.clamp.ac.element.AutomationCompositionDefinition
-        version: 1.2.3
-        metadata: {}
-        description: Automation composition for Demp
-  name: tosca
-  version: 1.0.0
-  metadata: {}
+              derived_from: org.onap.policy.clamp.acm.AutomationCompositionElement
+              metadata: {}
+      topology_template:
+          node_templates:
+              org.onap.policy.clamp.acm.HttpParticipant:
+                  type: org.onap.policy.clamp.acm.Participant
+                  type_version: 1.0.1
+                  properties:
+                      provider: ONAP
+                  name: org.onap.policy.clamp.acm.HttpParticipant
+                  version: 2.3.4
+                  metadata: {}
+                  description: Participant for Http requests
+              onap.policy.clamp.ac.element.Http_StarterAutomationCompositionElement:
+                type: org.onap.policy.clamp.acm.HttpAutomationCompositionElement
+                type_version: 1.0.0
+                properties:
+                    provider: ONAP
+                    uninitializedToPassiveTimeout: 180
+                    startPhase: 0
+                    baseUrl: http://acelement-starter:8084
+                    httpHeaders:
+                        Content-Type: application/json
+                        Authorization: Basic cnVudGltZVVzZXI6emIhWHp0RzM0
+                    configurationEntities:
+                        - configurationEntityId:
+                              name: onap.policy.clamp.ac.starter
+                              version: 1.0.0
+                          restSequence:
+                              - restRequestId:
+                                    name: request1
+                                    version: 1.0.1
+                                httpMethod: POST
+                                path: /onap/policy/clamp/acelement/v2/activate
+                                body:
+                                    '{ "receiverId": { "name": "onap.policy.clamp.ac.startertobridge",
+                                    "version": "1.0.0" }, "timerMs": 4000, "elementType": "STARTER", "topicParameterGroup":
+                                    { "server": "message-router", "listenerTopic": "POLICY_UPDATE_MSG",
+                                    "publisherTopic": "AC_ELEMENT_MSG", "fetchTimeout": 15000, "topicCommInfrastructure":
+                                    "dmaap" } }'
+                                expectedResponse: 201
+                name: onap.policy.clamp.ac.element.Http_StarterAutomationCompositionElement
+                version: 1.2.3
+                metadata: {}
+                description:
+                    Automation composition element for the http requests of AC Element
+                    Starter microservice
+              onap.policy.clamp.ac.element.Http_BridgeAutomationCompositionElement:
+                type: org.onap.policy.clamp.acm.HttpAutomationCompositionElement
+                type_version: 1.0.0
+                properties:
+                    provider: ONAP
+                    uninitializedToPassiveTimeout: 180
+                    startPhase: 0
+                    baseUrl: http://acelement-bridge:8084
+                    httpHeaders:
+                        Content-Type: application/json
+                        Authorization: Basic cnVudGltZVVzZXI6emIhWHp0RzM0
+                    configurationEntities:
+                        - configurationEntityId:
+                              name: onap.policy.clamp.ac.bridge
+                              version: 1.0.0
+                          restSequence:
+                              - restRequestId:
+                                    name: request2
+                                    version: 1.0.1
+                                httpMethod: POST
+                                path: /onap/policy/clamp/acelement/v2/activate
+                                body:
+                                    '{ "receiverId": { "name": "onap.policy.clamp.ac.bridgetosink",
+                                    "version": "1.0.0" }, "timerMs": 4000, "elementType": "BRIDGE", "topicParameterGroup":
+                                    { "server": "message-router", "listenerTopic": "POLICY_UPDATE_MSG",
+                                    "publisherTopic": "AC_ELEMENT_MSG", "fetchTimeout": 15000, "topicCommInfrastructure":
+                                    "dmaap" } }'
+                                expectedResponse: 201
+                name: onap.policy.clamp.ac.element.Http_BridgeAutomationCompositionElement
+                version: 1.2.3
+                metadata: {}
+                description:
+                    Automation composition element for the http requests of AC Element
+                    Bridge microservice
+              onap.policy.clamp.ac.element.Http_SinkAutomationCompositionElement:
+                type: org.onap.policy.clamp.acm.HttpAutomationCompositionElement
+                type_version: 1.0.0
+                properties:
+                    provider: ONAP
+                    uninitializedToPassiveTimeout: 180
+                    startPhase: 0
+                    baseUrl: http://acelement-sink:8084
+                    httpHeaders:
+                        Content-Type: application/json
+                        Authorization: Basic cnVudGltZVVzZXI6emIhWHp0RzM0
+                    configurationEntities:
+                        - configurationEntityId:
+                              name: onap.policy.clamp.ac.sink
+                              version: 1.0.0
+                          restSequence:
+                              - restRequestId:
+                                    name: request3
+                                    version: 1.0.1
+                                httpMethod: POST
+                                path: /onap/policy/clamp/acelement/v2/activate
+                                body:
+                                    '{ "receiverId": { "name": "onap.policy.clamp.ac.sink", "version":
+                                    "1.0.0" }, "timerMs": 4000, "elementType": "SINK", "topicParameterGroup":
+                                    { "server": "message-router", "listenerTopic": "POLICY_UPDATE_MSG",
+                                    "publisherTopic": "AC_ELEMENT_MSG", "fetchTimeout": 15000, "topicCommInfrastructure":
+                                    "dmaap" } }'
+                                expectedResponse: 201
+                name: onap.policy.clamp.ac.element.Http_SinkAutomationCompositionElement
+                version: 1.2.3
+                metadata: {}
+                description:
+                    Automation composition element for the http requests of AC Element
+                    Sink microservice
+              onap.policy.clamp.ac.element.AutomationCompositionDefinition:
+                  type: org.onap.policy.clamp.acm.AutomationComposition
+                  type_version: 1.0.1
+                  properties:
+                      provider: ONAP
+                      elements:
+                          - name: onap.policy.clamp.ac.element.Http_StarterAutomationCompositionElement
+                            version: 1.2.3
+                          - name: onap.policy.clamp.ac.element.Http_BridgeAutomationCompositionElement
+                            version: 1.2.3
+                          - name: onap.policy.clamp.ac.element.Http_SinkAutomationCompositionElement
+                            version: 1.2.3
+                  name: onap.policy.clamp.ac.element.AutomationCompositionDefinition
+                  version: 1.2.3
+                  metadata: {}
+                  description: Automation composition for Demp
+          policies: []
+      name: tosca
+      version: 1.0.0
+      metadata:
+          compositionId: 562ed027-2689-481a-b3a5-e284b1fbc33f
diff --git a/runtime-acm/src/main/resources/openapi/examples/getAllCompositionInstancesResponse.json b/runtime-acm/src/main/resources/openapi/examples/getAllCompositionInstancesResponse.json
index a1d0a999d..a79b66de7 100644..100755
--- a/runtime-acm/src/main/resources/openapi/examples/getAllCompositionInstancesResponse.json
+++ b/runtime-acm/src/main/resources/openapi/examples/getAllCompositionInstancesResponse.json
@@ -1,9 +1,10 @@
 {
     "automationCompositionList": [
         {
+            "instanceId": "caf50cde-11a2-4915-a49c-609762714a6f",
             "compositionId": "562ed027-2689-481a-b3a5-e284b1fbc33f",
-            "state": "UNINITIALISED",
-            "orderedState": "UNINITIALISED",
+            "deployState": "DEPLOYED",
+            "lockState": "LOCKED",
             "elements": {
                 "709c62b3-8918-41b9-a747-d21eb79c6c23": {
                     "id": "709c62b3-8918-41b9-a747-d21eb79c6c23",
@@ -11,53 +12,125 @@
                         "name": "onap.policy.clamp.ac.element.Http_SinkAutomationCompositionElement",
                         "version": "1.2.3"
                     },
-                    "participantType": {
-                        "name": "org.onap.policy.clamp.acm.HttpParticipant",
-                        "version": "2.3.4"
-                    },
-                    "participantId": "101c62b3-8918-41b9-a747-d21eb79c6c01",
-                    "state": "UNINITIALISED",
-                    "orderedState": "UNINITIALISED",
+                    "participantId": "101c62b3-8918-41b9-a747-d21eb79c6c91",
+                    "deployState": "DEPLOYED",
+                    "lockState": "LOCKED",
                     "description": "Sink Automation Composition Element for the Demo",
-                    "propertiesMap": {}
+                    "message": "Deployed",
+                    "properties": {
+                        "baseUrl": "http://10.101.0.249:30802",
+                        "httpHeaders": {
+                            "Content-Type": "application/json",
+                            "Authorization": "Basic YWNtVXNlcjp6YiFYenRHMzQ="
+                        },
+                        "configurationEntities": [
+                            {
+                                "configurationEntityId": {
+                                    "name": "onap.policy.clamp.ac.sink",
+                                    "version": "1.0.0"
+                                },
+                                "restSequence": [
+                                    {
+                                        "restRequestId": {
+                                            "name": "request3",
+                                            "version": "1.0.1"
+                                        },
+                                        "httpMethod": "POST",
+                                        "path": "/activate",
+                                        "body": "{ \"receiverId\": { \"name\": \"onap.policy.clamp.ac.sink\", \"version\": \"1.0.0\" }, \"timerMs\": 20000, \"elementType\": \"SINK\", \"topicParameterGroup\": { \"server\": \"message-router\", \"listenerTopic\": \"POLICY_UPDATE_MSG\", \"publisherTopic\": \"AC_ELEMENT_MSG\", \"fetchTimeout\": 15000, \"topicCommInfrastructure\": \"dmaap\" } }",
+                                        "expectedResponse": 201
+                                    }
+                                ]
+                            }
+                        ]
+                    },
+                    "outProperties": {}
                 },
-                "709c62b3-8918-41b9-a747-d21eb79c6c25": {
-                    "id": "709c62b3-8918-41b9-a747-d21eb79c6c25",
+                "709c62b3-8918-41b9-a747-d21eb79c6c24": {
+                    "id": "709c62b3-8918-41b9-a747-d21eb79c6c24",
                     "definition": {
-                        "name": "onap.policy.clamp.ac.element.Http_BridgeAutomationCompositionElement",
+                        "name": "onap.policy.clamp.ac.element.Http_StarterAutomationCompositionElement",
                         "version": "1.2.3"
                     },
-                    "participantType": {
-                        "name": "org.onap.policy.clamp.acm.HttpParticipant",
-                        "version": "2.3.4"
+                    "participantId": "101c62b3-8918-41b9-a747-d21eb79c6c91",
+                    "deployState": "DEPLOYED",
+                    "lockState": "LOCKED",
+                    "description": "Starter Automation Composition Element for the Demo",
+                    "message": "Deployed",
+                    "properties": {
+                        "baseUrl": "http://10.101.0.249:30800",
+                        "httpHeaders": {
+                            "Content-Type": "application/json",
+                            "Authorization": "Basic YWNtVXNlcjp6YiFYenRHMzQ="
+                        },
+                        "configurationEntities": [
+                            {
+                                "configurationEntityId": {
+                                    "name": "onap.policy.clamp.ac.starter",
+                                    "version": "1.0.0"
+                                },
+                                "restSequence": [
+                                    {
+                                        "restRequestId": {
+                                            "name": "request1",
+                                            "version": "1.0.1"
+                                        },
+                                        "httpMethod": "POST",
+                                        "path": "/activate",
+                                        "body": "{ \"receiverId\": { \"name\": \"onap.policy.clamp.ac.startertobridge\", \"version\": \"1.0.0\" }, \"timerMs\": 20000, \"elementType\": \"STARTER\", \"topicParameterGroup\": { \"server\": \"message-router:3904\", \"listenerTopic\": \"POLICY_UPDATE_MSG\", \"publisherTopic\": \"AC_ELEMENT_MSG\", \"fetchTimeout\": 15000, \"topicCommInfrastructure\": \"dmaap\" } }",
+                                        "expectedResponse": 201
+                                    }
+                                ]
+                            }
+                        ]
                     },
-                    "participantId": "101c62b3-8918-41b9-a747-d21eb79c6c01",
-                    "state": "UNINITIALISED",
-                    "orderedState": "UNINITIALISED",
-                    "description": "Bridge Automation Composition Element for the Demo",
-                    "propertiesMap": {}
+                    "outProperties": {}
                 },
-                "709c62b3-8918-41b9-a747-d21eb79c6c24": {
-                    "id": "709c62b3-8918-41b9-a747-d21eb79c6c24",
+                "709c62b3-8918-41b9-a747-d21eb79c6c25": {
+                    "id": "709c62b3-8918-41b9-a747-d21eb79c6c25",
                     "definition": {
-                        "name": "onap.policy.clamp.ac.element.Http_StarterAutomationCompositionElement",
+                        "name": "onap.policy.clamp.ac.element.Http_BridgeAutomationCompositionElement",
                         "version": "1.2.3"
                     },
-                    "participantType": {
-                        "name": "org.onap.policy.clamp.acm.HttpParticipant",
-                        "version": "2.3.4"
+                    "participantId": "101c62b3-8918-41b9-a747-d21eb79c6c91",
+                    "deployState": "DEPLOYED",
+                    "lockState": "LOCKED",
+                    "description": "Bridge Automation Composition Element for the Demo",
+                    "message": "Deployed",
+                    "properties": {
+                        "baseUrl": "http://10.101.0.249:30801",
+                        "httpHeaders": {
+                            "Content-Type": "application/json",
+                            "Authorization": "Basic YWNtVXNlcjp6YiFYenRHMzQ="
+                        },
+                        "configurationEntities": [
+                            {
+                                "configurationEntityId": {
+                                    "name": "onap.policy.clamp.ac.bridge",
+                                    "version": "1.0.0"
+                                },
+                                "restSequence": [
+                                    {
+                                        "restRequestId": {
+                                            "name": "request2",
+                                            "version": "1.0.1"
+                                        },
+                                        "httpMethod": "POST",
+                                        "path": "/activate",
+                                        "body": "{ \"receiverId\": { \"name\": \"onap.policy.clamp.ac.bridgetosink\", \"version\": \"1.0.0\" }, \"timerMs\": 20000, \"elementType\": \"BRIDGE\", \"topicParameterGroup\": { \"server\": \"message-router:3904\", \"listenerTopic\": \"POLICY_UPDATE_MSG\", \"publisherTopic\": \"AC_ELEMENT_MSG\", \"fetchTimeout\": 15000, \"topicCommInfrastructure\": \"dmaap\" } }",
+                                        "expectedResponse": 201
+                                    }
+                                ]
+                            }
+                        ]
                     },
-                    "participantId": "101c62b3-8918-41b9-a747-d21eb79c6c01",
-                    "state": "UNINITIALISED",
-                    "orderedState": "UNINITIALISED",
-                    "description": "Starter Automation Composition Element for the Demo",
-                    "propertiesMap": {}
+                    "outProperties": {}
                 }
             },
-            "primed": false,
+            "stateChangeResult": "NO_ERROR",
             "name": "InstanceHttp",
             "version": "1.0.1",
             "description": "Demo automation composition instance Http"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/runtime-acm/src/main/resources/openapi/examples/getAllCompositionInstancesResponse.yaml b/runtime-acm/src/main/resources/openapi/examples/getAllCompositionInstancesResponse.yaml
index 3b007fda6..3bf76f98f 100644..100755
--- a/runtime-acm/src/main/resources/openapi/examples/getAllCompositionInstancesResponse.yaml
+++ b/runtime-acm/src/main/resources/openapi/examples/getAllCompositionInstancesResponse.yaml
@@ -1,48 +1,109 @@
 automationCompositionList:
-- compositionId: 562ed027-2689-481a-b3a5-e284b1fbc33f
-  state: UNINITIALISED
-  orderedState: UNINITIALISED
-  elements:
-    709c62b3-8918-41b9-a747-d21eb79c6c23:
-      id: 709c62b3-8918-41b9-a747-d21eb79c6c23
-      definition:
-        name: onap.policy.clamp.ac.element.Http_SinkAutomationCompositionElement
-        version: 1.2.3
-      participantType:
-        name: org.onap.policy.clamp.acm.HttpParticipant
-        version: 2.3.4
-      participantId: 101c62b3-8918-41b9-a747-d21eb79c6c01
-      state: UNINITIALISED
-      orderedState: UNINITIALISED
-      description: Sink Automation Composition Element for the Demo
-      propertiesMap: {}
-    709c62b3-8918-41b9-a747-d21eb79c6c25:
-      id: 709c62b3-8918-41b9-a747-d21eb79c6c25
-      definition:
-        name: onap.policy.clamp.ac.element.Http_BridgeAutomationCompositionElement
-        version: 1.2.3
-      participantType:
-        name: org.onap.policy.clamp.acm.HttpParticipant
-        version: 2.3.4
-      participantId: 101c62b3-8918-41b9-a747-d21eb79c6c01
-      state: UNINITIALISED
-      orderedState: UNINITIALISED
-      description: Bridge Automation Composition Element for the Demo
-      propertiesMap: {}
-    709c62b3-8918-41b9-a747-d21eb79c6c24:
-      id: 709c62b3-8918-41b9-a747-d21eb79c6c24
-      definition:
-        name: onap.policy.clamp.ac.element.Http_StarterAutomationCompositionElement
-        version: 1.2.3
-      participantType:
-        name: org.onap.policy.clamp.acm.HttpParticipant
-        version: 2.3.4
-      participantId: 101c62b3-8918-41b9-a747-d21eb79c6c01
-      state: UNINITIALISED
-      orderedState: UNINITIALISED
-      description: Starter Automation Composition Element for the Demo
-      propertiesMap: {}
-  primed: false
-  name: InstanceHttp
-  version: 1.0.1
-  description: Demo automation composition instance Http
+    - instanceId: caf50cde-11a2-4915-a49c-609762714a6f
+      compositionId: 562ed027-2689-481a-b3a5-e284b1fbc33f
+      deployState: DEPLOYED
+      lockState: LOCKED
+      elements:
+          709c62b3-8918-41b9-a747-d21eb79c6c23:
+              id: 709c62b3-8918-41b9-a747-d21eb79c6c23
+              definition:
+                  name: onap.policy.clamp.ac.element.Http_SinkAutomationCompositionElement
+                  version: 1.2.3
+              participantId: 101c62b3-8918-41b9-a747-d21eb79c6c91
+              deployState: DEPLOYED
+              lockState: LOCKED
+              description: Sink Automation Composition Element for the Demo
+              message: Deployed
+              properties:
+                  baseUrl: http://10.101.0.249:30802
+                  httpHeaders:
+                      Content-Type: application/json
+                      Authorization: Basic YWNtVXNlcjp6YiFYenRHMzQ=
+                  configurationEntities:
+                      - configurationEntityId:
+                            name: onap.policy.clamp.ac.sink
+                            version: 1.0.0
+                        restSequence:
+                            - restRequestId:
+                                  name: request3
+                                  version: 1.0.1
+                              httpMethod: POST
+                              path: /activate
+                              body:
+                                  '{ "receiverId": { "name": "onap.policy.clamp.ac.sink", "version":
+                                  "1.0.0" }, "timerMs": 20000, "elementType": "SINK", "topicParameterGroup":
+                                  { "server": "message-router", "listenerTopic": "POLICY_UPDATE_MSG",
+                                  "publisherTopic": "AC_ELEMENT_MSG", "fetchTimeout": 15000, "topicCommInfrastructure":
+                                  "dmaap" } }'
+                              expectedResponse: 201
+              outProperties: {}
+          709c62b3-8918-41b9-a747-d21eb79c6c24:
+              id: 709c62b3-8918-41b9-a747-d21eb79c6c24
+              definition:
+                  name: onap.policy.clamp.ac.element.Http_StarterAutomationCompositionElement
+                  version: 1.2.3
+              participantId: 101c62b3-8918-41b9-a747-d21eb79c6c91
+              deployState: DEPLOYED
+              lockState: LOCKED
+              description: Starter Automation Composition Element for the Demo
+              message: Deployed
+              properties:
+                  baseUrl: http://10.101.0.249:30800
+                  httpHeaders:
+                      Content-Type: application/json
+                      Authorization: Basic YWNtVXNlcjp6YiFYenRHMzQ=
+                  configurationEntities:
+                      - configurationEntityId:
+                            name: onap.policy.clamp.ac.starter
+                            version: 1.0.0
+                        restSequence:
+                            - restRequestId:
+                                  name: request1
+                                  version: 1.0.1
+                              httpMethod: POST
+                              path: /activate
+                              body:
+                                  '{ "receiverId": { "name": "onap.policy.clamp.ac.startertobridge",
+                                  "version": "1.0.0" }, "timerMs": 20000, "elementType": "STARTER", "topicParameterGroup":
+                                  { "server": "message-router:3904", "listenerTopic": "POLICY_UPDATE_MSG",
+                                  "publisherTopic": "AC_ELEMENT_MSG", "fetchTimeout": 15000, "topicCommInfrastructure":
+                                  "dmaap" } }'
+                              expectedResponse: 201
+              outProperties: {}
+          709c62b3-8918-41b9-a747-d21eb79c6c25:
+              id: 709c62b3-8918-41b9-a747-d21eb79c6c25
+              definition:
+                  name: onap.policy.clamp.ac.element.Http_BridgeAutomationCompositionElement
+                  version: 1.2.3
+              participantId: 101c62b3-8918-41b9-a747-d21eb79c6c91
+              deployState: DEPLOYED
+              lockState: LOCKED
+              description: Bridge Automation Composition Element for the Demo
+              message: Deployed
+              properties:
+                  baseUrl: http://10.101.0.249:30801
+                  httpHeaders:
+                      Content-Type: application/json
+                      Authorization: Basic YWNtVXNlcjp6YiFYenRHMzQ=
+                  configurationEntities:
+                      - configurationEntityId:
+                            name: onap.policy.clamp.ac.bridge
+                            version: 1.0.0
+                        restSequence:
+                            - restRequestId:
+                                  name: request2
+                                  version: 1.0.1
+                              httpMethod: POST
+                              path: /activate
+                              body:
+                                  '{ "receiverId": { "name": "onap.policy.clamp.ac.bridgetosink",
+                                  "version": "1.0.0" }, "timerMs": 20000, "elementType": "BRIDGE", "topicParameterGroup":
+                                  { "server": "message-router:3904", "listenerTopic": "POLICY_UPDATE_MSG",
+                                  "publisherTopic": "AC_ELEMENT_MSG", "fetchTimeout": 15000, "topicCommInfrastructure":
+                                  "dmaap" } }'
+                              expectedResponse: 201
+              outProperties: {}
+      stateChangeResult: NO_ERROR
+      name: InstanceHttp
+      version: 1.0.1
+      description: Demo automation composition instance Http
diff --git a/runtime-acm/src/main/resources/openapi/examples/getCompositionInstancesResponse.json b/runtime-acm/src/main/resources/openapi/examples/getCompositionInstancesResponse.json
index 55b99b28c..8365fd21f 100644..100755
--- a/runtime-acm/src/main/resources/openapi/examples/getCompositionInstancesResponse.json
+++ b/runtime-acm/src/main/resources/openapi/examples/getCompositionInstancesResponse.json
@@ -1,72 +1,132 @@
 {
-    "automationCompositionList": [
-        {
-            "compositionId": "562ed027-2689-481a-b3a5-e284b1fbc33f",
-            "state": "UNINITIALISED",
-            "orderedState": "UNINITIALISED",
-            "elements": {
-                "709c62b3-8918-41b9-a747-d21eb79c6c23": {
-                    "id": "709c62b3-8918-41b9-a747-d21eb79c6c23",
-                    "definition": {
-                        "name": "onap.policy.clamp.ac.element.Http_SinkAutomationCompositionElement",
-                        "version": "1.2.3"
-                    },
-                    "participantType": {
-                        "name": "org.onap.policy.clamp.acm.HttpParticipant",
-                        "version": "2.3.4"
-                    },
-                    "participantId": {
-                        "name": "HttpParticipant0",
-                        "version": "1.0.0"
-                    },
-                    "state": "UNINITIALISED",
-                    "orderedState": "UNINITIALISED",
-                    "description": "Sink Automation Composition Element for the Demo",
-                    "propertiesMap": {}
+    "instanceId": "caf50cde-11a2-4915-a49c-609762714a6f",
+    "compositionId": "562ed027-2689-481a-b3a5-e284b1fbc33f",
+    "deployState": "DEPLOYED",
+    "lockState": "LOCKED",
+    "elements": {
+        "709c62b3-8918-41b9-a747-d21eb79c6c23": {
+            "id": "709c62b3-8918-41b9-a747-d21eb79c6c23",
+            "definition": {
+                "name": "onap.policy.clamp.ac.element.Http_SinkAutomationCompositionElement",
+                "version": "1.2.3"
+            },
+            "participantId": "101c62b3-8918-41b9-a747-d21eb79c6c91",
+            "deployState": "DEPLOYED",
+            "lockState": "LOCKED",
+            "description": "Sink Automation Composition Element for the Demo",
+            "message": "Deployed",
+            "properties": {
+                "baseUrl": "http://10.101.0.249:30802",
+                "httpHeaders": {
+                    "Content-Type": "application/json",
+                    "Authorization": "Basic YWNtVXNlcjp6YiFYenRHMzQ="
+                },
+                "configurationEntities": [
+                    {
+                        "configurationEntityId": {
+                            "name": "onap.policy.clamp.ac.sink",
+                            "version": "1.0.0"
+                        },
+                        "restSequence": [
+                            {
+                                "restRequestId": {
+                                    "name": "request3",
+                                    "version": "1.0.1"
+                                },
+                                "httpMethod": "POST",
+                                "path": "/activate",
+                                "body": "{ \"receiverId\": { \"name\": \"onap.policy.clamp.ac.sink\", \"version\": \"1.0.0\" }, \"timerMs\": 20000, \"elementType\": \"SINK\", \"topicParameterGroup\": { \"server\": \"message-router\", \"listenerTopic\": \"POLICY_UPDATE_MSG\", \"publisherTopic\": \"AC_ELEMENT_MSG\", \"fetchTimeout\": 15000, \"topicCommInfrastructure\": \"dmaap\" } }",
+                                "expectedResponse": 201
+                            }
+                        ]
+                    }
+                ]
+            },
+            "outProperties": {}
+        },
+        "709c62b3-8918-41b9-a747-d21eb79c6c24": {
+            "id": "709c62b3-8918-41b9-a747-d21eb79c6c24",
+            "definition": {
+                "name": "onap.policy.clamp.ac.element.Http_StarterAutomationCompositionElement",
+                "version": "1.2.3"
+            },
+            "participantId": "101c62b3-8918-41b9-a747-d21eb79c6c91",
+            "deployState": "DEPLOYED",
+            "lockState": "LOCKED",
+            "description": "Starter Automation Composition Element for the Demo",
+            "message": "Deployed",
+            "properties": {
+                "baseUrl": "http://10.101.0.249:30800",
+                "httpHeaders": {
+                    "Content-Type": "application/json",
+                    "Authorization": "Basic YWNtVXNlcjp6YiFYenRHMzQ="
                 },
-                "709c62b3-8918-41b9-a747-d21eb79c6c25": {
-                    "id": "709c62b3-8918-41b9-a747-d21eb79c6c25",
-                    "definition": {
-                        "name": "onap.policy.clamp.ac.element.Http_BridgeAutomationCompositionElement",
-                        "version": "1.2.3"
-                    },
-                    "participantType": {
-                        "name": "org.onap.policy.clamp.acm.HttpParticipant",
-                        "version": "2.3.4"
-                    },
-                    "participantId": {
-                        "name": "HttpParticipant0",
-                        "version": "1.0.0"
-                    },
-                    "state": "UNINITIALISED",
-                    "orderedState": "UNINITIALISED",
-                    "description": "Bridge Automation Composition Element for the Demo",
-                    "propertiesMap": {}
+                "configurationEntities": [
+                    {
+                        "configurationEntityId": {
+                            "name": "onap.policy.clamp.ac.starter",
+                            "version": "1.0.0"
+                        },
+                        "restSequence": [
+                            {
+                                "restRequestId": {
+                                    "name": "request1",
+                                    "version": "1.0.1"
+                                },
+                                "httpMethod": "POST",
+                                "path": "/activate",
+                                "body": "{ \"receiverId\": { \"name\": \"onap.policy.clamp.ac.startertobridge\", \"version\": \"1.0.0\" }, \"timerMs\": 20000, \"elementType\": \"STARTER\", \"topicParameterGroup\": { \"server\": \"message-router:3904\", \"listenerTopic\": \"POLICY_UPDATE_MSG\", \"publisherTopic\": \"AC_ELEMENT_MSG\", \"fetchTimeout\": 15000, \"topicCommInfrastructure\": \"dmaap\" } }",
+                                "expectedResponse": 201
+                            }
+                        ]
+                    }
+                ]
+            },
+            "outProperties": {}
+        },
+        "709c62b3-8918-41b9-a747-d21eb79c6c25": {
+            "id": "709c62b3-8918-41b9-a747-d21eb79c6c25",
+            "definition": {
+                "name": "onap.policy.clamp.ac.element.Http_BridgeAutomationCompositionElement",
+                "version": "1.2.3"
+            },
+            "participantId": "101c62b3-8918-41b9-a747-d21eb79c6c91",
+            "deployState": "DEPLOYED",
+            "lockState": "LOCKED",
+            "description": "Bridge Automation Composition Element for the Demo",
+            "message": "Deployed",
+            "properties": {
+                "baseUrl": "http://10.101.0.249:30801",
+                "httpHeaders": {
+                    "Content-Type": "application/json",
+                    "Authorization": "Basic YWNtVXNlcjp6YiFYenRHMzQ="
                 },
-                "709c62b3-8918-41b9-a747-d21eb79c6c24": {
-                    "id": "709c62b3-8918-41b9-a747-d21eb79c6c24",
-                    "definition": {
-                        "name": "onap.policy.clamp.ac.element.Http_StarterAutomationCompositionElement",
-                        "version": "1.2.3"
-                    },
-                    "participantType": {
-                        "name": "org.onap.policy.clamp.acm.HttpParticipant",
-                        "version": "2.3.4"
-                    },
-                    "participantId": {
-                        "name": "HttpParticipant0",
-                        "version": "1.0.0"
-                    },
-                    "state": "UNINITIALISED",
-                    "orderedState": "UNINITIALISED",
-                    "description": "Starter Automation Composition Element for the Demo",
-                    "propertiesMap": {}
-                }
+                "configurationEntities": [
+                    {
+                        "configurationEntityId": {
+                            "name": "onap.policy.clamp.ac.bridge",
+                            "version": "1.0.0"
+                        },
+                        "restSequence": [
+                            {
+                                "restRequestId": {
+                                    "name": "request2",
+                                    "version": "1.0.1"
+                                },
+                                "httpMethod": "POST",
+                                "path": "/activate",
+                                "body": "{ \"receiverId\": { \"name\": \"onap.policy.clamp.ac.bridgetosink\", \"version\": \"1.0.0\" }, \"timerMs\": 20000, \"elementType\": \"BRIDGE\", \"topicParameterGroup\": { \"server\": \"message-router:3904\", \"listenerTopic\": \"POLICY_UPDATE_MSG\", \"publisherTopic\": \"AC_ELEMENT_MSG\", \"fetchTimeout\": 15000, \"topicCommInfrastructure\": \"dmaap\" } }",
+                                "expectedResponse": 201
+                            }
+                        ]
+                    }
+                ]
             },
-            "primed": false,
-            "name": "InstanceHttp",
-            "version": "1.0.1",
-            "description": "Demo automation composition instance Http"
+            "outProperties": {}
         }
-    ]
+    },
+    "stateChangeResult": "NO_ERROR",
+    "name": "InstanceHttp",
+    "version": "1.0.1",
+    "description": "Demo automation composition instance Http"
 }
\ No newline at end of file
diff --git a/runtime-acm/src/main/resources/openapi/examples/getCompositionInstancesResponse.yaml b/runtime-acm/src/main/resources/openapi/examples/getCompositionInstancesResponse.yaml
index 3fa6506ea..2b962af9c 100644..100755
--- a/runtime-acm/src/main/resources/openapi/examples/getCompositionInstancesResponse.yaml
+++ b/runtime-acm/src/main/resources/openapi/examples/getCompositionInstancesResponse.yaml
@@ -1,54 +1,108 @@
-automationCompositionList:
-- compositionId: 562ed027-2689-481a-b3a5-e284b1fbc33f
-  state: UNINITIALISED
-  orderedState: UNINITIALISED
-  elements:
+instanceId: caf50cde-11a2-4915-a49c-609762714a6f
+compositionId: 562ed027-2689-481a-b3a5-e284b1fbc33f
+deployState: DEPLOYED
+lockState: LOCKED
+elements:
     709c62b3-8918-41b9-a747-d21eb79c6c23:
-      id: 709c62b3-8918-41b9-a747-d21eb79c6c23
-      definition:
-        name: onap.policy.clamp.ac.element.Http_SinkAutomationCompositionElement
-        version: 1.2.3
-      participantType:
-        name: org.onap.policy.clamp.acm.HttpParticipant
-        version: 2.3.4
-      participantId:
-        name: HttpParticipant0
-        version: 1.0.0
-      state: UNINITIALISED
-      orderedState: UNINITIALISED
-      description: Sink Automation Composition Element for the Demo
-      propertiesMap: {}
-    709c62b3-8918-41b9-a747-d21eb79c6c25:
-      id: 709c62b3-8918-41b9-a747-d21eb79c6c25
-      definition:
-        name: onap.policy.clamp.ac.element.Http_BridgeAutomationCompositionElement
-        version: 1.2.3
-      participantType:
-        name: org.onap.policy.clamp.acm.HttpParticipant
-        version: 2.3.4
-      participantId:
-        name: HttpParticipant0
-        version: 1.0.0
-      state: UNINITIALISED
-      orderedState: UNINITIALISED
-      description: Bridge Automation Composition Element for the Demo
-      propertiesMap: {}
+        id: 709c62b3-8918-41b9-a747-d21eb79c6c23
+        definition:
+            name: onap.policy.clamp.ac.element.Http_SinkAutomationCompositionElement
+            version: 1.2.3
+        participantId: 101c62b3-8918-41b9-a747-d21eb79c6c91
+        deployState: DEPLOYED
+        lockState: LOCKED
+        description: Sink Automation Composition Element for the Demo
+        message: Deployed
+        properties:
+            baseUrl: http://10.101.0.249:30802
+            httpHeaders:
+                Content-Type: application/json
+                Authorization: Basic YWNtVXNlcjp6YiFYenRHMzQ=
+            configurationEntities:
+                - configurationEntityId:
+                      name: onap.policy.clamp.ac.sink
+                      version: 1.0.0
+                  restSequence:
+                      - restRequestId:
+                            name: request3
+                            version: 1.0.1
+                        httpMethod: POST
+                        path: /activate
+                        body:
+                            '{ "receiverId": { "name": "onap.policy.clamp.ac.sink", "version":
+                            "1.0.0" }, "timerMs": 20000, "elementType": "SINK", "topicParameterGroup":
+                            { "server": "message-router", "listenerTopic": "POLICY_UPDATE_MSG", "publisherTopic":
+                            "AC_ELEMENT_MSG", "fetchTimeout": 15000, "topicCommInfrastructure": "dmaap"
+                            } }'
+                        expectedResponse: 201
+        outProperties: {}
     709c62b3-8918-41b9-a747-d21eb79c6c24:
-      id: 709c62b3-8918-41b9-a747-d21eb79c6c24
-      definition:
-        name: onap.policy.clamp.ac.element.Http_StarterAutomationCompositionElement
-        version: 1.2.3
-      participantType:
-        name: org.onap.policy.clamp.acm.HttpParticipant
-        version: 2.3.4
-      participantId:
-        name: HttpParticipant0
-        version: 1.0.0
-      state: UNINITIALISED
-      orderedState: UNINITIALISED
-      description: Starter Automation Composition Element for the Demo
-      propertiesMap: {}
-  primed: false
-  name: InstanceHttp
-  version: 1.0.1
-  description: Demo automation composition instance Http
+        id: 709c62b3-8918-41b9-a747-d21eb79c6c24
+        definition:
+            name: onap.policy.clamp.ac.element.Http_StarterAutomationCompositionElement
+            version: 1.2.3
+        participantId: 101c62b3-8918-41b9-a747-d21eb79c6c91
+        deployState: DEPLOYED
+        lockState: LOCKED
+        description: Starter Automation Composition Element for the Demo
+        message: Deployed
+        properties:
+            baseUrl: http://10.101.0.249:30800
+            httpHeaders:
+                Content-Type: application/json
+                Authorization: Basic YWNtVXNlcjp6YiFYenRHMzQ=
+            configurationEntities:
+                - configurationEntityId:
+                      name: onap.policy.clamp.ac.starter
+                      version: 1.0.0
+                  restSequence:
+                      - restRequestId:
+                            name: request1
+                            version: 1.0.1
+                        httpMethod: POST
+                        path: /activate
+                        body:
+                            '{ "receiverId": { "name": "onap.policy.clamp.ac.startertobridge",
+                            "version": "1.0.0" }, "timerMs": 20000, "elementType": "STARTER", "topicParameterGroup":
+                            { "server": "message-router:3904", "listenerTopic": "POLICY_UPDATE_MSG",
+                            "publisherTopic": "AC_ELEMENT_MSG", "fetchTimeout": 15000, "topicCommInfrastructure":
+                            "dmaap" } }'
+                        expectedResponse: 201
+        outProperties: {}
+    709c62b3-8918-41b9-a747-d21eb79c6c25:
+        id: 709c62b3-8918-41b9-a747-d21eb79c6c25
+        definition:
+            name: onap.policy.clamp.ac.element.Http_BridgeAutomationCompositionElement
+            version: 1.2.3
+        participantId: 101c62b3-8918-41b9-a747-d21eb79c6c91
+        deployState: DEPLOYED
+        lockState: LOCKED
+        description: Bridge Automation Composition Element for the Demo
+        message: Deployed
+        properties:
+            baseUrl: http://10.101.0.249:30801
+            httpHeaders:
+                Content-Type: application/json
+                Authorization: Basic YWNtVXNlcjp6YiFYenRHMzQ=
+            configurationEntities:
+                - configurationEntityId:
+                      name: onap.policy.clamp.ac.bridge
+                      version: 1.0.0
+                  restSequence:
+                      - restRequestId:
+                            name: request2
+                            version: 1.0.1
+                        httpMethod: POST
+                        path: /activate
+                        body:
+                            '{ "receiverId": { "name": "onap.policy.clamp.ac.bridgetosink", "version":
+                            "1.0.0" }, "timerMs": 20000, "elementType": "BRIDGE", "topicParameterGroup":
+                            { "server": "message-router:3904", "listenerTopic": "POLICY_UPDATE_MSG",
+                            "publisherTopic": "AC_ELEMENT_MSG", "fetchTimeout": 15000, "topicCommInfrastructure":
+                            "dmaap" } }'
+                        expectedResponse: 201
+        outProperties: {}
+stateChangeResult: NO_ERROR
+name: InstanceHttp
+version: 1.0.1
+description: Demo automation composition instance Http
diff --git a/runtime-acm/src/main/resources/openapi/examples/getMultiParticipantResponse.yaml b/runtime-acm/src/main/resources/openapi/examples/getMultiParticipantResponse.yaml
index f74e29986..f0ed94bf4 100644..100755
--- a/runtime-acm/src/main/resources/openapi/examples/getMultiParticipantResponse.yaml
+++ b/runtime-acm/src/main/resources/openapi/examples/getMultiParticipantResponse.yaml
@@ -1,64 +1,156 @@
 - participant:
-    participantId: 101c62b3-8918-41b9-a747-d21eb79c6c03
-    participantState: ON_LINE
-    participantSupportedElementTypes:
-      3012010d-e59e-4dde-bab1-3ee544e49b6d:
-        id: 3012010d-e59e-4dde-bab1-3ee544e49b6d
-        typeName: org.onap.policy.clamp.acm.AutomationCompositionElement
-        typeVersion: 1.0.1
-      8d9e947e-c444-471c-9420-29f1c6584f8c:
-        id: 8d9e947e-c444-471c-9420-29f1c6584f8c
-        typeName: org.onap.policy.clamp.acm.PolicyAutomationCompositionElement
-        typeVersion: 1.0.1
+      participantId: 101c62b3-8918-41b9-a747-d21eb79c6c91
+      participantState: ON_LINE
+      participantSupportedElementTypes:
+          14c6d6d0-0fa2-4a7f-927a-afdab75e92c4:
+              id: 14c6d6d0-0fa2-4a7f-927a-afdab75e92c4
+              typeName: org.onap.policy.clamp.acm.HttpAutomationCompositionElement
+              typeVersion: 1.0.0
   acNodeTemplateStateDefinitionMap:
-    8cf8b401-dfd7-4ffe-90ff-c6543da10789:
-      nodeTemplateStateId: 8cf8b401-dfd7-4ffe-90ff-c6543da10789
-      participantId: 101c62b3-8918-41b9-a747-d21eb79c6c03
-      nodeTemplateId:
-        name: org.onap.domain.pmsh.PMSH_OperationalPolicyAutomationCompositionElement
-        version: 1.2.3
-      state: PRIMED
+      d514b576-c091-4a2c-b797-99204e6dc620:
+          nodeTemplateStateId: d514b576-c091-4a2c-b797-99204e6dc620
+          participantId: 101c62b3-8918-41b9-a747-d21eb79c6c91
+          nodeTemplateId:
+              name: onap.policy.clamp.ac.element.Http_BridgeAutomationCompositionElement
+              version: 1.2.3
+          state: PRIMED
+          message: Primed
+          outProperties: {}
+      05773b12-9005-4166-bd03-caec308207e7:
+          nodeTemplateStateId: 05773b12-9005-4166-bd03-caec308207e7
+          participantId: 101c62b3-8918-41b9-a747-d21eb79c6c91
+          nodeTemplateId:
+              name: onap.policy.clamp.ac.element.Http_StarterAutomationCompositionElement
+              version: 1.2.3
+          state: PRIMED
+          message: Primed
+          outProperties: {}
+      363832a4-0281-4a69-8d37-99b4d48c5685:
+          nodeTemplateStateId: 363832a4-0281-4a69-8d37-99b4d48c5685
+          participantId: 101c62b3-8918-41b9-a747-d21eb79c6c91
+          nodeTemplateId:
+              name: onap.policy.clamp.ac.element.Http_SinkAutomationCompositionElement
+              version: 1.2.3
+          state: PRIMED
+          message: Primed
+          outProperties: {}
   acElementInstanceMap:
-    709c62b3-8918-41b9-a747-d21eb79c6c22:
-      id: 709c62b3-8918-41b9-a747-d21eb79c6c22
-      definition:
-        name: org.onap.domain.pmsh.PMSH_OperationalPolicyAutomationCompositionElement
-        version: 1.2.3
-      participantId: 101c62b3-8918-41b9-a747-d21eb79c6c03
-      deployState: DEPLOYED
-      lockState: UNLOCKED
-      description: Automation composition element for the operational policy for Performance
-        Management Subscription Handling
-      properties: {}
+      709c62b3-8918-41b9-a747-d21eb79c6c23:
+          id: 709c62b3-8918-41b9-a747-d21eb79c6c23
+          definition:
+              name: onap.policy.clamp.ac.element.Http_SinkAutomationCompositionElement
+              version: 1.2.3
+          participantId: 101c62b3-8918-41b9-a747-d21eb79c6c91
+          deployState: DEPLOYED
+          lockState: LOCKED
+          description: Sink Automation Composition Element for the Demo
+          message: Deployed
+          properties:
+              baseUrl: http://10.101.0.249:30802
+              httpHeaders:
+                  Content-Type: application/json
+                  Authorization: Basic YWNtVXNlcjp6YiFYenRHMzQ=
+              configurationEntities:
+                  - configurationEntityId:
+                        name: onap.policy.clamp.ac.sink
+                        version: 1.0.0
+                    restSequence:
+                        - restRequestId:
+                              name: request3
+                              version: 1.0.1
+                          httpMethod: POST
+                          path: /activate
+                          body:
+                              '{ "receiverId": { "name": "onap.policy.clamp.ac.sink", "version":
+                              "1.0.0" }, "timerMs": 20000, "elementType": "SINK", "topicParameterGroup":
+                              { "server": "message-router", "listenerTopic": "POLICY_UPDATE_MSG",
+                              "publisherTopic": "AC_ELEMENT_MSG", "fetchTimeout": 15000, "topicCommInfrastructure":
+                              "dmaap" } }'
+                          expectedResponse: 201
+          outProperties: {}
+      709c62b3-8918-41b9-a747-d21eb79c6c25:
+          id: 709c62b3-8918-41b9-a747-d21eb79c6c25
+          definition:
+              name: onap.policy.clamp.ac.element.Http_BridgeAutomationCompositionElement
+              version: 1.2.3
+          participantId: 101c62b3-8918-41b9-a747-d21eb79c6c91
+          deployState: DEPLOYED
+          lockState: LOCKED
+          description: Bridge Automation Composition Element for the Demo
+          message: Deployed
+          properties:
+              baseUrl: http://10.101.0.249:30801
+              httpHeaders:
+                  Content-Type: application/json
+                  Authorization: Basic YWNtVXNlcjp6YiFYenRHMzQ=
+              configurationEntities:
+                  - configurationEntityId:
+                        name: onap.policy.clamp.ac.bridge
+                        version: 1.0.0
+                    restSequence:
+                        - restRequestId:
+                              name: request2
+                              version: 1.0.1
+                          httpMethod: POST
+                          path: /activate
+                          body:
+                              '{ "receiverId": { "name": "onap.policy.clamp.ac.bridgetosink",
+                              "version": "1.0.0" }, "timerMs": 20000, "elementType": "BRIDGE", "topicParameterGroup":
+                              { "server": "message-router:3904", "listenerTopic": "POLICY_UPDATE_MSG",
+                              "publisherTopic": "AC_ELEMENT_MSG", "fetchTimeout": 15000, "topicCommInfrastructure":
+                              "dmaap" } }'
+                          expectedResponse: 201
+          outProperties: {}
+      709c62b3-8918-41b9-a747-d21eb79c6c24:
+          id: 709c62b3-8918-41b9-a747-d21eb79c6c24
+          definition:
+              name: onap.policy.clamp.ac.element.Http_StarterAutomationCompositionElement
+              version: 1.2.3
+          participantId: 101c62b3-8918-41b9-a747-d21eb79c6c91
+          deployState: DEPLOYED
+          lockState: LOCKED
+          description: Starter Automation Composition Element for the Demo
+          message: Deployed
+          properties:
+              baseUrl: http://10.101.0.249:30800
+              httpHeaders:
+                  Content-Type: application/json
+                  Authorization: Basic YWNtVXNlcjp6YiFYenRHMzQ=
+              configurationEntities:
+                  - configurationEntityId:
+                        name: onap.policy.clamp.ac.starter
+                        version: 1.0.0
+                    restSequence:
+                        - restRequestId:
+                              name: request1
+                              version: 1.0.1
+                          httpMethod: POST
+                          path: /activate
+                          body:
+                              '{ "receiverId": { "name": "onap.policy.clamp.ac.startertobridge",
+                              "version": "1.0.0" }, "timerMs": 20000, "elementType": "STARTER", "topicParameterGroup":
+                              { "server": "message-router:3904", "listenerTopic": "POLICY_UPDATE_MSG",
+                              "publisherTopic": "AC_ELEMENT_MSG", "fetchTimeout": 15000, "topicCommInfrastructure":
+                              "dmaap" } }'
+                          expectedResponse: 201
+          outProperties: {}
 - participant:
-    participantId: 985d73aa-abba-11ed-afa1-0242ac120002
-    participantState: ON_LINE
-    participantSupportedElementTypes:
-      cded8a5a-abba-11ed-afa1-0242ac120002:
-        id: cded8a5a-abba-11ed-afa1-0242ac120002
-        typeName: org.onap.policy.clamp.acm.K8SMicroserviceAutomationCompositionElement
-        typeVersion: 1.0.1
-      25ac7864-abbb-11ed-afa1-0242ac120002:
-        id: 25ac7864-abbb-11ed-afa1-0242ac120002
-        typeName: org.onap.policy.clamp.acm.AutomationCompositionElement
-        typeVersion: 1.0.1
-  acNodeTemplateStateDefinitionMap:
-    34b4d248-abbb-11ed-afa1-0242ac120002:
-      nodeTemplateStateId: 34b4d248-abbb-11ed-afa1-0242ac120002
-      participantId: 985d73aa-abba-11ed-afa1-0242ac120002
-      nodeTemplateId:
-        name: org.onap.domain.pmsh.PMSH_OperationalPolicyAutomationCompositionElement
-        version: 1.2.3
-      state: PRIMED
-  acElementInstanceMap:
-    3dd7a936-abbb-11ed-afa1-0242ac120002:
-      id: 3dd7a936-abbb-11ed-afa1-0242ac120002
-      definition:
-        name: org.onap.domain.pmsh.PMSH_OperationalPolicyAutomationCompositionElement
-        version: 1.2.3
-      participantId: 985d73aa-abba-11ed-afa1-0242ac120002
-      deployState: DEPLOYED
-      lockState: UNLOCKED
-      description: Automation composition element for the operational policy for Performance
-        Management Subscription Handling
-      properties: {}
+      participantId: 101c62b3-8918-41b9-a747-d21eb79c6c92
+      participantState: ON_LINE
+      participantSupportedElementTypes:
+          110a2081-724a-4a15-b701-ff3c5cf741fa:
+              id: 110a2081-724a-4a15-b701-ff3c5cf741fa
+              typeName: org.onap.policy.clamp.acm.PolicyAutomationCompositionElement
+              typeVersion: 1.0.0
+  acNodeTemplateStateDefinitionMap: {}
+  acElementInstanceMap: {}
+- participant:
+      participantId: 101c62b3-8918-41b9-a747-d21eb79c6c93
+      participantState: ON_LINE
+      participantSupportedElementTypes:
+          e7eb37db-af7a-4840-a626-d82845c4786f:
+              id: e7eb37db-af7a-4840-a626-d82845c4786f
+              typeName: org.onap.policy.clamp.acm.K8SMicroserviceAutomationCompositionElement
+              typeVersion: 1.0.0
+  acNodeTemplateStateDefinitionMap: {}
+  acElementInstanceMap: {}
diff --git a/runtime-acm/src/main/resources/openapi/examples/getMultipleParticipantResponse.json b/runtime-acm/src/main/resources/openapi/examples/getMultipleParticipantResponse.json
index 7e277c5a3..b5e73e04c 100644..100755
--- a/runtime-acm/src/main/resources/openapi/examples/getMultipleParticipantResponse.json
+++ b/runtime-acm/src/main/resources/openapi/examples/getMultipleParticipantResponse.json
@@ -1,88 +1,202 @@
 [
-  {
-    "participant": {
-      "participantId": "101c62b3-8918-41b9-a747-d21eb79c6c03",
-      "participantState": "ON_LINE",
-      "participantSupportedElementTypes": {
-        "3012010d-e59e-4dde-bab1-3ee544e49b6d": {
-          "id": "3012010d-e59e-4dde-bab1-3ee544e49b6d",
-          "typeName": "org.onap.policy.clamp.acm.AutomationCompositionElement",
-          "typeVersion": "1.0.1"
+    {
+        "participant": {
+            "participantId": "101c62b3-8918-41b9-a747-d21eb79c6c91",
+            "participantState": "ON_LINE",
+            "participantSupportedElementTypes": {
+                "14c6d6d0-0fa2-4a7f-927a-afdab75e92c4": {
+                    "id": "14c6d6d0-0fa2-4a7f-927a-afdab75e92c4",
+                    "typeName": "org.onap.policy.clamp.acm.HttpAutomationCompositionElement",
+                    "typeVersion": "1.0.0"
+                }
+            }
         },
-        "8d9e947e-c444-471c-9420-29f1c6584f8c": {
-          "id": "8d9e947e-c444-471c-9420-29f1c6584f8c",
-          "typeName": "org.onap.policy.clamp.acm.PolicyAutomationCompositionElement",
-          "typeVersion": "1.0.1"
-        }
-      }
-    },
-    "acNodeTemplateStateDefinitionMap": {
-      "8cf8b401-dfd7-4ffe-90ff-c6543da10789": {
-        "nodeTemplateStateId": "8cf8b401-dfd7-4ffe-90ff-c6543da10789",
-        "participantId": "101c62b3-8918-41b9-a747-d21eb79c6c03",
-        "nodeTemplateId": {
-          "name": "org.onap.domain.pmsh.PMSH_OperationalPolicyAutomationCompositionElement",
-          "version": "1.2.3"
-        },
-        "state": "PRIMED"
-      }
-    },
-    "acElementInstanceMap": {
-      "709c62b3-8918-41b9-a747-d21eb79c6c22": {
-        "id": "709c62b3-8918-41b9-a747-d21eb79c6c22",
-        "definition": {
-          "name": "org.onap.domain.pmsh.PMSH_OperationalPolicyAutomationCompositionElement",
-          "version": "1.2.3"
-        },
-        "participantId": "101c62b3-8918-41b9-a747-d21eb79c6c03",
-        "deployState": "DEPLOYED",
-        "lockState": "UNLOCKED",
-        "description": "Automation composition element for the operational policy for Performance Management Subscription Handling",
-        "properties": {}
-      }
-    }
-  },
-  {
-    "participant": {
-      "participantId": "985d73aa-abba-11ed-afa1-0242ac120002",
-      "participantState": "ON_LINE",
-      "participantSupportedElementTypes": {
-        "cded8a5a-abba-11ed-afa1-0242ac120002": {
-          "id": "cded8a5a-abba-11ed-afa1-0242ac120002",
-          "typeName": "org.onap.policy.clamp.acm.K8SMicroserviceAutomationCompositionElement",
-          "typeVersion": "1.0.1"
+        "acNodeTemplateStateDefinitionMap": {
+            "d514b576-c091-4a2c-b797-99204e6dc620": {
+                "nodeTemplateStateId": "d514b576-c091-4a2c-b797-99204e6dc620",
+                "participantId": "101c62b3-8918-41b9-a747-d21eb79c6c91",
+                "nodeTemplateId": {
+                    "name": "onap.policy.clamp.ac.element.Http_BridgeAutomationCompositionElement",
+                    "version": "1.2.3"
+                },
+                "state": "PRIMED",
+                "message": "Primed",
+                "outProperties": {}
+            },
+            "05773b12-9005-4166-bd03-caec308207e7": {
+                "nodeTemplateStateId": "05773b12-9005-4166-bd03-caec308207e7",
+                "participantId": "101c62b3-8918-41b9-a747-d21eb79c6c91",
+                "nodeTemplateId": {
+                    "name": "onap.policy.clamp.ac.element.Http_StarterAutomationCompositionElement",
+                    "version": "1.2.3"
+                },
+                "state": "PRIMED",
+                "message": "Primed",
+                "outProperties": {}
+            },
+            "363832a4-0281-4a69-8d37-99b4d48c5685": {
+                "nodeTemplateStateId": "363832a4-0281-4a69-8d37-99b4d48c5685",
+                "participantId": "101c62b3-8918-41b9-a747-d21eb79c6c91",
+                "nodeTemplateId": {
+                    "name": "onap.policy.clamp.ac.element.Http_SinkAutomationCompositionElement",
+                    "version": "1.2.3"
+                },
+                "state": "PRIMED",
+                "message": "Primed",
+                "outProperties": {}
+            }
         },
-        "25ac7864-abbb-11ed-afa1-0242ac120002": {
-          "id": "25ac7864-abbb-11ed-afa1-0242ac120002",
-          "typeName": "org.onap.policy.clamp.acm.AutomationCompositionElement",
-          "typeVersion": "1.0.1"
+        "acElementInstanceMap": {
+            "709c62b3-8918-41b9-a747-d21eb79c6c23": {
+                "id": "709c62b3-8918-41b9-a747-d21eb79c6c23",
+                "definition": {
+                    "name": "onap.policy.clamp.ac.element.Http_SinkAutomationCompositionElement",
+                    "version": "1.2.3"
+                },
+                "participantId": "101c62b3-8918-41b9-a747-d21eb79c6c91",
+                "deployState": "DEPLOYED",
+                "lockState": "LOCKED",
+                "description": "Sink Automation Composition Element for the Demo",
+                "message": "Deployed",
+                "properties": {
+                    "baseUrl": "http://10.101.0.249:30802",
+                    "httpHeaders": {
+                        "Content-Type": "application/json",
+                        "Authorization": "Basic YWNtVXNlcjp6YiFYenRHMzQ="
+                    },
+                    "configurationEntities": [
+                        {
+                            "configurationEntityId": {
+                                "name": "onap.policy.clamp.ac.sink",
+                                "version": "1.0.0"
+                            },
+                            "restSequence": [
+                                {
+                                    "restRequestId": {
+                                        "name": "request3",
+                                        "version": "1.0.1"
+                                    },
+                                    "httpMethod": "POST",
+                                    "path": "/activate",
+                                    "body": "{ \"receiverId\": { \"name\": \"onap.policy.clamp.ac.sink\", \"version\": \"1.0.0\" }, \"timerMs\": 20000, \"elementType\": \"SINK\", \"topicParameterGroup\": { \"server\": \"message-router\", \"listenerTopic\": \"POLICY_UPDATE_MSG\", \"publisherTopic\": \"AC_ELEMENT_MSG\", \"fetchTimeout\": 15000, \"topicCommInfrastructure\": \"dmaap\" } }",
+                                    "expectedResponse": 201
+                                }
+                            ]
+                        }
+                    ]
+                },
+                "outProperties": {}
+            },
+            "709c62b3-8918-41b9-a747-d21eb79c6c25": {
+                "id": "709c62b3-8918-41b9-a747-d21eb79c6c25",
+                "definition": {
+                    "name": "onap.policy.clamp.ac.element.Http_BridgeAutomationCompositionElement",
+                    "version": "1.2.3"
+                },
+                "participantId": "101c62b3-8918-41b9-a747-d21eb79c6c91",
+                "deployState": "DEPLOYED",
+                "lockState": "LOCKED",
+                "description": "Bridge Automation Composition Element for the Demo",
+                "message": "Deployed",
+                "properties": {
+                    "baseUrl": "http://10.101.0.249:30801",
+                    "httpHeaders": {
+                        "Content-Type": "application/json",
+                        "Authorization": "Basic YWNtVXNlcjp6YiFYenRHMzQ="
+                    },
+                    "configurationEntities": [
+                        {
+                            "configurationEntityId": {
+                                "name": "onap.policy.clamp.ac.bridge",
+                                "version": "1.0.0"
+                            },
+                            "restSequence": [
+                                {
+                                    "restRequestId": {
+                                        "name": "request2",
+                                        "version": "1.0.1"
+                                    },
+                                    "httpMethod": "POST",
+                                    "path": "/activate",
+                                    "body": "{ \"receiverId\": { \"name\": \"onap.policy.clamp.ac.bridgetosink\", \"version\": \"1.0.0\" }, \"timerMs\": 20000, \"elementType\": \"BRIDGE\", \"topicParameterGroup\": { \"server\": \"message-router:3904\", \"listenerTopic\": \"POLICY_UPDATE_MSG\", \"publisherTopic\": \"AC_ELEMENT_MSG\", \"fetchTimeout\": 15000, \"topicCommInfrastructure\": \"dmaap\" } }",
+                                    "expectedResponse": 201
+                                }
+                            ]
+                        }
+                    ]
+                },
+                "outProperties": {}
+            },
+            "709c62b3-8918-41b9-a747-d21eb79c6c24": {
+                "id": "709c62b3-8918-41b9-a747-d21eb79c6c24",
+                "definition": {
+                    "name": "onap.policy.clamp.ac.element.Http_StarterAutomationCompositionElement",
+                    "version": "1.2.3"
+                },
+                "participantId": "101c62b3-8918-41b9-a747-d21eb79c6c91",
+                "deployState": "DEPLOYED",
+                "lockState": "LOCKED",
+                "description": "Starter Automation Composition Element for the Demo",
+                "message": "Deployed",
+                "properties": {
+                    "baseUrl": "http://10.101.0.249:30800",
+                    "httpHeaders": {
+                        "Content-Type": "application/json",
+                        "Authorization": "Basic YWNtVXNlcjp6YiFYenRHMzQ="
+                    },
+                    "configurationEntities": [
+                        {
+                            "configurationEntityId": {
+                                "name": "onap.policy.clamp.ac.starter",
+                                "version": "1.0.0"
+                            },
+                            "restSequence": [
+                                {
+                                    "restRequestId": {
+                                        "name": "request1",
+                                        "version": "1.0.1"
+                                    },
+                                    "httpMethod": "POST",
+                                    "path": "/activate",
+                                    "body": "{ \"receiverId\": { \"name\": \"onap.policy.clamp.ac.startertobridge\", \"version\": \"1.0.0\" }, \"timerMs\": 20000, \"elementType\": \"STARTER\", \"topicParameterGroup\": { \"server\": \"message-router:3904\", \"listenerTopic\": \"POLICY_UPDATE_MSG\", \"publisherTopic\": \"AC_ELEMENT_MSG\", \"fetchTimeout\": 15000, \"topicCommInfrastructure\": \"dmaap\" } }",
+                                    "expectedResponse": 201
+                                }
+                            ]
+                        }
+                    ]
+                },
+                "outProperties": {}
+            }
         }
-      }
     },
-    "acNodeTemplateStateDefinitionMap": {
-      "34b4d248-abbb-11ed-afa1-0242ac120002": {
-        "nodeTemplateStateId": "34b4d248-abbb-11ed-afa1-0242ac120002",
-        "participantId": "985d73aa-abba-11ed-afa1-0242ac120002",
-        "nodeTemplateId": {
-          "name": "org.onap.domain.pmsh.PMSH_OperationalPolicyAutomationCompositionElement",
-          "version": "1.2.3"
+    {
+        "participant": {
+            "participantId": "101c62b3-8918-41b9-a747-d21eb79c6c92",
+            "participantState": "ON_LINE",
+            "participantSupportedElementTypes": {
+                "110a2081-724a-4a15-b701-ff3c5cf741fa": {
+                    "id": "110a2081-724a-4a15-b701-ff3c5cf741fa",
+                    "typeName": "org.onap.policy.clamp.acm.PolicyAutomationCompositionElement",
+                    "typeVersion": "1.0.0"
+                }
+            }
         },
-        "state": "PRIMED"
-      }
+        "acNodeTemplateStateDefinitionMap": {},
+        "acElementInstanceMap": {}
     },
-    "acElementInstanceMap": {
-      "3dd7a936-abbb-11ed-afa1-0242ac120002": {
-        "id": "3dd7a936-abbb-11ed-afa1-0242ac120002",
-        "definition": {
-          "name": "org.onap.domain.pmsh.PMSH_OperationalPolicyAutomationCompositionElement",
-          "version": "1.2.3"
+    {
+        "participant": {
+            "participantId": "101c62b3-8918-41b9-a747-d21eb79c6c93",
+            "participantState": "ON_LINE",
+            "participantSupportedElementTypes": {
+                "e7eb37db-af7a-4840-a626-d82845c4786f": {
+                    "id": "e7eb37db-af7a-4840-a626-d82845c4786f",
+                    "typeName": "org.onap.policy.clamp.acm.K8SMicroserviceAutomationCompositionElement",
+                    "typeVersion": "1.0.0"
+                }
+            }
         },
-        "participantId": "985d73aa-abba-11ed-afa1-0242ac120002",
-        "deployState": "DEPLOYED",
-        "lockState": "UNLOCKED",
-        "description": "Automation composition element for the operational policy for Performance Management Subscription Handling",
-        "properties": {}
-      }
+        "acNodeTemplateStateDefinitionMap": {},
+        "acElementInstanceMap": {}
     }
-  }
 ]
diff --git a/runtime-acm/src/main/resources/openapi/examples/getSingleCompositionDefinition.json b/runtime-acm/src/main/resources/openapi/examples/getSingleCompositionDefinition.json
index 37ea18974..6ba9081a4 100644..100755
--- a/runtime-acm/src/main/resources/openapi/examples/getSingleCompositionDefinition.json
+++ b/runtime-acm/src/main/resources/openapi/examples/getSingleCompositionDefinition.json
@@ -1,487 +1,439 @@
 {
-    "tosca_definitions_version": "tosca_simple_yaml_1_3",
-    "data_types": {
-        "onap.datatypes.ToscaConceptIdentifier": {
-            "properties": {
-                "name": {
-                    "name": "name",
-                    "type": "string",
-                    "type_version": "0.0.0",
-                    "required": true
-                },
-                "version": {
-                    "name": "version",
-                    "type": "string",
-                    "type_version": "0.0.0",
-                    "required": true
-                }
-            },
-            "name": "onap.datatypes.ToscaConceptIdentifier",
-            "version": "0.0.0",
-            "derived_from": "tosca.datatypes.Root",
-            "metadata": {}
-        },
-        "org.onap.datatypes.policy.clamp.acm.httpAutomationCompositionElement.RestRequest": {
-            "properties": {
-                "restRequestId": {
-                    "name": "restRequestId",
-                    "type": "onap.datatypes.ToscaConceptIdentifier",
-                    "type_version": "0.0.0",
-                    "description": "The name and version of a REST request to be sent to a REST endpoint",
-                    "required": true
-                },
-                "httpMethod": {
-                    "name": "httpMethod",
-                    "type": "string",
-                    "type_version": "0.0.0",
-                    "description": "The REST method to use",
-                    "required": true,
-                    "constraints": [
-                        {
-                            "valid_values": [
-                                "POST",
-                                "PUT",
-                                "GET",
-                                "DELETE"
-                            ]
-                        }
-                    ]
-                },
-                "path": {
-                    "name": "path",
-                    "type": "string",
-                    "type_version": "0.0.0",
-                    "description": "The path of the REST request relative to the base URL",
-                    "required": true
-                },
-                "body": {
-                    "name": "body",
-                    "type": "string",
-                    "type_version": "0.0.0",
-                    "description": "The body of the REST request for PUT and POST requests",
-                    "required": false
-                },
-                "expectedResponse": {
-                    "name": "expectedResponse",
-                    "type": "integer",
-                    "type_version": "0.0.0",
-                    "description": "THe expected HTTP status code for the REST request",
-                    "required": true,
-                    "constraints": []
-                }
-            },
-            "name": "org.onap.datatypes.policy.clamp.acm.httpAutomationCompositionElement.RestRequest",
-            "version": "1.0.0",
-            "derived_from": "tosca.datatypes.Root",
-            "metadata": {}
-        },
-        "org.onap.datatypes.policy.clamp.acm.httpAutomationCompositionElement.ConfigurationEntity": {
-            "properties": {
-                "configurationEntityId": {
-                    "name": "configurationEntityId",
-                    "type": "onap.datatypes.ToscaConceptIdentifier",
-                    "type_version": "0.0.0",
-                    "description": "The name and version of a Configuration Entity to be handled by the HTTP Automation Composition Element",
-                    "required": true
-                },
-                "restSequence": {
-                    "name": "restSequence",
-                    "type": "list",
-                    "type_version": "0.0.0",
-                    "description": "A sequence of REST commands to send to the REST endpoint",
-                    "required": false,
-                    "entry_schema": {
-                        "type": "org.onap.datatypes.policy.clamp.acm.httpAutomationCompositionElement.RestRequest",
-                        "type_version": "1.0.0"
-                    }
-                }
-            },
-            "name": "org.onap.datatypes.policy.clamp.acm.httpAutomationCompositionElement.ConfigurationEntity",
-            "version": "1.0.0",
-            "derived_from": "tosca.datatypes.Root",
-            "metadata": {}
-        }
-    },
-    "node_types": {
-        "org.onap.policy.clamp.acm.Participant": {
-            "properties": {
-                "provider": {
-                    "name": "provider",
-                    "type": "string",
-                    "type_version": "0.0.0",
-                    "required": false
-                }
-            },
-            "name": "org.onap.policy.clamp.acm.Participant",
-            "version": "1.0.1",
-            "derived_from": "tosca.nodetypes.Root",
-            "metadata": {}
-        },
-        "org.onap.policy.clamp.acm.AutomationCompositionElement": {
-            "properties": {
-                "provider": {
-                    "name": "provider",
-                    "type": "string",
-                    "type_version": "0.0.0",
-                    "description": "Specifies the organization that provides the automation composition element",
-                    "required": false,
-                    "metadata": {
-                        "common": "true"
-                    }
-                },
-                "participant_id": {
-                    "name": "participant_id",
-                    "type": "onap.datatypes.ToscaConceptIdentifier",
-                    "type_version": "0.0.0",
-                    "required": true,
-                    "metadata": {
-                        "common": "true"
-                    }
-                },
-                "participantType": {
-                    "name": "participantType",
-                    "type": "onap.datatypes.ToscaConceptIdentifier",
-                    "type_version": "0.0.0",
-                    "description": "The identity of the participant type that hosts this type of Automation Composition Element",
-                    "required": true,
-                    "metadata": {
-                        "common": "true"
-                    }
-                },
-                "startPhase": {
-                    "name": "startPhase",
-                    "type": "integer",
-                    "type_version": "0.0.0",
-                    "description": "A value indicating the start phase in which this automation composition element will be started, the first start phase is zero. Automation Composition Elements are started in their start_phase order and stopped in reverse start phase order. Automation Composition Elements with the same start phase are started and stopped simultaneously",
-                    "required": false,
-                    "constraints": [
-                        {
-                            "greater_or_equal": "0"
-                        }
-                    ],
-                    "metadata": {
-                        "common": "true"
-                    }
-                },
-                "uninitializedToPassiveTimeout": {
-                    "name": "uninitializedToPassiveTimeout",
-                    "type": "integer",
-                    "type_version": "0.0.0",
-                    "description": "The maximum time in seconds to wait for a state chage from uninitialized to passive",
-                    "default": 60.0,
-                    "required": false,
-                    "constraints": [
-                        {
-                            "greater_or_equal": "0"
-                        }
-                    ],
-                    "metadata": {
-                        "common": "true"
-                    }
-                },
-                "passiveToRunningTimeout": {
-                    "name": "passiveToRunningTimeout",
-                    "type": "integer",
-                    "type_version": "0.0.0",
-                    "description": "The maximum time in seconds to wait for a state chage from passive to running",
-                    "default": 60.0,
-                    "required": false,
-                    "constraints": [
-                        {
-                            "greater_or_equal": "0"
-                        }
-                    ],
-                    "metadata": {
-                        "common": "true"
-                    }
-                },
-                "runningToPassiveTimeout": {
-                    "name": "runningToPassiveTimeout",
-                    "type": "integer",
-                    "type_version": "0.0.0",
-                    "description": "The maximum time in seconds to wait for a state chage from running to passive",
-                    "default": 60.0,
-                    "required": false,
-                    "constraints": [
-                        {
-                            "greater_or_equal": "0"
-                        }
-                    ],
-                    "metadata": {
-                        "common": "true"
+    "compositionId": "562ed027-2689-481a-b3a5-e284b1fbc33f",
+    "serviceTemplate": {
+        "tosca_definitions_version": "tosca_simple_yaml_1_3",
+        "data_types": {
+            "onap.datatypes.ToscaConceptIdentifier": {
+                "properties": {
+                    "name": {
+                        "name": "name",
+                        "type": "string",
+                        "type_version": "0.0.0",
+                        "required": true
+                    },
+                    "version": {
+                        "name": "version",
+                        "type": "string",
+                        "type_version": "0.0.0",
+                        "required": true
                     }
                 },
-                "passiveToUninitializedTimeout": {
-                    "name": "passiveToUninitializedTimeout",
-                    "type": "integer",
-                    "type_version": "0.0.0",
-                    "description": "The maximum time in seconds to wait for a state chage from passive to uninitialized",
-                    "default": 60.0,
-                    "required": false,
-                    "constraints": [
-                        {
-                            "greater_or_equal": "0"
-                        }
-                    ],
-                    "metadata": {
-                        "common": "true"
-                    }
-                }
+                "name": "onap.datatypes.ToscaConceptIdentifier",
+                "version": "0.0.0",
+                "derived_from": "tosca.datatypes.Root",
+                "metadata": {}
             },
-            "name": "org.onap.policy.clamp.acm.AutomationCompositionElement",
-            "version": "1.0.1",
-            "derived_from": "tosca.nodetypes.Root",
-            "metadata": {}
-        },
-        "org.onap.policy.clamp.acm.AutomationComposition": {
-            "properties": {
-                "provider": {
-                    "name": "provider",
-                    "type": "string",
-                    "type_version": "0.0.0",
-                    "description": "Specifies the organization that provides the automation composition element",
-                    "required": false,
-                    "metadata": {
-                        "common": "true"
+            "org.onap.datatypes.policy.clamp.acm.httpAutomationCompositionElement.RestRequest": {
+                "properties": {
+                    "restRequestId": {
+                        "name": "restRequestId",
+                        "type": "onap.datatypes.ToscaConceptIdentifier",
+                        "type_version": "0.0.0",
+                        "description": "The name and version of a REST request to be sent to a REST endpoint",
+                        "required": true
+                    },
+                    "httpMethod": {
+                        "name": "httpMethod",
+                        "type": "string",
+                        "type_version": "0.0.0",
+                        "description": "The REST method to use",
+                        "required": true,
+                        "constraints": [
+                            {
+                                "valid_values": [
+                                    "POST",
+                                    "PUT",
+                                    "GET",
+                                    "DELETE"
+                                ]
+                            }
+                        ]
+                    },
+                    "path": {
+                        "name": "path",
+                        "type": "string",
+                        "type_version": "0.0.0",
+                        "description": "The path of the REST request relative to the base URL",
+                        "required": true
+                    },
+                    "body": {
+                        "name": "body",
+                        "type": "string",
+                        "type_version": "0.0.0",
+                        "description": "The body of the REST request for PUT and POST requests",
+                        "required": false
+                    },
+                    "expectedResponse": {
+                        "name": "expectedResponse",
+                        "type": "integer",
+                        "type_version": "0.0.0",
+                        "description": "THe expected HTTP status code for the REST request",
+                        "required": true,
+                        "constraints": []
                     }
                 },
-                "elements": {
-                    "name": "elements",
-                    "type": "list",
-                    "type_version": "0.0.0",
-                    "description": "Specifies a list of automation composition element definitions that make up this automation composition definition",
-                    "required": true,
-                    "entry_schema": {
+                "name": "org.onap.datatypes.policy.clamp.acm.httpAutomationCompositionElement.RestRequest",
+                "version": "1.0.0",
+                "derived_from": "tosca.datatypes.Root",
+                "metadata": {}
+            },
+            "org.onap.datatypes.policy.clamp.acm.httpAutomationCompositionElement.ConfigurationEntity": {
+                "properties": {
+                    "configurationEntityId": {
+                        "name": "configurationEntityId",
                         "type": "onap.datatypes.ToscaConceptIdentifier",
-                        "type_version": "0.0.0"
+                        "type_version": "0.0.0",
+                        "description": "The name and version of a Configuration Entity to be handled by the HTTP Automation Composition Element",
+                        "required": true
                     },
-                    "metadata": {
-                        "common": "true"
+                    "restSequence": {
+                        "name": "restSequence",
+                        "type": "list",
+                        "type_version": "0.0.0",
+                        "description": "A sequence of REST commands to send to the REST endpoint",
+                        "required": false,
+                        "entry_schema": {
+                            "type": "org.onap.datatypes.policy.clamp.acm.httpAutomationCompositionElement.RestRequest",
+                            "type_version": "1.0.0"
+                        }
                     }
-                }
-            },
-            "name": "org.onap.policy.clamp.acm.AutomationComposition",
-            "version": "1.0.1",
-            "derived_from": "tosca.nodetypes.Root",
-            "metadata": {}
-        },
-        "org.onap.policy.clamp.acm.HttpAutomationCompositionElement": {
-            "properties": {
-                "baseUrl": {
-                    "name": "baseUrl",
-                    "type": "string",
-                    "type_version": "0.0.0",
-                    "description": "The base URL to be prepended to each path, identifies the host for the REST endpoints.",
-                    "required": true
                 },
-                "httpHeaders": {
-                    "name": "httpHeaders",
-                    "type": "map",
-                    "type_version": "0.0.0",
-                    "description": "HTTP headers to send on REST requests",
-                    "required": false,
-                    "entry_schema": {
+                "name": "org.onap.datatypes.policy.clamp.acm.httpAutomationCompositionElement.ConfigurationEntity",
+                "version": "1.0.0",
+                "derived_from": "tosca.datatypes.Root",
+                "metadata": {}
+            }
+        },
+        "node_types": {
+            "org.onap.policy.clamp.acm.Participant": {
+                "properties": {
+                    "provider": {
+                        "name": "provider",
                         "type": "string",
-                        "type_version": "0.0.0"
-                    }
-                },
-                "configurationEntities": {
-                    "name": "configurationEntities",
-                    "type": "map",
-                    "type_version": "0.0.0",
-                    "description": "The connfiguration entities the Automation Composition Element is managing and their associated REST requests",
-                    "required": true,
-                    "entry_schema": {
-                        "type": "org.onap.datatypes.policy.clamp.acm.httpAutomationCompositionElement.ConfigurationEntity",
-                        "type_version": "1.0.0"
+                        "type_version": "0.0.0",
+                        "required": false
                     }
-                }
-            },
-            "name": "org.onap.policy.clamp.acm.HttpAutomationCompositionElement",
-            "version": "1.0.1",
-            "derived_from": "org.onap.policy.clamp.acm.AutomationCompositionElement",
-            "metadata": {}
-        }
-    },
-    "topology_template": {
-        "node_templates": {
-            "org.onap.policy.clamp.acm.HttpParticipant": {
-                "type": "org.onap.policy.clamp.acm.Participant",
-                "type_version": "1.0.1",
-                "properties": {
-                    "provider": "ONAP"
                 },
-                "name": "org.onap.policy.clamp.acm.HttpParticipant",
-                "version": "2.3.4",
-                "metadata": {},
-                "description": "Participant for Http requests"
+                "name": "org.onap.policy.clamp.acm.Participant",
+                "version": "1.0.1",
+                "derived_from": "tosca.nodetypes.Root",
+                "metadata": {}
             },
-            "onap.policy.clamp.ac.element.Http_StarterAutomationCompositionElement": {
-                "type": "org.onap.policy.clamp.acm.HttpAutomationCompositionElement",
-                "type_version": "1.0.1",
+            "org.onap.policy.clamp.acm.AutomationCompositionElement": {
                 "properties": {
-                    "provider": "ONAP",
-                    "participant_id": {
-                        "name": "HttpParticipant0",
-                        "version": "1.0.0"
-                    },
-                    "participantType": {
-                        "name": "org.onap.policy.clamp.acm.HttpParticipant",
-                        "version": "2.3.4"
+                    "provider": {
+                        "name": "provider",
+                        "type": "string",
+                        "type_version": "0.0.0",
+                        "description": "Specifies the organization that provides the automation composition element",
+                        "required": false,
+                        "metadata": {
+                            "common": "true"
+                        }
                     },
-                    "uninitializedToPassiveTimeout": 180,
-                    "startPhase": 0,
-                    "baseUrl": "http://acelement-starter:8084",
-                    "httpHeaders": {
-                        "Content-Type": "application/json",
-                        "Authorization": "Basic cnVudGltZVVzZXI6emIhWHp0RzM0"
+                    "startPhase": {
+                        "name": "startPhase",
+                        "type": "integer",
+                        "type_version": "0.0.0",
+                        "description": "A value indicating the start phase in which this automation composition element will be started, the first start phase is zero. Automation Composition Elements are started in their start_phase order and stopped in reverse start phase order. Automation Composition Elements with the same start phase are started and stopped simultaneously",
+                        "required": false,
+                        "constraints": [
+                            {
+                                "greater_or_equal": "0"
+                            }
+                        ],
+                        "metadata": {
+                            "common": "true"
+                        }
                     },
-                    "configurationEntities": [
-                        {
-                            "configurationEntityId": {
-                                "name": "onap.policy.clamp.ac.starter",
-                                "version": "1.0.0"
-                            },
-                            "restSequence": [
-                                {
-                                    "restRequestId": {
-                                        "name": "request1",
-                                        "version": "1.0.1"
-                                    },
-                                    "httpMethod": "POST",
-                                    "path": "/onap/policy/clamp/acelement/v2/activate",
-                                    "body": "{ \"receiverId\": { \"name\": \"onap.policy.clamp.ac.startertobridge\", \"version\": \"1.0.0\" }, \"timerMs\": 4000, \"elementType\": \"STARTER\", \"topicParameterGroup\": { \"server\": \"message-router\", \"listenerTopic\": \"POLICY_UPDATE_MSG\", \"publisherTopic\": \"AC_ELEMENT_MSG\", \"fetchTimeout\": 15000, \"topicCommInfrastructure\": \"dmaap\" } }",
-                                    "expectedResponse": 201
-                                }
-                            ]
+                    "uninitializedToPassiveTimeout": {
+                        "name": "uninitializedToPassiveTimeout",
+                        "type": "integer",
+                        "type_version": "0.0.0",
+                        "description": "The maximum time in seconds to wait for a state chage from uninitialized to passive",
+                        "default": 60.0,
+                        "required": false,
+                        "constraints": [
+                            {
+                                "greater_or_equal": "0"
+                            }
+                        ],
+                        "metadata": {
+                            "common": "true"
                         }
-                    ]
+                    }
                 },
-                "name": "onap.policy.clamp.ac.element.Http_StarterAutomationCompositionElement",
-                "version": "1.2.3",
-                "metadata": {},
-                "description": "Automation composition element for the http requests of AC Element Starter microservice"
+                "name": "org.onap.policy.clamp.acm.AutomationCompositionElement",
+                "version": "1.0.1",
+                "derived_from": "tosca.nodetypes.Root",
+                "metadata": {}
             },
-            "onap.policy.clamp.ac.element.Http_BridgeAutomationCompositionElement": {
-                "type": "org.onap.policy.clamp.acm.HttpAutomationCompositionElement",
-                "type_version": "1.0.1",
+            "org.onap.policy.clamp.acm.AutomationComposition": {
                 "properties": {
-                    "provider": "ONAP",
-                    "participant_id": {
-                        "name": "HttpParticipant0",
-                        "version": "1.0.0"
-                    },
-                    "participantType": {
-                        "name": "org.onap.policy.clamp.acm.HttpParticipant",
-                        "version": "2.3.4"
-                    },
-                    "uninitializedToPassiveTimeout": 180,
-                    "startPhase": 0,
-                    "baseUrl": "http://acelement-bridge:8084",
-                    "httpHeaders": {
-                        "Content-Type": "application/json",
-                        "Authorization": "Basic cnVudGltZVVzZXI6emIhWHp0RzM0"
+                    "provider": {
+                        "name": "provider",
+                        "type": "string",
+                        "type_version": "0.0.0",
+                        "description": "Specifies the organization that provides the automation composition element",
+                        "required": false,
+                        "metadata": {
+                            "common": "true"
+                        }
                     },
-                    "configurationEntities": [
-                        {
-                            "configurationEntityId": {
-                                "name": "onap.policy.clamp.ac.bridge",
-                                "version": "1.0.0"
-                            },
-                            "restSequence": [
-                                {
-                                    "restRequestId": {
-                                        "name": "request2",
-                                        "version": "1.0.1"
-                                    },
-                                    "httpMethod": "POST",
-                                    "path": "/onap/policy/clamp/acelement/v2/activate",
-                                    "body": "{ \"receiverId\": { \"name\": \"onap.policy.clamp.ac.bridgetosink\", \"version\": \"1.0.0\" }, \"timerMs\": 4000, \"elementType\": \"BRIDGE\", \"topicParameterGroup\": { \"server\": \"message-router\", \"listenerTopic\": \"POLICY_UPDATE_MSG\", \"publisherTopic\": \"AC_ELEMENT_MSG\", \"fetchTimeout\": 15000, \"topicCommInfrastructure\": \"dmaap\" } }",
-                                    "expectedResponse": 201
-                                }
-                            ]
+                    "elements": {
+                        "name": "elements",
+                        "type": "list",
+                        "type_version": "0.0.0",
+                        "description": "Specifies a list of automation composition element definitions that make up this automation composition definition",
+                        "required": true,
+                        "entry_schema": {
+                            "type": "onap.datatypes.ToscaConceptIdentifier",
+                            "type_version": "0.0.0"
+                        },
+                        "metadata": {
+                            "common": "true"
                         }
-                    ]
+                    }
                 },
-                "name": "onap.policy.clamp.ac.element.Http_BridgeAutomationCompositionElement",
-                "version": "1.2.3",
-                "metadata": {},
-                "description": "Automation composition element for the http requests of AC Element Bridge microservice"
+                "name": "org.onap.policy.clamp.acm.AutomationComposition",
+                "version": "1.0.1",
+                "derived_from": "tosca.nodetypes.Root",
+                "metadata": {}
             },
-            "onap.policy.clamp.ac.element.Http_SinkAutomationCompositionElement": {
-                "type": "org.onap.policy.clamp.acm.HttpAutomationCompositionElement",
-                "type_version": "1.0.1",
+            "org.onap.policy.clamp.acm.HttpAutomationCompositionElement": {
                 "properties": {
-                    "provider": "ONAP",
-                    "participant_id": {
-                        "name": "HttpParticipant0",
-                        "version": "1.0.0"
-                    },
-                    "participantType": {
-                        "name": "org.onap.policy.clamp.acm.HttpParticipant",
-                        "version": "2.3.4"
+                    "baseUrl": {
+                        "name": "baseUrl",
+                        "type": "string",
+                        "type_version": "0.0.0",
+                        "description": "The base URL to be prepended to each path, identifies the host for the REST endpoints.",
+                        "required": true
                     },
-                    "uninitializedToPassiveTimeout": 180,
-                    "startPhase": 0,
-                    "baseUrl": "http://acelement-sink:8084",
                     "httpHeaders": {
-                        "Content-Type": "application/json",
-                        "Authorization": "Basic cnVudGltZVVzZXI6emIhWHp0RzM0"
+                        "name": "httpHeaders",
+                        "type": "map",
+                        "type_version": "0.0.0",
+                        "description": "HTTP headers to send on REST requests",
+                        "required": false,
+                        "entry_schema": {
+                            "type": "string",
+                            "type_version": "0.0.0"
+                        }
                     },
-                    "configurationEntities": [
-                        {
-                            "configurationEntityId": {
-                                "name": "onap.policy.clamp.ac.sink",
-                                "version": "1.0.0"
-                            },
-                            "restSequence": [
-                                {
-                                    "restRequestId": {
-                                        "name": "request3",
-                                        "version": "1.0.1"
-                                    },
-                                    "httpMethod": "POST",
-                                    "path": "/onap/policy/clamp/acelement/v2/activate",
-                                    "body": "{ \"receiverId\": { \"name\": \"onap.policy.clamp.ac.sink\", \"version\": \"1.0.0\" }, \"timerMs\": 4000, \"elementType\": \"SINK\", \"topicParameterGroup\": { \"server\": \"message-router\", \"listenerTopic\": \"POLICY_UPDATE_MSG\", \"publisherTopic\": \"AC_ELEMENT_MSG\", \"fetchTimeout\": 15000, \"topicCommInfrastructure\": \"dmaap\" } }",
-                                    "expectedResponse": 201
-                                }
-                            ]
+                    "configurationEntities": {
+                        "name": "configurationEntities",
+                        "type": "map",
+                        "type_version": "0.0.0",
+                        "description": "The connfiguration entities the Automation Composition Element is managing and their associated REST requests",
+                        "required": true,
+                        "entry_schema": {
+                            "type": "org.onap.datatypes.policy.clamp.acm.httpAutomationCompositionElement.ConfigurationEntity",
+                            "type_version": "1.0.0"
                         }
-                    ]
+                    }
                 },
-                "name": "onap.policy.clamp.ac.element.Http_SinkAutomationCompositionElement",
-                "version": "1.2.3",
-                "metadata": {},
-                "description": "Automation composition element for the http requests of AC Element Sink microservice"
-            },
-            "onap.policy.clamp.ac.element.AutomationCompositionDefinition": {
-                "type": "org.onap.policy.clamp.acm.AutomationComposition",
-                "type_version": "1.0.1",
-                "properties": {
-                    "provider": "ONAP",
-                    "elements": [
-                        {
-                            "name": "onap.policy.clamp.ac.element.Http_StarterAutomationCompositionElement",
-                            "version": "1.2.3"
+                "name": "org.onap.policy.clamp.acm.HttpAutomationCompositionElement",
+                "version": "1.0.0",
+                "derived_from": "org.onap.policy.clamp.acm.AutomationCompositionElement",
+                "metadata": {}
+            }
+        },
+        "topology_template": {
+            "node_templates": {
+                "org.onap.policy.clamp.acm.HttpParticipant": {
+                    "type": "org.onap.policy.clamp.acm.Participant",
+                    "type_version": "1.0.1",
+                    "properties": {
+                        "provider": "ONAP"
+                    },
+                    "name": "org.onap.policy.clamp.acm.HttpParticipant",
+                    "version": "2.3.4",
+                    "metadata": {},
+                    "description": "Participant for Http requests"
+                },
+                "onap.policy.clamp.ac.element.Http_StarterAutomationCompositionElement": {
+                    "type": "org.onap.policy.clamp.acm.HttpAutomationCompositionElement",
+                    "type_version": "1.0.0",
+                    "properties": {
+                        "provider": "ONAP",
+                        "uninitializedToPassiveTimeout": 180,
+                        "startPhase": 0,
+                        "baseUrl": "http://acelement-starter:8084",
+                        "httpHeaders": {
+                            "Content-Type": "application/json",
+                            "Authorization": "Basic cnVudGltZVVzZXI6emIhWHp0RzM0"
                         },
-                        {
-                            "name": "onap.policy.clamp.ac.element.Http_BridgeAutomationCompositionElement",
-                            "version": "1.2.3"
+                        "configurationEntities": [
+                            {
+                                "configurationEntityId": {
+                                    "name": "onap.policy.clamp.ac.starter",
+                                    "version": "1.0.0"
+                                },
+                                "restSequence": [
+                                    {
+                                        "restRequestId": {
+                                            "name": "request1",
+                                            "version": "1.0.1"
+                                        },
+                                        "httpMethod": "POST",
+                                        "path": "/onap/policy/clamp/acelement/v2/activate",
+                                        "body": "{ \"receiverId\": { \"name\": \"onap.policy.clamp.ac.startertobridge\", \"version\": \"1.0.0\" }, \"timerMs\": 4000, \"elementType\": \"STARTER\", \"topicParameterGroup\": { \"server\": \"message-router\", \"listenerTopic\": \"POLICY_UPDATE_MSG\", \"publisherTopic\": \"AC_ELEMENT_MSG\", \"fetchTimeout\": 15000, \"topicCommInfrastructure\": \"dmaap\" } }",
+                                        "expectedResponse": 201
+                                    }
+                                ]
+                            }
+                        ]
+                    },
+                    "name": "onap.policy.clamp.ac.element.Http_StarterAutomationCompositionElement",
+                    "version": "1.2.3",
+                    "metadata": {},
+                    "description": "Automation composition element for the http requests of AC Element Starter microservice"
+                },
+                "onap.policy.clamp.ac.element.Http_BridgeAutomationCompositionElement": {
+                    "type": "org.onap.policy.clamp.acm.HttpAutomationCompositionElement",
+                    "type_version": "1.0.0",
+                    "properties": {
+                        "provider": "ONAP",
+                        "uninitializedToPassiveTimeout": 180,
+                        "startPhase": 0,
+                        "baseUrl": "http://acelement-bridge:8084",
+                        "httpHeaders": {
+                            "Content-Type": "application/json",
+                            "Authorization": "Basic cnVudGltZVVzZXI6emIhWHp0RzM0"
                         },
-                        {
-                            "name": "onap.policy.clamp.ac.element.Http_SinkAutomationCompositionElement",
-                            "version": "1.2.3"
-                        }
-                    ]
+                        "configurationEntities": [
+                            {
+                                "configurationEntityId": {
+                                    "name": "onap.policy.clamp.ac.bridge",
+                                    "version": "1.0.0"
+                                },
+                                "restSequence": [
+                                    {
+                                        "restRequestId": {
+                                            "name": "request2",
+                                            "version": "1.0.1"
+                                        },
+                                        "httpMethod": "POST",
+                                        "path": "/onap/policy/clamp/acelement/v2/activate",
+                                        "body": "{ \"receiverId\": { \"name\": \"onap.policy.clamp.ac.bridgetosink\", \"version\": \"1.0.0\" }, \"timerMs\": 4000, \"elementType\": \"BRIDGE\", \"topicParameterGroup\": { \"server\": \"message-router\", \"listenerTopic\": \"POLICY_UPDATE_MSG\", \"publisherTopic\": \"AC_ELEMENT_MSG\", \"fetchTimeout\": 15000, \"topicCommInfrastructure\": \"dmaap\" } }",
+                                        "expectedResponse": 201
+                                    }
+                                ]
+                            }
+                        ]
+                    },
+                    "name": "onap.policy.clamp.ac.element.Http_BridgeAutomationCompositionElement",
+                    "version": "1.2.3",
+                    "metadata": {},
+                    "description": "Automation composition element for the http requests of AC Element Bridge microservice"
                 },
-                "name": "onap.policy.clamp.ac.element.AutomationCompositionDefinition",
-                "version": "1.2.3",
-                "metadata": {},
-                "description": "Automation composition for Demp"
-            }
+                "onap.policy.clamp.ac.element.Http_SinkAutomationCompositionElement": {
+                    "type": "org.onap.policy.clamp.acm.HttpAutomationCompositionElement",
+                    "type_version": "1.0.0",
+                    "properties": {
+                        "provider": "ONAP",
+                        "uninitializedToPassiveTimeout": 180,
+                        "startPhase": 0,
+                        "baseUrl": "http://acelement-sink:8084",
+                        "httpHeaders": {
+                            "Content-Type": "application/json",
+                            "Authorization": "Basic cnVudGltZVVzZXI6emIhWHp0RzM0"
+                        },
+                        "configurationEntities": [
+                            {
+                                "configurationEntityId": {
+                                    "name": "onap.policy.clamp.ac.sink",
+                                    "version": "1.0.0"
+                                },
+                                "restSequence": [
+                                    {
+                                        "restRequestId": {
+                                            "name": "request3",
+                                            "version": "1.0.1"
+                                        },
+                                        "httpMethod": "POST",
+                                        "path": "/onap/policy/clamp/acelement/v2/activate",
+                                        "body": "{ \"receiverId\": { \"name\": \"onap.policy.clamp.ac.sink\", \"version\": \"1.0.0\" }, \"timerMs\": 4000, \"elementType\": \"SINK\", \"topicParameterGroup\": { \"server\": \"message-router\", \"listenerTopic\": \"POLICY_UPDATE_MSG\", \"publisherTopic\": \"AC_ELEMENT_MSG\", \"fetchTimeout\": 15000, \"topicCommInfrastructure\": \"dmaap\" } }",
+                                        "expectedResponse": 201
+                                    }
+                                ]
+                            }
+                        ]
+                    },
+                    "name": "onap.policy.clamp.ac.element.Http_SinkAutomationCompositionElement",
+                    "version": "1.2.3",
+                    "metadata": {},
+                    "description": "Automation composition element for the http requests of AC Element Sink microservice"
+                },
+                "onap.policy.clamp.ac.element.AutomationCompositionDefinition": {
+                    "type": "org.onap.policy.clamp.acm.AutomationComposition",
+                    "type_version": "1.0.1",
+                    "properties": {
+                        "provider": "ONAP",
+                        "elements": [
+                            {
+                                "name": "onap.policy.clamp.ac.element.Http_StarterAutomationCompositionElement",
+                                "version": "1.2.3"
+                            },
+                            {
+                                "name": "onap.policy.clamp.ac.element.Http_BridgeAutomationCompositionElement",
+                                "version": "1.2.3"
+                            },
+                            {
+                                "name": "onap.policy.clamp.ac.element.Http_SinkAutomationCompositionElement",
+                                "version": "1.2.3"
+                            }
+                        ]
+                    },
+                    "name": "onap.policy.clamp.ac.element.AutomationCompositionDefinition",
+                    "version": "1.2.3",
+                    "metadata": {},
+                    "description": "Automation composition for Demp"
+                }
+            },
+            "policies": []
+        },
+        "name": "tosca",
+        "version": "1.0.0",
+        "metadata": {
+            "compositionId": "495ead11-dad6-4fe3-946c-6e753715708b"
         }
     },
-    "name": "tosca",
-    "version": "1.0.0",
-    "metadata": {}
-}
\ No newline at end of file
+    "state": "PRIMED",
+    "stateChangeResult": "NO_ERROR",
+    "elementStateMap": {
+        "onap.policy.clamp.ac.element.Http_SinkAutomationCompositionElement": {
+            "nodeTemplateStateId": "363832a4-0281-4a69-8d37-99b4d48c5685",
+            "participantId": "101c62b3-8918-41b9-a747-d21eb79c6c91",
+            "nodeTemplateId": {
+                "name": "onap.policy.clamp.ac.element.Http_SinkAutomationCompositionElement",
+                "version": "1.2.3"
+            },
+            "state": "PRIMED",
+            "message": "Primed",
+            "outProperties": {}
+        },
+        "onap.policy.clamp.ac.element.Http_BridgeAutomationCompositionElement": {
+            "nodeTemplateStateId": "d514b576-c091-4a2c-b797-99204e6dc620",
+            "participantId": "101c62b3-8918-41b9-a747-d21eb79c6c91",
+            "nodeTemplateId": {
+                "name": "onap.policy.clamp.ac.element.Http_BridgeAutomationCompositionElement",
+                "version": "1.2.3"
+            },
+            "state": "PRIMED",
+            "message": "Primed",
+            "outProperties": {}
+        },
+        "onap.policy.clamp.ac.element.Http_StarterAutomationCompositionElement": {
+            "nodeTemplateStateId": "05773b12-9005-4166-bd03-caec308207e7",
+            "participantId": "101c62b3-8918-41b9-a747-d21eb79c6c91",
+            "nodeTemplateId": {
+                "name": "onap.policy.clamp.ac.element.Http_StarterAutomationCompositionElement",
+                "version": "1.2.3"
+            },
+            "state": "PRIMED",
+            "message": "Primed",
+            "outProperties": {}
+        }
+    }
+}
diff --git a/runtime-acm/src/main/resources/openapi/examples/getSingleCompositionDefinition.yaml b/runtime-acm/src/main/resources/openapi/examples/getSingleCompositionDefinition.yaml
index 5e2c61144..ce5e4ab68 100644..100755
--- a/runtime-acm/src/main/resources/openapi/examples/getSingleCompositionDefinition.yaml
+++ b/runtime-acm/src/main/resources/openapi/examples/getSingleCompositionDefinition.yaml
@@ -1,391 +1,371 @@
-tosca_definitions_version: tosca_simple_yaml_1_3
-data_types:
-  onap.datatypes.ToscaConceptIdentifier:
-    properties:
-      name:
-        name: name
-        type: string
-        type_version: 0.0.0
-        required: true
-      version:
-        name: version
-        type: string
-        type_version: 0.0.0
-        required: true
-    name: onap.datatypes.ToscaConceptIdentifier
-    version: 0.0.0
-    derived_from: tosca.datatypes.Root
-    metadata: {}
-  org.onap.datatypes.policy.clamp.acm.httpAutomationCompositionElement.RestRequest:
-    properties:
-      restRequestId:
-        name: restRequestId
-        type: onap.datatypes.ToscaConceptIdentifier
-        type_version: 0.0.0
-        description: The name and version of a REST request to be sent to a REST endpoint
-        required: true
-      httpMethod:
-        name: httpMethod
-        type: string
-        type_version: 0.0.0
-        description: The REST method to use
-        required: true
-        constraints:
-        - valid_values:
-          - POST
-          - PUT
-          - GET
-          - DELETE
-      path:
-        name: path
-        type: string
-        type_version: 0.0.0
-        description: The path of the REST request relative to the base URL
-        required: true
-      body:
-        name: body
-        type: string
-        type_version: 0.0.0
-        description: The body of the REST request for PUT and POST requests
-        required: false
-      expectedResponse:
-        name: expectedResponse
-        type: integer
-        type_version: 0.0.0
-        description: THe expected HTTP status code for the REST request
-        required: true
-        constraints: []
-    name: org.onap.datatypes.policy.clamp.acm.httpAutomationCompositionElement.RestRequest
-    version: 1.0.0
-    derived_from: tosca.datatypes.Root
-    metadata: {}
-  org.onap.datatypes.policy.clamp.acm.httpAutomationCompositionElement.ConfigurationEntity:
-    properties:
-      configurationEntityId:
-        name: configurationEntityId
-        type: onap.datatypes.ToscaConceptIdentifier
-        type_version: 0.0.0
-        description: The name and version of a Configuration Entity to be handled
-          by the HTTP Automation Composition Element
-        required: true
-      restSequence:
-        name: restSequence
-        type: list
-        type_version: 0.0.0
-        description: A sequence of REST commands to send to the REST endpoint
-        required: false
-        entry_schema:
-          type: org.onap.datatypes.policy.clamp.acm.httpAutomationCompositionElement.RestRequest
-          type_version: 1.0.0
-    name: org.onap.datatypes.policy.clamp.acm.httpAutomationCompositionElement.ConfigurationEntity
-    version: 1.0.0
-    derived_from: tosca.datatypes.Root
-    metadata: {}
-node_types:
-  org.onap.policy.clamp.acm.Participant:
-    properties:
-      provider:
-        name: provider
-        type: string
-        type_version: 0.0.0
-        required: false
-    name: org.onap.policy.clamp.acm.Participant
-    version: 1.0.1
-    derived_from: tosca.nodetypes.Root
-    metadata: {}
-  org.onap.policy.clamp.acm.AutomationCompositionElement:
-    properties:
-      provider:
-        name: provider
-        type: string
-        type_version: 0.0.0
-        description: Specifies the organization that provides the automation composition
-          element
-        required: false
-        metadata:
-          common: 'true'
-      participant_id:
-        name: participant_id
-        type: onap.datatypes.ToscaConceptIdentifier
-        type_version: 0.0.0
-        required: true
-        metadata:
-          common: 'true'
-      participantType:
-        name: participantType
-        type: onap.datatypes.ToscaConceptIdentifier
-        type_version: 0.0.0
-        description: The identity of the participant type that hosts this type of
-          Automation Composition Element
-        required: true
-        metadata:
-          common: 'true'
-      startPhase:
-        name: startPhase
-        type: integer
-        type_version: 0.0.0
-        description: A value indicating the start phase in which this automation composition
-          element will be started, the first start phase is zero. Automation Composition
-          Elements are started in their start_phase order and stopped in reverse start
-          phase order. Automation Composition Elements with the same start phase are
-          started and stopped simultaneously
-        required: false
-        constraints:
-        - greater_or_equal: '0'
-        metadata:
-          common: 'true'
-      uninitializedToPassiveTimeout:
-        name: uninitializedToPassiveTimeout
-        type: integer
-        type_version: 0.0.0
-        description: The maximum time in seconds to wait for a state chage from uninitialized
-          to passive
-        default: 60.0
-        required: false
-        constraints:
-        - greater_or_equal: '0'
-        metadata:
-          common: 'true'
-      passiveToRunningTimeout:
-        name: passiveToRunningTimeout
-        type: integer
-        type_version: 0.0.0
-        description: The maximum time in seconds to wait for a state chage from passive
-          to running
-        default: 60.0
-        required: false
-        constraints:
-        - greater_or_equal: '0'
-        metadata:
-          common: 'true'
-      runningToPassiveTimeout:
-        name: runningToPassiveTimeout
-        type: integer
-        type_version: 0.0.0
-        description: The maximum time in seconds to wait for a state chage from running
-          to passive
-        default: 60.0
-        required: false
-        constraints:
-        - greater_or_equal: '0'
-        metadata:
-          common: 'true'
-      passiveToUninitializedTimeout:
-        name: passiveToUninitializedTimeout
-        type: integer
-        type_version: 0.0.0
-        description: The maximum time in seconds to wait for a state chage from passive
-          to uninitialized
-        default: 60.0
-        required: false
-        constraints:
-        - greater_or_equal: '0'
-        metadata:
-          common: 'true'
-    name: org.onap.policy.clamp.acm.AutomationCompositionElement
-    version: 1.0.1
-    derived_from: tosca.nodetypes.Root
-    metadata: {}
-  org.onap.policy.clamp.acm.AutomationComposition:
-    properties:
-      provider:
-        name: provider
-        type: string
-        type_version: 0.0.0
-        description: Specifies the organization that provides the automation composition
-          element
-        required: false
-        metadata:
-          common: 'true'
-      elements:
-        name: elements
-        type: list
-        type_version: 0.0.0
-        description: Specifies a list of automation composition element definitions
-          that make up this automation composition definition
-        required: true
-        entry_schema:
-          type: onap.datatypes.ToscaConceptIdentifier
-          type_version: 0.0.0
-        metadata:
-          common: 'true'
-    name: org.onap.policy.clamp.acm.AutomationComposition
-    version: 1.0.1
-    derived_from: tosca.nodetypes.Root
-    metadata: {}
-  org.onap.policy.clamp.acm.HttpAutomationCompositionElement:
-    properties:
-      baseUrl:
-        name: baseUrl
-        type: string
-        type_version: 0.0.0
-        description: The base URL to be prepended to each path, identifies the host
-          for the REST endpoints.
-        required: true
-      httpHeaders:
-        name: httpHeaders
-        type: map
-        type_version: 0.0.0
-        description: HTTP headers to send on REST requests
-        required: false
-        entry_schema:
-          type: string
-          type_version: 0.0.0
-      configurationEntities:
-        name: configurationEntities
-        type: map
-        type_version: 0.0.0
-        description: The connfiguration entities the Automation Composition Element
-          is managing and their associated REST requests
-        required: true
-        entry_schema:
-          type: org.onap.datatypes.policy.clamp.acm.httpAutomationCompositionElement.ConfigurationEntity
-          type_version: 1.0.0
-    name: org.onap.policy.clamp.acm.HttpAutomationCompositionElement
-    version: 1.0.1
-    derived_from: org.onap.policy.clamp.acm.AutomationCompositionElement
-    metadata: {}
-topology_template:
-  node_templates:
-    org.onap.policy.clamp.acm.HttpParticipant:
-      type: org.onap.policy.clamp.acm.Participant
-      type_version: 1.0.1
-      properties:
-        provider: ONAP
-      name: org.onap.policy.clamp.acm.HttpParticipant
-      version: 2.3.4
-      metadata: {}
-      description: Participant for Http requests
-    onap.policy.clamp.ac.element.Http_StarterAutomationCompositionElement:
-      type: org.onap.policy.clamp.acm.HttpAutomationCompositionElement
-      type_version: 1.0.1
-      properties:
-        provider: ONAP
-        participant_id:
-          name: HttpParticipant0
+compositionId: 562ed027-2689-481a-b3a5-e284b1fbc33f
+serviceTemplate:
+    tosca_definitions_version: tosca_simple_yaml_1_3
+    data_types:
+        onap.datatypes.ToscaConceptIdentifier:
+            properties:
+                name:
+                    name: name
+                    type: string
+                    type_version: 0.0.0
+                    required: true
+                version:
+                    name: version
+                    type: string
+                    type_version: 0.0.0
+                    required: true
+            name: onap.datatypes.ToscaConceptIdentifier
+            version: 0.0.0
+            derived_from: tosca.datatypes.Root
+            metadata: {}
+        org.onap.datatypes.policy.clamp.acm.httpAutomationCompositionElement.RestRequest:
+          properties:
+              restRequestId:
+                  name: restRequestId
+                  type: onap.datatypes.ToscaConceptIdentifier
+                  type_version: 0.0.0
+                  description:
+                      The name and version of a REST request to be sent to a REST
+                      endpoint
+                  required: true
+              httpMethod:
+                  name: httpMethod
+                  type: string
+                  type_version: 0.0.0
+                  description: The REST method to use
+                  required: true
+                  constraints:
+                      - valid_values:
+                            - POST
+                            - PUT
+                            - GET
+                            - DELETE
+              path:
+                  name: path
+                  type: string
+                  type_version: 0.0.0
+                  description: The path of the REST request relative to the base URL
+                  required: true
+              body:
+                  name: body
+                  type: string
+                  type_version: 0.0.0
+                  description: The body of the REST request for PUT and POST requests
+                  required: false
+              expectedResponse:
+                  name: expectedResponse
+                  type: integer
+                  type_version: 0.0.0
+                  description: THe expected HTTP status code for the REST request
+                  required: true
+                  constraints: []
+          name: org.onap.datatypes.policy.clamp.acm.httpAutomationCompositionElement.RestRequest
           version: 1.0.0
-        participantType:
-          name: org.onap.policy.clamp.acm.HttpParticipant
-          version: 2.3.4
-        uninitializedToPassiveTimeout: 180
-        startPhase: 0
-        baseUrl: http://acelement-starter:8084
-        httpHeaders:
-          Content-Type: application/json
-          Authorization: Basic cnVudGltZVVzZXI6emIhWHp0RzM0
-        configurationEntities:
-        - configurationEntityId:
-            name: onap.policy.clamp.ac.starter
-            version: 1.0.0
-          restSequence:
-          - restRequestId:
-              name: request1
-              version: 1.0.1
-            httpMethod: POST
-            path: /onap/policy/clamp/acelement/v2/activate
-            body: '{ "receiverId": { "name": "onap.policy.clamp.ac.startertobridge",
-              "version": "1.0.0" }, "timerMs": 4000, "elementType": "STARTER", "topicParameterGroup":
-              { "server": "message-router", "listenerTopic": "POLICY_UPDATE_MSG",
-              "publisherTopic": "AC_ELEMENT_MSG", "fetchTimeout": 15000, "topicCommInfrastructure":
-              "dmaap" } }'
-            expectedResponse: 201
-      name: onap.policy.clamp.ac.element.Http_StarterAutomationCompositionElement
-      version: 1.2.3
-      metadata: {}
-      description: Automation composition element for the http requests of AC Element
-        Starter microservice
-    onap.policy.clamp.ac.element.Http_BridgeAutomationCompositionElement:
-      type: org.onap.policy.clamp.acm.HttpAutomationCompositionElement
-      type_version: 1.0.1
-      properties:
-        provider: ONAP
-        participant_id:
-          name: HttpParticipant0
+          derived_from: tosca.datatypes.Root
+          metadata: {}
+        org.onap.datatypes.policy.clamp.acm.httpAutomationCompositionElement.ConfigurationEntity:
+          properties:
+              configurationEntityId:
+                  name: configurationEntityId
+                  type: onap.datatypes.ToscaConceptIdentifier
+                  type_version: 0.0.0
+                  description:
+                      The name and version of a Configuration Entity to be handled
+                      by the HTTP Automation Composition Element
+                  required: true
+              restSequence:
+                  name: restSequence
+                  type: list
+                  type_version: 0.0.0
+                  description: A sequence of REST commands to send to the REST endpoint
+                  required: false
+                  entry_schema:
+                      type: org.onap.datatypes.policy.clamp.acm.httpAutomationCompositionElement.RestRequest
+                      type_version: 1.0.0
+          name: org.onap.datatypes.policy.clamp.acm.httpAutomationCompositionElement.ConfigurationEntity
           version: 1.0.0
-        participantType:
-          name: org.onap.policy.clamp.acm.HttpParticipant
-          version: 2.3.4
-        uninitializedToPassiveTimeout: 180
-        startPhase: 0
-        baseUrl: http://acelement-bridge:8084
-        httpHeaders:
-          Content-Type: application/json
-          Authorization: Basic cnVudGltZVVzZXI6emIhWHp0RzM0
-        configurationEntities:
-        - configurationEntityId:
-            name: onap.policy.clamp.ac.bridge
+          derived_from: tosca.datatypes.Root
+          metadata: {}
+    node_types:
+        org.onap.policy.clamp.acm.Participant:
+            properties:
+                provider:
+                    name: provider
+                    type: string
+                    type_version: 0.0.0
+                    required: false
+            name: org.onap.policy.clamp.acm.Participant
+            version: 1.0.1
+            derived_from: tosca.nodetypes.Root
+            metadata: {}
+        org.onap.policy.clamp.acm.AutomationCompositionElement:
+            properties:
+                provider:
+                    name: provider
+                    type: string
+                    type_version: 0.0.0
+                    description:
+                        Specifies the organization that provides the automation composition
+                        element
+                    required: false
+                    metadata:
+                        common: "true"
+                startPhase:
+                    name: startPhase
+                    type: integer
+                    type_version: 0.0.0
+                    description:
+                        A value indicating the start phase in which this automation
+                        composition element will be started, the first start phase is zero. Automation
+                        Composition Elements are started in their start_phase order and stopped
+                        in reverse start phase order. Automation Composition Elements with the
+                        same start phase are started and stopped simultaneously
+                    required: false
+                    constraints:
+                        - greater_or_equal: "0"
+                    metadata:
+                        common: "true"
+                uninitializedToPassiveTimeout:
+                    name: uninitializedToPassiveTimeout
+                    type: integer
+                    type_version: 0.0.0
+                    description:
+                        The maximum time in seconds to wait for a state chage from
+                        uninitialized to passive
+                    default: 60.0
+                    required: false
+                    constraints:
+                        - greater_or_equal: "0"
+                    metadata:
+                        common: "true"
+            name: org.onap.policy.clamp.acm.AutomationCompositionElement
+            version: 1.0.1
+            derived_from: tosca.nodetypes.Root
+            metadata: {}
+        org.onap.policy.clamp.acm.AutomationComposition:
+            properties:
+                provider:
+                    name: provider
+                    type: string
+                    type_version: 0.0.0
+                    description:
+                        Specifies the organization that provides the automation composition
+                        element
+                    required: false
+                    metadata:
+                        common: "true"
+                elements:
+                    name: elements
+                    type: list
+                    type_version: 0.0.0
+                    description:
+                        Specifies a list of automation composition element definitions
+                        that make up this automation composition definition
+                    required: true
+                    entry_schema:
+                        type: onap.datatypes.ToscaConceptIdentifier
+                        type_version: 0.0.0
+                    metadata:
+                        common: "true"
+            name: org.onap.policy.clamp.acm.AutomationComposition
+            version: 1.0.1
+            derived_from: tosca.nodetypes.Root
+            metadata: {}
+        org.onap.policy.clamp.acm.HttpAutomationCompositionElement:
+            properties:
+                baseUrl:
+                    name: baseUrl
+                    type: string
+                    type_version: 0.0.0
+                    description:
+                        The base URL to be prepended to each path, identifies the host
+                        for the REST endpoints.
+                    required: true
+                httpHeaders:
+                    name: httpHeaders
+                    type: map
+                    type_version: 0.0.0
+                    description: HTTP headers to send on REST requests
+                    required: false
+                    entry_schema:
+                        type: string
+                        type_version: 0.0.0
+                configurationEntities:
+                    name: configurationEntities
+                    type: map
+                    type_version: 0.0.0
+                    description:
+                        The connfiguration entities the Automation Composition Element
+                        is managing and their associated REST requests
+                    required: true
+                    entry_schema:
+                        type: org.onap.datatypes.policy.clamp.acm.httpAutomationCompositionElement.ConfigurationEntity
+                        type_version: 1.0.0
+            name: org.onap.policy.clamp.acm.HttpAutomationCompositionElement
             version: 1.0.0
-          restSequence:
-          - restRequestId:
-              name: request2
-              version: 1.0.1
-            httpMethod: POST
-            path: /onap/policy/clamp/acelement/v2/activate
-            body: '{ "receiverId": { "name": "onap.policy.clamp.ac.bridgetosink",
-              "version": "1.0.0" }, "timerMs": 4000, "elementType": "BRIDGE", "topicParameterGroup":
-              { "server": "message-router", "listenerTopic": "POLICY_UPDATE_MSG",
-              "publisherTopic": "AC_ELEMENT_MSG", "fetchTimeout": 15000, "topicCommInfrastructure":
-              "dmaap" } }'
-            expectedResponse: 201
-      name: onap.policy.clamp.ac.element.Http_BridgeAutomationCompositionElement
-      version: 1.2.3
-      metadata: {}
-      description: Automation composition element for the http requests of AC Element
-        Bridge microservice
+            derived_from: org.onap.policy.clamp.acm.AutomationCompositionElement
+            metadata: {}
+    topology_template:
+        node_templates:
+            org.onap.policy.clamp.acm.HttpParticipant:
+                type: org.onap.policy.clamp.acm.Participant
+                type_version: 1.0.1
+                properties:
+                    provider: ONAP
+                name: org.onap.policy.clamp.acm.HttpParticipant
+                version: 2.3.4
+                metadata: {}
+                description: Participant for Http requests
+            onap.policy.clamp.ac.element.Http_StarterAutomationCompositionElement:
+              type: org.onap.policy.clamp.acm.HttpAutomationCompositionElement
+              type_version: 1.0.0
+              properties:
+                  provider: ONAP
+                  uninitializedToPassiveTimeout: 180
+                  startPhase: 0
+                  baseUrl: http://acelement-starter:8084
+                  httpHeaders:
+                      Content-Type: application/json
+                      Authorization: Basic cnVudGltZVVzZXI6emIhWHp0RzM0
+                  configurationEntities:
+                      - configurationEntityId:
+                            name: onap.policy.clamp.ac.starter
+                            version: 1.0.0
+                        restSequence:
+                            - restRequestId:
+                                  name: request1
+                                  version: 1.0.1
+                              httpMethod: POST
+                              path: /onap/policy/clamp/acelement/v2/activate
+                              body:
+                                  '{ "receiverId": { "name": "onap.policy.clamp.ac.startertobridge",
+                                  "version": "1.0.0" }, "timerMs": 4000, "elementType": "STARTER", "topicParameterGroup":
+                                  { "server": "message-router", "listenerTopic": "POLICY_UPDATE_MSG",
+                                  "publisherTopic": "AC_ELEMENT_MSG", "fetchTimeout": 15000, "topicCommInfrastructure":
+                                  "dmaap" } }'
+                              expectedResponse: 201
+              name: onap.policy.clamp.ac.element.Http_StarterAutomationCompositionElement
+              version: 1.2.3
+              metadata: {}
+              description:
+                  Automation composition element for the http requests of AC Element
+                  Starter microservice
+            onap.policy.clamp.ac.element.Http_BridgeAutomationCompositionElement:
+              type: org.onap.policy.clamp.acm.HttpAutomationCompositionElement
+              type_version: 1.0.0
+              properties:
+                  provider: ONAP
+                  uninitializedToPassiveTimeout: 180
+                  startPhase: 0
+                  baseUrl: http://acelement-bridge:8084
+                  httpHeaders:
+                      Content-Type: application/json
+                      Authorization: Basic cnVudGltZVVzZXI6emIhWHp0RzM0
+                  configurationEntities:
+                      - configurationEntityId:
+                            name: onap.policy.clamp.ac.bridge
+                            version: 1.0.0
+                        restSequence:
+                            - restRequestId:
+                                  name: request2
+                                  version: 1.0.1
+                              httpMethod: POST
+                              path: /onap/policy/clamp/acelement/v2/activate
+                              body:
+                                  '{ "receiverId": { "name": "onap.policy.clamp.ac.bridgetosink",
+                                  "version": "1.0.0" }, "timerMs": 4000, "elementType": "BRIDGE", "topicParameterGroup":
+                                  { "server": "message-router", "listenerTopic": "POLICY_UPDATE_MSG",
+                                  "publisherTopic": "AC_ELEMENT_MSG", "fetchTimeout": 15000, "topicCommInfrastructure":
+                                  "dmaap" } }'
+                              expectedResponse: 201
+              name: onap.policy.clamp.ac.element.Http_BridgeAutomationCompositionElement
+              version: 1.2.3
+              metadata: {}
+              description:
+                  Automation composition element for the http requests of AC Element
+                  Bridge microservice
+            onap.policy.clamp.ac.element.Http_SinkAutomationCompositionElement:
+                type: org.onap.policy.clamp.acm.HttpAutomationCompositionElement
+                type_version: 1.0.0
+                properties:
+                    provider: ONAP
+                    uninitializedToPassiveTimeout: 180
+                    startPhase: 0
+                    baseUrl: http://acelement-sink:8084
+                    httpHeaders:
+                        Content-Type: application/json
+                        Authorization: Basic cnVudGltZVVzZXI6emIhWHp0RzM0
+                    configurationEntities:
+                        - configurationEntityId:
+                              name: onap.policy.clamp.ac.sink
+                              version: 1.0.0
+                          restSequence:
+                              - restRequestId:
+                                    name: request3
+                                    version: 1.0.1
+                                httpMethod: POST
+                                path: /onap/policy/clamp/acelement/v2/activate
+                                body:
+                                    '{ "receiverId": { "name": "onap.policy.clamp.ac.sink", "version":
+                                    "1.0.0" }, "timerMs": 4000, "elementType": "SINK", "topicParameterGroup":
+                                    { "server": "message-router", "listenerTopic": "POLICY_UPDATE_MSG",
+                                    "publisherTopic": "AC_ELEMENT_MSG", "fetchTimeout": 15000, "topicCommInfrastructure":
+                                    "dmaap" } }'
+                                expectedResponse: 201
+                name: onap.policy.clamp.ac.element.Http_SinkAutomationCompositionElement
+                version: 1.2.3
+                metadata: {}
+                description:
+                    Automation composition element for the http requests of AC Element
+                    Sink microservice
+            onap.policy.clamp.ac.element.AutomationCompositionDefinition:
+                type: org.onap.policy.clamp.acm.AutomationComposition
+                type_version: 1.0.1
+                properties:
+                    provider: ONAP
+                    elements:
+                        - name: onap.policy.clamp.ac.element.Http_StarterAutomationCompositionElement
+                          version: 1.2.3
+                        - name: onap.policy.clamp.ac.element.Http_BridgeAutomationCompositionElement
+                          version: 1.2.3
+                        - name: onap.policy.clamp.ac.element.Http_SinkAutomationCompositionElement
+                          version: 1.2.3
+                name: onap.policy.clamp.ac.element.AutomationCompositionDefinition
+                version: 1.2.3
+                metadata: {}
+                description: Automation composition for Demp
+        policies: []
+    name: tosca
+    version: 1.0.0
+    metadata:
+        compositionId: 495ead11-dad6-4fe3-946c-6e753715708b
+state: PRIMED
+stateChangeResult: NO_ERROR
+elementStateMap:
     onap.policy.clamp.ac.element.Http_SinkAutomationCompositionElement:
-      type: org.onap.policy.clamp.acm.HttpAutomationCompositionElement
-      type_version: 1.0.1
-      properties:
-        provider: ONAP
-        participant_id:
-          name: HttpParticipant0
-          version: 1.0.0
-        participantType:
-          name: org.onap.policy.clamp.acm.HttpParticipant
-          version: 2.3.4
-        uninitializedToPassiveTimeout: 180
-        startPhase: 0
-        baseUrl: http://acelement-sink:8084
-        httpHeaders:
-          Content-Type: application/json
-          Authorization: Basic cnVudGltZVVzZXI6emIhWHp0RzM0
-        configurationEntities:
-        - configurationEntityId:
-            name: onap.policy.clamp.ac.sink
-            version: 1.0.0
-          restSequence:
-          - restRequestId:
-              name: request3
-              version: 1.0.1
-            httpMethod: POST
-            path: /onap/policy/clamp/acelement/v2/activate
-            body: '{ "receiverId": { "name": "onap.policy.clamp.ac.sink", "version":
-              "1.0.0" }, "timerMs": 4000, "elementType": "SINK", "topicParameterGroup":
-              { "server": "message-router", "listenerTopic": "POLICY_UPDATE_MSG",
-              "publisherTopic": "AC_ELEMENT_MSG", "fetchTimeout": 15000, "topicCommInfrastructure":
-              "dmaap" } }'
-            expectedResponse: 201
-      name: onap.policy.clamp.ac.element.Http_SinkAutomationCompositionElement
-      version: 1.2.3
-      metadata: {}
-      description: Automation composition element for the http requests of AC Element
-        Sink microservice
-    onap.policy.clamp.ac.element.AutomationCompositionDefinition:
-      type: org.onap.policy.clamp.acm.AutomationComposition
-      type_version: 1.0.1
-      properties:
-        provider: ONAP
-        elements:
-        - name: onap.policy.clamp.ac.element.Http_StarterAutomationCompositionElement
-          version: 1.2.3
-        - name: onap.policy.clamp.ac.element.Http_BridgeAutomationCompositionElement
-          version: 1.2.3
-        - name: onap.policy.clamp.ac.element.Http_SinkAutomationCompositionElement
-          version: 1.2.3
-      name: onap.policy.clamp.ac.element.AutomationCompositionDefinition
-      version: 1.2.3
-      metadata: {}
-      description: Automation composition for Demp
-name: tosca
-version: 1.0.0
-metadata: {}
+        nodeTemplateStateId: 363832a4-0281-4a69-8d37-99b4d48c5685
+        participantId: 101c62b3-8918-41b9-a747-d21eb79c6c91
+        nodeTemplateId:
+            name: onap.policy.clamp.ac.element.Http_SinkAutomationCompositionElement
+            version: 1.2.3
+        state: PRIMED
+        message: Primed
+        outProperties: {}
+    onap.policy.clamp.ac.element.Http_BridgeAutomationCompositionElement:
+        nodeTemplateStateId: d514b576-c091-4a2c-b797-99204e6dc620
+        participantId: 101c62b3-8918-41b9-a747-d21eb79c6c91
+        nodeTemplateId:
+            name: onap.policy.clamp.ac.element.Http_BridgeAutomationCompositionElement
+            version: 1.2.3
+        state: PRIMED
+        message: Primed
+        outProperties: {}
+    onap.policy.clamp.ac.element.Http_StarterAutomationCompositionElement:
+        nodeTemplateStateId: 05773b12-9005-4166-bd03-caec308207e7
+        participantId: 101c62b3-8918-41b9-a747-d21eb79c6c91
+        nodeTemplateId:
+            name: onap.policy.clamp.ac.element.Http_StarterAutomationCompositionElement
+            version: 1.2.3
+        state: PRIMED
+        message: Primed
+        outProperties: {}
diff --git a/runtime-acm/src/main/resources/openapi/examples/getSingleParticipantResponse.json b/runtime-acm/src/main/resources/openapi/examples/getSingleParticipantResponse.json
index 350fd29d7..5d13996ac 100644..100755
--- a/runtime-acm/src/main/resources/openapi/examples/getSingleParticipantResponse.json
+++ b/runtime-acm/src/main/resources/openapi/examples/getSingleParticipantResponse.json
@@ -1,43 +1,170 @@
 {
-  "participant": {
-    "participantId": "101c62b3-8918-41b9-a747-d21eb79c6c03",
-    "participantState": "ON_LINE",
-    "participantSupportedElementTypes": {
-      "3012010d-e59e-4dde-bab1-3ee544e49b6d": {
-        "id": "3012010d-e59e-4dde-bab1-3ee544e49b6d",
-        "typeName": "org.onap.policy.clamp.acm.AutomationCompositionElement",
-        "typeVersion": "1.0.1"
-      },
-      "8d9e947e-c444-471c-9420-29f1c6584f8c": {
-        "id": "8d9e947e-c444-471c-9420-29f1c6584f8c",
-        "typeName": "org.onap.policy.clamp.acm.PolicyAutomationCompositionElement",
-        "typeVersion": "1.0.1"
-      }
+    "participant": {
+        "participantId": "101c62b3-8918-41b9-a747-d21eb79c6c91",
+        "participantState": "ON_LINE",
+        "participantSupportedElementTypes": {
+            "14c6d6d0-0fa2-4a7f-927a-afdab75e92c4": {
+                "id": "14c6d6d0-0fa2-4a7f-927a-afdab75e92c4",
+                "typeName": "org.onap.policy.clamp.acm.HttpAutomationCompositionElement",
+                "typeVersion": "1.0.0"
+            }
+        }
+    },
+    "acNodeTemplateStateDefinitionMap": {
+        "d514b576-c091-4a2c-b797-99204e6dc620": {
+            "nodeTemplateStateId": "d514b576-c091-4a2c-b797-99204e6dc620",
+            "participantId": "101c62b3-8918-41b9-a747-d21eb79c6c91",
+            "nodeTemplateId": {
+                "name": "onap.policy.clamp.ac.element.Http_BridgeAutomationCompositionElement",
+                "version": "1.2.3"
+            },
+            "state": "PRIMED",
+            "message": "Primed",
+            "outProperties": {}
+        },
+        "05773b12-9005-4166-bd03-caec308207e7": {
+            "nodeTemplateStateId": "05773b12-9005-4166-bd03-caec308207e7",
+            "participantId": "101c62b3-8918-41b9-a747-d21eb79c6c91",
+            "nodeTemplateId": {
+                "name": "onap.policy.clamp.ac.element.Http_StarterAutomationCompositionElement",
+                "version": "1.2.3"
+            },
+            "state": "PRIMED",
+            "message": "Primed",
+            "outProperties": {}
+        },
+        "363832a4-0281-4a69-8d37-99b4d48c5685": {
+            "nodeTemplateStateId": "363832a4-0281-4a69-8d37-99b4d48c5685",
+            "participantId": "101c62b3-8918-41b9-a747-d21eb79c6c91",
+            "nodeTemplateId": {
+                "name": "onap.policy.clamp.ac.element.Http_SinkAutomationCompositionElement",
+                "version": "1.2.3"
+            },
+            "state": "PRIMED",
+            "message": "Primed",
+            "outProperties": {}
+        }
+    },
+    "acElementInstanceMap": {
+        "709c62b3-8918-41b9-a747-d21eb79c6c23": {
+            "id": "709c62b3-8918-41b9-a747-d21eb79c6c23",
+            "definition": {
+                "name": "onap.policy.clamp.ac.element.Http_SinkAutomationCompositionElement",
+                "version": "1.2.3"
+            },
+            "participantId": "101c62b3-8918-41b9-a747-d21eb79c6c91",
+            "deployState": "DEPLOYED",
+            "lockState": "LOCKED",
+            "description": "Sink Automation Composition Element for the Demo",
+            "message": "Deployed",
+            "properties": {
+                "baseUrl": "http://10.101.0.249:30802",
+                "httpHeaders": {
+                    "Content-Type": "application/json",
+                    "Authorization": "Basic YWNtVXNlcjp6YiFYenRHMzQ="
+                },
+                "configurationEntities": [
+                    {
+                        "configurationEntityId": {
+                            "name": "onap.policy.clamp.ac.sink",
+                            "version": "1.0.0"
+                        },
+                        "restSequence": [
+                            {
+                                "restRequestId": {
+                                    "name": "request3",
+                                    "version": "1.0.1"
+                                },
+                                "httpMethod": "POST",
+                                "path": "/activate",
+                                "body": "{ \"receiverId\": { \"name\": \"onap.policy.clamp.ac.sink\", \"version\": \"1.0.0\" }, \"timerMs\": 20000, \"elementType\": \"SINK\", \"topicParameterGroup\": { \"server\": \"message-router\", \"listenerTopic\": \"POLICY_UPDATE_MSG\", \"publisherTopic\": \"AC_ELEMENT_MSG\", \"fetchTimeout\": 15000, \"topicCommInfrastructure\": \"dmaap\" } }",
+                                "expectedResponse": 201
+                            }
+                        ]
+                    }
+                ]
+            },
+            "outProperties": {}
+        },
+        "709c62b3-8918-41b9-a747-d21eb79c6c25": {
+            "id": "709c62b3-8918-41b9-a747-d21eb79c6c25",
+            "definition": {
+                "name": "onap.policy.clamp.ac.element.Http_BridgeAutomationCompositionElement",
+                "version": "1.2.3"
+            },
+            "participantId": "101c62b3-8918-41b9-a747-d21eb79c6c91",
+            "deployState": "DEPLOYED",
+            "lockState": "LOCKED",
+            "description": "Bridge Automation Composition Element for the Demo",
+            "message": "Deployed",
+            "properties": {
+                "baseUrl": "http://10.101.0.249:30801",
+                "httpHeaders": {
+                    "Content-Type": "application/json",
+                    "Authorization": "Basic YWNtVXNlcjp6YiFYenRHMzQ="
+                },
+                "configurationEntities": [
+                    {
+                        "configurationEntityId": {
+                            "name": "onap.policy.clamp.ac.bridge",
+                            "version": "1.0.0"
+                        },
+                        "restSequence": [
+                            {
+                                "restRequestId": {
+                                    "name": "request2",
+                                    "version": "1.0.1"
+                                },
+                                "httpMethod": "POST",
+                                "path": "/activate",
+                                "body": "{ \"receiverId\": { \"name\": \"onap.policy.clamp.ac.bridgetosink\", \"version\": \"1.0.0\" }, \"timerMs\": 20000, \"elementType\": \"BRIDGE\", \"topicParameterGroup\": { \"server\": \"message-router:3904\", \"listenerTopic\": \"POLICY_UPDATE_MSG\", \"publisherTopic\": \"AC_ELEMENT_MSG\", \"fetchTimeout\": 15000, \"topicCommInfrastructure\": \"dmaap\" } }",
+                                "expectedResponse": 201
+                            }
+                        ]
+                    }
+                ]
+            },
+            "outProperties": {}
+        },
+        "709c62b3-8918-41b9-a747-d21eb79c6c24": {
+            "id": "709c62b3-8918-41b9-a747-d21eb79c6c24",
+            "definition": {
+                "name": "onap.policy.clamp.ac.element.Http_StarterAutomationCompositionElement",
+                "version": "1.2.3"
+            },
+            "participantId": "101c62b3-8918-41b9-a747-d21eb79c6c91",
+            "deployState": "DEPLOYED",
+            "lockState": "LOCKED",
+            "description": "Starter Automation Composition Element for the Demo",
+            "message": "Deployed",
+            "properties": {
+                "baseUrl": "http://10.101.0.249:30800",
+                "httpHeaders": {
+                    "Content-Type": "application/json",
+                    "Authorization": "Basic YWNtVXNlcjp6YiFYenRHMzQ="
+                },
+                "configurationEntities": [
+                    {
+                        "configurationEntityId": {
+                            "name": "onap.policy.clamp.ac.starter",
+                            "version": "1.0.0"
+                        },
+                        "restSequence": [
+                            {
+                                "restRequestId": {
+                                    "name": "request1",
+                                    "version": "1.0.1"
+                                },
+                                "httpMethod": "POST",
+                                "path": "/activate",
+                                "body": "{ \"receiverId\": { \"name\": \"onap.policy.clamp.ac.startertobridge\", \"version\": \"1.0.0\" }, \"timerMs\": 20000, \"elementType\": \"STARTER\", \"topicParameterGroup\": { \"server\": \"message-router:3904\", \"listenerTopic\": \"POLICY_UPDATE_MSG\", \"publisherTopic\": \"AC_ELEMENT_MSG\", \"fetchTimeout\": 15000, \"topicCommInfrastructure\": \"dmaap\" } }",
+                                "expectedResponse": 201
+                            }
+                        ]
+                    }
+                ]
+            },
+            "outProperties": {}
+        }
     }
-  },
-  "acNodeTemplateStateDefinitionMap": {
-    "8cf8b401-dfd7-4ffe-90ff-c6543da10789": {
-      "nodeTemplateStateId": "8cf8b401-dfd7-4ffe-90ff-c6543da10789",
-      "participantId": "101c62b3-8918-41b9-a747-d21eb79c6c03",
-      "nodeTemplateId": {
-        "name": "org.onap.domain.pmsh.PMSH_OperationalPolicyAutomationCompositionElement",
-        "version": "1.2.3"
-      },
-      "state": "PRIMED"
-    }
-  },
-  "acElementInstanceMap": {
-    "709c62b3-8918-41b9-a747-d21eb79c6c22": {
-      "id": "709c62b3-8918-41b9-a747-d21eb79c6c22",
-      "definition": {
-        "name": "org.onap.domain.pmsh.PMSH_OperationalPolicyAutomationCompositionElement",
-        "version": "1.2.3"
-      },
-      "participantId": "101c62b3-8918-41b9-a747-d21eb79c6c03",
-      "deployState": "DEPLOYED",
-      "lockState": "UNLOCKED",
-      "description": "Automation composition element for the operational policy for Performance Management Subscription Handling",
-      "properties": {}
-    }
-  }
 }
diff --git a/runtime-acm/src/main/resources/openapi/examples/getSingleparticipantResponse.yaml b/runtime-acm/src/main/resources/openapi/examples/getSingleparticipantResponse.yaml
index 0c2dc69b5..c099f1115 100644..100755
--- a/runtime-acm/src/main/resources/openapi/examples/getSingleparticipantResponse.yaml
+++ b/runtime-acm/src/main/resources/openapi/examples/getSingleparticipantResponse.yaml
@@ -1,32 +1,136 @@
 participant:
-  participantId: 101c62b3-8918-41b9-a747-d21eb79c6c03
-  participantState: ON_LINE
-  participantSupportedElementTypes:
-    3012010d-e59e-4dde-bab1-3ee544e49b6d:
-      id: 3012010d-e59e-4dde-bab1-3ee544e49b6d
-      typeName: org.onap.policy.clamp.acm.AutomationCompositionElement
-      typeVersion: 1.0.1
-    8d9e947e-c444-471c-9420-29f1c6584f8c:
-      id: 8d9e947e-c444-471c-9420-29f1c6584f8c
-      typeName: org.onap.policy.clamp.acm.PolicyAutomationCompositionElement
-      typeVersion: 1.0.1
+    participantId: 101c62b3-8918-41b9-a747-d21eb79c6c91
+    participantState: ON_LINE
+    participantSupportedElementTypes:
+        14c6d6d0-0fa2-4a7f-927a-afdab75e92c4:
+            id: 14c6d6d0-0fa2-4a7f-927a-afdab75e92c4
+            typeName: org.onap.policy.clamp.acm.HttpAutomationCompositionElement
+            typeVersion: 1.0.0
 acNodeTemplateStateDefinitionMap:
-  8cf8b401-dfd7-4ffe-90ff-c6543da10789:
-    nodeTemplateStateId: 8cf8b401-dfd7-4ffe-90ff-c6543da10789
-    participantId: 101c62b3-8918-41b9-a747-d21eb79c6c03
-    nodeTemplateId:
-      name: org.onap.domain.pmsh.PMSH_OperationalPolicyAutomationCompositionElement
-      version: 1.2.3
-    state: PRIMED
+    d514b576-c091-4a2c-b797-99204e6dc620:
+        nodeTemplateStateId: d514b576-c091-4a2c-b797-99204e6dc620
+        participantId: 101c62b3-8918-41b9-a747-d21eb79c6c91
+        nodeTemplateId:
+            name: onap.policy.clamp.ac.element.Http_BridgeAutomationCompositionElement
+            version: 1.2.3
+        state: PRIMED
+        message: Primed
+        outProperties: {}
+    05773b12-9005-4166-bd03-caec308207e7:
+        nodeTemplateStateId: 05773b12-9005-4166-bd03-caec308207e7
+        participantId: 101c62b3-8918-41b9-a747-d21eb79c6c91
+        nodeTemplateId:
+            name: onap.policy.clamp.ac.element.Http_StarterAutomationCompositionElement
+            version: 1.2.3
+        state: PRIMED
+        message: Primed
+        outProperties: {}
+    363832a4-0281-4a69-8d37-99b4d48c5685:
+        nodeTemplateStateId: 363832a4-0281-4a69-8d37-99b4d48c5685
+        participantId: 101c62b3-8918-41b9-a747-d21eb79c6c91
+        nodeTemplateId:
+            name: onap.policy.clamp.ac.element.Http_SinkAutomationCompositionElement
+            version: 1.2.3
+        state: PRIMED
+        message: Primed
+        outProperties: {}
 acElementInstanceMap:
-  709c62b3-8918-41b9-a747-d21eb79c6c22:
-    id: 709c62b3-8918-41b9-a747-d21eb79c6c22
-    definition:
-      name: org.onap.domain.pmsh.PMSH_OperationalPolicyAutomationCompositionElement
-      version: 1.2.3
-    participantId: 101c62b3-8918-41b9-a747-d21eb79c6c03
-    deployState: DEPLOYED
-    lockState: UNLOCKED
-    description: Automation composition element for the operational policy for Performance
-      Management Subscription Handling
-    properties: {}
+    709c62b3-8918-41b9-a747-d21eb79c6c23:
+        id: 709c62b3-8918-41b9-a747-d21eb79c6c23
+        definition:
+            name: onap.policy.clamp.ac.element.Http_SinkAutomationCompositionElement
+            version: 1.2.3
+        participantId: 101c62b3-8918-41b9-a747-d21eb79c6c91
+        deployState: DEPLOYED
+        lockState: LOCKED
+        description: Sink Automation Composition Element for the Demo
+        message: Deployed
+        properties:
+            baseUrl: http://10.101.0.249:30802
+            httpHeaders:
+                Content-Type: application/json
+                Authorization: Basic YWNtVXNlcjp6YiFYenRHMzQ=
+            configurationEntities:
+                - configurationEntityId:
+                      name: onap.policy.clamp.ac.sink
+                      version: 1.0.0
+                  restSequence:
+                      - restRequestId:
+                            name: request3
+                            version: 1.0.1
+                        httpMethod: POST
+                        path: /activate
+                        body:
+                            '{ "receiverId": { "name": "onap.policy.clamp.ac.sink", "version":
+                            "1.0.0" }, "timerMs": 20000, "elementType": "SINK", "topicParameterGroup":
+                            { "server": "message-router", "listenerTopic": "POLICY_UPDATE_MSG", "publisherTopic":
+                            "AC_ELEMENT_MSG", "fetchTimeout": 15000, "topicCommInfrastructure": "dmaap"
+                            } }'
+                        expectedResponse: 201
+        outProperties: {}
+    709c62b3-8918-41b9-a747-d21eb79c6c25:
+        id: 709c62b3-8918-41b9-a747-d21eb79c6c25
+        definition:
+            name: onap.policy.clamp.ac.element.Http_BridgeAutomationCompositionElement
+            version: 1.2.3
+        participantId: 101c62b3-8918-41b9-a747-d21eb79c6c91
+        deployState: DEPLOYED
+        lockState: LOCKED
+        description: Bridge Automation Composition Element for the Demo
+        message: Deployed
+        properties:
+            baseUrl: http://10.101.0.249:30801
+            httpHeaders:
+                Content-Type: application/json
+                Authorization: Basic YWNtVXNlcjp6YiFYenRHMzQ=
+            configurationEntities:
+                - configurationEntityId:
+                      name: onap.policy.clamp.ac.bridge
+                      version: 1.0.0
+                  restSequence:
+                      - restRequestId:
+                            name: request2
+                            version: 1.0.1
+                        httpMethod: POST
+                        path: /activate
+                        body:
+                            '{ "receiverId": { "name": "onap.policy.clamp.ac.bridgetosink", "version":
+                            "1.0.0" }, "timerMs": 20000, "elementType": "BRIDGE", "topicParameterGroup":
+                            { "server": "message-router:3904", "listenerTopic": "POLICY_UPDATE_MSG",
+                            "publisherTopic": "AC_ELEMENT_MSG", "fetchTimeout": 15000, "topicCommInfrastructure":
+                            "dmaap" } }'
+                        expectedResponse: 201
+        outProperties: {}
+    709c62b3-8918-41b9-a747-d21eb79c6c24:
+        id: 709c62b3-8918-41b9-a747-d21eb79c6c24
+        definition:
+            name: onap.policy.clamp.ac.element.Http_StarterAutomationCompositionElement
+            version: 1.2.3
+        participantId: 101c62b3-8918-41b9-a747-d21eb79c6c91
+        deployState: DEPLOYED
+        lockState: LOCKED
+        description: Starter Automation Composition Element for the Demo
+        message: Deployed
+        properties:
+            baseUrl: http://10.101.0.249:30800
+            httpHeaders:
+                Content-Type: application/json
+                Authorization: Basic YWNtVXNlcjp6YiFYenRHMzQ=
+            configurationEntities:
+                - configurationEntityId:
+                      name: onap.policy.clamp.ac.starter
+                      version: 1.0.0
+                  restSequence:
+                      - restRequestId:
+                            name: request1
+                            version: 1.0.1
+                        httpMethod: POST
+                        path: /activate
+                        body:
+                            '{ "receiverId": { "name": "onap.policy.clamp.ac.startertobridge",
+                            "version": "1.0.0" }, "timerMs": 20000, "elementType": "STARTER", "topicParameterGroup":
+                            { "server": "message-router:3904", "listenerTopic": "POLICY_UPDATE_MSG",
+                            "publisherTopic": "AC_ELEMENT_MSG", "fetchTimeout": 15000, "topicCommInfrastructure":
+                            "dmaap" } }'
+                        expectedResponse: 201
+        outProperties: {}
diff --git a/runtime-acm/src/main/resources/openapi/examples/postCompositionDefinitions.json b/runtime-acm/src/main/resources/openapi/examples/postCompositionDefinitions.json
index 61314cf6c..8ef7e2a17 100644..100755
--- a/runtime-acm/src/main/resources/openapi/examples/postCompositionDefinitions.json
+++ b/runtime-acm/src/main/resources/openapi/examples/postCompositionDefinitions.json
@@ -99,21 +99,6 @@
           },
           "description": "Specifies the organization that provides the automation composition element"
         },
-        "participant_id": {
-          "type": "onap.datatypes.ToscaConceptIdentifier",
-          "required": true,
-          "metadata": {
-            "common": true
-          }
-        },
-        "participantType": {
-          "type": "onap.datatypes.ToscaConceptIdentifier",
-          "required": true,
-          "metadata": {
-            "common": true
-          },
-          "description": "The identity of the participant type that hosts this type of Automation Composition Element"
-        },
         "startPhase": {
           "type": "integer",
           "required": false,
@@ -140,48 +125,6 @@
             "common": true
           },
           "description": "The maximum time in seconds to wait for a state chage from uninitialized to passive"
-        },
-        "passiveToRunningTimeout": {
-          "type": "integer",
-          "required": false,
-          "constraints": [
-            {
-              "greater_or_equal": 0
-            }
-          ],
-          "default": 60,
-          "metadata": {
-            "common": true
-          },
-          "description": "The maximum time in seconds to wait for a state chage from passive to running"
-        },
-        "runningToPassiveTimeout": {
-          "type": "integer",
-          "required": false,
-          "constraints": [
-            {
-              "greater_or_equal": 0
-            }
-          ],
-          "default": 60,
-          "metadata": {
-            "common": true
-          },
-          "description": "The maximum time in seconds to wait for a state chage from running to passive"
-        },
-        "passiveToUninitializedTimeout": {
-          "type": "integer",
-          "required": false,
-          "constraints": [
-            {
-              "greater_or_equal": 0
-            }
-          ],
-          "default": 60,
-          "metadata": {
-            "common": true
-          },
-          "description": "The maximum time in seconds to wait for a state chage from passive to uninitialized"
         }
       }
     },
@@ -211,7 +154,7 @@
       }
     },
     "org.onap.policy.clamp.acm.HttpAutomationCompositionElement": {
-      "version": "1.0.1",
+      "version": "1.0.0",
       "derived_from": "org.onap.policy.clamp.acm.AutomationCompositionElement",
       "properties": {
         "baseUrl": {
@@ -253,18 +196,10 @@
       "onap.policy.clamp.ac.element.Http_StarterAutomationCompositionElement": {
         "version": "1.2.3",
         "type": "org.onap.policy.clamp.acm.HttpAutomationCompositionElement",
-        "type_version": "1.0.1",
+        "type_version": "1.0.0",
         "description": "Automation composition element for the http requests of AC Element Starter microservice",
         "properties": {
           "provider": "ONAP",
-          "participant_id": {
-            "name": "HttpParticipant0",
-            "version": "1.0.0"
-          },
-          "participantType": {
-            "name": "org.onap.policy.clamp.acm.HttpParticipant",
-            "version": "2.3.4"
-          },
           "uninitializedToPassiveTimeout": 180,
           "startPhase": 0,
           "baseUrl": "http://acelement-starter:8084",
@@ -297,18 +232,10 @@
       "onap.policy.clamp.ac.element.Http_BridgeAutomationCompositionElement": {
         "version": "1.2.3",
         "type": "org.onap.policy.clamp.acm.HttpAutomationCompositionElement",
-        "type_version": "1.0.1",
+        "type_version": "1.0.0",
         "description": "Automation composition element for the http requests of AC Element Bridge microservice",
         "properties": {
           "provider": "ONAP",
-          "participant_id": {
-            "name": "HttpParticipant0",
-            "version": "1.0.0"
-          },
-          "participantType": {
-            "name": "org.onap.policy.clamp.acm.HttpParticipant",
-            "version": "2.3.4"
-          },
           "uninitializedToPassiveTimeout": 180,
           "startPhase": 0,
           "baseUrl": "http://acelement-bridge:8084",
@@ -341,18 +268,10 @@
       "onap.policy.clamp.ac.element.Http_SinkAutomationCompositionElement": {
         "version": "1.2.3",
         "type": "org.onap.policy.clamp.acm.HttpAutomationCompositionElement",
-        "type_version": "1.0.1",
+        "type_version": "1.0.0",
         "description": "Automation composition element for the http requests of AC Element Sink microservice",
         "properties": {
           "provider": "ONAP",
-          "participant_id": {
-            "name": "HttpParticipant0",
-            "version": "1.0.0"
-          },
-          "participantType": {
-            "name": "org.onap.policy.clamp.acm.HttpParticipant",
-            "version": "2.3.4"
-          },
           "uninitializedToPassiveTimeout": 180,
           "startPhase": 0,
           "baseUrl": "http://acelement-sink:8084",
diff --git a/runtime-acm/src/main/resources/openapi/examples/postCompositionDefinitions.yaml b/runtime-acm/src/main/resources/openapi/examples/postCompositionDefinitions.yaml
index c60209836..5d8447e00 100644..100755
--- a/runtime-acm/src/main/resources/openapi/examples/postCompositionDefinitions.yaml
+++ b/runtime-acm/src/main/resources/openapi/examples/postCompositionDefinitions.yaml
@@ -1,5 +1,5 @@
 # ============LICENSE_START=======================================================
-# Copyright (C) 2022 Nordix Foundation.
+# Copyright (C) 2022-2023 Nordix Foundation.
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -92,17 +92,6 @@ node_types:
         metadata:
           common: true
         description: Specifies the organization that provides the automation composition element
-      participant_id:
-        type: onap.datatypes.ToscaConceptIdentifier
-        required: true
-        metadata:
-          common: true
-      participantType:
-        type: onap.datatypes.ToscaConceptIdentifier
-        required: true
-        metadata:
-          common: true
-        description: The identity of the participant type that hosts this type of Automation Composition Element
       startPhase:
         type: integer
         required: false
@@ -123,33 +112,6 @@ node_types:
         metadata:
           common: true
         description: The maximum time in seconds to wait for a state chage from uninitialized to passive
-      passiveToRunningTimeout:
-        type: integer
-        required: false
-        constraints:
-          - greater_or_equal: 0
-        default: 60
-        metadata:
-          common: true
-        description: The maximum time in seconds to wait for a state chage from passive to running
-      runningToPassiveTimeout:
-        type: integer
-        required: false
-        constraints:
-          - greater_or_equal: 0
-        default: 60
-        metadata:
-          common: true
-        description: The maximum time in seconds to wait for a state chage from running to passive
-      passiveToUninitializedTimeout:
-        type: integer
-        required: false
-        constraints:
-          - greater_or_equal: 0
-        default: 60
-        metadata:
-          common: true
-        description: The maximum time in seconds to wait for a state chage from passive to uninitialized
   org.onap.policy.clamp.acm.AutomationComposition:
     version: 1.0.1
     derived_from: tosca.nodetypes.Root
@@ -169,7 +131,7 @@ node_types:
           type: onap.datatypes.ToscaConceptIdentifier
         description: Specifies a list of automation composition element definitions that make up this automation composition definition
   org.onap.policy.clamp.acm.HttpAutomationCompositionElement:
-    version: 1.0.1
+    version: 1.0.0
     derived_from: org.onap.policy.clamp.acm.AutomationCompositionElement
     properties:
       baseUrl:
@@ -203,16 +165,10 @@ topology_template:
       # Http config for AC Element Starter.
       version: 1.2.3
       type: org.onap.policy.clamp.acm.HttpAutomationCompositionElement
-      type_version: 1.0.1
+      type_version: 1.0.0
       description: Automation composition element for the http requests of AC Element Starter microservice
       properties:
         provider: ONAP
-        participant_id:
-          name: HttpParticipant0
-          version: 1.0.0
-        participantType:
-          name: org.onap.policy.clamp.acm.HttpParticipant
-          version: 2.3.4
         uninitializedToPassiveTimeout: 180
         startPhase: 0
         baseUrl: http://acelement-starter:8084
@@ -235,16 +191,10 @@ topology_template:
       # Http config for AC Element Bridge.
       version: 1.2.3
       type: org.onap.policy.clamp.acm.HttpAutomationCompositionElement
-      type_version: 1.0.1
+      type_version: 1.0.0
       description: Automation composition element for the http requests of AC Element Bridge microservice
       properties:
         provider: ONAP
-        participant_id:
-          name: HttpParticipant0
-          version: 1.0.0
-        participantType:
-          name: org.onap.policy.clamp.acm.HttpParticipant
-          version: 2.3.4
         uninitializedToPassiveTimeout: 180
         startPhase: 0
         baseUrl: http://acelement-bridge:8084
@@ -267,16 +217,10 @@ topology_template:
       # Http config for AC Element Sink.
       version: 1.2.3
       type: org.onap.policy.clamp.acm.HttpAutomationCompositionElement
-      type_version: 1.0.1
+      type_version: 1.0.0
       description: Automation composition element for the http requests of AC Element Sink microservice
       properties:
         provider: ONAP
-        participant_id:
-          name: HttpParticipant0
-          version: 1.0.0
-        participantType:
-          name: org.onap.policy.clamp.acm.HttpParticipant
-          version: 2.3.4
         uninitializedToPassiveTimeout: 180
         startPhase: 0
         baseUrl: http://acelement-sink:8084
diff --git a/runtime-acm/src/main/resources/openapi/examples/postCompositionInstance.json b/runtime-acm/src/main/resources/openapi/examples/postCompositionInstance.json
index f6715a9cd..45f886694 100644..100755
--- a/runtime-acm/src/main/resources/openapi/examples/postCompositionInstance.json
+++ b/runtime-acm/src/main/resources/openapi/examples/postCompositionInstance.json
@@ -10,14 +10,6 @@
                 "name": "onap.policy.clamp.ac.element.Http_StarterAutomationCompositionElement",
                 "version": "1.2.3"
             },
-            "participantId": {
-                "name": "HttpParticipant0",
-                "version": "1.0.0"
-            },
-            "participantType": {
-                "name": "org.onap.policy.clamp.acm.HttpParticipant",
-                "version": "2.3.4"
-            },
             "description": "Starter Automation Composition Element for the Demo",
             "properties": {
                 "baseUrl": "http://10.101.0.249:30800",
@@ -53,14 +45,6 @@
                 "name": "onap.policy.clamp.ac.element.Http_BridgeAutomationCompositionElement",
                 "version": "1.2.3"
             },
-            "participantId": {
-                "name": "HttpParticipant0",
-                "version": "1.0.0"
-            },
-            "participantType": {
-                "name": "org.onap.policy.clamp.acm.HttpParticipant",
-                "version": "2.3.4"
-            },
             "description": "Bridge Automation Composition Element for the Demo",
             "properties": {
                 "baseUrl": "http://10.101.0.249:30801",
@@ -96,14 +80,6 @@
                 "name": "onap.policy.clamp.ac.element.Http_SinkAutomationCompositionElement",
                 "version": "1.2.3"
             },
-            "participantId": {
-                "name": "HttpParticipant0",
-                "version": "1.0.0"
-            },
-            "participantType": {
-                "name": "org.onap.policy.clamp.acm.HttpParticipant",
-                "version": "2.3.4"
-            },
             "description": "Sink Automation Composition Element for the Demo",
             "properties": {
                 "baseUrl": "http://10.101.0.249:30802",
diff --git a/runtime-acm/src/main/resources/openapi/examples/postCompositionInstance.yaml b/runtime-acm/src/main/resources/openapi/examples/postCompositionInstance.yaml
index 9e006ecc1..10a77bc01 100644..100755
--- a/runtime-acm/src/main/resources/openapi/examples/postCompositionInstance.yaml
+++ b/runtime-acm/src/main/resources/openapi/examples/postCompositionInstance.yaml
@@ -1,3 +1,20 @@
+# ============LICENSE_START=======================================================
+# Copyright (C) 2022-2023 Nordix Foundation.
+# ================================================================================
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# SPDX-License-Identifier: Apache-2.0
+# ============LICENSE_END=========================================================
 name: InstanceHttp
 version: 1.0.1
 compositionId: 562ed027-2689-481a-b3a5-e284b1fbc33f
@@ -8,12 +25,6 @@ elements:
     definition:
       name: onap.policy.clamp.ac.element.Http_StarterAutomationCompositionElement
       version: 1.2.3
-    participantId:
-      name: HttpParticipant0
-      version: 1.0.0
-    participantType:
-      name: org.onap.policy.clamp.acm.HttpParticipant
-      version: 2.3.4
     description: Starter Automation Composition Element for the Demo
     properties:
       baseUrl: http://10.101.0.249:30800
@@ -37,12 +48,6 @@ elements:
     definition:
       name: onap.policy.clamp.ac.element.Http_BridgeAutomationCompositionElement
       version: 1.2.3
-    participantId:
-      name: HttpParticipant0
-      version: 1.0.0
-    participantType:
-      name: org.onap.policy.clamp.acm.HttpParticipant
-      version: 2.3.4
     description: Bridge Automation Composition Element for the Demo
     properties:
       baseUrl: http://10.101.0.249:30801
@@ -66,12 +71,6 @@ elements:
     definition:
       name: onap.policy.clamp.ac.element.Http_SinkAutomationCompositionElement
       version: 1.2.3
-    participantId:
-      name: HttpParticipant0
-      version: 1.0.0
-    participantType:
-      name: org.onap.policy.clamp.acm.HttpParticipant
-      version: 2.3.4
     description: Sink Automation Composition Element for the Demo
     properties:
       baseUrl: http://10.101.0.249:30802
diff --git a/runtime-acm/src/main/resources/openapi/examples/postCompositionInstanceUpdate.json b/runtime-acm/src/main/resources/openapi/examples/postCompositionInstanceUpdate.json
index 7800d1f29..28215f22b 100644..100755
--- a/runtime-acm/src/main/resources/openapi/examples/postCompositionInstanceUpdate.json
+++ b/runtime-acm/src/main/resources/openapi/examples/postCompositionInstanceUpdate.json
@@ -11,14 +11,6 @@
                 "name": "onap.policy.clamp.ac.element.Http_StarterAutomationCompositionElement",
                 "version": "1.2.3"
             },
-            "participantId": {
-                "name": "HttpParticipant0",
-                "version": "1.0.0"
-            },
-            "participantType": {
-                "name": "org.onap.policy.clamp.acm.HttpParticipant",
-                "version": "2.3.4"
-            },
             "description": "Starter Automation Composition Element for the Demo",
             "properties": {
                 "baseUrl": "http://10.101.0.249:30800",
@@ -54,14 +46,6 @@
                 "name": "onap.policy.clamp.ac.element.Http_BridgeAutomationCompositionElement",
                 "version": "1.2.3"
             },
-            "participantId": {
-                "name": "HttpParticipant0",
-                "version": "1.0.0"
-            },
-            "participantType": {
-                "name": "org.onap.policy.clamp.acm.HttpParticipant",
-                "version": "2.3.4"
-            },
             "description": "Bridge Automation Composition Element for the Demo",
             "properties": {
                 "baseUrl": "http://10.101.0.249:30801",
@@ -97,14 +81,6 @@
                 "name": "onap.policy.clamp.ac.element.Http_SinkAutomationCompositionElement",
                 "version": "1.2.3"
             },
-            "participantId": {
-                "name": "HttpParticipant0",
-                "version": "1.0.0"
-            },
-            "participantType": {
-                "name": "org.onap.policy.clamp.acm.HttpParticipant",
-                "version": "2.3.4"
-            },
             "description": "Sink Automation Composition Element for the Demo",
             "properties": {
                 "baseUrl": "http://10.101.0.249:30802",
diff --git a/runtime-acm/src/main/resources/openapi/examples/postCompositionInstanceUpdate.yaml b/runtime-acm/src/main/resources/openapi/examples/postCompositionInstanceUpdate.yaml
index ab1409c7a..4b389560a 100644..100755
--- a/runtime-acm/src/main/resources/openapi/examples/postCompositionInstanceUpdate.yaml
+++ b/runtime-acm/src/main/resources/openapi/examples/postCompositionInstanceUpdate.yaml
@@ -1,3 +1,20 @@
+# ============LICENSE_START=======================================================
+# Copyright (C) 2022-2023 Nordix Foundation.
+# ================================================================================
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# SPDX-License-Identifier: Apache-2.0
+# ============LICENSE_END=========================================================
 name: InstanceHttp
 version: 1.0.1
 compositionId: 562ed027-2689-481a-b3a5-e284b1fbc33f
@@ -9,12 +26,6 @@ elements:
     definition:
       name: onap.policy.clamp.ac.element.Http_StarterAutomationCompositionElement
       version: 1.2.3
-    participantId:
-      name: HttpParticipant0
-      version: 1.0.0
-    participantType:
-      name: org.onap.policy.clamp.acm.HttpParticipant
-      version: 2.3.4
     description: Starter Automation Composition Element for the Demo
     properties:
       baseUrl: http://10.101.0.249:30800
@@ -38,12 +49,6 @@ elements:
     definition:
       name: onap.policy.clamp.ac.element.Http_BridgeAutomationCompositionElement
       version: 1.2.3
-    participantId:
-      name: HttpParticipant0
-      version: 1.0.0
-    participantType:
-      name: org.onap.policy.clamp.acm.HttpParticipant
-      version: 2.3.4
     description: Bridge Automation Composition Element for the Demo
     properties:
       baseUrl: http://10.101.0.249:30801
@@ -67,12 +72,6 @@ elements:
     definition:
       name: onap.policy.clamp.ac.element.Http_SinkAutomationCompositionElement
       version: 1.2.3
-    participantId:
-      name: HttpParticipant0
-      version: 1.0.0
-    participantType:
-      name: org.onap.policy.clamp.acm.HttpParticipant
-      version: 2.3.4
     description: Sink Automation Composition Element for the Demo
     properties:
       baseUrl: http://10.101.0.249:30802
diff --git a/runtime-acm/src/main/resources/openapi/examples/putCompositionDefinitionUpdate.json b/runtime-acm/src/main/resources/openapi/examples/putCompositionDefinitionUpdate.json
index 78b81d628..f581c7a43 100644..100755
--- a/runtime-acm/src/main/resources/openapi/examples/putCompositionDefinitionUpdate.json
+++ b/runtime-acm/src/main/resources/openapi/examples/putCompositionDefinitionUpdate.json
@@ -1,5 +1,8 @@
 {
   "tosca_definitions_version": "tosca_simple_yaml_1_3",
+  "metadata": {
+    "compositionId": "562ed027-2689-481a-b3a5-e284b1fbc33f"
+  },
   "data_types": {
     "onap.datatypes.ToscaConceptIdentifier": {
       "derived_from": "tosca.datatypes.Root",
diff --git a/runtime-acm/src/main/resources/openapi/examples/putCompositionDefinitionUpdate.yaml b/runtime-acm/src/main/resources/openapi/examples/putCompositionDefinitionUpdate.yaml
index cacadce4f..4b5c64362 100644..100755
--- a/runtime-acm/src/main/resources/openapi/examples/putCompositionDefinitionUpdate.yaml
+++ b/runtime-acm/src/main/resources/openapi/examples/putCompositionDefinitionUpdate.yaml
@@ -1,5 +1,5 @@
 # ============LICENSE_START=======================================================
-# Copyright (C) 2022 Nordix Foundation.
+# Copyright (C) 2022-2023 Nordix Foundation.
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -16,6 +16,8 @@
 # SPDX-License-Identifier: Apache-2.0
 # ============LICENSE_END=========================================================
 tosca_definitions_version: tosca_simple_yaml_1_3
+metadata:
+  compositionId: 562ed027-2689-481a-b3a5-e284b1fbc33f
 data_types:
   onap.datatypes.ToscaConceptIdentifier:
     derived_from: tosca.datatypes.Root
@@ -92,17 +94,6 @@ node_types:
         metadata:
           common: true
         description: Specifies the organization that provides the automation composition element
-      participant_id:
-        type: onap.datatypes.ToscaConceptIdentifier
-        required: true
-        metadata:
-          common: true
-      participantType:
-        type: onap.datatypes.ToscaConceptIdentifier
-        required: true
-        metadata:
-          common: true
-        description: The identity of the participant type that hosts this type of Automation Composition Element
       startPhase:
         type: integer
         required: false
@@ -123,33 +114,6 @@ node_types:
         metadata:
           common: true
         description: The maximum time in seconds to wait for a state chage from uninitialized to passive
-      passiveToRunningTimeout:
-        type: integer
-        required: false
-        constraints:
-          - greater_or_equal: 0
-        default: 60
-        metadata:
-          common: true
-        description: The maximum time in seconds to wait for a state chage from passive to running
-      runningToPassiveTimeout:
-        type: integer
-        required: false
-        constraints:
-          - greater_or_equal: 0
-        default: 60
-        metadata:
-          common: true
-        description: The maximum time in seconds to wait for a state chage from running to passive
-      passiveToUninitializedTimeout:
-        type: integer
-        required: false
-        constraints:
-          - greater_or_equal: 0
-        default: 60
-        metadata:
-          common: true
-        description: The maximum time in seconds to wait for a state chage from passive to uninitialized
   org.onap.policy.clamp.acm.AutomationComposition:
     version: 1.0.2
     derived_from: tosca.nodetypes.Root
@@ -207,12 +171,6 @@ topology_template:
       description: Automation composition element for the http requests of AC Element Starter microservice
       properties:
         provider: ONAP
-        participant_id:
-          name: HttpParticipant0
-          version: 1.0.0
-        participantType:
-          name: org.onap.policy.clamp.acm.HttpParticipant
-          version: 2.3.4
         uninitializedToPassiveTimeout: 180
         startPhase: 0
         baseUrl: http://acelement-starter:8084
@@ -239,12 +197,6 @@ topology_template:
       description: Automation composition element for the http requests of AC Element Bridge microservice
       properties:
         provider: ONAP
-        participant_id:
-          name: HttpParticipant0
-          version: 1.0.0
-        participantType:
-          name: org.onap.policy.clamp.acm.HttpParticipant
-          version: 2.3.4
         uninitializedToPassiveTimeout: 180
         startPhase: 0
         baseUrl: http://acelement-bridge:8084
@@ -271,12 +223,6 @@ topology_template:
       description: Automation composition element for the http requests of AC Element Sink microservice
       properties:
         provider: ONAP
-        participant_id:
-          name: HttpParticipant0
-          version: 1.0.0
-        participantType:
-          name: org.onap.policy.clamp.acm.HttpParticipant
-          version: 2.3.4
         uninitializedToPassiveTimeout: 180
         startPhase: 0
         baseUrl: http://acelement-sink:8084