Fix type version in all tosca_service_template yaml files

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

8 files changed, 155 insertions, 155 deletions

diff --git a/examples/src/main/resources/clamp/acm/gentleguidance/sampleAcmTosca.yml b/examples/src/main/resources/clamp/acm/gentleguidance/sampleAcmTosca.yml
index bd7242fe5..c9c11ed31 100644
--- a/examples/src/main/resources/clamp/acm/gentleguidance/sampleAcmTosca.yml
+++ b/examples/src/main/resources/clamp/acm/gentleguidance/sampleAcmTosca.yml
@@ -34,7 +34,7 @@ data_types:
     properties:
       restRequestId:
         type: onap.datatypes.ToscaConceptIdentifier
-        typeVersion: 1.0.0
+        type_version: 0.0.0
         required: true
         description: The name and version of a REST request to be sent to a REST endpoint
       httpMethod:
@@ -62,14 +62,14 @@ data_types:
     properties:
       configurationEntityId:
         type: onap.datatypes.ToscaConceptIdentifier
-        typeVersion: 1.0.0
+        type_version: 0.0.0
         required: true
         description: The name and version of a Configuration Entity to be handled by the HTTP Automation Composition Element
       restSequence:
         type: list
         entry_schema:
           type: org.onap.datatypes.policy.clamp.acm.httpAutomationCompositionElement.RestRequest
-          typeVersion: 1.0.0
+          type_version: 1.0.0
         description: A sequence of REST commands to send to the REST endpoint
 
   node_types:
@@ -79,7 +79,7 @@ data_types:
       properties:
         provider:
           type: string
-          requred: false
+          required: false
     org.onap.policy.clamp.acm.AutomationCompositionElement:
       version: 1.0.1
       derived_from: tosca.nodetypes.Root
@@ -92,7 +92,7 @@ data_types:
           description: Specifies the organization that provides the automation composition element
         participant_id:
           type: onap.datatypes.ToscaConceptIdentifier
-          requred: true
+          required: true
           metadata:
             common: true
         participantType:
@@ -185,7 +185,7 @@ data_types:
           required: true
           entry_schema:
             type: org.onap.datatypes.policy.clamp.acm.httpAutomationCompositionElement.ConfigurationEntity
-            typeVersion: 1.0.0
+            type_version: 1.0.0
           description: The connfiguration entities the Automation Composition Element is managing and their associated REST requests
 
 topology_template:
diff --git a/examples/src/main/resources/clamp/acm/gentleguidance/sampleAcmToscaWithMultipleElements.yml b/examples/src/main/resources/clamp/acm/gentleguidance/sampleAcmToscaWithMultipleElements.yml
index 6adfcebcf..ed0b7c0b0 100644
--- a/examples/src/main/resources/clamp/acm/gentleguidance/sampleAcmToscaWithMultipleElements.yml
+++ b/examples/src/main/resources/clamp/acm/gentleguidance/sampleAcmToscaWithMultipleElements.yml
@@ -36,7 +36,7 @@ data_types:
     properties:
       restRequestId:
         type: onap.datatypes.ToscaConceptIdentifier
-        typeVersion: 1.0.0
+        type_version: 0.0.0
         required: true
         description: The name and version of a REST request to be sent to a REST endpoint
       httpMethod:
@@ -64,14 +64,14 @@ data_types:
     properties:
       configurationEntityId:
         type: onap.datatypes.ToscaConceptIdentifier
-        typeVersion: 1.0.0
+        type_version: 0.0.0
         required: true
         description: The name and version of a Configuration Entity to be handled by the HTTP Automation Composition Element
       restSequence:
         type: list
         entry_schema:
           type: org.onap.datatypes.policy.clamp.acm.httpAutomationCompositionElement.RestRequest
-          typeVersion: 1.0.0
+          type_version: 1.0.0
         description: A sequence of REST commands to send to the REST endpoint
 policy_types:
   # The following policy types will be created in policy framework by the acm policy participant
@@ -92,7 +92,7 @@ node_types:
     properties:
       provider:
         type: string
-        requred: false
+        required: false
   org.onap.policy.clamp.acm.AutomationCompositionElement:
     version: 1.0.1
     derived_from: tosca.nodetypes.Root
@@ -105,7 +105,7 @@ node_types:
         description: Specifies the organization that provides the automation composition element
       participant_id:
         type: onap.datatypes.ToscaConceptIdentifier
-        requred: true
+        required: true
         metadata:
           common: true
       participantType:
@@ -185,10 +185,10 @@ node_types:
     properties:
       policy_type_id:
         type: onap.datatypes.ToscaConceptIdentifier
-        requred: true
+        required: true
       policy_id:
         type: onap.datatypes.ToscaConceptIdentifier
-        requred: false
+        required: false
   org.onap.policy.clamp.acm.K8SMicroserviceAutomationCompositionElement:
     version: 1.0.1
     derived_from: org.onap.policy.clamp.acm.AutomationCompositionElement
@@ -201,14 +201,14 @@ node_types:
         required: false
       requirements:
         type: string
-        requred: false
+        required: false
       templates:
         type: list
         required: false
         entry_schema:
       values:
         type: string
-        requred: true
+        required: true
   org.onap.policy.clamp.acm.HttpAutomationCompositionElement:
     version: 1.0.1
     derived_from: org.onap.policy.clamp.acm.AutomationCompositionElement
@@ -228,7 +228,7 @@ node_types:
         required: true
         entry_schema:
           type: org.onap.datatypes.policy.clamp.acm.httpAutomationCompositionElement.ConfigurationEntity
-          typeVersion: 1.0.0
+          type_version: 1.0.0
         description: The connfiguration entities the Automation Composition Element is managing and their associated REST requests
 
 topology_template:
@@ -251,7 +251,7 @@ topology_template:
       # The policy Acm element that deploys decision maker policy in policy framework.
       version: 1.2.3
       type: org.onap.policy.clamp.acm.PolicyAutomationCompositionElement
-      type_version: 1.0.0
+      type_version: 1.0.1
       description: Automation composition element for deploying sample decision maker policy
       properties:
         provider: Ericsson
@@ -277,7 +277,7 @@ topology_template:
       # The k8s Acm element that deploys the helm chart of nginx-ingress from nginx repo.
       version: 1.2.3
       type: org.onap.policy.clamp.acm.K8SMicroserviceAutomationCompositionElement
-      type_version: 1.0.0
+      type_version: 1.0.1
       description: Automation composition element for the K8S microservice to deploy nginx app
       properties:
         provider: ONAP
@@ -344,7 +344,7 @@ topology_template:
       # The ACM definition that comprises multiple Acm elements
       version: 1.2.3
       type: org.onap.policy.clamp.acm.AutomationComposition
-      type_version: 1.0.0
+      type_version: 1.0.1
       description: Automation composition with multiple Acm elements
       properties:
         provider: ONAP
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 8df3a4e7e..cf8aff469 100644
--- a/examples/src/main/resources/clamp/acm/pmsh/funtional-pmsh-usecase.yaml
+++ b/examples/src/main/resources/clamp/acm/pmsh/funtional-pmsh-usecase.yaml
@@ -139,7 +139,7 @@ data_types:
       DN:
         name: DN
         type: string
-        typeVersion: 0.0.0
+        type_version: 0.0.0
         description: Managed object distinguished name
         required: true
         constraints: [ ]
@@ -154,13 +154,13 @@ data_types:
       managedObjectDNsBasic:
         name: managedObjectDNsBasic
         type: map
-        typeVersion: 0.0.0
+        type_version: 0.0.0
         description: Managed object distinguished name object
         required: true
         constraints: [ ]
         entry_schema:
           type: onap.datatypes.monitoring.managedObjectDNsBasic
-          typeVersion: 0.0.0
+          type_version: 0.0.0
           constraints: [ ]
         metadata: { }
     name: onap.datatypes.monitoring.managedObjectDNsBasics
@@ -173,25 +173,25 @@ data_types:
       measurementTypes:
         name: measurementTypes
         type: list
-        typeVersion: 0.0.0
+        type_version: 0.0.0
         description: List of measurement types
         required: true
         constraints: [ ]
         entry_schema:
           type: onap.datatypes.monitoring.measurementTypes
-          typeVersion: 0.0.0
+          type_version: 0.0.0
           constraints: [ ]
         metadata: { }
       managedObjectDNsBasic:
         name: managedObjectDNsBasic
         type: list
-        typeVersion: 0.0.0
+        type_version: 0.0.0
         description: List of managed object distinguished names
         required: true
         constraints: [ ]
         entry_schema:
           type: onap.datatypes.monitoring.managedObjectDNsBasics
-          typeVersion: 0.0.0
+          type_version: 0.0.0
           constraints: [ ]
         metadata: { }
     name: onap.datatypes.monitoring.measurementGroup
@@ -204,13 +204,13 @@ data_types:
       measurementGroup:
         name: measurementGroup
         type: map
-        typeVersion: 0.0.0
+        type_version: 0.0.0
         description: Measurement Group
         required: true
         constraints: [ ]
         entry_schema:
           type: onap.datatypes.monitoring.measurementGroup
-          typeVersion: 0.0.0
+          type_version: 0.0.0
           constraints: [ ]
         metadata: { }
     name: onap.datatypes.monitoring.measurementGroups
@@ -223,7 +223,7 @@ data_types:
       measurementType:
         name: measurementType
         type: string
-        typeVersion: 0.0.0
+        type_version: 0.0.0
         description: Measurement type
         required: true
         constraints: [ ]
@@ -238,13 +238,13 @@ data_types:
       measurementType:
         name: measurementType
         type: map
-        typeVersion: 0.0.0
+        type_version: 0.0.0
         description: Measurement type object
         required: true
         constraints: [ ]
         entry_schema:
           type: onap.datatypes.monitoring.measurementType
-          typeVersion: 0.0.0
+          type_version: 0.0.0
           constraints: [ ]
         metadata: { }
     name: onap.datatypes.monitoring.measurementTypes
@@ -257,49 +257,49 @@ data_types:
       modelNames:
         name: modelNames
         type: list
-        typeVersion: 0.0.0
+        type_version: 0.0.0
         description: List of model names
         required: true
         constraints: [ ]
         entry_schema:
           type: string
-          typeVersion: 0.0.0
+          type_version: 0.0.0
           constraints: [ ]
         metadata: { }
       modelInvariantIDs:
         name: modelInvariantIDs
         type: list
-        typeVersion: 0.0.0
+        type_version: 0.0.0
         description: List of model invariant IDs
         required: true
         constraints: [ ]
         entry_schema:
           type: string
-          typeVersion: 0.0.0
+          type_version: 0.0.0
           constraints: [ ]
         metadata: { }
       modelVersionIDs:
         name: modelVersionIDs
         type: list
-        typeVersion: 0.0.0
+        type_version: 0.0.0
         description: List of model version IDs
         required: true
         constraints: [ ]
         entry_schema:
           type: string
-          typeVersion: 0.0.0
+          type_version: 0.0.0
           constraints: [ ]
         metadata: { }
       nfNames:
         name: nfNames
         type: list
-        typeVersion: 0.0.0
+        type_version: 0.0.0
         description: List of network functions
         required: true
         constraints: [ ]
         entry_schema:
           type: string
-          typeVersion: 0.0.0
+          type_version: 0.0.0
           constraints: [ ]
         metadata: { }
     name: onap.datatypes.monitoring.nfFilter
@@ -312,19 +312,19 @@ data_types:
       measurementGroups:
         name: measurementGroups
         type: list
-        typeVersion: 0.0.0
+        type_version: 0.0.0
         description: Measurement Groups
         required: true
         constraints: [ ]
         entry_schema:
           type: onap.datatypes.monitoring.measurementGroups
-          typeVersion: 0.0.0
+          type_version: 0.0.0
           constraints: [ ]
         metadata: { }
       fileBasedGP:
         name: fileBasedGP
         type: integer
-        typeVersion: 0.0.0
+        type_version: 0.0.0
         description: File based granularity period
         required: true
         constraints: [ ]
@@ -332,7 +332,7 @@ data_types:
       fileLocation:
         name: fileLocation
         type: string
-        typeVersion: 0.0.0
+        type_version: 0.0.0
         description: ROP file location
         required: true
         constraints: [ ]
@@ -340,7 +340,7 @@ data_types:
       subscriptionName:
         name: subscriptionName
         type: string
-        typeVersion: 0.0.0
+        type_version: 0.0.0
         description: Name of the subscription
         required: true
         constraints: [ ]
@@ -348,7 +348,7 @@ data_types:
       administrativeState:
         name: administrativeState
         type: string
-        typeVersion: 0.0.0
+        type_version: 0.0.0
         description: State of the subscription
         required: true
         constraints:
@@ -359,13 +359,13 @@ data_types:
       nfFilter:
         name: nfFilter
         type: map
-        typeVersion: 0.0.0
+        type_version: 0.0.0
         description: Network function filter
         required: true
         constraints: [ ]
         entry_schema:
           type: onap.datatypes.monitoring.nfFilter
-          typeVersion: 0.0.0
+          type_version: 0.0.0
           constraints: [ ]
         metadata: { }
     name: onap.datatypes.monitoring.subscription
@@ -378,7 +378,7 @@ data_types:
     properties:
       restRequestId:
         type: onap.datatypes.ToscaConceptIdentifier
-        typeVersion: 1.0.0
+        type_version: 0.0.0
         required: true
         description: The name and version of a REST request to be sent to a REST endpoint
       httpMethod:
@@ -400,21 +400,21 @@ data_types:
         required: true
         constraints: [ ]
         description: THe expected HTTP status code for the REST request
-    org.onap.datatypes.policy.clamp.acm.httpAutomationCompositionElement.ConfigurationEntity:
-      version: 1.0.0
-      derived_from: tosca.datatypes.Root
-      properties:
-        configurationEntityId:
-          type: onap.datatypes.ToscaConceptIdentifier
-          typeVersion: 1.0.0
-          required: true
-          description: The name and version of a Configuration Entity to be handled by the HTTP Automation Composition Element
-        restSequence:
-          type: list
-          entry_schema:
-            type: org.onap.datatypes.policy.clamp.acm.httpAutomationCompositionElement.RestRequest
-            typeVersion: 1.0.0
-          description: A sequence of REST commands to send to the REST endpoint
+  org.onap.datatypes.policy.clamp.acm.httpAutomationCompositionElement.ConfigurationEntity:
+    version: 1.0.0
+    derived_from: tosca.datatypes.Root
+    properties:
+      configurationEntityId:
+        type: onap.datatypes.ToscaConceptIdentifier
+        type_version: 0.0.0
+        required: true
+        description: The name and version of a Configuration Entity to be handled by the HTTP Automation Composition Element
+      restSequence:
+        type: list
+        entry_schema:
+          type: org.onap.datatypes.policy.clamp.acm.httpAutomationCompositionElement.RestRequest
+          type_version: 1.0.0
+        description: A sequence of REST commands to send to the REST endpoint
 policy_types:
   onap.policies.Monitoring:
     derived_from: tosca.policies.Root
@@ -431,7 +431,7 @@ policy_types:
       pmsh_policy:
         name: pmsh_policy
         type: onap.datatypes.monitoring.subscription
-        typeVersion: 0.0.0
+        type_version: 0.0.0
         description: PMSH Policy JSON
         required: false
         constraints: [ ]
@@ -503,7 +503,7 @@ node_types:
     properties:
       provider:
         type: string
-        requred: false
+        required: false
   org.onap.policy.clamp.acm.AutomationCompositionElement:
     version: 1.0.1
     derived_from: tosca.nodetypes.Root
@@ -516,7 +516,7 @@ node_types:
         description: Specifies the organization that provides the automation composition element
       participant_id:
         type: onap.datatypes.ToscaConceptIdentifier
-        requred: true
+        required: true
         metadata:
           common: true
       participantType:
@@ -596,17 +596,17 @@ node_types:
     properties:
       policy_type_id:
         type: onap.datatypes.ToscaConceptIdentifier
-        requred: true
+        required: true
       policy_id:
         type: onap.datatypes.ToscaConceptIdentifier
-        requred: false
+        required: false
   org.onap.policy.clamp.acm.CDSAutomationCompositionElement:
     version: 1.0.1
     derived_from: org.onap.policy.clamp.acm.AutomationCompositionElement
     properties:
       cds_blueprint_id:
         type: onap.datatypes.ToscaConceptIdentifier
-        requred: true
+        required: true
   org.onap.policy.clamp.acm.K8SMicroserviceAutomationCompositionElement:
     version: 1.0.1
     derived_from: org.onap.policy.clamp.acm.AutomationCompositionElement
@@ -619,14 +619,14 @@ node_types:
         required: false
       requirements:
         type: string
-        requred: false
+        required: false
       templates:
         type: list
         required: false
         entry_schema:
       values:
         type: string
-        requred: true
+        required: true
   org.onap.policy.clamp.acm.HttpAutomationCompositionElement:
     version: 1.0.1
     derived_from: org.onap.policy.clamp.acm.AutomationCompositionElement
@@ -646,7 +646,7 @@ node_types:
         required: true
         entry_schema:
           type: org.onap.datatypes.policy.clamp.acm.httpAutomationCompositionElement.ConfigurationEntity
-          typeVersion: 1.0.0
+          type_version: 1.0.0
         description: The connfiguration entities the Automation Composition Element is managing and their associated REST requests
 
 topology_template:
@@ -674,7 +674,7 @@ topology_template:
     org.onap.domain.pmsh.PMSH_MonitoringPolicyAutomationCompositionElement:
       version: 1.2.3
       type: org.onap.policy.clamp.acm.PolicyAutomationCompositionElement
-      type_version: 1.0.0
+      type_version: 1.0.1
       description: Automation composition element for the monitoring policy for Performance Management Subscription Handling
       properties:
         provider: Ericsson
@@ -692,7 +692,7 @@ topology_template:
     org.onap.domain.pmsh.PMSH_OperationalPolicyAutomationCompositionElement:
       version: 1.2.3
       type: org.onap.policy.clamp.acm.PolicyAutomationCompositionElement
-      type_version: 1.0.0
+      type_version: 1.0.1
       description: Automation composition element for the operational policy for Performance Management Subscription Handling
       properties:
         provider: Ericsson
@@ -718,7 +718,7 @@ topology_template:
       # Chart from new repository
       version: 1.2.3
       type: org.onap.policy.clamp.acm.K8SMicroserviceAutomationCompositionElement
-      type_version: 1.0.0
+      type_version: 1.0.1
       description: Automation composition element for the K8S microservice for PMSH
       properties:
         provider: ONAP
@@ -834,7 +834,7 @@ topology_template:
     org.onap.domain.sample.GenericK8s_AutomationCompositionDefinition:
       version: 1.2.3
       type: org.onap.policy.clamp.acm.AutomationComposition
-      type_version: 1.0.0
+      type_version: 1.0.1
       description: Automation composition for Hello World
       properties:
         provider: ONAP
@@ -3741,4 +3741,4 @@ topology_template:
                   restRequestTimeout: 2000
               eventProtocolParameters:
                 eventProtocol: JSON
-              eventNameFilter: CDSResponseStatusEvent
\ No newline at end of file
+              eventNameFilter: CDSResponseStatusEvent
diff --git a/examples/src/main/resources/clamp/acm/tca/tosca-tcagen2.yml b/examples/src/main/resources/clamp/acm/tca/tosca-tcagen2.yml
index a21a72651..78dcc31da 100644
--- a/examples/src/main/resources/clamp/acm/tca/tosca-tcagen2.yml
+++ b/examples/src/main/resources/clamp/acm/tca/tosca-tcagen2.yml
@@ -140,25 +140,25 @@ data_types:
       measurementTypes:
         name: measurementTypes
         type: list
-        typeVersion: 0.0.0
+        type_version: 0.0.0
         description: List of measurement types
         required: true
         constraints: [ ]
         entry_schema:
           type: onap.datatypes.monitoring.measurementTypes
-          typeVersion: 0.0.0
+          type_version: 0.0.0
           constraints: [ ]
         metadata: { }
       managedObjectDNsBasic:
         name: managedObjectDNsBasic
         type: list
-        typeVersion: 0.0.0
+        type_version: 0.0.0
         description: List of managed object distinguished names
         required: true
         constraints: [ ]
         entry_schema:
           type: onap.datatypes.monitoring.managedObjectDNsBasics
-          typeVersion: 0.0.0
+          type_version: 0.0.0
           constraints: [ ]
         metadata: { }
     name: onap.datatypes.monitoring.measurementGroup
@@ -171,13 +171,13 @@ data_types:
       measurementGroup:
         name: measurementGroup
         type: map
-        typeVersion: 0.0.0
+        type_version: 0.0.0
         description: Measurement Group
         required: true
         constraints: [ ]
         entry_schema:
           type: onap.datatypes.monitoring.measurementGroup
-          typeVersion: 0.0.0
+          type_version: 0.0.0
           constraints: [ ]
         metadata: { }
     name: onap.datatypes.monitoring.measurementGroups
@@ -190,7 +190,7 @@ data_types:
       measurementType:
         name: measurementType
         type: string
-        typeVersion: 0.0.0
+        type_version: 0.0.0
         description: Measurement type
         required: true
         constraints: [ ]
@@ -205,13 +205,13 @@ data_types:
       measurementType:
         name: measurementType
         type: map
-        typeVersion: 0.0.0
+        type_version: 0.0.0
         description: Measurement type object
         required: true
         constraints: [ ]
         entry_schema:
           type: onap.datatypes.monitoring.measurementType
-          typeVersion: 0.0.0
+          type_version: 0.0.0
           constraints: [ ]
         metadata: { }
     name: onap.datatypes.monitoring.measurementTypes
@@ -224,7 +224,7 @@ data_types:
       DN:
         name: DN
         type: string
-        typeVersion: 0.0.0
+        type_version: 0.0.0
         description: Managed object distinguished name
         required: true
         constraints: [ ]
@@ -239,13 +239,13 @@ data_types:
       managedObjectDNsBasic:
         name: managedObjectDNsBasic
         type: map
-        typeVersion: 0.0.0
+        type_version: 0.0.0
         description: Managed object distinguished name object
         required: true
         constraints: [ ]
         entry_schema:
           type: onap.datatypes.monitoring.managedObjectDNsBasic
-          typeVersion: 0.0.0
+          type_version: 0.0.0
           constraints: [ ]
         metadata: { }
     name: onap.datatypes.monitoring.managedObjectDNsBasics
@@ -258,49 +258,49 @@ data_types:
       modelNames:
         name: modelNames
         type: list
-        typeVersion: 0.0.0
+        type_version: 0.0.0
         description: List of model names
         required: true
         constraints: [ ]
         entry_schema:
           type: string
-          typeVersion: 0.0.0
+          type_version: 0.0.0
           constraints: [ ]
         metadata: { }
       modelInvariantIDs:
         name: modelInvariantIDs
         type: list
-        typeVersion: 0.0.0
+        type_version: 0.0.0
         description: List of model invariant IDs
         required: true
         constraints: [ ]
         entry_schema:
           type: string
-          typeVersion: 0.0.0
+          type_version: 0.0.0
           constraints: [ ]
         metadata: { }
       modelVersionIDs:
         name: modelVersionIDs
         type: list
-        typeVersion: 0.0.0
+        type_version: 0.0.0
         description: List of model version IDs
         required: true
         constraints: [ ]
         entry_schema:
           type: string
-          typeVersion: 0.0.0
+          type_version: 0.0.0
           constraints: [ ]
         metadata: { }
       nfNames:
         name: nfNames
         type: list
-        typeVersion: 0.0.0
+        type_version: 0.0.0
         description: List of network functions
         required: true
         constraints: [ ]
         entry_schema:
           type: string
-          typeVersion: 0.0.0
+          type_version: 0.0.0
           constraints: [ ]
         metadata: { }
     name: onap.datatypes.monitoring.nfFilter
@@ -313,19 +313,19 @@ data_types:
       measurementGroups:
         name: measurementGroups
         type: list
-        typeVersion: 0.0.0
+        type_version: 0.0.0
         description: Measurement Groups
         required: true
         constraints: [ ]
         entry_schema:
           type: onap.datatypes.monitoring.measurementGroups
-          typeVersion: 0.0.0
+          type_version: 0.0.0
           constraints: [ ]
         metadata: { }
       fileBasedGP:
         name: fileBasedGP
         type: integer
-        typeVersion: 0.0.0
+        type_version: 0.0.0
         description: File based granularity period
         required: true
         constraints: [ ]
@@ -333,7 +333,7 @@ data_types:
       fileLocation:
         name: fileLocation
         type: string
-        typeVersion: 0.0.0
+        type_version: 0.0.0
         description: ROP file location
         required: true
         constraints: [ ]
@@ -341,7 +341,7 @@ data_types:
       subscriptionName:
         name: subscriptionName
         type: string
-        typeVersion: 0.0.0
+        type_version: 0.0.0
         description: Name of the subscription
         required: true
         constraints: [ ]
@@ -349,7 +349,7 @@ data_types:
       administrativeState:
         name: administrativeState
         type: string
-        typeVersion: 0.0.0
+        type_version: 0.0.0
         description: State of the subscription
         required: true
         constraints:
@@ -360,13 +360,13 @@ data_types:
       nfFilter:
         name: nfFilter
         type: map
-        typeVersion: 0.0.0
+        type_version: 0.0.0
         description: Network function filter
         required: true
         constraints: [ ]
         entry_schema:
           type: onap.datatypes.monitoring.nfFilter
-          typeVersion: 0.0.0
+          type_version: 0.0.0
           constraints: [ ]
         metadata: { }
     name: onap.datatypes.monitoring.subscription
@@ -379,7 +379,7 @@ data_types:
     properties:
       restRequestId:
         type: onap.datatypes.ToscaConceptIdentifier
-        typeVersion: 1.0.0
+        type_version: 0.0.0
         required: true
         description: The name and version of a REST request to be sent to a REST endpoint
       httpMethod:
@@ -407,14 +407,14 @@ data_types:
     properties:
       configurationEntityId:
         type: onap.datatypes.ToscaConceptIdentifier
-        typeVersion: 1.0.0
+        type_version: 0.0.0
         required: true
         description: The name and version of a Configuration Entity to be handled by the HTTP Automation composition Element
       restSequence:
         type: list
         entry_schema:
           type: org.onap.datatypes.policy.clamp.acm.httpAutomationCompositionElement.RestRequest
-          typeVersion: 1.0.0
+          type_version: 1.0.0
         description: A sequence of REST commands to send to the REST endpoint
 policy_types:
   onap.policies.Monitoring:
@@ -427,7 +427,7 @@ policy_types:
       tca.policy:
         name: tca.policy
         type: onap.datatypes.monitoring.subscription
-        typeVersion: 0.0.0
+        type_version: 0.0.0
         description: TCA Gen2 Policy JSON
         required: false
         constraints: [ ]
@@ -497,7 +497,7 @@ node_types:
     properties:
       provider:
         type: string
-        requred: false
+        required: false
   org.onap.policy.clamp.acm.AutomationCompositionElement:
     version: 1.0.1
     derived_from: tosca.nodetypes.Root
@@ -510,7 +510,7 @@ node_types:
         description: Specifies the organization that provides the Automation composition element
       participant_id:
         type: onap.datatypes.ToscaConceptIdentifier
-        requred: true
+        required: true
         metadata:
           common: true
       participantType:
@@ -606,7 +606,7 @@ node_types:
         required: false
       requirements:
         type: string
-        requred: false
+        required: false
       templates:
         type: list
         required: false
@@ -634,7 +634,7 @@ node_types:
         required: true
         entry_schema:
           type: org.onap.datatypes.policy.clamp.acm.httpAutomationCompositionElement.ConfigurationEntity
-          typeVersion: 1.0.0
+          type_version: 1.0.0
         description: The connfiguration entities the Automation composition Element is managing and their associated REST requests
 
 topology_template:
@@ -737,7 +737,7 @@ topology_template:
     org.onap.domain.sample.GenericK8s_AutomationCompositionDefinition:
       version: 1.2.3
       type: org.onap.policy.clamp.acm.AutomationComposition
-      type_version: 1.0.0
+      type_version: 1.0.1
       description: Automation composition for TCA Gen2 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 7bea30d40..1e458c22b 100644
--- a/examples/src/main/resources/clamp/acm/test/participant-http.yaml
+++ b/examples/src/main/resources/clamp/acm/test/participant-http.yaml
@@ -33,7 +33,7 @@ data_types:
     properties:
       restRequestId:
         type:  onap.datatypes.ToscaConceptIdentifier
-        typeVersion: 1.0.0
+        type_version: 0.0.0
         required: true
         description: The name and version of a REST request to be sent to a REST endpoint
       httpMethod:
@@ -56,21 +56,21 @@ data_types:
         constraints:
           - in_range: [100, 599]
         description: THe expected HTTP status code for the REST request
-    org.onap.datatypes.policy.clamp.acm.httpAutomationCompositionElement.ConfigurationEntity:
-      version: 1.0.0
-      derived_from: tosca.datatypes.Root
-      properties:
-        configurationEntityId:
-          type:  onap.datatypes.ToscaConceptIdentifier
-          typeVersion: 1.0.0
-          required: true
-          description: The name and version of a Configuration Entity to be handled by the HTTP Automation Composition Element
-        restSequence:
-          type: list
-          entry_schema:
-            type: org.onap.datatypes.policy.clamp.acm.httpAutomationCompositionElement.RestRequest
-            typeVersion: 1.0.0
-          description: A sequence of REST commands to send to the REST endpoint
+  org.onap.datatypes.policy.clamp.acm.httpAutomationCompositionElement.ConfigurationEntity:
+    version: 1.0.0
+    derived_from: tosca.datatypes.Root
+    properties:
+      configurationEntityId:
+        type:  onap.datatypes.ToscaConceptIdentifier
+        type_version: 0.0.0
+        required: true
+        description: The name and version of a Configuration Entity to be handled by the HTTP Automation Composition Element
+      restSequence:
+        type: list
+        entry_schema:
+          type: org.onap.datatypes.policy.clamp.acm.httpAutomationCompositionElement.RestRequest
+          type_version: 1.0.0
+        description: A sequence of REST commands to send to the REST endpoint
 
 
 node_types:
@@ -80,17 +80,17 @@ node_types:
     properties:
       provider:
         type: string
-        requred: false
+        required: false
   org.onap.policy.clamp.acm.AutomationCompositionElement:
     version: 1.0.1
     derived_from: tosca.nodetypes.Root
     properties:
       provider:
         type: string
-        requred: false
+        required: false
       participantType:
         type: onap.datatypes.ToscaConceptIdentifier
-        requred: true
+        required: true
       startPhase:
         type: integer
         required: false
@@ -108,7 +108,7 @@ node_types:
     properties:
       provider:
         type: string
-        requred: false
+        required: false
       elements:
         type: list
         required: true
@@ -133,7 +133,7 @@ node_types:
         required: true
         entry_schema:
           type: org.onap.datatypes.policy.clamp.acm.httpAutomationCompositionElement.ConfigurationEntity
-          typeVersion: 1.0.0
+          type_version: 1.0.0
         description: The connfiguration entities the Automation Composition Element is managing and their associated REST requests
 topology_template:
   node_templates:
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 a2e9f61af..cd1a3e84c 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
@@ -33,17 +33,17 @@ node_types:
     properties:
       provider:
         type: string
-        requred: false
+        required: false
   org.onap.policy.clamp.acm.AutomationCompositionElement:
     version: 1.0.1
     derived_from: tosca.nodetypes.Root
     properties:
       provider:
         type: string
-        requred: false
+        required: false
       participantType:
         type: onap.datatypes.ToscaConceptIdentifier
-        requred: true
+        required: true
       startPhase:
         type: integer
         required: false
@@ -61,7 +61,7 @@ node_types:
     properties:
       provider:
         type: string
-        requred: false
+        required: false
       elements:
         type: list
         required: true
@@ -79,14 +79,14 @@ node_types:
         required: false
       requirements:
         type: string
-        requred: false
+        required: false
       templates:
         type: list
         required: false
         entry_schema:
       values:
         type: string
-        requred: true
+        required: true
 topology_template:
   node_templates:
     org.onap.k8s.acm.K8SAutomationCompositionParticipant:
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 2af28085d..6d41d9f3a 100644
--- 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
@@ -17,17 +17,17 @@ node_types:
     properties:
       provider:
         type: string
-        requred: false
+        required: false
   org.onap.policy.clamp.acm.AutomationCompositionElement:
     version: 1.0.1
     derived_from: tosca.nodetypes.Root
     properties:
       provider:
         type: string
-        requred: false
+        required: false
       participantType:
         type: onap.datatypes.ToscaConceptIdentifier
-        requred: true
+        required: true
       startPhase:
         type: integer
         required: false
@@ -45,7 +45,7 @@ node_types:
     properties:
       provider:
         type: string
-        requred: false
+        required: false
       elements:
         type: list
         required: true
@@ -57,21 +57,21 @@ node_types:
     properties:
       dcae_blueprint_id:
         type: onap.datatypes.ToscaConceptIdentifier
-        requred: true
+        required: true
   org.onap.policy.clamp.acm.PolicyTypeAutomationCompositionElement:
     version: 1.0.1
     derived_from: org.onap.policy.clamp.acm.AutomationCompositionElement
     properties:
       policy_type_id:
         type: onap.datatypes.ToscaConceptIdentifier
-        requred: true
+        required: true
   org.onap.policy.clamp.acm.CDSAutomationCompositionElement:
     version: 1.0.1
     derived_from: org.onap.policy.clamp.acm.AutomationCompositionElement
     properties:
       cds_blueprint_id:
         type: onap.datatypes.ToscaConceptIdentifier
-        requred: true
+        required: true
 topology_template:
   node_templates:
     org.onap.dcae.acm.DCAEMicroserviceAutomationCompositionParticipant:
diff --git a/examples/src/main/resources/clamp/acm/test/pmsh_multiple_ac_tosca.yaml b/examples/src/main/resources/clamp/acm/test/pmsh_multiple_ac_tosca.yaml
index a7a6bd262..69a818390 100644
--- a/examples/src/main/resources/clamp/acm/test/pmsh_multiple_ac_tosca.yaml
+++ b/examples/src/main/resources/clamp/acm/test/pmsh_multiple_ac_tosca.yaml
@@ -17,17 +17,17 @@ node_types:
     properties:
       provider:
         type: string
-        requred: false
+        required: false
   org.onap.policy.clamp.acm.AutomationCompositionElement:
     version: 1.0.1
     derived_from: tosca.nodetypes.Root
     properties:
       provider:
         type: string
-        requred: false
+        required: false
       participantType:
         type: onap.datatypes.ToscaConceptIdentifier
-        requred: true
+        required: true
       startPhase:
         type: integer
         required: false
@@ -45,7 +45,7 @@ node_types:
     properties:
       provider:
         type: string
-        requred: false
+        required: false
       elements:
         type: list
         required: true
@@ -57,21 +57,21 @@ node_types:
     properties:
       dcae_blueprint_id:
         type: onap.datatypes.ToscaConceptIdentifier
-        requred: true
+        required: true
   org.onap.policy.clamp.acm.PolicyTypeAutomationCompositionElement:
     version: 1.0.1
     derived_from: org.onap.policy.clamp.acm.AutomationCompositionElement
     properties:
       policy_type_id:
         type: onap.datatypes.ToscaConceptIdentifier
-        requred: true
+        required: true
   org.onap.policy.clamp.acm.CDSAutomationCompositionElement:
     version: 1.0.1
     derived_from: org.onap.policy.clamp.acm.AutomationCompositionElement
     properties:
       cds_blueprint_id:
         type: onap.datatypes.ToscaConceptIdentifier
-        requred: true
+        required: true
 topology_template:
   node_templates:
     org.onap.dcae.acm.DCAEMicroserviceAutomationCompositionParticipant: