19 files changed, 0 insertions, 546 deletions
diff --git a/common/src/test/resources/examples/controlloop/KubernetesHelm.yaml b/common/src/test/resources/examples/acm/KubernetesHelm.yaml
index 9b0f449d3..9b0f449d3 100644
--- a/common/src/test/resources/examples/controlloop/KubernetesHelm.yaml
+++ b/common/src/test/resources/examples/acm/KubernetesHelm.yaml
diff --git a/common/src/test/resources/examples/controlloop/PMSH/consul_call_body.json b/common/src/test/resources/examples/acm/PMSH/consul_call_body.json
index 9118e9a6f..9118e9a6f 100644
--- a/common/src/test/resources/examples/controlloop/PMSH/consul_call_body.json
+++ b/common/src/test/resources/examples/acm/PMSH/consul_call_body.json
diff --git a/common/src/test/resources/examples/controlloop/PMSH/consul_url.txt b/common/src/test/resources/examples/acm/PMSH/consul_url.txt
index 2a2e77e86..2a2e77e86 100644
--- a/common/src/test/resources/examples/controlloop/PMSH/consul_url.txt
+++ b/common/src/test/resources/examples/acm/PMSH/consul_url.txt
diff --git a/common/src/test/resources/examples/controlloop/PMSH/pmsh.postman2.0_collection.json b/common/src/test/resources/examples/acm/PMSH/pmsh.postman2.0_collection.json
index 6efddc256..6efddc256 100644
--- a/common/src/test/resources/examples/controlloop/PMSH/pmsh.postman2.0_collection.json
+++ b/common/src/test/resources/examples/acm/PMSH/pmsh.postman2.0_collection.json
diff --git a/common/src/test/resources/examples/controlloop/PMSH/pmsh_cloudify_blueprint.yaml b/common/src/test/resources/examples/acm/PMSH/pmsh_cloudify_blueprint.yaml
index 7cdc6d5b9..7cdc6d5b9 100644
--- a/common/src/test/resources/examples/controlloop/PMSH/pmsh_cloudify_blueprint.yaml
+++ b/common/src/test/resources/examples/acm/PMSH/pmsh_cloudify_blueprint.yaml
diff --git a/common/src/test/resources/examples/controlloop/PMSH/pmsh_monitoring_policy.json b/common/src/test/resources/examples/acm/PMSH/pmsh_monitoring_policy.json
index 5b64b5b6f..5b64b5b6f 100644
--- a/common/src/test/resources/examples/controlloop/PMSH/pmsh_monitoring_policy.json
+++ b/common/src/test/resources/examples/acm/PMSH/pmsh_monitoring_policy.json
diff --git a/common/src/test/resources/examples/controlloop/PMSH/pmsh_monitoring_policy.yaml b/common/src/test/resources/examples/acm/PMSH/pmsh_monitoring_policy.yaml
index 6021f36bc..6021f36bc 100644
--- a/common/src/test/resources/examples/controlloop/PMSH/pmsh_monitoring_policy.yaml
+++ b/common/src/test/resources/examples/acm/PMSH/pmsh_monitoring_policy.yaml
diff --git a/common/src/test/resources/examples/controlloop/PMSH/pmsh_monitoring_policy_type.yaml b/common/src/test/resources/examples/acm/PMSH/pmsh_monitoring_policy_type.yaml
index e282bf5ba..e282bf5ba 100644
--- a/common/src/test/resources/examples/controlloop/PMSH/pmsh_monitoring_policy_type.yaml
+++ b/common/src/test/resources/examples/acm/PMSH/pmsh_monitoring_policy_type.yaml
diff --git a/common/src/test/resources/examples/controlloop/PMSH/pmsh_operational_policy.json b/common/src/test/resources/examples/acm/PMSH/pmsh_operational_policy.json
index 6bd681d71..6bd681d71 100644
--- a/common/src/test/resources/examples/controlloop/PMSH/pmsh_operational_policy.json
+++ b/common/src/test/resources/examples/acm/PMSH/pmsh_operational_policy.json
diff --git a/common/src/test/resources/examples/controlloop/PMSH/pmsh_operational_policy.yaml b/common/src/test/resources/examples/acm/PMSH/pmsh_operational_policy.yaml
index faf579012..faf579012 100644
--- a/common/src/test/resources/examples/controlloop/PMSH/pmsh_operational_policy.yaml
+++ b/common/src/test/resources/examples/acm/PMSH/pmsh_operational_policy.yaml
diff --git a/common/src/test/resources/examples/controlloop/PMSubscriptionHandling.yaml b/common/src/test/resources/examples/acm/PMSubscriptionHandling.yaml
index 8e8f3cd39..8e8f3cd39 100644
--- a/common/src/test/resources/examples/controlloop/PMSubscriptionHandling.yaml
+++ b/common/src/test/resources/examples/acm/PMSubscriptionHandling.yaml
diff --git a/common/src/test/resources/examples/controlloop/PMSubscriptionHandling_GuilinFormat.yaml b/common/src/test/resources/examples/acm/PMSubscriptionHandling_GuilinFormat.yaml
index 51e369696..51e369696 100644
--- a/common/src/test/resources/examples/controlloop/PMSubscriptionHandling_GuilinFormat.yaml
+++ b/common/src/test/resources/examples/acm/PMSubscriptionHandling_GuilinFormat.yaml
diff --git a/common/src/test/resources/examples/controlloop/http-participant/http.postman2.0_collection.json b/common/src/test/resources/examples/acm/http-participant/http.postman2.0_collection.json
index 798b0edd6..798b0edd6 100644
--- a/common/src/test/resources/examples/controlloop/http-participant/http.postman2.0_collection.json
+++ b/common/src/test/resources/examples/acm/http-participant/http.postman2.0_collection.json
diff --git a/common/src/test/resources/examples/controlloop/k8s-participant/k8s.postman2.0_collection.json b/common/src/test/resources/examples/acm/k8s-participant/k8s.postman2.0_collection.json
index e83bc2594..e83bc2594 100644
--- a/common/src/test/resources/examples/controlloop/k8s-participant/k8s.postman2.0_collection.json
+++ b/common/src/test/resources/examples/acm/k8s-participant/k8s.postman2.0_collection.json
diff --git a/common/src/test/resources/examples/controlloop/original/cloop_DCAE_VES_TCA_substitution.yaml b/common/src/test/resources/examples/controlloop/original/cloop_DCAE_VES_TCA_substitution.yaml
deleted file mode 100644
index 96ea133c2..000000000
--- a/common/src/test/resources/examples/controlloop/original/cloop_DCAE_VES_TCA_substitution.yaml
+++ /dev/null
@@ -1,83 +0,0 @@
-# ============LICENSE_START=======================================================
-# Copyright (C) 2021 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=========================================================
-
-tosca_definitions_version: tosca_simple_yaml_1_3
-
-imports:
-  - cloop_base_types.yaml
-  - cloop_dcae_types.yaml
-
-topology_template:
-  inputs:
-    some_property_input:
-      type: string
-
-  substitution_mappings:
-    node_type: org.onap.DCAE_VES_TCA
-    properties:
-      some_property: { get_input: some_property_input }
-    capabilities:
-      VES-5.28.4-publisher: [ node1_VES_Collector, VES-5.28.4-publisher ]
-      VES-7.30.1-publisher: [ node1_VES_Collector, VES-7.30.1-publisher ]
-      TCA-handle-out-publisher: [ node2_TCA_GEN_2, TCA-handle-out-publisher ]
-      VES_specification-subscriber: [ node2_TCA_GEN_2, VES_specification-subscriber ]
-
-  node_templates:
-  ################################################################################
-  #alt1: without relay
-
-  node1_VES_Collector:
-    type: org.onap.VESCollector
-
-  node2_TCA_GEN_2:
-    type:  org.onap.TCA_GEN_2
-    requirements:
-      - receive:
-          capability: VES-5.28.4-publisher
-          node: node1_VES_Collector
-          relationship:
-            type: org.onap.PropagateEvent
-            properties:
-              config-keys: [ ves-measurement ]
-
-
-  ################################################################################
-  #alt2: with relay
-
-  node1_VES_Collector:
-    type: org.onap.VESCollector
-
-  node2_TCA_GEN_2:
-    type:  org.onap.TCA_GEN_2
-
-  node3_Relay:
-    type: org.onap.EventRelay
-    properties:
-      event_format: "VES_specification"
-      event_format_version: "5.28.4"
-      supported_carrier_protocols: [{ DMAAP_message_router: DMAAP_message_router }]
-      supported_data_formats: [{ JSON: JSON }]
-    requirements:
-      - receive:
-          node: node1_VES_Collector
-          properties:
-            config_keys: [ ves-measurement ]
-      - send:
-          node: node2_TCA_GEN_2
-          properties:
-            config_keys: [ ves-measurement ]
diff --git a/common/src/test/resources/examples/controlloop/original/cloop_base_types.yaml b/common/src/test/resources/examples/controlloop/original/cloop_base_types.yaml
deleted file mode 100644
index 4f29e5635..000000000
--- a/common/src/test/resources/examples/controlloop/original/cloop_base_types.yaml
+++ /dev/null
@@ -1,210 +0,0 @@
-# ============LICENSE_START=======================================================
-# Copyright (C) 2021 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=========================================================
-
-tosca_definitions_version: tosca_simple_yaml_1_2
-
-capability_types:
-  #producer capability type
-  org.onap.EventProducer:
-    derived_from: tosca.capabilities.Root
-    properties:
-      carrier_protocol_type:
-        type: string
-        required: true
-        constraints:
-          valid_values: [ DMAAP_message_router,  REST ]
-          #all valid values should be added here
-      data_format:
-        type: string
-        required: true
-        constraints:
-          valid_values: [ JSON, YAML, JMS ]
-          #all valid values should be added here
-      event_format:
-        type: string
-        required: true
-        #examples for event_format: Ves_specification, etc.
-      event_format_version:
-        type: string
-        #examples for event_format_version: 5.28.4, 7.30.1, etc.
-      config_keys:
-        type: list
-        required: false
-        entry_schema:
-          type: string
-          constraints:
-            #valid_values: [ ]
-              #all valid values should be added here
-              #if not specified, events of any config key may be generated
-              #examples for config_key: ves-measurement, ves-syslog, tca_handle_out, etc.
-
-
-  #consumer capability type
-  org.onap.EventConsumer:
-    derived_from: tosca.capabilities.Root
-    properties:
-      carrier_protocol_type:
-        type: string
-        required: true
-        constraints:
-          valid_values: [ DMAAP_message_router, REST ]
-          #all valid values should be added here
-      data_format:
-        type: string
-        required: true
-        constraints:
-          valid_values: [ JSON, YAML, JMS ]
-          #all valid values should be added here
-      event_format:
-        type: string
-        required: true
-        #examples for event_format: Ves_specification, LinkUp, VnfConfigured, etc.
-      event_format_version:
-        type: string
-        #examples for event_format_version: 5.28.4, 7.30.1, etc.
-      config_keys:
-        type: list
-        required: false
-        entry_schema:
-          type: string
-          constraints:
-            #valid_values: [ ]
-              #all valid values should be added here
-              #if not specified, events of any config key may be generated
-              #examples for config_key: ves-measurement, ves-syslog, tca_handle_out, etc.
-
-
-relationship_types:
-  #the relationship type used on requirements to org.onap.EventProducer and org.onap.EventConsumer capabilities
-  org.onap.PropagateEvent:
-    derived_from: tosca.relationships.Root
-    properties:
-    config_keys:
-      type: list
-      required: false
-      description: >
-        Filters events by specific config_keys to be transferred by this relationship.
-        That is, any event with a specific config_key found in the list is transferred.
-        If list is not defined or is empty, events with all config_keys are transferred.
-      entry_schema: string
-
-
-
-node_types:
-  #base app node type
-  org.onap.APP:
-    derived_from: tosca.nodes.Root
-    properties:
-      application_name:
-        type: string
-        description: Human readable name for the application Product
-        required: false
-      provider:
-        type: string
-        description: Provider of the application and of the descriptor
-        required: true
-      application_version:
-        type: string
-        description: Software version of the application
-        required: true
-      blueprint_id:
-        type: string
-        description: A reference to the app blueprint
-      monitoring_policy:
-        type: string
-        required: false
-        description: A reference to the monitoring policy
-    requirements:
-      - receive:
-          capability: org.onap.EventProducer
-          relationship: org.onap.PropagateEvent
-          occurrences: [0, UNBOUNDED]
-      - send:
-          capability: org.onap.EventConsumer
-          relationship: org.onap.PropagateEvent
-          occurrences: [0, UNBOUNDED]
-
-  #the event relay node type
-  org.onap.EventRelay:
-    derived_from: tosca.nodes.Root
-    properties:
-      event_format:
-        type: string
-        required: true
-        #examples for event_format: Ves_specification, etc.
-      event_format_version:
-        type: string
-        required: true
-        #examples for event_format_version: 5.28.4, 7.30.1, etc.
-      config_keys:
-        type: list
-        required: false
-        entry_schema:
-          type: string
-          constraints:
-            #valid_values: [ ]
-              #all valid values should be added here
-              #if not specified, events of any config key is relayed
-              #examples for config_key: ves-measurement, ves-syslog, tca_handle_out, etc.
-      supported_carrier_protocols:
-        type: map
-        required: true
-        description: >
-          A map describing supported carrier protocols and translations. The
-          tuples define what protocol combinations are supported on the producer
-          and consumer side: e.g. { REST: REST, DMAAP: REST, DMAAP: DMAAP}
-        key_schema:
-          type: string
-          constraints:
-            valid_values: [ DMAAP_message_router,  REST ]
-            #all valid values should be added here
-        entry_schema:
-          type: string
-          constraints:
-            valid_values: [ DMAAP_message_router,  REST ]
-            #all valid values should be added here
-      supported_data_formats:
-        type: map
-        required: true
-        description: >
-          Is a map describing supported data formats and translation. The tuples
-          define what protocol combinations are supported on the producer and
-          consumer side: e.g. { JSON: JSON, JMS: JSON, YAML:YAML }
-        key_schema:
-          type: string
-          constraints:
-            valid_values: [ JSON,  JMS, YAML, etc ]
-            #all valid values should be added here
-        entry_schema:
-          type: string
-          constraints:
-            valid_values: [ JSON,  JMS, YAML, etc ]
-            #all valid values should be added here
-    requirements:
-      - receive:
-          capability: org.onap.EventProducer
-          relationship: org.onap.PropagateEvent
-          occurrences: [1, UNBOUNDED]
-      - send:
-          capability: org.onap.EventConsumer
-          relationship: org.onap.PropagateEvent
-          occurrences: [1, UNBOUNDED]
-
-
-
-
diff --git a/common/src/test/resources/examples/controlloop/original/cloop_dcae_example.yaml b/common/src/test/resources/examples/controlloop/original/cloop_dcae_example.yaml
deleted file mode 100644
index 4629f6f75..000000000
--- a/common/src/test/resources/examples/controlloop/original/cloop_dcae_example.yaml
+++ /dev/null
@@ -1,50 +0,0 @@
-# ============LICENSE_START=======================================================
-# Copyright (C) 2021 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=========================================================
-
-tosca_definitions_version: tosca_simple_yaml_1_3
-
-imports:
-  - cloop_base_types.yaml
-  - cloop_dcae_types.yaml
-  - cloop_other_types.yaml
-
-topology_template:
-  node_templates:
-
-    node1_DCAE_VES_TCA:
-      type: org.onap.DCAE_VES_TCA
-      directives:
-        - substitute
-
-    node2_PolicyFramework:
-      type: org.onap.ApexPolicyFramework
-      requirements:
-        - receive:
-            capability: TCA-handle-out-publisher
-            node: node1_DCAE_VES_TCA
-            relationship:
-              properties:
-                config_keys: [ ves-measurement ]
-        - send:
-            capability: SelfService
-            node: org.onap.CDS
-            relationship:
-              properties:
-                config_keys: [ ves-measurement ]
-
-  #if this closed loop to subscribe to other events via the VesCollector, should we not add that?
diff --git a/common/src/test/resources/examples/controlloop/original/cloop_dcae_types.yaml b/common/src/test/resources/examples/controlloop/original/cloop_dcae_types.yaml
deleted file mode 100644
index 5f96cd5df..000000000
--- a/common/src/test/resources/examples/controlloop/original/cloop_dcae_types.yaml
+++ /dev/null
@@ -1,140 +0,0 @@
-# ============LICENSE_START=======================================================
-# Copyright (C) 2021 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=========================================================
-
-tosca_definitions_version: tosca_simple_yaml_1_3
-
-imports:
-  - cloop_types.yaml
-
-node_types:
-
-  #node type for VES_Collector
-  org.onap.VES_Collector:
-    derived_from: org.onap.APP
-    capabilities:
-      VES-5.28.4-publisher:
-        type: org.onap.EventProducer
-        occurrences: [ 0, UNBOUNDED ]
-        properties:
-          carrier_protocol_type: "DMAAP_message_router"
-          data_format: "JSON"
-          event_format: "VES_specification"
-          event_format_version: "5.28.4"
-          config_keys:
-            - "ves-fault"
-            - "ves-measurement"
-            - "ves-syslog"
-            - "ves-heartbeat"
-            - "ves-other"
-            - "ves-mobileflow"
-            - "ves-statechange"
-            - "ves-thresholdCrossingAlert"
-            - "ves-voicequality"
-            - "ves-sipsignaling"
-      VES-7.30.1-publisher:
-        type: org.onap.EventProducer
-        occurrences: [ 0, UNBOUNDED ]
-        properties:
-          carrier_protocol_type: "DMAAP_message_router"
-          data_format: "JSON"
-          event_format: "VES_specification"
-          event_format_version: "7.30.1"
-          config_keys:
-            - "ves-fault"
-            - "ves-pnfRegistration"
-            - "ves-notification"
-            - "ves-perf3gpp"
-
-  #node type for TCA_GEN_2
-  org.onap.TCA_GEN_2:
-    derived_from: org.onap.APP
-    capabilities:
-      TCA-handle-out-publisher:
-        type: org.onap.EventProducer
-        occurrences: [ 0, UNBOUNDED ]
-        properties:
-          carrier_protocol_type: "DMAAP_message_router"
-          data_format: "JSON"
-          event_format: "DCAE_CL_Output"
-          event_format_version: "1.0.1"
-          config_keys: [ "tca_handle_out" ]
-      VES_specification-subscriber:
-        type: org.onap.EventConsumer
-        occurrences: [ 0, UNBOUNDED ]
-        properties:
-          carrier_protocol_type: "DMAAP_message_router"
-          data_format: "JSON"
-          event_format: "VES_specification"
-          event_format_version: "5.28.4"
-          config_keys: [ "tca_handle_in" ]
-
-
-
-  #node type for the composed VES_Collector and TCA_GEN_2
-  org.onap.DCAE_VES_TCA:
-    derived_from: org.onap.APP
-    capabilities:
-      VES-5.28.4-publisher:
-        type: org.onap.EventProducer
-        occurrences: [ 0, UNBOUNDED ]
-        properties:
-          carrier_protocol_type: "DMAAP_message_router"
-          data_format: "JSON"
-          event_format: "VES_specification"
-          event_format_version: "5.28.4"
-          config_keys:
-            - "ves-fault"
-            - "ves-measurement"
-            - "ves-syslog"
-            - "ves-heartbeat"
-            - "ves-other"
-            - "ves-mobileflow"
-            - "ves-statechange"
-            - "ves-thresholdCrossingAlert"
-            - "ves-voicequality"
-            - "ves-sipsignaling"
-      VES-7.30.1-publisher:
-        type: org.onap.EventProducer
-        occurrences: [ 0, UNBOUNDED ]
-        properties:
-          carrier_protocol_type: "DMAAP_message_router"
-          data_format: "JSON"
-          event_format: "VES_specification"
-          event_format_version: "7.30.1"
-          config_keys:
-            - "ves-pnfRegistration"
-            - "ves-notification"
-            - "ves-perf3gpp"
-      TCA-handle-out-publisher:
-        type: org.onap.EventProducer
-        occurrences: [ 0, UNBOUNDED ]
-        properties:
-          carrier_protocol_type: "DMAAP_message_router"
-          data_format: "JSON"
-          event_format: "DCAE_CL_Output"
-          event_format_version: "1.0.1"
-          config_keys: [ "tca_handle_out" ]
-      VES_specification-subscriber:
-        type: org.onap.EventConsumer
-        occurrences: [ 0, UNBOUNDED ]
-        properties:
-          carrier_protocol_type: "DMAAP_message_router"
-          data_format: "JSON"
-          event_format: "VES_specification"
-          event_format_version: "5.28.4"
-          config_keys: [ "tca_handle_in" ]
diff --git a/common/src/test/resources/examples/controlloop/original/cloop_other_types.yaml b/common/src/test/resources/examples/controlloop/original/cloop_other_types.yaml
deleted file mode 100644
index d743f499f..000000000
--- a/common/src/test/resources/examples/controlloop/original/cloop_other_types.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
-# ============LICENSE_START=======================================================
-# Copyright (C) 2021 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=========================================================
-
-tosca_definitions_version: tosca_simple_yaml_1_2
-
-imports:
-  - cloop_base_types.yaml
-
-node_types:
-  #node type for Policy
-  org.onap.PolicyFramework:
-    derived_from: org.onap.APP
-
-  #node type for Apex Policy
-  org.onap.ApexPolicyFramework:
-    derived_from: org.onap.PolicyFramework
-
-  #node type for CDS
-  org.onap.CDS:
-    derived_from: org.onap.APP
-    capabilities:
-      #consumer capability for CDS for events of type ResourceAndTemplate management API
-      ResourceAndTemplateManagement:
-        type: org.onap.EventConsumer
-        properties:
-          carrier_protocol_type: "DMAAP_message_router"
-          data_format: "JSON"
-          event_format: "ResourceAndTemplate"
-          event_format_version: "x.xx.x"
-        occurrences: [ 0, UNBOUNDED ]
-      #consumer capability for CDS for events of type SelfService API
-      SelfService:
-        type: org.onap.EventConsumer
-        properties:
-          carrier_protocol_type: "DMAAP_message_router"
-          data_format: "JSON"
-          event_format: "SelfService"
-          event_format_version: "x.xx.x"
-        occurrences: [ 0, UNBOUNDED ]
-      #producer capability for CDS for events of type PNFControl
-      PNFcontrolEventsProducer:
-        type: org.onap.EventProducer
-        properties:
-          carrier_protocol_type: "DMAAP_message_router"
-          data_format: "JSON"
-          event_format: "PNFcontrol"
-          event_format_version: "x.xx.x"
-        occurrences: [ 0, UNBOUNDED ]