From cb5df4253252b9b00146bf2b7829230acb124383 Mon Sep 17 00:00:00 2001 From: FrancescoFioraEst Date: Mon, 13 Feb 2023 14:51:08 +0000 Subject: Refactor yaml files in ACM Refactor Supported ACM element types and align element type version in all examples Issue-ID: POLICY-4512 Change-Id: Ic810fc1a98237d1b6fb816dccb1fcbe61a675c1e Signed-off-by: FrancescoFioraEst --- .../clamp/acm/acm-demo/toscaServiceTemplate.yaml | 18 +++++++++--------- .../resources/clamp/acm/test/participant-http.yaml | 4 ++-- .../clamp/acm/test/participant-kubernetes-helm.yaml | 8 ++++---- 3 files changed, 15 insertions(+), 15 deletions(-) (limited to 'examples') 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 525583b59..f062115ad 100644 --- a/examples/src/main/resources/clamp/acm/acm-demo/toscaServiceTemplate.yaml +++ b/examples/src/main/resources/clamp/acm/acm-demo/toscaServiceTemplate.yaml @@ -355,7 +355,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.PolicyAutomationCompositionElement: - version: 1.0.1 + version: 1.0.0 derived_from: org.onap.policy.clamp.acm.AutomationCompositionElement properties: policy_type_id: @@ -365,7 +365,7 @@ node_types: type: onap.datatypes.ToscaConceptIdentifier required: false org.onap.policy.clamp.acm.K8SMicroserviceAutomationCompositionElement: - version: 1.0.1 + version: 1.0.0 derived_from: org.onap.policy.clamp.acm.AutomationCompositionElement properties: chart: @@ -385,7 +385,7 @@ node_types: type: string required: true org.onap.policy.clamp.acm.HttpAutomationCompositionElement: - version: 1.0.1 + version: 1.0.0 derived_from: org.onap.policy.clamp.acm.AutomationCompositionElement properties: baseUrl: @@ -445,7 +445,7 @@ topology_template: # Chart from any chart repository configured on helm client. version: 1.2.3 type: org.onap.policy.clamp.acm.K8SMicroserviceAutomationCompositionElement - type_version: 1.0.1 + type_version: 1.0.0 description: Automation composition element for the K8S microservice for AC Element Starter properties: provider: ONAP @@ -469,7 +469,7 @@ topology_template: # Chart from any chart repository configured on helm client. version: 1.2.3 type: org.onap.policy.clamp.acm.K8SMicroserviceAutomationCompositionElement - type_version: 1.0.1 + type_version: 1.0.0 description: Automation composition element for the K8S microservice for AC Element Bridge properties: provider: ONAP @@ -493,7 +493,7 @@ topology_template: # Chart from any chart repository configured on helm client. version: 1.2.3 type: org.onap.policy.clamp.acm.K8SMicroserviceAutomationCompositionElement - type_version: 1.0.1 + type_version: 1.0.0 description: Automation composition element for the K8S microservice for AC Element Sink properties: provider: ONAP @@ -524,7 +524,7 @@ 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 @@ -550,7 +550,7 @@ 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 @@ -576,7 +576,7 @@ 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 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 2bc3828bb..39e1fa63d 100644 --- a/examples/src/main/resources/clamp/acm/test/participant-http.yaml +++ b/examples/src/main/resources/clamp/acm/test/participant-http.yaml @@ -112,7 +112,7 @@ node_types: entry_schema: type: onap.datatypes.ToscaConceptIdentifier org.onap.policy.clamp.acm.HttpAutomationCompositionElement: - version: 1.0.1 + version: 1.0.0 derived_from: org.onap.policy.clamp.acm.AutomationCompositionElement properties: baseUrl: @@ -146,7 +146,7 @@ topology_template: # Http config for PMSH. 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 PMSH microservice properties: provider: ONAP 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 b6aab8747..4034debba 100644 --- a/examples/src/main/resources/clamp/acm/test/participant-kubernetes-helm.yaml +++ b/examples/src/main/resources/clamp/acm/test/participant-kubernetes-helm.yaml @@ -65,7 +65,7 @@ node_types: entry_schema: type: onap.datatypes.ToscaConceptIdentifier org.onap.policy.clamp.acm.K8SMicroserviceAutomationCompositionElement: - version: 1.0.1 + version: 1.0.0 derived_from: org.onap.policy.clamp.acm.AutomationCompositionElement properties: chart: @@ -98,7 +98,7 @@ topology_template: # Chart from any chart repository configured on helm client. version: 1.2.3 type: org.onap.policy.clamp.acm.K8SMicroserviceAutomationCompositionElement - type_version: 1.0.1 + type_version: 1.0.0 description: Automation composition element for the K8S microservice for Hello World properties: provider: ONAP @@ -117,7 +117,7 @@ topology_template: # Chart from local file system version: 1.2.3 type: org.onap.policy.clamp.acm.K8SMicroserviceAutomationCompositionElement - type_version: 1.0.1 + type_version: 1.0.0 description: Automation composition element for the K8S microservice for PMSH properties: provider: ONAP @@ -137,7 +137,7 @@ topology_template: # Chart installation without passing repository name version: 1.2.3 type: org.onap.policy.clamp.acm.K8SMicroserviceAutomationCompositionElement - type_version: 1.0.1 + type_version: 1.0.0 description: Automation composition element for the K8S microservice for local chart properties: provider: ONAP -- cgit 1.2.3-korg