Remove ParticipantType in all yaml files

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

diff --git a/common/src/main/resources/tosca/AutomationCompositionTOSCAServiceTemplateTypes.yaml b/common/src/main/resources/tosca/AutomationCompositionTOSCAServiceTemplateTypes.yaml
index 12f8cf7..7a7ae92 100644 (file)
--- a/common/src/main/resources/tosca/AutomationCompositionTOSCAServiceTemplateTypes.yaml
+++ b/common/src/main/resources/tosca/AutomationCompositionTOSCAServiceTemplateTypes.yaml
@@ -1,5 +1,5 @@
 # ============LICENSE_START=======================================================
-# Copyright (C) 2021-2022 Nordix Foundation.
+# Copyright (C) 2021-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.
@@ -37,12 +37,6 @@ node_types:
         metadata:
             common: true
         description: Specifies the organization that provides the automation composition element
-      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

diff --git a/examples/src/main/resources/clamp/acm/acm-demo/toscaServiceTemplate.yaml b/examples/src/main/resources/clamp/acm/acm-demo/toscaServiceTemplate.yaml
index 6a1ccfe..525583b 100644 (file)
--- a/examples/src/main/resources/clamp/acm/acm-demo/toscaServiceTemplate.yaml
+++ b/examples/src/main/resources/clamp/acm/acm-demo/toscaServiceTemplate.yaml
@@ -289,17 +289,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
@@ -439,12 +428,6 @@ topology_template:
       description: Automation composition element for the operational policy for Performance Management Subscription Handling
       properties:
         provider: Ericsson
-        participant_id:
-          name: org.onap.PM_Policy
-          version: 1.0.0
-        participantType:
-          name: org.onap.policy.clamp.acm.PolicyParticipant
-          version: 2.3.1
         policy_type_id:
           name: onap.policies.operational.pm-subscription-handler
           version: 1.0.0
@@ -466,12 +449,6 @@ topology_template:
       description: Automation composition element for the K8S microservice for AC Element Starter
       properties:
         provider: ONAP
-        participant_id:
-          name: K8sParticipant0
-          version: 1.0.0
-        participantType:
-          name: org.onap.policy.clamp.acm.KubernetesParticipant
-          version: 2.3.4
         startPhase: 0
         uninitializedToPassiveTimeout: 300
         podStatusCheckInterval: 30
@@ -496,12 +473,6 @@ topology_template:
       description: Automation composition element for the K8S microservice for AC Element Bridge
       properties:
         provider: ONAP
-        participant_id:
-          name: K8sParticipant0
-          version: 1.0.0
-        participantType:
-          name: org.onap.policy.clamp.acm.KubernetesParticipant
-          version: 2.3.4
         startPhase: 0
         uninitializedToPassiveTimeout: 300
         podStatusCheckInterval: 30
@@ -526,12 +497,6 @@ topology_template:
       description: Automation composition element for the K8S microservice for AC Element Sink
       properties:
         provider: ONAP
-        participant_id:
-          name: K8sParticipant0
-          version: 1.0.0
-        participantType:
-          name: org.onap.policy.clamp.acm.KubernetesParticipant
-          version: 2.3.4
         startPhase: 0
         uninitializedToPassiveTimeout: 300
         podStatusCheckInterval: 30
@@ -563,12 +528,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: 300
         startPhase: 1
         baseUrl: http://cluster-ip:30800
@@ -595,12 +554,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: 300
         startPhase: 1
         baseUrl: http://cluster-ip:30801
@@ -627,12 +580,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: 300
         startPhase: 1
         baseUrl: http://cluster-ip:30802

diff --git a/examples/src/main/resources/clamp/acm/gentleguidance/GentleGuidanceDefaultProperties.yaml b/examples/src/main/resources/clamp/acm/gentleguidance/GentleGuidanceDefaultProperties.yaml
index fb28f10..bf84241 100644 (file)
--- a/examples/src/main/resources/clamp/acm/gentleguidance/GentleGuidanceDefaultProperties.yaml
+++ b/examples/src/main/resources/clamp/acm/gentleguidance/GentleGuidanceDefaultProperties.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.
@@ -25,7 +25,6 @@ topology_template:
       description: Automation Composition element for the Gentle Guidance Kubernetes Microservice
       properties:
         provider: Ericsson
-        participantType: org.onap.policy.acm.participant.Kubernetes:1.0.0
         startPhase: 2
         uninitializedToPassiveTimeout: 180
         chart:
@@ -39,7 +38,6 @@ topology_template:
       description: Automation Composition element for the Gentle Guidance Microservice REST configuration
       properties:
         provider: Ericsson
-        participantType: org.onap.policy.acm.participant.Http:1.0.0
         startPhase: 1
         baseUrl: https://10.10.10.10:12345/gentleguidancemicroservice
         httpHeaders:
@@ -87,7 +85,6 @@ topology_template:
       description: Automation Composition element for the Gentle Guidance Operational Policy
       properties:
         provider: Ericsson
-        participantType: org.onap.policy.acm.participant.Policy:1.0.0
         startPhase: 0
         policyType: onap.policies.acm.operational.common.Apex:1.0.0
         policyId: org.onap.domain.gentleguidance.policy.GentleGuidanceAssertive:1.0.0
@@ -98,7 +95,6 @@ topology_template:
       description: Automation Composition element for the Gentle Guidance CDS blueprint
       properties:
         provider: Ericsson
-        participantType: org.onap.policy.acm.participant.Cds:1.0.0
         startPhase: 0
         cdsBlueprint: "Placeholder for the CDS blueprint"
     org.onap.domain.gentleguidance.AcmDefinition:

diff --git a/examples/src/main/resources/clamp/acm/gentleguidance/GentleGuidanceMultipleTopologyTemplates.yaml b/examples/src/main/resources/clamp/acm/gentleguidance/GentleGuidanceMultipleTopologyTemplates.yaml
index ad7e40f..7333684 100644 (file)
--- a/examples/src/main/resources/clamp/acm/gentleguidance/GentleGuidanceMultipleTopologyTemplates.yaml
+++ b/examples/src/main/resources/clamp/acm/gentleguidance/GentleGuidanceMultipleTopologyTemplates.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.
@@ -63,7 +63,6 @@ topology_template:
       description: Control loop element for the Gentle Guidance Kubernetes Microservice
       properties:
         provider: Ericsson
-        participantType: org.onap.policy.acm.participant.Kubernetes:1.0.0
         startPhase: 2
         uninitializedToPassiveTimeout: 180
     org.onap.domain.gentleguidance.RestAcmElementDefinition:
@@ -73,7 +72,6 @@ topology_template:
       description: Automation Composition element for the Gentle Guidance Microservice REST configuration
       properties:
         provider: Ericsson
-        participantType: org.onap.policy.acm.participant.Http:1.0.0
         startPhase: 1
         baseUrl: https://10.10.10.10:12345/gentleguidancemicroservice
     org.onap.domain.gentleguidance.PolicyAcmElementDefinition:
@@ -83,7 +81,6 @@ topology_template:
       description: Automation Composition element for the Gentle Guidance Operational Policy
       properties:
         provider: Ericsson
-        participantType: org.onap.policy.acm.participant.Policy:1.0.0
         startPhase: 0
     org.onap.domain.gentleguidance.CdsAcmElementDefinition:
       version: 1.0.0
@@ -92,7 +89,6 @@ topology_template:
       description: Automation Composition element for the Gentle Guidance CDS blueprint
       properties:
         provider: Ericsson
-        participantType: org.onap.policy.acm.participant.Cds:1.0.0
         startPhase: 0
     org.onap.domain.gentleguidance.AcmDefinition:
       version: 1.0.0
@@ -122,7 +118,6 @@ topology_template:
       description: Automation Composition element for the Gentle Guidance Kubernetes Microservice
       properties:
         provider: Ericsson
-        participantType: org.onap.policy.acm.participant.Kubernetes:1.0.0
         startPhase: 2
         uninitializedToPassiveTimeout: 180
         chart:
@@ -136,7 +131,6 @@ topology_template:
       description: Automation Composition element for the Gentle Guidance Microservice REST configuration
       properties:
         provider: Ericsson
-        participantType: org.onap.policy.acm.participant.Http:1.0.0
         startPhase: 1
         baseUrl: https://10.10.10.10:12345/gentleguidancemicroservice
         httpHeaders:
@@ -184,7 +178,6 @@ topology_template:
       description: Automation Composition element for the Gentle Guidance Operational Policy
       properties:
         provider: Ericsson
-        participantType: org.onap.policy.acm.participant.Policy:1.0.0
         startPhase: 0
         policyType: onap.policies.acm.operational.common.Apex:1.0.0
         policyId: org.onap.domain.gentleguidance.policy.GentleGuidanceAssertive:1.0.0
@@ -195,7 +188,6 @@ topology_template:
       description: Automation Composition element for the Gentle Guidance CDS blueprint
       properties:
         provider: Ericsson
-        participantType: org.onap.policy.acm.participant.Cds:1.0.0
         startPhase: 0
         cdsBlueprint: "Placeholder for the CDS blueprint"
     org.onap.domain.gentleguidance.AcmDefinition_Instance1:
@@ -224,7 +216,6 @@ topology_template:
       description: Automation Composition element for the Gentle Guidance Kubernetes Microservice
       properties:
         provider: Ericsson
-        participantType: org.onap.policy.acm.participant.Kubernetes:1.0.0
         startPhase: 2
         uninitializedToPassiveTimeout: 180
         chart:
@@ -238,7 +229,6 @@ topology_template:
       description: Automation Composition element for the Gentle Guidance Microservice REST configuration
       properties:
         provider: Ericsson
-        participantType: org.onap.policy.acm.participant.Http:1.0.0
         startPhase: 1
         baseUrl: https://10.10.10.10:12345/gentleguidancemicroservice
         httpHeaders:
@@ -286,7 +276,6 @@ topology_template:
       description: Automation Composition element for the Gentle Guidance Operational Policy
       properties:
         provider: Ericsson
-        participantType: org.onap.policy.acm.participant.Policy:1.0.0
         startPhase: 0
         policyType: onap.policies.acm.operational.common.Apex:1.0.0
         policyId: org.onap.domain.gentleguidance.policy.GentleGuidanceAssertive:1.0.0
@@ -297,7 +286,6 @@ topology_template:
       description: Automation Composition element for the Gentle Guidance CDS blueprint
       properties:
         provider: Ericsson
-        participantType: org.onap.policy.acm.participant.Cds:1.0.0
         startPhase: 0
         cdsBlueprint: "Placeholder for the CDS blueprint"
     org.onap.domain.gentleguidance.AcmDefinition_Instance2:

diff --git a/examples/src/main/resources/clamp/acm/pmsh/funtional-pmsh-usecase.yaml b/examples/src/main/resources/clamp/acm/pmsh/funtional-pmsh-usecase.yaml
index f0da6f3..9d8a375 100644 (file)
--- a/examples/src/main/resources/clamp/acm/pmsh/funtional-pmsh-usecase.yaml
+++ b/examples/src/main/resources/clamp/acm/pmsh/funtional-pmsh-usecase.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.
@@ -276,17 +276,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
@@ -434,12 +423,6 @@ topology_template:
       description: Automation composition element for the operational policy for Performance Management Subscription Handling
       properties:
         provider: Ericsson
-        participant_id:
-          name: org.onap.PM_Policy
-          version: 1.0.0
-        participantType:
-          name: org.onap.policy.clamp.acm.PolicyParticipant
-          version: 2.3.1
         policy_type_id:
           name: onap.policies.operational.pm-subscription-handler
           version: 1.0.0
@@ -462,12 +445,6 @@ topology_template:
       description: Automation composition element for the K8S microservice for PMSH
       properties:
         provider: ONAP
-        participant_id:
-          name: K8sParticipant0
-          version: 1.0.0
-        participantType:
-          name: org.onap.policy.clamp.acm.KubernetesParticipant
-          version: 2.3.4
         chart:
           chartId:
             name: dcae-pmsh
@@ -497,12 +474,6 @@ topology_template:
       description: Automation composition element for the http requests of PMSH 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: 1
         baseUrl: https://dcae-pmsh:8443

diff --git a/examples/src/main/resources/clamp/acm/test/participant-a1pms.yaml b/examples/src/main/resources/clamp/acm/test/participant-a1pms.yaml
index 88cca16..26d2973 100755 (executable)
--- a/examples/src/main/resources/clamp/acm/test/participant-a1pms.yaml
+++ b/examples/src/main/resources/clamp/acm/test/participant-a1pms.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.
@@ -63,9 +63,6 @@ node_types:
       provider:
         type: string
         required: false
-      participantType:
-        type: onap.datatypes.ToscaConceptIdentifier
-        required: true
       startPhase:
         type: integer
         required: false
@@ -117,9 +114,6 @@ topology_template:
       description: Automation composition element for the A1 PMS Requests
       properties:
         provider: ONAP
-        participantType:
-          name: org.onap.policy.clamp.acm.A1PMSParticipant
-          version: 2.3.4
         policyServiceEntities:
           - a1PolicyServiceEntityId:
               name: entity1

diff --git a/examples/src/main/resources/clamp/acm/test/participant-http.yaml b/examples/src/main/resources/clamp/acm/test/participant-http.yaml
index 4020162..2bc3828 100644 (file)
--- a/examples/src/main/resources/clamp/acm/test/participant-http.yaml
+++ b/examples/src/main/resources/clamp/acm/test/participant-http.yaml
@@ -1,5 +1,5 @@
 # ============LICENSE_START=======================================================
-# Copyright (C) 2021-2022 Nordix Foundation.
+# Copyright (C) 2021-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.
@@ -88,9 +88,6 @@ node_types:
       provider:
         type: string
         required: false
-      participantType:
-        type: onap.datatypes.ToscaConceptIdentifier
-        required: true
       startPhase:
         type: integer
         required: false
@@ -153,9 +150,6 @@ topology_template:
       description: Automation composition element for the http requests of PMSH microservice
       properties:
         provider: ONAP
-        participantType:
-          name: org.onap.acm.HttpAutomationCompositionParticipant
-          version: 2.3.4
         startPhase: 1
         uninitializedToPassiveTimeout: 180
         baseUrl: https://httpbin.org

diff --git a/examples/src/main/resources/clamp/acm/test/participant-kubernetes-helm.yaml b/examples/src/main/resources/clamp/acm/test/participant-kubernetes-helm.yaml
index 8d06649..b6aab87 100644 (file)
--- a/examples/src/main/resources/clamp/acm/test/participant-kubernetes-helm.yaml
+++ b/examples/src/main/resources/clamp/acm/test/participant-kubernetes-helm.yaml
@@ -1,5 +1,5 @@
 # ============LICENSE_START=======================================================
-# Copyright (C) 2021-2022 Nordix Foundation.
+# Copyright (C) 2021-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.
@@ -41,9 +41,6 @@ node_types:
       provider:
         type: string
         required: false
-      participantType:
-        type: onap.datatypes.ToscaConceptIdentifier
-        required: true
       startPhase:
         type: integer
         required: false
@@ -105,9 +102,6 @@ topology_template:
       description: Automation composition element for the K8S microservice for Hello World
       properties:
         provider: ONAP
-        participantType:
-          name: org.onap.k8s.acm.K8SAutomationCompositionParticipant
-          version: 2.3.4
         startPhase: 2
         uninitializedToPassiveTimeout: 180
         podStatusCheckInterval: 30
@@ -127,9 +121,6 @@ topology_template:
       description: Automation composition element for the K8S microservice for PMSH
       properties:
         provider: ONAP
-        participantType:
-          name: org.onap.k8s.acm.K8SAutomationCompositionParticipant
-          version: 2.3.4
         startPhase: 2
         uninitializedToPassiveTimeout: 180
         podStatusCheckInterval: 30
@@ -150,9 +141,6 @@ topology_template:
       description: Automation composition element for the K8S microservice for local chart
       properties:
         provider: ONAP
-        participantType:
-          name: org.onap.k8s.acm.K8SAutomationCompositionParticipant
-          version: 2.3.4
         startPhase: 2
         uninitializedToPassiveTimeout: 180
         podStatusCheckInterval: 30

diff --git a/examples/src/main/resources/clamp/acm/test/pm_simple_ac_tosca.yaml b/examples/src/main/resources/clamp/acm/test/pm_simple_ac_tosca.yaml
index fedae59..397b522 100644 (file)
--- a/examples/src/main/resources/clamp/acm/test/pm_simple_ac_tosca.yaml
+++ b/examples/src/main/resources/clamp/acm/test/pm_simple_ac_tosca.yaml
@@ -25,9 +25,6 @@ node_types:
       provider:
         type: string
         required: false
-      participantType:
-        type: onap.datatypes.ToscaConceptIdentifier
-        required: true
       startPhase:
         type: integer
         required: false
@@ -102,9 +99,6 @@ topology_template:
       description: Automation composition element for the DCAE microservice for Performance Management Subscription Handling
       properties:
         provider: Ericsson
-        participantType:
-          name: org.onap.dcae.acm.DCAEMicroserviceAutomationCompositionParticipant
-          version: 2.3.4
         dcae_blueprint_id:
           name: org.onap.dcae.blueprints.PMSHBlueprint
           version: 1.0.0
@@ -115,9 +109,6 @@ topology_template:
       description: Automation composition element for the monitoring policy for Performance Management Subscription Handling
       properties:
         provider: Ericsson
-        participantType:
-          name: org.onap.policy.acm.PolicyAutomationCompositionParticipant
-          version: 2.3.1
         policy_type_id:
           name: onap.policies.monitoring.pm-subscription-handler
           version: 1.0.0
@@ -128,9 +119,6 @@ topology_template:
       description: Automation composition element for the operational policy for Performance Management Subscription Handling
       properties:
         provider: Ericsson
-        participantType:
-          name: org.onap.policy.acm.PolicyAutomationCompositionParticipant
-          version: 2.3.1
         policy_type_id:
           name: onap.policies.operational.pm-subscription-handler
           version: 1.0.0
@@ -141,9 +129,6 @@ topology_template:
       description: Automation composition element for CDS for Performance Management Subscription Handling
       properties:
         provider: Ericsson
-        participantType:
-          name: org.onap.PM_CDS_Blueprint
-          version: 1.0.0
         cds_blueprint_id:
           name: org.onap.ccsdk.cds.PMSHCdsBlueprint
           version: 1.0.0

diff --git a/models/src/test/resources/examples/acm/test-pm-subscription-handling.yaml b/models/src/test/resources/examples/acm/test-pm-subscription-handling.yaml
index c4f3735..595755a 100644 (file)
--- a/models/src/test/resources/examples/acm/test-pm-subscription-handling.yaml
+++ b/models/src/test/resources/examples/acm/test-pm-subscription-handling.yaml
@@ -1,5 +1,5 @@
 # ============LICENSE_START=======================================================
-# Copyright (C) 2021 Nordix Foundation.
+# Copyright (C) 2021-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.
@@ -317,9 +317,6 @@ node_types:
       provider:
         type: string
         required: false
-      participantType:
-        type: onap.datatypes.ToscaConceptIdentifier
-        required: true
       startPhase:
         type: integer
         required: false
@@ -418,9 +415,6 @@ topology_template:
       description: Automation composition element for the DCAE microservice for Performance Management Subscription Handling
       properties:
         provider: Ericsson
-        participantType:
-          name: org.onap.dcae.acm.DCAEMicroserviceAutomationCompositionParticipant
-          version: 2.3.4
         dcae_blueprint:
           tosca_definitions_version: cloudify_dsl_1_3
           imports:
@@ -642,9 +636,6 @@ topology_template:
       description: Automation composition element for the monitoring policy for Performance Management Subscription Handling
       properties:
         provider: Ericsson
-        participantType:
-          name: org.onap.policy.acm.PolicyAutomationCompositionParticipant
-          version: 2.3.1
         policy_type_id:
           name: onap.policies.monitoring.pm-subscription-handler
           version: 1.0.0
@@ -657,9 +648,6 @@ topology_template:
       description: Automation composition element for the operational policy for Performance Management Subscription Handling
       properties:
         provider: Ericsson
-        participantType:
-          name: org.onap.policy.acm.PolicyAutomationCompositionParticipant
-          version: 2.2.1
         policy_type_id:
           name: onap.policies.operational.pm-subscription-handler
           version: 1.0.0
@@ -672,9 +660,6 @@ topology_template:
       description: Automation composition element for CDS for Performance Management Subscription Handling
       properties:
         provider: Ericsson
-        participantType:
-          name: org.onap.ccsdk.cds.acm.CdsAutomationCompositionParticipant
-          version: 3.2.1
         cds_blueprint_id:
           name: org.onap.ccsdk.cds.PMSHCdsBlueprint
           version: 1.0.0

diff --git a/packages/policy-clamp-tarball/src/main/resources/etc/A1pmsParticipantParameters.yaml b/packages/policy-clamp-tarball/src/main/resources/etc/A1pmsParticipantParameters.yaml
index 54bb437..a924ec1 100755 (executable)
--- a/packages/policy-clamp-tarball/src/main/resources/etc/A1pmsParticipantParameters.yaml
+++ b/packages/policy-clamp-tarball/src/main/resources/etc/A1pmsParticipantParameters.yaml
@@ -26,9 +26,6 @@ participant:
     reportingTimeIntervalMs: 120000
     description: Participant Description
     participantId: 101c62b3-8918-41b9-a747-d21eb79c6c00
-    participantType:
-      name: org.onap.policy.clamp.acm.A1PMSParticipant
-      version: 2.3.4
     clampAutomationCompositionTopics:
       topicSources:
         - topic: POLICY-ACRUNTIME-PARTICIPANT
@@ -41,7 +38,13 @@ participant:
           servers:
             - ${topicServer:localhost}
           topicCommInfrastructure: dmaap
-
+    participantSupportedElementTypes:
+      -
+        typeName: org.onap.policy.clamp.acm.A1PMSAutomationCompositionElement
+        typeVersion: 1.0.1
+      -
+        typeName: org.onap.policy.clamp.acm.AutomationCompositionElement
+        typeVersion: 1.0.0
 
 management:
   endpoints:

diff --git a/packages/policy-clamp-tarball/src/main/resources/etc/HttpParticipantParameters.yaml b/packages/policy-clamp-tarball/src/main/resources/etc/HttpParticipantParameters.yaml
index b31a160..8b3061e 100644 (file)
--- a/packages/policy-clamp-tarball/src/main/resources/etc/HttpParticipantParameters.yaml
+++ b/packages/policy-clamp-tarball/src/main/resources/etc/HttpParticipantParameters.yaml
@@ -17,9 +17,6 @@ participant:
     reportingTimeIntervalMs: 120000
     description: Participant Description
     participantId: 101c62b3-8918-41b9-a747-d21eb79c6c01
-    participantType:
-      name: org.onap.policy.clamp.acm.HttpParticipant
-      version: 2.3.4
     clampAutomationCompositionTopics:
       topicSources:
         - topic: POLICY-ACRUNTIME-PARTICIPANT
@@ -34,6 +31,14 @@ participant:
             - ${topicServer:message-router}
           topicCommInfrastructure: dmaap
           useHttps: true
+    participantSupportedElementTypes:
+      -
+        typeName: org.onap.policy.clamp.acm.HttpAutomationCompositionElement
+        typeVersion: 1.0.0
+      -
+        typeName: org.onap.policy.clamp.acm.AutomationCompositionElement
+        typeVersion: 1.0.0
+
 management:
   endpoints:
     web:

diff --git a/packages/policy-clamp-tarball/src/main/resources/etc/KubernetesParticipantParameters.yaml b/packages/policy-clamp-tarball/src/main/resources/etc/KubernetesParticipantParameters.yaml
index 531a9cd..0fb7cf5 100644 (file)
--- a/packages/policy-clamp-tarball/src/main/resources/etc/KubernetesParticipantParameters.yaml
+++ b/packages/policy-clamp-tarball/src/main/resources/etc/KubernetesParticipantParameters.yaml
@@ -20,9 +20,6 @@ participant:
     reportingTimeIntervalMs: 120000
     description: Participant Description
     participantId: 101c62b3-8918-41b9-a747-d21eb79c6c02
-    participantType:
-      name: org.onap.policy.clamp.acm.KubernetesParticipant
-      version: 2.3.4
     clampAutomationCompositionTopics:
       topicSources:
         -
@@ -39,6 +36,13 @@ participant:
             - ${topicServer:message-router}
           topicCommInfrastructure: dmaap
           useHttps: true
+    participantSupportedElementTypes:
+      -
+        typeName: org.onap.policy.clamp.acm.K8SMicroserviceAutomationCompositionElement
+        typeVersion: 1.0.0
+      -
+        typeName: org.onap.policy.clamp.acm.AutomationCompositionElement
+        typeVersion: 1.0.0
 
 management:
   endpoints:

diff --git a/packages/policy-clamp-tarball/src/main/resources/etc/PolicyParticipantParameters.yaml b/packages/policy-clamp-tarball/src/main/resources/etc/PolicyParticipantParameters.yaml
index 7cdefd3..7ac11f2 100644 (file)
--- a/packages/policy-clamp-tarball/src/main/resources/etc/PolicyParticipantParameters.yaml
+++ b/packages/policy-clamp-tarball/src/main/resources/etc/PolicyParticipantParameters.yaml
@@ -33,9 +33,6 @@ participant:
     reportingTimeIntervalMs: 120000
     description: Participant Description
     participantId: 101c62b3-8918-41b9-a747-d21eb79c6c03
-    participantType:
-      name: org.onap.policy.clamp.acm.PolicyParticipant
-      version: 2.3.1
     clampAutomationCompositionTopics:
       topicSources:
         -
@@ -52,6 +49,14 @@ participant:
             - ${topicServer:message-router}
           topicCommInfrastructure: dmaap
           useHttps: true
+    participantSupportedElementTypes:
+      -
+        typeName: org.onap.policy.clamp.acm.PolicyAutomationCompositionElement
+        typeVersion: 1.0.0
+      -
+        typeName: org.onap.policy.clamp.acm.AutomationCompositionElement
+        typeVersion: 1.0.0
+
 management:
   endpoints:
     web:

diff --git a/participant/participant-impl/participant-impl-a1pms/src/main/resources/config/application.yaml b/participant/participant-impl/participant-impl-a1pms/src/main/resources/config/application.yaml
index 9c4e437..4171596 100755 (executable)
--- a/participant/participant-impl/participant-impl-a1pms/src/main/resources/config/application.yaml
+++ b/participant/participant-impl/participant-impl-a1pms/src/main/resources/config/application.yaml
@@ -26,9 +26,6 @@ participant:
     reportingTimeIntervalMs: 120000
     description: Participant Description
     participantId: 101c62b3-8918-41b9-a747-d21eb79c6c00
-    participantType:
-      name: org.onap.policy.clamp.acm.A1PMSParticipant
-      version: 2.3.4
     clampAutomationCompositionTopics:
       topicSources:
         - topic: POLICY-ACRUNTIME-PARTICIPANT
@@ -41,7 +38,13 @@ participant:
           servers:
             - ${topicServer:localhost}
           topicCommInfrastructure: dmaap
-
+    participantSupportedElementTypes:
+      -
+        typeName: org.onap.policy.clamp.acm.A1PMSAutomationCompositionElement
+        typeVersion: 1.0.1
+      -
+        typeName: org.onap.policy.clamp.acm.AutomationCompositionElement
+        typeVersion: 1.0.0
 
 management:
   endpoints:

diff --git a/participant/participant-impl/participant-impl-a1pms/src/test/resources/application-test.yaml b/participant/participant-impl/participant-impl-a1pms/src/test/resources/application-test.yaml
index ced319c..cd3a54e 100755 (executable)
--- a/participant/participant-impl/participant-impl-a1pms/src/test/resources/application-test.yaml
+++ b/participant/participant-impl/participant-impl-a1pms/src/test/resources/application-test.yaml
@@ -3,9 +3,6 @@ participant:
     reportingTimeInterval: 120000
     description: Participant Description
     participantId: 101c62b3-8918-41b9-a747-d21eb79c6c00
-    participantType:
-      name: org.onap.policy.clamp.acm.A1PMSParticipant
-      version: 2.3.4
     clampAutomationCompositionTopics:
       topicSources:
         -
@@ -22,8 +19,8 @@ participant:
           topic: POLICY-ACRUNTIME-PARTICIPANT
     participantSupportedElementTypes:
       -
-        typeName: org.onap.policy.clamp.acm.HttpAutomationCompositionElement
-        typeVersion: 1.0.0
+        typeName: org.onap.policy.clamp.acm.A1PMSAutomationCompositionElement
+        typeVersion: 1.0.1
       -
         typeName: org.onap.policy.clamp.acm.AutomationCompositionElement
         typeVersion: 1.0.0

diff --git a/participant/participant-impl/participant-impl-http/src/main/resources/config/application.yaml b/participant/participant-impl/participant-impl-http/src/main/resources/config/application.yaml
index a7015d9..68905c3 100644 (file)
--- a/participant/participant-impl/participant-impl-http/src/main/resources/config/application.yaml
+++ b/participant/participant-impl/participant-impl-http/src/main/resources/config/application.yaml
@@ -17,9 +17,6 @@ participant:
     reportingTimeIntervalMs: 120000
     description: Participant Description
     participantId: 101c62b3-8918-41b9-a747-d21eb79c6c01
-    participantType:
-      name: org.onap.policy.clamp.acm.HttpParticipant
-      version: 2.3.4
     clampAutomationCompositionTopics:
       topicSources:
         - topic: POLICY-ACRUNTIME-PARTICIPANT

diff --git a/participant/participant-impl/participant-impl-http/src/test/resources/application-test.yaml b/participant/participant-impl/participant-impl-http/src/test/resources/application-test.yaml
index bf429df..000ebc7 100644 (file)
--- a/participant/participant-impl/participant-impl-http/src/test/resources/application-test.yaml
+++ b/participant/participant-impl/participant-impl-http/src/test/resources/application-test.yaml
@@ -3,9 +3,6 @@ participant:
     reportingTimeInterval: 120000
     description: Participant Description
     participantId: 101c62b3-8918-41b9-a747-d21eb79c6c01
-    participantType:
-      version: 2.3.4
-      name: org.onap.clamp.acm.HttpParticipant
     clampAutomationCompositionTopics:
       topicSources:
         -

diff --git a/participant/participant-impl/participant-impl-kubernetes/src/main/resources/config/application.yaml b/participant/participant-impl/participant-impl-kubernetes/src/main/resources/config/application.yaml
index de9794d..9642b40 100644 (file)
--- a/participant/participant-impl/participant-impl-kubernetes/src/main/resources/config/application.yaml
+++ b/participant/participant-impl/participant-impl-kubernetes/src/main/resources/config/application.yaml
@@ -20,9 +20,6 @@ participant:
     reportingTimeIntervalMs: 120000
     description: Participant Description
     participantId: 101c62b3-8918-41b9-a747-d21eb79c6c02
-    participantType:
-      name: org.onap.policy.clamp.acm.KubernetesParticipant
-      version: 2.3.4
     clampAutomationCompositionTopics:
       topicSources:
         -

diff --git a/participant/participant-impl/participant-impl-kubernetes/src/test/resources/application-test.yaml b/participant/participant-impl/participant-impl-kubernetes/src/test/resources/application-test.yaml
index 62cef60..d8e4cb0 100644 (file)
--- a/participant/participant-impl/participant-impl-kubernetes/src/test/resources/application-test.yaml
+++ b/participant/participant-impl/participant-impl-kubernetes/src/test/resources/application-test.yaml
@@ -9,9 +9,6 @@ participant:
     description: Participant Description
     reportingTimeInterval: 120000
     participantId: 101c62b3-8918-41b9-a747-d21eb79c6c02
-    participantType:
-      version: 2.3.4
-      name: org.onap.k8s.acm.K8SAutomationCompositionParticipant
     clampAutomationCompositionTopics:
       topicSources:
         -

diff --git a/participant/participant-impl/participant-impl-policy/src/main/resources/config/application.yaml b/participant/participant-impl/participant-impl-policy/src/main/resources/config/application.yaml
index e7b59be..37391f1 100644 (file)
--- a/participant/participant-impl/participant-impl-policy/src/main/resources/config/application.yaml
+++ b/participant/participant-impl/participant-impl-policy/src/main/resources/config/application.yaml
@@ -33,9 +33,6 @@ participant:
     reportingTimeIntervalMs: 120000
     description: Participant Description
     participantId: 101c62b3-8918-41b9-a747-d21eb79c6c03
-    participantType:
-      name: org.onap.policy.clamp.acm.PolicyParticipant
-      version: 2.3.1
     clampAutomationCompositionTopics:
       topicSources:
         -
@@ -57,6 +54,7 @@ participant:
       -
         typeName: org.onap.policy.clamp.acm.AutomationCompositionElement
         typeVersion: 1.0.0
+
 management:
   endpoints:
     web:

diff --git a/participant/participant-impl/participant-impl-policy/src/test/resources/application-test.yaml b/participant/participant-impl/participant-impl-policy/src/test/resources/application-test.yaml
index 7a366f6..d9051c2 100644 (file)
--- a/participant/participant-impl/participant-impl-policy/src/test/resources/application-test.yaml
+++ b/participant/participant-impl/participant-impl-policy/src/test/resources/application-test.yaml
@@ -3,9 +3,6 @@ participant:
     reportingTimeInterval: 120000
     description: Participant Description
     participantId: 101c62b3-8918-41b9-a747-d21eb79c6c03
-    participantType:
-      version: 1.0.0
-      name: org.onap.PM_CDS_Blueprint
     clampAutomationCompositionTopics:
       topicSources:
         -

diff --git a/participant/participant-impl/participant-impl-policy/src/test/resources/parameters/TestACParams.yaml b/participant/participant-impl/participant-impl-policy/src/test/resources/parameters/TestACParams.yaml
index ef0e67c..f568b9c 100644 (file)
--- a/participant/participant-impl/participant-impl-policy/src/test/resources/parameters/TestACParams.yaml
+++ b/participant/participant-impl/participant-impl-policy/src/test/resources/parameters/TestACParams.yaml
@@ -24,9 +24,6 @@ node_types:
       provider:
         type: string
         required: false
-      participantType:
-        type: onap.datatypes.ToscaConceptIdentifier
-        required: true
       startPhase:
         type: integer
         required: false
@@ -108,9 +105,6 @@ topology_template:
       description: Automation composition element, DCAE microservice for Performance Management Subscription Handling
       properties:
         provider: Ericsson
-        participantType:
-          name: org.onap.dcae.acm.DCAEMicroserviceAutomationCompositionParticipant
-          version: 2.3.4
         dcae_blueprint_id:
           name: org.onap.dcae.blueprints.PMSHBlueprint
           version: 1.0.0
@@ -121,9 +115,6 @@ topology_template:
       description: Automation composition element, monitoring policy for Performance Management Subscription Handling
       properties:
         provider: Ericsson
-        participantType:
-          name: org.onap.policy.acm.MonitoringPolicyAutomationCompositionParticipant
-          version: 2.3.1
         policy_type_id:
           name: onap.policies.monitoring.pm-subscription-handler
           version: 1.0.0
@@ -134,9 +125,6 @@ topology_template:
       description: Automation composition element, operational policy for Performance Management Subscription Handling
       properties:
         provider: Ericsson
-        participantType:
-          name: org.onap.policy.acm.OperationalPolicyAutomationCompositionParticipant
-          version: 2.2.1
         policy_type_id:
           name: onap.policies.operational.pm-subscription-handler
           version: 1.0.0
@@ -147,9 +135,6 @@ topology_template:
       description: Automation composition element for CDS for Performance Management Subscription Handling
       properties:
         provider: Ericsson
-        participantType:
-          name: org.onap.ccsdk.cds.acm.CdsAutomationCompositionParticipant
-          version: 3.2.1
         cds_blueprint_id:
           name: org.onap.ccsdk.cds.PMSHCdsBlueprint
           version: 1.0.0