Fix for status properties value.

These changes were made to align the normative types to the TOSCA property definition requirements.

Issue-ID: SDC-322
Change-Id: I32e815dd26990dd6c82c859ad051b271db3c8029
Signed-off-by: aribeiro <anderson.ribeiro@est.tech>

30 files changed, 684 insertions, 684 deletions

diff --git a/catalog-be/src/main/resources/import/tosca/capability-types/capabilityTypes.yml b/catalog-be/src/main/resources/import/tosca/capability-types/capabilityTypes.yml
index b6c2de81cd..e4037bcf76 100644
--- a/catalog-be/src/main/resources/import/tosca/capability-types/capabilityTypes.yml
+++ b/catalog-be/src/main/resources/import/tosca/capability-types/capabilityTypes.yml
@@ -161,27 +161,27 @@ org.openecomp.capabilities.Metric:
       type: string
       description: Unit of the metric value
       required: true
-      status: SUPPORTED
+      status: supported
     description:
       type: string
       description: Description of the metric
       required: false
-      status: SUPPORTED
+      status: supported
     type:
       type: string
       description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
       required: true
-      status: SUPPORTED
+      status: supported
     category:
       type: string
       description: Category of the metric, for an example, compute, disk, network, storage and etc.
       required: false
-      status: SUPPORTED
+      status: supported
   attributes:
     value:
       type: string
       description: Runtime monitored value
-      status: SUPPORTED
+      status: supported
 org.openecomp.capabilities.metric.Ceilometer:
   derived_from: org.openecomp.capabilities.Metric
   description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -190,7 +190,7 @@ org.openecomp.capabilities.metric.Ceilometer:
       type: string
       description: Ceilometer metric type name to monitor. (The name ceilometer is using)
       required: true
-      status: SUPPORTED
+      status: supported
 org.openecomp.capabilities.metric.SnmpPolling:
   derived_from: org.openecomp.capabilities.Metric
   description: A node type that includes the Metric capability indicates that it can be monitored using snmp polling.
@@ -199,7 +199,7 @@ org.openecomp.capabilities.metric.SnmpPolling:
       type: string
       description: Object Id of the metric
       required: true
-      status: SUPPORTED
+      status: supported
 org.openecomp.capabilities.metric.SnmpTrap:
   derived_from: org.openecomp.capabilities.Metric
   description: A node type that includes the Metric capability indicates that it can be monitored using snmp trap.
@@ -208,7 +208,7 @@ org.openecomp.capabilities.metric.SnmpTrap:
       type: string
       description: Object Id of the metric
       required: true
-      status: SUPPORTED
+      status: supported
 org.openecomp.capabilities.Forwarder:
   derived_from: tosca.capabilities.Root
 org.openecomp.capabilities.VLANAssignment:
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 e527b7a938..f1dab7d360 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
@@ -147,12 +147,12 @@ org.openecomp.datatypes.heat.network.AddressPair:
       type: string
       description: MAC address
       required: false
-      status: SUPPORTED
+      status: supported
     ip_address:
       type: string
       description: IP address
       required: false
-      status: SUPPORTED
+      status: supported
 
 org.openecomp.datatypes.heat.network.subnet.HostRoute:
   derived_from: tosca.datatypes.Root
@@ -162,12 +162,12 @@ org.openecomp.datatypes.heat.network.subnet.HostRoute:
       type: string
       description: The destination for static route
       required: false
-      status: SUPPORTED
+      status: supported
     nexthop:
       type: string
       description: The next hop for the destination
       required: false
-      status: SUPPORTED
+      status: supported
 
 org.openecomp.datatypes.heat.network.AllocationPool:
   derived_from: tosca.datatypes.Root
@@ -177,12 +177,12 @@ org.openecomp.datatypes.heat.network.AllocationPool:
       type: string
       description: Start address for the allocation pool
       required: false
-      status: SUPPORTED
+      status: supported
     end:
       type: string
       description: End address for the allocation pool
       required: false
-      status: SUPPORTED
+      status: supported
 
 org.openecomp.datatypes.heat.network.neutron.Subnet:
   derived_from: tosca.datatypes.Root
@@ -192,18 +192,18 @@ org.openecomp.datatypes.heat.network.neutron.Subnet:
       type: string
       description: The ID of the tenant who owns the network
       required: false
-      status: SUPPORTED
+      status: supported
     enable_dhcp:
       type: boolean
       description: Set to true if DHCP is enabled and false if DHCP is disabled
       required: false
       default: true
-      status: SUPPORTED
+      status: supported
     ipv6_address_mode:
       type: string
       description: IPv6 address mode
       required: false
-      status: SUPPORTED
+      status: supported
       constraints:
       - valid_values:
         - dhcpv6-stateful
@@ -213,7 +213,7 @@ org.openecomp.datatypes.heat.network.neutron.Subnet:
       type: string
       description: IPv6 RA (Router Advertisement) mode
       required: false
-      status: SUPPORTED
+      status: supported
       constraints:
       - valid_values:
         - dhcpv6-stateful
@@ -224,34 +224,34 @@ org.openecomp.datatypes.heat.network.neutron.Subnet:
       description: Extra parameters to include in the request
       required: false
       default: {}
-      status: SUPPORTED
+      status: supported
       entry_schema:
         type: string
     allocation_pools:
        type: list
        description: The start and end addresses for the allocation pools
        required: false
-       status: SUPPORTED
+       status: supported
        entry_schema:
          type: org.openecomp.datatypes.heat.network.AllocationPool
     subnetpool:
       type: string
       description: The name or ID of the subnet pool
       required: false
-      status: SUPPORTED
+      status: supported
     dns_nameservers:
       type: list
       description: A specified set of DNS name servers to be used
       required: false
       default: []
-      status: SUPPORTED
+      status: supported
       entry_schema:
         type: string
     host_routes:
       type: list
       description: The gateway IP address
       required: false
-      status: SUPPORTED
+      status: supported
       entry_schema:
         type: org.openecomp.datatypes.heat.network.subnet.HostRoute
     ip_version:
@@ -259,7 +259,7 @@ org.openecomp.datatypes.heat.network.neutron.Subnet:
       description: The gateway IP address
       required: false
       default: 4
-      status: SUPPORTED
+      status: supported
       constraints:
       - valid_values:
         - '4'
@@ -268,24 +268,24 @@ org.openecomp.datatypes.heat.network.neutron.Subnet:
       type: string
       description: The name of the subnet
       required: false
-      status: SUPPORTED
+      status: supported
     prefixlen:
       type: integer
       description: Prefix length for subnet allocation from subnet pool
       required: false
-      status: SUPPORTED
+      status: supported
       constraints:
       - greater_or_equal: 0
     cidr:
       type: string
       description: The CIDR
       required: false
-      status: SUPPORTED
+      status: supported
     gateway_ip:
       type: string
       description: The gateway IP address
       required: false
-      status: SUPPORTED
+      status: supported
 
 org.openecomp.datatypes.heat.novaServer.network.PortExtraProperties:
   derived_from: tosca.datatypes.Root
@@ -295,35 +295,35 @@ org.openecomp.datatypes.heat.novaServer.network.PortExtraProperties:
       type: boolean
       description: Flag to enable/disable port security on the port
       required: false
-      status: SUPPORTED
+      status: supported
     mac_address:
       type: string
       description: MAC address to give to this port
       required: false
-      status: SUPPORTED
+      status: supported
     admin_state_up:
       type: boolean
       description: The administrative state of this port
       required: false
       default: true
-      status: SUPPORTED
+      status: supported
     qos_policy:
       type: string
       description: The name or ID of QoS policy to attach to this port
       required: false
-      status: SUPPORTED
+      status: supported
     allowed_address_pairs:
       type: list
       description: Additional MAC/IP address pairs allowed to pass through the port
       required: false
-      status: SUPPORTED
+      status: supported
       entry_schema:
         type: org.openecomp.datatypes.heat.network.AddressPair
     binding:vnic_type:
       type: string
       description: The vnic type to be bound on the neutron port
       required: false
-      status: SUPPORTED
+      status: supported
       constraints:
       - valid_values:
         - macvtap
@@ -334,7 +334,7 @@ org.openecomp.datatypes.heat.novaServer.network.PortExtraProperties:
       description: Extra parameters to include in the request
       required: false
       default: {}
-      status: SUPPORTED
+      status: supported
       entry_schema:
         type: string
 
@@ -346,7 +346,7 @@ org.openecomp.datatypes.heat.novaServer.network.AddressInfo:
       type: string
       description: Port id
       required: false
-      status: SUPPORTED
+      status: supported
 
 org.openecomp.datatypes.heat.neutron.port.FixedIps:
   derived_from: tosca.datatypes.Root
@@ -356,17 +356,17 @@ org.openecomp.datatypes.heat.neutron.port.FixedIps:
       type: string
       description: Subnet in which to allocate the IP address for this port
       required: false
-      status: SUPPORTED
+      status: supported
     ip_address:
       type: string
       description: IP address desired in the subnet for this port
       required: false
-      status: SUPPORTED
+      status: supported
     subnet_id:
       type: string
       description: Subnet in which to allocate the IP address for this port
       required: false
-      status: SUPPORTED
+      status: supported
 
 org.openecomp.datatypes.heat.FileInfo:
   derived_from: tosca.datatypes.Root
@@ -376,12 +376,12 @@ org.openecomp.datatypes.heat.FileInfo:
       type: string
       description: The required URI string (relative or absolute) which can be used to locate the file
       required: true
-      status: SUPPORTED
+      status: supported
     file_type:
       type: string
       description: The type of the file
       required: true
-      status: SUPPORTED
+      status: supported
       constraints:
       - valid_values:
         - base
@@ -397,12 +397,12 @@ org.openecomp.datatypes.heat.contrail.network.rule.PortPairs:
         type: string
         description: Start port
         required: false
-        status: SUPPORTED
+        status: supported
       end_port:
         type: string
         description: End port
         required: false
-        status: SUPPORTED
+        status: supported
 
 org.openecomp.datatypes.heat.contrail.network.rule.Rule:
     derived_from: tosca.datatypes.Root
@@ -412,45 +412,45 @@ org.openecomp.datatypes.heat.contrail.network.rule.Rule:
         type: list
         description: Source ports
         required: false
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.contrail.network.rule.PortPairs
       protocol:
         type: string
         description: Protocol
         required: false
-        status: SUPPORTED
+        status: supported
       dst_addresses:
         type: list
         description: Destination addresses
         required: false
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.contrail.network.rule.VirtualNetwork
       apply_service:
         type: string
         description: Service to apply
         required: false
-        status: SUPPORTED
+        status: supported
       dst_ports:
         type: list
         description: Destination ports
         required: false
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.contrail.network.rule.PortPairs
       src_addresses:
         type: list
         description: Source addresses
         required: false
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.contrail.network.rule.VirtualNetwork
       direction:
         type: string
         description: Direction
         required: false
-        status: SUPPORTED
+        status: supported
 
 org.openecomp.datatypes.heat.contrail.network.rule.RuleList:
     derived_from: tosca.datatypes.Root
@@ -460,7 +460,7 @@ org.openecomp.datatypes.heat.contrail.network.rule.RuleList:
         type: list
         description: Contrail network rule
         required: false
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.contrail.network.rule.Rule
 
@@ -472,7 +472,7 @@ org.openecomp.datatypes.heat.contrail.network.rule.VirtualNetwork:
         type: string
         description: Virtual network
         required: false
-        status: SUPPORTED
+        status: supported
 
 org.openecomp.datatypes.heat.network.neutron.SecurityRules.Rule:
     derived_from: tosca.datatypes.Root
@@ -482,12 +482,12 @@ org.openecomp.datatypes.heat.network.neutron.SecurityRules.Rule:
         type: string
         description: The remote group ID to be associated with this security group rule
         required: false
-        status: SUPPORTED
+        status: supported
       protocol:
         type: string
         description: The protocol that is matched by the security group rule
         required: false
-        status: SUPPORTED
+        status: supported
         constraints:
         - valid_values:
           - tcp
@@ -498,7 +498,7 @@ org.openecomp.datatypes.heat.network.neutron.SecurityRules.Rule:
         description: Ethertype of the traffic
         required: false
         default: IPv4
-        status: SUPPORTED
+        status: supported
         constraints:
         - valid_values:
           - IPv4
@@ -507,7 +507,7 @@ org.openecomp.datatypes.heat.network.neutron.SecurityRules.Rule:
         type: integer
         description: 'The maximum port number in the range that is matched by the security group rule. '
         required: false
-        status: SUPPORTED
+        status: supported
         constraints:
         - in_range:
           - 0
@@ -516,13 +516,13 @@ org.openecomp.datatypes.heat.network.neutron.SecurityRules.Rule:
         type: string
         description: The remote IP prefix (CIDR) to be associated with this security group rule
         required: false
-        status: SUPPORTED
+        status: supported
       remote_mode:
         type: string
         description: Whether to specify a remote group or a remote IP prefix
         required: false
         default: remote_ip_prefix
-        status: SUPPORTED
+        status: supported
         constraints:
         - valid_values:
           - remote_ip_prefix
@@ -532,7 +532,7 @@ org.openecomp.datatypes.heat.network.neutron.SecurityRules.Rule:
         description: The direction in which the security group rule is applied
         required: false
         default: ingress
-        status: SUPPORTED
+        status: supported
         constraints:
         - valid_values:
           - egress
@@ -541,7 +541,7 @@ org.openecomp.datatypes.heat.network.neutron.SecurityRules.Rule:
         type: integer
         description: The minimum port number in the range that is matched by the security group rule.
         required: false
-        status: SUPPORTED
+        status: supported
         constraints:
         - in_range:
           - 0
@@ -555,13 +555,13 @@ org.openecomp.datatypes.heat.substitution.SubstitutionFiltering:
         type: string
         description: Substitute Service Template
         required: true
-        status: SUPPORTED
+        status: supported
       index_value:
         type: integer
         description: Index value of the substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       count:
@@ -569,19 +569,19 @@ org.openecomp.datatypes.heat.substitution.SubstitutionFiltering:
         description: Count
         required: false
         default: 1
-        status: SUPPORTED
+        status: supported
       scaling_enabled:
         type: boolean
         description: Indicates whether service scaling is enabled
         required: false
         default: true
-        status: SUPPORTED
+        status: supported
       mandatory:
         type: boolean
         description: Mandatory
         required: false
         default: true
-        status: SUPPORTED
+        status: supported
 
 org.openecomp.datatypes.heat.contrailV2.virtual.network.rule.RefDataSequence:
     derived_from: tosca.datatypes.Root
@@ -591,12 +591,12 @@ org.openecomp.datatypes.heat.contrailV2.virtual.network.rule.RefDataSequence:
         type: integer
         description: Network Policy ref data sequence Major
         required: false
-        status: SUPPORTED
+        status: supported
       network_policy_refs_data_sequence_minor:
         type: integer
         description: Network Policy ref data sequence Minor
         required: false
-        status: SUPPORTED
+        status: supported
 
 org.openecomp.datatypes.heat.contrailV2.virtual.network.rule.RefData:
     derived_from: tosca.datatypes.Root
@@ -606,7 +606,7 @@ org.openecomp.datatypes.heat.contrailV2.virtual.network.rule.RefData:
         type: org.openecomp.datatypes.heat.contrailV2.virtual.network.rule.RefDataSequence
         description: Network Policy ref data sequence
         required: false
-        status: SUPPORTED
+        status: supported
 
 org.openecomp.datatypes.heat.contrailV2.virtual.network.rule.ref.data.IpamSubnet:
     derived_from: tosca.datatypes.Root
@@ -616,12 +616,12 @@ org.openecomp.datatypes.heat.contrailV2.virtual.network.rule.ref.data.IpamSubnet
         type: string
         description: Network ipam refs data ipam subnets ip prefix len
         required: false
-        status: SUPPORTED
+        status: supported
       network_ipam_refs_data_ipam_subnets_subnet_ip_prefix:
         type: string
         description: Network ipam refs data ipam subnets ip prefix
         required: false
-        status: SUPPORTED
+        status: supported
 
 org.openecomp.datatypes.heat.contrailV2.virtual.network.rule.ref.data.IpamSubnetList:
     derived_from: tosca.datatypes.Root
@@ -631,12 +631,12 @@ org.openecomp.datatypes.heat.contrailV2.virtual.network.rule.ref.data.IpamSubnet
         type: org.openecomp.datatypes.heat.contrailV2.virtual.network.rule.ref.data.IpamSubnet
         description: Network ipam refs data ipam subnets
         required: false
-        status: SUPPORTED
+        status: supported
       network_ipam_refs_data_ipam_subnets_addr_from_start:
         type: string
         description: Network ipam refs data ipam subnets addr from start
         required: false
-        status: SUPPORTED
+        status: supported
 
 org.openecomp.datatypes.heat.contrailV2.virtual.network.rule.IpamRefData:
     derived_from: tosca.datatypes.Root
@@ -646,7 +646,7 @@ org.openecomp.datatypes.heat.contrailV2.virtual.network.rule.IpamRefData:
         type: list
         description: Network ipam refs data ipam subnets
         required: false
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.contrailV2.virtual.network.rule.ref.data.IpamSubnetList
 
@@ -658,7 +658,7 @@ org.openecomp.datatypes.heat.contrailV2.network.rule.SrcVirtualNetwork:
         type: string
         description: Source addresses Virtual network
         required: false
-        status: SUPPORTED
+        status: supported
 
 org.openecomp.datatypes.heat.contrailV2.network.rule.DstVirtualNetwork:
     derived_from: tosca.datatypes.Root
@@ -668,7 +668,7 @@ org.openecomp.datatypes.heat.contrailV2.network.rule.DstVirtualNetwork:
         type: string
         description: Destination addresses Virtual network
         required: false
-        status: SUPPORTED
+        status: supported
 
 org.openecomp.datatypes.heat.contrailV2.network.rule.DstPortPairs:
     derived_from: tosca.datatypes.Root
@@ -678,12 +678,12 @@ org.openecomp.datatypes.heat.contrailV2.network.rule.DstPortPairs:
         type: string
         description: Start port
         required: false
-        status: SUPPORTED
+        status: supported
       network_policy_entries_policy_rule_dst_ports_end_port:
         type: string
         description: End port
         required: false
-        status: SUPPORTED
+        status: supported
 
 org.openecomp.datatypes.heat.contrailV2.network.rule.SrcPortPairs:
     derived_from: tosca.datatypes.Root
@@ -693,12 +693,12 @@ org.openecomp.datatypes.heat.contrailV2.network.rule.SrcPortPairs:
         type: string
         description: Start port
         required: false
-        status: SUPPORTED
+        status: supported
       network_policy_entries_policy_rule_src_ports_end_port:
         type: string
         description: End port
         required: false
-        status: SUPPORTED
+        status: supported
 
 org.openecomp.datatypes.heat.contrailV2.network.rule.ActionList:
     derived_from: tosca.datatypes.Root
@@ -708,12 +708,12 @@ org.openecomp.datatypes.heat.contrailV2.network.rule.ActionList:
         type: string
         description: Simple Action
         required: false
-        status: SUPPORTED
+        status: supported
       network_policy_entries_policy_rule_action_list_apply_service:
         type: list
         description: Apply Service
         required: false
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
 
@@ -725,45 +725,45 @@ org.openecomp.datatypes.heat.contrailV2.network.rule.Rule:
         type: list
         description: Destination addresses
         required: false
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.contrailV2.network.rule.DstVirtualNetwork
       network_policy_entries_policy_rule_dst_ports:
         type: list
         description: Destination ports
         required: false
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.contrailV2.network.rule.DstPortPairs
       network_policy_entries_policy_rule_protocol:
         type: string
         description: Protocol
         required: false
-        status: SUPPORTED
+        status: supported
       network_policy_entries_policy_rule_src_addresses:
         type: list
         description: Source addresses
         required: false
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.contrailV2.network.rule.SrcVirtualNetwork
       network_policy_entries_policy_rule_direction:
         type: string
         description: Direction
         required: false
-        status: SUPPORTED
+        status: supported
       network_policy_entries_policy_rule_src_ports:
         type: list
         description: Source ports
         required: false
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.contrailV2.network.rule.SrcPortPairs
       network_policy_entries_policy_rule_action_list:
         type: org.openecomp.datatypes.heat.contrailV2.network.rule.ActionList
         description: Action list
         required: false
-        status: SUPPORTED
+        status: supported
 
 org.openecomp.datatypes.heat.contrailV2.network.rule.RuleList:
     derived_from: tosca.datatypes.Root
@@ -773,7 +773,7 @@ org.openecomp.datatypes.heat.contrailV2.network.rule.RuleList:
         type: list
         description: Contrail network rule
         required: false
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.contrailV2.network.rule.Rule
 
@@ -785,17 +785,17 @@ org.openecomp.datatypes.heat.network.contrail.port.StaticRoute:
         type: string
         description: Route prefix
         required: false
-        status: SUPPORTED
+        status: supported
       next_hop:
         type: string
         description: Next hop
         required: false
-        status: SUPPORTED
+        status: supported
       next_hop_type:
         type: string
         description: Next hop type
         required: false
-        status: SUPPORTED
+        status: supported
 
 org.openecomp.datatypes.heat.network.contrail.AddressPair:
     derived_from: tosca.datatypes.Root
@@ -805,7 +805,7 @@ org.openecomp.datatypes.heat.network.contrail.AddressPair:
         type: string
         description: Address mode active-active or active-standy
         required: false
-        status: SUPPORTED
+        status: supported
         constraints:
         - valid_values:
           - active-active
@@ -814,12 +814,12 @@ org.openecomp.datatypes.heat.network.contrail.AddressPair:
         type: string
         description: IP address prefix
         required: false
-        status: SUPPORTED
+        status: supported
       mac_address:
         type: string
         description: Mac address
         required: false
-        status: SUPPORTED
+        status: supported
 
 org.openecomp.datatypes.heat.network.contrail.InterfaceData:
     derived_from: tosca.datatypes.Root
@@ -829,26 +829,26 @@ org.openecomp.datatypes.heat.network.contrail.InterfaceData:
         type: list
         description: An ordered list of static routes to be added to this interface
         required: false
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.network.contrail.port.StaticRoute
       virtual_network:
         type: string
         description: Virtual Network for this interface
         required: true
-        status: SUPPORTED
+        status: supported
       allowed_address_pairs:
         type: list
         description: List of allowed address pair for this interface
         required: false
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.network.contrail.AddressPair
       ip_address:
         type: string
         description: IP for this interface
         required: false
-        status: SUPPORTED
+        status: supported
 
 org.openecomp.datatypes.heat.contrailV2.virtual.machine.interface.Properties:
     derived_from: tosca.datatypes.Root
@@ -858,7 +858,7 @@ org.openecomp.datatypes.heat.contrailV2.virtual.machine.interface.Properties:
         type: string
         description: Service Interface Type.
         required: false
-        status: SUPPORTED
+        status: supported
 
 org.openecomp.datatypes.Root:
   derived_from: tosca.datatypes.Root
@@ -1152,12 +1152,12 @@ org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPair
       type: string
       description: IP Prefix.
       required: false
-      status: SUPPORTED
+      status: supported
     ip_prefix_len:
       type: integer
       description: IP Prefix Len.
       required: false
-      status: SUPPORTED
+      status: supported
 
 org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.MacAddress:
   derived_from: tosca.datatypes.Root
@@ -1167,7 +1167,7 @@ org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.MacAddress:
       type: list
       description: Mac Addresses List.
       required: false
-      status: SUPPORTED
+      status: supported
       entry_schema:
         type: string
 
@@ -1179,7 +1179,7 @@ org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.Properties:
       type: string
       description: Sub Interface VLAN Tag.
       required: false
-      status: SUPPORTED
+      status: supported
 
 org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPair:
   derived_from: tosca.datatypes.Root
@@ -1189,17 +1189,17 @@ org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPair
       type: string
       description: Address Mode.
       required: false
-      status: SUPPORTED
+      status: supported
     ip:
       type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairIp
       description: IP.
       required: false
-      status: SUPPORTED
+      status: supported
     mac:
       type: string
       description: Mac.
       required: false
-      status: SUPPORTED
+      status: supported
 
 org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs:
   derived_from: tosca.datatypes.Root
@@ -1209,7 +1209,7 @@ org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPair
       type: list
       description: Addresses pair List.
       required: false
-      status: SUPPORTED
+      status: supported
       entry_schema:
         type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPair
 
diff --git a/catalog-be/src/main/resources/import/tosca/group-types/groupTypes.yml b/catalog-be/src/main/resources/import/tosca/group-types/groupTypes.yml
index b878241ebd..c09acb20c5 100644
--- a/catalog-be/src/main/resources/import/tosca/group-types/groupTypes.yml
+++ b/catalog-be/src/main/resources/import/tosca/group-types/groupTypes.yml
@@ -11,12 +11,12 @@ org.openecomp.groups.heat.HeatStack:
       type: string
       description: Heat file which associate to this group/heat stack
       required: true
-      status: SUPPORTED
+      status: supported
     description:
       type: string
       description: group description
       required: true
-      status: SUPPORTED
+      status: supported
 org.openecomp.groups.VfModule:
   derived_from: tosca.groups.Root
   description: Grouped all heat resources which are in the same VF Module
@@ -26,7 +26,7 @@ org.openecomp.groups.VfModule:
       description: Whether this module should be deployed before other modules
       required: true
       default: false
-      status: SUPPORTED
+      status: supported
     vf_module_label:
       type: string
       required: true
diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/Generic_VFC/Generic_VFC.yml b/catalog-be/src/main/resources/import/tosca/heat-types/Generic_VFC/Generic_VFC.yml
index 276ee03e63..71a93bcc0b 100644
--- a/catalog-be/src/main/resources/import/tosca/heat-types/Generic_VFC/Generic_VFC.yml
+++ b/catalog-be/src/main/resources/import/tosca/heat-types/Generic_VFC/Generic_VFC.yml
@@ -9,27 +9,27 @@ node_types:
         type: string
         description: high_availablity
         required: false
-        status: SUPPORTED
+        status: supported
       vm_image_name:
         type: string
         description: Master image_name volume id
         required: true
-        status: SUPPORTED
+        status: supported
       vm_flavor_name:
         type: string
         description: Master image_name volume id
         required: true
-        status: SUPPORTED
+        status: supported
       nfc_naming_code:
         type: string
         description: nfc code for instance naming
         required: false
-        status: SUPPORTED
+        status: supported
       vm_type_tag:
         type: string
         description: vm type based on naming Convention
         required: false
-        status: SUPPORTED
+        status: supported
       nfc_naming:
         type: org.openecomp.datatypes.Naming
         description: vfc naming
@@ -38,13 +38,13 @@ node_types:
         description: Minimum number of VFC Instances
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       max_instances:
         type: integer
         description: Maximum number of VFC Instances
         required: false
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 1
\ No newline at end of file
diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/abstractSubstitute/abstractSubstitute.yml b/catalog-be/src/main/resources/import/tosca/heat-types/abstractSubstitute/abstractSubstitute.yml
index 7aa7edfe70..3faf7a060c 100644
--- a/catalog-be/src/main/resources/import/tosca/heat-types/abstractSubstitute/abstractSubstitute.yml
+++ b/catalog-be/src/main/resources/import/tosca/heat-types/abstractSubstitute/abstractSubstitute.yml
@@ -7,4 +7,4 @@ node_types:
         type: org.openecomp.datatypes.heat.substitution.SubstitutionFiltering
         description: Substitution Filter
         required: true
-        status: SUPPORTED
+        status: supported
diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/cinderVolume/cinderVolume.yml b/catalog-be/src/main/resources/import/tosca/heat-types/cinderVolume/cinderVolume.yml
index 87dfc313ae..ba8ee3c8f6 100644
--- a/catalog-be/src/main/resources/import/tosca/heat-types/cinderVolume/cinderVolume.yml
+++ b/catalog-be/src/main/resources/import/tosca/heat-types/cinderVolume/cinderVolume.yml
@@ -6,34 +6,34 @@ node_types:
       availability_zone:
         description: The availability zone in which the volume will be created
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
       image:
         description: If specified, the name or ID of the image to create the volume from
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
       metadata:
         description: Key/value pairs to associate with the volume
         type: map
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
         required: false
       volume_type:
         description: If specified, the type of volume to use, mapping to a specific backend
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
       description:
         description: A description of the volume
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
       device_type:
         description: Device type
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
         constraints:
         - valid_values:
@@ -43,7 +43,7 @@ node_types:
         description: 'Bus of the device: hypervisor driver chooses a suitable default
           if omitted'
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
         constraints:
         - valid_values:
@@ -55,95 +55,95 @@ node_types:
       backup_id:
         description: If specified, the backup to create the volume from
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
       source_volid:
         description: If specified, the volume to use as source
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
       boot_index:
         description: Integer used for ordering the boot disks
         type: integer
-        status: SUPPORTED
+        status: supported
         required: false
       size:
         description: The requested storage size (default unit is MB)
         type: scalar-unit.size
-        status: SUPPORTED
+        status: supported
         required: false
         constraints:
         - greater_or_equal: 1 GB
       read_only:
         description: Enables or disables read-only access mode of volume
         type: boolean
-        status: SUPPORTED
+        status: supported
         required: false
       name:
         description: A name used to distinguish the volume
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
       scheduler_hints:
         description: Arbitrary key-value pairs specified by the client to help the Cinder scheduler creating a volume
         type: map
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
         required: false
       swap_size:
         description: The size of the swap, in MB
         type: scalar-unit.size
-        status: SUPPORTED
+        status: supported
         required: false
       delete_on_termination:
         description: Indicate whether the volume should be deleted when the server is terminated
         type: boolean
-        status: SUPPORTED
+        status: supported
         required: false
       multiattach:
         description: Whether allow the volume to be attached more than once
         type: boolean
-        status: SUPPORTED
+        status: supported
         required: false
     attributes:
       display_description:
         description: Description of the volume
         type: string
-        status: SUPPORTED
+        status: supported
       attachments:
         description: The list of attachments of the volume
         type: string
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       encrypted:
         description: Boolean indicating if the volume is encrypted or not
         type: boolean
-        status: SUPPORTED
+        status: supported
       show:
         description: Detailed information about resource
         type: string
-        status: SUPPORTED
+        status: supported
       created_at:
         description: The timestamp indicating volume creation
         type: timestamp
-        status: SUPPORTED
+        status: supported
       display_name:
         description: Name of the volume
         type: string
-        status: SUPPORTED
+        status: supported
       metadata_values:
         description: Key/value pairs associated with the volume in raw dict form
         type: map
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       bootable:
         description: Boolean indicating if the volume can be booted or not
         type: boolean
-        status: SUPPORTED
+        status: supported
       status:
         description: The current status of the volume
         type: string
-        status: SUPPORTED
+        status: supported
diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/contrailAbstractSubstitute/contrailAbstractSubstitute.yml b/catalog-be/src/main/resources/import/tosca/heat-types/contrailAbstractSubstitute/contrailAbstractSubstitute.yml
index a1f40c5529..b1abf64728 100644
--- a/catalog-be/src/main/resources/import/tosca/heat-types/contrailAbstractSubstitute/contrailAbstractSubstitute.yml
+++ b/catalog-be/src/main/resources/import/tosca/heat-types/contrailAbstractSubstitute/contrailAbstractSubstitute.yml
@@ -7,12 +7,12 @@ node_types:
         type: string
         description: Availability zone to create servers in
         required: false
-        status: SUPPORTED
+        status: supported
       static_routes_list:
         type: list
         description: Static routes enabled
         required: false
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: boolean
       availability_zone_enable:
@@ -20,33 +20,33 @@ node_types:
         description: Indicates availability zone is enabled
         required: false
         default: false
-        status: SUPPORTED
+        status: supported
       service_template_name:
         type: string
         description: Service template name
         required: false
-        status: SUPPORTED
+        status: supported
       ordered_interfaces:
         type: boolean
         description: Indicates if service interface are ordered
         required: false
         default: false
-        status: SUPPORTED
+        status: supported
       flavor:
         type: string
         description: flavor
         required: false
-        status: SUPPORTED
+        status: supported
       image_name:
         type: string
         description: Image name
         required: true
-        status: SUPPORTED
+        status: supported
       service_type:
         type: string
         description: Service type
         required: true
-        status: SUPPORTED
+        status: supported
         constraints:
         - valid_values:
           - firewall
@@ -57,7 +57,7 @@ node_types:
         type: list
         description: List of interface types
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
           constraints:
@@ -70,19 +70,19 @@ node_types:
         type: string
         description: Service instance name
         required: true
-        status: SUPPORTED
+        status: supported
       interface_list:
         type: list
         description: List of interfaces
         required: false
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.network.contrail.InterfaceData
       service_mode:
         type: string
         description: Service mode
         required: true
-        status: SUPPORTED
+        status: supported
         constraints:
         - valid_values:
           - transparent
@@ -92,39 +92,39 @@ node_types:
         type: list
         description: Shared ips enabled
         required: false
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: boolean
     attributes:
       tenant_id:
         type: string
         description: Tenant id of the Service Instance
-        status: SUPPORTED
+        status: supported
       fq_name:
         type: string
         description: The FQ name of the service instance
-        status: SUPPORTED
+        status: supported
       service_template_name:
         type: string
         description: Service Template of the Service Instance
-        status: SUPPORTED
+        status: supported
       show:
         type: string
         description: All attributes
-        status: SUPPORTED
+        status: supported
       active_vms:
         type: string
         description: Number of service VMs active for this Service Instance
-        status: SUPPORTED
+        status: supported
       service_instance_name:
         type: string
         description: The name of the service instance
-        status: SUPPORTED
+        status: supported
       virtual_machines:
         type: string
         description: Service VMs for the Service Instance
-        status: SUPPORTED
+        status: supported
       status:
         type: string
         description: Status of the service instance
-        status: SUPPORTED
\ No newline at end of file
+        status: supported
\ No newline at end of file
diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/contrailCompute/contrailCompute.yml b/catalog-be/src/main/resources/import/tosca/heat-types/contrailCompute/contrailCompute.yml
index c2ba70e2d1..4844b11d25 100644
--- a/catalog-be/src/main/resources/import/tosca/heat-types/contrailCompute/contrailCompute.yml
+++ b/catalog-be/src/main/resources/import/tosca/heat-types/contrailCompute/contrailCompute.yml
@@ -7,22 +7,22 @@ node_types:
         type: string
         description: flavor
         required: false
-        status: SUPPORTED
+        status: supported
       image_name:
         type: string
         description: Image name
         required: true
-        status: SUPPORTED
+        status: supported
       availability_zone:
         type: string
         description: Availability zone to create servers in
         required: false
-        status: SUPPORTED
+        status: supported
       service_type:
         type: string
         description: Service type
         required: true
-        status: SUPPORTED
+        status: supported
         constraints:
         - valid_values:
           - firewall
@@ -34,22 +34,22 @@ node_types:
         description: Indicates availability zone is enabled
         required: false
         default: false
-        status: SUPPORTED
+        status: supported
       service_template_name:
         type: string
         description: Service template name
         required: false
-        status: SUPPORTED
+        status: supported
       service_instance_name:
         type: string
         description: Service instance name
         required: true
-        status: SUPPORTED
+        status: supported
       service_mode:
         type: string
         description: Service mode
         required: true
-        status: SUPPORTED
+        status: supported
         constraints:
         - valid_values:
           - transparent
@@ -59,24 +59,24 @@ node_types:
       tenant_id:
         type: string
         description: Tenant id of the VM
-        status: SUPPORTED
+        status: supported
       fq_name:
         type: string
         description: fq_name
-        status: SUPPORTED
+        status: supported
       show:
         type: string
         description: All attributes
-        status: SUPPORTED
+        status: supported
       active_vms:
         type: string
         description: Number of active VMs
-        status: SUPPORTED
+        status: supported
       virtual_machines:
         type: string
         description: VMs of this compute
-        status: SUPPORTED
+        status: supported
       status:
         type: string
         description: status of the compute
-        status: SUPPORTED
+        status: supported
diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/contrailNetworkRules/contrailNetworkRules.yml b/catalog-be/src/main/resources/import/tosca/heat-types/contrailNetworkRules/contrailNetworkRules.yml
index 2f8228ac85..7f6b29fec3 100644
--- a/catalog-be/src/main/resources/import/tosca/heat-types/contrailNetworkRules/contrailNetworkRules.yml
+++ b/catalog-be/src/main/resources/import/tosca/heat-types/contrailNetworkRules/contrailNetworkRules.yml
@@ -7,29 +7,29 @@ node_types:
         type: org.openecomp.datatypes.heat.contrail.network.rule.RuleList
         description: A symbolic name for this contrail network rule
         required: false
-        status: SUPPORTED
+        status: supported
       name:
         type: string
         description: A symbolic name for this contrail network rule
         required: false
-        status: SUPPORTED
+        status: supported
     attributes:
       tenant_id:
         type: string
         description: tenant_id
-        status: SUPPORTED
+        status: supported
       fq_name:
         type: string
         description: fq_name
-        status: SUPPORTED
+        status: supported
       show:
         type: string
         description: All attributes.
-        status: SUPPORTED
+        status: supported
       rules:
         type: list
         description: List of rules
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
     requirements:
diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/contrailPort/contrailPort.yml b/catalog-be/src/main/resources/import/tosca/heat-types/contrailPort/contrailPort.yml
index ce99511bbe..77cfc08bdd 100644
--- a/catalog-be/src/main/resources/import/tosca/heat-types/contrailPort/contrailPort.yml
+++ b/catalog-be/src/main/resources/import/tosca/heat-types/contrailPort/contrailPort.yml
@@ -7,25 +7,25 @@ node_types:
         type: list
         description: An ordered list of static routes to be added to this interface
         required: false
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.network.contrail.port.StaticRoute
       virtual_network:
         type: string
         description: Virtual Network for this interface
         required: true
-        status: SUPPORTED
+        status: supported
       static_route:
         type: boolean
         description: Static route enabled
         required: false
         default: false
-        status: SUPPORTED
+        status: supported
       allowed_address_pairs:
         type: list
         description: List of allowed address pair for this interface
         required: false
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.network.contrail.AddressPair
       shared_ip:
@@ -33,17 +33,17 @@ node_types:
         description: Shared ip enabled
         required: false
         default: false
-        status: SUPPORTED
+        status: supported
       ip_address:
         type: string
         description: IP for this interface
         required: false
-        status: SUPPORTED
+        status: supported
       interface_type:
         type: string
         description: Interface type
         required: true
-        status: SUPPORTED
+        status: supported
         constraints:
         - valid_values:
           - management
@@ -54,4 +54,4 @@ node_types:
       fq_name:
         type: string
         description: fq_name
-        status: SUPPORTED
+        status: supported
diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/contrailV2NetworkRules/contrailV2NetworkRules.yml b/catalog-be/src/main/resources/import/tosca/heat-types/contrailV2NetworkRules/contrailV2NetworkRules.yml
index ad4369ce40..684426c474 100644
--- a/catalog-be/src/main/resources/import/tosca/heat-types/contrailV2NetworkRules/contrailV2NetworkRules.yml
+++ b/catalog-be/src/main/resources/import/tosca/heat-types/contrailV2NetworkRules/contrailV2NetworkRules.yml
@@ -7,17 +7,17 @@ node_types:
         type: string
         description: A symbolic name for this contrail v2 network rule
         required: false
-        status: SUPPORTED
+        status: supported
       network_policy_entries:
         type: org.openecomp.datatypes.heat.contrailV2.network.rule.RuleList
         description: A symbolic name for this contrail v2 network rule
         required: false
-        status: SUPPORTED
+        status: supported
     attributes:
       fq_name:
         type: string
         description: fq_name
-        status: SUPPORTED
+        status: supported
     requirements:
     - network:
         capability: tosca.capabilities.Attachment
diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/contrailV2VLANSubInterface/contrailV2VLANSubInterface.yml b/catalog-be/src/main/resources/import/tosca/heat-types/contrailV2VLANSubInterface/contrailV2VLANSubInterface.yml
index 20f7372274..6858dcba1a 100644
--- a/catalog-be/src/main/resources/import/tosca/heat-types/contrailV2VLANSubInterface/contrailV2VLANSubInterface.yml
+++ b/catalog-be/src/main/resources/import/tosca/heat-types/contrailV2VLANSubInterface/contrailV2VLANSubInterface.yml
@@ -6,48 +6,48 @@ node_types:
       virtual_machine_interface_refs:
         description: List of virtual machine interface.
         type: list
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
         required: false
       name:
         description: Virtual Machine Sub Interface VLAN name
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
       virtual_network_refs:
         description: List of virtual networks.
         type: list
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
         required: false
       virtual_machine_interface_properties:
         description: virtual machine interface properties.
         type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.Properties
-        status: SUPPORTED
+        status: supported
         required: false
       virtual_machine_interface_allowed_address_pairs:
         description: Virtual Machine Sub Interface allowed address pairs.
         type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs
-        status: SUPPORTED
+        status: supported
         required: false
       virtual_machine_interface_mac_addresses:
         description: List of mac addresses.
         type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.MacAddress
-        status: SUPPORTED
+        status: supported
         required: false
       security_group_refs:
         description: List of security groups.
         type: list
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
         required: false
       port_tuple_refs:
         description: List of port tuples.
         type: list
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
         required: false
@@ -55,11 +55,11 @@ node_types:
       fq_name:
         description: The FQ name of the Virtual Network.
         type: string
-        status: SUPPORTED
+        status: supported
       show:
         description: All attributes.
         type: string
-        status: SUPPORTED
+        status: supported
     requirements:
     - binding:
         capability: tosca.capabilities.network.Bindable
diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/contrailV2VLANSubInterfaceV2/contrailV2VLANSubInterfaceV2.yml b/catalog-be/src/main/resources/import/tosca/heat-types/contrailV2VLANSubInterfaceV2/contrailV2VLANSubInterfaceV2.yml
index a9a89e84bc..85f5ac9d0e 100644
--- a/catalog-be/src/main/resources/import/tosca/heat-types/contrailV2VLANSubInterfaceV2/contrailV2VLANSubInterfaceV2.yml
+++ b/catalog-be/src/main/resources/import/tosca/heat-types/contrailV2VLANSubInterfaceV2/contrailV2VLANSubInterfaceV2.yml
@@ -6,48 +6,48 @@ node_types:
       virtual_machine_interface_refs:
         description: List of virtual machine interface.
         type: list
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
         required: false
       name:
         description: Virtual Machine Sub Interface VLAN name
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
       virtual_network_refs:
         description: List of virtual networks.
         type: list
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
         required: false
       virtual_machine_interface_properties:
         description: virtual machine interface properties.
         type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.Properties
-        status: SUPPORTED
+        status: supported
         required: false
       virtual_machine_interface_allowed_address_pairs:
         description: Virtual Machine Sub Interface allowed address pairs.
         type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs
-        status: SUPPORTED
+        status: supported
         required: false
       virtual_machine_interface_mac_addresses:
         description: List of mac addresses.
         type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.MacAddress
-        status: SUPPORTED
+        status: supported
         required: false
       security_group_refs:
         description: List of security groups.
         type: list
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
         required: false
       port_tuple_refs:
         description: List of port tuples.
         type: list
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
         required: false
@@ -55,11 +55,11 @@ node_types:
       fq_name:
         description: The FQ name of the Virtual Network.
         type: string
-        status: SUPPORTED
+        status: supported
       show:
         description: All attributes.
         type: string
-        status: SUPPORTED
+        status: supported
     requirements:
     - binding:
         capability: tosca.capabilities.network.Bindable
diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/contrailV2VirtualMachineInterface/contrailV2VirtualMachineInterface.yml b/catalog-be/src/main/resources/import/tosca/heat-types/contrailV2VirtualMachineInterface/contrailV2VirtualMachineInterface.yml
index 69e15ff488..248220c729 100644
--- a/catalog-be/src/main/resources/import/tosca/heat-types/contrailV2VirtualMachineInterface/contrailV2VirtualMachineInterface.yml
+++ b/catalog-be/src/main/resources/import/tosca/heat-types/contrailV2VirtualMachineInterface/contrailV2VirtualMachineInterface.yml
@@ -6,55 +6,55 @@ node_types:
       name:
         description: Virtual Machine Interface name
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
       security_group_refs:
         description: List of security groups.
         type: list
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
         required: false
       virtual_network_refs:
         description: List of virtual networks.
         type: list
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
         required: false
       virtual_machine_interface_properties:
         description: virtual machine interface properties.
         type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.interface.Properties
-        status: SUPPORTED
+        status: supported
         required: false
       port_tuple_refs:
         description: List of port tuples.
         type: list
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
         required: false
       virtual_machine_interface_mac_addresses:
         description: List of mac addresses.
         type: list
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
         required: false
       virtual_machine_interface_allowed_address_pairs:
         description: Virtual Machine Interface allowed address pairs.
         type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs
-        status: SUPPORTED
+        status: supported
         required: false      
     attributes:
       fq_name:
         description: The FQ name of the Virtual Network.
         type: string
-        status: SUPPORTED
+        status: supported
       show:
         description: All attributes.
         type: string
-        status: SUPPORTED
+        status: supported
     capabilities:
       binding:
         type: tosca.capabilities.network.Bindable
diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/contrailV2VirtualNetwork/contrailV2VirtualNetwork.yml b/catalog-be/src/main/resources/import/tosca/heat-types/contrailV2VirtualNetwork/contrailV2VirtualNetwork.yml
index 0fa7c94a63..22b0427c5f 100644
--- a/catalog-be/src/main/resources/import/tosca/heat-types/contrailV2VirtualNetwork/contrailV2VirtualNetwork.yml
+++ b/catalog-be/src/main/resources/import/tosca/heat-types/contrailV2VirtualNetwork/contrailV2VirtualNetwork.yml
@@ -7,58 +7,58 @@ node_types:
         type: list
         description: IPAM references Data
         required: false
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.contrailV2.virtual.network.rule.IpamRefData
       network_policy_refs_data:
         type: list
         description: Policy references data
         required: false
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.contrailV2.virtual.network.rule.RefData
       network_ipam_refs:
         type: list
         description: IPAM references
         required: false
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       network_policy_refs:
         type: list
         description: Policy references
         required: false
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subnets:
         type: map
         description: Network related subnets
         required: false
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.network.neutron.Subnet
     attributes:
       fq_name:
         type: string
         description: fq_name
-        status: SUPPORTED
+        status: supported
       subnets_name:
         type: list
         description: Subnets name of this network
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subnets_show:
         type: map
         description: Detailed information about each subnet
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subnets:
         type: map
         description: Network related subnets
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.network.neutron.Subnet
     capabilities:
diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/contrailVirtualNetwork/contrailVirtualNetwork.yml b/catalog-be/src/main/resources/import/tosca/heat-types/contrailVirtualNetwork/contrailVirtualNetwork.yml
index c0d1f3dab2..7ebe342e9f 100644
--- a/catalog-be/src/main/resources/import/tosca/heat-types/contrailVirtualNetwork/contrailVirtualNetwork.yml
+++ b/catalog-be/src/main/resources/import/tosca/heat-types/contrailVirtualNetwork/contrailVirtualNetwork.yml
@@ -7,66 +7,66 @@ node_types:
         type: string
         description: Is virtual network shared
         required: false
-        status: SUPPORTED
+        status: supported
       forwarding_mode:
         type: string
         description: forwarding mode of the virtual network
         required: false
-        status: SUPPORTED
+        status: supported
       external:
         type: string
         description: Is virtual network external
         required: false
-        status: SUPPORTED
+        status: supported
       allow_transit:
         type: string
         description: Whether this network should be transitive.
         required: false
-        status: SUPPORTED
+        status: supported
       flood_unknown_unicast:
         type: string
         description: flood L2 packets on network
         required: false
-        status: SUPPORTED
+        status: supported
       route_targets:
         type: list
         description: route targets associated with the virtual network
         required: false
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subnets:
         type: map
         description: Network related subnets
         required: false
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.network.neutron.Subnet
     attributes:
       fq_name:
         type: string
         description: fq_name
-        status: SUPPORTED
+        status: supported
       show:
         type: string
         description: All attributes.
-        status: SUPPORTED
+        status: supported
       subnets_name:
         type: list
         description: Subnets name of this network
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subnets_show:
         type: map
         description: Detailed information about each subnet
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subnets:
         type: map
         description: Network related subnets
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.network.neutron.Subnet
     capabilities:
diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/extContrailCP/extContrailCP.yml b/catalog-be/src/main/resources/import/tosca/heat-types/extContrailCP/extContrailCP.yml
index e97c7ae674..be37efbf13 100644
--- a/catalog-be/src/main/resources/import/tosca/heat-types/extContrailCP/extContrailCP.yml
+++ b/catalog-be/src/main/resources/import/tosca/heat-types/extContrailCP/extContrailCP.yml
@@ -8,25 +8,25 @@ node_types:
         type: list
         description: An ordered list of static routes to be added to this interface
         required: false
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.network.contrail.port.StaticRoute
       virtual_network:
         type: string
         description: Virtual Network for this interface
         required: true
-        status: SUPPORTED
+        status: supported
       static_route:
         type: boolean
         description: Static route enabled
         required: false
         default: false
-        status: SUPPORTED
+        status: supported
       allowed_address_pairs:
         type: list
         description: List of allowed address pair for this interface
         required: false
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.network.contrail.AddressPair
       shared_ip:
@@ -34,17 +34,17 @@ node_types:
         description: Shared ip enabled
         required: false
         default: false
-        status: SUPPORTED
+        status: supported
       ip_address:
         type: string
         description: IP for this interface
         required: false
-        status: SUPPORTED
+        status: supported
       interface_type:
         type: string
         description: Interface type
         required: true
-        status: SUPPORTED
+        status: supported
         constraints:
         - valid_values:
           - management
@@ -56,4 +56,4 @@ node_types:
       fq_name:
         type: string
         description: fq_name
-        status: SUPPORTED
+        status: supported
diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/extNeutronCP/extNeutronCP.yml b/catalog-be/src/main/resources/import/tosca/heat-types/extNeutronCP/extNeutronCP.yml
index ad946fc8bd..63a4bcfb96 100644
--- a/catalog-be/src/main/resources/import/tosca/heat-types/extNeutronCP/extNeutronCP.yml
+++ b/catalog-be/src/main/resources/import/tosca/heat-types/extNeutronCP/extNeutronCP.yml
@@ -9,29 +9,29 @@ node_types:
         type: boolean
         description: Flag to enable/disable port security on the network
         required: false
-        status: SUPPORTED
+        status: supported
       device_id:
         type: string
         description: Device ID of this port
         required: false
-        status: SUPPORTED
+        status: supported
       qos_policy:
         type: string
         description: The name or ID of QoS policy to attach to this network
         required: false
-        status: SUPPORTED
+        status: supported
       allowed_address_pairs:
         type: list
         description: Additional MAC/IP address pairs allowed to pass through the port
         required: false
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.network.AddressPair
       binding:vnic_type:
         type: string
         description: The vnic type to be bound on the neutron port
         required: false
-        status: SUPPORTED
+        status: supported
         constraints:
         - valid_values:
           - macvtap
@@ -43,25 +43,25 @@ node_types:
         required: false
         default: {
           }
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       device_owner:
         type: string
         description: Name of the network owning the port
         required: false
-        status: SUPPORTED
+        status: supported
       network:
         type: string
         description: Network this port belongs to
         required: false
-        status: SUPPORTED
+        status: supported
       replacement_policy:
         type: string
         description: Policy on how to respond to a stack-update for this resource
         required: false
         default: AUTO
-        status: SUPPORTED
+        status: supported
         constraints:
         - valid_values:
           - REPLACE_ALWAYS
@@ -70,60 +70,60 @@ node_types:
         type: list
         description: List of security group names or IDs
         required: false
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       fixed_ips:
         type: list
         description: Desired IPs for this port
         required: false
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
       mac_address:
         type: string
         description: MAC address to give to this port
         required: false
-        status: SUPPORTED
+        status: supported
       admin_state_up:
         type: boolean
         description: A boolean value specifying the administrative status of the network
         required: false
         default: true
-        status: SUPPORTED
+        status: supported
       name:
         type: string
         description: A symbolic name for this port
         required: false
-        status: SUPPORTED
+        status: supported
     attributes:
       # copied from the org.openecomp.resource.cp.nodes.heat.network.neutron.Port type
       tenant_id:
         type: string
         description: Tenant owning the port
-        status: SUPPORTED
+        status: supported
       network_id:
         type: string
         description: Unique identifier for the network owning the port
-        status: SUPPORTED
+        status: supported
       qos_policy_id:
         type: string
         description: The QoS policy ID attached to this network
-        status: SUPPORTED
+        status: supported
       show:
         type: string
         description: Detailed information about resource
-        status: SUPPORTED
+        status: supported
       subnets:
         type: list
         description: Subnets of this network
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       status:
         type: string
         description: The status of the network
-        status: SUPPORTED
+        status: supported
     capabilities:
       # copied from the org.openecomp.resource.cp.nodes.heat.network.neutron.Port type
       attachment:
diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/extVirtualMachineInterfaceCP/extVirtualMachineInterfaceCP.yml b/catalog-be/src/main/resources/import/tosca/heat-types/extVirtualMachineInterfaceCP/extVirtualMachineInterfaceCP.yml
index 6816e7b299..11b12249f6 100644
--- a/catalog-be/src/main/resources/import/tosca/heat-types/extVirtualMachineInterfaceCP/extVirtualMachineInterfaceCP.yml
+++ b/catalog-be/src/main/resources/import/tosca/heat-types/extVirtualMachineInterfaceCP/extVirtualMachineInterfaceCP.yml
@@ -7,55 +7,55 @@ node_types:
       name:
         description: Virtual Machine Interface name
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
       security_group_refs:
         description: List of security groups.
         type: list
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
           required: false
       virtual_network_refs:
         description: List of virtual networks.
         type: list
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
           required: false
       virtual_machine_interface_properties:
         description: virtual machine interface properties.
         type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.interface.Properties
-        status: SUPPORTED
+        status: supported
         required: false
       port_tuple_refs:
         description: List of port tuples.
         type: list
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
           required: false
       virtual_machine_interface_mac_addresses:
         description: List of mac addresses.
         type: list
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
           required: false
       virtual_machine_interface_allowed_address_pairs:
         description: Virtual Machine Interface allowed address pairs.
         type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs
-        status: SUPPORTED
+        status: supported
         required: false
     attributes:
       fq_name:
         description: The FQ name of the Virtual Network.
         type: string
-        status: SUPPORTED
+        status: supported
       show:
         description: All attributes.
         type: string
-        status: SUPPORTED
+        status: supported
     capabilities:
       binding:
         type: tosca.capabilities.network.Bindable
diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/forwardingPath/forwardingPath.yml b/catalog-be/src/main/resources/import/tosca/heat-types/forwardingPath/forwardingPath.yml
index fe1be7f1f2..33f5a76f95 100644
--- a/catalog-be/src/main/resources/import/tosca/heat-types/forwardingPath/forwardingPath.yml
+++ b/catalog-be/src/main/resources/import/tosca/heat-types/forwardingPath/forwardingPath.yml
@@ -6,7 +6,7 @@ node_types:
       target_range:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           description: Identifier of the reciever port of the VNF or the service
           type: integer
@@ -14,7 +14,7 @@ node_types:
         type: string
         description: protocol type that runs on the link
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - forwarder:
         capability: org.openecomp.capabilities.Forwarder
diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/globalCompute/globalCompute.yml b/catalog-be/src/main/resources/import/tosca/heat-types/globalCompute/globalCompute.yml
index 4ac9950ee2..5facec997e 100644
--- a/catalog-be/src/main/resources/import/tosca/heat-types/globalCompute/globalCompute.yml
+++ b/catalog-be/src/main/resources/import/tosca/heat-types/globalCompute/globalCompute.yml
@@ -12,31 +12,31 @@ node_types:
             description: Unit of the metric value
             required: true
             default: GB
-            status: SUPPORTED
+            status: supported
           name:
             type: string
             description: Ceilometer metric type name to monitor. (The name ceilometer is using)
             required: true
             default: disk.ephemeral.size
-            status: SUPPORTED
+            status: supported
           description:
             type: string
             description: Description of the metric
             required: false
             default: Size of ephemeral disk
-            status: SUPPORTED
+            status: supported
           type:
             type: string
             description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
             required: true
             default: Gauge
-            status: SUPPORTED
+            status: supported
           category:
             type: string
             description: Category of the metric, for an example, compute, disk, network, storage and etc.
             required: false
             default: compute
-            status: SUPPORTED
+            status: supported
         occurrences:
         - 1
         - UNBOUNDED
@@ -49,31 +49,31 @@ node_types:
             description: Unit of the metric value
             required: true
             default: instance
-            status: SUPPORTED
+            status: supported
           name:
             type: string
             description: Ceilometer metric type name to monitor. (The name ceilometer is using)
             required: true
             default: instance
-            status: SUPPORTED
+            status: supported
           description:
             type: string
             description: Description of the metric
             required: false
             default: Existence of instance
-            status: SUPPORTED
+            status: supported
           type:
             type: string
             description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
             required: true
             default: Gauge
-            status: SUPPORTED
+            status: supported
           category:
             type: string
             description: Category of the metric, for an example, compute, disk, network, storage and etc.
             required: false
             default: compute
-            status: SUPPORTED
+            status: supported
         occurrences:
         - 1
         - UNBOUNDED
@@ -86,31 +86,31 @@ node_types:
             description: Unit of the metric value
             required: true
             default: MB
-            status: SUPPORTED
+            status: supported
           name:
             type: string
             description: Ceilometer metric type name to monitor. (The name ceilometer is using)
             required: true
             default: memory
-            status: SUPPORTED
+            status: supported
           description:
             type: string
             description: Description of the metric
             required: false
             default: Volume of RAM allocated to the instance
-            status: SUPPORTED
+            status: supported
           type:
             type: string
             description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
             required: true
             default: Gauge
-            status: SUPPORTED
+            status: supported
           category:
             type: string
             description: Category of the metric, for an example, compute, disk, network, storage and etc.
             required: false
             default: compute
-            status: SUPPORTED
+            status: supported
         occurrences:
         - 1
         - UNBOUNDED
@@ -123,31 +123,31 @@ node_types:
             description: Unit of the metric value
             required: true
             default: count/s
-            status: SUPPORTED
+            status: supported
           name:
             type: string
             description: Ceilometer metric type name to monitor. (The name ceilometer is using)
             required: true
             default: disk.iops
-            status: SUPPORTED
+            status: supported
           description:
             type: string
             description: Description of the metric
             required: false
             default: Average disk iops
-            status: SUPPORTED
+            status: supported
           type:
             type: string
             description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
             required: true
             default: Gauge
-            status: SUPPORTED
+            status: supported
           category:
             type: string
             description: Category of the metric, for an example, compute, disk, network, storage and etc.
             required: false
             default: disk
-            status: SUPPORTED
+            status: supported
         occurrences:
         - 1
         - UNBOUNDED
@@ -160,31 +160,31 @@ node_types:
             description: Unit of the metric value
             required: true
             default: request
-            status: SUPPORTED
+            status: supported
           name:
             type: string
             description: Ceilometer metric type name to monitor. (The name ceilometer is using)
             required: true
             default: disk.device.read.requests
-            status: SUPPORTED
+            status: supported
           description:
             type: string
             description: Description of the metric
             required: false
             default: Number of read requests
-            status: SUPPORTED
+            status: supported
           type:
             type: string
             description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
             required: true
             default: Cumulative
-            status: SUPPORTED
+            status: supported
           category:
             type: string
             description: Category of the metric, for an example, compute, disk, network, storage and etc.
             required: false
             default: disk
-            status: SUPPORTED
+            status: supported
         occurrences:
         - 1
         - UNBOUNDED
@@ -197,31 +197,31 @@ node_types:
             description: Unit of the metric value
             required: true
             default: ns
-            status: SUPPORTED
+            status: supported
           name:
             type: string
             description: Ceilometer metric type name to monitor. (The name ceilometer is using)
             required: true
             default: cpu.delta
-            status: SUPPORTED
+            status: supported
           description:
             type: string
             description: Description of the metric
             required: false
             default: CPU time used since previous datapoint
-            status: SUPPORTED
+            status: supported
           type:
             type: string
             description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
             required: true
             default: Delta
-            status: SUPPORTED
+            status: supported
           category:
             type: string
             description: Category of the metric, for an example, compute, disk, network, storage and etc.
             required: false
             default: compute
-            status: SUPPORTED
+            status: supported
         occurrences:
         - 1
         - UNBOUNDED
@@ -234,31 +234,31 @@ node_types:
             description: Unit of the metric value
             required: true
             default: B
-            status: SUPPORTED
+            status: supported
           name:
             type: string
             description: Ceilometer metric type name to monitor. (The name ceilometer is using)
             required: true
             default: disk.capacity
-            status: SUPPORTED
+            status: supported
           description:
             type: string
             description: Description of the metric
             required: false
             default: The amount of disk that the instance can see
-            status: SUPPORTED
+            status: supported
           type:
             type: string
             description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
             required: true
             default: Gauge
-            status: SUPPORTED
+            status: supported
           category:
             type: string
             description: Category of the metric, for an example, compute, disk, network, storage and etc.
             required: false
             default: disk
-            status: SUPPORTED
+            status: supported
         occurrences:
         - 1
         - UNBOUNDED
@@ -271,31 +271,31 @@ node_types:
             description: Unit of the metric value
             required: true
             default: B
-            status: SUPPORTED
+            status: supported
           name:
             type: string
             description: Ceilometer metric type name to monitor. (The name ceilometer is using)
             required: true
             default: disk.device.read.bytes
-            status: SUPPORTED
+            status: supported
           description:
             type: string
             description: Description of the metric
             required: false
             default: Volume of reads
-            status: SUPPORTED
+            status: supported
           type:
             type: string
             description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
             required: true
             default: Cumulative
-            status: SUPPORTED
+            status: supported
           category:
             type: string
             description: Category of the metric, for an example, compute, disk, network, storage and etc.
             required: false
             default: disk
-            status: SUPPORTED
+            status: supported
         occurrences:
         - 1
         - UNBOUNDED
@@ -308,31 +308,31 @@ node_types:
             description: Unit of the metric value
             required: true
             default: B
-            status: SUPPORTED
+            status: supported
           name:
             type: string
             description: Ceilometer metric type name to monitor. (The name ceilometer is using)
             required: true
             default: disk.write.bytes
-            status: SUPPORTED
+            status: supported
           description:
             type: string
             description: Description of the metric
             required: false
             default: Volume of writes
-            status: SUPPORTED
+            status: supported
           type:
             type: string
             description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
             required: true
             default: Cumulative
-            status: SUPPORTED
+            status: supported
           category:
             type: string
             description: Category of the metric, for an example, compute, disk, network, storage and etc.
             required: false
             default: compute
-            status: SUPPORTED
+            status: supported
         occurrences:
         - 1
         - UNBOUNDED
@@ -345,31 +345,31 @@ node_types:
             description: Unit of the metric value
             required: true
             default: ms
-            status: SUPPORTED
+            status: supported
           name:
             type: string
             description: Ceilometer metric type name to monitor. (The name ceilometer is using)
             required: true
             default: disk.latency
-            status: SUPPORTED
+            status: supported
           description:
             type: string
             description: Description of the metric
             required: false
             default: Average disk latency
-            status: SUPPORTED
+            status: supported
           type:
             type: string
             description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
             required: true
             default: Gauge
-            status: SUPPORTED
+            status: supported
           category:
             type: string
             description: Category of the metric, for an example, compute, disk, network, storage and etc.
             required: false
             default: disk
-            status: SUPPORTED
+            status: supported
         occurrences:
         - 1
         - UNBOUNDED
@@ -382,31 +382,31 @@ node_types:
             description: Unit of the metric value
             required: true
             default: B/s
-            status: SUPPORTED
+            status: supported
           name:
             type: string
             description: Ceilometer metric type name to monitor. (The name ceilometer is using)
             required: true
             default: disk.device.read.bytes.rate
-            status: SUPPORTED
+            status: supported
           description:
             type: string
             description: Description of the metric
             required: false
             default: Average rate of reads
-            status: SUPPORTED
+            status: supported
           type:
             type: string
             description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
             required: true
             default: Gauge
-            status: SUPPORTED
+            status: supported
           category:
             type: string
             description: Category of the metric, for an example, compute, disk, network, storage and etc.
             required: false
             default: disk
-            status: SUPPORTED
+            status: supported
         occurrences:
         - 1
         - UNBOUNDED
@@ -419,31 +419,31 @@ node_types:
             description: Unit of the metric value
             required: true
             default: B
-            status: SUPPORTED
+            status: supported
           name:
             type: string
             description: Ceilometer metric type name to monitor. (The name ceilometer is using)
             required: true
             default: disk.usage
-            status: SUPPORTED
+            status: supported
           description:
             type: string
             description: Description of the metric
             required: false
             default: The physical size in bytes of the image container on the host
-            status: SUPPORTED
+            status: supported
           type:
             type: string
             description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
             required: true
             default: Gauge
-            status: SUPPORTED
+            status: supported
           category:
             type: string
             description: Category of the metric, for an example, compute, disk, network, storage and etc.
             required: false
             default: disk
-            status: SUPPORTED
+            status: supported
         occurrences:
         - 1
         - UNBOUNDED
@@ -456,31 +456,31 @@ node_types:
             description: Unit of the metric value
             required: true
             default: '%'
-            status: SUPPORTED
+            status: supported
           name:
             type: string
             description: Ceilometer metric type name to monitor. (The name ceilometer is using)
             required: true
             default: cpu_util
-            status: SUPPORTED
+            status: supported
           description:
             type: string
             description: Description of the metric
             required: false
             default: Average CPU utilization
-            status: SUPPORTED
+            status: supported
           type:
             type: string
             description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
             required: true
             default: Gauge
-            status: SUPPORTED
+            status: supported
           category:
             type: string
             description: Category of the metric, for an example, compute, disk, network, storage and etc.
             required: false
             default: compute
-            status: SUPPORTED
+            status: supported
         occurrences:
         - 1
         - UNBOUNDED
@@ -493,31 +493,31 @@ node_types:
             description: Unit of the metric value
             required: true
             default: B
-            status: SUPPORTED
+            status: supported
           name:
             type: string
             description: Ceilometer metric type name to monitor. (The name ceilometer is using)
             required: true
             default: disk.device.allocation
-            status: SUPPORTED
+            status: supported
           description:
             type: string
             description: Description of the metric
             required: false
             default: The amount of disk per device occupied by the instance on the host machine
-            status: SUPPORTED
+            status: supported
           type:
             type: string
             description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
             required: true
             default: Gauge
-            status: SUPPORTED
+            status: supported
           category:
             type: string
             description: Category of the metric, for an example, compute, disk, network, storage and etc.
             required: false
             default: disk
-            status: SUPPORTED
+            status: supported
         occurrences:
         - 1
         - UNBOUNDED
@@ -530,31 +530,31 @@ node_types:
             description: Unit of the metric value
             required: true
             default: request/s
-            status: SUPPORTED
+            status: supported
           name:
             type: string
             description: Ceilometer metric type name to monitor. (The name ceilometer is using)
             required: true
             default: disk.write.requests.rate
-            status: SUPPORTED
+            status: supported
           description:
             type: string
             description: Description of the metric
             required: false
             default: Average rate of write requests
-            status: SUPPORTED
+            status: supported
           type:
             type: string
             description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
             required: true
             default: Gauge
-            status: SUPPORTED
+            status: supported
           category:
             type: string
             description: Category of the metric, for an example, compute, disk, network, storage and etc.
             required: false
             default: compute
-            status: SUPPORTED
+            status: supported
         occurrences:
         - 1
         - UNBOUNDED
@@ -567,31 +567,31 @@ node_types:
             description: Unit of the metric value
             required: true
             default: B/s
-            status: SUPPORTED
+            status: supported
           name:
             type: string
             description: Ceilometer metric type name to monitor. (The name ceilometer is using)
             required: true
             default: disk.write.bytes.rate
-            status: SUPPORTED
+            status: supported
           description:
             type: string
             description: Description of the metric
             required: false
             default: Average rate of writes
-            status: SUPPORTED
+            status: supported
           type:
             type: string
             description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
             required: true
             default: Gauge
-            status: SUPPORTED
+            status: supported
           category:
             type: string
             description: Category of the metric, for an example, compute, disk, network, storage and etc.
             required: false
             default: compute
-            status: SUPPORTED
+            status: supported
         occurrences:
         - 1
         - UNBOUNDED
@@ -604,31 +604,31 @@ node_types:
             description: Unit of the metric value
             required: true
             default: ms
-            status: SUPPORTED
+            status: supported
           name:
             type: string
             description: Ceilometer metric type name to monitor. (The name ceilometer is using)
             required: true
             default: disk.device.latency
-            status: SUPPORTED
+            status: supported
           description:
             type: string
             description: Description of the metric
             required: false
             default: Average disk latency per device
-            status: SUPPORTED
+            status: supported
           type:
             type: string
             description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
             required: true
             default: Gauge
-            status: SUPPORTED
+            status: supported
           category:
             type: string
             description: Category of the metric, for an example, compute, disk, network, storage and etc.
             required: false
             default: disk
-            status: SUPPORTED
+            status: supported
         occurrences:
         - 1
         - UNBOUNDED
@@ -641,31 +641,31 @@ node_types:
             description: Unit of the metric value
             required: true
             default: ns
-            status: SUPPORTED
+            status: supported
           name:
             type: string
             description: Ceilometer metric type name to monitor. (The name ceilometer is using)
             required: true
             default: cpu
-            status: SUPPORTED
+            status: supported
           description:
             type: string
             description: Description of the metric
             required: false
             default: CPU time used
-            status: SUPPORTED
+            status: supported
           type:
             type: string
             description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
             required: true
             default: Cumulative
-            status: SUPPORTED
+            status: supported
           category:
             type: string
             description: Category of the metric, for an example, compute, disk, network, storage and etc.
             required: false
             default: compute
-            status: SUPPORTED
+            status: supported
         occurrences:
         - 1
         - UNBOUNDED
@@ -678,31 +678,31 @@ node_types:
             description: Unit of the metric value
             required: true
             default: request
-            status: SUPPORTED
+            status: supported
           name:
             type: string
             description: Ceilometer metric type name to monitor. (The name ceilometer is using)
             required: true
             default: disk.device.write.requests
-            status: SUPPORTED
+            status: supported
           description:
             type: string
             description: Description of the metric
             required: false
             default: Number of write requests
-            status: SUPPORTED
+            status: supported
           type:
             type: string
             description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
             required: true
             default: Cumulative
-            status: SUPPORTED
+            status: supported
           category:
             type: string
             description: Category of the metric, for an example, compute, disk, network, storage and etc.
             required: false
             default: disk
-            status: SUPPORTED
+            status: supported
         occurrences:
         - 1
         - UNBOUNDED
@@ -715,31 +715,31 @@ node_types:
             description: Unit of the metric value
             required: true
             default: B
-            status: SUPPORTED
+            status: supported
           name:
             type: string
             description: Ceilometer metric type name to monitor. (The name ceilometer is using)
             required: true
             default: disk.device.write.bytes
-            status: SUPPORTED
+            status: supported
           description:
             type: string
             description: Description of the metric
             required: false
             default: Volume of writes
-            status: SUPPORTED
+            status: supported
           type:
             type: string
             description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
             required: true
             default: Cumulative
-            status: SUPPORTED
+            status: supported
           category:
             type: string
             description: Category of the metric, for an example, compute, disk, network, storage and etc.
             required: false
             default: disk
-            status: SUPPORTED
+            status: supported
         occurrences:
         - 1
         - UNBOUNDED
@@ -752,31 +752,31 @@ node_types:
             description: Unit of the metric value
             required: true
             default: request
-            status: SUPPORTED
+            status: supported
           name:
             type: string
             description: Ceilometer metric type name to monitor. (The name ceilometer is using)
             required: true
             default: disk.read.requests
-            status: SUPPORTED
+            status: supported
           description:
             type: string
             description: Description of the metric
             required: false
             default: Number of read requests
-            status: SUPPORTED
+            status: supported
           type:
             type: string
             description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
             required: true
             default: Cumulative
-            status: SUPPORTED
+            status: supported
           category:
             type: string
             description: Category of the metric, for an example, compute, disk, network, storage and etc.
             required: false
             default: compute
-            status: SUPPORTED
+            status: supported
         occurrences:
         - 1
         - UNBOUNDED
@@ -789,31 +789,31 @@ node_types:
             description: Unit of the metric value
             required: true
             default: GB
-            status: SUPPORTED
+            status: supported
           name:
             type: string
             description: Ceilometer metric type name to monitor. (The name ceilometer is using)
             required: true
             default: disk.root.size
-            status: SUPPORTED
+            status: supported
           description:
             type: string
             description: Description of the metric
             required: false
             default: Size of root disk
-            status: SUPPORTED
+            status: supported
           type:
             type: string
             description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
             required: true
             default: Gauge
-            status: SUPPORTED
+            status: supported
           category:
             type: string
             description: Category of the metric, for an example, compute, disk, network, storage and etc.
             required: false
             default: compute
-            status: SUPPORTED
+            status: supported
         occurrences:
         - 1
         - UNBOUNDED
@@ -826,31 +826,31 @@ node_types:
             description: Unit of the metric value
             required: true
             default: B/s
-            status: SUPPORTED
+            status: supported
           name:
             type: string
             description: Ceilometer metric type name to monitor. (The name ceilometer is using)
             required: true
             default: disk.device.write.bytes.rate
-            status: SUPPORTED
+            status: supported
           description:
             type: string
             description: Description of the metric
             required: false
             default: Average rate of writes
-            status: SUPPORTED
+            status: supported
           type:
             type: string
             description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
             required: true
             default: Gauge
-            status: SUPPORTED
+            status: supported
           category:
             type: string
             description: Category of the metric, for an example, compute, disk, network, storage and etc.
             required: false
             default: disk
-            status: SUPPORTED
+            status: supported
         occurrences:
         - 1
         - UNBOUNDED
@@ -863,31 +863,31 @@ node_types:
             description: Unit of the metric value
             required: true
             default: vcpu
-            status: SUPPORTED
+            status: supported
           name:
             type: string
             description: Ceilometer metric type name to monitor. (The name ceilometer is using)
             required: true
             default: vcpus
-            status: SUPPORTED
+            status: supported
           description:
             type: string
             description: Description of the metric
             required: false
             default: Number of virtual CPUs allocated to the instance
-            status: SUPPORTED
+            status: supported
           type:
             type: string
             description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
             required: true
             default: Gauge
-            status: SUPPORTED
+            status: supported
           category:
             type: string
             description: Category of the metric, for an example, compute, disk, network, storage and etc.
             required: false
             default: compute
-            status: SUPPORTED
+            status: supported
         occurrences:
         - 1
         - UNBOUNDED
@@ -900,31 +900,31 @@ node_types:
             description: Unit of the metric value
             required: true
             default: count/s
-            status: SUPPORTED
+            status: supported
           name:
             type: string
             description: Ceilometer metric type name to monitor. (The name ceilometer is using)
             required: true
             default: disk.device.iops
-            status: SUPPORTED
+            status: supported
           description:
             type: string
             description: Description of the metric
             required: false
             default: Average disk iops per device
-            status: SUPPORTED
+            status: supported
           type:
             type: string
             description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
             required: true
             default: Gauge
-            status: SUPPORTED
+            status: supported
           category:
             type: string
             description: Category of the metric, for an example, compute, disk, network, storage and etc.
             required: false
             default: disk
-            status: SUPPORTED
+            status: supported
         occurrences:
         - 1
         - UNBOUNDED
@@ -937,31 +937,31 @@ node_types:
             description: Unit of the metric value
             required: true
             default: B
-            status: SUPPORTED
+            status: supported
           name:
             type: string
             description: Ceilometer metric type name to monitor. (The name ceilometer is using)
             required: true
             default: disk.device.usage
-            status: SUPPORTED
+            status: supported
           description:
             type: string
             description: Description of the metric
             required: false
             default: The physical size in bytes of the image container on the host per device
-            status: SUPPORTED
+            status: supported
           type:
             type: string
             description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
             required: true
             default: Gauge
-            status: SUPPORTED
+            status: supported
           category:
             type: string
             description: Category of the metric, for an example, compute, disk, network, storage and etc.
             required: false
             default: disk
-            status: SUPPORTED
+            status: supported
         occurrences:
         - 1
         - UNBOUNDED
@@ -974,31 +974,31 @@ node_types:
             description: Unit of the metric value
             required: true
             default: request/s
-            status: SUPPORTED
+            status: supported
           name:
             type: string
             description: Ceilometer metric type name to monitor. (The name ceilometer is using)
             required: true
             default: disk.device.read.requests.rate
-            status: SUPPORTED
+            status: supported
           description:
             type: string
             description: Description of the metric
             required: false
             default: Average rate of read requests
-            status: SUPPORTED
+            status: supported
           type:
             type: string
             description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
             required: true
             default: Gauge
-            status: SUPPORTED
+            status: supported
           category:
             type: string
             description: Category of the metric, for an example, compute, disk, network, storage and etc.
             required: false
             default: disk
-            status: SUPPORTED
+            status: supported
         occurrences:
         - 1
         - UNBOUNDED
@@ -1011,31 +1011,31 @@ node_types:
             description: Unit of the metric value
             required: true
             default: request/s
-            status: SUPPORTED
+            status: supported
           name:
             type: string
             description: Ceilometer metric type name to monitor. (The name ceilometer is using)
             required: true
             default: disk.device.write.requests.rate
-            status: SUPPORTED
+            status: supported
           description:
             type: string
             description: Description of the metric
             required: false
             default: Average rate of write requests
-            status: SUPPORTED
+            status: supported
           type:
             type: string
             description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
             required: true
             default: Gauge
-            status: SUPPORTED
+            status: supported
           category:
             type: string
             description: Category of the metric, for an example, compute, disk, network, storage and etc.
             required: false
             default: disk
-            status: SUPPORTED
+            status: supported
         occurrences:
         - 1
         - UNBOUNDED
@@ -1048,31 +1048,31 @@ node_types:
             description: Unit of the metric value
             required: true
             default: B
-            status: SUPPORTED
+            status: supported
           name:
             type: string
             description: Ceilometer metric type name to monitor. (The name ceilometer is using)
             required: true
             default: disk.allocation
-            status: SUPPORTED
+            status: supported
           description:
             type: string
             description: Description of the metric
             required: false
             default: The amount of disk occupied by the instance on the host machine
-            status: SUPPORTED
+            status: supported
           type:
             type: string
             description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
             required: true
             default: Gauge
-            status: SUPPORTED
+            status: supported
           category:
             type: string
             description: Category of the metric, for an example, compute, disk, network, storage and etc.
             required: false
             default: disk
-            status: SUPPORTED
+            status: supported
         occurrences:
         - 1
         - UNBOUNDED
@@ -1085,31 +1085,31 @@ node_types:
             description: Unit of the metric value
             required: true
             default: B/s
-            status: SUPPORTED
+            status: supported
           name:
             type: string
             description: Ceilometer metric type name to monitor. (The name ceilometer is using)
             required: true
             default: disk.read.bytes.rate
-            status: SUPPORTED
+            status: supported
           description:
             type: string
             description: Description of the metric
             required: false
             default: Average rate of reads
-            status: SUPPORTED
+            status: supported
           type:
             type: string
             description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
             required: true
             default: Gauge
-            status: SUPPORTED
+            status: supported
           category:
             type: string
             description: Category of the metric, for an example, compute, disk, network, storage and etc.
             required: false
             default: compute
-            status: SUPPORTED
+            status: supported
         occurrences:
         - 1
         - UNBOUNDED
@@ -1122,31 +1122,31 @@ node_types:
             description: Unit of the metric value
             required: true
             default: B
-            status: SUPPORTED
+            status: supported
           name:
             type: string
             description: Ceilometer metric type name to monitor. (The name ceilometer is using)
             required: true
             default: disk.read.bytes
-            status: SUPPORTED
+            status: supported
           description:
             type: string
             description: Description of the metric
             required: false
             default: Volume of reads
-            status: SUPPORTED
+            status: supported
           type:
             type: string
             description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
             required: true
             default: Cumulative
-            status: SUPPORTED
+            status: supported
           category:
             type: string
             description: Category of the metric, for an example, compute, disk, network, storage and etc.
             required: false
             default: compute
-            status: SUPPORTED
+            status: supported
         occurrences:
         - 1
         - UNBOUNDED
@@ -1159,31 +1159,31 @@ node_types:
             description: Unit of the metric value
             required: true
             default: MB
-            status: SUPPORTED
+            status: supported
           name:
             type: string
             description: Ceilometer metric type name to monitor. (The name ceilometer is using)
             required: true
             default: memory.usage
-            status: SUPPORTED
+            status: supported
           description:
             type: string
             description: Description of the metric
             required: false
             default: Volume of RAM used by the instance from the amount of its allocated memory
-            status: SUPPORTED
+            status: supported
           type:
             type: string
             description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
             required: true
             default: Gauge
-            status: SUPPORTED
+            status: supported
           category:
             type: string
             description: Category of the metric, for an example, compute, disk, network, storage and etc.
             required: false
             default: compute
-            status: SUPPORTED
+            status: supported
         occurrences:
         - 1
         - UNBOUNDED
@@ -1196,31 +1196,31 @@ node_types:
             description: Unit of the metric value
             required: true
             default: B
-            status: SUPPORTED
+            status: supported
           name:
             type: string
             description: Ceilometer metric type name to monitor. (The name ceilometer is using)
             required: true
             default: disk.device.capacity
-            status: SUPPORTED
+            status: supported
           description:
             type: string
             description: Description of the metric
             required: false
             default: The amount of disk per device that the instance can see
-            status: SUPPORTED
+            status: supported
           type:
             type: string
             description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
             required: true
             default: Gauge
-            status: SUPPORTED
+            status: supported
           category:
             type: string
             description: Category of the metric, for an example, compute, disk, network, storage and etc.
             required: false
             default: disk
-            status: SUPPORTED
+            status: supported
         occurrences:
         - 1
         - UNBOUNDED
@@ -1233,31 +1233,31 @@ node_types:
             description: Unit of the metric value
             required: true
             default: MB
-            status: SUPPORTED
+            status: supported
           name:
             type: string
             description: Ceilometer metric type name to monitor. (The name ceilometer is using)
             required: true
             default: memory.resident
-            status: SUPPORTED
+            status: supported
           description:
             type: string
             description: Description of the metric
             required: false
             default: Volume of RAM used by the instance on the physical machine
-            status: SUPPORTED
+            status: supported
           type:
             type: string
             description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
             required: true
             default: Gauge
-            status: SUPPORTED
+            status: supported
           category:
             type: string
             description: Category of the metric, for an example, compute, disk, network, storage and etc.
             required: false
             default: compute
-            status: SUPPORTED
+            status: supported
         occurrences:
         - 1
         - UNBOUNDED
@@ -1270,31 +1270,31 @@ node_types:
             description: Unit of the metric value
             required: true
             default: request
-            status: SUPPORTED
+            status: supported
           name:
             type: string
             description: Ceilometer metric type name to monitor. (The name ceilometer is using)
             required: true
             default: disk.write.requests
-            status: SUPPORTED
+            status: supported
           description:
             type: string
             description: Description of the metric
             required: false
             default: Number of write requests
-            status: SUPPORTED
+            status: supported
           type:
             type: string
             description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
             required: true
             default: Cumulative
-            status: SUPPORTED
+            status: supported
           category:
             type: string
             description: Category of the metric, for an example, compute, disk, network, storage and etc.
             required: false
             default: compute
-            status: SUPPORTED
+            status: supported
         occurrences:
         - 1
         - UNBOUNDED
diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/globalPort/globalPort.yml b/catalog-be/src/main/resources/import/tosca/heat-types/globalPort/globalPort.yml
index 0ff4d7823c..a05c97361b 100644
--- a/catalog-be/src/main/resources/import/tosca/heat-types/globalPort/globalPort.yml
+++ b/catalog-be/src/main/resources/import/tosca/heat-types/globalPort/globalPort.yml
@@ -57,31 +57,31 @@ node_types:
             description: Unit of the metric value
             required: true
             default: packet/s
-            status: SUPPORTED
+            status: supported
           name:
             type: string
             description: Ceilometer metric type name to monitor. (The name ceilometer is using)
             required: true
             default: network.incoming.packets.rate
-            status: SUPPORTED
+            status: supported
           description:
             type: string
             description: Description of the metric
             required: false
             default: Average rate of incoming packets
-            status: SUPPORTED
+            status: supported
           type:
             type: string
             description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
             required: true
             default: Gauge
-            status: SUPPORTED
+            status: supported
           category:
             type: string
             description: Category of the metric, for an example, compute, disk, network, storage and etc.
             required: false
             default: network
-            status: SUPPORTED
+            status: supported
         occurrences:
         - 1
         - UNBOUNDED
@@ -96,31 +96,31 @@ node_types:
             description: Unit of the metric value
             required: true
             default: B
-            status: SUPPORTED
+            status: supported
           name:
             type: string
             description: Ceilometer metric type name to monitor. (The name ceilometer is using)
             required: true
             default: network.outgoing.bytes
-            status: SUPPORTED
+            status: supported
           description:
             type: string
             description: Description of the metric
             required: false
             default: Number of outgoing bytes
-            status: SUPPORTED
+            status: supported
           type:
             type: string
             description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
             required: true
             default: Cumulative
-            status: SUPPORTED
+            status: supported
           category:
             type: string
             description: Category of the metric, for an example, compute, disk, network, storage and etc.
             required: false
             default: network
-            status: SUPPORTED
+            status: supported
         occurrences:
         - 1
         - UNBOUNDED
@@ -133,31 +133,31 @@ node_types:
             description: Unit of the metric value
             required: true
             default: packet/s
-            status: SUPPORTED
+            status: supported
           name:
             type: string
             description: Ceilometer metric type name to monitor. (The name ceilometer is using)
             required: true
             default: network.outgoing.packets.rate
-            status: SUPPORTED
+            status: supported
           description:
             type: string
             description: Description of the metric
             required: false
             default: Average rate of outgoing packets
-            status: SUPPORTED
+            status: supported
           type:
             type: string
             description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
             required: true
             default: Gauge
-            status: SUPPORTED
+            status: supported
           category:
             type: string
             description: Category of the metric, for an example, compute, disk, network, storage and etc.
             required: false
             default: network
-            status: SUPPORTED
+            status: supported
         occurrences:
         - 1
         - UNBOUNDED
@@ -170,31 +170,31 @@ node_types:
             description: Unit of the metric value
             required: true
             default: packet
-            status: SUPPORTED
+            status: supported
           name:
             type: string
             description: Ceilometer metric type name to monitor. (The name ceilometer is using)
             required: true
             default: network.outpoing.packets
-            status: SUPPORTED
+            status: supported
           description:
             type: string
             description: Description of the metric
             required: false
             default: Number of outgoing packets
-            status: SUPPORTED
+            status: supported
           type:
             type: string
             description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
             required: true
             default: Cumulative
-            status: SUPPORTED
+            status: supported
           category:
             type: string
             description: Category of the metric, for an example, compute, disk, network, storage and etc.
             required: false
             default: network
-            status: SUPPORTED
+            status: supported
         occurrences:
         - 1
         - UNBOUNDED
@@ -207,31 +207,31 @@ node_types:
             description: Unit of the metric value
             required: true
             default: B/s
-            status: SUPPORTED
+            status: supported
           name:
             type: string
             description: Ceilometer metric type name to monitor. (The name ceilometer is using)
             required: true
             default: network.incoming.bytes.rate
-            status: SUPPORTED
+            status: supported
           description:
             type: string
             description: Description of the metric
             required: false
             default: Average rate of incoming bytes
-            status: SUPPORTED
+            status: supported
           type:
             type: string
             description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
             required: true
             default: Gauge
-            status: SUPPORTED
+            status: supported
           category:
             type: string
             description: Category of the metric, for an example, compute, disk, network, storage and etc.
             required: false
             default: network
-            status: SUPPORTED
+            status: supported
         occurrences:
         - 1
         - UNBOUNDED
@@ -244,31 +244,31 @@ node_types:
             description: Unit of the metric value
             required: true
             default: B
-            status: SUPPORTED
+            status: supported
           name:
             type: string
             description: Ceilometer metric type name to monitor. (The name ceilometer is using)
             required: true
             default: network.incoming.bytes
-            status: SUPPORTED
+            status: supported
           description:
             type: string
             description: Description of the metric
             required: false
             default: Number of incoming bytes
-            status: SUPPORTED
+            status: supported
           type:
             type: string
             description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
             required: true
             default: Cumulative
-            status: SUPPORTED
+            status: supported
           category:
             type: string
             description: Category of the metric, for an example, compute, disk, network, storage and etc.
             required: false
             default: network
-            status: SUPPORTED
+            status: supported
         occurrences:
         - 1
         - UNBOUNDED
@@ -281,31 +281,31 @@ node_types:
             description: Unit of the metric value
             required: true
             default: B/s
-            status: SUPPORTED
+            status: supported
           name:
             type: string
             description: Ceilometer metric type name to monitor. (The name ceilometer is using)
             required: true
             default: network.outgoing.bytes.rate
-            status: SUPPORTED
+            status: supported
           description:
             type: string
             description: Description of the metric
             required: false
             default: Average rate of outgoing bytes
-            status: SUPPORTED
+            status: supported
           type:
             type: string
             description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
             required: true
             default: Gauge
-            status: SUPPORTED
+            status: supported
           category:
             type: string
             description: Category of the metric, for an example, compute, disk, network, storage and etc.
             required: false
             default: network
-            status: SUPPORTED
+            status: supported
         occurrences:
         - 1
         - UNBOUNDED
@@ -318,31 +318,31 @@ node_types:
             description: Unit of the metric value
             required: true
             default: packet
-            status: SUPPORTED
+            status: supported
           name:
             type: string
             description: Ceilometer metric type name to monitor. (The name ceilometer is using)
             required: true
             default: network.incoming.packets
-            status: SUPPORTED
+            status: supported
           description:
             type: string
             description: Description of the metric
             required: false
             default: Number of incoming packets
-            status: SUPPORTED
+            status: supported
           type:
             type: string
             description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
             required: true
             default: Cumulative
-            status: SUPPORTED
+            status: supported
           category:
             type: string
             description: Category of the metric, for an example, compute, disk, network, storage and etc.
             required: false
             default: network
-            status: SUPPORTED
+            status: supported
         occurrences:
         - 1
         - UNBOUNDED
diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/neutronNet/neutronNet.yml b/catalog-be/src/main/resources/import/tosca/heat-types/neutronNet/neutronNet.yml
index 539e33991f..97cf7dd537 100644
--- a/catalog-be/src/main/resources/import/tosca/heat-types/neutronNet/neutronNet.yml
+++ b/catalog-be/src/main/resources/import/tosca/heat-types/neutronNet/neutronNet.yml
@@ -7,41 +7,41 @@ node_types:
         type: list
         description: The IDs of the DHCP agent to schedule the network
         required: false
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       tenant_id:
         type: string
         description: The ID of the tenant which will own the network
         required: false
-        status: SUPPORTED
+        status: supported
       port_security_enabled:
         type: boolean
         description: Flag to enable/disable port security on the network
         required: false
-        status: SUPPORTED
+        status: supported
       shared:
         type: boolean
         description: Whether this network should be shared across all tenants
         required: false
         default: false
-        status: SUPPORTED
+        status: supported
       admin_state_up:
         type: boolean
         description: A boolean value specifying the administrative status of the network
         required: false
         default: true
-        status: SUPPORTED
+        status: supported
       qos_policy:
         type: string
         description: The name or ID of QoS policy to attach to this network
         required: false
-        status: SUPPORTED
+        status: supported
       subnets:
         type: map
         description: Network related subnets
         required: false
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.network.neutron.Subnet
       value_specs:
@@ -50,38 +50,38 @@ node_types:
         required: false
         default: {
           }
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
     attributes:
       qos_policy_id:
         type: string
         description: The QoS policy ID attached to this network
-        status: SUPPORTED
+        status: supported
       show:
         type: string
         description: Detailed information about resource
-        status: SUPPORTED
+        status: supported
       subnets_name:
         type: list
         description: Subnets name of this network
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subnets:
         type: map
         description: Network related subnets
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.network.neutron.Subnet
       mtu:
         type: scalar-unit.size
         description: The maximum transmission unit size(in bytes) for the network
-        status: SUPPORTED
+        status: supported
       status:
         type: string
         description: The status of the network
-        status: SUPPORTED
+        status: supported
     capabilities:
       attachment:
         type: tosca.capabilities.Attachment
diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/neutronPort/neutronPort.yml b/catalog-be/src/main/resources/import/tosca/heat-types/neutronPort/neutronPort.yml
index 0f6fcb371c..2dafda026c 100644
--- a/catalog-be/src/main/resources/import/tosca/heat-types/neutronPort/neutronPort.yml
+++ b/catalog-be/src/main/resources/import/tosca/heat-types/neutronPort/neutronPort.yml
@@ -7,29 +7,29 @@ node_types:
         type: boolean
         description: Flag to enable/disable port security on the network
         required: false
-        status: SUPPORTED
+        status: supported
       device_id:
         type: string
         description: Device ID of this port
         required: false
-        status: SUPPORTED
+        status: supported
       qos_policy:
         type: string
         description: The name or ID of QoS policy to attach to this network
         required: false
-        status: SUPPORTED
+        status: supported
       allowed_address_pairs:
         type: list
         description: Additional MAC/IP address pairs allowed to pass through the port
         required: false
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.network.AddressPair
       binding:vnic_type:
         type: string
         description: The vnic type to be bound on the neutron port
         required: false
-        status: SUPPORTED
+        status: supported
         constraints:
         - valid_values:
           - macvtap
@@ -41,25 +41,25 @@ node_types:
         required: false
         default: {
           }
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       device_owner:
         type: string
         description: Name of the network owning the port
         required: false
-        status: SUPPORTED
+        status: supported
       network:
         type: string
         description: Network this port belongs to
         required: false
-        status: SUPPORTED
+        status: supported
       replacement_policy:
         type: string
         description: Policy on how to respond to a stack-update for this resource
         required: false
         default: AUTO
-        status: SUPPORTED
+        status: supported
         constraints:
         - valid_values:
           - REPLACE_ALWAYS
@@ -68,59 +68,59 @@ node_types:
         type: list
         description: List of security group names or IDs
         required: false
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       fixed_ips:
         type: list
         description: Desired IPs for this port
         required: false
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
       mac_address:
         type: string
         description: MAC address to give to this port
         required: false
-        status: SUPPORTED
+        status: supported
       admin_state_up:
         type: boolean
         description: A boolean value specifying the administrative status of the network
         required: false
         default: true
-        status: SUPPORTED
+        status: supported
       name:
         type: string
         description: A symbolic name for this port
         required: false
-        status: SUPPORTED
+        status: supported
     attributes:
       tenant_id:
         type: string
         description: Tenant owning the port
-        status: SUPPORTED
+        status: supported
       network_id:
         type: string
         description: Unique identifier for the network owning the port
-        status: SUPPORTED
+        status: supported
       qos_policy_id:
         type: string
         description: The QoS policy ID attached to this network
-        status: SUPPORTED
+        status: supported
       show:
         type: string
         description: Detailed information about resource
-        status: SUPPORTED
+        status: supported
       subnets:
         type: list
         description: Subnets of this network
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       status:
         type: string
         description: The status of the network
-        status: SUPPORTED
+        status: supported
     capabilities:
       attachment:
         type: tosca.capabilities.Attachment
diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/novaServer/novaServer.yml b/catalog-be/src/main/resources/import/tosca/heat-types/novaServer/novaServer.yml
index 2271c9cd06..7c56a4c0fc 100644
--- a/catalog-be/src/main/resources/import/tosca/heat-types/novaServer/novaServer.yml
+++ b/catalog-be/src/main/resources/import/tosca/heat-types/novaServer/novaServer.yml
@@ -7,23 +7,23 @@ node_types:
         type: string
         description: The administrator password for the server
         required: false
-        status: SUPPORTED
+        status: supported
       availability_zone:
         type: string
         description: Availability zone to create servers in
         required: false
-        status: SUPPORTED
+        status: supported
       image:
         type: string
         description: The ID or name of the image to boot with
         required: false
-        status: SUPPORTED
+        status: supported
       image_update_policy:
         type: string
         description: Policy on how to apply an image-id update
         required: false
         default: REBUILD
-        status: SUPPORTED
+        status: supported
         constraints:
         - valid_values:
           - REBUILD_PRESERVE_EPHEMERAL
@@ -33,19 +33,19 @@ node_types:
         type: json
         description: Arbitrary JSON metadata to store for this server
         required: false
-        status: SUPPORTED
+        status: supported
       contrail_service_instance_ind:
         type: boolean
         description: Nova server related to service instance indicator
         required: false
         default: false
-        status: SUPPORTED
+        status: supported
       user_data_update_policy:
         type: string
         description: Policy on how to apply a user_data update
         required: false
         default: REPLACE
-        status: SUPPORTED
+        status: supported
         constraints:
         - valid_values:
           - REPLACE
@@ -55,7 +55,7 @@ node_types:
         description: Policy on how to apply a flavor update
         required: false
         default: RESIZE
-        status: SUPPORTED
+        status: supported
         constraints:
         - valid_values:
           - RESIZE
@@ -65,43 +65,43 @@ node_types:
         description: User data script to be executed by cloud-init
         required: false
         default: ''
-        status: SUPPORTED
+        status: supported
       flavor:
         type: string
         description: The ID or name of the flavor to boot onto
         required: true
-        status: SUPPORTED
+        status: supported
       key_name:
         type: string
         description: Name of keypair to inject into the server
         required: false
-        status: SUPPORTED
+        status: supported
       reservation_id:
         type: string
         description: A UUID for the set of servers being requested
         required: false
-        status: SUPPORTED
+        status: supported
       security_groups:
         type: list
         description: List of security group names or IDs
         required: false
         default: [
           ]
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       config_drive:
         type: boolean
         description: enable config drive on the server
         required: false
-        status: SUPPORTED
+        status: supported
       personality:
         type: map
         description: A map of files to create/overwrite on the server upon boot
         required: false
         default: {
           }
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       software_config_transport:
@@ -109,7 +109,7 @@ node_types:
         description: How the server should receive the metadata required for software configuration
         required: false
         default: POLL_SERVER_CFN
-        status: SUPPORTED
+        status: supported
         constraints:
         - valid_values:
           - POLL_SERVER_CFN
@@ -121,7 +121,7 @@ node_types:
         description: How the user_data should be formatted for the server
         required: false
         default: HEAT_CFNTOOLS
-        status: SUPPORTED
+        status: supported
         constraints:
         - valid_values:
           - SOFTWARE_CONFIG
@@ -131,7 +131,7 @@ node_types:
         type: string
         description: Control how the disk is partitioned when the server is created
         required: false
-        status: SUPPORTED
+        status: supported
         constraints:
         - valid_values:
           - AUTO
@@ -140,42 +140,42 @@ node_types:
         type: string
         description: Server name
         required: false
-        status: SUPPORTED
+        status: supported
       scheduler_hints:
         type: map
         description: Arbitrary key-value pairs specified by the client to help boot a server
         required: false
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
     attributes:
       accessIPv4:
         type: string
         description: The manually assigned alternative public IPv4 address of the server
-        status: SUPPORTED
+        status: supported
       addresses:
         type: map
         description: A dict of all network addresses with corresponding port_id
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.novaServer.network.AddressInfo
       accessIPv6:
         type: string
         description: The manually assigned alternative public IPv6 address of the server
-        status: SUPPORTED
+        status: supported
       instance_name:
         type: string
         description: AWS compatible instance name
-        status: SUPPORTED
+        status: supported
       name:
         type: string
         description: Name of the server
-        status: SUPPORTED
+        status: supported
       show:
         type: string
         description: Detailed information about resource
-        status: SUPPORTED
+        status: supported
       console_urls:
         type: string
         description: URLs of servers consoles
-        status: SUPPORTED
+        status: supported
diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/securityRules/securityRules.yml b/catalog-be/src/main/resources/import/tosca/heat-types/securityRules/securityRules.yml
index 876b2f1388..a48a405a83 100644
--- a/catalog-be/src/main/resources/import/tosca/heat-types/securityRules/securityRules.yml
+++ b/catalog-be/src/main/resources/import/tosca/heat-types/securityRules/securityRules.yml
@@ -7,24 +7,24 @@ node_types:
         type: string
         description: Description of the security group
         required: false
-        status: SUPPORTED
+        status: supported
       name:
         type: string
         description: A symbolic name for this security group, which is not required to be unique.
         required: false
-        status: SUPPORTED
+        status: supported
       rules:
         type: list
         description: List of security group rules
         required: false
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.network.neutron.SecurityRules.Rule
     attributes:
       show:
         type: string
         description: Detailed information about resource
-        status: SUPPORTED
+        status: supported
     requirements:
     - port:
         capability: tosca.capabilities.Attachment
diff --git a/catalog-be/src/main/resources/import/tosca/policy-types/policyTypes.yml b/catalog-be/src/main/resources/import/tosca/policy-types/policyTypes.yml
index c39c182808..65d19d7820 100644
--- a/catalog-be/src/main/resources/import/tosca/policy-types/policyTypes.yml
+++ b/catalog-be/src/main/resources/import/tosca/policy-types/policyTypes.yml
@@ -20,12 +20,12 @@ org.openecomp.policies.placement.Antilocate:
       type: string
       description: The name of the policy
       required: false
-      status: SUPPORTED
+      status: supported
     container_type:
       type: string
       description: container type
       required: false
-      status: SUPPORTED
+      status: supported
       constraints:
       - valid_values:
         - host
@@ -39,12 +39,12 @@ org.openecomp.policies.placement.Colocate:
       type: string
       description: The name of the policy
       required: false
-      status: SUPPORTED
+      status: supported
     affinity:
       type: string
       description: affinity
       required: true
-      status: SUPPORTED
+      status: supported
       constraints:
       - valid_values:
         - host
@@ -59,7 +59,7 @@ org.openecomp.policies.placement.valet.Diversity:
       description: diversity
       required: false
       default: host
-      status: SUPPORTED
+      status: supported
       constraints:
       - valid_values:
         - host
@@ -73,7 +73,7 @@ org.openecomp.policies.placement.valet.Exclusivity:
       description: exclusivity
       required: false
       default: host
-      status: SUPPORTED
+      status: supported
       constraints:
       - valid_values:
         - host
@@ -87,7 +87,7 @@ org.openecomp.policies.placement.valet.Affinity:
       description: affinity
       required: false
       default: host
-      status: SUPPORTED
+      status: supported
       constraints:
       - valid_values:
         - host
diff --git a/catalog-be/src/main/resources/import/tosca/relationship-types/relationshipTypes.yml b/catalog-be/src/main/resources/import/tosca/relationship-types/relationshipTypes.yml
index a2c9d2b3ad..a2ea535a56 100644
--- a/catalog-be/src/main/resources/import/tosca/relationship-types/relationshipTypes.yml
+++ b/catalog-be/src/main/resources/import/tosca/relationship-types/relationshipTypes.yml
@@ -87,7 +87,7 @@ org.openecomp.relationships.AttachesTo:
       location:
         description: The relative location (e.g., path on the file system), which provides the root location to address an attached node.
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
 
 org.openecomp.relationships.VolumeAttachesTo:
@@ -97,18 +97,18 @@ org.openecomp.relationships.VolumeAttachesTo:
     volume_id:
       description: The ID of the volume to be attached
       type: string
-      status: SUPPORTED
+      status: supported
       required: true
     instance_uuid:
       description: The ID of the server to which the volume attaches
       type: string
-      status: SUPPORTED
+      status: supported
       required: true
   attributes:
     show:
       description: Detailed information about resource
       type: string
-      status: SUPPORTED
+      status: supported
 
 org.openecomp.relationships.ForwardsTo:
   derived_from: tosca.relationships.Root
diff --git a/catalog-be/src/test/resources/yamlValidation/test-no-valid.yml b/catalog-be/src/test/resources/yamlValidation/test-no-valid.yml
index 335758e887..2c3f469913 100644
--- a/catalog-be/src/test/resources/yamlValidation/test-no-valid.yml
+++ b/catalog-be/src/test/resources/yamlValidation/test-no-valid.yml
@@ -130,12 +130,12 @@ org.openecomp.datatypes.heat.network.AddressPair:
       type: string
       description: MAC address
       required: false
-      status: SUPPORTED
+      status: supported
     ip_address:
       type: string
       description: IP address
       required: false
-      status: SUPPORTED
+      status: supported
 
 org.openecomp.datatypes.heat.network.subnet.HostRoute:
   derived_from: tosca.datatypes.Root
@@ -145,12 +145,12 @@ org.openecomp.datatypes.heat.network.subnet.HostRoute:
       type: string
       description: The destination for static route
       required: false
-      status: SUPPORTED
+      status: supported
     nexthop:
       type: string
       description: The next hop for the destination
       required: false
-      status: SUPPORTED
+      status: supported
       
 org.openecomp.datatypes.heat.network.AllocationPool:
   derived_from: tosca.datatypes.Root
@@ -160,12 +160,12 @@ org.openecomp.datatypes.heat.network.AllocationPool:
       type: string
       description: Start address for the allocation pool
       required: false
-      status: SUPPORTED
+      status: supported
     end:
       type: string
       description: End address for the allocation pool
       required: false
-      status: SUPPORTED
+      status: supported
 
 org.openecomp.datatypes.heat.network.neutron.Subnet:
   derived_from: tosca.datatypes.Root
@@ -175,18 +175,18 @@ org.openecomp.datatypes.heat.network.neutron.Subnet:
       type: string
       description: The ID of the tenant who owns the network
       required: false
-      status: SUPPORTED
+      status: supported
     enable_dhcp:
       type: boolean
       description: Set to true if DHCP is enabled and false if DHCP is disabled
       required: false
       default: true
-      status: SUPPORTED
+      status: supported
     ipv6_address_mode:
       type: string
       description: IPv6 address mode
       required: false
-      status: SUPPORTED
+      status: supported
       constraints:
       - valid_values:
         - dhcpv6-stateful
@@ -196,7 +196,7 @@ org.openecomp.datatypes.heat.network.neutron.Subnet:
       type: string
       description: IPv6 RA (Router Advertisement) mode
       required: false
-      status: SUPPORTED
+      status: supported
       constraints:
       - valid_values:
         - dhcpv6-stateful
@@ -208,35 +208,35 @@ org.openecomp.datatypes.heat.network.neutron.Subnet:
       required: false
       default: {
         }
-      status: SUPPORTED
+      status: supported
       entry_schema:
         type: string
     allocation_pools:
        type: list
        description: The start and end addresses for the allocation pools
        required: false
-       status: SUPPORTED
+       status: supported
        entry_schema:
          type: org.openecomp.datatypes.heat.network.AllocationPool
     subnetpool:
       type: string
       description: The name or ID of the subnet pool
       required: false
-      status: SUPPORTED
+      status: supported
     dns_nameservers:
       type: list
       description: A specified set of DNS name servers to be used
       required: false
       default: [
         ]
-      status: SUPPORTED
+      status: supported
       entry_schema:
         type: string     
     host_routes:
       type: list
       description: The gateway IP address
       required: false
-      status: SUPPORTED
+      status: supported
       entry_schema:
         type: org.openecomp.datatypes.heat.network.subnet.HostRoute
     ip_version:
@@ -244,7 +244,7 @@ org.openecomp.datatypes.heat.network.neutron.Subnet:
       description: The gateway IP address
       required: false
       default: 4
-      status: SUPPORTED
+      status: supported
       constraints:
       - valid_values:
         - '4'
@@ -253,24 +253,24 @@ org.openecomp.datatypes.heat.network.neutron.Subnet:
       type: string
       description: The name of the subnet
       required: false
-      status: SUPPORTED
+      status: supported
     prefixlen:
       type: integer
       description: Prefix length for subnet allocation from subnet pool
       required: false
-      status: SUPPORTED
+      status: supported
       constraints:
       - greater_or_equal: 0
     cidr:
       type: string
       description: The CIDR
       required: false
-      status: SUPPORTED
+      status: supported
     gateway_ip:
       type: string
       description: The gateway IP address
       required: false
-      status: SUPPORTED
+      status: supported
 
 org.openecomp.datatypes.heat.novaServer.network.PortExtraProperties:
   derived_from: tosca.datatypes.Root
@@ -280,35 +280,35 @@ org.openecomp.datatypes.heat.novaServer.network.PortExtraProperties:
       type: boolean
       description: Flag to enable/disable port security on the port
       required: false
-      status: SUPPORTED
+      status: supported
     mac_address:
       type: string
       description: MAC address to give to this port
       required: false
-      status: SUPPORTED
+      status: supported
     admin_state_up:
       type: boolean
       description: The administrative state of this port
       required: false
       default: true
-      status: SUPPORTED
+      status: supported
     qos_policy:
       type: string
       description: The name or ID of QoS policy to attach to this port
       required: false
-      status: SUPPORTED
+      status: supported
     allowed_address_pairs:
       type: list
       description: Additional MAC/IP address pairs allowed to pass through the port
       required: false
-      status: SUPPORTED
+      status: supported
       entry_schema:
         type: org.openecomp.datatypes.heat.network.AddressPair
     binding:vnic_type:
       type: string
       description: The vnic type to be bound on the neutron port
       required: false
-      status: SUPPORTED
+      status: supported
       constraints:
       - valid_values:
         - macvtap
@@ -320,7 +320,7 @@ org.openecomp.datatypes.heat.novaServer.network.PortExtraProperties:
       required: false
       default: {
         }
-      status: SUPPORTED
+      status: supported
       entry_schema:
         type: string
 
@@ -332,7 +332,7 @@ org.openecomp.datatypes.heat.novaServer.network.AddressInfo:
       type: string
       description: Port id
       required: false
-      status: SUPPORTED
+      status: supported
 
 org.openecomp.datatypes.heat.neutron.port.FixedIps:
   derived_from: tosca.datatypes.Root
@@ -342,12 +342,12 @@ org.openecomp.datatypes.heat.neutron.port.FixedIps:
       type: string
       description: Subnet in which to allocate the IP address for this port
       required: false
-      status: SUPPORTED
+      status: supported
     ip_address:
       type: string
       description: IP address desired in the subnet for this port
       required: false
-      status: SUPPORTED
+      status: supported
 
 org.openecomp.datatypes.heat.FileInfo:
   derived_from: tosca.datatypes.Root
@@ -357,12 +357,12 @@ org.openecomp.datatypes.heat.FileInfo:
       type: string
       description: The required URI string (relative or absolute) which can be used to locate the file
       required: true
-      status: SUPPORTED
+      status: supported
     file_type:
       type: string
       description: The type of the file
       required: true
-      status: SUPPORTED
+      status: supported
       constraints:
       - valid_values:
         - base
@@ -378,12 +378,12 @@ org.openecomp.datatypes.heat.contrail.network.rule.PortPairs:
         type: string
         description: Start port
         required: false
-        status: SUPPORTED
+        status: supported
       end_port:
         type: string
         description: End port
         required: false
-        status: SUPPORTED
+        status: supported
 
 org.openecomp.datatypes.heat.contrail.network.rule.Rule:
     derived_from: tosca.datatypes.Root
@@ -393,45 +393,45 @@ org.openecomp.datatypes.heat.contrail.network.rule.Rule:
         type: list
         description: Source ports
         required: false
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.contrail.network.rule.PortPairs
       protocol:
         type: string
         description: Protocol
         required: false
-        status: SUPPORTED
+        status: supported
       dst_addresses:
         type: list
         description: Destination addresses
         required: false
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.contrail.network.rule.VirtualNetwork
       apply_service:
         type: string
         description: Service to apply
         required: false
-        status: SUPPORTED
+        status: supported
       dst_ports:
         type: list
         description: Destination ports
         required: false
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.contrail.network.rule.PortPairs
       src_addresses:
         type: list
         description: Source addresses
         required: false
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.contrail.network.rule.VirtualNetwork
       direction:
         type: string
         description: Direction
         required: false
-        status: SUPPORTED
+        status: supported
 
 org.openecomp.datatypes.heat.contrail.network.rule.RuleList:
     derived_from: tosca.datatypes.Root
@@ -441,7 +441,7 @@ org.openecomp.datatypes.heat.contrail.network.rule.RuleList:
         type: list
         description: Contrail network rule
         required: false
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.contrail.network.rule.Rule
 
@@ -453,7 +453,7 @@ org.openecomp.datatypes.heat.contrail.network.rule.VirtualNetwork:
         type: string
         description: Virtual network
         required: false
-        status: SUPPORTED
+        status: supported
 
 org.openecomp.datatypes.heat.network.neutron.SecurityRules.Rule:
     derived_from: tosca.datatypes.Root
@@ -463,12 +463,12 @@ org.openecomp.datatypes.heat.network.neutron.SecurityRules.Rule:
         type: string
         description: The remote group ID to be associated with this security group rule
         required: false
-        status: SUPPORTED
+        status: supported
       protocol:
         type: string
         description: The protocol that is matched by the security group rule
         required: false
-        status: SUPPORTED
+        status: supported
         constraints:
         - valid_values:
           - tcp
@@ -479,7 +479,7 @@ org.openecomp.datatypes.heat.network.neutron.SecurityRules.Rule:
         description: Ethertype of the traffic
         required: false
         default: IPv4
-        status: SUPPORTED
+        status: supported
         constraints:
         - valid_values:
           - IPv4
@@ -489,7 +489,7 @@ org.openecomp.datatypes.heat.network.neutron.SecurityRules.Rule:
         description: 'The maximum port number in the range that is matched by the
           security group rule. '
         required: false
-        status: SUPPORTED
+        status: supported
         constraints:
         - in_range:
           - 0
@@ -498,13 +498,13 @@ org.openecomp.datatypes.heat.network.neutron.SecurityRules.Rule:
         type: string
         description: The remote IP prefix (CIDR) to be associated with this security group rule
         required: false
-        status: SUPPORTED
+        status: supported
       remote_mode:
         type: string
         description: Whether to specify a remote group or a remote IP prefix
         required: false
         default: remote_ip_prefix
-        status: SUPPORTED
+        status: supported
         constraints:
         - valid_values:
           - remote_ip_prefix
@@ -514,7 +514,7 @@ org.openecomp.datatypes.heat.network.neutron.SecurityRules.Rule:
         description: The direction in which the security group rule is applied
         required: false
         default: ingress
-        status: SUPPORTED
+        status: supported
         constraints:
         - valid_values:
           - egress
@@ -523,7 +523,7 @@ org.openecomp.datatypes.heat.network.neutron.SecurityRules.Rule:
         type: integer
         description: The minimum port number in the range that is matched by the security group rule.
         required: false
-        status: SUPPORTED
+        status: supported
         constraints:
         - in_range:
           - 0
@@ -537,13 +537,13 @@ org.openecomp.datatypes.heat.substitution.SubstitutionFiltering:
         type: string
         description: Substitute Service Template
         required: true
-        status: SUPPORTED
+        status: supported
       index_value:
         type: integer
         description: Index value of the substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       count:
@@ -551,19 +551,19 @@ org.openecomp.datatypes.heat.substitution.SubstitutionFiltering:
         description: Count
         required: false
         default: 1
-        status: SUPPORTED
+        status: supported
       scaling_enabled:
         type: boolean
         description: Indicates whether service scaling is enabled
         required: false
         default: true
-        status: SUPPORTED
+        status: supported
       mandatory:
         type: boolean
         description: Mandatory
         required: false
         default: true
-        status: SUPPORTED
+        status: supported
 
 org.openecomp.datatypes.heat.contrailV2.virtual.network.rule.RefDataSequence:
     derived_from: tosca.datatypes.Root
@@ -573,12 +573,12 @@ org.openecomp.datatypes.heat.contrailV2.virtual.network.rule.RefDataSequence:
         type: integer
         description: Network Policy ref data sequence Major
         required: false
-        status: SUPPORTED
+        status: supported
       network_policy_refs_data_sequence_minor:
         type: integer
         description: Network Policy ref data sequence Minor
         required: false
-        status: SUPPORTED
+        status: supported
 
 org.openecomp.datatypes.heat.contrailV2.virtual.network.rule.RefData:
     derived_from: tosca.datatypes.Root
@@ -588,7 +588,7 @@ org.openecomp.datatypes.heat.contrailV2.virtual.network.rule.RefData:
         type: org.openecomp.datatypes.heat.contrailV2.virtual.network.rule.RefDataSequence
         description: Network Policy ref data sequence
         required: false
-        status: SUPPORTED
+        status: supported
 
 org.openecomp.datatypes.heat.contrailV2.virtual.network.rule.ref.data.IpamSubnet:
     derived_from: tosca.datatypes.Root
@@ -598,12 +598,12 @@ org.openecomp.datatypes.heat.contrailV2.virtual.network.rule.ref.data.IpamSubnet
         type: string
         description: Network ipam refs data ipam subnets ip prefix len
         required: false
-        status: SUPPORTED
+        status: supported
       network_ipam_refs_data_ipam_subnets_subnet_ip_prefix:
         type: string
         description: Network ipam refs data ipam subnets ip prefix
         required: false
-        status: SUPPORTED
+        status: supported
 
 org.openecomp.datatypes.heat.contrailV2.virtual.network.rule.ref.data.IpamSubnetList:
     derived_from: tosca.datatypes.Root
@@ -613,12 +613,12 @@ org.openecomp.datatypes.heat.contrailV2.virtual.network.rule.ref.data.IpamSubnet
         type: org.openecomp.datatypes.heat.contrailV2.virtual.network.rule.ref.data.IpamSubnet
         description: Network ipam refs data ipam subnets
         required: false
-        status: SUPPORTED
+        status: supported
       network_ipam_refs_data_ipam_subnets_addr_from_start:
         type: string
         description: Network ipam refs data ipam subnets addr from start
         required: false
-        status: SUPPORTED
+        status: supported
 
 org.openecomp.datatypes.heat.contrailV2.virtual.network.rule.IpamRefData:
     derived_from: tosca.datatypes.Root
@@ -628,7 +628,7 @@ org.openecomp.datatypes.heat.contrailV2.virtual.network.rule.IpamRefData:
         type: list
         description: Network ipam refs data ipam subnets
         required: false
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.contrailV2.virtual.network.rule.ref.data.IpamSubnetList
 
@@ -640,7 +640,7 @@ org.openecomp.datatypes.heat.contrailV2.network.rule.SrcVirtualNetwork:
         type: string
         description: Source addresses Virtual network
         required: false
-        status: SUPPORTED
+        status: supported
 
 org.openecomp.datatypes.heat.contrailV2.network.rule.DstVirtualNetwork:
     derived_from: tosca.datatypes.Root
@@ -650,7 +650,7 @@ org.openecomp.datatypes.heat.contrailV2.network.rule.DstVirtualNetwork:
         type: string
         description: Destination addresses Virtual network
         required: false
-        status: SUPPORTED
+        status: supported
 
 org.openecomp.datatypes.heat.contrailV2.network.rule.DstPortPairs:
     derived_from: tosca.datatypes.Root
@@ -660,12 +660,12 @@ org.openecomp.datatypes.heat.contrailV2.network.rule.DstPortPairs:
         type: string
         description: Start port
         required: false
-        status: SUPPORTED
+        status: supported
       network_policy_entries_policy_rule_dst_ports_end_port:
         type: string
         description: End port
         required: false
-        status: SUPPORTED
+        status: supported
 
 org.openecomp.datatypes.heat.contrailV2.network.rule.SrcPortPairs:
     derived_from: tosca.datatypes.Root
@@ -675,12 +675,12 @@ org.openecomp.datatypes.heat.contrailV2.network.rule.SrcPortPairs:
         type: string
         description: Start port
         required: false
-        status: SUPPORTED
+        status: supported
       network_policy_entries_policy_rule_src_ports_end_port:
         type: string
         description: End port
         required: false
-        status: SUPPORTED
+        status: supported
 
 org.openecomp.datatypes.heat.contrailV2.network.rule.ActionList:
     derived_from: tosca.datatypes.Root
@@ -690,12 +690,12 @@ org.openecomp.datatypes.heat.contrailV2.network.rule.ActionList:
         type: string
         description: Simple Action
         required: false
-        status: SUPPORTED
+        status: supported
       network_policy_entries_policy_rule_action_list_apply_service:
         type: list
         description: Apply Service
         required: false
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
 
@@ -707,45 +707,45 @@ org.openecomp.datatypes.heat.contrailV2.network.rule.Rule:
         type: list
         description: Destination addresses
         required: false
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.contrailV2.network.rule.DstVirtualNetwork
       network_policy_entries_policy_rule_dst_ports:
         type: list
         description: Destination ports
         required: false
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.contrailV2.network.rule.DstPortPairs
       network_policy_entries_policy_rule_protocol:
         type: string
         description: Protocol
         required: false
-        status: SUPPORTED
+        status: supported
       network_policy_entries_policy_rule_src_addresses:
         type: list
         description: Source addresses
         required: false
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.contrailV2.network.rule.SrcVirtualNetwork
       network_policy_entries_policy_rule_direction:
         type: string
         description: Direction
         required: false
-        status: SUPPORTED
+        status: supported
       network_policy_entries_policy_rule_src_ports:
         type: list
         description: Source ports
         required: false
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.contrailV2.network.rule.SrcPortPairs
       network_policy_entries_policy_rule_action_list:
         type: org.openecomp.datatypes.heat.contrailV2.network.rule.ActionList
         description: Action list
         required: false
-        status: SUPPORTED
+        status: supported
 
 org.openecomp.datatypes.heat.contrailV2.network.rule.RuleList:
     derived_from: tosca.datatypes.Root
@@ -755,7 +755,7 @@ org.openecomp.datatypes.heat.contrailV2.network.rule.RuleList:
         type: list
         description: Contrail network rule
         required: false
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.contrailV2.network.rule.Rule
 
@@ -767,17 +767,17 @@ org.openecomp.datatypes.heat.network.contrail.port.StaticRoute:
         type: string
         description: Route prefix
         required: false
-        status: SUPPORTED
+        status: supported
       next_hop:
         type: string
         description: Next hop
         required: false
-        status: SUPPORTED
+        status: supported
       next_hop_type:
         type: string
         description: Next hop type
         required: false
-        status: SUPPORTED
+        status: supported
 
 org.openecomp.datatypes.heat.network.contrail.AddressPair:
     derived_from: tosca.datatypes.Root
@@ -787,7 +787,7 @@ org.openecomp.datatypes.heat.network.contrail.AddressPair:
         type: string
         description: Address mode active-active or active-standy
         required: false
-        status: SUPPORTED
+        status: supported
         constraints:
         - valid_values:
           - active-active
@@ -796,12 +796,12 @@ org.openecomp.datatypes.heat.network.contrail.AddressPair:
         type: string
         description: IP address prefix
         required: false
-        status: SUPPORTED
+        status: supported
       mac_address:
         type: string
         description: Mac address
         required: false
-        status: SUPPORTED
+        status: supported
 
 org.openecomp.datatypes.heat.network.contrail.InterfaceData:
     derived_from: tosca.datatypes.Root
@@ -811,26 +811,26 @@ org.openecomp.datatypes.heat.network.contrail.InterfaceData:
         type: list
         description: An ordered list of static routes to be added to this interface
         required: false
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.network.contrail.port.StaticRoute
       virtual_network:
         type: string
         description: Virtual Network for this interface
         required: true
-        status: SUPPORTED
+        status: supported
       allowed_address_pairs:
         type: list
         description: List of allowed address pair for this interface
         required: false
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.network.contrail.AddressPair
       ip_address:
         type: string
         description: IP for this interface
         required: false
-        status: SUPPORTED
+        status: supported
 
 org.openecomp.datatypes.heat.contrailV2.virtual.machine.interface.Properties:
     derived_from: tosca.datatypes.Root
@@ -840,7 +840,7 @@ org.openecomp.datatypes.heat.contrailV2.virtual.machine.interface.Properties:
         type: string
         description: Service Interface Type.
         required: false
-        status: SUPPORTED
+        status: supported
 
 org.openecomp.datatypes.Root:
   derived_from: tosca.datatypes.Root
@@ -1117,12 +1117,12 @@ org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPair
       type: string
       description: IP Prefix.
       required: false
-      status: SUPPORTED
+      status: supported
     ip_prefix_len:
       type: integer
       description: IP Prefix Len.
       required: false
-      status: SUPPORTED
+      status: supported
 
 org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.MacAddress:
   derived_from: tosca.datatypes.Root
@@ -1132,7 +1132,7 @@ org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.MacAddress:
       type: list
       description: Mac Addresses List.
       required: false
-      status: SUPPORTED
+      status: supported
       entry_schema:
         type: string
 
@@ -1144,7 +1144,7 @@ org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.Properties:
       type: string
       description: Sub Interface VLAN Tag.
       required: false
-      status: SUPPORTED
+      status: supported
 
 org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPair:
   derived_from: tosca.datatypes.Root
@@ -1154,17 +1154,17 @@ org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPair
       type: string
       description: Address Mode.
       required: false
-      status: SUPPORTED
+      status: supported
     ip:
       type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairIp
       description: IP.
       required: false
-      status: SUPPORTED
+      status: supported
     mac:
       type: string
       description: Mac.
       required: false
-      status: SUPPORTED
+      status: supported
 
 org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs:
   derived_from: tosca.datatypes.Root
@@ -1174,7 +1174,7 @@ org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPair
       type: list
       description: Addresses pair List.
       required: false
-      status: SUPPORTED
+      status: supported
       entry_schema:
         type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPair
 
diff --git a/catalog-be/src/test/resources/yamlValidation/testDir/test.yml b/catalog-be/src/test/resources/yamlValidation/testDir/test.yml
index c94909101b..9caecd7344 100644
--- a/catalog-be/src/test/resources/yamlValidation/testDir/test.yml
+++ b/catalog-be/src/test/resources/yamlValidation/testDir/test.yml
@@ -156,27 +156,27 @@ org.openecomp.capabilities.Metric:
       type: string
       description: Unit of the metric value
       required: true
-      status: SUPPORTED
+      status: supported
     description:
       type: string
       description: Description of the metric
       required: false
-      status: SUPPORTED
+      status: supported
     type:
       type: string
       description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
       required: true
-      status: SUPPORTED
+      status: supported
     category:
       type: string
       description: Category of the metric, for an example, compute, disk, network, storage and etc.
       required: false
-      status: SUPPORTED
+      status: supported
   attributes:
     value:
       type: string
       description: Runtime monitored value
-      status: SUPPORTED
+      status: supported
 org.openecomp.capabilities.metric.Ceilometer:
   derived_from: org.openecomp.capabilities.Metric
   description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -185,7 +185,7 @@ org.openecomp.capabilities.metric.Ceilometer:
       type: string
       description: Ceilometer metric type name to monitor. (The name ceilometer is using)
       required: true
-      status: SUPPORTED
+      status: supported
 org.openecomp.capabilities.metric.SnmpPolling:
   derived_from: org.openecomp.capabilities.Metric
   description: A node type that includes the Metric capability indicates that it can be monitored using snmp polling.
@@ -194,7 +194,7 @@ org.openecomp.capabilities.metric.SnmpPolling:
       type: string
       description: Object Id of the metric
       required: true
-      status: SUPPORTED
+      status: supported
 org.openecomp.capabilities.metric.SnmpTrap:
   derived_from: org.openecomp.capabilities.Metric
   description: A node type that includes the Metric capability indicates that it can be monitored using snmp trap.
@@ -203,4 +203,4 @@ org.openecomp.capabilities.metric.SnmpTrap:
       type: string
       description: Object Id of the metric
       required: true
-      status: SUPPORTED
+      status: supported