summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLiam Fallon <liam.fallon@est.tech>2023-02-15 17:02:52 +0000
committerGerrit Code Review <gerrit@onap.org>2023-02-15 17:02:52 +0000
commit2d3db6e64ef37448b419b31e2af7412aeb2b42ca (patch)
treed2ea57dc08ff2def99df8659d26a0ba7f1dbe8d2
parent7fcfd7b04b7b7deec7e8279134a7c9d93525eb6c (diff)
parentcb5df4253252b9b00146bf2b7829230acb124383 (diff)
Merge "Refactor yaml files in ACM"
-rw-r--r--common/src/main/resources/tosca/HttpAutomationCompositionElementType.yaml2
-rw-r--r--common/src/main/resources/tosca/PolicyAutomationCompositionElementType.yaml2
-rw-r--r--examples/src/main/resources/clamp/acm/acm-demo/toscaServiceTemplate.yaml18
-rw-r--r--examples/src/main/resources/clamp/acm/test/participant-http.yaml4
-rw-r--r--examples/src/main/resources/clamp/acm/test/participant-kubernetes-helm.yaml8
-rw-r--r--models/src/test/resources/examples/acm/test-pm-subscription-handling.yaml6
-rwxr-xr-xpackages/policy-clamp-tarball/src/main/resources/etc/A1pmsParticipantParameters.yaml3
-rw-r--r--packages/policy-clamp-tarball/src/main/resources/etc/HttpParticipantParameters.yaml3
-rw-r--r--packages/policy-clamp-tarball/src/main/resources/etc/KubernetesParticipantParameters.yaml3
-rw-r--r--packages/policy-clamp-tarball/src/main/resources/etc/PolicyParticipantParameters.yaml3
-rwxr-xr-xparticipant/participant-impl/participant-impl-a1pms/src/main/resources/config/application.yaml3
-rwxr-xr-xparticipant/participant-impl/participant-impl-a1pms/src/test/resources/application-test.yaml3
-rw-r--r--participant/participant-impl/participant-impl-http/src/main/resources/config/application.yaml4
-rw-r--r--participant/participant-impl/participant-impl-http/src/test/resources/application-test.yaml2
-rw-r--r--participant/participant-impl/participant-impl-kubernetes/src/main/resources/config/application.yaml3
-rw-r--r--participant/participant-impl/participant-impl-kubernetes/src/test/resources/application-test.yaml3
-rw-r--r--participant/participant-impl/participant-impl-policy/src/main/resources/config/application.yaml3
-rw-r--r--participant/participant-impl/participant-impl-policy/src/test/resources/application-test.yaml3
18 files changed, 21 insertions, 55 deletions
diff --git a/common/src/main/resources/tosca/HttpAutomationCompositionElementType.yaml b/common/src/main/resources/tosca/HttpAutomationCompositionElementType.yaml
index ca9d577f1..097288e08 100644
--- a/common/src/main/resources/tosca/HttpAutomationCompositionElementType.yaml
+++ b/common/src/main/resources/tosca/HttpAutomationCompositionElementType.yaml
@@ -64,7 +64,7 @@ data_types:
description: A sequence of REST commands to send to the REST endpoint
node_types:
org.onap.policy.clamp.acm.HttpAutomationCompositionElement:
- version: 1.0.1
+ version: 1.0.0
derived_from: org.onap.policy.clamp.acm.AutomationCompositionElement
properties:
baseUrl:
diff --git a/common/src/main/resources/tosca/PolicyAutomationCompositionElementType.yaml b/common/src/main/resources/tosca/PolicyAutomationCompositionElementType.yaml
index 3968b3471..1aac3f1ce 100644
--- a/common/src/main/resources/tosca/PolicyAutomationCompositionElementType.yaml
+++ b/common/src/main/resources/tosca/PolicyAutomationCompositionElementType.yaml
@@ -18,7 +18,7 @@
tosca_definitions_version: tosca_simple_yaml_1_3
node_types:
org.onap.policy.clamp.acm.PolicyAutomationCompositionElement:
- version: 1.0.1
+ version: 1.0.0
derived_from: org.onap.policy.clamp.acm.AutomationCompositionElement
properties:
policyType:
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
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 595755a03..2b0b4feff 100644
--- a/models/src/test/resources/examples/acm/test-pm-subscription-handling.yaml
+++ b/models/src/test/resources/examples/acm/test-pm-subscription-handling.yaml
@@ -356,7 +356,7 @@ node_types:
entry_schema:
type: org.onap.datatypes.policy.clamp.acm.DCAEMicroserviceAutomationCompositionElementConsulInfo
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:
@@ -632,7 +632,7 @@ topology_template:
org.onap.domain.pmsh.PMSH_MonitoringPolicyAutomationCompositionElement:
version: 1.2.3
type: org.onap.policy.clamp.acm.PolicyAutomationCompositionElement
- type_version: 1.0.1
+ type_version: 1.0.0
description: Automation composition element for the monitoring policy for Performance Management Subscription Handling
properties:
provider: Ericsson
@@ -644,7 +644,7 @@ topology_template:
org.onap.domain.pmsh.PMSH_OperationalPolicyAutomationCompositionElement:
version: 1.2.3
type: org.onap.policy.clamp.acm.PolicyAutomationCompositionElement
- type_version: 1.0.1
+ type_version: 1.0.0
description: Automation composition element for the operational policy for Performance Management Subscription Handling
properties:
provider: Ericsson
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 a924ec18b..ddb4b9224 100755
--- a/packages/policy-clamp-tarball/src/main/resources/etc/A1pmsParticipantParameters.yaml
+++ b/packages/policy-clamp-tarball/src/main/resources/etc/A1pmsParticipantParameters.yaml
@@ -42,9 +42,6 @@ participant:
-
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 8b3061ee6..ed5fbbed8 100644
--- a/packages/policy-clamp-tarball/src/main/resources/etc/HttpParticipantParameters.yaml
+++ b/packages/policy-clamp-tarball/src/main/resources/etc/HttpParticipantParameters.yaml
@@ -35,9 +35,6 @@ participant:
-
typeName: org.onap.policy.clamp.acm.HttpAutomationCompositionElement
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/KubernetesParticipantParameters.yaml b/packages/policy-clamp-tarball/src/main/resources/etc/KubernetesParticipantParameters.yaml
index 0fb7cf5ce..89a42d069 100644
--- a/packages/policy-clamp-tarball/src/main/resources/etc/KubernetesParticipantParameters.yaml
+++ b/packages/policy-clamp-tarball/src/main/resources/etc/KubernetesParticipantParameters.yaml
@@ -40,9 +40,6 @@ participant:
-
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 7ac11f2e3..8b7e5440c 100644
--- a/packages/policy-clamp-tarball/src/main/resources/etc/PolicyParticipantParameters.yaml
+++ b/packages/policy-clamp-tarball/src/main/resources/etc/PolicyParticipantParameters.yaml
@@ -53,9 +53,6 @@ participant:
-
typeName: org.onap.policy.clamp.acm.PolicyAutomationCompositionElement
typeVersion: 1.0.0
- -
- typeName: org.onap.policy.clamp.acm.AutomationCompositionElement
- typeVersion: 1.0.0
management:
endpoints:
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 417159671..efa2a6e9e 100755
--- 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
@@ -42,9 +42,6 @@ participant:
-
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 cd3a54e78..4a179d11a 100755
--- 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
@@ -21,6 +21,3 @@ participant:
-
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 68905c36d..791299545 100644
--- 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
@@ -33,9 +33,7 @@ participant:
-
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/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 000ebc7a6..c77c2db23 100644
--- 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
@@ -20,5 +20,3 @@ participant:
participantSupportedElementTypes:
- typeName: org.onap.policy.clamp.acm.HttpAutomationCompositionElement
typeVersion: 1.0.0
- - typeName: org.onap.policy.clamp.acm.AutomationCompositionElement
- typeVersion: 1.0.0
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 9642b40e6..d032d3512 100644
--- 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
@@ -38,9 +38,6 @@ participant:
-
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/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 d8e4cb075..8d27aa93e 100644
--- 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
@@ -28,6 +28,3 @@ participant:
-
typeName: org.onap.policy.clamp.acm.K8SMicroserviceAutomationCompositionElement
typeVersion: 1.0.0
- -
- typeName: org.onap.policy.clamp.acm.AutomationCompositionElement
- typeVersion: 1.0.0
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 37391f116..6b0eed116 100644
--- 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
@@ -51,9 +51,6 @@ participant:
-
typeName: org.onap.policy.clamp.acm.PolicyAutomationCompositionElement
typeVersion: 1.0.0
- -
- typeName: org.onap.policy.clamp.acm.AutomationCompositionElement
- typeVersion: 1.0.0
management:
endpoints:
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 d9051c2cf..6c78c07dc 100644
--- 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
@@ -21,6 +21,3 @@ participant:
-
typeName: org.onap.policy.clamp.acm.PolicyAutomationCompositionElement
typeVersion: 1.0.0
- -
- typeName: org.onap.policy.clamp.acm.AutomationCompositionElement
- typeVersion: 1.0.0