Add backend support for VFC property metadata

Remove empty tags from tosca file

Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech>
Change-Id: I0c446b537934ffd19c1162326e075e13845db23e
Issue-ID: SDC-4424

8 files changed, 38 insertions, 295 deletions

diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ImportUtils.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ImportUtils.java
index fff9f0bf1c..62b345c499 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ImportUtils.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ImportUtils.java
@@ -40,7 +40,10 @@ import java.util.Map;
 import java.util.Map.Entry;
 import java.util.function.Consumer;
 import java.util.function.Function;
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
 import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.MapUtils;
 import org.apache.commons.text.StringEscapeUtils;
 import org.onap.sdc.tosca.datatypes.model.EntrySchema;
 import org.openecomp.sdc.be.components.impl.exceptions.ByActionStatusComponentException;
@@ -83,6 +86,7 @@ import org.yaml.snakeyaml.nodes.Tag;
 import org.yaml.snakeyaml.representer.Representer;
 import org.yaml.snakeyaml.resolver.Resolver;
 
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
 @Component
 public final class ImportUtils {
 
@@ -91,9 +95,6 @@ public final class ImportUtils {
     private static final Logger log = Logger.getLogger(ImportUtils.class);
     private static ComponentsUtils componentsUtils;
 
-    private ImportUtils() {
-    }
-
     @Autowired
     public static void setComponentsUtils(ComponentsUtils cu) {
         componentsUtils = cu;
@@ -361,6 +362,7 @@ public final class ImportUtils {
         setJsonStringField(propertyValue, TypeUtils.ToscaTagNamesEnum.VALUE, propertyDef.getType(), propertyDef::setValue);
         setFieldBoolean(propertyValue, TypeUtils.ToscaTagNamesEnum.IS_PASSWORD, pass -> propertyDef.setPassword(Boolean.parseBoolean(pass)));
         setField(propertyValue, TypeUtils.ToscaTagNamesEnum.STATUS, propertyDef::setStatus);
+        setFieldMap(propertyValue, ToscaTagNamesEnum.METADATA, propertyDef::setMetadata);
         setSchema(propertyValue, propertyDef);
         setPropertyConstraints(propertyValue, propertyDef);
         return propertyDef;
@@ -533,7 +535,7 @@ public final class ImportUtils {
     private static void setFieldMap(final Map<String, Object> toscaJson, final ToscaTagNamesEnum tagName,
                                     final Consumer<Map<String, String>> setter) {
         final Either<Map<String, String>, ResultStatusEnum> toscaMapElement = findFirstToscaMapElement(toscaJson, tagName);
-        if (toscaMapElement.isLeft()) {
+        if (toscaMapElement.isLeft() && MapUtils.isNotEmpty(toscaMapElement.left().value())) {
             setter.accept(toscaMapElement.left().value());
         }
     }
@@ -770,6 +772,7 @@ public final class ImportUtils {
         }
     }
 
+    @NoArgsConstructor(access = AccessLevel.PRIVATE)
     public static class Constants {
 
         public static final String FIRST_NON_CERTIFIED_VERSION = "0.1";
@@ -790,7 +793,5 @@ public final class ImportUtils {
         public static final String VF_DESCRIPTION = "Nested VF in service";
         public static final String TENANT = "tenant";
 
-        private Constants() {
-        }
     }
 }
diff --git a/catalog-be/src/main/resources/import/tosca/data-types/dataTypes.yml b/catalog-be/src/main/resources/import/tosca/data-types/dataTypes.yml
index aec45318d4..1b2c0402c1 100644
--- a/catalog-be/src/main/resources/import/tosca/data-types/dataTypes.yml
+++ b/catalog-be/src/main/resources/import/tosca/data-types/dataTypes.yml
@@ -232,7 +232,6 @@ org.openecomp.datatypes.heat.network.neutron.Subnet:
       type: map
       description: Extra parameters to include in the request
       required: false
-      default: {}
       status: supported
       entry_schema:
         type: string
@@ -252,7 +251,6 @@ org.openecomp.datatypes.heat.network.neutron.Subnet:
       type: list
       description: A specified set of DNS name servers to be used
       required: false
-      default: []
       status: supported
       entry_schema:
         type: string
@@ -342,7 +340,6 @@ org.openecomp.datatypes.heat.novaServer.network.PortExtraProperties:
       type: map
       description: Extra parameters to include in the request
       required: false
-      default: {}
       status: supported
       entry_schema:
         type: string
@@ -3480,4 +3477,4 @@ tosca.datatypes.asd.requiredPlugin:
     version:
       description: "the version of the required K8s plugin"
       type: string
-      required: true
\ No newline at end of file
+      required: true
diff --git a/catalog-be/src/main/resources/import/tosca/models/init/acm/imports/acm.yaml b/catalog-be/src/main/resources/import/tosca/models/init/acm/imports/acm.yaml
index 54300cc731..c88d7235e9 100644
--- a/catalog-be/src/main/resources/import/tosca/models/init/acm/imports/acm.yaml
+++ b/catalog-be/src/main/resources/import/tosca/models/init/acm/imports/acm.yaml
@@ -124,7 +124,6 @@ data_types:
         required: false
         default: final_failure_guard
   onap.datatypes.monitoring.managedObjectDNsBasic:
-    constraints: []
     properties:
       DN:
         name: DN
@@ -132,14 +131,10 @@ data_types:
         typeVersion: 0.0.0
         description: Managed object distinguished name
         required: true
-        constraints: []
-        metadata: {}
     name: onap.datatypes.monitoring.managedObjectDNsBasic
     version: 0.0.0
     derived_from: tosca.datatypes.Root
-    metadata: {}
   onap.datatypes.monitoring.managedObjectDNsBasics:
-    constraints: []
     properties:
       managedObjectDNsBasic:
         name: managedObjectDNsBasic
@@ -147,18 +142,13 @@ data_types:
         typeVersion: 0.0.0
         description: Managed object distinguished name object
         required: true
-        constraints: []
         entry_schema:
           type: onap.datatypes.monitoring.managedObjectDNsBasic
           typeVersion: 0.0.0
-          constraints: []
-        metadata: {}
     name: onap.datatypes.monitoring.managedObjectDNsBasics
     version: 0.0.0
     derived_from: tosca.datatypes.Root
-    metadata: {}
   onap.datatypes.monitoring.measurementGroup:
-    constraints: []
     properties:
       measurementTypes:
         name: measurementTypes
@@ -166,30 +156,22 @@ data_types:
         typeVersion: 0.0.0
         description: List of measurement types
         required: true
-        constraints: []
         entry_schema:
           type: onap.datatypes.monitoring.measurementTypes
           typeVersion: 0.0.0
-          constraints: []
-        metadata: {}
       managedObjectDNsBasic:
         name: managedObjectDNsBasic
         type: list
         typeVersion: 0.0.0
         description: List of managed object distinguished names
         required: true
-        constraints: []
         entry_schema:
           type: onap.datatypes.monitoring.managedObjectDNsBasics
           typeVersion: 0.0.0
-          constraints: []
-        metadata: {}
     name: onap.datatypes.monitoring.measurementGroup
     version: 0.0.0
     derived_from: tosca.datatypes.Root
-    metadata: {}
   onap.datatypes.monitoring.measurementGroups:
-    constraints: []
     properties:
       measurementGroup:
         name: measurementGroup
@@ -197,18 +179,13 @@ data_types:
         typeVersion: 0.0.0
         description: Measurement Group
         required: true
-        constraints: []
         entry_schema:
           type: onap.datatypes.monitoring.measurementGroup
           typeVersion: 0.0.0
-          constraints: []
-        metadata: {}
     name: onap.datatypes.monitoring.measurementGroups
     version: 0.0.0
     derived_from: tosca.datatypes.Root
-    metadata: {}
   onap.datatypes.monitoring.measurementType:
-    constraints: []
     properties:
       measurementType:
         name: measurementType
@@ -216,14 +193,10 @@ data_types:
         typeVersion: 0.0.0
         description: Measurement type
         required: true
-        constraints: []
-        metadata: {}
     name: onap.datatypes.monitoring.measurementType
     version: 0.0.0
     derived_from: tosca.datatypes.Root
-    metadata: {}
   onap.datatypes.monitoring.measurementTypes:
-    constraints: []
     properties:
       measurementType:
         name: measurementType
@@ -231,18 +204,13 @@ data_types:
         typeVersion: 0.0.0
         description: Measurement type object
         required: true
-        constraints: []
         entry_schema:
           type: onap.datatypes.monitoring.measurementType
           typeVersion: 0.0.0
-          constraints: []
-        metadata: {}
     name: onap.datatypes.monitoring.measurementTypes
     version: 0.0.0
     derived_from: tosca.datatypes.Root
-    metadata: {}
   onap.datatypes.monitoring.nfFilter:
-    constraints: []
     properties:
       modelNames:
         name: modelNames
@@ -250,54 +218,40 @@ data_types:
         typeVersion: 0.0.0
         description: List of model names
         required: true
-        constraints: []
         entry_schema:
           type: string
           typeVersion: 0.0.0
-          constraints: []
-        metadata: {}
       modelInvariantIDs:
         name: modelInvariantIDs
         type: list
         typeVersion: 0.0.0
         description: List of model invariant IDs
         required: true
-        constraints: []
         entry_schema:
           type: string
           typeVersion: 0.0.0
-          constraints: []
-        metadata: {}
       modelVersionIDs:
         name: modelVersionIDs
         type: list
         typeVersion: 0.0.0
         description: List of model version IDs
         required: true
-        constraints: []
         entry_schema:
           type: string
           typeVersion: 0.0.0
-          constraints: []
-        metadata: {}
       nfNames:
         name: nfNames
         type: list
         typeVersion: 0.0.0
         description: List of network functions
         required: true
-        constraints: []
         entry_schema:
           type: string
           typeVersion: 0.0.0
-          constraints: []
-        metadata: {}
     name: onap.datatypes.monitoring.nfFilter
     version: 0.0.0
     derived_from: tosca.datatypes.Root
-    metadata: {}
   onap.datatypes.monitoring.subscription:
-    constraints: []
     properties:
       measurementGroups:
         name: measurementGroups
@@ -305,36 +259,27 @@ data_types:
         typeVersion: 0.0.0
         description: Measurement Groups
         required: true
-        constraints: []
         entry_schema:
           type: onap.datatypes.monitoring.measurementGroups
           typeVersion: 0.0.0
-          constraints: []
-        metadata: {}
       fileBasedGP:
         name: fileBasedGP
         type: integer
         typeVersion: 0.0.0
         description: File based granularity period
         required: true
-        constraints: []
-        metadata: {}
       fileLocation:
         name: fileLocation
         type: string
         typeVersion: 0.0.0
         description: ROP file location
         required: true
-        constraints: []
-        metadata: {}
       subscriptionName:
         name: subscriptionName
         type: string
         typeVersion: 0.0.0
         description: Name of the subscription
         required: true
-        constraints: []
-        metadata: {}
       administrativeState:
         name: administrativeState
         type: string
@@ -345,23 +290,18 @@ data_types:
           - valid_values:
               - LOCKED
               - UNLOCKED
-        metadata: {}
       nfFilter:
         name: nfFilter
         type: map
         typeVersion: 0.0.0
         description: Network function filter
         required: true
-        constraints: []
         entry_schema:
           type: onap.datatypes.monitoring.nfFilter
           typeVersion: 0.0.0
-          constraints: []
-        metadata: {}
     name: onap.datatypes.monitoring.subscription
     version: 0.0.0
     derived_from: tosca.datatypes.Root
-    metadata: {}
   org.onap.datatypes.policy.clamp.acm.httpAutomationCompositionElement.RestRequest:
     version: 1.0.0
     derived_from: tosca.datatypes.Root
@@ -392,7 +332,6 @@ data_types:
       expectedResponse:
         type: integer
         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
@@ -424,12 +363,9 @@ policy_types:
         typeVersion: 0.0.0
         description: PMSH Policy JSON
         required: false
-        constraints: []
-        metadata: {}
     name: onap.policies.monitoring.dcae-pm-subscription-handler
     version: 1.0.0
     derived_from: onap.policies.Monitoring
-    metadata: {}
   onap.policies.acm.operational.Common:
     derived_from: tosca.policies.Root
     version: 1.0.0
@@ -503,18 +439,18 @@ node_types:
         type: string
         required: false
         metadata:
-          common: true
+          common: 'true'
         description: Specifies the organization that provides the acm element
       participant_id:
         type: onap.datatypes.ToscaConceptIdentifier
         required: true
         metadata:
-          common: true
+          common: 'true'
       participantType:
         type: onap.datatypes.ToscaConceptIdentifier
         required: true
         metadata:
-          common: true
+          common: 'true'
         description: The identity of the participant type that hosts this type of Automation
           Composition Element
       startPhase:
@@ -523,7 +459,7 @@ node_types:
         constraints:
           - greater_or_equal: 0
         metadata:
-          common: true
+          common: 'true'
         description: A value indicating the start phase in which this acm element
           will be started, the first start phase is zero. Automation Composition Elements
           are started in their start_phase order and stopped in reverse start
@@ -536,7 +472,7 @@ node_types:
           - greater_or_equal: 0
         default: 60
         metadata:
-          common: true
+          common: 'true'
         description: The maximum time in seconds to wait for a state chage from
           uninitialized to passive
       passiveToRunningTimeout:
@@ -546,7 +482,7 @@ node_types:
           - greater_or_equal: 0
         default: 60
         metadata:
-          common: true
+          common: 'true'
         description: The maximum time in seconds to wait for a state chage from passive to
           running
       runningToPassiveTimeout:
@@ -556,7 +492,7 @@ node_types:
           - greater_or_equal: 0
         default: 60
         metadata:
-          common: true
+          common: 'true'
         description: The maximum time in seconds to wait for a state chage from running to
           passive
       passiveToUninitializedTimeout:
@@ -566,7 +502,7 @@ node_types:
           - greater_or_equal: 0
         default: 60
         metadata:
-          common: true
+          common: 'true'
         description: The maximum time in seconds to wait for a state chage from passive to
           uninitialized
   org.onap.policy.clamp.acm.AutomationComposition:
@@ -577,13 +513,13 @@ node_types:
         type: string
         required: false
         metadata:
-          common: true
+          common: 'true'
         description: Specifies the organization that provides the acm element
       elements:
         type: list
         required: true
         metadata:
-          common: true
+          common: 'true'
         entry_schema:
           type: onap.datatypes.ToscaConceptIdentifier
         description: Specifies a list of acm element definitions that make up this
diff --git a/catalog-be/src/main/resources/import/tosca/models/init/acm/tosca/data-types/dataTypes.yml b/catalog-be/src/main/resources/import/tosca/models/init/acm/tosca/data-types/dataTypes.yml
index 5a34ccbe2a..48e514288a 100644
--- a/catalog-be/src/main/resources/import/tosca/models/init/acm/tosca/data-types/dataTypes.yml
+++ b/catalog-be/src/main/resources/import/tosca/models/init/acm/tosca/data-types/dataTypes.yml
@@ -149,7 +149,6 @@ onap.datatype.acm.Operation:
       required: false
       default: final_failure_guard
 onap.datatypes.monitoring.managedObjectDNsBasic:
-  constraints: []
   properties:
     DN:
       name: DN
@@ -157,14 +156,10 @@ onap.datatypes.monitoring.managedObjectDNsBasic:
       typeVersion: 0.0.0
       description: Managed object distinguished name
       required: true
-      constraints: []
-      metadata: {}
   name: onap.datatypes.monitoring.managedObjectDNsBasic
   version: 0.0.0
   derived_from: tosca.datatypes.Root
-  metadata: {}
 onap.datatypes.monitoring.managedObjectDNsBasics:
-  constraints: []
   properties:
     managedObjectDNsBasic:
       name: managedObjectDNsBasic
@@ -172,18 +167,13 @@ onap.datatypes.monitoring.managedObjectDNsBasics:
       typeVersion: 0.0.0
       description: Managed object distinguished name object
       required: true
-      constraints: []
       entry_schema:
         type: onap.datatypes.monitoring.managedObjectDNsBasic
         typeVersion: 0.0.0
-        constraints: []
-      metadata: {}
   name: onap.datatypes.monitoring.managedObjectDNsBasics
   version: 0.0.0
   derived_from: tosca.datatypes.Root
-  metadata: {}
 onap.datatypes.monitoring.measurementGroup:
-  constraints: []
   properties:
     measurementTypes:
       name: measurementTypes
@@ -191,30 +181,22 @@ onap.datatypes.monitoring.measurementGroup:
       typeVersion: 0.0.0
       description: List of measurement types
       required: true
-      constraints: []
       entry_schema:
         type: onap.datatypes.monitoring.measurementTypes
         typeVersion: 0.0.0
-        constraints: []
-      metadata: {}
     managedObjectDNsBasic:
       name: managedObjectDNsBasic
       type: list
       typeVersion: 0.0.0
       description: List of managed object distinguished names
       required: true
-      constraints: []
       entry_schema:
         type: onap.datatypes.monitoring.managedObjectDNsBasics
         typeVersion: 0.0.0
-        constraints: []
-      metadata: {}
   name: onap.datatypes.monitoring.measurementGroup
   version: 0.0.0
   derived_from: tosca.datatypes.Root
-  metadata: {}
 onap.datatypes.monitoring.measurementGroups:
-  constraints: []
   properties:
     measurementGroup:
       name: measurementGroup
@@ -222,18 +204,13 @@ onap.datatypes.monitoring.measurementGroups:
       typeVersion: 0.0.0
       description: Measurement Group
       required: true
-      constraints: []
       entry_schema:
         type: onap.datatypes.monitoring.measurementGroup
         typeVersion: 0.0.0
-        constraints: []
-      metadata: {}
   name: onap.datatypes.monitoring.measurementGroups
   version: 0.0.0
   derived_from: tosca.datatypes.Root
-  metadata: {}
 onap.datatypes.monitoring.measurementType:
-  constraints: []
   properties:
     measurementType:
       name: measurementType
@@ -241,14 +218,10 @@ onap.datatypes.monitoring.measurementType:
       typeVersion: 0.0.0
       description: Measurement type
       required: true
-      constraints: []
-      metadata: {}
   name: onap.datatypes.monitoring.measurementType
   version: 0.0.0
   derived_from: tosca.datatypes.Root
-  metadata: {}
 onap.datatypes.monitoring.measurementTypes:
-  constraints: []
   properties:
     measurementType:
       name: measurementType
@@ -256,18 +229,13 @@ onap.datatypes.monitoring.measurementTypes:
       typeVersion: 0.0.0
       description: Measurement type object
       required: true
-      constraints: []
       entry_schema:
         type: onap.datatypes.monitoring.measurementType
         typeVersion: 0.0.0
-        constraints: []
-      metadata: {}
   name: onap.datatypes.monitoring.measurementTypes
   version: 0.0.0
   derived_from: tosca.datatypes.Root
-  metadata: {}
 onap.datatypes.monitoring.nfFilter:
-  constraints: []
   properties:
     modelNames:
       name: modelNames
@@ -275,54 +243,40 @@ onap.datatypes.monitoring.nfFilter:
       typeVersion: 0.0.0
       description: List of model names
       required: true
-      constraints: []
       entry_schema:
         type: string
         typeVersion: 0.0.0
-        constraints: []
-      metadata: {}
     modelInvariantIDs:
       name: modelInvariantIDs
       type: list
       typeVersion: 0.0.0
       description: List of model invariant IDs
       required: true
-      constraints: []
       entry_schema:
         type: string
         typeVersion: 0.0.0
-        constraints: []
-      metadata: {}
     modelVersionIDs:
       name: modelVersionIDs
       type: list
       typeVersion: 0.0.0
       description: List of model version IDs
       required: true
-      constraints: []
       entry_schema:
         type: string
         typeVersion: 0.0.0
-        constraints: []
-      metadata: {}
     nfNames:
       name: nfNames
       type: list
       typeVersion: 0.0.0
       description: List of network functions
       required: true
-      constraints: []
       entry_schema:
         type: string
         typeVersion: 0.0.0
-        constraints: []
-      metadata: {}
   name: onap.datatypes.monitoring.nfFilter
   version: 0.0.0
   derived_from: tosca.datatypes.Root
-  metadata: {}
 onap.datatypes.monitoring.subscription:
-  constraints: []
   properties:
     measurementGroups:
       name: measurementGroups
@@ -330,36 +284,27 @@ onap.datatypes.monitoring.subscription:
       typeVersion: 0.0.0
       description: Measurement Groups
       required: true
-      constraints: []
       entry_schema:
         type: onap.datatypes.monitoring.measurementGroups
         typeVersion: 0.0.0
-        constraints: []
-      metadata: {}
     fileBasedGP:
       name: fileBasedGP
       type: integer
       typeVersion: 0.0.0
       description: File based granularity period
       required: true
-      constraints: []
-      metadata: {}
     fileLocation:
       name: fileLocation
       type: string
       typeVersion: 0.0.0
       description: ROP file location
       required: true
-      constraints: []
-      metadata: {}
     subscriptionName:
       name: subscriptionName
       type: string
       typeVersion: 0.0.0
       description: Name of the subscription
       required: true
-      constraints: []
-      metadata: {}
     administrativeState:
       name: administrativeState
       type: string
@@ -370,23 +315,18 @@ onap.datatypes.monitoring.subscription:
         - valid_values:
             - LOCKED
             - UNLOCKED
-      metadata: {}
     nfFilter:
       name: nfFilter
       type: map
       typeVersion: 0.0.0
       description: Network function filter
       required: true
-      constraints: []
       entry_schema:
         type: onap.datatypes.monitoring.nfFilter
         typeVersion: 0.0.0
-        constraints: []
-      metadata: {}
   name: onap.datatypes.monitoring.subscription
   version: 0.0.0
   derived_from: tosca.datatypes.Root
-  metadata: {}
 org.onap.datatypes.policy.clamp.acm.httpAutomationCompositionElement.RestRequest:
   version: 1.0.0
   derived_from: tosca.datatypes.Root
@@ -417,7 +357,6 @@ org.onap.datatypes.policy.clamp.acm.httpAutomationCompositionElement.RestRequest
     expectedResponse:
       type: integer
       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
@@ -434,5 +373,4 @@ org.onap.datatypes.policy.clamp.acm.httpAutomationCompositionElement.Configurati
       entry_schema:
         type: org.onap.datatypes.policy.clamp.acm.httpAutomationCompositionElement.RestRequest
         typeVersion: 1.0.0
-        constraints: []
       description: A sequence of REST commands to send to the REST endpoint
diff --git a/catalog-be/src/main/resources/import/tosca/models/init/acm/tosca/node-types/nodeTypes.yaml b/catalog-be/src/main/resources/import/tosca/models/init/acm/tosca/node-types/nodeTypes.yaml
index dd0abee722..ae3973d206 100644
--- a/catalog-be/src/main/resources/import/tosca/models/init/acm/tosca/node-types/nodeTypes.yaml
+++ b/catalog-be/src/main/resources/import/tosca/models/init/acm/tosca/node-types/nodeTypes.yaml
@@ -41,7 +41,7 @@ node_types:
         type: string
         required: false
         metadata:
-          common: true
+          common: 'true'
         description: Specifies the organization that provides the automation composition element
       version:
         type: string
@@ -51,12 +51,12 @@ node_types:
         type: string
         required: true
         metadata:
-          common: true
+          common: 'true'
       participantType:
         type: string
         required: true
         metadata:
-          common: true
+          common: 'true'
         description: The identity of the participant type that hosts this type of Automation Composition Element
       startPhase:
         type: integer
@@ -64,7 +64,7 @@ node_types:
         constraints:
           - greater_or_equal: 0
         metadata:
-          common: true
+          common: 'true'
         description: A value indicating the start phase in which this automation composition element will be started, the
           first start phase is zero. Automation Composition Elements are started in their start_phase order and stopped
           in reverse start phase order. Automation Composition Elements with the same start phase are started and
@@ -76,7 +76,7 @@ node_types:
           - greater_or_equal: 0
         default: 60
         metadata:
-          common: true
+          common: 'true'
         description: The maximum time in seconds to wait for a state chage from uninitialized to passive
       passiveToRunningTimeout:
         type: integer
@@ -85,7 +85,7 @@ node_types:
           - greater_or_equal: 0
         default: 60
         metadata:
-          common: true
+          common: 'true'
         description: The maximum time in seconds to wait for a state chage from passive to running
       runningToPassiveTimeout:
         type: integer
@@ -94,7 +94,7 @@ node_types:
           - greater_or_equal: 0
         default: 60
         metadata:
-          common: true
+          common: 'true'
         description: The maximum time in seconds to wait for a state chage from running to passive
       passiveToUninitializedTimeout:
         type: integer
@@ -103,7 +103,7 @@ node_types:
           - greater_or_equal: 0
         default: 60
         metadata:
-          common: true
+          common: 'true'
         description: The maximum time in seconds to wait for a state chage from passive to uninitialized
   org.onap.policy.clamp.acm.AutomationComposition:
     derived_from: tosca.nodes.Root
@@ -112,7 +112,7 @@ node_types:
         type: string
         required: false
         metadata:
-          common: true
+          common: 'true'
         description: Specifies the organization that provides the automation composition element
       version:
         type: string
@@ -122,7 +122,7 @@ node_types:
         type: list
         required: true
         metadata:
-          common: true
+          common: 'true'
         entry_schema:
           type: string
         description: Specifies a list of automation composition element definitions that make up this automation composition definition
diff --git a/catalog-be/src/main/resources/import/tosca/models/init/acm/tosca/policy-types/policyTypes.yml b/catalog-be/src/main/resources/import/tosca/models/init/acm/tosca/policy-types/policyTypes.yml
index a4b9c340e9..a567bf3594 100644
--- a/catalog-be/src/main/resources/import/tosca/models/init/acm/tosca/policy-types/policyTypes.yml
+++ b/catalog-be/src/main/resources/import/tosca/models/init/acm/tosca/policy-types/policyTypes.yml
@@ -17,12 +17,9 @@ onap.policies.monitoring.dcae-pm-subscription-handler:
       typeVersion: 0.0.0
       description: PMSH Policy JSON
       required: false
-      constraints: []
-      metadata: {}
   name: onap.policies.monitoring.dcae-pm-subscription-handler
   version: 1.0.0
   derived_from: onap.policies.Monitoring
-  metadata: {}
 onap.policies.acm.operational.Common:
   derived_from: tosca.policies.Root
   version: 1.0.0
diff --git a/catalog-be/src/main/resources/import/tosca/models/upgrade/acm/imports/acm.yaml b/catalog-be/src/main/resources/import/tosca/models/upgrade/acm/imports/acm.yaml
index 54300cc731..c88d7235e9 100644
--- a/catalog-be/src/main/resources/import/tosca/models/upgrade/acm/imports/acm.yaml
+++ b/catalog-be/src/main/resources/import/tosca/models/upgrade/acm/imports/acm.yaml
@@ -124,7 +124,6 @@ data_types:
         required: false
         default: final_failure_guard
   onap.datatypes.monitoring.managedObjectDNsBasic:
-    constraints: []
     properties:
       DN:
         name: DN
@@ -132,14 +131,10 @@ data_types:
         typeVersion: 0.0.0
         description: Managed object distinguished name
         required: true
-        constraints: []
-        metadata: {}
     name: onap.datatypes.monitoring.managedObjectDNsBasic
     version: 0.0.0
     derived_from: tosca.datatypes.Root
-    metadata: {}
   onap.datatypes.monitoring.managedObjectDNsBasics:
-    constraints: []
     properties:
       managedObjectDNsBasic:
         name: managedObjectDNsBasic
@@ -147,18 +142,13 @@ data_types:
         typeVersion: 0.0.0
         description: Managed object distinguished name object
         required: true
-        constraints: []
         entry_schema:
           type: onap.datatypes.monitoring.managedObjectDNsBasic
           typeVersion: 0.0.0
-          constraints: []
-        metadata: {}
     name: onap.datatypes.monitoring.managedObjectDNsBasics
     version: 0.0.0
     derived_from: tosca.datatypes.Root
-    metadata: {}
   onap.datatypes.monitoring.measurementGroup:
-    constraints: []
     properties:
       measurementTypes:
         name: measurementTypes
@@ -166,30 +156,22 @@ data_types:
         typeVersion: 0.0.0
         description: List of measurement types
         required: true
-        constraints: []
         entry_schema:
           type: onap.datatypes.monitoring.measurementTypes
           typeVersion: 0.0.0
-          constraints: []
-        metadata: {}
       managedObjectDNsBasic:
         name: managedObjectDNsBasic
         type: list
         typeVersion: 0.0.0
         description: List of managed object distinguished names
         required: true
-        constraints: []
         entry_schema:
           type: onap.datatypes.monitoring.managedObjectDNsBasics
           typeVersion: 0.0.0
-          constraints: []
-        metadata: {}
     name: onap.datatypes.monitoring.measurementGroup
     version: 0.0.0
     derived_from: tosca.datatypes.Root
-    metadata: {}
   onap.datatypes.monitoring.measurementGroups:
-    constraints: []
     properties:
       measurementGroup:
         name: measurementGroup
@@ -197,18 +179,13 @@ data_types:
         typeVersion: 0.0.0
         description: Measurement Group
         required: true
-        constraints: []
         entry_schema:
           type: onap.datatypes.monitoring.measurementGroup
           typeVersion: 0.0.0
-          constraints: []
-        metadata: {}
     name: onap.datatypes.monitoring.measurementGroups
     version: 0.0.0
     derived_from: tosca.datatypes.Root
-    metadata: {}
   onap.datatypes.monitoring.measurementType:
-    constraints: []
     properties:
       measurementType:
         name: measurementType
@@ -216,14 +193,10 @@ data_types:
         typeVersion: 0.0.0
         description: Measurement type
         required: true
-        constraints: []
-        metadata: {}
     name: onap.datatypes.monitoring.measurementType
     version: 0.0.0
     derived_from: tosca.datatypes.Root
-    metadata: {}
   onap.datatypes.monitoring.measurementTypes:
-    constraints: []
     properties:
       measurementType:
         name: measurementType
@@ -231,18 +204,13 @@ data_types:
         typeVersion: 0.0.0
         description: Measurement type object
         required: true
-        constraints: []
         entry_schema:
           type: onap.datatypes.monitoring.measurementType
           typeVersion: 0.0.0
-          constraints: []
-        metadata: {}
     name: onap.datatypes.monitoring.measurementTypes
     version: 0.0.0
     derived_from: tosca.datatypes.Root
-    metadata: {}
   onap.datatypes.monitoring.nfFilter:
-    constraints: []
     properties:
       modelNames:
         name: modelNames
@@ -250,54 +218,40 @@ data_types:
         typeVersion: 0.0.0
         description: List of model names
         required: true
-        constraints: []
         entry_schema:
           type: string
           typeVersion: 0.0.0
-          constraints: []
-        metadata: {}
       modelInvariantIDs:
         name: modelInvariantIDs
         type: list
         typeVersion: 0.0.0
         description: List of model invariant IDs
         required: true
-        constraints: []
         entry_schema:
           type: string
           typeVersion: 0.0.0
-          constraints: []
-        metadata: {}
       modelVersionIDs:
         name: modelVersionIDs
         type: list
         typeVersion: 0.0.0
         description: List of model version IDs
         required: true
-        constraints: []
         entry_schema:
           type: string
           typeVersion: 0.0.0
-          constraints: []
-        metadata: {}
       nfNames:
         name: nfNames
         type: list
         typeVersion: 0.0.0
         description: List of network functions
         required: true
-        constraints: []
         entry_schema:
           type: string
           typeVersion: 0.0.0
-          constraints: []
-        metadata: {}
     name: onap.datatypes.monitoring.nfFilter
     version: 0.0.0
     derived_from: tosca.datatypes.Root
-    metadata: {}
   onap.datatypes.monitoring.subscription:
-    constraints: []
     properties:
       measurementGroups:
         name: measurementGroups
@@ -305,36 +259,27 @@ data_types:
         typeVersion: 0.0.0
         description: Measurement Groups
         required: true
-        constraints: []
         entry_schema:
           type: onap.datatypes.monitoring.measurementGroups
           typeVersion: 0.0.0
-          constraints: []
-        metadata: {}
       fileBasedGP:
         name: fileBasedGP
         type: integer
         typeVersion: 0.0.0
         description: File based granularity period
         required: true
-        constraints: []
-        metadata: {}
       fileLocation:
         name: fileLocation
         type: string
         typeVersion: 0.0.0
         description: ROP file location
         required: true
-        constraints: []
-        metadata: {}
       subscriptionName:
         name: subscriptionName
         type: string
         typeVersion: 0.0.0
         description: Name of the subscription
         required: true
-        constraints: []
-        metadata: {}
       administrativeState:
         name: administrativeState
         type: string
@@ -345,23 +290,18 @@ data_types:
           - valid_values:
               - LOCKED
               - UNLOCKED
-        metadata: {}
       nfFilter:
         name: nfFilter
         type: map
         typeVersion: 0.0.0
         description: Network function filter
         required: true
-        constraints: []
         entry_schema:
           type: onap.datatypes.monitoring.nfFilter
           typeVersion: 0.0.0
-          constraints: []
-        metadata: {}
     name: onap.datatypes.monitoring.subscription
     version: 0.0.0
     derived_from: tosca.datatypes.Root
-    metadata: {}
   org.onap.datatypes.policy.clamp.acm.httpAutomationCompositionElement.RestRequest:
     version: 1.0.0
     derived_from: tosca.datatypes.Root
@@ -392,7 +332,6 @@ data_types:
       expectedResponse:
         type: integer
         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
@@ -424,12 +363,9 @@ policy_types:
         typeVersion: 0.0.0
         description: PMSH Policy JSON
         required: false
-        constraints: []
-        metadata: {}
     name: onap.policies.monitoring.dcae-pm-subscription-handler
     version: 1.0.0
     derived_from: onap.policies.Monitoring
-    metadata: {}
   onap.policies.acm.operational.Common:
     derived_from: tosca.policies.Root
     version: 1.0.0
@@ -503,18 +439,18 @@ node_types:
         type: string
         required: false
         metadata:
-          common: true
+          common: 'true'
         description: Specifies the organization that provides the acm element
       participant_id:
         type: onap.datatypes.ToscaConceptIdentifier
         required: true
         metadata:
-          common: true
+          common: 'true'
       participantType:
         type: onap.datatypes.ToscaConceptIdentifier
         required: true
         metadata:
-          common: true
+          common: 'true'
         description: The identity of the participant type that hosts this type of Automation
           Composition Element
       startPhase:
@@ -523,7 +459,7 @@ node_types:
         constraints:
           - greater_or_equal: 0
         metadata:
-          common: true
+          common: 'true'
         description: A value indicating the start phase in which this acm element
           will be started, the first start phase is zero. Automation Composition Elements
           are started in their start_phase order and stopped in reverse start
@@ -536,7 +472,7 @@ node_types:
           - greater_or_equal: 0
         default: 60
         metadata:
-          common: true
+          common: 'true'
         description: The maximum time in seconds to wait for a state chage from
           uninitialized to passive
       passiveToRunningTimeout:
@@ -546,7 +482,7 @@ node_types:
           - greater_or_equal: 0
         default: 60
         metadata:
-          common: true
+          common: 'true'
         description: The maximum time in seconds to wait for a state chage from passive to
           running
       runningToPassiveTimeout:
@@ -556,7 +492,7 @@ node_types:
           - greater_or_equal: 0
         default: 60
         metadata:
-          common: true
+          common: 'true'
         description: The maximum time in seconds to wait for a state chage from running to
           passive
       passiveToUninitializedTimeout:
@@ -566,7 +502,7 @@ node_types:
           - greater_or_equal: 0
         default: 60
         metadata:
-          common: true
+          common: 'true'
         description: The maximum time in seconds to wait for a state chage from passive to
           uninitialized
   org.onap.policy.clamp.acm.AutomationComposition:
@@ -577,13 +513,13 @@ node_types:
         type: string
         required: false
         metadata:
-          common: true
+          common: 'true'
         description: Specifies the organization that provides the acm element
       elements:
         type: list
         required: true
         metadata:
-          common: true
+          common: 'true'
         entry_schema:
           type: onap.datatypes.ToscaConceptIdentifier
         description: Specifies a list of acm element definitions that make up this
diff --git a/catalog-be/src/main/resources/import/tosca/models/upgrade/acm/tosca/data-types/dataTypes.yml b/catalog-be/src/main/resources/import/tosca/models/upgrade/acm/tosca/data-types/dataTypes.yml
index 5a34ccbe2a..48e514288a 100644
--- a/catalog-be/src/main/resources/import/tosca/models/upgrade/acm/tosca/data-types/dataTypes.yml
+++ b/catalog-be/src/main/resources/import/tosca/models/upgrade/acm/tosca/data-types/dataTypes.yml
@@ -149,7 +149,6 @@ onap.datatype.acm.Operation:
       required: false
       default: final_failure_guard
 onap.datatypes.monitoring.managedObjectDNsBasic:
-  constraints: []
   properties:
     DN:
       name: DN
@@ -157,14 +156,10 @@ onap.datatypes.monitoring.managedObjectDNsBasic:
       typeVersion: 0.0.0
       description: Managed object distinguished name
       required: true
-      constraints: []
-      metadata: {}
   name: onap.datatypes.monitoring.managedObjectDNsBasic
   version: 0.0.0
   derived_from: tosca.datatypes.Root
-  metadata: {}
 onap.datatypes.monitoring.managedObjectDNsBasics:
-  constraints: []
   properties:
     managedObjectDNsBasic:
       name: managedObjectDNsBasic
@@ -172,18 +167,13 @@ onap.datatypes.monitoring.managedObjectDNsBasics:
       typeVersion: 0.0.0
       description: Managed object distinguished name object
       required: true
-      constraints: []
       entry_schema:
         type: onap.datatypes.monitoring.managedObjectDNsBasic
         typeVersion: 0.0.0
-        constraints: []
-      metadata: {}
   name: onap.datatypes.monitoring.managedObjectDNsBasics
   version: 0.0.0
   derived_from: tosca.datatypes.Root
-  metadata: {}
 onap.datatypes.monitoring.measurementGroup:
-  constraints: []
   properties:
     measurementTypes:
       name: measurementTypes
@@ -191,30 +181,22 @@ onap.datatypes.monitoring.measurementGroup:
       typeVersion: 0.0.0
       description: List of measurement types
       required: true
-      constraints: []
       entry_schema:
         type: onap.datatypes.monitoring.measurementTypes
         typeVersion: 0.0.0
-        constraints: []
-      metadata: {}
     managedObjectDNsBasic:
       name: managedObjectDNsBasic
       type: list
       typeVersion: 0.0.0
       description: List of managed object distinguished names
       required: true
-      constraints: []
       entry_schema:
         type: onap.datatypes.monitoring.managedObjectDNsBasics
         typeVersion: 0.0.0
-        constraints: []
-      metadata: {}
   name: onap.datatypes.monitoring.measurementGroup
   version: 0.0.0
   derived_from: tosca.datatypes.Root
-  metadata: {}
 onap.datatypes.monitoring.measurementGroups:
-  constraints: []
   properties:
     measurementGroup:
       name: measurementGroup
@@ -222,18 +204,13 @@ onap.datatypes.monitoring.measurementGroups:
       typeVersion: 0.0.0
       description: Measurement Group
       required: true
-      constraints: []
       entry_schema:
         type: onap.datatypes.monitoring.measurementGroup
         typeVersion: 0.0.0
-        constraints: []
-      metadata: {}
   name: onap.datatypes.monitoring.measurementGroups
   version: 0.0.0
   derived_from: tosca.datatypes.Root
-  metadata: {}
 onap.datatypes.monitoring.measurementType:
-  constraints: []
   properties:
     measurementType:
       name: measurementType
@@ -241,14 +218,10 @@ onap.datatypes.monitoring.measurementType:
       typeVersion: 0.0.0
       description: Measurement type
       required: true
-      constraints: []
-      metadata: {}
   name: onap.datatypes.monitoring.measurementType
   version: 0.0.0
   derived_from: tosca.datatypes.Root
-  metadata: {}
 onap.datatypes.monitoring.measurementTypes:
-  constraints: []
   properties:
     measurementType:
       name: measurementType
@@ -256,18 +229,13 @@ onap.datatypes.monitoring.measurementTypes:
       typeVersion: 0.0.0
       description: Measurement type object
       required: true
-      constraints: []
       entry_schema:
         type: onap.datatypes.monitoring.measurementType
         typeVersion: 0.0.0
-        constraints: []
-      metadata: {}
   name: onap.datatypes.monitoring.measurementTypes
   version: 0.0.0
   derived_from: tosca.datatypes.Root
-  metadata: {}
 onap.datatypes.monitoring.nfFilter:
-  constraints: []
   properties:
     modelNames:
       name: modelNames
@@ -275,54 +243,40 @@ onap.datatypes.monitoring.nfFilter:
       typeVersion: 0.0.0
       description: List of model names
       required: true
-      constraints: []
       entry_schema:
         type: string
         typeVersion: 0.0.0
-        constraints: []
-      metadata: {}
     modelInvariantIDs:
       name: modelInvariantIDs
       type: list
       typeVersion: 0.0.0
       description: List of model invariant IDs
       required: true
-      constraints: []
       entry_schema:
         type: string
         typeVersion: 0.0.0
-        constraints: []
-      metadata: {}
     modelVersionIDs:
       name: modelVersionIDs
       type: list
       typeVersion: 0.0.0
       description: List of model version IDs
       required: true
-      constraints: []
       entry_schema:
         type: string
         typeVersion: 0.0.0
-        constraints: []
-      metadata: {}
     nfNames:
       name: nfNames
       type: list
       typeVersion: 0.0.0
       description: List of network functions
       required: true
-      constraints: []
       entry_schema:
         type: string
         typeVersion: 0.0.0
-        constraints: []
-      metadata: {}
   name: onap.datatypes.monitoring.nfFilter
   version: 0.0.0
   derived_from: tosca.datatypes.Root
-  metadata: {}
 onap.datatypes.monitoring.subscription:
-  constraints: []
   properties:
     measurementGroups:
       name: measurementGroups
@@ -330,36 +284,27 @@ onap.datatypes.monitoring.subscription:
       typeVersion: 0.0.0
       description: Measurement Groups
       required: true
-      constraints: []
       entry_schema:
         type: onap.datatypes.monitoring.measurementGroups
         typeVersion: 0.0.0
-        constraints: []
-      metadata: {}
     fileBasedGP:
       name: fileBasedGP
       type: integer
       typeVersion: 0.0.0
       description: File based granularity period
       required: true
-      constraints: []
-      metadata: {}
     fileLocation:
       name: fileLocation
       type: string
       typeVersion: 0.0.0
       description: ROP file location
       required: true
-      constraints: []
-      metadata: {}
     subscriptionName:
       name: subscriptionName
       type: string
       typeVersion: 0.0.0
       description: Name of the subscription
       required: true
-      constraints: []
-      metadata: {}
     administrativeState:
       name: administrativeState
       type: string
@@ -370,23 +315,18 @@ onap.datatypes.monitoring.subscription:
         - valid_values:
             - LOCKED
             - UNLOCKED
-      metadata: {}
     nfFilter:
       name: nfFilter
       type: map
       typeVersion: 0.0.0
       description: Network function filter
       required: true
-      constraints: []
       entry_schema:
         type: onap.datatypes.monitoring.nfFilter
         typeVersion: 0.0.0
-        constraints: []
-      metadata: {}
   name: onap.datatypes.monitoring.subscription
   version: 0.0.0
   derived_from: tosca.datatypes.Root
-  metadata: {}
 org.onap.datatypes.policy.clamp.acm.httpAutomationCompositionElement.RestRequest:
   version: 1.0.0
   derived_from: tosca.datatypes.Root
@@ -417,7 +357,6 @@ org.onap.datatypes.policy.clamp.acm.httpAutomationCompositionElement.RestRequest
     expectedResponse:
       type: integer
       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
@@ -434,5 +373,4 @@ org.onap.datatypes.policy.clamp.acm.httpAutomationCompositionElement.Configurati
       entry_schema:
         type: org.onap.datatypes.policy.clamp.acm.httpAutomationCompositionElement.RestRequest
         typeVersion: 1.0.0
-        constraints: []
       description: A sequence of REST commands to send to the REST endpoint