348 files changed, 16758 insertions, 16768 deletions

diff --git a/asdctool/src/main/resources/config/dataTypes.yml b/asdctool/src/main/resources/config/dataTypes.yml
index 43c7f0c844..d768bffe78 100644
--- a/asdctool/src/main/resources/config/dataTypes.yml
+++ b/asdctool/src/main/resources/config/dataTypes.yml
@@ -114,12 +114,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
   description: Host route info for the subnet
@@ -128,12 +128,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
@@ -143,12 +143,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
@@ -158,18 +158,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
@@ -179,7 +179,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
@@ -191,35 +191,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:
@@ -227,7 +227,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'
@@ -236,24 +236,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
@@ -263,35 +263,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
@@ -303,7 +303,7 @@ org.openecomp.datatypes.heat.novaServer.network.PortExtraProperties:
       required: false
       default: {
         }
-      status: SUPPORTED
+      status: supported
       entry_schema:
         type: string
 org.openecomp.datatypes.heat.novaServer.network.AddressInfo:
@@ -314,7 +314,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
   description: subnet/ip_address
@@ -323,12 +323,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
   description: Heat File Info
@@ -337,12 +337,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
@@ -357,12 +357,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
     description: policy rule
@@ -371,45 +371,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
     description: list of policy rules
@@ -418,7 +418,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
 org.openecomp.datatypes.heat.contrail.network.rule.VirtualNetwork:
@@ -429,7 +429,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
@@ -439,12 +439,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
@@ -455,7 +455,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
@@ -465,7 +465,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
@@ -474,13 +474,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
@@ -490,7 +490,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
@@ -499,7 +499,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
@@ -512,13 +512,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:
@@ -526,19 +526,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
     description: network policy refs data sequence
@@ -547,12 +547,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
     description: network policy refs data
@@ -561,7 +561,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
     description: Network Ipam Ref Data Subnet
@@ -570,12 +570,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
     description: Network Ipam Ref Data Subnet List
@@ -584,12 +584,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
     description: Network Ipam Ref Data
@@ -598,7 +598,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
 org.openecomp.datatypes.heat.contrailV2.network.rule.SrcVirtualNetwork:
@@ -609,7 +609,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
     description: destination addresses
@@ -618,7 +618,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
     description: destination port pairs
@@ -627,12 +627,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
     description: source port pairs
@@ -641,12 +641,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
     description: Action List
@@ -655,12 +655,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
 org.openecomp.datatypes.heat.contrailV2.network.rule.ActionList:
@@ -671,12 +671,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
 org.openecomp.datatypes.heat.contrailV2.network.rule.Rule:
@@ -687,45 +687,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
     description: list of policy rules
@@ -734,7 +734,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
 org.openecomp.datatypes.heat.network.contrail.port.StaticRoute:
@@ -745,17 +745,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
     description: Address Pair
@@ -764,7 +764,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
@@ -773,12 +773,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
     description: Interface Data
@@ -787,26 +787,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
     description: Virtual Machine Interface Properties.
@@ -815,7 +815,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
   description: >
@@ -1061,12 +1061,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
@@ -1076,7 +1076,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
 
@@ -1088,7 +1088,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
@@ -1098,17 +1098,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
@@ -1118,6 +1118,6 @@ 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
\ No newline at end of file
diff --git a/asdctool/src/main/resources/config/groupTypes.yml b/asdctool/src/main/resources/config/groupTypes.yml
index ce457e4add..0c0abc9013 100644
--- a/asdctool/src/main/resources/config/groupTypes.yml
+++ b/asdctool/src/main/resources/config/groupTypes.yml
@@ -6,12 +6,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
@@ -21,7 +21,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/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
diff --git a/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/AttributeDefinition.java b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/AttributeDefinition.java
index aa1392e2ce..1b72cbc030 100644
--- a/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/AttributeDefinition.java
+++ b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/AttributeDefinition.java
@@ -31,11 +31,11 @@ public class AttributeDefinition implements Cloneable {
   private String type;
   private String description;
   private Object _default;
-  private Status status;
+  private String status;
   private EntrySchema entry_schema;
 
   public AttributeDefinition() {
-    status = Status.SUPPORTED;
+    status = Status.SUPPORTED.getName();
   }
 
 
diff --git a/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/DefinitionOfDataType.java b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/DefinitionOfDataType.java
index 44da720fc4..310f9004af 100644
--- a/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/DefinitionOfDataType.java
+++ b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/DefinitionOfDataType.java
@@ -27,7 +27,7 @@ public class DefinitionOfDataType implements Cloneable {
   private Object value;
   private Boolean required;
   private Object _default;
-  private Status status;
+  private String status;
   private List<Constraint> constraints;
   private EntrySchema entry_schema;
 
@@ -71,11 +71,11 @@ public class DefinitionOfDataType implements Cloneable {
     this._default = _default;
   }
 
-  public Status getStatus() {
+  public String getStatus() {
     return status;
   }
 
-  public void setStatus(Status status) {
+  public void setStatus(String status) {
     this.status = status;
   }
 
diff --git a/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/PropertyDefinition.java b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/PropertyDefinition.java
index 0c1f804efa..331b7b0e64 100644
--- a/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/PropertyDefinition.java
+++ b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/PropertyDefinition.java
@@ -39,7 +39,7 @@ package org.onap.sdc.tosca.datatypes.model;
 public class PropertyDefinition extends DefinitionOfDataType {
 
   public PropertyDefinition() {
-    setStatus(Status.SUPPORTED);
+    setStatus(Status.SUPPORTED.getName());
     setRequired(true);
   }
 
diff --git a/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/Status.java b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/Status.java
index b58f13c3a5..c25a6adbaa 100644
--- a/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/Status.java
+++ b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/Status.java
@@ -20,27 +20,17 @@
 
 package org.onap.sdc.tosca.datatypes.model;
 
+import lombok.AllArgsConstructor;
+import lombok.Getter;
 
-
+@Getter
+@AllArgsConstructor
 public enum Status {
-
   SUPPORTED("supported"),
-  supported("supported"),
   UNSUPPORTED("unsupported"),
-  unsupported("unsupported"),
   EXPERIMENTAL("experimental"),
-  experimental("experimental"),
-  DEPRECATED("deprecated"),
-  deprecated("deprecated");
-  private String displayName;
-
-  Status(String displayName) {
-    this.displayName = displayName;
-  }
-
-  public String getDisplayName() {
-    return displayName;
-  }
+  DEPRECATED("deprecated");
 
+  private final String name;
 
 }
diff --git a/common/onap-tosca-datatype/src/main/resources/globalTypes/openecomp-heat/data.yml b/common/onap-tosca-datatype/src/main/resources/globalTypes/openecomp-heat/data.yml
index bc1f5efd68..f2e142b03d 100644
--- a/common/onap-tosca-datatype/src/main/resources/globalTypes/openecomp-heat/data.yml
+++ b/common/onap-tosca-datatype/src/main/resources/globalTypes/openecomp-heat/data.yml
@@ -31,12 +31,12 @@ data_types:
       mac_address:
         description: MAC address
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
       ip_address:
         description: IP address
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
 
   org.openecomp.datatypes.heat.novaServer.network.PortExtraProperties:
@@ -46,35 +46,35 @@ data_types:
       port_security_enabled:
         description: Flag to enable/disable port security on the port
         type: boolean
-        status: SUPPORTED
+        status: supported
         required: false
       mac_address:
         description: MAC address to give to this port
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
       admin_state_up:
         description: The administrative state of this port
         type: boolean
-        status: SUPPORTED
+        status: supported
         default: true
         required: false
       qos_policy:
         description: The name or ID of QoS policy to attach to this port
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
       allowed_address_pairs:
         description: Additional MAC/IP address pairs allowed to pass through the port
         type: list
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.network.AddressPair
         required: false
       binding:vnic_type:
         description: The vnic type to be bound on the neutron port
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
         constraints:
         - valid_values:
@@ -84,7 +84,7 @@ data_types:
       value_specs:
         description: Extra parameters to include in the request
         type: map
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
         default: {}
@@ -97,12 +97,12 @@ data_types:
       network_policy_entries_policy_rule_src_ports_start_port:
         description: Start port
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
       network_policy_entries_policy_rule_src_ports_end_port:
         description: End port
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
 
   org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPair:
@@ -112,17 +112,17 @@ data_types:
       address_mode:
         description: Address Mode.
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
       ip:
         description: IP.
         type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairIp
-        status: SUPPORTED
+        status: supported
         required: false
       mac:
         description: Mac.
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
 
   org.openecomp.datatypes.heat.contrailV2.network.rule.DstVirtualNetwork:
@@ -132,7 +132,7 @@ data_types:
       network_policy_entries_policy_rule_dst_addresses_virtual_network:
         description: Destination addresses Virtual network
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
 
   org.openecomp.datatypes.heat.contrailV2.network.rule.Rule:
@@ -142,45 +142,45 @@ data_types:
       network_policy_entries_policy_rule_dst_addresses:
         description: Destination addresses
         type: list
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.contrailV2.network.rule.DstVirtualNetwork
         required: false
       network_policy_entries_policy_rule_dst_ports:
         description: Destination ports
         type: list
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.contrailV2.network.rule.DstPortPairs
         required: false
       network_policy_entries_policy_rule_protocol:
         description: Protocol
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
       network_policy_entries_policy_rule_src_addresses:
         description: Source addresses
         type: list
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.contrailV2.network.rule.SrcVirtualNetwork
         required: false
       network_policy_entries_policy_rule_direction:
         description: Direction
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
       network_policy_entries_policy_rule_src_ports:
         description: Source ports
         type: list
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.contrailV2.network.rule.SrcPortPairs
         required: false
       network_policy_entries_policy_rule_action_list:
         description: Action list
         type: org.openecomp.datatypes.heat.contrailV2.network.rule.ActionList
-        status: SUPPORTED
+        status: supported
         required: false
 
   org.openecomp.datatypes.heat.network.neutron.SecurityRules.Rule:
@@ -190,12 +190,12 @@ data_types:
       remote_group_id:
         description: The remote group ID to be associated with this security group rule
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
       protocol:
         description: The protocol that is matched by the security group rule
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
         constraints:
         - valid_values:
@@ -205,7 +205,7 @@ data_types:
       ethertype:
         description: Ethertype of the traffic
         type: string
-        status: SUPPORTED
+        status: supported
         default: IPv4
         required: false
         constraints:
@@ -216,7 +216,7 @@ data_types:
         description: 'The maximum port number in the range that is matched by the
           security group rule. '
         type: integer
-        status: SUPPORTED
+        status: supported
         required: false
         constraints:
         - in_range:
@@ -225,12 +225,12 @@ data_types:
       remote_ip_prefix:
         description: The remote IP prefix (CIDR) to be associated with this security group rule
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
       remote_mode:
         description: Whether to specify a remote group or a remote IP prefix
         type: string
-        status: SUPPORTED
+        status: supported
         default: remote_ip_prefix
         required: false
         constraints:
@@ -240,7 +240,7 @@ data_types:
       direction:
         description: The direction in which the security group rule is applied
         type: string
-        status: SUPPORTED
+        status: supported
         default: ingress
         required: false
         constraints:
@@ -250,7 +250,7 @@ data_types:
       port_range_min:
         description: The minimum port number in the range that is matched by the security group rule.
         type: integer
-        status: SUPPORTED
+        status: supported
         required: false
         constraints:
         - in_range:
@@ -264,12 +264,12 @@ data_types:
       network_ipam_refs_data_ipam_subnets_subnet_ip_prefix_len:
         description: Network ipam refs data ipam subnets ip prefix len
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
       network_ipam_refs_data_ipam_subnets_subnet_ip_prefix:
         description: Network ipam refs data ipam subnets ip prefix
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
 
   org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.Properties:
@@ -279,7 +279,7 @@ data_types:
       sub_interface_vlan_tag:
         description: Sub Interface VLAN Tag.
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
 
   org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairIp:
@@ -289,12 +289,12 @@ data_types:
       ip_prefix:
         description: IP Prefix.
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
       ip_prefix_len:
         description: IP Prefix Len.
         type: integer
-        status: SUPPORTED
+        status: supported
         required: false
 
   org.openecomp.datatypes.heat.contrailV2.network.rule.SrcVirtualNetwork:
@@ -304,7 +304,7 @@ data_types:
       network_policy_entries_policy_rule_src_addresses_virtual_network:
         description: Source addresses Virtual network
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
 
   org.openecomp.datatypes.heat.contrailV2.network.rule.ActionList:
@@ -314,12 +314,12 @@ data_types:
       network_policy_entries_policy_rule_action_list_simple_action:
         description: Simple Action
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
       network_policy_entries_policy_rule_action_list_apply_service:
         description: Apply Service
         type: list
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
         required: false
@@ -331,7 +331,7 @@ data_types:
       network_ipam_refs_data_ipam_subnets:
         description: Network ipam refs data ipam subnets
         type: list
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.contrailV2.virtual.network.rule.ref.data.IpamSubnetList
         required: false
@@ -343,12 +343,12 @@ data_types:
       file:
         description: The required URI string (relative or absolute) which can be used to locate the file
         type: string
-        status: SUPPORTED
+        status: supported
         required: true
       file_type:
         description: The type of the file
         type: string
-        status: SUPPORTED
+        status: supported
         required: true
         constraints:
         - valid_values:
@@ -364,26 +364,26 @@ data_types:
       static_routes:
         description: An ordered list of static routes to be added to this interface
         type: list
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.network.contrail.port.StaticRoute
         required: false
       virtual_network:
         description: Virtual Network for this interface
         type: string
-        status: SUPPORTED
+        status: supported
         required: true
       allowed_address_pairs:
         description: List of allowed address pair for this interface
         type: list
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.network.contrail.AddressPair
         required: false
       ip_address:
         description: IP for this interface
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
 
   org.openecomp.datatypes.heat.contrailV2.virtual.network.rule.RefData:
@@ -393,7 +393,7 @@ data_types:
       network_policy_refs_data_sequence:
         description: Network Policy ref data sequence
         type: org.openecomp.datatypes.heat.contrailV2.virtual.network.rule.RefDataSequence
-        status: SUPPORTED
+        status: supported
         required: false
 
   org.openecomp.datatypes.heat.contrailV2.network.rule.DstPortPairs:
@@ -403,12 +403,12 @@ data_types:
       network_policy_entries_policy_rule_dst_ports_start_port:
         description: Start port
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
       network_policy_entries_policy_rule_dst_ports_end_port:
         description: End port
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
 
   org.openecomp.datatypes.heat.network.AllocationPool:
@@ -418,12 +418,12 @@ data_types:
       start:
         description: Start address for the allocation pool
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
       end:
         description: End address for the allocation pool
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
 
   org.openecomp.datatypes.heat.contrail.network.rule.PortPairs:
@@ -433,12 +433,12 @@ data_types:
       start_port:
         description: Start port
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
       end_port:
         description: End port
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
 
   org.openecomp.datatypes.heat.contrail.network.rule.VirtualNetwork:
@@ -448,7 +448,7 @@ data_types:
       virtual_network:
         description: Virtual network
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
 
   org.openecomp.datatypes.heat.contrail.network.rule.RuleList:
@@ -458,7 +458,7 @@ data_types:
       policy_rule:
         description: Contrail network rule
         type: list
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.contrail.network.rule.Rule
         required: false
@@ -470,7 +470,7 @@ data_types:
       address_mode:
         description: Address mode active-active or active-standy
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
         constraints:
         - valid_values:
@@ -479,12 +479,12 @@ data_types:
       prefix:
         description: IP address prefix
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
       mac_address:
         description: Mac address
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
 
   org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.MacAddress:
@@ -494,7 +494,7 @@ data_types:
       mac_address:
         description: Mac Addresses List.
         type: list
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
         required: false
@@ -506,12 +506,12 @@ data_types:
       network_ipam_refs_data_ipam_subnets_subnet:
         description: Network ipam refs data ipam subnets
         type: org.openecomp.datatypes.heat.contrailV2.virtual.network.rule.ref.data.IpamSubnet
-        status: SUPPORTED
+        status: supported
         required: false
       network_ipam_refs_data_ipam_subnets_addr_from_start:
         description: Network ipam refs data ipam subnets addr from start
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
 
   org.openecomp.datatypes.heat.contrailV2.network.rule.RuleList:
@@ -521,7 +521,7 @@ data_types:
       network_policy_entries_policy_rule:
         description: Contrail network rule
         type: list
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.contrailV2.network.rule.Rule
         required: false
@@ -533,7 +533,7 @@ data_types:
       port_id:
         description: Port id
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
 
   org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs:
@@ -543,7 +543,7 @@ data_types:
       allowed_address_pair:
         description: Addresses pair List.
         type: list
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPair
         required: false
@@ -555,18 +555,18 @@ data_types:
       subnet:
         description: Subnet in which to allocate the IP address for this port
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
       ip_address:
         description: IP address desired in the subnet for this port
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
       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.contrailV2.virtual.machine.interface.Properties:
@@ -576,7 +576,7 @@ data_types:
       service_interface_type:
         description: Service Interface Type.
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
 
   org.openecomp.datatypes.heat.network.subnet.HostRoute:
@@ -586,12 +586,12 @@ data_types:
       destination:
         description: The destination for static route
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
       nexthop:
         description: The next hop for the destination
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
 
   org.openecomp.datatypes.heat.network.contrail.port.StaticRoute:
@@ -601,17 +601,17 @@ data_types:
       prefix:
         description: Route prefix
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
       next_hop:
         description: Next hop
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
       next_hop_type:
         description: Next hop type
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
 
   org.openecomp.datatypes.heat.substitution.SubstitutionFiltering:
@@ -621,12 +621,12 @@ data_types:
       substitute_service_template:
         description: Substitute Service Template
         type: string
-        status: SUPPORTED
+        status: supported
         required: true
       index_value:
         description: Index value of the substitution service template runtime instance
         type: integer
-        status: SUPPORTED
+        status: supported
         default: 0
         required: false
         constraints:
@@ -634,19 +634,19 @@ data_types:
       count:
         description: Count
         type: integer
-        status: SUPPORTED
+        status: supported
         default: 1
         required: false
       scaling_enabled:
         description: Indicates whether service scaling is enabled
         type: boolean
-        status: SUPPORTED
+        status: supported
         default: true
         required: false
       mandatory:
         description: Mandatory
         type: boolean
-        status: SUPPORTED
+        status: supported
         default: true
         required: false
 
@@ -657,18 +657,18 @@ data_types:
       tenant_id:
         description: The ID of the tenant who owns the network
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
       enable_dhcp:
         description: Set to true if DHCP is enabled and false if DHCP is disabled
         type: boolean
-        status: SUPPORTED
+        status: supported
         default: true
         required: false
       ipv6_address_mode:
         description: IPv6 address mode
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
         constraints:
         - valid_values:
@@ -678,7 +678,7 @@ data_types:
       ipv6_ra_mode:
         description: IPv6 RA (Router Advertisement) mode
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
         constraints:
         - valid_values:
@@ -688,7 +688,7 @@ data_types:
       value_specs:
         description: Extra parameters to include in the request
         type: map
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
         default: {}
@@ -696,19 +696,19 @@ data_types:
       allocation_pools:
         description: The start and end addresses for the allocation pools
         type: list
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.network.AllocationPool
         required: false
       subnetpool:
         description: The name or ID of the subnet pool
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
       dns_nameservers:
         description: A specified set of DNS name servers to be used
         type: list
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
         default: []
@@ -716,14 +716,14 @@ data_types:
       host_routes:
         description: The gateway IP address
         type: list
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.network.subnet.HostRoute
         required: false
       ip_version:
         description: The gateway IP address
         type: integer
-        status: SUPPORTED
+        status: supported
         default: 4
         required: false
         constraints:
@@ -733,24 +733,24 @@ data_types:
       name:
         description: The name of the subnet
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
       prefixlen:
         description: Prefix length for subnet allocation from subnet pool
         type: integer
-        status: SUPPORTED
+        status: supported
         required: false
         constraints:
         - greater_or_equal: 0
       cidr:
         description: The CIDR
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
       gateway_ip:
         description: The gateway IP address
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
 
   org.openecomp.datatypes.heat.contrail.network.rule.Rule:
@@ -760,45 +760,45 @@ data_types:
       src_ports:
         description: Source ports
         type: list
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.contrail.network.rule.PortPairs
         required: false
       protocol:
         description: Protocol
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
       dst_addresses:
         description: Destination addresses
         type: list
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.contrail.network.rule.VirtualNetwork
         required: false
       apply_service:
         description: Service to apply
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
       dst_ports:
         description: Destination ports
         type: list
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.contrail.network.rule.PortPairs
         required: false
       src_addresses:
         description: Source addresses
         type: list
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.contrail.network.rule.VirtualNetwork
         required: false
       direction:
         description: Direction
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
 
   org.openecomp.datatypes.heat.contrailV2.virtual.network.rule.RefDataSequence:
@@ -808,10 +808,10 @@ data_types:
       network_policy_refs_data_sequence_major:
         description: Network Policy ref data sequence Major
         type: integer
-        status: SUPPORTED
+        status: supported
         required: false
       network_policy_refs_data_sequence_minor:
         description: Network Policy ref data sequence Minor
         type: integer
-        status: SUPPORTED
+        status: supported
         required: false
diff --git a/common/onap-tosca-datatype/src/main/resources/globalTypes/openecomp-heat/groups.yml b/common/onap-tosca-datatype/src/main/resources/globalTypes/openecomp-heat/groups.yml
index ded2373e50..36e32a6a9e 100644
--- a/common/onap-tosca-datatype/src/main/resources/globalTypes/openecomp-heat/groups.yml
+++ b/common/onap-tosca-datatype/src/main/resources/globalTypes/openecomp-heat/groups.yml
@@ -31,10 +31,10 @@ group_types:
       heat_file:
         description: Heat file which associate to this group/heat stack
         type: string
-        status: SUPPORTED
+        status: supported
         required: true
       description:
         description: group description
         type: string
-        status: SUPPORTED
+        status: supported
         required: true
diff --git a/common/onap-tosca-datatype/src/main/resources/globalTypes/openecomp-heat/nodes.yml b/common/onap-tosca-datatype/src/main/resources/globalTypes/openecomp-heat/nodes.yml
index c26eaf0bc6..a7fc263750 100644
--- a/common/onap-tosca-datatype/src/main/resources/globalTypes/openecomp-heat/nodes.yml
+++ b/common/onap-tosca-datatype/src/main/resources/globalTypes/openecomp-heat/nodes.yml
@@ -30,46 +30,46 @@ node_types:
       availability_zone:
         description: Availability zone to create servers in
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
       static_routes_list:
         description: Static routes enabled
         type: list
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: boolean
         required: false
       availability_zone_enable:
         description: Indicates availability zone is enabled
         type: boolean
-        status: SUPPORTED
+        status: supported
         default: false
         required: false
       service_template_name:
         description: Service template name
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
       ordered_interfaces:
         description: Indicates if service interface are ordered
         type: boolean
-        status: SUPPORTED
+        status: supported
         default: false
         required: false
       flavor:
         description: flavor
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
       image_name:
         description: Image name
         type: string
-        status: SUPPORTED
+        status: supported
         required: true
       service_type:
         description: Service type
         type: string
-        status: SUPPORTED
+        status: supported
         required: true
         constraints:
         - valid_values:
@@ -80,7 +80,7 @@ node_types:
       service_interface_type_list:
         description: List of interface types
         type: list
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
           constraints:
@@ -93,19 +93,19 @@ node_types:
       service_instance_name:
         description: Service instance name
         type: string
-        status: SUPPORTED
+        status: supported
         required: true
       interface_list:
         description: List of interfaces
         type: list
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.network.contrail.InterfaceData
         required: false
       service_mode:
         description: Service mode
         type: string
-        status: SUPPORTED
+        status: supported
         required: true
         constraints:
         - valid_values:
@@ -115,7 +115,7 @@ node_types:
       shared_ip_list:
         description: Shared ips enabled
         type: list
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: boolean
         required: false
@@ -123,35 +123,35 @@ node_types:
       tenant_id:
         description: Tenant id of the Service Instance
         type: string
-        status: SUPPORTED
+        status: supported
       fq_name:
         description: The FQ name of the service instance
         type: string
-        status: SUPPORTED
+        status: supported
       service_template_name:
         description: Service Template of the Service Instance
         type: string
-        status: SUPPORTED
+        status: supported
       show:
         description: All attributes
         type: string
-        status: SUPPORTED
+        status: supported
       active_vms:
         description: Number of service VMs active for this Service Instance
         type: string
-        status: SUPPORTED
+        status: supported
       service_instance_name:
         description: The name of the service instance
         type: string
-        status: SUPPORTED
+        status: supported
       virtual_machines:
         description: Service VMs for the Service Instance
         type: string
-        status: SUPPORTED
+        status: supported
       status:
         description: Status of the service instance
         type: string
-        status: SUPPORTED
+        status: supported
         
 
   org.openecomp.resource.cp.nodes.heat.contrailV2.VirtualMachineInterface:
@@ -160,56 +160,56 @@ 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
@@ -227,30 +227,30 @@ node_types:
       entries:
         description: A symbolic name for this contrail network rule
         type: org.openecomp.datatypes.heat.contrail.network.rule.RuleList
-        status: SUPPORTED
+        status: supported
         required: false
       name:
         description: A symbolic name for this contrail network rule
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
     attributes:
       tenant_id:
         description: tenant_id
         type: string
-        status: SUPPORTED
+        status: supported
       fq_name:
         description: fq_name
         type: string
-        status: SUPPORTED
+        status: supported
       show:
         description: All attributes.
         type: string
-        status: SUPPORTED
+        status: supported
       rules:
         description: List of rules
         type: list
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
     requirements:
@@ -268,17 +268,17 @@ node_types:
       description:
         description: Description of the security group
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
       name:
         description: A symbolic name for this security group, which is not required to be unique.
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
       rules:
         description: List of security group rules
         type: list
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.network.neutron.SecurityRules.Rule
         required: false
@@ -286,7 +286,7 @@ node_types:
       show:
         description: Detailed information about resource
         type: string
-        status: SUPPORTED
+        status: supported
     requirements:
     - port:
         capability: tosca.capabilities.Attachment
@@ -302,39 +302,39 @@ node_types:
       shared:
         description: Is virtual network shared
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
       forwarding_mode:
         description: forwarding mode of the virtual network
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
       external:
         description: Is virtual network external
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
       allow_transit:
         description: Whether this network should be transitive.
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
       flood_unknown_unicast:
         description: flood L2 packets on network
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
       route_targets:
         description: route targets associated with the virtual network
         type: list
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
         required: false
       subnets:
         description: Network related subnets
         type: map
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.network.neutron.Subnet
         required: false
@@ -342,27 +342,27 @@ node_types:
       fq_name:
         description: fq_name
         type: string
-        status: SUPPORTED
+        status: supported
       show:
         description: All attributes.
         type: string
-        status: SUPPORTED
+        status: supported
       subnets_name:
         description: Subnets name of this network
         type: list
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subnets_show:
         description: Detailed information about each subnet
         type: map
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subnets:
         description: Network related subnets
         type: map
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.network.neutron.Subnet
     capabilities:
@@ -378,22 +378,22 @@ node_types:
       admin_pass:
         description: The administrator password for the server
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
       availability_zone:
         description: Availability zone to create servers in
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
       image:
         description: The ID or name of the image to boot with
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
       image_update_policy:
         description: Policy on how to apply an image-id update
         type: string
-        status: SUPPORTED
+        status: supported
         default: REBUILD
         required: false
         constraints:
@@ -404,18 +404,18 @@ node_types:
       metadata:
         description: Arbitrary JSON metadata to store for this server
         type: json
-        status: SUPPORTED
+        status: supported
         required: false
       contrail_service_instance_ind:
         description: Nova server related to service instance indicator
         type: boolean
-        status: SUPPORTED
+        status: supported
         default: false
         required: false
       user_data_update_policy:
         description: Policy on how to apply a user_data update
         type: string
-        status: SUPPORTED
+        status: supported
         default: REPLACE
         required: false
         constraints:
@@ -425,7 +425,7 @@ node_types:
       flavor_update_policy:
         description: Policy on how to apply a flavor update
         type: string
-        status: SUPPORTED
+        status: supported
         default: RESIZE
         required: false
         constraints:
@@ -435,28 +435,28 @@ node_types:
       user_data:
         description: User data script to be executed by cloud-init
         type: string
-        status: SUPPORTED
+        status: supported
         default: ''
         required: false
       flavor:
         description: The ID or name of the flavor to boot onto
         type: string
-        status: SUPPORTED
+        status: supported
         required: true
       key_name:
         description: Name of keypair to inject into the server
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
       reservation_id:
         description: A UUID for the set of servers being requested
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
       security_groups:
         description: List of security group names or IDs
         type: list
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
         default: []
@@ -464,12 +464,12 @@ node_types:
       config_drive:
         description: enable config drive on the server
         type: boolean
-        status: SUPPORTED
+        status: supported
         required: false
       personality:
         description: A map of files to create/overwrite on the server upon boot
         type: map
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
         default: {}
@@ -477,7 +477,7 @@ node_types:
       software_config_transport:
         description: How the server should receive the metadata required for software configuration
         type: string
-        status: SUPPORTED
+        status: supported
         default: POLL_SERVER_CFN
         required: false
         constraints:
@@ -489,7 +489,7 @@ node_types:
       user_data_format:
         description: How the user_data should be formatted for the server
         type: string
-        status: SUPPORTED
+        status: supported
         default: HEAT_CFNTOOLS
         required: false
         constraints:
@@ -500,7 +500,7 @@ node_types:
       diskConfig:
         description: Control how the disk is partitioned when the server is created
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
         constraints:
         - valid_values:
@@ -509,12 +509,12 @@ node_types:
       name:
         description: Server name
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
       scheduler_hints:
         description: Arbitrary key-value pairs specified by the client to help boot a server
         type: map
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
         required: false
@@ -522,33 +522,33 @@ node_types:
       accessIPv4:
         description: The manually assigned alternative public IPv4 address of the server
         type: string
-        status: SUPPORTED
+        status: supported
       addresses:
         description: A dict of all network addresses with corresponding port_id
         type: map
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.novaServer.network.AddressInfo
       accessIPv6:
         description: The manually assigned alternative public IPv6 address of the server
         type: string
-        status: SUPPORTED
+        status: supported
       instance_name:
         description: AWS compatible instance name
         type: string
-        status: SUPPORTED
+        status: supported
       name:
         description: Name of the server
         type: string
-        status: SUPPORTED
+        status: supported
       show:
         description: Detailed information about resource
         type: string
-        status: SUPPORTED
+        status: supported
       console_urls:
         description: URLs of servers consoles
         type: string
-        status: SUPPORTED
+        status: supported
 
   org.openecomp.resource.vfc.rules.nodes.heat.network.contrailV2.NetworkRules:
     derived_from: tosca.nodes.Root
@@ -556,18 +556,18 @@ node_types:
       name:
         description: A symbolic name for this contrail v2 network rule
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
       network_policy_entries:
         description: A symbolic name for this contrail v2 network rule
         type: org.openecomp.datatypes.heat.contrailV2.network.rule.RuleList
-        status: SUPPORTED
+        status: supported
         required: false
     attributes:
       fq_name:
         description: fq_name
         type: string
-        status: SUPPORTED
+        status: supported
     requirements:
     - network:
         capability: tosca.capabilities.Attachment
@@ -583,29 +583,29 @@ node_types:
       port_security_enabled:
         description: Flag to enable/disable port security on the network
         type: boolean
-        status: SUPPORTED
+        status: supported
         required: false
       device_id:
         description: Device ID of this port
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
       qos_policy:
         description: The name or ID of QoS policy to attach to this network
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
       allowed_address_pairs:
         description: Additional MAC/IP address pairs allowed to pass through the port
         type: list
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.network.AddressPair
         required: false
       binding:vnic_type:
         description: The vnic type to be bound on the neutron port
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
         constraints:
         - valid_values:
@@ -615,7 +615,7 @@ node_types:
       value_specs:
         description: Extra parameters to include in the request
         type: map
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
         default: {}
@@ -623,17 +623,17 @@ node_types:
       device_owner:
         description: Name of the network owning the port
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
       network:
         description: Network this port belongs to
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
       replacement_policy:
         description: Policy on how to respond to a stack-update for this resource
         type: string
-        status: SUPPORTED
+        status: supported
         default: AUTO
         required: false
         constraints:
@@ -643,60 +643,60 @@ node_types:
       security_groups:
         description: List of security group names or IDs
         type: list
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
         required: false
       fixed_ips:
         description: Desired IPs for this port
         type: list
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
         required: false
       mac_address:
         description: MAC address to give to this port
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
       admin_state_up:
         description: A boolean value specifying the administrative status of the network
         type: boolean
-        status: SUPPORTED
+        status: supported
         default: true
         required: false
       name:
         description: A symbolic name for this port
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
     attributes:
       tenant_id:
         description: Tenant owning the port
         type: string
-        status: SUPPORTED
+        status: supported
       network_id:
         description: Unique identifier for the network owning the port
         type: string
-        status: SUPPORTED
+        status: supported
       qos_policy_id:
         description: The QoS policy ID attached to this network
         type: string
-        status: SUPPORTED
+        status: supported
       show:
         description: Detailed information about resource
         type: string
-        status: SUPPORTED
+        status: supported
       subnets:
         description: Subnets of this network
         type: list
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       status:
         description: The status of the network
         type: string
-        status: SUPPORTED
+        status: supported
     capabilities:
       attachment:
         type: tosca.capabilities.Attachment
@@ -718,48 +718,48 @@ node_types:
       dhcp_agent_ids:
         description: The IDs of the DHCP agent to schedule the network
         type: list
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
         required: false
       tenant_id:
         description: The ID of the tenant which will own the network
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
       port_security_enabled:
         description: Flag to enable/disable port security on the network
         type: boolean
-        status: SUPPORTED
+        status: supported
         required: false
       shared:
         description: Whether this network should be shared across all tenants
         type: boolean
-        status: SUPPORTED
+        status: supported
         default: false
         required: false
       admin_state_up:
         description: A boolean value specifying the administrative status of the network
         type: boolean
-        status: SUPPORTED
+        status: supported
         default: true
         required: false
       qos_policy:
         description: The name or ID of QoS policy to attach to this network
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
       subnets:
         description: Network related subnets
         type: map
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.network.neutron.Subnet
         required: false
       value_specs:
         description: Extra parameters to include in the request
         type: map
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
         default: {}
@@ -768,31 +768,31 @@ node_types:
       qos_policy_id:
         description: The QoS policy ID attached to this network
         type: string
-        status: SUPPORTED
+        status: supported
       show:
         description: Detailed information about resource
         type: string
-        status: SUPPORTED
+        status: supported
       subnets_name:
         description: Subnets name of this network
         type: list
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subnets:
         description: Network related subnets
         type: map
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.network.neutron.Subnet
       mtu:
         description: The maximum transmission unit size(in bytes) for the network
         type: scalar-unit.size
-        status: SUPPORTED
+        status: supported
       status:
         description: The status of the network
         type: string
-        status: SUPPORTED
+        status: supported
     capabilities:
       attachment:
         type: tosca.capabilities.Attachment
@@ -806,43 +806,43 @@ node_types:
       static_routes:
         description: An ordered list of static routes to be added to this interface
         type: list
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.network.contrail.port.StaticRoute
         required: false
       virtual_network:
         description: Virtual Network for this interface
         type: string
-        status: SUPPORTED
+        status: supported
         required: true
       static_route:
         description: Static route enabled
         type: boolean
-        status: SUPPORTED
+        status: supported
         default: false
         required: false
       allowed_address_pairs:
         description: List of allowed address pair for this interface
         type: list
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.network.contrail.AddressPair
         required: false
       shared_ip:
         description: Shared ip enabled
         type: boolean
-        status: SUPPORTED
+        status: supported
         default: false
         required: false
       ip_address:
         description: IP for this interface
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
       interface_type:
         description: Interface type
         type: string
-        status: SUPPORTED
+        status: supported
         required: true
         constraints:
         - valid_values:
@@ -854,7 +854,7 @@ node_types:
       fq_name:
         description: fq_name
         type: string
-        status: SUPPORTED
+        status: supported
 
   org.openecomp.resource.vfc.nodes.heat.contrail.Compute:
     derived_from: org.openecomp.resource.vfc.nodes.Compute
@@ -862,22 +862,22 @@ node_types:
       flavor:
         description: flavor
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
       image_name:
         description: Image name
         type: string
-        status: SUPPORTED
+        status: supported
         required: true
       availability_zone:
         description: Availability zone to create servers in
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
       service_type:
         description: Service type
         type: string
-        status: SUPPORTED
+        status: supported
         required: true
         constraints:
         - valid_values:
@@ -888,23 +888,23 @@ node_types:
       availability_zone_enable:
         description: Indicates availability zone is enabled
         type: boolean
-        status: SUPPORTED
+        status: supported
         default: false
         required: false
       service_template_name:
         description: Service template name
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
       service_instance_name:
         description: Service instance name
         type: string
-        status: SUPPORTED
+        status: supported
         required: true
       service_mode:
         description: Service mode
         type: string
-        status: SUPPORTED
+        status: supported
         required: true
         constraints:
         - valid_values:
@@ -915,27 +915,27 @@ node_types:
       tenant_id:
         description: Tenant id of the VM
         type: string
-        status: SUPPORTED
+        status: supported
       fq_name:
         description: fq_name
         type: string
-        status: SUPPORTED
+        status: supported
       show:
         description: All attributes
         type: string
-        status: SUPPORTED
+        status: supported
       active_vms:
         description: Number of active VMs
         type: string
-        status: SUPPORTED
+        status: supported
       virtual_machines:
         description: VMs of this compute
         type: string
-        status: SUPPORTED
+        status: supported
       status:
         description: status of the compute
         type: string
-        status: SUPPORTED
+        status: supported
 
   org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface:
     derived_from: org.openecomp.resource.cp.nodes.network.v2.SubInterface
@@ -943,48 +943,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
@@ -992,11 +992,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
 
   org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface:
     derived_from: org.openecomp.resource.cp.nodes.network.SubInterface
@@ -1004,48 +1004,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
@@ -1053,11 +1053,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
@@ -1073,35 +1073,35 @@ node_types:
       network_ipam_refs_data:
         description: IPAM references Data
         type: list
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.contrailV2.virtual.network.rule.IpamRefData
         required: false
       network_policy_refs_data:
         description: Policy references data
         type: list
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.contrailV2.virtual.network.rule.RefData
         required: false
       network_ipam_refs:
         description: IPAM references
         type: list
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
         required: false
       network_policy_refs:
         description: Policy references
         type: list
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
         required: false
       subnets:
         description: Network related subnets
         type: map
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.network.neutron.Subnet
         required: false
@@ -1109,23 +1109,23 @@ node_types:
       fq_name:
         description: fq_name
         type: string
-        status: SUPPORTED
+        status: supported
       subnets_name:
         description: Subnets name of this network
         type: list
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subnets_show:
         description: Detailed information about each subnet
         type: map
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subnets:
         description: Network related subnets
         type: map
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.network.neutron.Subnet
     capabilities:
@@ -1141,34 +1141,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:
@@ -1178,7 +1178,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:
@@ -1190,95 +1190,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/common/onap-tosca-datatype/src/main/resources/globalTypes/openecomp/capabilities.yml b/common/onap-tosca-datatype/src/main/resources/globalTypes/openecomp/capabilities.yml
index 979cd95b96..8505f41a4a 100644
--- a/common/onap-tosca-datatype/src/main/resources/globalTypes/openecomp/capabilities.yml
+++ b/common/onap-tosca-datatype/src/main/resources/globalTypes/openecomp/capabilities.yml
@@ -32,7 +32,7 @@ capability_types:
         type: map
         description: Deployment flavors instance
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
             type: org.openecomp.datatypes.DeploymentFlavor     
 
@@ -43,7 +43,7 @@ capability_types:
       oid:
         description: Object Id of the metric
         type: string
-        status: SUPPORTED
+        status: supported
         required: true
 
   org.openecomp.capabilities.AllottedResource:
@@ -56,7 +56,7 @@ capability_types:
       oid:
         description: Object Id of the metric
         type: string
-        status: SUPPORTED
+        status: supported
         required: true
 
   org.openecomp.capabilities.metric.Ceilometer:
@@ -66,7 +66,7 @@ capability_types:
       name:
         description: Ceilometer metric type name to monitor. (The name ceilometer is using)
         type: string
-        status: SUPPORTED
+        status: supported
         required: true
 
   org.openecomp.capabilities.Metric:
@@ -76,28 +76,28 @@ capability_types:
       unit:
         description: Unit of the metric value
         type: string
-        status: SUPPORTED
+        status: supported
         required: true
       description:
         description: Description of the metric
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
       type:
         description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
         type: string
-        status: SUPPORTED
+        status: supported
         required: true
       category:
         description: Category of the metric, for an example, compute, disk, network, storage and etc.
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
     attributes:
       value:
         description: Runtime monitored value
         type: string
-        status: SUPPORTED
+        status: supported
 
   org.openecomp.capabilities.Forwarder:
       derived_from: tosca.capabilities.Root
diff --git a/common/onap-tosca-datatype/src/main/resources/globalTypes/openecomp/data.yml b/common/onap-tosca-datatype/src/main/resources/globalTypes/openecomp/data.yml
index b87cbb7b51..27577d4883 100644
--- a/common/onap-tosca-datatype/src/main/resources/globalTypes/openecomp/data.yml
+++ b/common/onap-tosca-datatype/src/main/resources/globalTypes/openecomp/data.yml
@@ -68,17 +68,17 @@ data_types:
       name:
         description: Deployment Flavor Name
         type: string
-        status: SUPPORTED
+        status: supported
         required: true
       license_feature_group:
         description: license feature group associated with Deployment Flavor
         type: org.openecomp.datatypes.FeatureGroup
-        status: SUPPORTED
+        status: supported
         required: true
       compute_size:
         description: Size of VM
         type: org.openecomp.datatypes.ComputeFlavor
-        status: SUPPORTED
+        status: supported
         required: true
 
   org.openecomp.datatypes.FeatureGroup:
@@ -88,12 +88,12 @@ data_types:
       license_feature_group_ref:
         description: Deployment Flavor Name
         type: string
-        status: SUPPORTED
+        status: supported
         required: true
       part_number:
         description: refrence part number related to feature group
         type: string
-        status: SUPPORTED
+        status: supported
         required: true
 
   org.openecomp.datatypes.EcompHoming:
@@ -242,22 +242,22 @@ data_types:
       name:
         description: Compute Flavor Name
         type: string
-        status: SUPPORTED
+        status: supported
         required: true
       num_cpus:
         description: Number of cpu
         type: integer
-        status: SUPPORTED
+        status: supported
         required: true
       disk_size:
         description: Disk size
         type: scalar-unit.size
-        status: SUPPORTED
+        status: supported
         required: true
       mem_size:
         description: Memory size
         type: scalar-unit.size
-        status: SUPPORTED
+        status: supported
         required: true
 
   org.openecomp.datatypes.network.MacAssignments:
@@ -374,12 +374,12 @@ data_types:
       substitute_service_template:
         description: Substitute Service Template
         type: string
-        status: SUPPORTED
+        status: supported
         required: true
       index_value:
         description: Index value of the substitution service template runtime instance
         type: integer
-        status: SUPPORTED
+        status: supported
         default: 0
         required: false
         constraints:
@@ -387,19 +387,19 @@ data_types:
       count:
         description: Count
         type: integer
-        status: SUPPORTED
+        status: supported
         default: 1
         required: false
       scaling_enabled:
         description: Indicates whether service scaling is enabled
         type: boolean
-        status: SUPPORTED
+        status: supported
         default: true
         required: false
       mandatory:
         description: Mandatory
         type: boolean
-        status: SUPPORTED
+        status: supported
         required: false
 
   org.openecomp.datatypes.network.NetworkFlows:
diff --git a/common/onap-tosca-datatype/src/main/resources/globalTypes/openecomp/groups.yml b/common/onap-tosca-datatype/src/main/resources/globalTypes/openecomp/groups.yml
index 904f9cdd33..f9ecfb2ca8 100644
--- a/common/onap-tosca-datatype/src/main/resources/globalTypes/openecomp/groups.yml
+++ b/common/onap-tosca-datatype/src/main/resources/globalTypes/openecomp/groups.yml
@@ -52,7 +52,7 @@ group_types:
       isBase:
         description: Whether this module should be deployed before other modules
         type: boolean
-        status: SUPPORTED
+        status: supported
         default: false
         required: true
       vf_module_label:
diff --git a/common/onap-tosca-datatype/src/main/resources/globalTypes/openecomp/nodes.yml b/common/onap-tosca-datatype/src/main/resources/globalTypes/openecomp/nodes.yml
index b788c1f5e6..ad7475a04f 100644
--- a/common/onap-tosca-datatype/src/main/resources/globalTypes/openecomp/nodes.yml
+++ b/common/onap-tosca-datatype/src/main/resources/globalTypes/openecomp/nodes.yml
@@ -43,7 +43,7 @@ node_types:
       service_template_filter:
         description: Substitution Filter
         type: org.openecomp.datatypes.substitution.SubstitutionFiltering
-        status: SUPPORTED
+        status: supported
         required: true
 
   org.openecomp.resource.vl.extVL:
@@ -308,7 +308,7 @@ node_types:
       license_feature_group_ref:
         description: refrence to license feature group
         type: string
-        status: SUPPORTED
+        status: supported
         required: true
     requirements:
     - deployment_flavor:
@@ -328,47 +328,47 @@ node_types:
       high_availablity:
         description: high_availablity
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
       vm_image_name:
         description: Master image_name volume id
         type: string
-        status: SUPPORTED
+        status: supported
         required: true
       vm_flavor_name:
         description: Master image_name volume id
         type: string
-        status: SUPPORTED
+        status: supported
         required: true
       nfc_naming_code:
         description: nfc code for instance naming
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
       nfc_code:
         type: string
         description: nfc code
-        status: SUPPORTED
+        status: supported
         required: false
       nfc_function:
         type: string
         description: nfc function
-        status: SUPPORTED
+        status: supported
         required: false
       vm_type_tag:
         description: vm type based on naming Convention
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
       vfc_naming:
         description: vfc naming
         type: org.openecomp.datatypes.Naming
-        status: SUPPORTED
+        status: supported
         required: false
       min_instances:
         description: Minimum number of VFC Instances
         type: integer
-        status: SUPPORTED
+        status: supported
         default: 0
         required: false
         constraints:
@@ -376,7 +376,7 @@ node_types:
       max_instances:
         description: Maximum number of VFC Instances
         type: integer
-        status: SUPPORTED
+        status: supported
         required: false
         constraints:
         - greater_or_equal: 1
@@ -669,29 +669,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
@@ -703,25 +703,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
@@ -730,59 +730,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
@@ -797,25 +797,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:
@@ -823,17 +823,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
@@ -844,7 +844,7 @@ node_types:
       fq_name:
         type: string
         description: fq_name
-        status: SUPPORTED
+        status: supported
 
   org.openecomp.resource.cp.v2.extVirtualMachineInterfaceCP:
     derived_from: org.openecomp.resource.cp.v2.extCP
@@ -852,55 +852,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
 
   org.openecomp.nodes.ForwardingPath:
     derived_from: tosca.nodes.Root
diff --git a/common/onap-tosca-datatype/src/main/resources/globalTypes/openecomp/relationships.yml b/common/onap-tosca-datatype/src/main/resources/globalTypes/openecomp/relationships.yml
index d15c56e079..14e123f713 100644
--- a/common/onap-tosca-datatype/src/main/resources/globalTypes/openecomp/relationships.yml
+++ b/common/onap-tosca-datatype/src/main/resources/globalTypes/openecomp/relationships.yml
@@ -31,18 +31,18 @@ relationship_types:
       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.AttachesTo:
     derived_from: tosca.relationships.AttachesTo
@@ -51,7 +51,7 @@ relationship_types:
       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.ForwardsTo:
diff --git a/common/onap-tosca-datatype/src/test/java/org/onap/sdc/tosca/datatypes/model/AttributeDefinitionTest.java b/common/onap-tosca-datatype/src/test/java/org/onap/sdc/tosca/datatypes/model/AttributeDefinitionTest.java
index 237832971f..deab74f567 100644
--- a/common/onap-tosca-datatype/src/test/java/org/onap/sdc/tosca/datatypes/model/AttributeDefinitionTest.java
+++ b/common/onap-tosca-datatype/src/test/java/org/onap/sdc/tosca/datatypes/model/AttributeDefinitionTest.java
@@ -40,7 +40,7 @@ public class AttributeDefinitionTest {
         attributeDefinition.setType("type");
         attributeDefinition.setDescription("description");
         attributeDefinition.set_default("default");
-        attributeDefinition.setStatus(Status.SUPPORTED);
+        attributeDefinition.setStatus(Status.SUPPORTED.getName());
         attributeDefinition.setEntry_schema(new EntrySchema());
 
         AttributeDefinition cloned = attributeDefinition.clone();
diff --git a/common/onap-tosca-datatype/src/test/java/org/onap/sdc/tosca/datatypes/model/PropertyDefinitionTest.java b/common/onap-tosca-datatype/src/test/java/org/onap/sdc/tosca/datatypes/model/PropertyDefinitionTest.java
index d9f1cc9a85..d81645129e 100644
--- a/common/onap-tosca-datatype/src/test/java/org/onap/sdc/tosca/datatypes/model/PropertyDefinitionTest.java
+++ b/common/onap-tosca-datatype/src/test/java/org/onap/sdc/tosca/datatypes/model/PropertyDefinitionTest.java
@@ -25,7 +25,7 @@ public class PropertyDefinitionTest {
     public void cloneTest() {
         PropertyDefinition propertyDefinition = new PropertyDefinition();
         propertyDefinition.setRequired(false);
-        propertyDefinition.setStatus(Status.DEPRECATED);
+        propertyDefinition.setStatus(Status.DEPRECATED.getName());
         Constraint constraint = new Constraint();
         constraint.setEqual("123");
         ArrayList<Constraint> constraints = new ArrayList<>();
@@ -34,8 +34,8 @@ public class PropertyDefinitionTest {
 
         PropertyDefinition propertyDefinitionClone = propertyDefinition.clone();
         Assert.assertEquals(propertyDefinition.getRequired(), propertyDefinitionClone.getRequired());
-        Assert.assertEquals(propertyDefinition.getStatus().getDisplayName(),
-                propertyDefinitionClone.getStatus().getDisplayName());
+        Assert.assertEquals(propertyDefinition.getStatus(),
+                propertyDefinitionClone.getStatus());
         Assert.assertEquals(propertyDefinition.getConstraints().get(0).getEqual(),
                 propertyDefinitionClone.getConstraints().get(0).getEqual());
     }
diff --git a/common/onap-tosca-datatype/src/test/java/org/onap/sdc/tosca/services/DataModelCloneUtilTest.java b/common/onap-tosca-datatype/src/test/java/org/onap/sdc/tosca/services/DataModelCloneUtilTest.java
index ee6d858c82..d24d32c8d5 100644
--- a/common/onap-tosca-datatype/src/test/java/org/onap/sdc/tosca/services/DataModelCloneUtilTest.java
+++ b/common/onap-tosca-datatype/src/test/java/org/onap/sdc/tosca/services/DataModelCloneUtilTest.java
@@ -161,8 +161,8 @@ public class DataModelCloneUtilTest {
         Assert.assertEquals(originalMap.get(KEY1).getDescription(), cloneMap.get(KEY1).getDescription());
         Assert.assertEquals(originalMap.get(KEY2).getDescription(), cloneMap.get(KEY2).getDescription());
         Assert.assertEquals(originalMap.get(KEY1).getImplementation(), cloneMap.get(KEY1).getImplementation());
-        Assert.assertEquals(originalMap.get(KEY2).getInputs().get(INPUT_KEY1).getStatus().getDisplayName(),
-                cloneMap.get(DataModelCloneUtilTest.KEY2).getInputs().get(INPUT_KEY1).getStatus().getDisplayName());
+        Assert.assertEquals(originalMap.get(KEY2).getInputs().get(INPUT_KEY1).getStatus(),
+                cloneMap.get(DataModelCloneUtilTest.KEY2).getInputs().get(INPUT_KEY1).getStatus());
         Assert.assertEquals(originalMap.get(KEY2).getInputs().get(INPUT_KEY1).getConstraints().get(0).getEqual(),
                 cloneMap.get(KEY2).getInputs().get(INPUT_KEY1).getConstraints().get(0).getEqual());
     }
@@ -170,7 +170,7 @@ public class DataModelCloneUtilTest {
     private PropertyDefinition createPropertyDefinition() {
         PropertyDefinition propertyDefinition = new PropertyDefinition();
         propertyDefinition.setRequired(false);
-        propertyDefinition.setStatus(Status.UNSUPPORTED);
+        propertyDefinition.setStatus(Status.UNSUPPORTED.getName());
         Constraint constraint = new Constraint();
         constraint.setEqual("1234");
         ArrayList<Constraint> constraints = new ArrayList<>();
diff --git a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/resources/extractServiceComposition/toscaGlobalServiceTemplates/openecomp-heat/data.yml b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/resources/extractServiceComposition/toscaGlobalServiceTemplates/openecomp-heat/data.yml
index f320a9879b..b469eb567f 100644
--- a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/resources/extractServiceComposition/toscaGlobalServiceTemplates/openecomp-heat/data.yml
+++ b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/resources/extractServiceComposition/toscaGlobalServiceTemplates/openecomp-heat/data.yml
@@ -31,12 +31,12 @@ data_types:
       mac_address:
         description: MAC address
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
       ip_address:
         description: IP address
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
 
   org.openecomp.datatypes.heat.novaServer.network.PortExtraProperties:
@@ -46,35 +46,35 @@ data_types:
       port_security_enabled:
         description: Flag to enable/disable port security on the port
         type: boolean
-        status: SUPPORTED
+        status: supported
         required: false
       mac_address:
         description: MAC address to give to this port
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
       admin_state_up:
         description: The administrative state of this port
         type: boolean
-        status: SUPPORTED
+        status: supported
         default: true
         required: false
       qos_policy:
         description: The name or ID of QoS policy to attach to this port
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
       allowed_address_pairs:
         description: Additional MAC/IP address pairs allowed to pass through the port
         type: list
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.network.AddressPair
         required: false
       binding:vnic_type:
         description: The vnic type to be bound on the neutron port
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
         constraints:
         - valid_values:
@@ -84,7 +84,7 @@ data_types:
       value_specs:
         description: Extra parameters to include in the request
         type: map
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
         default: {}
@@ -97,12 +97,12 @@ data_types:
       network_policy_entries_policy_rule_src_ports_start_port:
         description: Start port
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
       network_policy_entries_policy_rule_src_ports_end_port:
         description: End port
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
 
   org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPair:
@@ -112,17 +112,17 @@ data_types:
       address_mode:
         description: Address Mode.
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
       ip:
         description: IP.
         type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairIp
-        status: SUPPORTED
+        status: supported
         required: false
       mac:
         description: Mac.
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
 
   org.openecomp.datatypes.heat.contrailV2.network.rule.DstVirtualNetwork:
@@ -132,7 +132,7 @@ data_types:
       network_policy_entries_policy_rule_dst_addresses_virtual_network:
         description: Destination addresses Virtual network
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
 
   org.openecomp.datatypes.heat.contrailV2.network.rule.Rule:
@@ -142,45 +142,45 @@ data_types:
       network_policy_entries_policy_rule_dst_addresses:
         description: Destination addresses
         type: list
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.contrailV2.network.rule.DstVirtualNetwork
         required: false
       network_policy_entries_policy_rule_dst_ports:
         description: Destination ports
         type: list
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.contrailV2.network.rule.DstPortPairs
         required: false
       network_policy_entries_policy_rule_protocol:
         description: Protocol
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
       network_policy_entries_policy_rule_src_addresses:
         description: Source addresses
         type: list
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.contrailV2.network.rule.SrcVirtualNetwork
         required: false
       network_policy_entries_policy_rule_direction:
         description: Direction
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
       network_policy_entries_policy_rule_src_ports:
         description: Source ports
         type: list
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.contrailV2.network.rule.SrcPortPairs
         required: false
       network_policy_entries_policy_rule_action_list:
         description: Action list
         type: org.openecomp.datatypes.heat.contrailV2.network.rule.ActionList
-        status: SUPPORTED
+        status: supported
         required: false
 
   org.openecomp.datatypes.heat.network.neutron.SecurityRules.Rule:
@@ -190,12 +190,12 @@ data_types:
       remote_group_id:
         description: The remote group ID to be associated with this security group rule
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
       protocol:
         description: The protocol that is matched by the security group rule
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
         constraints:
         - valid_values:
@@ -205,7 +205,7 @@ data_types:
       ethertype:
         description: Ethertype of the traffic
         type: string
-        status: SUPPORTED
+        status: supported
         default: IPv4
         required: false
         constraints:
@@ -216,7 +216,7 @@ data_types:
         description: 'The maximum port number in the range that is matched by the
           security group rule. '
         type: integer
-        status: SUPPORTED
+        status: supported
         required: false
         constraints:
         - in_range:
@@ -225,12 +225,12 @@ data_types:
       remote_ip_prefix:
         description: The remote IP prefix (CIDR) to be associated with this security group rule
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
       remote_mode:
         description: Whether to specify a remote group or a remote IP prefix
         type: string
-        status: SUPPORTED
+        status: supported
         default: remote_ip_prefix
         required: false
         constraints:
@@ -240,7 +240,7 @@ data_types:
       direction:
         description: The direction in which the security group rule is applied
         type: string
-        status: SUPPORTED
+        status: supported
         default: ingress
         required: false
         constraints:
@@ -250,7 +250,7 @@ data_types:
       port_range_min:
         description: The minimum port number in the range that is matched by the security group rule.
         type: integer
-        status: SUPPORTED
+        status: supported
         required: false
         constraints:
         - in_range:
@@ -264,12 +264,12 @@ data_types:
       network_ipam_refs_data_ipam_subnets_subnet_ip_prefix_len:
         description: Network ipam refs data ipam subnets ip prefix len
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
       network_ipam_refs_data_ipam_subnets_subnet_ip_prefix:
         description: Network ipam refs data ipam subnets ip prefix
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
 
   org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.Properties:
@@ -279,7 +279,7 @@ data_types:
       sub_interface_vlan_tag:
         description: Sub Interface VLAN Tag.
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
 
   org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairIp:
@@ -289,12 +289,12 @@ data_types:
       ip_prefix:
         description: IP Prefix.
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
       ip_prefix_len:
         description: IP Prefix Len.
         type: integer
-        status: SUPPORTED
+        status: supported
         required: false
 
   org.openecomp.datatypes.heat.contrailV2.network.rule.SrcVirtualNetwork:
@@ -304,7 +304,7 @@ data_types:
       network_policy_entries_policy_rule_src_addresses_virtual_network:
         description: Source addresses Virtual network
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
 
   org.openecomp.datatypes.heat.contrailV2.network.rule.ActionList:
@@ -314,12 +314,12 @@ data_types:
       network_policy_entries_policy_rule_action_list_simple_action:
         description: Simple Action
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
       network_policy_entries_policy_rule_action_list_apply_service:
         description: Apply Service
         type: list
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
         required: false
@@ -331,7 +331,7 @@ data_types:
       network_ipam_refs_data_ipam_subnets:
         description: Network ipam refs data ipam subnets
         type: list
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.contrailV2.virtual.network.rule.ref.data.IpamSubnetList
         required: false
@@ -343,12 +343,12 @@ data_types:
       file:
         description: The required URI string (relative or absolute) which can be used to locate the file
         type: string
-        status: SUPPORTED
+        status: supported
         required: true
       file_type:
         description: The type of the file
         type: string
-        status: SUPPORTED
+        status: supported
         required: true
         constraints:
         - valid_values:
@@ -364,26 +364,26 @@ data_types:
       static_routes:
         description: An ordered list of static routes to be added to this interface
         type: list
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.network.contrail.port.StaticRoute
         required: false
       virtual_network:
         description: Virtual Network for this interface
         type: string
-        status: SUPPORTED
+        status: supported
         required: true
       allowed_address_pairs:
         description: List of allowed address pair for this interface
         type: list
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.network.contrail.AddressPair
         required: false
       ip_address:
         description: IP for this interface
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
 
   org.openecomp.datatypes.heat.contrailV2.virtual.network.rule.RefData:
@@ -393,7 +393,7 @@ data_types:
       network_policy_refs_data_sequence:
         description: Network Policy ref data sequence
         type: org.openecomp.datatypes.heat.contrailV2.virtual.network.rule.RefDataSequence
-        status: SUPPORTED
+        status: supported
         required: false
 
   org.openecomp.datatypes.heat.contrailV2.network.rule.DstPortPairs:
@@ -403,12 +403,12 @@ data_types:
       network_policy_entries_policy_rule_dst_ports_start_port:
         description: Start port
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
       network_policy_entries_policy_rule_dst_ports_end_port:
         description: End port
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
 
   org.openecomp.datatypes.heat.network.AllocationPool:
@@ -418,12 +418,12 @@ data_types:
       start:
         description: Start address for the allocation pool
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
       end:
         description: End address for the allocation pool
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
 
   org.openecomp.datatypes.heat.contrail.network.rule.PortPairs:
@@ -433,12 +433,12 @@ data_types:
       start_port:
         description: Start port
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
       end_port:
         description: End port
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
 
   org.openecomp.datatypes.heat.contrail.network.rule.VirtualNetwork:
@@ -448,7 +448,7 @@ data_types:
       virtual_network:
         description: Virtual network
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
 
   org.openecomp.datatypes.heat.contrail.network.rule.RuleList:
@@ -458,7 +458,7 @@ data_types:
       policy_rule:
         description: Contrail network rule
         type: list
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.contrail.network.rule.Rule
         required: false
@@ -470,7 +470,7 @@ data_types:
       address_mode:
         description: Address mode active-active or active-standy
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
         constraints:
         - valid_values:
@@ -479,12 +479,12 @@ data_types:
       prefix:
         description: IP address prefix
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
       mac_address:
         description: Mac address
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
 
   org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.MacAddress:
@@ -494,7 +494,7 @@ data_types:
       mac_address:
         description: Mac Addresses List.
         type: list
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
         required: false
@@ -506,12 +506,12 @@ data_types:
       network_ipam_refs_data_ipam_subnets_subnet:
         description: Network ipam refs data ipam subnets
         type: org.openecomp.datatypes.heat.contrailV2.virtual.network.rule.ref.data.IpamSubnet
-        status: SUPPORTED
+        status: supported
         required: false
       network_ipam_refs_data_ipam_subnets_addr_from_start:
         description: Network ipam refs data ipam subnets addr from start
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
 
   org.openecomp.datatypes.heat.contrailV2.network.rule.RuleList:
@@ -521,7 +521,7 @@ data_types:
       network_policy_entries_policy_rule:
         description: Contrail network rule
         type: list
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.contrailV2.network.rule.Rule
         required: false
@@ -533,7 +533,7 @@ data_types:
       port_id:
         description: Port id
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
 
   org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs:
@@ -543,7 +543,7 @@ data_types:
       allowed_address_pair:
         description: Addresses pair List.
         type: list
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPair
         required: false
@@ -555,12 +555,12 @@ data_types:
       subnet:
         description: Subnet in which to allocate the IP address for this port
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
       ip_address:
         description: IP address desired in the subnet for this port
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
 
   org.openecomp.datatypes.heat.contrailV2.virtual.machine.interface.Properties:
@@ -570,7 +570,7 @@ data_types:
       service_interface_type:
         description: Service Interface Type.
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
 
   org.openecomp.datatypes.heat.network.subnet.HostRoute:
@@ -580,12 +580,12 @@ data_types:
       destination:
         description: The destination for static route
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
       nexthop:
         description: The next hop for the destination
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
 
   org.openecomp.datatypes.heat.network.contrail.port.StaticRoute:
@@ -595,17 +595,17 @@ data_types:
       prefix:
         description: Route prefix
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
       next_hop:
         description: Next hop
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
       next_hop_type:
         description: Next hop type
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
 
   org.openecomp.datatypes.heat.substitution.SubstitutionFiltering:
@@ -615,12 +615,12 @@ data_types:
       substitute_service_template:
         description: Substitute Service Template
         type: string
-        status: SUPPORTED
+        status: supported
         required: true
       index_value:
         description: Index value of the substitution service template runtime instance
         type: integer
-        status: SUPPORTED
+        status: supported
         default: 0
         required: false
         constraints:
@@ -628,19 +628,19 @@ data_types:
       count:
         description: Count
         type: string
-        status: SUPPORTED
+        status: supported
         default: 1
         required: false
       scaling_enabled:
         description: Indicates whether service scaling is enabled
         type: boolean
-        status: SUPPORTED
+        status: supported
         default: true
         required: false
       mandatory:
         description: Mandatory
         type: boolean
-        status: SUPPORTED
+        status: supported
         default: true
         required: false
 
@@ -651,18 +651,18 @@ data_types:
       tenant_id:
         description: The ID of the tenant who owns the network
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
       enable_dhcp:
         description: Set to true if DHCP is enabled and false if DHCP is disabled
         type: boolean
-        status: SUPPORTED
+        status: supported
         default: true
         required: false
       ipv6_address_mode:
         description: IPv6 address mode
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
         constraints:
         - valid_values:
@@ -672,7 +672,7 @@ data_types:
       ipv6_ra_mode:
         description: IPv6 RA (Router Advertisement) mode
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
         constraints:
         - valid_values:
@@ -682,7 +682,7 @@ data_types:
       value_specs:
         description: Extra parameters to include in the request
         type: map
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
         default: {}
@@ -690,19 +690,19 @@ data_types:
       allocation_pools:
         description: The start and end addresses for the allocation pools
         type: list
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.network.AllocationPool
         required: false
       subnetpool:
         description: The name or ID of the subnet pool
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
       dns_nameservers:
         description: A specified set of DNS name servers to be used
         type: list
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
         default: []
@@ -710,14 +710,14 @@ data_types:
       host_routes:
         description: The gateway IP address
         type: list
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.network.subnet.HostRoute
         required: false
       ip_version:
         description: The gateway IP address
         type: integer
-        status: SUPPORTED
+        status: supported
         default: 4
         required: false
         constraints:
@@ -727,24 +727,24 @@ data_types:
       name:
         description: The name of the subnet
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
       prefixlen:
         description: Prefix length for subnet allocation from subnet pool
         type: integer
-        status: SUPPORTED
+        status: supported
         required: false
         constraints:
         - greater_or_equal: 0
       cidr:
         description: The CIDR
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
       gateway_ip:
         description: The gateway IP address
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
 
   org.openecomp.datatypes.heat.contrail.network.rule.Rule:
@@ -754,45 +754,45 @@ data_types:
       src_ports:
         description: Source ports
         type: list
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.contrail.network.rule.PortPairs
         required: false
       protocol:
         description: Protocol
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
       dst_addresses:
         description: Destination addresses
         type: list
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.contrail.network.rule.VirtualNetwork
         required: false
       apply_service:
         description: Service to apply
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
       dst_ports:
         description: Destination ports
         type: list
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.contrail.network.rule.PortPairs
         required: false
       src_addresses:
         description: Source addresses
         type: list
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.contrail.network.rule.VirtualNetwork
         required: false
       direction:
         description: Direction
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
 
   org.openecomp.datatypes.heat.contrailV2.virtual.network.rule.RefDataSequence:
@@ -802,10 +802,10 @@ data_types:
       network_policy_refs_data_sequence_major:
         description: Network Policy ref data sequence Major
         type: integer
-        status: SUPPORTED
+        status: supported
         required: false
       network_policy_refs_data_sequence_minor:
         description: Network Policy ref data sequence Minor
         type: integer
-        status: SUPPORTED
+        status: supported
         required: false
diff --git a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/resources/extractServiceComposition/toscaGlobalServiceTemplates/openecomp-heat/groups.yml b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/resources/extractServiceComposition/toscaGlobalServiceTemplates/openecomp-heat/groups.yml
index 64cb598ef4..ab9af48849 100644
--- a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/resources/extractServiceComposition/toscaGlobalServiceTemplates/openecomp-heat/groups.yml
+++ b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/resources/extractServiceComposition/toscaGlobalServiceTemplates/openecomp-heat/groups.yml
@@ -31,10 +31,10 @@ group_types:
       heat_file:
         description: Heat file which associate to this group/heat stack
         type: string
-        status: SUPPORTED
+        status: supported
         required: true
       description:
         description: group description
         type: string
-        status: SUPPORTED
+        status: supported
         required: true
diff --git a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/resources/extractServiceComposition/toscaGlobalServiceTemplates/openecomp-heat/nodes.yml b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/resources/extractServiceComposition/toscaGlobalServiceTemplates/openecomp-heat/nodes.yml
index 75f9e2f939..9219a5d5e4 100644
--- a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/resources/extractServiceComposition/toscaGlobalServiceTemplates/openecomp-heat/nodes.yml
+++ b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/resources/extractServiceComposition/toscaGlobalServiceTemplates/openecomp-heat/nodes.yml
@@ -30,46 +30,46 @@ node_types:
       availability_zone:
         description: Availability zone to create servers in
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
       static_routes_list:
         description: Static routes enabled
         type: list
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: boolean
         required: false
       availability_zone_enable:
         description: Indicates availability zone is enabled
         type: boolean
-        status: SUPPORTED
+        status: supported
         default: false
         required: false
       service_template_name:
         description: Service template name
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
       ordered_interfaces:
         description: Indicates if service interface are ordered
         type: boolean
-        status: SUPPORTED
+        status: supported
         default: false
         required: false
       flavor:
         description: flavor
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
       image_name:
         description: Image name
         type: string
-        status: SUPPORTED
+        status: supported
         required: true
       service_type:
         description: Service type
         type: string
-        status: SUPPORTED
+        status: supported
         required: true
         constraints:
         - valid_values:
@@ -80,7 +80,7 @@ node_types:
       service_interface_type_list:
         description: List of interface types
         type: list
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
           constraints:
@@ -93,19 +93,19 @@ node_types:
       service_instance_name:
         description: Service instance name
         type: string
-        status: SUPPORTED
+        status: supported
         required: true
       interface_list:
         description: List of interfaces
         type: list
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.network.contrail.InterfaceData
         required: false
       service_mode:
         description: Service mode
         type: string
-        status: SUPPORTED
+        status: supported
         required: true
         constraints:
         - valid_values:
@@ -115,7 +115,7 @@ node_types:
       shared_ip_list:
         description: Shared ips enabled
         type: list
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: boolean
         required: false
@@ -123,35 +123,35 @@ node_types:
       tenant_id:
         description: Tenant id of the Service Instance
         type: string
-        status: SUPPORTED
+        status: supported
       fq_name:
         description: The FQ name of the service instance
         type: string
-        status: SUPPORTED
+        status: supported
       service_template_name:
         description: Service Template of the Service Instance
         type: string
-        status: SUPPORTED
+        status: supported
       show:
         description: All attributes
         type: string
-        status: SUPPORTED
+        status: supported
       active_vms:
         description: Number of service VMs active for this Service Instance
         type: string
-        status: SUPPORTED
+        status: supported
       service_instance_name:
         description: The name of the service instance
         type: string
-        status: SUPPORTED
+        status: supported
       virtual_machines:
         description: Service VMs for the Service Instance
         type: string
-        status: SUPPORTED
+        status: supported
       status:
         description: Status of the service instance
         type: string
-        status: SUPPORTED
+        status: supported
         
 
   org.openecomp.resource.cp.nodes.heat.contrailV2.VirtualMachineInterface:
@@ -160,56 +160,56 @@ 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
@@ -225,30 +225,30 @@ node_types:
       entries:
         description: A symbolic name for this contrail network rule
         type: org.openecomp.datatypes.heat.contrail.network.rule.RuleList
-        status: SUPPORTED
+        status: supported
         required: false
       name:
         description: A symbolic name for this contrail network rule
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
     attributes:
       tenant_id:
         description: tenant_id
         type: string
-        status: SUPPORTED
+        status: supported
       fq_name:
         description: fq_name
         type: string
-        status: SUPPORTED
+        status: supported
       show:
         description: All attributes.
         type: string
-        status: SUPPORTED
+        status: supported
       rules:
         description: List of rules
         type: list
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
     requirements:
@@ -266,17 +266,17 @@ node_types:
       description:
         description: Description of the security group
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
       name:
         description: A symbolic name for this security group, which is not required to be unique.
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
       rules:
         description: List of security group rules
         type: list
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.network.neutron.SecurityRules.Rule
         required: false
@@ -284,7 +284,7 @@ node_types:
       show:
         description: Detailed information about resource
         type: string
-        status: SUPPORTED
+        status: supported
     requirements:
     - port:
         capability: tosca.capabilities.Attachment
@@ -300,39 +300,39 @@ node_types:
       shared:
         description: Is virtual network shared
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
       forwarding_mode:
         description: forwarding mode of the virtual network
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
       external:
         description: Is virtual network external
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
       allow_transit:
         description: Whether this network should be transitive.
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
       flood_unknown_unicast:
         description: flood L2 packets on network
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
       route_targets:
         description: route targets associated with the virtual network
         type: list
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
         required: false
       subnets:
         description: Network related subnets
         type: map
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.network.neutron.Subnet
         required: false
@@ -340,27 +340,27 @@ node_types:
       fq_name:
         description: fq_name
         type: string
-        status: SUPPORTED
+        status: supported
       show:
         description: All attributes.
         type: string
-        status: SUPPORTED
+        status: supported
       subnets_name:
         description: Subnets name of this network
         type: list
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subnets_show:
         description: Detailed information about each subnet
         type: map
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subnets:
         description: Network related subnets
         type: map
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.network.neutron.Subnet
     capabilities:
@@ -376,22 +376,22 @@ node_types:
       admin_pass:
         description: The administrator password for the server
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
       availability_zone:
         description: Availability zone to create servers in
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
       image:
         description: The ID or name of the image to boot with
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
       image_update_policy:
         description: Policy on how to apply an image-id update
         type: string
-        status: SUPPORTED
+        status: supported
         default: REBUILD
         required: false
         constraints:
@@ -402,18 +402,18 @@ node_types:
       metadata:
         description: Arbitrary JSON metadata to store for this server
         type: json
-        status: SUPPORTED
+        status: supported
         required: false
       contrail_service_instance_ind:
         description: Nova server related to service instance indicator
         type: boolean
-        status: SUPPORTED
+        status: supported
         default: false
         required: false
       user_data_update_policy:
         description: Policy on how to apply a user_data update
         type: string
-        status: SUPPORTED
+        status: supported
         default: REPLACE
         required: false
         constraints:
@@ -423,7 +423,7 @@ node_types:
       flavor_update_policy:
         description: Policy on how to apply a flavor update
         type: string
-        status: SUPPORTED
+        status: supported
         default: RESIZE
         required: false
         constraints:
@@ -433,28 +433,28 @@ node_types:
       user_data:
         description: User data script to be executed by cloud-init
         type: string
-        status: SUPPORTED
+        status: supported
         default: ''
         required: false
       flavor:
         description: The ID or name of the flavor to boot onto
         type: string
-        status: SUPPORTED
+        status: supported
         required: true
       key_name:
         description: Name of keypair to inject into the server
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
       reservation_id:
         description: A UUID for the set of servers being requested
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
       security_groups:
         description: List of security group names or IDs
         type: list
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
         default: []
@@ -462,12 +462,12 @@ node_types:
       config_drive:
         description: enable config drive on the server
         type: boolean
-        status: SUPPORTED
+        status: supported
         required: false
       personality:
         description: A map of files to create/overwrite on the server upon boot
         type: map
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
         default: {}
@@ -475,7 +475,7 @@ node_types:
       software_config_transport:
         description: How the server should receive the metadata required for software configuration
         type: string
-        status: SUPPORTED
+        status: supported
         default: POLL_SERVER_CFN
         required: false
         constraints:
@@ -487,7 +487,7 @@ node_types:
       user_data_format:
         description: How the user_data should be formatted for the server
         type: string
-        status: SUPPORTED
+        status: supported
         default: HEAT_CFNTOOLS
         required: false
         constraints:
@@ -498,7 +498,7 @@ node_types:
       diskConfig:
         description: Control how the disk is partitioned when the server is created
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
         constraints:
         - valid_values:
@@ -507,12 +507,12 @@ node_types:
       name:
         description: Server name
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
       scheduler_hints:
         description: Arbitrary key-value pairs specified by the client to help boot a server
         type: map
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
         required: false
@@ -520,33 +520,33 @@ node_types:
       accessIPv4:
         description: The manually assigned alternative public IPv4 address of the server
         type: string
-        status: SUPPORTED
+        status: supported
       addresses:
         description: A dict of all network addresses with corresponding port_id
         type: map
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.novaServer.network.AddressInfo
       accessIPv6:
         description: The manually assigned alternative public IPv6 address of the server
         type: string
-        status: SUPPORTED
+        status: supported
       instance_name:
         description: AWS compatible instance name
         type: string
-        status: SUPPORTED
+        status: supported
       name:
         description: Name of the server
         type: string
-        status: SUPPORTED
+        status: supported
       show:
         description: Detailed information about resource
         type: string
-        status: SUPPORTED
+        status: supported
       console_urls:
         description: URLs of servers consoles
         type: string
-        status: SUPPORTED
+        status: supported
 
   org.openecomp.resource.vfc.rules.nodes.heat.network.contrailV2.NetworkRules:
     derived_from: tosca.nodes.Root
@@ -554,18 +554,18 @@ node_types:
       name:
         description: A symbolic name for this contrail v2 network rule
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
       network_policy_entries:
         description: A symbolic name for this contrail v2 network rule
         type: org.openecomp.datatypes.heat.contrailV2.network.rule.RuleList
-        status: SUPPORTED
+        status: supported
         required: false
     attributes:
       fq_name:
         description: fq_name
         type: string
-        status: SUPPORTED
+        status: supported
     requirements:
     - network:
         capability: tosca.capabilities.Attachment
@@ -581,29 +581,29 @@ node_types:
       port_security_enabled:
         description: Flag to enable/disable port security on the network
         type: boolean
-        status: SUPPORTED
+        status: supported
         required: false
       device_id:
         description: Device ID of this port
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
       qos_policy:
         description: The name or ID of QoS policy to attach to this network
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
       allowed_address_pairs:
         description: Additional MAC/IP address pairs allowed to pass through the port
         type: list
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.network.AddressPair
         required: false
       binding:vnic_type:
         description: The vnic type to be bound on the neutron port
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
         constraints:
         - valid_values:
@@ -613,7 +613,7 @@ node_types:
       value_specs:
         description: Extra parameters to include in the request
         type: map
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
         default: {}
@@ -621,17 +621,17 @@ node_types:
       device_owner:
         description: Name of the network owning the port
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
       network:
         description: Network this port belongs to
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
       replacement_policy:
         description: Policy on how to respond to a stack-update for this resource
         type: string
-        status: SUPPORTED
+        status: supported
         default: AUTO
         required: false
         constraints:
@@ -641,60 +641,60 @@ node_types:
       security_groups:
         description: List of security group names or IDs
         type: list
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
         required: false
       fixed_ips:
         description: Desired IPs for this port
         type: list
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
         required: false
       mac_address:
         description: MAC address to give to this port
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
       admin_state_up:
         description: A boolean value specifying the administrative status of the network
         type: boolean
-        status: SUPPORTED
+        status: supported
         default: true
         required: false
       name:
         description: A symbolic name for this port
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
     attributes:
       tenant_id:
         description: Tenant owning the port
         type: string
-        status: SUPPORTED
+        status: supported
       network_id:
         description: Unique identifier for the network owning the port
         type: string
-        status: SUPPORTED
+        status: supported
       qos_policy_id:
         description: The QoS policy ID attached to this network
         type: string
-        status: SUPPORTED
+        status: supported
       show:
         description: Detailed information about resource
         type: string
-        status: SUPPORTED
+        status: supported
       subnets:
         description: Subnets of this network
         type: list
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       status:
         description: The status of the network
         type: string
-        status: SUPPORTED
+        status: supported
     capabilities:
       attachment:
         type: tosca.capabilities.Attachment
@@ -715,48 +715,48 @@ node_types:
       dhcp_agent_ids:
         description: The IDs of the DHCP agent to schedule the network
         type: list
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
         required: false
       tenant_id:
         description: The ID of the tenant which will own the network
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
       port_security_enabled:
         description: Flag to enable/disable port security on the network
         type: boolean
-        status: SUPPORTED
+        status: supported
         required: false
       shared:
         description: Whether this network should be shared across all tenants
         type: boolean
-        status: SUPPORTED
+        status: supported
         default: false
         required: false
       admin_state_up:
         description: A boolean value specifying the administrative status of the network
         type: boolean
-        status: SUPPORTED
+        status: supported
         default: true
         required: false
       qos_policy:
         description: The name or ID of QoS policy to attach to this network
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
       subnets:
         description: Network related subnets
         type: map
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.network.neutron.Subnet
         required: false
       value_specs:
         description: Extra parameters to include in the request
         type: map
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
         default: {}
@@ -765,31 +765,31 @@ node_types:
       qos_policy_id:
         description: The QoS policy ID attached to this network
         type: string
-        status: SUPPORTED
+        status: supported
       show:
         description: Detailed information about resource
         type: string
-        status: SUPPORTED
+        status: supported
       subnets_name:
         description: Subnets name of this network
         type: list
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subnets:
         description: Network related subnets
         type: map
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.network.neutron.Subnet
       mtu:
         description: The maximum transmission unit size(in bytes) for the network
         type: scalar-unit.size
-        status: SUPPORTED
+        status: supported
       status:
         description: The status of the network
         type: string
-        status: SUPPORTED
+        status: supported
     capabilities:
       attachment:
         type: tosca.capabilities.Attachment
@@ -803,43 +803,43 @@ node_types:
       static_routes:
         description: An ordered list of static routes to be added to this interface
         type: list
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.network.contrail.port.StaticRoute
         required: false
       virtual_network:
         description: Virtual Network for this interface
         type: string
-        status: SUPPORTED
+        status: supported
         required: true
       static_route:
         description: Static route enabled
         type: boolean
-        status: SUPPORTED
+        status: supported
         default: false
         required: false
       allowed_address_pairs:
         description: List of allowed address pair for this interface
         type: list
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.network.contrail.AddressPair
         required: false
       shared_ip:
         description: Shared ip enabled
         type: boolean
-        status: SUPPORTED
+        status: supported
         default: false
         required: false
       ip_address:
         description: IP for this interface
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
       interface_type:
         description: Interface type
         type: string
-        status: SUPPORTED
+        status: supported
         required: true
         constraints:
         - valid_values:
@@ -851,7 +851,7 @@ node_types:
       fq_name:
         description: fq_name
         type: string
-        status: SUPPORTED
+        status: supported
 
   org.openecomp.resource.vfc.nodes.heat.contrail.Compute:
     derived_from: org.openecomp.resource.vfc.nodes.Compute
@@ -859,22 +859,22 @@ node_types:
       flavor:
         description: flavor
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
       image_name:
         description: Image name
         type: string
-        status: SUPPORTED
+        status: supported
         required: true
       availability_zone:
         description: Availability zone to create servers in
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
       service_type:
         description: Service type
         type: string
-        status: SUPPORTED
+        status: supported
         required: true
         constraints:
         - valid_values:
@@ -885,23 +885,23 @@ node_types:
       availability_zone_enable:
         description: Indicates availability zone is enabled
         type: boolean
-        status: SUPPORTED
+        status: supported
         default: false
         required: false
       service_template_name:
         description: Service template name
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
       service_instance_name:
         description: Service instance name
         type: string
-        status: SUPPORTED
+        status: supported
         required: true
       service_mode:
         description: Service mode
         type: string
-        status: SUPPORTED
+        status: supported
         required: true
         constraints:
         - valid_values:
@@ -912,27 +912,27 @@ node_types:
       tenant_id:
         description: Tenant id of the VM
         type: string
-        status: SUPPORTED
+        status: supported
       fq_name:
         description: fq_name
         type: string
-        status: SUPPORTED
+        status: supported
       show:
         description: All attributes
         type: string
-        status: SUPPORTED
+        status: supported
       active_vms:
         description: Number of active VMs
         type: string
-        status: SUPPORTED
+        status: supported
       virtual_machines:
         description: VMs of this compute
         type: string
-        status: SUPPORTED
+        status: supported
       status:
         description: status of the compute
         type: string
-        status: SUPPORTED
+        status: supported
 
         
   org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface:
@@ -941,48 +941,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
@@ -990,11 +990,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
@@ -1010,35 +1010,35 @@ node_types:
       network_ipam_refs_data:
         description: IPAM references Data
         type: list
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.contrailV2.virtual.network.rule.IpamRefData
         required: false
       network_policy_refs_data:
         description: Policy references data
         type: list
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.contrailV2.virtual.network.rule.RefData
         required: false
       network_ipam_refs:
         description: IPAM references
         type: list
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
         required: false
       network_policy_refs:
         description: Policy references
         type: list
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
         required: false
       subnets:
         description: Network related subnets
         type: map
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.network.neutron.Subnet
         required: false
@@ -1046,23 +1046,23 @@ node_types:
       fq_name:
         description: fq_name
         type: string
-        status: SUPPORTED
+        status: supported
       subnets_name:
         description: Subnets name of this network
         type: list
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subnets_show:
         description: Detailed information about each subnet
         type: map
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subnets:
         description: Network related subnets
         type: map
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.network.neutron.Subnet
     capabilities:
@@ -1078,34 +1078,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:
@@ -1115,7 +1115,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:
@@ -1127,95 +1127,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/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/resources/extractServiceComposition/toscaGlobalServiceTemplates/openecomp/capabilities.yml b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/resources/extractServiceComposition/toscaGlobalServiceTemplates/openecomp/capabilities.yml
index 77d8eb9857..5f5126cd8b 100644
--- a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/resources/extractServiceComposition/toscaGlobalServiceTemplates/openecomp/capabilities.yml
+++ b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/resources/extractServiceComposition/toscaGlobalServiceTemplates/openecomp/capabilities.yml
@@ -32,7 +32,7 @@ capability_types:
         type: map
         description: Deployment flavors instance
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
             type: org.openecomp.datatypes.DeploymentFlavor     
 
@@ -43,7 +43,7 @@ capability_types:
       oid:
         description: Object Id of the metric
         type: string
-        status: SUPPORTED
+        status: supported
         required: true
 
   org.openecomp.capabilities.AllottedResource:
@@ -56,7 +56,7 @@ capability_types:
       oid:
         description: Object Id of the metric
         type: string
-        status: SUPPORTED
+        status: supported
         required: true
 
   org.openecomp.capabilities.metric.Ceilometer:
@@ -66,7 +66,7 @@ capability_types:
       name:
         description: Ceilometer metric type name to monitor. (The name ceilometer is using)
         type: string
-        status: SUPPORTED
+        status: supported
         required: true
 
   org.openecomp.capabilities.Metric:
@@ -76,25 +76,25 @@ capability_types:
       unit:
         description: Unit of the metric value
         type: string
-        status: SUPPORTED
+        status: supported
         required: true
       description:
         description: Description of the metric
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
       type:
         description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
         type: string
-        status: SUPPORTED
+        status: supported
         required: true
       category:
         description: Category of the metric, for an example, compute, disk, network, storage and etc.
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
     attributes:
       value:
         description: Runtime monitored value
         type: string
-        status: SUPPORTED
+        status: supported
diff --git a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/resources/extractServiceComposition/toscaGlobalServiceTemplates/openecomp/data.yml b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/resources/extractServiceComposition/toscaGlobalServiceTemplates/openecomp/data.yml
index c68eaee77a..613d721154 100644
--- a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/resources/extractServiceComposition/toscaGlobalServiceTemplates/openecomp/data.yml
+++ b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/resources/extractServiceComposition/toscaGlobalServiceTemplates/openecomp/data.yml
@@ -69,17 +69,17 @@ data_types:
       name:
         description: Deployment Flavor Name
         type: string
-        status: SUPPORTED
+        status: supported
         required: true
       license_feature_group:
         description: license feature group associated with Deployment Flavor
         type: org.openecomp.datatypes.FeatureGroup
-        status: SUPPORTED
+        status: supported
         required: true
       compute_size:
         description: Size of VM
         type: org.openecomp.datatypes.ComputeFlavor
-        status: SUPPORTED
+        status: supported
         required: true
 
   org.openecomp.datatypes.FeatureGroup:
@@ -89,12 +89,12 @@ data_types:
       license_feature_group_ref:
         description: Deployment Flavor Name
         type: string
-        status: SUPPORTED
+        status: supported
         required: true
       part_number:
         description: refrence part number related to feature group
         type: string
-        status: SUPPORTED
+        status: supported
         required: true
         
   org.openecomp.datatypes.EcompHoming:
@@ -217,22 +217,22 @@ data_types:
       name:
         description: Compute Flavor Name
         type: string
-        status: SUPPORTED
+        status: supported
         required: true
       num_cpus:
         description: Number of cpu
         type: integer
-        status: SUPPORTED
+        status: supported
         required: true
       disk_size:
         description: Disk size
         type: scalar-unit.size
-        status: SUPPORTED
+        status: supported
         required: true
       mem_size:
         description: Memory size
         type: scalar-unit.size
-        status: SUPPORTED
+        status: supported
         required: true
 
   org.openecomp.datatypes.network.MacAssignments:
@@ -341,12 +341,12 @@ data_types:
       substitute_service_template:
         description: Substitute Service Template
         type: string
-        status: SUPPORTED
+        status: supported
         required: true
       index_value:
         description: Index value of the substitution service template runtime instance
         type: integer
-        status: SUPPORTED
+        status: supported
         default: 0
         required: false
         constraints:
@@ -354,19 +354,19 @@ data_types:
       count:
         description: Count
         type: string
-        status: SUPPORTED
+        status: supported
         default: 1
         required: false
       scaling_enabled:
         description: Indicates whether service scaling is enabled
         type: boolean
-        status: SUPPORTED
+        status: supported
         default: true
         required: false
       mandatory:
         description: Mandatory
         type: boolean
-        status: SUPPORTED
+        status: supported
         required: false
 
   org.openecomp.datatypes.network.NetworkFlows:
diff --git a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/resources/extractServiceComposition/toscaGlobalServiceTemplates/openecomp/groups.yml b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/resources/extractServiceComposition/toscaGlobalServiceTemplates/openecomp/groups.yml
index 438dd071a8..fa24cb5d1a 100644
--- a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/resources/extractServiceComposition/toscaGlobalServiceTemplates/openecomp/groups.yml
+++ b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/resources/extractServiceComposition/toscaGlobalServiceTemplates/openecomp/groups.yml
@@ -31,7 +31,7 @@ group_types:
       isBase:
         description: Whether this module should be deployed before other modules
         type: boolean
-        status: SUPPORTED
+        status: supported
         default: false
         required: true
       vf_module_label:
diff --git a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/resources/extractServiceComposition/toscaGlobalServiceTemplates/openecomp/nodes.yml b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/resources/extractServiceComposition/toscaGlobalServiceTemplates/openecomp/nodes.yml
index 43bf2accda..9df37e4dae 100644
--- a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/resources/extractServiceComposition/toscaGlobalServiceTemplates/openecomp/nodes.yml
+++ b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/resources/extractServiceComposition/toscaGlobalServiceTemplates/openecomp/nodes.yml
@@ -43,7 +43,7 @@ node_types:
       service_template_filter:
         description: Substitution Filter
         type: org.openecomp.datatypes.substitution.SubstitutionFiltering
-        status: SUPPORTED
+        status: supported
         required: true
 
   org.openecomp.resource.vl.extVL:
@@ -309,7 +309,7 @@ node_types:
       license_feature_group_ref:
         description: refrence to license feature group
         type: string
-        status: SUPPORTED
+        status: supported
         required: true
     requirements:
     - deployment_flavor:
@@ -326,38 +326,38 @@ node_types:
       high_availablity:
         description: high_availablity
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
       vm_image_name:
         description: Master image_name volume id
         type: string
-        status: SUPPORTED
+        status: supported
         required: true
       vm_flavor_name:
         description: Master image_name volume id
         type: string
-        status: SUPPORTED
+        status: supported
         required: true
       nfc_naming_code:
         description: nfc code for instance naming
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
       vm_type_tag:
         description: vm type based on naming Convention
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
       vfc_naming:
         description: vfc naming
         type: org.openecomp.datatypes.Naming
-        status: SUPPORTED
+        status: supported
         default: false
         required: false
       min_instances:
         description: Minimum number of VFC Instances
         type: integer
-        status: SUPPORTED
+        status: supported
         default: 0
         required: false
         constraints:
@@ -365,7 +365,7 @@ node_types:
       max_instances:
         description: Maximum number of VFC Instances
         type: integer
-        status: SUPPORTED
+        status: supported
         required: false
         constraints:
         - greater_or_equal: 1
diff --git a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/resources/extractServiceComposition/toscaGlobalServiceTemplates/openecomp/relationships.yml b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/resources/extractServiceComposition/toscaGlobalServiceTemplates/openecomp/relationships.yml
index 6243cfa5d1..3b4eac17f0 100644
--- a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/resources/extractServiceComposition/toscaGlobalServiceTemplates/openecomp/relationships.yml
+++ b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/resources/extractServiceComposition/toscaGlobalServiceTemplates/openecomp/relationships.yml
@@ -31,18 +31,18 @@ relationship_types:
       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.AttachesTo:
     derived_from: tosca.relationships.AttachesTo
@@ -51,6 +51,6 @@ relationship_types:
       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
         
diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/mock/enrich/expectedOutput/ComputeGlobalTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/mock/enrich/expectedOutput/ComputeGlobalTypesServiceTemplate.yaml
index 2e5d468b31..87851d00da 100644
--- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/mock/enrich/expectedOutput/ComputeGlobalTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/mock/enrich/expectedOutput/ComputeGlobalTypesServiceTemplate.yaml
@@ -19,31 +19,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
       instance:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -53,31 +53,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
       memory:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -87,31 +87,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
       disk.iops:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -121,31 +121,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
       disk.device.read.requests:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -155,31 +155,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
       cpu.delta:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -189,31 +189,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
       disk.capacity:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -223,31 +223,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
       disk.device.read.bytes:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -257,31 +257,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
       disk.write.bytes:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -291,31 +291,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
       disk.latency:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -325,31 +325,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
       disk.device.read.bytes.rate:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -359,31 +359,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
       disk.usage:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -393,31 +393,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
       cpu_util:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -427,31 +427,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
       disk.device.allocation:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -461,31 +461,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
       disk.write.requests.rate:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -495,31 +495,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
       disk.write.bytes.rate:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -529,31 +529,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
       disk.device.latency:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -563,31 +563,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
       cpu:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -597,31 +597,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
       disk.device.write.requests:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -631,31 +631,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
       disk.device.write.bytes:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -665,31 +665,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
       disk.read.requests:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -699,31 +699,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
       disk.root.size:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -733,31 +733,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
       disk.device.write.bytes.rate:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -767,31 +767,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
       vcpus:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -801,31 +801,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
       disk.device.iops:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -835,31 +835,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
       disk.device.usage:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -869,31 +869,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
       disk.device.read.requests.rate:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -903,31 +903,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
       disk.device.write.requests.rate:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -937,31 +937,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
       disk.allocation:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -971,31 +971,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
       disk.read.bytes.rate:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -1005,31 +1005,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
       disk.read.bytes:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -1039,31 +1039,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
       memory.usage:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -1073,31 +1073,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
       disk.device.capacity:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -1107,31 +1107,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
       memory.resident:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -1141,31 +1141,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
       disk.write.requests:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -1175,28 +1175,28 @@ 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
\ No newline at end of file
+            status: supported
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/mock/enrich/expectedOutput/PortGlobalTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/mock/enrich/expectedOutput/PortGlobalTypesServiceTemplate.yaml
index bbaa13873e..f686680112 100644
--- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/mock/enrich/expectedOutput/PortGlobalTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/mock/enrich/expectedOutput/PortGlobalTypesServiceTemplate.yaml
@@ -19,31 +19,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
       network.outgoing.bytes:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -53,31 +53,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
       network.outgoing.packets.rate:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -87,31 +87,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
       network.outpoing.packets:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -121,31 +121,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
       network.incoming.bytes.rate:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -155,31 +155,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
       network.incoming.bytes:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -189,31 +189,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
       network.outgoing.bytes.rate:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -223,31 +223,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
       network.incoming.packets:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -257,28 +257,28 @@ 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
\ No newline at end of file
+            status: supported
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/mock/toscaGlobalServiceTemplates/AbstractSubstituteGlobalTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/mock/toscaGlobalServiceTemplates/AbstractSubstituteGlobalTypesServiceTemplate.yaml
index 224e9b746e..c74974bc5b 100644
--- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/mock/toscaGlobalServiceTemplates/AbstractSubstituteGlobalTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/mock/toscaGlobalServiceTemplates/AbstractSubstituteGlobalTypesServiceTemplate.yaml
@@ -15,13 +15,13 @@ data_types:
         type: string
         description: Substitute Service Template
         required: true
-        status: SUPPORTED
+        status: supported
       index_variable:
         type: string
         description: Index variable
         required: false
         default: '%index%'
-        status: SUPPORTED
+        status: supported
         constraints:
         - min_length: 3
       count:
@@ -29,19 +29,19 @@ data_types:
         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.substitution.SubstitutionFiltering:
     derived_from: tosca.datatypes.Root
     description: Substitution Filter
@@ -50,13 +50,13 @@ data_types:
         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:
@@ -64,19 +64,19 @@ data_types:
         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
 node_types:
   org.openecomp.resource.abstract.nodes.AbstractSubstitute:
     derived_from: tosca.nodes.Root
@@ -85,4 +85,4 @@ node_types:
         type: org.openecomp.datatypes.heat.substitution.SubstitutionFiltering
         description: Substitution Filter
         required: true
-        status: SUPPORTED
\ No newline at end of file
+        status: supported
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/mock/toscaGlobalServiceTemplates/CinderVolumeGlobalTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/mock/toscaGlobalServiceTemplates/CinderVolumeGlobalTypesServiceTemplate.yaml
index c72ecd31df..c1c5319edf 100644
--- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/mock/toscaGlobalServiceTemplates/CinderVolumeGlobalTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/mock/toscaGlobalServiceTemplates/CinderVolumeGlobalTypesServiceTemplate.yaml
@@ -12,22 +12,22 @@ relationship_types:
         type: string
         description: The ID of the volume to be attached
         required: true
-        status: SUPPORTED
+        status: supported
       location:
         type: string
         description: The location where the volume is exposed on the instance, mountpoint
         required: false
-        status: SUPPORTED
+        status: supported
       instance_uuid:
         type: string
         description: The ID of the server to which the volume attaches
         required: true
-        status: SUPPORTED
+        status: supported
     attributes:
       show:
         type: string
         description: Detailed information about resource
-        status: SUPPORTED
+        status: supported
 node_types:
   org.openecomp.resource.vfc.nodes.heat.cinder.Volume:
     derived_from: tosca.nodes.BlockStorage
@@ -36,34 +36,34 @@ node_types:
         type: string
         description: The availability zone in which the volume will be created
         required: false
-        status: SUPPORTED
+        status: supported
       image:
         type: string
         description: If specified, the name or ID of the image to create the volume from
         required: false
-        status: SUPPORTED
+        status: supported
       metadata:
         type: map
         description: Key/value pairs to associate with the volume
         required: false
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       volume_type:
         type: string
         description: If specified, the type of volume to use, mapping to a specific backend
         required: false
-        status: SUPPORTED
+        status: supported
       description:
         type: string
         description: A description of the volume
         required: false
-        status: SUPPORTED
+        status: supported
       device_type:
         type: string
         description: Device type
         required: false
-        status: SUPPORTED
+        status: supported
         constraints:
         - valid_values:
           - cdrom
@@ -73,7 +73,7 @@ node_types:
         description: 'Bus of the device: hypervisor driver chooses a suitable default
           if omitted'
         required: false
-        status: SUPPORTED
+        status: supported
         constraints:
         - valid_values:
           - ide
@@ -85,94 +85,94 @@ node_types:
         type: string
         description: If specified, the backup to create the volume from
         required: false
-        status: SUPPORTED
+        status: supported
       source_volid:
         type: string
         description: If specified, the volume to use as source
         required: false
-        status: SUPPORTED
+        status: supported
       boot_index:
         type: integer
         description: Integer used for ordering the boot disks
         required: false
-        status: SUPPORTED
+        status: supported
       size:
         type: scalar-unit.size
         description: The requested storage size (default unit is MB)
         required: false
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 1 GB
       read_only:
         type: boolean
         description: Enables or disables read-only access mode of volume
         required: false
-        status: SUPPORTED
+        status: supported
       name:
         type: string
         description: A name used to distinguish the volume
         required: false
-        status: SUPPORTED
+        status: supported
       scheduler_hints:
         type: map
         description: Arbitrary key-value pairs specified by the client to help the Cinder scheduler creating a volume
         required: false
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       swap_size:
         type: scalar-unit.size
         description: The size of the swap, in MB
         required: false
-        status: SUPPORTED
+        status: supported
       delete_on_termination:
         type: boolean
         description: Indicate whether the volume should be deleted when the server is terminated
         required: false
-        status: SUPPORTED
+        status: supported
       multiattach:
         type: boolean
         description: Whether allow the volume to be attached more than once
         required: false
-        status: SUPPORTED
+        status: supported
     attributes:
       display_description:
         type: string
         description: Description of the volume
-        status: SUPPORTED
+        status: supported
       attachments:
         type: string
         description: The list of attachments of the volume
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       encrypted:
         type: boolean
         description: Boolean indicating if the volume is encrypted or not
-        status: SUPPORTED
+        status: supported
       show:
         type: string
         description: Detailed information about resource
-        status: SUPPORTED
+        status: supported
       created_at:
         type: timestamp
         description: The timestamp indicating volume creation
-        status: SUPPORTED
+        status: supported
       display_name:
         type: string
         description: Name of the volume
-        status: SUPPORTED
+        status: supported
       metadata_values:
         type: map
         description: Key/value pairs associated with the volume in raw dict form
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       bootable:
         type: boolean
         description: Boolean indicating if the volume can be booted or not
-        status: SUPPORTED
+        status: supported
       status:
         type: string
         description: The current status of the volume
-        status: SUPPORTED
\ No newline at end of file
+        status: supported
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/mock/toscaGlobalServiceTemplates/CommonGlobalTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/mock/toscaGlobalServiceTemplates/CommonGlobalTypesServiceTemplate.yaml
index eee8a96129..8b6b93ed92 100644
--- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/mock/toscaGlobalServiceTemplates/CommonGlobalTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/mock/toscaGlobalServiceTemplates/CommonGlobalTypesServiceTemplate.yaml
@@ -15,12 +15,12 @@ data_types:
         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.contrail.port.StaticRoute:
     derived_from: tosca.datatypes.Root
     description: static route
@@ -29,17 +29,17 @@ data_types:
         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.subnet.HostRoute:
     derived_from: tosca.datatypes.Root
     description: Host route info for the subnet
@@ -48,12 +48,12 @@ data_types:
         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.neutron.Subnet:
     derived_from: tosca.datatypes.Root
     description: A subnet represents an IP address block that can be used for assigning IP addresses to virtual instances
@@ -62,18 +62,18 @@ data_types:
         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
@@ -83,7 +83,7 @@ data_types:
         type: string
         description: IPv6 RA (Router Advertisement) mode
         required: false
-        status: SUPPORTED
+        status: supported
         constraints:
         - valid_values:
           - dhcpv6-stateful
@@ -95,35 +95,35 @@ data_types:
         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:
@@ -131,7 +131,7 @@ data_types:
         description: The gateway IP address
         required: false
         default: 4
-        status: SUPPORTED
+        status: supported
         constraints:
         - valid_values:
           - '4'
@@ -140,24 +140,24 @@ data_types:
         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.network.AllocationPool:
     derived_from: tosca.datatypes.Root
     description: The start and end addresses for the allocation pool
@@ -166,12 +166,12 @@ data_types:
         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.contrail.AddressPair:
     derived_from: tosca.datatypes.Root
     description: Address Pair
@@ -180,7 +180,7 @@ data_types:
         type: string
         description: Address mode active-active or active-standy
         required: false
-        status: SUPPORTED
+        status: supported
         constraints:
         - valid_values:
           - active-active
@@ -189,12 +189,12 @@ data_types:
         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
 capability_types:
   org.openecomp.capabilities.Metric:
     derived_from: tosca.capabilities.nfv.Metric
@@ -204,27 +204,27 @@ capability_types:
         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.
@@ -233,7 +233,7 @@ capability_types:
         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.
@@ -242,7 +242,7 @@ capability_types:
         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.
@@ -251,7 +251,7 @@ capability_types:
         type: string
         description: Object Id of the metric
         required: true
-        status: SUPPORTED
+        status: supported
 relationship_types:
   org.openecomp.relationships.AttachesTo:
     derived_from: tosca.relationships.Root
@@ -265,12 +265,12 @@ group_types:
         type: string
         description: Heat file which associate to this group/heat stack
         required: true
-        status: SUPPORTED
+        status: supported
       description:
         type: string
         description: Heat file description
         required: false
-        status: SUPPORTED
+        status: supported
 policy_types:
   org.openecomp.policies.placement.valet.Diversity:
     derived_from: tosca.policy.placement
@@ -281,7 +281,7 @@ policy_types:
         description: diversity
         required: false
         default: host
-        status: SUPPORTED
+        status: supported
         constraints:
         - valid_values:
           - host
@@ -295,7 +295,7 @@ policy_types:
         description: exclusivity
         required: false
         default: host
-        status: SUPPORTED
+        status: supported
         constraints:
         - valid_values:
           - host
@@ -309,7 +309,7 @@ policy_types:
         description: affinity
         required: false
         default: host
-        status: SUPPORTED
+        status: supported
         constraints:
         - valid_values:
           - host
@@ -322,12 +322,12 @@ policy_types:
         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
@@ -341,12 +341,12 @@ policy_types:
         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
diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/mock/toscaGlobalServiceTemplates/ContrailAbstractSubstituteGlobalTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/mock/toscaGlobalServiceTemplates/ContrailAbstractSubstituteGlobalTypesServiceTemplate.yaml
index e667df0742..c952b2b4b5 100644
--- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/mock/toscaGlobalServiceTemplates/ContrailAbstractSubstituteGlobalTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/mock/toscaGlobalServiceTemplates/ContrailAbstractSubstituteGlobalTypesServiceTemplate.yaml
@@ -15,26 +15,26 @@ data_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
       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
 node_types:
   org.openecomp.resource.abstract.nodes.contrail.AbstractSubstitute:
     derived_from: org.openecomp.resource.abstract.nodes.AbstractSubstitute
@@ -43,12 +43,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:
@@ -56,33 +56,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
@@ -93,7 +93,7 @@ node_types:
         type: list
         description: List of interface types
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
           constraints:
@@ -106,19 +106,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
@@ -128,39 +128,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/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/mock/toscaGlobalServiceTemplates/ContrailComputeGlobalTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/mock/toscaGlobalServiceTemplates/ContrailComputeGlobalTypesServiceTemplate.yaml
index dff50856cd..a7e5b8243c 100644
--- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/mock/toscaGlobalServiceTemplates/ContrailComputeGlobalTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/mock/toscaGlobalServiceTemplates/ContrailComputeGlobalTypesServiceTemplate.yaml
@@ -16,22 +16,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
@@ -43,22 +43,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
@@ -68,24 +68,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
\ No newline at end of file
+        status: supported
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/mock/toscaGlobalServiceTemplates/ContrailNetworkRuleGlobalTypeServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/mock/toscaGlobalServiceTemplates/ContrailNetworkRuleGlobalTypeServiceTemplate.yaml
index 8038479153..16fe3191a1 100644
--- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/mock/toscaGlobalServiceTemplates/ContrailNetworkRuleGlobalTypeServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/mock/toscaGlobalServiceTemplates/ContrailNetworkRuleGlobalTypeServiceTemplate.yaml
@@ -15,12 +15,12 @@ data_types:
         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
     description: policy rule
@@ -29,45 +29,45 @@ data_types:
         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
     description: list of policy rules
@@ -76,7 +76,7 @@ data_types:
         type: list
         description: Contrail network rule
         required: false
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.contrail.network.rule.Rule
   org.openecomp.datatypes.heat.contrail.network.rule.VirtualNetwork:
@@ -87,7 +87,7 @@ data_types:
         type: string
         description: Virtual network
         required: false
-        status: SUPPORTED
+        status: supported
 node_types:
   org.openecomp.resource.vfc.rules.nodes.heat.network.contrail.NetworkRules:
     derived_from: tosca.nodes.Root
@@ -96,29 +96,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/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/mock/toscaGlobalServiceTemplates/ContrailPortGlobalTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/mock/toscaGlobalServiceTemplates/ContrailPortGlobalTypesServiceTemplate.yaml
index 06857ed1dd..f8c10146cf 100644
--- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/mock/toscaGlobalServiceTemplates/ContrailPortGlobalTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/mock/toscaGlobalServiceTemplates/ContrailPortGlobalTypesServiceTemplate.yaml
@@ -16,25 +16,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:
@@ -42,17 +42,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
@@ -63,4 +63,4 @@ node_types:
       fq_name:
         type: string
         description: fq_name
-        status: SUPPORTED
\ No newline at end of file
+        status: supported
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/mock/toscaGlobalServiceTemplates/ContrailV2NetworkRuleGlobalTypeServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/mock/toscaGlobalServiceTemplates/ContrailV2NetworkRuleGlobalTypeServiceTemplate.yaml
index 11e29bde76..7ffef5fad4 100644
--- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/mock/toscaGlobalServiceTemplates/ContrailV2NetworkRuleGlobalTypeServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/mock/toscaGlobalServiceTemplates/ContrailV2NetworkRuleGlobalTypeServiceTemplate.yaml
@@ -15,7 +15,7 @@ data_types:
         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
     description: destination addresses
@@ -24,7 +24,7 @@ data_types:
         type: string
         description: Destination addresses Virtual network
         required: false
-        status: SUPPORTED
+        status: supported
   org.openecomp.datatypes.heat.contrailV2.network.rule.Rule:
     derived_from: tosca.datatypes.Root
     description: policy rule
@@ -33,45 +33,45 @@ data_types:
         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.ActionList:
     derived_from: tosca.datatypes.Root
     description: Action List
@@ -80,12 +80,12 @@ data_types:
         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
   org.openecomp.datatypes.heat.contrailV2.network.rule.RuleList:
@@ -96,7 +96,7 @@ data_types:
         type: list
         description: Contrail network rule
         required: false
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.contrailV2.network.rule.Rule
   org.openecomp.datatypes.heat.contrailV2.network.rule.DstPortPairs:
@@ -107,12 +107,12 @@ data_types:
         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
     description: source port pairs
@@ -121,12 +121,12 @@ data_types:
         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
 node_types:
   org.openecomp.resource.vfc.rules.nodes.heat.network.contrailV2.NetworkRules:
     derived_from: tosca.nodes.Root
@@ -135,17 +135,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/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/mock/toscaGlobalServiceTemplates/ContrailV2VirtualMachineInterfaceGlobalTypeServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/mock/toscaGlobalServiceTemplates/ContrailV2VirtualMachineInterfaceGlobalTypeServiceTemplate.yaml
index 61c3af6e82..cadb3c4eb9 100644
--- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/mock/toscaGlobalServiceTemplates/ContrailV2VirtualMachineInterfaceGlobalTypeServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/mock/toscaGlobalServiceTemplates/ContrailV2VirtualMachineInterfaceGlobalTypeServiceTemplate.yaml
@@ -17,7 +17,7 @@ data_types:
         type: string
         description: Service Interface Type.
         required: false
-        status: SUPPORTED
+        status: supported
 node_types:
   org.openecomp.resource.cp.nodes.heat.contrailV2.VirtualMachineInterface:
     derived_from: org.openecomp.resource.cp.nodes.network.Port
@@ -26,46 +26,46 @@ node_types:
         type: list
         description: List of mac addresses.
         required: false
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       name:
         type: string
         description: Virtual Machine Interface name
         required: false
-        status: SUPPORTED
+        status: supported
       security_group_refs:
         type: list
         description: List of security groups.
         required: false
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       virtual_network_refs:
         type: list
         description: List of virtual networks.
         required: false
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       virtual_machine_interface_properties:
         type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.interface.Properties
         description: virtual machine interface properties.
         required: false
-        status: SUPPORTED
+        status: supported
       port_tuple_refs:
         type: list
         description: List of port tuples.
         required: false
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
     attributes:
       fq_name:
         type: string
         description: The FQ name of the Virtual Network.
-        status: SUPPORTED
+        status: supported
       show:
         type: string
         description: All attributes.
-        status: SUPPORTED
\ No newline at end of file
+        status: supported
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/mock/toscaGlobalServiceTemplates/ContrailV2VirtualNetworkGlobalTypeServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/mock/toscaGlobalServiceTemplates/ContrailV2VirtualNetworkGlobalTypeServiceTemplate.yaml
index dcf36dbafa..7d0e6953d4 100644
--- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/mock/toscaGlobalServiceTemplates/ContrailV2VirtualNetworkGlobalTypeServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/mock/toscaGlobalServiceTemplates/ContrailV2VirtualNetworkGlobalTypeServiceTemplate.yaml
@@ -17,7 +17,7 @@ data_types:
         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.RefDataSequence:
     derived_from: tosca.datatypes.Root
     description: network policy refs data sequence
@@ -26,12 +26,12 @@ data_types:
         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.ref.data.IpamSubnet:
     derived_from: tosca.datatypes.Root
     description: Network Ipam Ref Data Subnet
@@ -40,12 +40,12 @@ data_types:
         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.IpamRefData:
     derived_from: tosca.datatypes.Root
     description: Network Ipam Ref Data
@@ -54,7 +54,7 @@ data_types:
         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
   org.openecomp.datatypes.heat.contrailV2.virtual.network.rule.ref.data.IpamSubnetList:
@@ -65,12 +65,12 @@ data_types:
         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
 node_types:
   org.openecomp.resource.vl.nodes.heat.network.contrailV2.VirtualNetwork:
     derived_from: org.openecomp.resource.vl.nodes.network.Network
@@ -79,58 +79,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/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/mock/toscaGlobalServiceTemplates/ContrailVirtualNetworkGlobalTypeServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/mock/toscaGlobalServiceTemplates/ContrailVirtualNetworkGlobalTypeServiceTemplate.yaml
index 5583c68278..72e789cc7e 100644
--- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/mock/toscaGlobalServiceTemplates/ContrailVirtualNetworkGlobalTypeServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/mock/toscaGlobalServiceTemplates/ContrailVirtualNetworkGlobalTypeServiceTemplate.yaml
@@ -16,66 +16,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/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/mock/toscaGlobalServiceTemplates/NativeTypesServiceTemplateServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/mock/toscaGlobalServiceTemplates/NativeTypesServiceTemplateServiceTemplate.yaml
index ffadfc5af5..0ba25f5ec5 100644
--- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/mock/toscaGlobalServiceTemplates/NativeTypesServiceTemplateServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/mock/toscaGlobalServiceTemplates/NativeTypesServiceTemplateServiceTemplate.yaml
@@ -13,21 +13,21 @@ node_types:
       private_address:
         type: string
         description: private address
-        status: SUPPORTED
+        status: supported
       public_address:
         type: string
         description: public_address
-        status: SUPPORTED
+        status: supported
       networks:
         type: map
         description: networks
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: tosca.datatypes.network.NetworkInfo
       ports:
         type: map
         description: ports
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: tosca.datatypes.network.PortInfo
     requirements:
@@ -72,25 +72,25 @@ node_types:
       ip_range_end:
         type: string
         required: false
-        status: SUPPORTED
+        status: supported
       ip_range_start:
         type: string
         required: false
-        status: SUPPORTED
+        status: supported
       ip_address:
         type: string
         required: false
-        status: SUPPORTED
+        status: supported
       is_default:
         type: boolean
         required: false
         default: false
-        status: SUPPORTED
+        status: supported
       order:
         type: integer
         required: true
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
     requirements:
@@ -113,15 +113,15 @@ node_types:
       tosca_name:
         type: string
         description: tosca name
-        status: SUPPORTED
+        status: supported
       state:
         type: string
         description: state
-        status: SUPPORTED
+        status: supported
       tosca_id:
         type: string
         description: tosca id
-        status: SUPPORTED
+        status: supported
     interfaces: {
       }
   tosca.nodes.network.Network:
@@ -130,25 +130,25 @@ node_types:
       physical_network:
         type: string
         required: false
-        status: SUPPORTED
+        status: supported
       dhcp_enabled:
         type: boolean
         required: false
         default: true
-        status: SUPPORTED
+        status: supported
       segmentation_id:
         type: string
         required: false
-        status: SUPPORTED
+        status: supported
       network_id:
         type: string
         required: false
-        status: SUPPORTED
+        status: supported
       ip_version:
         type: integer
         required: false
         default: 4
-        status: SUPPORTED
+        status: supported
         constraints:
         - valid_values:
           - 4
@@ -156,27 +156,27 @@ node_types:
       start_ip:
         type: string
         required: false
-        status: SUPPORTED
+        status: supported
       network_name:
         type: string
         required: false
-        status: SUPPORTED
+        status: supported
       cidr:
         type: string
         required: false
-        status: SUPPORTED
+        status: supported
       gateway_ip:
         type: string
         required: false
-        status: SUPPORTED
+        status: supported
       network_type:
         type: string
         required: false
-        status: SUPPORTED
+        status: supported
       end_ip:
         type: string
         required: false
-        status: SUPPORTED
+        status: supported
     capabilities:
       link:
         type: tosca.capabilities.network.Linkable
@@ -189,17 +189,17 @@ node_types:
       size:
         type: scalar-unit.size
         required: false
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 1 MB
       volume_id:
         type: string
         required: false
-        status: SUPPORTED
+        status: supported
       snapshot_id:
         type: string
         required: false
-        status: SUPPORTED
+        status: supported
     capabilities:
       attachment:
         type: tosca.capabilities.Attachment
diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/mock/toscaGlobalServiceTemplates/NeutronNetGlobalTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/mock/toscaGlobalServiceTemplates/NeutronNetGlobalTypesServiceTemplate.yaml
index 3dbb24b0f2..5fb5da22fc 100644
--- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/mock/toscaGlobalServiceTemplates/NeutronNetGlobalTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/mock/toscaGlobalServiceTemplates/NeutronNetGlobalTypesServiceTemplate.yaml
@@ -16,41 +16,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:
@@ -59,38 +59,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/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/mock/toscaGlobalServiceTemplates/NeutronPortGlobalTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/mock/toscaGlobalServiceTemplates/NeutronPortGlobalTypesServiceTemplate.yaml
index 4613b70f74..cbd43ebeb0 100644
--- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/mock/toscaGlobalServiceTemplates/NeutronPortGlobalTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/mock/toscaGlobalServiceTemplates/NeutronPortGlobalTypesServiceTemplate.yaml
@@ -17,12 +17,12 @@ data_types:
         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
 node_types:
   org.openecomp.resource.cp.nodes.heat.network.neutron.Port:
     derived_from: org.openecomp.resource.cp.nodes.network.Port
@@ -31,29 +31,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
@@ -65,25 +65,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
@@ -92,59 +92,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/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/mock/toscaGlobalServiceTemplates/NeutronSecurityRulesGlobalTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/mock/toscaGlobalServiceTemplates/NeutronSecurityRulesGlobalTypesServiceTemplate.yaml
index 3e4a465689..8868f4a4f1 100644
--- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/mock/toscaGlobalServiceTemplates/NeutronSecurityRulesGlobalTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/mock/toscaGlobalServiceTemplates/NeutronSecurityRulesGlobalTypesServiceTemplate.yaml
@@ -15,12 +15,12 @@ data_types:
         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
@@ -31,7 +31,7 @@ data_types:
         description: Ethertype of the traffic
         required: false
         default: IPv4
-        status: SUPPORTED
+        status: supported
         constraints:
         - valid_values:
           - IPv4
@@ -41,7 +41,7 @@ data_types:
         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
@@ -50,13 +50,13 @@ data_types:
         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
@@ -66,7 +66,7 @@ data_types:
         description: The direction in which the security group rule is applied
         required: false
         default: ingress
-        status: SUPPORTED
+        status: supported
         constraints:
         - valid_values:
           - egress
@@ -75,7 +75,7 @@ data_types:
         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
@@ -88,24 +88,24 @@ node_types:
         type: string
         description: A symbolic name for this security group, which is not required to be unique.
         required: false
-        status: SUPPORTED
+        status: supported
       description:
         type: string
         description: Description of the security group
         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/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/mock/toscaGlobalServiceTemplates/NovaServerGlobalTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/mock/toscaGlobalServiceTemplates/NovaServerGlobalTypesServiceTemplate.yaml
index 2a7069a932..e962020c7b 100644
--- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/mock/toscaGlobalServiceTemplates/NovaServerGlobalTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/mock/toscaGlobalServiceTemplates/NovaServerGlobalTypesServiceTemplate.yaml
@@ -17,35 +17,35 @@ data_types:
         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
@@ -57,7 +57,7 @@ data_types:
         required: false
         default: {
           }
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
   org.openecomp.datatypes.heat.novaServer.network.AddressInfo:
@@ -68,7 +68,7 @@ data_types:
         type: string
         description: Port id
         required: false
-        status: SUPPORTED
+        status: supported
 node_types:
   org.openecomp.resource.vfc.nodes.heat.nova.Server:
     derived_from: org.openecomp.resource.vfc.nodes.Compute
@@ -77,23 +77,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
@@ -103,19 +103,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
@@ -125,7 +125,7 @@ node_types:
         description: Policy on how to apply a flavor update
         required: false
         default: RESIZE
-        status: SUPPORTED
+        status: supported
         constraints:
         - valid_values:
           - RESIZE
@@ -135,43 +135,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:
@@ -179,7 +179,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
@@ -191,7 +191,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
@@ -201,7 +201,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
@@ -210,42 +210,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
\ No newline at end of file
+        status: supported
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichCeilometerOutput/ComputeGlobalTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichCeilometerOutput/ComputeGlobalTypesServiceTemplate.yaml
index 3cb1c1740c..49f0157455 100644
--- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichCeilometerOutput/ComputeGlobalTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichCeilometerOutput/ComputeGlobalTypesServiceTemplate.yaml
@@ -19,31 +19,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
       instance:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -53,31 +53,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
       memory:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -87,31 +87,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
       disk.iops:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -121,31 +121,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
       disk.device.read.requests:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -155,31 +155,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
       cpu.delta:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -189,31 +189,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
       disk.capacity:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -223,31 +223,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
       disk.write.bytes:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -257,31 +257,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
       disk.device.read.bytes:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -291,31 +291,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
       disk.latency:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -325,31 +325,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
       disk.usage:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -359,31 +359,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
       cpu_util:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -393,31 +393,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
       disk.device.allocation:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -427,31 +427,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
       disk.write.requests.rate:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -461,31 +461,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
       disk.write.bytes.rate:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -495,31 +495,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
       disk.device.latency:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -529,31 +529,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
       cpu:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -563,31 +563,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
       disk.read.requests:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -597,31 +597,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
       disk.root.size:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -631,31 +631,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
       disk.device.write.requests:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -665,31 +665,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
       vcpus:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -699,31 +699,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: 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
       disk.device.iops:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -733,31 +733,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
       disk.device.usage:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -767,31 +767,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
       disk.device.read.requests.rate:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -801,31 +801,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
       disk.device.write.requests.rate:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -835,31 +835,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
       instance:type:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -869,31 +869,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:type
-            status: SUPPORTED
+            status: supported
           description:
             type: string
             description: Description of the metric
             required: false
             default: Existence of instance <type> (OpenStack types)
-            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
       disk.allocation:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -903,31 +903,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
       disk.read.bytes.rate:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -937,31 +937,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
       disk.read.bytes:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -971,31 +971,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
       memory.usage:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -1005,31 +1005,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
       disk.device.capacity:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -1039,31 +1039,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
       memory.resident:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -1073,31 +1073,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
       disk.write.requests:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -1107,28 +1107,28 @@ 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
\ No newline at end of file
+            status: supported
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichCeilometerOutput/PortGlobalTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichCeilometerOutput/PortGlobalTypesServiceTemplate.yaml
index a3a466ba26..495b3e2461 100644
--- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichCeilometerOutput/PortGlobalTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichCeilometerOutput/PortGlobalTypesServiceTemplate.yaml
@@ -19,28 +19,28 @@ 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
\ No newline at end of file
+            status: supported
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichComputeCeilometerOutput/ComputeGlobalTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichComputeCeilometerOutput/ComputeGlobalTypesServiceTemplate.yaml
index 3cb1c1740c..49f0157455 100644
--- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichComputeCeilometerOutput/ComputeGlobalTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichComputeCeilometerOutput/ComputeGlobalTypesServiceTemplate.yaml
@@ -19,31 +19,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
       instance:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -53,31 +53,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
       memory:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -87,31 +87,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
       disk.iops:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -121,31 +121,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
       disk.device.read.requests:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -155,31 +155,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
       cpu.delta:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -189,31 +189,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
       disk.capacity:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -223,31 +223,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
       disk.write.bytes:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -257,31 +257,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
       disk.device.read.bytes:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -291,31 +291,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
       disk.latency:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -325,31 +325,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
       disk.usage:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -359,31 +359,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
       cpu_util:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -393,31 +393,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
       disk.device.allocation:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -427,31 +427,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
       disk.write.requests.rate:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -461,31 +461,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
       disk.write.bytes.rate:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -495,31 +495,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
       disk.device.latency:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -529,31 +529,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
       cpu:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -563,31 +563,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
       disk.read.requests:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -597,31 +597,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
       disk.root.size:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -631,31 +631,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
       disk.device.write.requests:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -665,31 +665,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
       vcpus:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -699,31 +699,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: 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
       disk.device.iops:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -733,31 +733,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
       disk.device.usage:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -767,31 +767,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
       disk.device.read.requests.rate:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -801,31 +801,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
       disk.device.write.requests.rate:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -835,31 +835,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
       instance:type:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -869,31 +869,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:type
-            status: SUPPORTED
+            status: supported
           description:
             type: string
             description: Description of the metric
             required: false
             default: Existence of instance <type> (OpenStack types)
-            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
       disk.allocation:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -903,31 +903,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
       disk.read.bytes.rate:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -937,31 +937,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
       disk.read.bytes:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -971,31 +971,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
       memory.usage:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -1005,31 +1005,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
       disk.device.capacity:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -1039,31 +1039,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
       memory.resident:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -1073,31 +1073,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
       disk.write.requests:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -1107,28 +1107,28 @@ 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
\ No newline at end of file
+            status: supported
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortCeilometerOutput/PortGlobalTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortCeilometerOutput/PortGlobalTypesServiceTemplate.yaml
index a3a466ba26..495b3e2461 100644
--- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortCeilometerOutput/PortGlobalTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortCeilometerOutput/PortGlobalTypesServiceTemplate.yaml
@@ -19,28 +19,28 @@ 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
\ No newline at end of file
+            status: supported
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/catalogInstance/in/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/catalogInstance/in/GlobalSubstitutionTypesServiceTemplate.yaml
index c24fab0eea..72872e2d1e 100644
--- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/catalogInstance/in/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/catalogInstance/in/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -13,75 +13,75 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       compute_pd_server_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_pd_server_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd01_port_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_pd01_port_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd01_port_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       compute_pd_server_user_data_format:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
     requirements:
diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/catalogInstance/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/catalogInstance/out/GlobalSubstitutionTypesServiceTemplate.yaml
index c56497f9c5..6ccb4fa5eb 100644
--- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/catalogInstance/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/catalogInstance/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -11,19 +11,19 @@ node_types:
       port_pd01_port_0_floating_ip_count:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd01_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd01_port_0_network_role_tag:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       index_value:
@@ -31,75 +31,75 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       port_pd01_port_0_ip_count:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_pd_server_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_pd_server_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd01_port_1_floating_ip_count:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_1_ip_count:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_1_mac_count:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd01_port_1_network_role_tag:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd01_port_0_mac_count:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd01_port_1_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_pd_server_user_data_format:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
     requirements:
@@ -522,23 +522,23 @@ node_types:
       compute_ps_server_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_ps01_port_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_ps_server_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_ps_server_user_data_format:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       index_value:
@@ -546,55 +546,55 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       port_ps01_port_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps01_port_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps01_port_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps01_port_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps01_port_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_ps01_port_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_ps01_port_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps01_port_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_ps_server:
         capability: tosca.capabilities.Node
@@ -943,7 +943,7 @@ node_types:
         type: float
         description: Size of /storage in GB.
         required: true
-        status: SUPPORTED
+        status: supported
         constraints:
         - in_range:
           - 4
@@ -952,25 +952,25 @@ node_types:
         type: string
         description: Unique name for this VNF instance.
         required: true
-        status: SUPPORTED
+        status: supported
       index:
         type: float
         description: number of volumes to spin up
         required: true
-        status: SUPPORTED
+        status: supported
       OS::stack_name:
         type: string
         required: false
-        status: SUPPORTED
+        status: supported
     attributes:
       cfed_volume_0:
         type: string
         description: CFED Volume UUID
-        status: SUPPORTED
+        status: supported
       cfed_volume_1:
         type: string
         description: CFED Volume UUID
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_cfed_volume_0:
         capability: tosca.capabilities.Node
@@ -1014,35 +1014,35 @@ node_types:
         type: string
         description: VM flavor name.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_sig_port_2_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_int_ctrl1_port_1_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_int_ctrl1_port_1_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       usage_info:
         type: json
         description: |
           Per-VM/vNIC data for members of this elastic group.
         required: true
-        status: SUPPORTED
+        status: supported
       config_info:
         type: json
         description: Service configuration and network layout.
         required: true
-        status: SUPPORTED
+        status: supported
       group_index:
         type: float
         description: Index of the VM pair within the elastic group.
         required: true
-        status: SUPPORTED
+        status: supported
         constraints:
         - in_range:
           - 0
@@ -1051,156 +1051,156 @@ node_types:
         type: string
         description: UUID of the subnet.
         required: true
-        status: SUPPORTED
+        status: supported
       workload_context:
         type: string
         description: Workload context for this VNF.
         required: true
-        status: SUPPORTED
+        status: supported
       ssh_private_key:
         type: string
         description: Private SSH key for VM to VM communication in this system.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_sig_port_2_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_cfed_0_int_ctrl0_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_cfed_0_sig_port_2_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_sig_port_2_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       int_ctrl1_Sec_Grp:
         type: string
         description: Internal network 0 security group UUID.
         required: true
-        status: SUPPORTED
+        status: supported
       current_group_count:
         type: string
         description: |
           Current VM pair count within the elastic group.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_int_ctrl0_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       total_pair_count:
         type: string
         description: |
           This string will evaluate to the number of PairGroups in the VNF.
         required: true
-        status: SUPPORTED
+        status: supported
       cfed_sig_ipmap_sideA_0_float_published:
         type: list
         description: VM/subnet/usage IP address list. Keyed by group index.
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_cfed_0_sig_port_2_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       int_ctrl1_net_id:
         type: string
         description: Internal network 1.
         required: true
-        status: SUPPORTED
+        status: supported
       cfed_sigv6_ipmap_sideA_0_fixed_dbaas:
         type: list
         description: VM/subnet/usage IP address list. Keyed by group index.
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       cfed_image_name:
         type: string
         description: VM image name.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_int_ctrl0_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_int_ctrl0_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       cfed_sigv6_ipmap_sideA_0_float_published:
         type: list
         description: VM/subnet/usage IP address list. Keyed by group index.
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       cfed_sig_ipmap_sideA_0_fixed_dbaas:
         type: list
         description: VM/subnet/usage IP address list. Keyed by group index.
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_cfed_0_int_ctrl0_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       ssh_public_key:
         type: string
         description: Public SSH key for VM to VM communication in this system.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_int_ctrl0_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_cfed_0_int_ctrl1_port_1_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       sig_net_id:
         type: string
         description: UUID of the network.
         required: true
-        status: SUPPORTED
+        status: supported
       sigv6_v6_subnet_id:
         type: string
         description: UUID of the subnet.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_int_ctrl1_port_1_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       vf_module_index:
         type: float
         description: Unique index for this VNF Module instance.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_int_ctrl1_port_1_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       backup_file1:
         type: string
         description: |
@@ -1208,12 +1208,12 @@ node_types:
           This is only used for restore (aka "disaster recovery") and
           only referenced on OAM-A.
         required: true
-        status: SUPPORTED
+        status: supported
       vf_module_id:
         type: string
         description: Unique ID for this VNF module instance.
         required: true
-        status: SUPPORTED
+        status: supported
       backup_file2:
         type: string
         description: |
@@ -1221,23 +1221,23 @@ node_types:
           This is only used for restore (aka "disaster recovery") and
           only referenced on OAM-A.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_sig_port_2_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       cfed_names:
         type: list
         description: VM name list.
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       role:
         type: string
         description: VM role during LCM activities.
         required: true
-        status: SUPPORTED
+        status: supported
         constraints:
         - valid_values:
           - oam
@@ -1245,56 +1245,56 @@ node_types:
       port_cfed_0_int_ctrl1_port_1_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       vnf_name:
         type: string
         description: Unique name for this VNF instance.
         required: true
-        status: SUPPORTED
+        status: supported
       vf_module_name:
         type: string
         description: Unique name for this VNF module instance.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_int_ctrl0_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       vnf_id:
         type: string
         description: Unique ID for this VNF instance.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_int_ctrl0_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       lcm_keypair:
         type: string
         description: Lifecycle management access key pair.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_int_ctrl1_port_1_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       availability_zone_0:
         type: string
         description: VM availability zone.
         required: true
-        status: SUPPORTED
+        status: supported
       sig_Sec_Grp:
         type: string
         description: UUID of the security group.
         required: true
-        status: SUPPORTED
+        status: supported
       int_ctrl0_Sec_Grp:
         type: string
         description: Internal network 0 security group UUID.
         required: true
-        status: SUPPORTED
+        status: supported
       net_info_str:
         type: string
         description: |
@@ -1303,78 +1303,78 @@ node_types:
           in Kilo there is no way to convert json to string for
           output as a personality file.
         required: true
-        status: SUPPORTED
+        status: supported
       ssh_access_key:
         type: string
         description: Public SSH key for external access.
         required: true
-        status: SUPPORTED
+        status: supported
       int_ctrl0_net_id:
         type: string
         description: Internal network 0.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_sig_port_2_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_sig_port_2_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       environment_context:
         type: string
         description: Environment context for this VNF.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_int_ctrl0_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       pair2idx:
         type: json
         description: Map group index to VMtype index.
         required: true
-        status: SUPPORTED
+        status: supported
       vm_role:
         type: string
         description: Unique role for these VMs.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_int_ctrl1_port_1_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       group_id:
         type: string
         description: ID number of the elastic group this pair is a member of.
         required: true
-        status: SUPPORTED
+        status: supported
       install_config:
         type: string
         description: JSON formatted string of install config values.
         required: true
-        status: SUPPORTED
+        status: supported
       cfed_volume_0:
         type: json
         description: CFED Volume.
         required: true
-        status: SUPPORTED
+        status: supported
       group_tag:
         type: string
         description: Key into "usage_info" for members of this elastic group.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_sig_port_2_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_int_ctrl1_port_1_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
     attributes:
@@ -1383,11 +1383,11 @@ node_types:
         description: |
           Template file version number. This should be updated
           each time a non-comment change is made to this file.
-        status: SUPPORTED
+        status: supported
       VMA-EXT_IPS:
         type: string
         description: IP addresses assigned to the first external network.
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_cfed_0_sig_port_2:
         capability: tosca.capabilities.Node
@@ -1905,29 +1905,29 @@ node_types:
         type: string
         description: VM flavor name.
         required: true
-        status: SUPPORTED
+        status: supported
       cfed_sigv6_ipmap_sideB_0_fixed_dbaas:
         type: list
         description: VM/subnet/usage IP address list. Keyed by group index.
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_cfed_1_int_ctrl0_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       cfed_sig_ipmap_sideB_0_fixed_dbaas:
         type: list
         description: VM/subnet/usage IP address list. Keyed by group index.
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_cfed_1_sig_port_2_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       usage_info:
@@ -1935,21 +1935,21 @@ node_types:
         description: |
           Per-VM/vNIC data for members of this elastic group.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_1_sig_port_2_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       config_info:
         type: json
         description: Service configuration and network layout.
         required: true
-        status: SUPPORTED
+        status: supported
       group_index:
         type: float
         description: Index of the VM pair within the elastic group.
         required: true
-        status: SUPPORTED
+        status: supported
         constraints:
         - in_range:
           - 0
@@ -1958,126 +1958,126 @@ node_types:
         type: string
         description: UUID of the subnet.
         required: true
-        status: SUPPORTED
+        status: supported
       workload_context:
         type: string
         description: Workload context for this VNF.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_1_sig_port_2_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       ssh_private_key:
         type: string
         description: Private SSH key for VM to VM communication in this system.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_1_sig_port_2_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_1_int_ctrl1_port_1_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_cfed_1_int_ctrl0_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       int_ctrl1_Sec_Grp:
         type: string
         description: Internal network 0 security group UUID.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_1_sig_port_2_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       current_group_count:
         type: string
         description: |
           Current VM pair count within the elastic group.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_1_int_ctrl0_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       total_pair_count:
         type: string
         description: |
           This string will evaluate to the number of PairGroups in the VNF.
         required: true
-        status: SUPPORTED
+        status: supported
       int_ctrl1_net_id:
         type: string
         description: Internal network 1.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_1_sig_port_2_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       cfed_image_name:
         type: string
         description: VM image name.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_1_int_ctrl1_port_1_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_1_int_ctrl1_port_1_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       ssh_public_key:
         type: string
         description: Public SSH key for VM to VM communication in this system.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_1_int_ctrl1_port_1_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_1_sig_port_2_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_cfed_1_int_ctrl0_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_cfed_1_sig_port_2_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       sig_net_id:
         type: string
         description: UUID of the network.
         required: true
-        status: SUPPORTED
+        status: supported
       sigv6_v6_subnet_id:
         type: string
         description: UUID of the subnet.
         required: true
-        status: SUPPORTED
+        status: supported
       vf_module_index:
         type: float
         description: Unique index for this VNF Module instance.
         required: true
-        status: SUPPORTED
+        status: supported
       backup_file1:
         type: string
         description: |
@@ -2085,12 +2085,12 @@ node_types:
           This is only used for restore (aka "disaster recovery") and
           only referenced on OAM-A.
         required: true
-        status: SUPPORTED
+        status: supported
       vf_module_id:
         type: string
         description: Unique ID for this VNF module instance.
         required: true
-        status: SUPPORTED
+        status: supported
       backup_file2:
         type: string
         description: |
@@ -2098,23 +2098,23 @@ node_types:
           This is only used for restore (aka "disaster recovery") and
           only referenced on OAM-A.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_1_int_ctrl1_port_1_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       cfed_names:
         type: list
         description: VM name list.
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       role:
         type: string
         description: VM role during LCM activities.
         required: true
-        status: SUPPORTED
+        status: supported
         constraints:
         - valid_values:
           - oam
@@ -2123,55 +2123,55 @@ node_types:
         type: string
         description: Unique name for this VNF instance.
         required: true
-        status: SUPPORTED
+        status: supported
       vf_module_name:
         type: string
         description: Unique name for this VNF module instance.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_1_int_ctrl0_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_cfed_1_int_ctrl1_port_1_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       vnf_id:
         type: string
         description: Unique ID for this VNF instance.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_1_int_ctrl1_port_1_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       lcm_keypair:
         type: string
         description: Lifecycle management access key pair.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_1_int_ctrl1_port_1_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       availability_zone_1:
         type: string
         description: VM availability zone.
         required: true
-        status: SUPPORTED
+        status: supported
       sig_Sec_Grp:
         type: string
         description: UUID of the security group.
         required: true
-        status: SUPPORTED
+        status: supported
       int_ctrl0_Sec_Grp:
         type: string
         description: Internal network 0 security group UUID.
         required: true
-        status: SUPPORTED
+        status: supported
       net_info_str:
         type: string
         description: |
@@ -2180,91 +2180,91 @@ node_types:
           in Kilo there is no way to convert json to string for
           output as a personality file.
         required: true
-        status: SUPPORTED
+        status: supported
       ssh_access_key:
         type: string
         description: Public SSH key for external access.
         required: true
-        status: SUPPORTED
+        status: supported
       int_ctrl0_net_id:
         type: string
         description: Internal network 0.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_1_sig_port_2_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       environment_context:
         type: string
         description: Environment context for this VNF.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_1_int_ctrl0_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       pair2idx:
         type: json
         description: Map group index to VMtype index.
         required: true
-        status: SUPPORTED
+        status: supported
       vm_role:
         type: string
         description: Unique role for these VMs.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_1_int_ctrl0_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_cfed_1_int_ctrl0_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_1_int_ctrl0_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       group_id:
         type: string
         description: ID number of the elastic group this pair is a member of.
         required: true
-        status: SUPPORTED
+        status: supported
       install_config:
         type: string
         description: JSON formatted string of install config values.
         required: true
-        status: SUPPORTED
+        status: supported
       cfed_volume_1:
         type: json
         description: CFED Volume.
         required: true
-        status: SUPPORTED
+        status: supported
       group_tag:
         type: string
         description: Key into "usage_info" for members of this elastic group.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_1_int_ctrl1_port_1_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
     attributes:
       VMB-EXT_IPS:
         type: string
         description: IP addresses assigned to the first external network.
-        status: SUPPORTED
+        status: supported
       Version:
         type: string
         description: |
           Template file version number. This should be updated
           each time a non-comment change is made to this file.
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_cfed_server_1:
         capability: tosca.capabilities.Node
@@ -2783,19 +2783,19 @@ node_types:
         description: |
           This string will evaluate to the number of PairGroups in the VNF.
         required: true
-        status: SUPPORTED
+        status: supported
       ext_net_list:
         type: list
         description: List of applicable subnet tags.
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       int_net_count:
         type: float
         description: Number of internal networks.
         required: true
-        status: SUPPORTED
+        status: supported
         constraints:
         - valid_values:
           - 1
@@ -2806,51 +2806,51 @@ node_types:
           Maps the network strings used in this HOT file
            to network info for the target cloud.
         required: true
-        status: SUPPORTED
+        status: supported
       vnf_name:
         type: string
         description: Unique name for this VNF instance.
         required: true
-        status: SUPPORTED
+        status: supported
       int_net1_label:
         type: json
         description: |
           Map the number of internal networks to an internal net1 label
           or the empty string.
         required: true
-        status: SUPPORTED
+        status: supported
     attributes:
       NetInfoStr:
         type: string
         description: Per-subnet information in string format.
-        status: SUPPORTED
+        status: supported
       PrivateKey:
         type: string
         description: Private SSH key for pre-install intra-VM communication.
-        status: SUPPORTED
+        status: supported
       Version:
         type: string
         description: |
           Template file version number. This should be updated
           each time a non-comment change is made to this file.
-        status: SUPPORTED
+        status: supported
       PublicKey:
         type: string
         description: Public SSH key for pre-install intra-VM communication.
-        status: SUPPORTED
+        status: supported
       TotalPairCount:
         type: string
         description: |
           This string will evaluate to the number of PairGroups in the VNF.
-        status: SUPPORTED
+        status: supported
       IntNetInfo:
         type: string
         description: Internal network attributes.
-        status: SUPPORTED
+        status: supported
       OpenSec:
         type: string
         description: Open security group.
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_Shared_Sec_Grp:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/nested/multiLevel/in/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/nested/multiLevel/in/GlobalSubstitutionTypesServiceTemplate.yaml
index c6c6d412e6..44772d47a1 100644
--- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/nested/multiLevel/in/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/nested/multiLevel/in/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -13,75 +13,75 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       port_ps02_port_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       compute_pd_server_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_pd_server_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_ps02_port_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps02_port_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps02_port_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps02_port_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_ps02_port_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps02_port_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps02_port_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       compute_pd_server_user_data_format:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_ps02_port_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
     requirements:
@@ -428,75 +428,75 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       compute_pd_server_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_pd_server_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd01_port_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_pd01_port_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd01_port_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       compute_pd_server_user_data_format:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
     requirements:
@@ -843,75 +843,75 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       compute_pd_server_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_pd_server_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd02_port_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd02_port_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd02_port_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd02_port_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd02_port_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd02_port_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd02_port_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd02_port_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_pd02_port_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_pd_server_user_data_format:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
     requirements:
@@ -1258,75 +1258,75 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       compute_pd_server_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_pd_server_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd02_port_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd02_port_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd02_port_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd02_port_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd02_port_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd02_port_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd02_port_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd02_port_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_pd02_port_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_pd_server_user_data_format:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
     requirements:
@@ -1673,75 +1673,75 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       compute_pd_server_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_pd_server_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd01_port_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_pd01_port_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd01_port_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       compute_pd_server_user_data_format:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
     requirements:
@@ -2088,75 +2088,75 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       compute_pd_server_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_pd_server_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd01_port_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_pd01_port_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd01_port_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       compute_pd_server_user_data_format:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
     requirements:
@@ -2503,75 +2503,75 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       compute_pd_server_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_pd_server_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd02_port_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd02_port_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd02_port_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd02_port_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd02_port_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd02_port_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd02_port_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd02_port_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_pd02_port_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_pd_server_user_data_format:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
     requirements:
@@ -2917,62 +2917,62 @@ node_types:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       p1:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       p2:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_image:
         type: string
         description: Image for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_flavor:
         type: string
         description: Flavor for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       packet_internal_network_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       packet_external_network_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       security_group_name:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       availability_zone_0:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_oam_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       net:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
     attributes:
       no_compute_attr_1:
         type: string
         description: no_compute_attr_1
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_cmaui_port_2:
         capability: tosca.capabilities.Node
@@ -3193,75 +3193,75 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       compute_pd_server_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_pd_server_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd01_port_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_pd01_port_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd01_port_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       compute_pd_server_user_data_format:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
     requirements:
@@ -3607,54 +3607,54 @@ node_types:
         type: string
         description: Flavor for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       p1:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       p2:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       availabilityzone_name:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       security_group_name:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       pd_image_name:
         type: string
         description: Image for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       pd_server_names:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       net:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       jsa_name:
         type: string
         description: network name of jsa log network
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_ps02_port_0:
         capability: tosca.capabilities.Node
@@ -6013,49 +6013,49 @@ node_types:
         type: string
         description: Flavor for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       p1:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       p2:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       availabilityzone_name:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       security_group_name:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       pd_image_name:
         type: string
         description: Image for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       pd_server_names:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       net:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_pd01_port_0:
         capability: tosca.capabilities.Node
@@ -7635,49 +7635,49 @@ node_types:
         type: string
         description: Flavor for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       p1:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       p2:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       availabilityzone_name:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       security_group_name:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       pd_image_name:
         type: string
         description: Image for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       pd_server_names:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       net:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_pd01_port_0:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/nested/multiLevel/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/nested/multiLevel/out/GlobalSubstitutionTypesServiceTemplate.yaml
index c56497f9c5..6ccb4fa5eb 100644
--- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/nested/multiLevel/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/nested/multiLevel/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -11,19 +11,19 @@ node_types:
       port_pd01_port_0_floating_ip_count:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd01_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd01_port_0_network_role_tag:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       index_value:
@@ -31,75 +31,75 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       port_pd01_port_0_ip_count:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_pd_server_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_pd_server_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd01_port_1_floating_ip_count:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_1_ip_count:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_1_mac_count:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd01_port_1_network_role_tag:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd01_port_0_mac_count:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd01_port_1_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_pd_server_user_data_format:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
     requirements:
@@ -522,23 +522,23 @@ node_types:
       compute_ps_server_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_ps01_port_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_ps_server_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_ps_server_user_data_format:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       index_value:
@@ -546,55 +546,55 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       port_ps01_port_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps01_port_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps01_port_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps01_port_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps01_port_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_ps01_port_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_ps01_port_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps01_port_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_ps_server:
         capability: tosca.capabilities.Node
@@ -943,7 +943,7 @@ node_types:
         type: float
         description: Size of /storage in GB.
         required: true
-        status: SUPPORTED
+        status: supported
         constraints:
         - in_range:
           - 4
@@ -952,25 +952,25 @@ node_types:
         type: string
         description: Unique name for this VNF instance.
         required: true
-        status: SUPPORTED
+        status: supported
       index:
         type: float
         description: number of volumes to spin up
         required: true
-        status: SUPPORTED
+        status: supported
       OS::stack_name:
         type: string
         required: false
-        status: SUPPORTED
+        status: supported
     attributes:
       cfed_volume_0:
         type: string
         description: CFED Volume UUID
-        status: SUPPORTED
+        status: supported
       cfed_volume_1:
         type: string
         description: CFED Volume UUID
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_cfed_volume_0:
         capability: tosca.capabilities.Node
@@ -1014,35 +1014,35 @@ node_types:
         type: string
         description: VM flavor name.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_sig_port_2_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_int_ctrl1_port_1_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_int_ctrl1_port_1_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       usage_info:
         type: json
         description: |
           Per-VM/vNIC data for members of this elastic group.
         required: true
-        status: SUPPORTED
+        status: supported
       config_info:
         type: json
         description: Service configuration and network layout.
         required: true
-        status: SUPPORTED
+        status: supported
       group_index:
         type: float
         description: Index of the VM pair within the elastic group.
         required: true
-        status: SUPPORTED
+        status: supported
         constraints:
         - in_range:
           - 0
@@ -1051,156 +1051,156 @@ node_types:
         type: string
         description: UUID of the subnet.
         required: true
-        status: SUPPORTED
+        status: supported
       workload_context:
         type: string
         description: Workload context for this VNF.
         required: true
-        status: SUPPORTED
+        status: supported
       ssh_private_key:
         type: string
         description: Private SSH key for VM to VM communication in this system.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_sig_port_2_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_cfed_0_int_ctrl0_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_cfed_0_sig_port_2_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_sig_port_2_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       int_ctrl1_Sec_Grp:
         type: string
         description: Internal network 0 security group UUID.
         required: true
-        status: SUPPORTED
+        status: supported
       current_group_count:
         type: string
         description: |
           Current VM pair count within the elastic group.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_int_ctrl0_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       total_pair_count:
         type: string
         description: |
           This string will evaluate to the number of PairGroups in the VNF.
         required: true
-        status: SUPPORTED
+        status: supported
       cfed_sig_ipmap_sideA_0_float_published:
         type: list
         description: VM/subnet/usage IP address list. Keyed by group index.
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_cfed_0_sig_port_2_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       int_ctrl1_net_id:
         type: string
         description: Internal network 1.
         required: true
-        status: SUPPORTED
+        status: supported
       cfed_sigv6_ipmap_sideA_0_fixed_dbaas:
         type: list
         description: VM/subnet/usage IP address list. Keyed by group index.
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       cfed_image_name:
         type: string
         description: VM image name.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_int_ctrl0_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_int_ctrl0_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       cfed_sigv6_ipmap_sideA_0_float_published:
         type: list
         description: VM/subnet/usage IP address list. Keyed by group index.
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       cfed_sig_ipmap_sideA_0_fixed_dbaas:
         type: list
         description: VM/subnet/usage IP address list. Keyed by group index.
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_cfed_0_int_ctrl0_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       ssh_public_key:
         type: string
         description: Public SSH key for VM to VM communication in this system.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_int_ctrl0_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_cfed_0_int_ctrl1_port_1_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       sig_net_id:
         type: string
         description: UUID of the network.
         required: true
-        status: SUPPORTED
+        status: supported
       sigv6_v6_subnet_id:
         type: string
         description: UUID of the subnet.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_int_ctrl1_port_1_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       vf_module_index:
         type: float
         description: Unique index for this VNF Module instance.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_int_ctrl1_port_1_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       backup_file1:
         type: string
         description: |
@@ -1208,12 +1208,12 @@ node_types:
           This is only used for restore (aka "disaster recovery") and
           only referenced on OAM-A.
         required: true
-        status: SUPPORTED
+        status: supported
       vf_module_id:
         type: string
         description: Unique ID for this VNF module instance.
         required: true
-        status: SUPPORTED
+        status: supported
       backup_file2:
         type: string
         description: |
@@ -1221,23 +1221,23 @@ node_types:
           This is only used for restore (aka "disaster recovery") and
           only referenced on OAM-A.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_sig_port_2_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       cfed_names:
         type: list
         description: VM name list.
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       role:
         type: string
         description: VM role during LCM activities.
         required: true
-        status: SUPPORTED
+        status: supported
         constraints:
         - valid_values:
           - oam
@@ -1245,56 +1245,56 @@ node_types:
       port_cfed_0_int_ctrl1_port_1_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       vnf_name:
         type: string
         description: Unique name for this VNF instance.
         required: true
-        status: SUPPORTED
+        status: supported
       vf_module_name:
         type: string
         description: Unique name for this VNF module instance.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_int_ctrl0_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       vnf_id:
         type: string
         description: Unique ID for this VNF instance.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_int_ctrl0_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       lcm_keypair:
         type: string
         description: Lifecycle management access key pair.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_int_ctrl1_port_1_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       availability_zone_0:
         type: string
         description: VM availability zone.
         required: true
-        status: SUPPORTED
+        status: supported
       sig_Sec_Grp:
         type: string
         description: UUID of the security group.
         required: true
-        status: SUPPORTED
+        status: supported
       int_ctrl0_Sec_Grp:
         type: string
         description: Internal network 0 security group UUID.
         required: true
-        status: SUPPORTED
+        status: supported
       net_info_str:
         type: string
         description: |
@@ -1303,78 +1303,78 @@ node_types:
           in Kilo there is no way to convert json to string for
           output as a personality file.
         required: true
-        status: SUPPORTED
+        status: supported
       ssh_access_key:
         type: string
         description: Public SSH key for external access.
         required: true
-        status: SUPPORTED
+        status: supported
       int_ctrl0_net_id:
         type: string
         description: Internal network 0.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_sig_port_2_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_sig_port_2_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       environment_context:
         type: string
         description: Environment context for this VNF.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_int_ctrl0_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       pair2idx:
         type: json
         description: Map group index to VMtype index.
         required: true
-        status: SUPPORTED
+        status: supported
       vm_role:
         type: string
         description: Unique role for these VMs.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_int_ctrl1_port_1_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       group_id:
         type: string
         description: ID number of the elastic group this pair is a member of.
         required: true
-        status: SUPPORTED
+        status: supported
       install_config:
         type: string
         description: JSON formatted string of install config values.
         required: true
-        status: SUPPORTED
+        status: supported
       cfed_volume_0:
         type: json
         description: CFED Volume.
         required: true
-        status: SUPPORTED
+        status: supported
       group_tag:
         type: string
         description: Key into "usage_info" for members of this elastic group.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_sig_port_2_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_int_ctrl1_port_1_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
     attributes:
@@ -1383,11 +1383,11 @@ node_types:
         description: |
           Template file version number. This should be updated
           each time a non-comment change is made to this file.
-        status: SUPPORTED
+        status: supported
       VMA-EXT_IPS:
         type: string
         description: IP addresses assigned to the first external network.
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_cfed_0_sig_port_2:
         capability: tosca.capabilities.Node
@@ -1905,29 +1905,29 @@ node_types:
         type: string
         description: VM flavor name.
         required: true
-        status: SUPPORTED
+        status: supported
       cfed_sigv6_ipmap_sideB_0_fixed_dbaas:
         type: list
         description: VM/subnet/usage IP address list. Keyed by group index.
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_cfed_1_int_ctrl0_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       cfed_sig_ipmap_sideB_0_fixed_dbaas:
         type: list
         description: VM/subnet/usage IP address list. Keyed by group index.
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_cfed_1_sig_port_2_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       usage_info:
@@ -1935,21 +1935,21 @@ node_types:
         description: |
           Per-VM/vNIC data for members of this elastic group.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_1_sig_port_2_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       config_info:
         type: json
         description: Service configuration and network layout.
         required: true
-        status: SUPPORTED
+        status: supported
       group_index:
         type: float
         description: Index of the VM pair within the elastic group.
         required: true
-        status: SUPPORTED
+        status: supported
         constraints:
         - in_range:
           - 0
@@ -1958,126 +1958,126 @@ node_types:
         type: string
         description: UUID of the subnet.
         required: true
-        status: SUPPORTED
+        status: supported
       workload_context:
         type: string
         description: Workload context for this VNF.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_1_sig_port_2_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       ssh_private_key:
         type: string
         description: Private SSH key for VM to VM communication in this system.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_1_sig_port_2_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_1_int_ctrl1_port_1_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_cfed_1_int_ctrl0_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       int_ctrl1_Sec_Grp:
         type: string
         description: Internal network 0 security group UUID.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_1_sig_port_2_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       current_group_count:
         type: string
         description: |
           Current VM pair count within the elastic group.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_1_int_ctrl0_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       total_pair_count:
         type: string
         description: |
           This string will evaluate to the number of PairGroups in the VNF.
         required: true
-        status: SUPPORTED
+        status: supported
       int_ctrl1_net_id:
         type: string
         description: Internal network 1.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_1_sig_port_2_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       cfed_image_name:
         type: string
         description: VM image name.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_1_int_ctrl1_port_1_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_1_int_ctrl1_port_1_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       ssh_public_key:
         type: string
         description: Public SSH key for VM to VM communication in this system.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_1_int_ctrl1_port_1_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_1_sig_port_2_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_cfed_1_int_ctrl0_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_cfed_1_sig_port_2_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       sig_net_id:
         type: string
         description: UUID of the network.
         required: true
-        status: SUPPORTED
+        status: supported
       sigv6_v6_subnet_id:
         type: string
         description: UUID of the subnet.
         required: true
-        status: SUPPORTED
+        status: supported
       vf_module_index:
         type: float
         description: Unique index for this VNF Module instance.
         required: true
-        status: SUPPORTED
+        status: supported
       backup_file1:
         type: string
         description: |
@@ -2085,12 +2085,12 @@ node_types:
           This is only used for restore (aka "disaster recovery") and
           only referenced on OAM-A.
         required: true
-        status: SUPPORTED
+        status: supported
       vf_module_id:
         type: string
         description: Unique ID for this VNF module instance.
         required: true
-        status: SUPPORTED
+        status: supported
       backup_file2:
         type: string
         description: |
@@ -2098,23 +2098,23 @@ node_types:
           This is only used for restore (aka "disaster recovery") and
           only referenced on OAM-A.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_1_int_ctrl1_port_1_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       cfed_names:
         type: list
         description: VM name list.
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       role:
         type: string
         description: VM role during LCM activities.
         required: true
-        status: SUPPORTED
+        status: supported
         constraints:
         - valid_values:
           - oam
@@ -2123,55 +2123,55 @@ node_types:
         type: string
         description: Unique name for this VNF instance.
         required: true
-        status: SUPPORTED
+        status: supported
       vf_module_name:
         type: string
         description: Unique name for this VNF module instance.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_1_int_ctrl0_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_cfed_1_int_ctrl1_port_1_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       vnf_id:
         type: string
         description: Unique ID for this VNF instance.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_1_int_ctrl1_port_1_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       lcm_keypair:
         type: string
         description: Lifecycle management access key pair.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_1_int_ctrl1_port_1_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       availability_zone_1:
         type: string
         description: VM availability zone.
         required: true
-        status: SUPPORTED
+        status: supported
       sig_Sec_Grp:
         type: string
         description: UUID of the security group.
         required: true
-        status: SUPPORTED
+        status: supported
       int_ctrl0_Sec_Grp:
         type: string
         description: Internal network 0 security group UUID.
         required: true
-        status: SUPPORTED
+        status: supported
       net_info_str:
         type: string
         description: |
@@ -2180,91 +2180,91 @@ node_types:
           in Kilo there is no way to convert json to string for
           output as a personality file.
         required: true
-        status: SUPPORTED
+        status: supported
       ssh_access_key:
         type: string
         description: Public SSH key for external access.
         required: true
-        status: SUPPORTED
+        status: supported
       int_ctrl0_net_id:
         type: string
         description: Internal network 0.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_1_sig_port_2_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       environment_context:
         type: string
         description: Environment context for this VNF.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_1_int_ctrl0_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       pair2idx:
         type: json
         description: Map group index to VMtype index.
         required: true
-        status: SUPPORTED
+        status: supported
       vm_role:
         type: string
         description: Unique role for these VMs.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_1_int_ctrl0_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_cfed_1_int_ctrl0_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_1_int_ctrl0_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       group_id:
         type: string
         description: ID number of the elastic group this pair is a member of.
         required: true
-        status: SUPPORTED
+        status: supported
       install_config:
         type: string
         description: JSON formatted string of install config values.
         required: true
-        status: SUPPORTED
+        status: supported
       cfed_volume_1:
         type: json
         description: CFED Volume.
         required: true
-        status: SUPPORTED
+        status: supported
       group_tag:
         type: string
         description: Key into "usage_info" for members of this elastic group.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_1_int_ctrl1_port_1_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
     attributes:
       VMB-EXT_IPS:
         type: string
         description: IP addresses assigned to the first external network.
-        status: SUPPORTED
+        status: supported
       Version:
         type: string
         description: |
           Template file version number. This should be updated
           each time a non-comment change is made to this file.
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_cfed_server_1:
         capability: tosca.capabilities.Node
@@ -2783,19 +2783,19 @@ node_types:
         description: |
           This string will evaluate to the number of PairGroups in the VNF.
         required: true
-        status: SUPPORTED
+        status: supported
       ext_net_list:
         type: list
         description: List of applicable subnet tags.
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       int_net_count:
         type: float
         description: Number of internal networks.
         required: true
-        status: SUPPORTED
+        status: supported
         constraints:
         - valid_values:
           - 1
@@ -2806,51 +2806,51 @@ node_types:
           Maps the network strings used in this HOT file
            to network info for the target cloud.
         required: true
-        status: SUPPORTED
+        status: supported
       vnf_name:
         type: string
         description: Unique name for this VNF instance.
         required: true
-        status: SUPPORTED
+        status: supported
       int_net1_label:
         type: json
         description: |
           Map the number of internal networks to an internal net1 label
           or the empty string.
         required: true
-        status: SUPPORTED
+        status: supported
     attributes:
       NetInfoStr:
         type: string
         description: Per-subnet information in string format.
-        status: SUPPORTED
+        status: supported
       PrivateKey:
         type: string
         description: Private SSH key for pre-install intra-VM communication.
-        status: SUPPORTED
+        status: supported
       Version:
         type: string
         description: |
           Template file version number. This should be updated
           each time a non-comment change is made to this file.
-        status: SUPPORTED
+        status: supported
       PublicKey:
         type: string
         description: Public SSH key for pre-install intra-VM communication.
-        status: SUPPORTED
+        status: supported
       TotalPairCount:
         type: string
         description: |
           This string will evaluate to the number of PairGroups in the VNF.
-        status: SUPPORTED
+        status: supported
       IntNetInfo:
         type: string
         description: Internal network attributes.
-        status: SUPPORTED
+        status: supported
       OpenSec:
         type: string
         description: Open security group.
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_Shared_Sec_Grp:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/nested/oneLevel/in/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/nested/oneLevel/in/GlobalSubstitutionTypesServiceTemplate.yaml
index 04d6a6929e..afb7472520 100644
--- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/nested/oneLevel/in/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/nested/oneLevel/in/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -11,186 +11,186 @@ node_types:
       port_pcm_1port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       availabilityzone_name:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_1port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_image_name:
         type: string
         description: PCRF CM image name
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_2port_2_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_1port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_1port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_2port_2_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_2port_2_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_2port_2_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_pcm_2port_1_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_2port_1_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_1port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_pcm_1port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_2port_2_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       pcm_server_name:
         type: string
         description: PCRF CM server name
         required: true
-        status: SUPPORTED
+        status: supported
       cps_net_mask:
         type: string
         description: CPS network mask
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_2port_2_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_name:
         type: string
         description: OAM network name
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_2port_2_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_1port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_2port_1_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_gw:
         type: string
         description: CPS network gateway
         required: true
-        status: SUPPORTED
+        status: supported
       packet_internal_network_name:
         type: string
         description: name of the network
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_1port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_2port_1_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       security_group_name:
         type: string
         description: the name of security group
         required: true
-        status: SUPPORTED
+        status: supported
       cps_net_ip:
         type: string
         description: CPS network ip
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_2port_1_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       pcm_flavor_name:
         type: string
         description: flavor name of PCRF CM instance
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_2port_2_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_2port_1_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_vol:
         type: string
         description: CPS Cluman Cinder Volume
         required: true
-        status: SUPPORTED
+        status: supported
       cps_net_name:
         type: string
         description: CPS network name
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_ip:
         type: string
         description: OAM network ip
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_mask:
         type: string
         description: CPS network mask
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_2port_1_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_2port_1_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
     attributes:
       server_pcm_id:
         type: string
         description: the pcm nova service id
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_server_pcm:
         capability: tosca.capabilities.Node
@@ -794,79 +794,79 @@ node_types:
       compute_compute_user_data_format:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_compute_port_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       port_compute_port_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       compute_compute_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_compute_port_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_compute_port_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_compute_port_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_compute_metadata:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_compute_port_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_compute_port_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_compute_port_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_compute_port_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_compute:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/nested/oneLevel/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/nested/oneLevel/out/GlobalSubstitutionTypesServiceTemplate.yaml
index c56497f9c5..6ccb4fa5eb 100644
--- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/nested/oneLevel/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/nested/oneLevel/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -11,19 +11,19 @@ node_types:
       port_pd01_port_0_floating_ip_count:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd01_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd01_port_0_network_role_tag:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       index_value:
@@ -31,75 +31,75 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       port_pd01_port_0_ip_count:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_pd_server_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_pd_server_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd01_port_1_floating_ip_count:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_1_ip_count:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_1_mac_count:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd01_port_1_network_role_tag:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd01_port_0_mac_count:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd01_port_1_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_pd_server_user_data_format:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
     requirements:
@@ -522,23 +522,23 @@ node_types:
       compute_ps_server_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_ps01_port_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_ps_server_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_ps_server_user_data_format:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       index_value:
@@ -546,55 +546,55 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       port_ps01_port_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps01_port_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps01_port_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps01_port_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps01_port_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_ps01_port_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_ps01_port_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps01_port_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_ps_server:
         capability: tosca.capabilities.Node
@@ -943,7 +943,7 @@ node_types:
         type: float
         description: Size of /storage in GB.
         required: true
-        status: SUPPORTED
+        status: supported
         constraints:
         - in_range:
           - 4
@@ -952,25 +952,25 @@ node_types:
         type: string
         description: Unique name for this VNF instance.
         required: true
-        status: SUPPORTED
+        status: supported
       index:
         type: float
         description: number of volumes to spin up
         required: true
-        status: SUPPORTED
+        status: supported
       OS::stack_name:
         type: string
         required: false
-        status: SUPPORTED
+        status: supported
     attributes:
       cfed_volume_0:
         type: string
         description: CFED Volume UUID
-        status: SUPPORTED
+        status: supported
       cfed_volume_1:
         type: string
         description: CFED Volume UUID
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_cfed_volume_0:
         capability: tosca.capabilities.Node
@@ -1014,35 +1014,35 @@ node_types:
         type: string
         description: VM flavor name.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_sig_port_2_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_int_ctrl1_port_1_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_int_ctrl1_port_1_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       usage_info:
         type: json
         description: |
           Per-VM/vNIC data for members of this elastic group.
         required: true
-        status: SUPPORTED
+        status: supported
       config_info:
         type: json
         description: Service configuration and network layout.
         required: true
-        status: SUPPORTED
+        status: supported
       group_index:
         type: float
         description: Index of the VM pair within the elastic group.
         required: true
-        status: SUPPORTED
+        status: supported
         constraints:
         - in_range:
           - 0
@@ -1051,156 +1051,156 @@ node_types:
         type: string
         description: UUID of the subnet.
         required: true
-        status: SUPPORTED
+        status: supported
       workload_context:
         type: string
         description: Workload context for this VNF.
         required: true
-        status: SUPPORTED
+        status: supported
       ssh_private_key:
         type: string
         description: Private SSH key for VM to VM communication in this system.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_sig_port_2_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_cfed_0_int_ctrl0_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_cfed_0_sig_port_2_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_sig_port_2_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       int_ctrl1_Sec_Grp:
         type: string
         description: Internal network 0 security group UUID.
         required: true
-        status: SUPPORTED
+        status: supported
       current_group_count:
         type: string
         description: |
           Current VM pair count within the elastic group.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_int_ctrl0_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       total_pair_count:
         type: string
         description: |
           This string will evaluate to the number of PairGroups in the VNF.
         required: true
-        status: SUPPORTED
+        status: supported
       cfed_sig_ipmap_sideA_0_float_published:
         type: list
         description: VM/subnet/usage IP address list. Keyed by group index.
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_cfed_0_sig_port_2_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       int_ctrl1_net_id:
         type: string
         description: Internal network 1.
         required: true
-        status: SUPPORTED
+        status: supported
       cfed_sigv6_ipmap_sideA_0_fixed_dbaas:
         type: list
         description: VM/subnet/usage IP address list. Keyed by group index.
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       cfed_image_name:
         type: string
         description: VM image name.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_int_ctrl0_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_int_ctrl0_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       cfed_sigv6_ipmap_sideA_0_float_published:
         type: list
         description: VM/subnet/usage IP address list. Keyed by group index.
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       cfed_sig_ipmap_sideA_0_fixed_dbaas:
         type: list
         description: VM/subnet/usage IP address list. Keyed by group index.
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_cfed_0_int_ctrl0_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       ssh_public_key:
         type: string
         description: Public SSH key for VM to VM communication in this system.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_int_ctrl0_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_cfed_0_int_ctrl1_port_1_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       sig_net_id:
         type: string
         description: UUID of the network.
         required: true
-        status: SUPPORTED
+        status: supported
       sigv6_v6_subnet_id:
         type: string
         description: UUID of the subnet.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_int_ctrl1_port_1_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       vf_module_index:
         type: float
         description: Unique index for this VNF Module instance.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_int_ctrl1_port_1_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       backup_file1:
         type: string
         description: |
@@ -1208,12 +1208,12 @@ node_types:
           This is only used for restore (aka "disaster recovery") and
           only referenced on OAM-A.
         required: true
-        status: SUPPORTED
+        status: supported
       vf_module_id:
         type: string
         description: Unique ID for this VNF module instance.
         required: true
-        status: SUPPORTED
+        status: supported
       backup_file2:
         type: string
         description: |
@@ -1221,23 +1221,23 @@ node_types:
           This is only used for restore (aka "disaster recovery") and
           only referenced on OAM-A.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_sig_port_2_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       cfed_names:
         type: list
         description: VM name list.
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       role:
         type: string
         description: VM role during LCM activities.
         required: true
-        status: SUPPORTED
+        status: supported
         constraints:
         - valid_values:
           - oam
@@ -1245,56 +1245,56 @@ node_types:
       port_cfed_0_int_ctrl1_port_1_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       vnf_name:
         type: string
         description: Unique name for this VNF instance.
         required: true
-        status: SUPPORTED
+        status: supported
       vf_module_name:
         type: string
         description: Unique name for this VNF module instance.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_int_ctrl0_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       vnf_id:
         type: string
         description: Unique ID for this VNF instance.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_int_ctrl0_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       lcm_keypair:
         type: string
         description: Lifecycle management access key pair.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_int_ctrl1_port_1_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       availability_zone_0:
         type: string
         description: VM availability zone.
         required: true
-        status: SUPPORTED
+        status: supported
       sig_Sec_Grp:
         type: string
         description: UUID of the security group.
         required: true
-        status: SUPPORTED
+        status: supported
       int_ctrl0_Sec_Grp:
         type: string
         description: Internal network 0 security group UUID.
         required: true
-        status: SUPPORTED
+        status: supported
       net_info_str:
         type: string
         description: |
@@ -1303,78 +1303,78 @@ node_types:
           in Kilo there is no way to convert json to string for
           output as a personality file.
         required: true
-        status: SUPPORTED
+        status: supported
       ssh_access_key:
         type: string
         description: Public SSH key for external access.
         required: true
-        status: SUPPORTED
+        status: supported
       int_ctrl0_net_id:
         type: string
         description: Internal network 0.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_sig_port_2_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_sig_port_2_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       environment_context:
         type: string
         description: Environment context for this VNF.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_int_ctrl0_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       pair2idx:
         type: json
         description: Map group index to VMtype index.
         required: true
-        status: SUPPORTED
+        status: supported
       vm_role:
         type: string
         description: Unique role for these VMs.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_int_ctrl1_port_1_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       group_id:
         type: string
         description: ID number of the elastic group this pair is a member of.
         required: true
-        status: SUPPORTED
+        status: supported
       install_config:
         type: string
         description: JSON formatted string of install config values.
         required: true
-        status: SUPPORTED
+        status: supported
       cfed_volume_0:
         type: json
         description: CFED Volume.
         required: true
-        status: SUPPORTED
+        status: supported
       group_tag:
         type: string
         description: Key into "usage_info" for members of this elastic group.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_sig_port_2_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_int_ctrl1_port_1_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
     attributes:
@@ -1383,11 +1383,11 @@ node_types:
         description: |
           Template file version number. This should be updated
           each time a non-comment change is made to this file.
-        status: SUPPORTED
+        status: supported
       VMA-EXT_IPS:
         type: string
         description: IP addresses assigned to the first external network.
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_cfed_0_sig_port_2:
         capability: tosca.capabilities.Node
@@ -1905,29 +1905,29 @@ node_types:
         type: string
         description: VM flavor name.
         required: true
-        status: SUPPORTED
+        status: supported
       cfed_sigv6_ipmap_sideB_0_fixed_dbaas:
         type: list
         description: VM/subnet/usage IP address list. Keyed by group index.
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_cfed_1_int_ctrl0_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       cfed_sig_ipmap_sideB_0_fixed_dbaas:
         type: list
         description: VM/subnet/usage IP address list. Keyed by group index.
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_cfed_1_sig_port_2_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       usage_info:
@@ -1935,21 +1935,21 @@ node_types:
         description: |
           Per-VM/vNIC data for members of this elastic group.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_1_sig_port_2_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       config_info:
         type: json
         description: Service configuration and network layout.
         required: true
-        status: SUPPORTED
+        status: supported
       group_index:
         type: float
         description: Index of the VM pair within the elastic group.
         required: true
-        status: SUPPORTED
+        status: supported
         constraints:
         - in_range:
           - 0
@@ -1958,126 +1958,126 @@ node_types:
         type: string
         description: UUID of the subnet.
         required: true
-        status: SUPPORTED
+        status: supported
       workload_context:
         type: string
         description: Workload context for this VNF.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_1_sig_port_2_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       ssh_private_key:
         type: string
         description: Private SSH key for VM to VM communication in this system.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_1_sig_port_2_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_1_int_ctrl1_port_1_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_cfed_1_int_ctrl0_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       int_ctrl1_Sec_Grp:
         type: string
         description: Internal network 0 security group UUID.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_1_sig_port_2_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       current_group_count:
         type: string
         description: |
           Current VM pair count within the elastic group.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_1_int_ctrl0_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       total_pair_count:
         type: string
         description: |
           This string will evaluate to the number of PairGroups in the VNF.
         required: true
-        status: SUPPORTED
+        status: supported
       int_ctrl1_net_id:
         type: string
         description: Internal network 1.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_1_sig_port_2_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       cfed_image_name:
         type: string
         description: VM image name.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_1_int_ctrl1_port_1_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_1_int_ctrl1_port_1_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       ssh_public_key:
         type: string
         description: Public SSH key for VM to VM communication in this system.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_1_int_ctrl1_port_1_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_1_sig_port_2_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_cfed_1_int_ctrl0_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_cfed_1_sig_port_2_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       sig_net_id:
         type: string
         description: UUID of the network.
         required: true
-        status: SUPPORTED
+        status: supported
       sigv6_v6_subnet_id:
         type: string
         description: UUID of the subnet.
         required: true
-        status: SUPPORTED
+        status: supported
       vf_module_index:
         type: float
         description: Unique index for this VNF Module instance.
         required: true
-        status: SUPPORTED
+        status: supported
       backup_file1:
         type: string
         description: |
@@ -2085,12 +2085,12 @@ node_types:
           This is only used for restore (aka "disaster recovery") and
           only referenced on OAM-A.
         required: true
-        status: SUPPORTED
+        status: supported
       vf_module_id:
         type: string
         description: Unique ID for this VNF module instance.
         required: true
-        status: SUPPORTED
+        status: supported
       backup_file2:
         type: string
         description: |
@@ -2098,23 +2098,23 @@ node_types:
           This is only used for restore (aka "disaster recovery") and
           only referenced on OAM-A.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_1_int_ctrl1_port_1_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       cfed_names:
         type: list
         description: VM name list.
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       role:
         type: string
         description: VM role during LCM activities.
         required: true
-        status: SUPPORTED
+        status: supported
         constraints:
         - valid_values:
           - oam
@@ -2123,55 +2123,55 @@ node_types:
         type: string
         description: Unique name for this VNF instance.
         required: true
-        status: SUPPORTED
+        status: supported
       vf_module_name:
         type: string
         description: Unique name for this VNF module instance.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_1_int_ctrl0_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_cfed_1_int_ctrl1_port_1_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       vnf_id:
         type: string
         description: Unique ID for this VNF instance.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_1_int_ctrl1_port_1_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       lcm_keypair:
         type: string
         description: Lifecycle management access key pair.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_1_int_ctrl1_port_1_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       availability_zone_1:
         type: string
         description: VM availability zone.
         required: true
-        status: SUPPORTED
+        status: supported
       sig_Sec_Grp:
         type: string
         description: UUID of the security group.
         required: true
-        status: SUPPORTED
+        status: supported
       int_ctrl0_Sec_Grp:
         type: string
         description: Internal network 0 security group UUID.
         required: true
-        status: SUPPORTED
+        status: supported
       net_info_str:
         type: string
         description: |
@@ -2180,91 +2180,91 @@ node_types:
           in Kilo there is no way to convert json to string for
           output as a personality file.
         required: true
-        status: SUPPORTED
+        status: supported
       ssh_access_key:
         type: string
         description: Public SSH key for external access.
         required: true
-        status: SUPPORTED
+        status: supported
       int_ctrl0_net_id:
         type: string
         description: Internal network 0.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_1_sig_port_2_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       environment_context:
         type: string
         description: Environment context for this VNF.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_1_int_ctrl0_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       pair2idx:
         type: json
         description: Map group index to VMtype index.
         required: true
-        status: SUPPORTED
+        status: supported
       vm_role:
         type: string
         description: Unique role for these VMs.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_1_int_ctrl0_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_cfed_1_int_ctrl0_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_1_int_ctrl0_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       group_id:
         type: string
         description: ID number of the elastic group this pair is a member of.
         required: true
-        status: SUPPORTED
+        status: supported
       install_config:
         type: string
         description: JSON formatted string of install config values.
         required: true
-        status: SUPPORTED
+        status: supported
       cfed_volume_1:
         type: json
         description: CFED Volume.
         required: true
-        status: SUPPORTED
+        status: supported
       group_tag:
         type: string
         description: Key into "usage_info" for members of this elastic group.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_1_int_ctrl1_port_1_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
     attributes:
       VMB-EXT_IPS:
         type: string
         description: IP addresses assigned to the first external network.
-        status: SUPPORTED
+        status: supported
       Version:
         type: string
         description: |
           Template file version number. This should be updated
           each time a non-comment change is made to this file.
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_cfed_server_1:
         capability: tosca.capabilities.Node
@@ -2783,19 +2783,19 @@ node_types:
         description: |
           This string will evaluate to the number of PairGroups in the VNF.
         required: true
-        status: SUPPORTED
+        status: supported
       ext_net_list:
         type: list
         description: List of applicable subnet tags.
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       int_net_count:
         type: float
         description: Number of internal networks.
         required: true
-        status: SUPPORTED
+        status: supported
         constraints:
         - valid_values:
           - 1
@@ -2806,51 +2806,51 @@ node_types:
           Maps the network strings used in this HOT file
            to network info for the target cloud.
         required: true
-        status: SUPPORTED
+        status: supported
       vnf_name:
         type: string
         description: Unique name for this VNF instance.
         required: true
-        status: SUPPORTED
+        status: supported
       int_net1_label:
         type: json
         description: |
           Map the number of internal networks to an internal net1 label
           or the empty string.
         required: true
-        status: SUPPORTED
+        status: supported
     attributes:
       NetInfoStr:
         type: string
         description: Per-subnet information in string format.
-        status: SUPPORTED
+        status: supported
       PrivateKey:
         type: string
         description: Private SSH key for pre-install intra-VM communication.
-        status: SUPPORTED
+        status: supported
       Version:
         type: string
         description: |
           Template file version number. This should be updated
           each time a non-comment change is made to this file.
-        status: SUPPORTED
+        status: supported
       PublicKey:
         type: string
         description: Public SSH key for pre-install intra-VM communication.
-        status: SUPPORTED
+        status: supported
       TotalPairCount:
         type: string
         description: |
           This string will evaluate to the number of PairGroups in the VNF.
-        status: SUPPORTED
+        status: supported
       IntNetInfo:
         type: string
         description: Internal network attributes.
-        status: SUPPORTED
+        status: supported
       OpenSec:
         type: string
         description: Open security group.
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_Shared_Sec_Grp:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/noPorts/in/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/noPorts/in/GlobalSubstitutionTypesServiceTemplate.yaml
index 0585915362..b077c3afbd 100644
--- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/noPorts/in/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/noPorts/in/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -11,35 +11,35 @@ node_types:
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       compute_pd_server_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_pd_server_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_pd_server_user_data_format:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
     requirements:
diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/noPorts/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/noPorts/out/GlobalSubstitutionTypesServiceTemplate.yaml
index c56497f9c5..6ccb4fa5eb 100644
--- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/noPorts/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/noPorts/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -11,19 +11,19 @@ node_types:
       port_pd01_port_0_floating_ip_count:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd01_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd01_port_0_network_role_tag:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       index_value:
@@ -31,75 +31,75 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       port_pd01_port_0_ip_count:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_pd_server_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_pd_server_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd01_port_1_floating_ip_count:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_1_ip_count:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_1_mac_count:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd01_port_1_network_role_tag:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd01_port_0_mac_count:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd01_port_1_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_pd_server_user_data_format:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
     requirements:
@@ -522,23 +522,23 @@ node_types:
       compute_ps_server_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_ps01_port_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_ps_server_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_ps_server_user_data_format:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       index_value:
@@ -546,55 +546,55 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       port_ps01_port_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps01_port_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps01_port_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps01_port_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps01_port_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_ps01_port_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_ps01_port_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps01_port_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_ps_server:
         capability: tosca.capabilities.Node
@@ -943,7 +943,7 @@ node_types:
         type: float
         description: Size of /storage in GB.
         required: true
-        status: SUPPORTED
+        status: supported
         constraints:
         - in_range:
           - 4
@@ -952,25 +952,25 @@ node_types:
         type: string
         description: Unique name for this VNF instance.
         required: true
-        status: SUPPORTED
+        status: supported
       index:
         type: float
         description: number of volumes to spin up
         required: true
-        status: SUPPORTED
+        status: supported
       OS::stack_name:
         type: string
         required: false
-        status: SUPPORTED
+        status: supported
     attributes:
       cfed_volume_0:
         type: string
         description: CFED Volume UUID
-        status: SUPPORTED
+        status: supported
       cfed_volume_1:
         type: string
         description: CFED Volume UUID
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_cfed_volume_0:
         capability: tosca.capabilities.Node
@@ -1014,35 +1014,35 @@ node_types:
         type: string
         description: VM flavor name.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_sig_port_2_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_int_ctrl1_port_1_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_int_ctrl1_port_1_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       usage_info:
         type: json
         description: |
           Per-VM/vNIC data for members of this elastic group.
         required: true
-        status: SUPPORTED
+        status: supported
       config_info:
         type: json
         description: Service configuration and network layout.
         required: true
-        status: SUPPORTED
+        status: supported
       group_index:
         type: float
         description: Index of the VM pair within the elastic group.
         required: true
-        status: SUPPORTED
+        status: supported
         constraints:
         - in_range:
           - 0
@@ -1051,156 +1051,156 @@ node_types:
         type: string
         description: UUID of the subnet.
         required: true
-        status: SUPPORTED
+        status: supported
       workload_context:
         type: string
         description: Workload context for this VNF.
         required: true
-        status: SUPPORTED
+        status: supported
       ssh_private_key:
         type: string
         description: Private SSH key for VM to VM communication in this system.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_sig_port_2_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_cfed_0_int_ctrl0_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_cfed_0_sig_port_2_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_sig_port_2_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       int_ctrl1_Sec_Grp:
         type: string
         description: Internal network 0 security group UUID.
         required: true
-        status: SUPPORTED
+        status: supported
       current_group_count:
         type: string
         description: |
           Current VM pair count within the elastic group.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_int_ctrl0_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       total_pair_count:
         type: string
         description: |
           This string will evaluate to the number of PairGroups in the VNF.
         required: true
-        status: SUPPORTED
+        status: supported
       cfed_sig_ipmap_sideA_0_float_published:
         type: list
         description: VM/subnet/usage IP address list. Keyed by group index.
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_cfed_0_sig_port_2_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       int_ctrl1_net_id:
         type: string
         description: Internal network 1.
         required: true
-        status: SUPPORTED
+        status: supported
       cfed_sigv6_ipmap_sideA_0_fixed_dbaas:
         type: list
         description: VM/subnet/usage IP address list. Keyed by group index.
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       cfed_image_name:
         type: string
         description: VM image name.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_int_ctrl0_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_int_ctrl0_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       cfed_sigv6_ipmap_sideA_0_float_published:
         type: list
         description: VM/subnet/usage IP address list. Keyed by group index.
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       cfed_sig_ipmap_sideA_0_fixed_dbaas:
         type: list
         description: VM/subnet/usage IP address list. Keyed by group index.
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_cfed_0_int_ctrl0_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       ssh_public_key:
         type: string
         description: Public SSH key for VM to VM communication in this system.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_int_ctrl0_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_cfed_0_int_ctrl1_port_1_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       sig_net_id:
         type: string
         description: UUID of the network.
         required: true
-        status: SUPPORTED
+        status: supported
       sigv6_v6_subnet_id:
         type: string
         description: UUID of the subnet.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_int_ctrl1_port_1_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       vf_module_index:
         type: float
         description: Unique index for this VNF Module instance.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_int_ctrl1_port_1_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       backup_file1:
         type: string
         description: |
@@ -1208,12 +1208,12 @@ node_types:
           This is only used for restore (aka "disaster recovery") and
           only referenced on OAM-A.
         required: true
-        status: SUPPORTED
+        status: supported
       vf_module_id:
         type: string
         description: Unique ID for this VNF module instance.
         required: true
-        status: SUPPORTED
+        status: supported
       backup_file2:
         type: string
         description: |
@@ -1221,23 +1221,23 @@ node_types:
           This is only used for restore (aka "disaster recovery") and
           only referenced on OAM-A.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_sig_port_2_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       cfed_names:
         type: list
         description: VM name list.
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       role:
         type: string
         description: VM role during LCM activities.
         required: true
-        status: SUPPORTED
+        status: supported
         constraints:
         - valid_values:
           - oam
@@ -1245,56 +1245,56 @@ node_types:
       port_cfed_0_int_ctrl1_port_1_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       vnf_name:
         type: string
         description: Unique name for this VNF instance.
         required: true
-        status: SUPPORTED
+        status: supported
       vf_module_name:
         type: string
         description: Unique name for this VNF module instance.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_int_ctrl0_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       vnf_id:
         type: string
         description: Unique ID for this VNF instance.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_int_ctrl0_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       lcm_keypair:
         type: string
         description: Lifecycle management access key pair.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_int_ctrl1_port_1_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       availability_zone_0:
         type: string
         description: VM availability zone.
         required: true
-        status: SUPPORTED
+        status: supported
       sig_Sec_Grp:
         type: string
         description: UUID of the security group.
         required: true
-        status: SUPPORTED
+        status: supported
       int_ctrl0_Sec_Grp:
         type: string
         description: Internal network 0 security group UUID.
         required: true
-        status: SUPPORTED
+        status: supported
       net_info_str:
         type: string
         description: |
@@ -1303,78 +1303,78 @@ node_types:
           in Kilo there is no way to convert json to string for
           output as a personality file.
         required: true
-        status: SUPPORTED
+        status: supported
       ssh_access_key:
         type: string
         description: Public SSH key for external access.
         required: true
-        status: SUPPORTED
+        status: supported
       int_ctrl0_net_id:
         type: string
         description: Internal network 0.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_sig_port_2_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_sig_port_2_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       environment_context:
         type: string
         description: Environment context for this VNF.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_int_ctrl0_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       pair2idx:
         type: json
         description: Map group index to VMtype index.
         required: true
-        status: SUPPORTED
+        status: supported
       vm_role:
         type: string
         description: Unique role for these VMs.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_int_ctrl1_port_1_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       group_id:
         type: string
         description: ID number of the elastic group this pair is a member of.
         required: true
-        status: SUPPORTED
+        status: supported
       install_config:
         type: string
         description: JSON formatted string of install config values.
         required: true
-        status: SUPPORTED
+        status: supported
       cfed_volume_0:
         type: json
         description: CFED Volume.
         required: true
-        status: SUPPORTED
+        status: supported
       group_tag:
         type: string
         description: Key into "usage_info" for members of this elastic group.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_sig_port_2_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_int_ctrl1_port_1_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
     attributes:
@@ -1383,11 +1383,11 @@ node_types:
         description: |
           Template file version number. This should be updated
           each time a non-comment change is made to this file.
-        status: SUPPORTED
+        status: supported
       VMA-EXT_IPS:
         type: string
         description: IP addresses assigned to the first external network.
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_cfed_0_sig_port_2:
         capability: tosca.capabilities.Node
@@ -1905,29 +1905,29 @@ node_types:
         type: string
         description: VM flavor name.
         required: true
-        status: SUPPORTED
+        status: supported
       cfed_sigv6_ipmap_sideB_0_fixed_dbaas:
         type: list
         description: VM/subnet/usage IP address list. Keyed by group index.
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_cfed_1_int_ctrl0_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       cfed_sig_ipmap_sideB_0_fixed_dbaas:
         type: list
         description: VM/subnet/usage IP address list. Keyed by group index.
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_cfed_1_sig_port_2_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       usage_info:
@@ -1935,21 +1935,21 @@ node_types:
         description: |
           Per-VM/vNIC data for members of this elastic group.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_1_sig_port_2_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       config_info:
         type: json
         description: Service configuration and network layout.
         required: true
-        status: SUPPORTED
+        status: supported
       group_index:
         type: float
         description: Index of the VM pair within the elastic group.
         required: true
-        status: SUPPORTED
+        status: supported
         constraints:
         - in_range:
           - 0
@@ -1958,126 +1958,126 @@ node_types:
         type: string
         description: UUID of the subnet.
         required: true
-        status: SUPPORTED
+        status: supported
       workload_context:
         type: string
         description: Workload context for this VNF.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_1_sig_port_2_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       ssh_private_key:
         type: string
         description: Private SSH key for VM to VM communication in this system.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_1_sig_port_2_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_1_int_ctrl1_port_1_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_cfed_1_int_ctrl0_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       int_ctrl1_Sec_Grp:
         type: string
         description: Internal network 0 security group UUID.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_1_sig_port_2_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       current_group_count:
         type: string
         description: |
           Current VM pair count within the elastic group.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_1_int_ctrl0_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       total_pair_count:
         type: string
         description: |
           This string will evaluate to the number of PairGroups in the VNF.
         required: true
-        status: SUPPORTED
+        status: supported
       int_ctrl1_net_id:
         type: string
         description: Internal network 1.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_1_sig_port_2_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       cfed_image_name:
         type: string
         description: VM image name.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_1_int_ctrl1_port_1_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_1_int_ctrl1_port_1_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       ssh_public_key:
         type: string
         description: Public SSH key for VM to VM communication in this system.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_1_int_ctrl1_port_1_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_1_sig_port_2_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_cfed_1_int_ctrl0_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_cfed_1_sig_port_2_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       sig_net_id:
         type: string
         description: UUID of the network.
         required: true
-        status: SUPPORTED
+        status: supported
       sigv6_v6_subnet_id:
         type: string
         description: UUID of the subnet.
         required: true
-        status: SUPPORTED
+        status: supported
       vf_module_index:
         type: float
         description: Unique index for this VNF Module instance.
         required: true
-        status: SUPPORTED
+        status: supported
       backup_file1:
         type: string
         description: |
@@ -2085,12 +2085,12 @@ node_types:
           This is only used for restore (aka "disaster recovery") and
           only referenced on OAM-A.
         required: true
-        status: SUPPORTED
+        status: supported
       vf_module_id:
         type: string
         description: Unique ID for this VNF module instance.
         required: true
-        status: SUPPORTED
+        status: supported
       backup_file2:
         type: string
         description: |
@@ -2098,23 +2098,23 @@ node_types:
           This is only used for restore (aka "disaster recovery") and
           only referenced on OAM-A.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_1_int_ctrl1_port_1_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       cfed_names:
         type: list
         description: VM name list.
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       role:
         type: string
         description: VM role during LCM activities.
         required: true
-        status: SUPPORTED
+        status: supported
         constraints:
         - valid_values:
           - oam
@@ -2123,55 +2123,55 @@ node_types:
         type: string
         description: Unique name for this VNF instance.
         required: true
-        status: SUPPORTED
+        status: supported
       vf_module_name:
         type: string
         description: Unique name for this VNF module instance.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_1_int_ctrl0_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_cfed_1_int_ctrl1_port_1_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       vnf_id:
         type: string
         description: Unique ID for this VNF instance.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_1_int_ctrl1_port_1_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       lcm_keypair:
         type: string
         description: Lifecycle management access key pair.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_1_int_ctrl1_port_1_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       availability_zone_1:
         type: string
         description: VM availability zone.
         required: true
-        status: SUPPORTED
+        status: supported
       sig_Sec_Grp:
         type: string
         description: UUID of the security group.
         required: true
-        status: SUPPORTED
+        status: supported
       int_ctrl0_Sec_Grp:
         type: string
         description: Internal network 0 security group UUID.
         required: true
-        status: SUPPORTED
+        status: supported
       net_info_str:
         type: string
         description: |
@@ -2180,91 +2180,91 @@ node_types:
           in Kilo there is no way to convert json to string for
           output as a personality file.
         required: true
-        status: SUPPORTED
+        status: supported
       ssh_access_key:
         type: string
         description: Public SSH key for external access.
         required: true
-        status: SUPPORTED
+        status: supported
       int_ctrl0_net_id:
         type: string
         description: Internal network 0.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_1_sig_port_2_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       environment_context:
         type: string
         description: Environment context for this VNF.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_1_int_ctrl0_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       pair2idx:
         type: json
         description: Map group index to VMtype index.
         required: true
-        status: SUPPORTED
+        status: supported
       vm_role:
         type: string
         description: Unique role for these VMs.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_1_int_ctrl0_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_cfed_1_int_ctrl0_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_1_int_ctrl0_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       group_id:
         type: string
         description: ID number of the elastic group this pair is a member of.
         required: true
-        status: SUPPORTED
+        status: supported
       install_config:
         type: string
         description: JSON formatted string of install config values.
         required: true
-        status: SUPPORTED
+        status: supported
       cfed_volume_1:
         type: json
         description: CFED Volume.
         required: true
-        status: SUPPORTED
+        status: supported
       group_tag:
         type: string
         description: Key into "usage_info" for members of this elastic group.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_1_int_ctrl1_port_1_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
     attributes:
       VMB-EXT_IPS:
         type: string
         description: IP addresses assigned to the first external network.
-        status: SUPPORTED
+        status: supported
       Version:
         type: string
         description: |
           Template file version number. This should be updated
           each time a non-comment change is made to this file.
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_cfed_server_1:
         capability: tosca.capabilities.Node
@@ -2783,19 +2783,19 @@ node_types:
         description: |
           This string will evaluate to the number of PairGroups in the VNF.
         required: true
-        status: SUPPORTED
+        status: supported
       ext_net_list:
         type: list
         description: List of applicable subnet tags.
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       int_net_count:
         type: float
         description: Number of internal networks.
         required: true
-        status: SUPPORTED
+        status: supported
         constraints:
         - valid_values:
           - 1
@@ -2806,51 +2806,51 @@ node_types:
           Maps the network strings used in this HOT file
            to network info for the target cloud.
         required: true
-        status: SUPPORTED
+        status: supported
       vnf_name:
         type: string
         description: Unique name for this VNF instance.
         required: true
-        status: SUPPORTED
+        status: supported
       int_net1_label:
         type: json
         description: |
           Map the number of internal networks to an internal net1 label
           or the empty string.
         required: true
-        status: SUPPORTED
+        status: supported
     attributes:
       NetInfoStr:
         type: string
         description: Per-subnet information in string format.
-        status: SUPPORTED
+        status: supported
       PrivateKey:
         type: string
         description: Private SSH key for pre-install intra-VM communication.
-        status: SUPPORTED
+        status: supported
       Version:
         type: string
         description: |
           Template file version number. This should be updated
           each time a non-comment change is made to this file.
-        status: SUPPORTED
+        status: supported
       PublicKey:
         type: string
         description: Public SSH key for pre-install intra-VM communication.
-        status: SUPPORTED
+        status: supported
       TotalPairCount:
         type: string
         description: |
           This string will evaluate to the number of PairGroups in the VNF.
-        status: SUPPORTED
+        status: supported
       IntNetInfo:
         type: string
         description: Internal network attributes.
-        status: SUPPORTED
+        status: supported
       OpenSec:
         type: string
         description: Open security group.
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_Shared_Sec_Grp:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/scalingInstance/in/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/scalingInstance/in/GlobalSubstitutionTypesServiceTemplate.yaml
index 6cea8753b3..ff5d2e754f 100644
--- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/scalingInstance/in/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/scalingInstance/in/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -11,63 +11,63 @@ node_types:
       compute_pd_server_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_pd_server_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd01_port_replacement_policy:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd02_port_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd02_port_replacement_policy:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd01_port_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_pd02_port_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       compute_pd_server_user_data_format:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       index_value:
@@ -75,63 +75,63 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       port_pd02_port_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd02_port_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd02_port_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd02_port_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_pd01_port_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd01_port_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd02_port_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd02_port_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_pd01_port_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_pd_server:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/scalingInstance/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/scalingInstance/out/GlobalSubstitutionTypesServiceTemplate.yaml
index c56497f9c5..6ccb4fa5eb 100644
--- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/scalingInstance/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/scalingInstance/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -11,19 +11,19 @@ node_types:
       port_pd01_port_0_floating_ip_count:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd01_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd01_port_0_network_role_tag:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       index_value:
@@ -31,75 +31,75 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       port_pd01_port_0_ip_count:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_pd_server_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_pd_server_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd01_port_1_floating_ip_count:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_1_ip_count:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_1_mac_count:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd01_port_1_network_role_tag:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd01_port_0_mac_count:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd01_port_1_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_pd_server_user_data_format:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
     requirements:
@@ -522,23 +522,23 @@ node_types:
       compute_ps_server_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_ps01_port_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_ps_server_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_ps_server_user_data_format:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       index_value:
@@ -546,55 +546,55 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       port_ps01_port_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps01_port_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps01_port_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps01_port_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps01_port_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_ps01_port_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_ps01_port_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps01_port_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_ps_server:
         capability: tosca.capabilities.Node
@@ -943,7 +943,7 @@ node_types:
         type: float
         description: Size of /storage in GB.
         required: true
-        status: SUPPORTED
+        status: supported
         constraints:
         - in_range:
           - 4
@@ -952,25 +952,25 @@ node_types:
         type: string
         description: Unique name for this VNF instance.
         required: true
-        status: SUPPORTED
+        status: supported
       index:
         type: float
         description: number of volumes to spin up
         required: true
-        status: SUPPORTED
+        status: supported
       OS::stack_name:
         type: string
         required: false
-        status: SUPPORTED
+        status: supported
     attributes:
       cfed_volume_0:
         type: string
         description: CFED Volume UUID
-        status: SUPPORTED
+        status: supported
       cfed_volume_1:
         type: string
         description: CFED Volume UUID
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_cfed_volume_0:
         capability: tosca.capabilities.Node
@@ -1014,35 +1014,35 @@ node_types:
         type: string
         description: VM flavor name.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_sig_port_2_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_int_ctrl1_port_1_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_int_ctrl1_port_1_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       usage_info:
         type: json
         description: |
           Per-VM/vNIC data for members of this elastic group.
         required: true
-        status: SUPPORTED
+        status: supported
       config_info:
         type: json
         description: Service configuration and network layout.
         required: true
-        status: SUPPORTED
+        status: supported
       group_index:
         type: float
         description: Index of the VM pair within the elastic group.
         required: true
-        status: SUPPORTED
+        status: supported
         constraints:
         - in_range:
           - 0
@@ -1051,156 +1051,156 @@ node_types:
         type: string
         description: UUID of the subnet.
         required: true
-        status: SUPPORTED
+        status: supported
       workload_context:
         type: string
         description: Workload context for this VNF.
         required: true
-        status: SUPPORTED
+        status: supported
       ssh_private_key:
         type: string
         description: Private SSH key for VM to VM communication in this system.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_sig_port_2_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_cfed_0_int_ctrl0_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_cfed_0_sig_port_2_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_sig_port_2_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       int_ctrl1_Sec_Grp:
         type: string
         description: Internal network 0 security group UUID.
         required: true
-        status: SUPPORTED
+        status: supported
       current_group_count:
         type: string
         description: |
           Current VM pair count within the elastic group.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_int_ctrl0_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       total_pair_count:
         type: string
         description: |
           This string will evaluate to the number of PairGroups in the VNF.
         required: true
-        status: SUPPORTED
+        status: supported
       cfed_sig_ipmap_sideA_0_float_published:
         type: list
         description: VM/subnet/usage IP address list. Keyed by group index.
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_cfed_0_sig_port_2_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       int_ctrl1_net_id:
         type: string
         description: Internal network 1.
         required: true
-        status: SUPPORTED
+        status: supported
       cfed_sigv6_ipmap_sideA_0_fixed_dbaas:
         type: list
         description: VM/subnet/usage IP address list. Keyed by group index.
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       cfed_image_name:
         type: string
         description: VM image name.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_int_ctrl0_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_int_ctrl0_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       cfed_sigv6_ipmap_sideA_0_float_published:
         type: list
         description: VM/subnet/usage IP address list. Keyed by group index.
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       cfed_sig_ipmap_sideA_0_fixed_dbaas:
         type: list
         description: VM/subnet/usage IP address list. Keyed by group index.
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_cfed_0_int_ctrl0_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       ssh_public_key:
         type: string
         description: Public SSH key for VM to VM communication in this system.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_int_ctrl0_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_cfed_0_int_ctrl1_port_1_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       sig_net_id:
         type: string
         description: UUID of the network.
         required: true
-        status: SUPPORTED
+        status: supported
       sigv6_v6_subnet_id:
         type: string
         description: UUID of the subnet.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_int_ctrl1_port_1_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       vf_module_index:
         type: float
         description: Unique index for this VNF Module instance.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_int_ctrl1_port_1_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       backup_file1:
         type: string
         description: |
@@ -1208,12 +1208,12 @@ node_types:
           This is only used for restore (aka "disaster recovery") and
           only referenced on OAM-A.
         required: true
-        status: SUPPORTED
+        status: supported
       vf_module_id:
         type: string
         description: Unique ID for this VNF module instance.
         required: true
-        status: SUPPORTED
+        status: supported
       backup_file2:
         type: string
         description: |
@@ -1221,23 +1221,23 @@ node_types:
           This is only used for restore (aka "disaster recovery") and
           only referenced on OAM-A.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_sig_port_2_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       cfed_names:
         type: list
         description: VM name list.
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       role:
         type: string
         description: VM role during LCM activities.
         required: true
-        status: SUPPORTED
+        status: supported
         constraints:
         - valid_values:
           - oam
@@ -1245,56 +1245,56 @@ node_types:
       port_cfed_0_int_ctrl1_port_1_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       vnf_name:
         type: string
         description: Unique name for this VNF instance.
         required: true
-        status: SUPPORTED
+        status: supported
       vf_module_name:
         type: string
         description: Unique name for this VNF module instance.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_int_ctrl0_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       vnf_id:
         type: string
         description: Unique ID for this VNF instance.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_int_ctrl0_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       lcm_keypair:
         type: string
         description: Lifecycle management access key pair.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_int_ctrl1_port_1_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       availability_zone_0:
         type: string
         description: VM availability zone.
         required: true
-        status: SUPPORTED
+        status: supported
       sig_Sec_Grp:
         type: string
         description: UUID of the security group.
         required: true
-        status: SUPPORTED
+        status: supported
       int_ctrl0_Sec_Grp:
         type: string
         description: Internal network 0 security group UUID.
         required: true
-        status: SUPPORTED
+        status: supported
       net_info_str:
         type: string
         description: |
@@ -1303,78 +1303,78 @@ node_types:
           in Kilo there is no way to convert json to string for
           output as a personality file.
         required: true
-        status: SUPPORTED
+        status: supported
       ssh_access_key:
         type: string
         description: Public SSH key for external access.
         required: true
-        status: SUPPORTED
+        status: supported
       int_ctrl0_net_id:
         type: string
         description: Internal network 0.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_sig_port_2_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_sig_port_2_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       environment_context:
         type: string
         description: Environment context for this VNF.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_int_ctrl0_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       pair2idx:
         type: json
         description: Map group index to VMtype index.
         required: true
-        status: SUPPORTED
+        status: supported
       vm_role:
         type: string
         description: Unique role for these VMs.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_int_ctrl1_port_1_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       group_id:
         type: string
         description: ID number of the elastic group this pair is a member of.
         required: true
-        status: SUPPORTED
+        status: supported
       install_config:
         type: string
         description: JSON formatted string of install config values.
         required: true
-        status: SUPPORTED
+        status: supported
       cfed_volume_0:
         type: json
         description: CFED Volume.
         required: true
-        status: SUPPORTED
+        status: supported
       group_tag:
         type: string
         description: Key into "usage_info" for members of this elastic group.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_sig_port_2_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_int_ctrl1_port_1_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
     attributes:
@@ -1383,11 +1383,11 @@ node_types:
         description: |
           Template file version number. This should be updated
           each time a non-comment change is made to this file.
-        status: SUPPORTED
+        status: supported
       VMA-EXT_IPS:
         type: string
         description: IP addresses assigned to the first external network.
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_cfed_0_sig_port_2:
         capability: tosca.capabilities.Node
@@ -1905,29 +1905,29 @@ node_types:
         type: string
         description: VM flavor name.
         required: true
-        status: SUPPORTED
+        status: supported
       cfed_sigv6_ipmap_sideB_0_fixed_dbaas:
         type: list
         description: VM/subnet/usage IP address list. Keyed by group index.
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_cfed_1_int_ctrl0_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       cfed_sig_ipmap_sideB_0_fixed_dbaas:
         type: list
         description: VM/subnet/usage IP address list. Keyed by group index.
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_cfed_1_sig_port_2_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       usage_info:
@@ -1935,21 +1935,21 @@ node_types:
         description: |
           Per-VM/vNIC data for members of this elastic group.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_1_sig_port_2_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       config_info:
         type: json
         description: Service configuration and network layout.
         required: true
-        status: SUPPORTED
+        status: supported
       group_index:
         type: float
         description: Index of the VM pair within the elastic group.
         required: true
-        status: SUPPORTED
+        status: supported
         constraints:
         - in_range:
           - 0
@@ -1958,126 +1958,126 @@ node_types:
         type: string
         description: UUID of the subnet.
         required: true
-        status: SUPPORTED
+        status: supported
       workload_context:
         type: string
         description: Workload context for this VNF.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_1_sig_port_2_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       ssh_private_key:
         type: string
         description: Private SSH key for VM to VM communication in this system.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_1_sig_port_2_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_1_int_ctrl1_port_1_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_cfed_1_int_ctrl0_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       int_ctrl1_Sec_Grp:
         type: string
         description: Internal network 0 security group UUID.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_1_sig_port_2_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       current_group_count:
         type: string
         description: |
           Current VM pair count within the elastic group.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_1_int_ctrl0_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       total_pair_count:
         type: string
         description: |
           This string will evaluate to the number of PairGroups in the VNF.
         required: true
-        status: SUPPORTED
+        status: supported
       int_ctrl1_net_id:
         type: string
         description: Internal network 1.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_1_sig_port_2_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       cfed_image_name:
         type: string
         description: VM image name.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_1_int_ctrl1_port_1_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_1_int_ctrl1_port_1_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       ssh_public_key:
         type: string
         description: Public SSH key for VM to VM communication in this system.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_1_int_ctrl1_port_1_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_1_sig_port_2_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_cfed_1_int_ctrl0_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_cfed_1_sig_port_2_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       sig_net_id:
         type: string
         description: UUID of the network.
         required: true
-        status: SUPPORTED
+        status: supported
       sigv6_v6_subnet_id:
         type: string
         description: UUID of the subnet.
         required: true
-        status: SUPPORTED
+        status: supported
       vf_module_index:
         type: float
         description: Unique index for this VNF Module instance.
         required: true
-        status: SUPPORTED
+        status: supported
       backup_file1:
         type: string
         description: |
@@ -2085,12 +2085,12 @@ node_types:
           This is only used for restore (aka "disaster recovery") and
           only referenced on OAM-A.
         required: true
-        status: SUPPORTED
+        status: supported
       vf_module_id:
         type: string
         description: Unique ID for this VNF module instance.
         required: true
-        status: SUPPORTED
+        status: supported
       backup_file2:
         type: string
         description: |
@@ -2098,23 +2098,23 @@ node_types:
           This is only used for restore (aka "disaster recovery") and
           only referenced on OAM-A.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_1_int_ctrl1_port_1_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       cfed_names:
         type: list
         description: VM name list.
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       role:
         type: string
         description: VM role during LCM activities.
         required: true
-        status: SUPPORTED
+        status: supported
         constraints:
         - valid_values:
           - oam
@@ -2123,55 +2123,55 @@ node_types:
         type: string
         description: Unique name for this VNF instance.
         required: true
-        status: SUPPORTED
+        status: supported
       vf_module_name:
         type: string
         description: Unique name for this VNF module instance.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_1_int_ctrl0_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_cfed_1_int_ctrl1_port_1_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       vnf_id:
         type: string
         description: Unique ID for this VNF instance.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_1_int_ctrl1_port_1_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       lcm_keypair:
         type: string
         description: Lifecycle management access key pair.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_1_int_ctrl1_port_1_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       availability_zone_1:
         type: string
         description: VM availability zone.
         required: true
-        status: SUPPORTED
+        status: supported
       sig_Sec_Grp:
         type: string
         description: UUID of the security group.
         required: true
-        status: SUPPORTED
+        status: supported
       int_ctrl0_Sec_Grp:
         type: string
         description: Internal network 0 security group UUID.
         required: true
-        status: SUPPORTED
+        status: supported
       net_info_str:
         type: string
         description: |
@@ -2180,91 +2180,91 @@ node_types:
           in Kilo there is no way to convert json to string for
           output as a personality file.
         required: true
-        status: SUPPORTED
+        status: supported
       ssh_access_key:
         type: string
         description: Public SSH key for external access.
         required: true
-        status: SUPPORTED
+        status: supported
       int_ctrl0_net_id:
         type: string
         description: Internal network 0.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_1_sig_port_2_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       environment_context:
         type: string
         description: Environment context for this VNF.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_1_int_ctrl0_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       pair2idx:
         type: json
         description: Map group index to VMtype index.
         required: true
-        status: SUPPORTED
+        status: supported
       vm_role:
         type: string
         description: Unique role for these VMs.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_1_int_ctrl0_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_cfed_1_int_ctrl0_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_1_int_ctrl0_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       group_id:
         type: string
         description: ID number of the elastic group this pair is a member of.
         required: true
-        status: SUPPORTED
+        status: supported
       install_config:
         type: string
         description: JSON formatted string of install config values.
         required: true
-        status: SUPPORTED
+        status: supported
       cfed_volume_1:
         type: json
         description: CFED Volume.
         required: true
-        status: SUPPORTED
+        status: supported
       group_tag:
         type: string
         description: Key into "usage_info" for members of this elastic group.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_1_int_ctrl1_port_1_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
     attributes:
       VMB-EXT_IPS:
         type: string
         description: IP addresses assigned to the first external network.
-        status: SUPPORTED
+        status: supported
       Version:
         type: string
         description: |
           Template file version number. This should be updated
           each time a non-comment change is made to this file.
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_cfed_server_1:
         capability: tosca.capabilities.Node
@@ -2783,19 +2783,19 @@ node_types:
         description: |
           This string will evaluate to the number of PairGroups in the VNF.
         required: true
-        status: SUPPORTED
+        status: supported
       ext_net_list:
         type: list
         description: List of applicable subnet tags.
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       int_net_count:
         type: float
         description: Number of internal networks.
         required: true
-        status: SUPPORTED
+        status: supported
         constraints:
         - valid_values:
           - 1
@@ -2806,51 +2806,51 @@ node_types:
           Maps the network strings used in this HOT file
            to network info for the target cloud.
         required: true
-        status: SUPPORTED
+        status: supported
       vnf_name:
         type: string
         description: Unique name for this VNF instance.
         required: true
-        status: SUPPORTED
+        status: supported
       int_net1_label:
         type: json
         description: |
           Map the number of internal networks to an internal net1 label
           or the empty string.
         required: true
-        status: SUPPORTED
+        status: supported
     attributes:
       NetInfoStr:
         type: string
         description: Per-subnet information in string format.
-        status: SUPPORTED
+        status: supported
       PrivateKey:
         type: string
         description: Private SSH key for pre-install intra-VM communication.
-        status: SUPPORTED
+        status: supported
       Version:
         type: string
         description: |
           Template file version number. This should be updated
           each time a non-comment change is made to this file.
-        status: SUPPORTED
+        status: supported
       PublicKey:
         type: string
         description: Public SSH key for pre-install intra-VM communication.
-        status: SUPPORTED
+        status: supported
       TotalPairCount:
         type: string
         description: |
           This string will evaluate to the number of PairGroups in the VNF.
-        status: SUPPORTED
+        status: supported
       IntNetInfo:
         type: string
         description: Internal network attributes.
-        status: SUPPORTED
+        status: supported
       OpenSec:
         type: string
         description: Open security group.
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_Shared_Sec_Grp:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/singleSubstitution/diffPortType/in/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/singleSubstitution/diffPortType/in/GlobalSubstitutionTypesServiceTemplate.yaml
index 491894ba35..eb90f5a0cc 100644
--- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/singleSubstitution/diffPortType/in/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/singleSubstitution/diffPortType/in/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -11,201 +11,201 @@ node_types:
       port_pd01_port_replacement_policy:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_template_VMInt_OAM_lb_internal_VMI_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_template_VMInt_OAM_lb_internal_VMI_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_template_VMInt_OAM_lb_internal_VMI_virtual_machine_interface_properties:
         type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.interface.Properties
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_template_VMInt_OAM_lb_internal_VMI_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_pd03_port_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_pd01_port_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_pd03_port_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd03_port_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_template_VMInt_OAM_lb_internal_VMI_virtual_network_refs:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_pd03_port_replacement_policy:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd02_port_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_template_VMInt_OAM_lb_internal_VMI_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_pd01_port_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_template_VMInt_OAM_lb_internal_VMI_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd02_port_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_pd03_port_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd03_port_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_template_VMInt_OAM_lb_internal_VMI_virtual_machine_interface_mac_addresses:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_template_VMInt_OAM_lb_internal_VMI_port_tuple_refs:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_pd02_port_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_pd01_port_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_template_VMInt_OAM_lb_internal_VMI_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_template_VMInt_OAM_lb_internal_VMI_security_group_refs:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       compute_pd_server_contrail_service_instance_ind:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: boolean
       compute_pd_server_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_pd_server_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd02_port_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd03_port_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_template_VMInt_OAM_lb_internal_VMI_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd02_port_replacement_policy:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd01_port_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_pd02_port_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd03_port_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_template_VMInt_OAM_lb_internal_VMI_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd03_port_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_pd_server_user_data_format:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       index_value:
@@ -213,53 +213,53 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       port_template_VMInt_OAM_lb_internal_VMI_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd02_port_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd02_port_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd01_port_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd02_port_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd02_port_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_template_VMInt_OAM_lb_internal_VMI_virtual_machine_interface_allowed_address_pairs:
         type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_pd_server:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/singleSubstitution/diffPortType/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/singleSubstitution/diffPortType/out/GlobalSubstitutionTypesServiceTemplate.yaml
index c56497f9c5..6ccb4fa5eb 100644
--- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/singleSubstitution/diffPortType/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/singleSubstitution/diffPortType/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -11,19 +11,19 @@ node_types:
       port_pd01_port_0_floating_ip_count:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd01_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd01_port_0_network_role_tag:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       index_value:
@@ -31,75 +31,75 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       port_pd01_port_0_ip_count:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_pd_server_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_pd_server_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd01_port_1_floating_ip_count:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_1_ip_count:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_1_mac_count:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd01_port_1_network_role_tag:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd01_port_0_mac_count:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd01_port_1_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_pd_server_user_data_format:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
     requirements:
@@ -522,23 +522,23 @@ node_types:
       compute_ps_server_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_ps01_port_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_ps_server_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_ps_server_user_data_format:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       index_value:
@@ -546,55 +546,55 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       port_ps01_port_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps01_port_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps01_port_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps01_port_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps01_port_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_ps01_port_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_ps01_port_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps01_port_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_ps_server:
         capability: tosca.capabilities.Node
@@ -943,7 +943,7 @@ node_types:
         type: float
         description: Size of /storage in GB.
         required: true
-        status: SUPPORTED
+        status: supported
         constraints:
         - in_range:
           - 4
@@ -952,25 +952,25 @@ node_types:
         type: string
         description: Unique name for this VNF instance.
         required: true
-        status: SUPPORTED
+        status: supported
       index:
         type: float
         description: number of volumes to spin up
         required: true
-        status: SUPPORTED
+        status: supported
       OS::stack_name:
         type: string
         required: false
-        status: SUPPORTED
+        status: supported
     attributes:
       cfed_volume_0:
         type: string
         description: CFED Volume UUID
-        status: SUPPORTED
+        status: supported
       cfed_volume_1:
         type: string
         description: CFED Volume UUID
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_cfed_volume_0:
         capability: tosca.capabilities.Node
@@ -1014,35 +1014,35 @@ node_types:
         type: string
         description: VM flavor name.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_sig_port_2_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_int_ctrl1_port_1_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_int_ctrl1_port_1_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       usage_info:
         type: json
         description: |
           Per-VM/vNIC data for members of this elastic group.
         required: true
-        status: SUPPORTED
+        status: supported
       config_info:
         type: json
         description: Service configuration and network layout.
         required: true
-        status: SUPPORTED
+        status: supported
       group_index:
         type: float
         description: Index of the VM pair within the elastic group.
         required: true
-        status: SUPPORTED
+        status: supported
         constraints:
         - in_range:
           - 0
@@ -1051,156 +1051,156 @@ node_types:
         type: string
         description: UUID of the subnet.
         required: true
-        status: SUPPORTED
+        status: supported
       workload_context:
         type: string
         description: Workload context for this VNF.
         required: true
-        status: SUPPORTED
+        status: supported
       ssh_private_key:
         type: string
         description: Private SSH key for VM to VM communication in this system.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_sig_port_2_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_cfed_0_int_ctrl0_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_cfed_0_sig_port_2_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_sig_port_2_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       int_ctrl1_Sec_Grp:
         type: string
         description: Internal network 0 security group UUID.
         required: true
-        status: SUPPORTED
+        status: supported
       current_group_count:
         type: string
         description: |
           Current VM pair count within the elastic group.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_int_ctrl0_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       total_pair_count:
         type: string
         description: |
           This string will evaluate to the number of PairGroups in the VNF.
         required: true
-        status: SUPPORTED
+        status: supported
       cfed_sig_ipmap_sideA_0_float_published:
         type: list
         description: VM/subnet/usage IP address list. Keyed by group index.
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_cfed_0_sig_port_2_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       int_ctrl1_net_id:
         type: string
         description: Internal network 1.
         required: true
-        status: SUPPORTED
+        status: supported
       cfed_sigv6_ipmap_sideA_0_fixed_dbaas:
         type: list
         description: VM/subnet/usage IP address list. Keyed by group index.
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       cfed_image_name:
         type: string
         description: VM image name.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_int_ctrl0_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_int_ctrl0_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       cfed_sigv6_ipmap_sideA_0_float_published:
         type: list
         description: VM/subnet/usage IP address list. Keyed by group index.
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       cfed_sig_ipmap_sideA_0_fixed_dbaas:
         type: list
         description: VM/subnet/usage IP address list. Keyed by group index.
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_cfed_0_int_ctrl0_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       ssh_public_key:
         type: string
         description: Public SSH key for VM to VM communication in this system.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_int_ctrl0_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_cfed_0_int_ctrl1_port_1_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       sig_net_id:
         type: string
         description: UUID of the network.
         required: true
-        status: SUPPORTED
+        status: supported
       sigv6_v6_subnet_id:
         type: string
         description: UUID of the subnet.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_int_ctrl1_port_1_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       vf_module_index:
         type: float
         description: Unique index for this VNF Module instance.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_int_ctrl1_port_1_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       backup_file1:
         type: string
         description: |
@@ -1208,12 +1208,12 @@ node_types:
           This is only used for restore (aka "disaster recovery") and
           only referenced on OAM-A.
         required: true
-        status: SUPPORTED
+        status: supported
       vf_module_id:
         type: string
         description: Unique ID for this VNF module instance.
         required: true
-        status: SUPPORTED
+        status: supported
       backup_file2:
         type: string
         description: |
@@ -1221,23 +1221,23 @@ node_types:
           This is only used for restore (aka "disaster recovery") and
           only referenced on OAM-A.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_sig_port_2_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       cfed_names:
         type: list
         description: VM name list.
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       role:
         type: string
         description: VM role during LCM activities.
         required: true
-        status: SUPPORTED
+        status: supported
         constraints:
         - valid_values:
           - oam
@@ -1245,56 +1245,56 @@ node_types:
       port_cfed_0_int_ctrl1_port_1_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       vnf_name:
         type: string
         description: Unique name for this VNF instance.
         required: true
-        status: SUPPORTED
+        status: supported
       vf_module_name:
         type: string
         description: Unique name for this VNF module instance.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_int_ctrl0_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       vnf_id:
         type: string
         description: Unique ID for this VNF instance.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_int_ctrl0_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       lcm_keypair:
         type: string
         description: Lifecycle management access key pair.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_int_ctrl1_port_1_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       availability_zone_0:
         type: string
         description: VM availability zone.
         required: true
-        status: SUPPORTED
+        status: supported
       sig_Sec_Grp:
         type: string
         description: UUID of the security group.
         required: true
-        status: SUPPORTED
+        status: supported
       int_ctrl0_Sec_Grp:
         type: string
         description: Internal network 0 security group UUID.
         required: true
-        status: SUPPORTED
+        status: supported
       net_info_str:
         type: string
         description: |
@@ -1303,78 +1303,78 @@ node_types:
           in Kilo there is no way to convert json to string for
           output as a personality file.
         required: true
-        status: SUPPORTED
+        status: supported
       ssh_access_key:
         type: string
         description: Public SSH key for external access.
         required: true
-        status: SUPPORTED
+        status: supported
       int_ctrl0_net_id:
         type: string
         description: Internal network 0.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_sig_port_2_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_sig_port_2_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       environment_context:
         type: string
         description: Environment context for this VNF.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_int_ctrl0_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       pair2idx:
         type: json
         description: Map group index to VMtype index.
         required: true
-        status: SUPPORTED
+        status: supported
       vm_role:
         type: string
         description: Unique role for these VMs.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_int_ctrl1_port_1_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       group_id:
         type: string
         description: ID number of the elastic group this pair is a member of.
         required: true
-        status: SUPPORTED
+        status: supported
       install_config:
         type: string
         description: JSON formatted string of install config values.
         required: true
-        status: SUPPORTED
+        status: supported
       cfed_volume_0:
         type: json
         description: CFED Volume.
         required: true
-        status: SUPPORTED
+        status: supported
       group_tag:
         type: string
         description: Key into "usage_info" for members of this elastic group.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_sig_port_2_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_int_ctrl1_port_1_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
     attributes:
@@ -1383,11 +1383,11 @@ node_types:
         description: |
           Template file version number. This should be updated
           each time a non-comment change is made to this file.
-        status: SUPPORTED
+        status: supported
       VMA-EXT_IPS:
         type: string
         description: IP addresses assigned to the first external network.
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_cfed_0_sig_port_2:
         capability: tosca.capabilities.Node
@@ -1905,29 +1905,29 @@ node_types:
         type: string
         description: VM flavor name.
         required: true
-        status: SUPPORTED
+        status: supported
       cfed_sigv6_ipmap_sideB_0_fixed_dbaas:
         type: list
         description: VM/subnet/usage IP address list. Keyed by group index.
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_cfed_1_int_ctrl0_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       cfed_sig_ipmap_sideB_0_fixed_dbaas:
         type: list
         description: VM/subnet/usage IP address list. Keyed by group index.
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_cfed_1_sig_port_2_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       usage_info:
@@ -1935,21 +1935,21 @@ node_types:
         description: |
           Per-VM/vNIC data for members of this elastic group.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_1_sig_port_2_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       config_info:
         type: json
         description: Service configuration and network layout.
         required: true
-        status: SUPPORTED
+        status: supported
       group_index:
         type: float
         description: Index of the VM pair within the elastic group.
         required: true
-        status: SUPPORTED
+        status: supported
         constraints:
         - in_range:
           - 0
@@ -1958,126 +1958,126 @@ node_types:
         type: string
         description: UUID of the subnet.
         required: true
-        status: SUPPORTED
+        status: supported
       workload_context:
         type: string
         description: Workload context for this VNF.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_1_sig_port_2_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       ssh_private_key:
         type: string
         description: Private SSH key for VM to VM communication in this system.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_1_sig_port_2_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_1_int_ctrl1_port_1_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_cfed_1_int_ctrl0_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       int_ctrl1_Sec_Grp:
         type: string
         description: Internal network 0 security group UUID.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_1_sig_port_2_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       current_group_count:
         type: string
         description: |
           Current VM pair count within the elastic group.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_1_int_ctrl0_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       total_pair_count:
         type: string
         description: |
           This string will evaluate to the number of PairGroups in the VNF.
         required: true
-        status: SUPPORTED
+        status: supported
       int_ctrl1_net_id:
         type: string
         description: Internal network 1.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_1_sig_port_2_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       cfed_image_name:
         type: string
         description: VM image name.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_1_int_ctrl1_port_1_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_1_int_ctrl1_port_1_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       ssh_public_key:
         type: string
         description: Public SSH key for VM to VM communication in this system.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_1_int_ctrl1_port_1_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_1_sig_port_2_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_cfed_1_int_ctrl0_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_cfed_1_sig_port_2_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       sig_net_id:
         type: string
         description: UUID of the network.
         required: true
-        status: SUPPORTED
+        status: supported
       sigv6_v6_subnet_id:
         type: string
         description: UUID of the subnet.
         required: true
-        status: SUPPORTED
+        status: supported
       vf_module_index:
         type: float
         description: Unique index for this VNF Module instance.
         required: true
-        status: SUPPORTED
+        status: supported
       backup_file1:
         type: string
         description: |
@@ -2085,12 +2085,12 @@ node_types:
           This is only used for restore (aka "disaster recovery") and
           only referenced on OAM-A.
         required: true
-        status: SUPPORTED
+        status: supported
       vf_module_id:
         type: string
         description: Unique ID for this VNF module instance.
         required: true
-        status: SUPPORTED
+        status: supported
       backup_file2:
         type: string
         description: |
@@ -2098,23 +2098,23 @@ node_types:
           This is only used for restore (aka "disaster recovery") and
           only referenced on OAM-A.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_1_int_ctrl1_port_1_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       cfed_names:
         type: list
         description: VM name list.
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       role:
         type: string
         description: VM role during LCM activities.
         required: true
-        status: SUPPORTED
+        status: supported
         constraints:
         - valid_values:
           - oam
@@ -2123,55 +2123,55 @@ node_types:
         type: string
         description: Unique name for this VNF instance.
         required: true
-        status: SUPPORTED
+        status: supported
       vf_module_name:
         type: string
         description: Unique name for this VNF module instance.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_1_int_ctrl0_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_cfed_1_int_ctrl1_port_1_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       vnf_id:
         type: string
         description: Unique ID for this VNF instance.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_1_int_ctrl1_port_1_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       lcm_keypair:
         type: string
         description: Lifecycle management access key pair.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_1_int_ctrl1_port_1_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       availability_zone_1:
         type: string
         description: VM availability zone.
         required: true
-        status: SUPPORTED
+        status: supported
       sig_Sec_Grp:
         type: string
         description: UUID of the security group.
         required: true
-        status: SUPPORTED
+        status: supported
       int_ctrl0_Sec_Grp:
         type: string
         description: Internal network 0 security group UUID.
         required: true
-        status: SUPPORTED
+        status: supported
       net_info_str:
         type: string
         description: |
@@ -2180,91 +2180,91 @@ node_types:
           in Kilo there is no way to convert json to string for
           output as a personality file.
         required: true
-        status: SUPPORTED
+        status: supported
       ssh_access_key:
         type: string
         description: Public SSH key for external access.
         required: true
-        status: SUPPORTED
+        status: supported
       int_ctrl0_net_id:
         type: string
         description: Internal network 0.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_1_sig_port_2_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       environment_context:
         type: string
         description: Environment context for this VNF.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_1_int_ctrl0_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       pair2idx:
         type: json
         description: Map group index to VMtype index.
         required: true
-        status: SUPPORTED
+        status: supported
       vm_role:
         type: string
         description: Unique role for these VMs.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_1_int_ctrl0_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_cfed_1_int_ctrl0_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_1_int_ctrl0_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       group_id:
         type: string
         description: ID number of the elastic group this pair is a member of.
         required: true
-        status: SUPPORTED
+        status: supported
       install_config:
         type: string
         description: JSON formatted string of install config values.
         required: true
-        status: SUPPORTED
+        status: supported
       cfed_volume_1:
         type: json
         description: CFED Volume.
         required: true
-        status: SUPPORTED
+        status: supported
       group_tag:
         type: string
         description: Key into "usage_info" for members of this elastic group.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_1_int_ctrl1_port_1_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
     attributes:
       VMB-EXT_IPS:
         type: string
         description: IP addresses assigned to the first external network.
-        status: SUPPORTED
+        status: supported
       Version:
         type: string
         description: |
           Template file version number. This should be updated
           each time a non-comment change is made to this file.
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_cfed_server_1:
         capability: tosca.capabilities.Node
@@ -2783,19 +2783,19 @@ node_types:
         description: |
           This string will evaluate to the number of PairGroups in the VNF.
         required: true
-        status: SUPPORTED
+        status: supported
       ext_net_list:
         type: list
         description: List of applicable subnet tags.
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       int_net_count:
         type: float
         description: Number of internal networks.
         required: true
-        status: SUPPORTED
+        status: supported
         constraints:
         - valid_values:
           - 1
@@ -2806,51 +2806,51 @@ node_types:
           Maps the network strings used in this HOT file
            to network info for the target cloud.
         required: true
-        status: SUPPORTED
+        status: supported
       vnf_name:
         type: string
         description: Unique name for this VNF instance.
         required: true
-        status: SUPPORTED
+        status: supported
       int_net1_label:
         type: json
         description: |
           Map the number of internal networks to an internal net1 label
           or the empty string.
         required: true
-        status: SUPPORTED
+        status: supported
     attributes:
       NetInfoStr:
         type: string
         description: Per-subnet information in string format.
-        status: SUPPORTED
+        status: supported
       PrivateKey:
         type: string
         description: Private SSH key for pre-install intra-VM communication.
-        status: SUPPORTED
+        status: supported
       Version:
         type: string
         description: |
           Template file version number. This should be updated
           each time a non-comment change is made to this file.
-        status: SUPPORTED
+        status: supported
       PublicKey:
         type: string
         description: Public SSH key for pre-install intra-VM communication.
-        status: SUPPORTED
+        status: supported
       TotalPairCount:
         type: string
         description: |
           This string will evaluate to the number of PairGroups in the VNF.
-        status: SUPPORTED
+        status: supported
       IntNetInfo:
         type: string
         description: Internal network attributes.
-        status: SUPPORTED
+        status: supported
       OpenSec:
         type: string
         description: Open security group.
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_Shared_Sec_Grp:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/singleSubstitution/samePortType/in/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/singleSubstitution/samePortType/in/GlobalSubstitutionTypesServiceTemplate.yaml
index 2b76ceded5..593eb5ec7e 100644
--- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/singleSubstitution/samePortType/in/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/singleSubstitution/samePortType/in/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -11,221 +11,221 @@ node_types:
       port_pd01_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_pd01_port_2_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_pd01_port_0_replacement_policy:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_1_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_template_VMInt_OAM_lb_internal_VMI_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_template_VMInt_OAM_lb_internal_VMI_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_template_VMInt_OAM_lb_internal_VMI_virtual_machine_interface_properties:
         type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.interface.Properties
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_2_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_template_VMInt_OAM_lb_internal_VMI_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_pd01_port_2_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_1_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd01_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_template_VMInt_OAM_lb_internal_VMI_virtual_network_refs:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_template_VMInt_OAM_lb_internal_VMI_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_pd01_port_1_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_template_VMInt_OAM_lb_internal_VMI_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_2_replacement_policy:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd01_port_1_replacement_policy:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd01_port_1_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_template_VMInt_OAM_lb_internal_VMI_virtual_machine_interface_mac_addresses:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_template_VMInt_OAM_lb_internal_VMI_port_tuple_refs:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_pd01_port_2_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_template_VMInt_OAM_lb_internal_VMI_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_template_VMInt_OAM_lb_internal_VMI_security_group_refs:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       compute_pd_server_contrail_service_instance_ind:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: boolean
       port_pd01_port_2_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd01_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_pd_server_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_pd_server_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd01_port_2_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_2_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_1_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_template_VMInt_OAM_lb_internal_VMI_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_1_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_template_VMInt_OAM_lb_internal_VMI_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_pd_server_user_data_format:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd01_port_2_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_pd01_port_1_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       index_value:
@@ -233,33 +233,33 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       port_template_VMInt_OAM_lb_internal_VMI_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_1_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_pd01_port_1_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_template_VMInt_OAM_lb_internal_VMI_virtual_machine_interface_allowed_address_pairs:
         type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_pd_server:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/singleSubstitution/samePortType/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/singleSubstitution/samePortType/out/GlobalSubstitutionTypesServiceTemplate.yaml
index c56497f9c5..6ccb4fa5eb 100644
--- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/singleSubstitution/samePortType/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/singleSubstitution/samePortType/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -11,19 +11,19 @@ node_types:
       port_pd01_port_0_floating_ip_count:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd01_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd01_port_0_network_role_tag:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       index_value:
@@ -31,75 +31,75 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       port_pd01_port_0_ip_count:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_pd_server_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_pd_server_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd01_port_1_floating_ip_count:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_1_ip_count:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_1_mac_count:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd01_port_1_network_role_tag:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd01_port_0_mac_count:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd01_port_1_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_pd_server_user_data_format:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
     requirements:
@@ -522,23 +522,23 @@ node_types:
       compute_ps_server_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_ps01_port_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_ps_server_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_ps_server_user_data_format:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       index_value:
@@ -546,55 +546,55 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       port_ps01_port_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps01_port_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps01_port_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps01_port_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps01_port_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_ps01_port_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_ps01_port_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps01_port_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_ps_server:
         capability: tosca.capabilities.Node
@@ -943,7 +943,7 @@ node_types:
         type: float
         description: Size of /storage in GB.
         required: true
-        status: SUPPORTED
+        status: supported
         constraints:
         - in_range:
           - 4
@@ -952,25 +952,25 @@ node_types:
         type: string
         description: Unique name for this VNF instance.
         required: true
-        status: SUPPORTED
+        status: supported
       index:
         type: float
         description: number of volumes to spin up
         required: true
-        status: SUPPORTED
+        status: supported
       OS::stack_name:
         type: string
         required: false
-        status: SUPPORTED
+        status: supported
     attributes:
       cfed_volume_0:
         type: string
         description: CFED Volume UUID
-        status: SUPPORTED
+        status: supported
       cfed_volume_1:
         type: string
         description: CFED Volume UUID
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_cfed_volume_0:
         capability: tosca.capabilities.Node
@@ -1014,35 +1014,35 @@ node_types:
         type: string
         description: VM flavor name.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_sig_port_2_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_int_ctrl1_port_1_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_int_ctrl1_port_1_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       usage_info:
         type: json
         description: |
           Per-VM/vNIC data for members of this elastic group.
         required: true
-        status: SUPPORTED
+        status: supported
       config_info:
         type: json
         description: Service configuration and network layout.
         required: true
-        status: SUPPORTED
+        status: supported
       group_index:
         type: float
         description: Index of the VM pair within the elastic group.
         required: true
-        status: SUPPORTED
+        status: supported
         constraints:
         - in_range:
           - 0
@@ -1051,156 +1051,156 @@ node_types:
         type: string
         description: UUID of the subnet.
         required: true
-        status: SUPPORTED
+        status: supported
       workload_context:
         type: string
         description: Workload context for this VNF.
         required: true
-        status: SUPPORTED
+        status: supported
       ssh_private_key:
         type: string
         description: Private SSH key for VM to VM communication in this system.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_sig_port_2_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_cfed_0_int_ctrl0_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_cfed_0_sig_port_2_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_sig_port_2_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       int_ctrl1_Sec_Grp:
         type: string
         description: Internal network 0 security group UUID.
         required: true
-        status: SUPPORTED
+        status: supported
       current_group_count:
         type: string
         description: |
           Current VM pair count within the elastic group.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_int_ctrl0_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       total_pair_count:
         type: string
         description: |
           This string will evaluate to the number of PairGroups in the VNF.
         required: true
-        status: SUPPORTED
+        status: supported
       cfed_sig_ipmap_sideA_0_float_published:
         type: list
         description: VM/subnet/usage IP address list. Keyed by group index.
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_cfed_0_sig_port_2_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       int_ctrl1_net_id:
         type: string
         description: Internal network 1.
         required: true
-        status: SUPPORTED
+        status: supported
       cfed_sigv6_ipmap_sideA_0_fixed_dbaas:
         type: list
         description: VM/subnet/usage IP address list. Keyed by group index.
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       cfed_image_name:
         type: string
         description: VM image name.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_int_ctrl0_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_int_ctrl0_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       cfed_sigv6_ipmap_sideA_0_float_published:
         type: list
         description: VM/subnet/usage IP address list. Keyed by group index.
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       cfed_sig_ipmap_sideA_0_fixed_dbaas:
         type: list
         description: VM/subnet/usage IP address list. Keyed by group index.
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_cfed_0_int_ctrl0_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       ssh_public_key:
         type: string
         description: Public SSH key for VM to VM communication in this system.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_int_ctrl0_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_cfed_0_int_ctrl1_port_1_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       sig_net_id:
         type: string
         description: UUID of the network.
         required: true
-        status: SUPPORTED
+        status: supported
       sigv6_v6_subnet_id:
         type: string
         description: UUID of the subnet.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_int_ctrl1_port_1_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       vf_module_index:
         type: float
         description: Unique index for this VNF Module instance.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_int_ctrl1_port_1_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       backup_file1:
         type: string
         description: |
@@ -1208,12 +1208,12 @@ node_types:
           This is only used for restore (aka "disaster recovery") and
           only referenced on OAM-A.
         required: true
-        status: SUPPORTED
+        status: supported
       vf_module_id:
         type: string
         description: Unique ID for this VNF module instance.
         required: true
-        status: SUPPORTED
+        status: supported
       backup_file2:
         type: string
         description: |
@@ -1221,23 +1221,23 @@ node_types:
           This is only used for restore (aka "disaster recovery") and
           only referenced on OAM-A.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_sig_port_2_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       cfed_names:
         type: list
         description: VM name list.
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       role:
         type: string
         description: VM role during LCM activities.
         required: true
-        status: SUPPORTED
+        status: supported
         constraints:
         - valid_values:
           - oam
@@ -1245,56 +1245,56 @@ node_types:
       port_cfed_0_int_ctrl1_port_1_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       vnf_name:
         type: string
         description: Unique name for this VNF instance.
         required: true
-        status: SUPPORTED
+        status: supported
       vf_module_name:
         type: string
         description: Unique name for this VNF module instance.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_int_ctrl0_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       vnf_id:
         type: string
         description: Unique ID for this VNF instance.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_int_ctrl0_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       lcm_keypair:
         type: string
         description: Lifecycle management access key pair.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_int_ctrl1_port_1_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       availability_zone_0:
         type: string
         description: VM availability zone.
         required: true
-        status: SUPPORTED
+        status: supported
       sig_Sec_Grp:
         type: string
         description: UUID of the security group.
         required: true
-        status: SUPPORTED
+        status: supported
       int_ctrl0_Sec_Grp:
         type: string
         description: Internal network 0 security group UUID.
         required: true
-        status: SUPPORTED
+        status: supported
       net_info_str:
         type: string
         description: |
@@ -1303,78 +1303,78 @@ node_types:
           in Kilo there is no way to convert json to string for
           output as a personality file.
         required: true
-        status: SUPPORTED
+        status: supported
       ssh_access_key:
         type: string
         description: Public SSH key for external access.
         required: true
-        status: SUPPORTED
+        status: supported
       int_ctrl0_net_id:
         type: string
         description: Internal network 0.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_sig_port_2_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_sig_port_2_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       environment_context:
         type: string
         description: Environment context for this VNF.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_int_ctrl0_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       pair2idx:
         type: json
         description: Map group index to VMtype index.
         required: true
-        status: SUPPORTED
+        status: supported
       vm_role:
         type: string
         description: Unique role for these VMs.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_int_ctrl1_port_1_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       group_id:
         type: string
         description: ID number of the elastic group this pair is a member of.
         required: true
-        status: SUPPORTED
+        status: supported
       install_config:
         type: string
         description: JSON formatted string of install config values.
         required: true
-        status: SUPPORTED
+        status: supported
       cfed_volume_0:
         type: json
         description: CFED Volume.
         required: true
-        status: SUPPORTED
+        status: supported
       group_tag:
         type: string
         description: Key into "usage_info" for members of this elastic group.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_sig_port_2_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_int_ctrl1_port_1_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
     attributes:
@@ -1383,11 +1383,11 @@ node_types:
         description: |
           Template file version number. This should be updated
           each time a non-comment change is made to this file.
-        status: SUPPORTED
+        status: supported
       VMA-EXT_IPS:
         type: string
         description: IP addresses assigned to the first external network.
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_cfed_0_sig_port_2:
         capability: tosca.capabilities.Node
@@ -1905,29 +1905,29 @@ node_types:
         type: string
         description: VM flavor name.
         required: true
-        status: SUPPORTED
+        status: supported
       cfed_sigv6_ipmap_sideB_0_fixed_dbaas:
         type: list
         description: VM/subnet/usage IP address list. Keyed by group index.
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_cfed_1_int_ctrl0_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       cfed_sig_ipmap_sideB_0_fixed_dbaas:
         type: list
         description: VM/subnet/usage IP address list. Keyed by group index.
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_cfed_1_sig_port_2_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       usage_info:
@@ -1935,21 +1935,21 @@ node_types:
         description: |
           Per-VM/vNIC data for members of this elastic group.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_1_sig_port_2_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       config_info:
         type: json
         description: Service configuration and network layout.
         required: true
-        status: SUPPORTED
+        status: supported
       group_index:
         type: float
         description: Index of the VM pair within the elastic group.
         required: true
-        status: SUPPORTED
+        status: supported
         constraints:
         - in_range:
           - 0
@@ -1958,126 +1958,126 @@ node_types:
         type: string
         description: UUID of the subnet.
         required: true
-        status: SUPPORTED
+        status: supported
       workload_context:
         type: string
         description: Workload context for this VNF.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_1_sig_port_2_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       ssh_private_key:
         type: string
         description: Private SSH key for VM to VM communication in this system.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_1_sig_port_2_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_1_int_ctrl1_port_1_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_cfed_1_int_ctrl0_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       int_ctrl1_Sec_Grp:
         type: string
         description: Internal network 0 security group UUID.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_1_sig_port_2_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       current_group_count:
         type: string
         description: |
           Current VM pair count within the elastic group.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_1_int_ctrl0_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       total_pair_count:
         type: string
         description: |
           This string will evaluate to the number of PairGroups in the VNF.
         required: true
-        status: SUPPORTED
+        status: supported
       int_ctrl1_net_id:
         type: string
         description: Internal network 1.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_1_sig_port_2_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       cfed_image_name:
         type: string
         description: VM image name.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_1_int_ctrl1_port_1_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_1_int_ctrl1_port_1_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       ssh_public_key:
         type: string
         description: Public SSH key for VM to VM communication in this system.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_1_int_ctrl1_port_1_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_1_sig_port_2_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_cfed_1_int_ctrl0_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_cfed_1_sig_port_2_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       sig_net_id:
         type: string
         description: UUID of the network.
         required: true
-        status: SUPPORTED
+        status: supported
       sigv6_v6_subnet_id:
         type: string
         description: UUID of the subnet.
         required: true
-        status: SUPPORTED
+        status: supported
       vf_module_index:
         type: float
         description: Unique index for this VNF Module instance.
         required: true
-        status: SUPPORTED
+        status: supported
       backup_file1:
         type: string
         description: |
@@ -2085,12 +2085,12 @@ node_types:
           This is only used for restore (aka "disaster recovery") and
           only referenced on OAM-A.
         required: true
-        status: SUPPORTED
+        status: supported
       vf_module_id:
         type: string
         description: Unique ID for this VNF module instance.
         required: true
-        status: SUPPORTED
+        status: supported
       backup_file2:
         type: string
         description: |
@@ -2098,23 +2098,23 @@ node_types:
           This is only used for restore (aka "disaster recovery") and
           only referenced on OAM-A.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_1_int_ctrl1_port_1_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       cfed_names:
         type: list
         description: VM name list.
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       role:
         type: string
         description: VM role during LCM activities.
         required: true
-        status: SUPPORTED
+        status: supported
         constraints:
         - valid_values:
           - oam
@@ -2123,55 +2123,55 @@ node_types:
         type: string
         description: Unique name for this VNF instance.
         required: true
-        status: SUPPORTED
+        status: supported
       vf_module_name:
         type: string
         description: Unique name for this VNF module instance.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_1_int_ctrl0_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_cfed_1_int_ctrl1_port_1_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       vnf_id:
         type: string
         description: Unique ID for this VNF instance.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_1_int_ctrl1_port_1_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       lcm_keypair:
         type: string
         description: Lifecycle management access key pair.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_1_int_ctrl1_port_1_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       availability_zone_1:
         type: string
         description: VM availability zone.
         required: true
-        status: SUPPORTED
+        status: supported
       sig_Sec_Grp:
         type: string
         description: UUID of the security group.
         required: true
-        status: SUPPORTED
+        status: supported
       int_ctrl0_Sec_Grp:
         type: string
         description: Internal network 0 security group UUID.
         required: true
-        status: SUPPORTED
+        status: supported
       net_info_str:
         type: string
         description: |
@@ -2180,91 +2180,91 @@ node_types:
           in Kilo there is no way to convert json to string for
           output as a personality file.
         required: true
-        status: SUPPORTED
+        status: supported
       ssh_access_key:
         type: string
         description: Public SSH key for external access.
         required: true
-        status: SUPPORTED
+        status: supported
       int_ctrl0_net_id:
         type: string
         description: Internal network 0.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_1_sig_port_2_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       environment_context:
         type: string
         description: Environment context for this VNF.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_1_int_ctrl0_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       pair2idx:
         type: json
         description: Map group index to VMtype index.
         required: true
-        status: SUPPORTED
+        status: supported
       vm_role:
         type: string
         description: Unique role for these VMs.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_1_int_ctrl0_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_cfed_1_int_ctrl0_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_1_int_ctrl0_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       group_id:
         type: string
         description: ID number of the elastic group this pair is a member of.
         required: true
-        status: SUPPORTED
+        status: supported
       install_config:
         type: string
         description: JSON formatted string of install config values.
         required: true
-        status: SUPPORTED
+        status: supported
       cfed_volume_1:
         type: json
         description: CFED Volume.
         required: true
-        status: SUPPORTED
+        status: supported
       group_tag:
         type: string
         description: Key into "usage_info" for members of this elastic group.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_1_int_ctrl1_port_1_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
     attributes:
       VMB-EXT_IPS:
         type: string
         description: IP addresses assigned to the first external network.
-        status: SUPPORTED
+        status: supported
       Version:
         type: string
         description: |
           Template file version number. This should be updated
           each time a non-comment change is made to this file.
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_cfed_server_1:
         capability: tosca.capabilities.Node
@@ -2783,19 +2783,19 @@ node_types:
         description: |
           This string will evaluate to the number of PairGroups in the VNF.
         required: true
-        status: SUPPORTED
+        status: supported
       ext_net_list:
         type: list
         description: List of applicable subnet tags.
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       int_net_count:
         type: float
         description: Number of internal networks.
         required: true
-        status: SUPPORTED
+        status: supported
         constraints:
         - valid_values:
           - 1
@@ -2806,51 +2806,51 @@ node_types:
           Maps the network strings used in this HOT file
            to network info for the target cloud.
         required: true
-        status: SUPPORTED
+        status: supported
       vnf_name:
         type: string
         description: Unique name for this VNF instance.
         required: true
-        status: SUPPORTED
+        status: supported
       int_net1_label:
         type: json
         description: |
           Map the number of internal networks to an internal net1 label
           or the empty string.
         required: true
-        status: SUPPORTED
+        status: supported
     attributes:
       NetInfoStr:
         type: string
         description: Per-subnet information in string format.
-        status: SUPPORTED
+        status: supported
       PrivateKey:
         type: string
         description: Private SSH key for pre-install intra-VM communication.
-        status: SUPPORTED
+        status: supported
       Version:
         type: string
         description: |
           Template file version number. This should be updated
           each time a non-comment change is made to this file.
-        status: SUPPORTED
+        status: supported
       PublicKey:
         type: string
         description: Public SSH key for pre-install intra-VM communication.
-        status: SUPPORTED
+        status: supported
       TotalPairCount:
         type: string
         description: |
           This string will evaluate to the number of PairGroups in the VNF.
-        status: SUPPORTED
+        status: supported
       IntNetInfo:
         type: string
         description: Internal network attributes.
-        status: SUPPORTED
+        status: supported
       OpenSec:
         type: string
         description: Open security group.
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_Shared_Sec_Grp:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/toscaGlobalServiceTemplates/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/toscaGlobalServiceTemplates/GlobalSubstitutionTypesServiceTemplate.yaml
index 1da2564e13..f91d6d7ba0 100644
--- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/toscaGlobalServiceTemplates/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/toscaGlobalServiceTemplates/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -11,19 +11,19 @@ node_types:
       port_pd01_port_0_floating_ip_count:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd01_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd01_port_0_network_role_tag:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       index_value:
@@ -31,75 +31,75 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       port_pd01_port_0_ip_count:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_pd_server_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_pd_server_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd01_port_1_floating_ip_count:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_1_ip_count:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_1_mac_count:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd01_port_1_network_role_tag:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd01_port_0_mac_count:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd01_port_1_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_pd_server_user_data_format:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
     requirements:
@@ -522,23 +522,23 @@ node_types:
       compute_ps_server_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_ps01_port_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_ps_server_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_ps_server_user_data_format:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       index_value:
@@ -546,55 +546,55 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       port_ps01_port_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps01_port_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps01_port_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps01_port_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps01_port_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_ps01_port_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_ps01_port_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps01_port_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_ps_server:
         capability: tosca.capabilities.Node
@@ -943,7 +943,7 @@ node_types:
         type: float
         description: Size of /storage in GB.
         required: true
-        status: SUPPORTED
+        status: supported
         constraints:
         - in_range:
           - 4
@@ -952,25 +952,25 @@ node_types:
         type: string
         description: Unique name for this VNF instance.
         required: true
-        status: SUPPORTED
+        status: supported
       index:
         type: float
         description: number of volumes to spin up
         required: true
-        status: SUPPORTED
+        status: supported
       OS::stack_name:
         type: string
         required: false
-        status: SUPPORTED
+        status: supported
     attributes:
       cfed_volume_0:
         type: string
         description: CFED Volume UUID
-        status: SUPPORTED
+        status: supported
       cfed_volume_1:
         type: string
         description: CFED Volume UUID
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_cfed_volume_0:
         capability: tosca.capabilities.Node
@@ -1014,35 +1014,35 @@ node_types:
         type: string
         description: VM flavor name.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_sig_port_2_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_int_ctrl1_port_1_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_int_ctrl1_port_1_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       usage_info:
         type: json
         description: |
           Per-VM/vNIC data for members of this elastic group.
         required: true
-        status: SUPPORTED
+        status: supported
       config_info:
         type: json
         description: Service configuration and network layout.
         required: true
-        status: SUPPORTED
+        status: supported
       group_index:
         type: float
         description: Index of the VM pair within the elastic group.
         required: true
-        status: SUPPORTED
+        status: supported
         constraints:
         - in_range:
           - 0
@@ -1051,156 +1051,156 @@ node_types:
         type: string
         description: UUID of the subnet.
         required: true
-        status: SUPPORTED
+        status: supported
       workload_context:
         type: string
         description: Workload context for this VNF.
         required: true
-        status: SUPPORTED
+        status: supported
       ssh_private_key:
         type: string
         description: Private SSH key for VM to VM communication in this system.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_sig_port_2_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_cfed_0_int_ctrl0_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_cfed_0_sig_port_2_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_sig_port_2_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       int_ctrl1_Sec_Grp:
         type: string
         description: Internal network 0 security group UUID.
         required: true
-        status: SUPPORTED
+        status: supported
       current_group_count:
         type: string
         description: |
           Current VM pair count within the elastic group.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_int_ctrl0_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       total_pair_count:
         type: string
         description: |
           This string will evaluate to the number of PairGroups in the VNF.
         required: true
-        status: SUPPORTED
+        status: supported
       cfed_sig_ipmap_sideA_0_float_published:
         type: list
         description: VM/subnet/usage IP address list. Keyed by group index.
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_cfed_0_sig_port_2_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       int_ctrl1_net_id:
         type: string
         description: Internal network 1.
         required: true
-        status: SUPPORTED
+        status: supported
       cfed_sigv6_ipmap_sideA_0_fixed_dbaas:
         type: list
         description: VM/subnet/usage IP address list. Keyed by group index.
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       cfed_image_name:
         type: string
         description: VM image name.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_int_ctrl0_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_int_ctrl0_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       cfed_sigv6_ipmap_sideA_0_float_published:
         type: list
         description: VM/subnet/usage IP address list. Keyed by group index.
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       cfed_sig_ipmap_sideA_0_fixed_dbaas:
         type: list
         description: VM/subnet/usage IP address list. Keyed by group index.
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_cfed_0_int_ctrl0_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       ssh_public_key:
         type: string
         description: Public SSH key for VM to VM communication in this system.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_int_ctrl0_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_cfed_0_int_ctrl1_port_1_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       sig_net_id:
         type: string
         description: UUID of the network.
         required: true
-        status: SUPPORTED
+        status: supported
       sigv6_v6_subnet_id:
         type: string
         description: UUID of the subnet.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_int_ctrl1_port_1_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       vf_module_index:
         type: float
         description: Unique index for this VNF Module instance.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_int_ctrl1_port_1_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       backup_file1:
         type: string
         description: |
@@ -1208,12 +1208,12 @@ node_types:
           This is only used for restore (aka "disaster recovery") and
           only referenced on OAM-A.
         required: true
-        status: SUPPORTED
+        status: supported
       vf_module_id:
         type: string
         description: Unique ID for this VNF module instance.
         required: true
-        status: SUPPORTED
+        status: supported
       backup_file2:
         type: string
         description: |
@@ -1221,23 +1221,23 @@ node_types:
           This is only used for restore (aka "disaster recovery") and
           only referenced on OAM-A.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_sig_port_2_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       cfed_names:
         type: list
         description: VM name list.
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       role:
         type: string
         description: VM role during LCM activities.
         required: true
-        status: SUPPORTED
+        status: supported
         constraints:
         - valid_values:
           - oam
@@ -1245,56 +1245,56 @@ node_types:
       port_cfed_0_int_ctrl1_port_1_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       vnf_name:
         type: string
         description: Unique name for this VNF instance.
         required: true
-        status: SUPPORTED
+        status: supported
       vf_module_name:
         type: string
         description: Unique name for this VNF module instance.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_int_ctrl0_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       vnf_id:
         type: string
         description: Unique ID for this VNF instance.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_int_ctrl0_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       lcm_keypair:
         type: string
         description: Lifecycle management access key pair.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_int_ctrl1_port_1_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       availability_zone_0:
         type: string
         description: VM availability zone.
         required: true
-        status: SUPPORTED
+        status: supported
       sig_Sec_Grp:
         type: string
         description: UUID of the security group.
         required: true
-        status: SUPPORTED
+        status: supported
       int_ctrl0_Sec_Grp:
         type: string
         description: Internal network 0 security group UUID.
         required: true
-        status: SUPPORTED
+        status: supported
       net_info_str:
         type: string
         description: |
@@ -1303,78 +1303,78 @@ node_types:
           in Kilo there is no way to convert json to string for
           output as a personality file.
         required: true
-        status: SUPPORTED
+        status: supported
       ssh_access_key:
         type: string
         description: Public SSH key for external access.
         required: true
-        status: SUPPORTED
+        status: supported
       int_ctrl0_net_id:
         type: string
         description: Internal network 0.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_sig_port_2_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_sig_port_2_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       environment_context:
         type: string
         description: Environment context for this VNF.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_int_ctrl0_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       pair2idx:
         type: json
         description: Map group index to VMtype index.
         required: true
-        status: SUPPORTED
+        status: supported
       vm_role:
         type: string
         description: Unique role for these VMs.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_int_ctrl1_port_1_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       group_id:
         type: string
         description: ID number of the elastic group this pair is a member of.
         required: true
-        status: SUPPORTED
+        status: supported
       install_config:
         type: string
         description: JSON formatted string of install config values.
         required: true
-        status: SUPPORTED
+        status: supported
       cfed_volume_0:
         type: json
         description: CFED Volume.
         required: true
-        status: SUPPORTED
+        status: supported
       group_tag:
         type: string
         description: Key into "usage_info" for members of this elastic group.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_sig_port_2_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_0_int_ctrl1_port_1_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
     attributes:
@@ -1383,11 +1383,11 @@ node_types:
         description: |
           Template file version number. This should be updated
           each time a non-comment change is made to this file.
-        status: SUPPORTED
+        status: supported
       VMA-EXT_IPS:
         type: string
         description: IP addresses assigned to the first external network.
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_cfed_0_sig_port_2:
         capability: tosca.capabilities.Node
@@ -1905,29 +1905,29 @@ node_types:
         type: string
         description: VM flavor name.
         required: true
-        status: SUPPORTED
+        status: supported
       cfed_sigv6_ipmap_sideB_0_fixed_dbaas:
         type: list
         description: VM/subnet/usage IP address list. Keyed by group index.
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_cfed_1_int_ctrl0_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       cfed_sig_ipmap_sideB_0_fixed_dbaas:
         type: list
         description: VM/subnet/usage IP address list. Keyed by group index.
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_cfed_1_sig_port_2_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       usage_info:
@@ -1935,21 +1935,21 @@ node_types:
         description: |
           Per-VM/vNIC data for members of this elastic group.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_1_sig_port_2_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       config_info:
         type: json
         description: Service configuration and network layout.
         required: true
-        status: SUPPORTED
+        status: supported
       group_index:
         type: float
         description: Index of the VM pair within the elastic group.
         required: true
-        status: SUPPORTED
+        status: supported
         constraints:
         - in_range:
           - 0
@@ -1958,126 +1958,126 @@ node_types:
         type: string
         description: UUID of the subnet.
         required: true
-        status: SUPPORTED
+        status: supported
       workload_context:
         type: string
         description: Workload context for this VNF.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_1_sig_port_2_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       ssh_private_key:
         type: string
         description: Private SSH key for VM to VM communication in this system.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_1_sig_port_2_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_1_int_ctrl1_port_1_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_cfed_1_int_ctrl0_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       int_ctrl1_Sec_Grp:
         type: string
         description: Internal network 0 security group UUID.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_1_sig_port_2_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       current_group_count:
         type: string
         description: |
           Current VM pair count within the elastic group.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_1_int_ctrl0_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       total_pair_count:
         type: string
         description: |
           This string will evaluate to the number of PairGroups in the VNF.
         required: true
-        status: SUPPORTED
+        status: supported
       int_ctrl1_net_id:
         type: string
         description: Internal network 1.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_1_sig_port_2_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       cfed_image_name:
         type: string
         description: VM image name.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_1_int_ctrl1_port_1_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_1_int_ctrl1_port_1_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       ssh_public_key:
         type: string
         description: Public SSH key for VM to VM communication in this system.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_1_int_ctrl1_port_1_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_1_sig_port_2_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_cfed_1_int_ctrl0_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_cfed_1_sig_port_2_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       sig_net_id:
         type: string
         description: UUID of the network.
         required: true
-        status: SUPPORTED
+        status: supported
       sigv6_v6_subnet_id:
         type: string
         description: UUID of the subnet.
         required: true
-        status: SUPPORTED
+        status: supported
       vf_module_index:
         type: float
         description: Unique index for this VNF Module instance.
         required: true
-        status: SUPPORTED
+        status: supported
       backup_file1:
         type: string
         description: |
@@ -2085,12 +2085,12 @@ node_types:
           This is only used for restore (aka "disaster recovery") and
           only referenced on OAM-A.
         required: true
-        status: SUPPORTED
+        status: supported
       vf_module_id:
         type: string
         description: Unique ID for this VNF module instance.
         required: true
-        status: SUPPORTED
+        status: supported
       backup_file2:
         type: string
         description: |
@@ -2098,23 +2098,23 @@ node_types:
           This is only used for restore (aka "disaster recovery") and
           only referenced on OAM-A.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_1_int_ctrl1_port_1_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       cfed_names:
         type: list
         description: VM name list.
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       role:
         type: string
         description: VM role during LCM activities.
         required: true
-        status: SUPPORTED
+        status: supported
         constraints:
         - valid_values:
           - oam
@@ -2123,55 +2123,55 @@ node_types:
         type: string
         description: Unique name for this VNF instance.
         required: true
-        status: SUPPORTED
+        status: supported
       vf_module_name:
         type: string
         description: Unique name for this VNF module instance.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_1_int_ctrl0_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_cfed_1_int_ctrl1_port_1_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       vnf_id:
         type: string
         description: Unique ID for this VNF instance.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_1_int_ctrl1_port_1_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       lcm_keypair:
         type: string
         description: Lifecycle management access key pair.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_1_int_ctrl1_port_1_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       availability_zone_1:
         type: string
         description: VM availability zone.
         required: true
-        status: SUPPORTED
+        status: supported
       sig_Sec_Grp:
         type: string
         description: UUID of the security group.
         required: true
-        status: SUPPORTED
+        status: supported
       int_ctrl0_Sec_Grp:
         type: string
         description: Internal network 0 security group UUID.
         required: true
-        status: SUPPORTED
+        status: supported
       net_info_str:
         type: string
         description: |
@@ -2180,91 +2180,91 @@ node_types:
           in Kilo there is no way to convert json to string for
           output as a personality file.
         required: true
-        status: SUPPORTED
+        status: supported
       ssh_access_key:
         type: string
         description: Public SSH key for external access.
         required: true
-        status: SUPPORTED
+        status: supported
       int_ctrl0_net_id:
         type: string
         description: Internal network 0.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_1_sig_port_2_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       environment_context:
         type: string
         description: Environment context for this VNF.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_1_int_ctrl0_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       pair2idx:
         type: json
         description: Map group index to VMtype index.
         required: true
-        status: SUPPORTED
+        status: supported
       vm_role:
         type: string
         description: Unique role for these VMs.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_1_int_ctrl0_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_cfed_1_int_ctrl0_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_1_int_ctrl0_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       group_id:
         type: string
         description: ID number of the elastic group this pair is a member of.
         required: true
-        status: SUPPORTED
+        status: supported
       install_config:
         type: string
         description: JSON formatted string of install config values.
         required: true
-        status: SUPPORTED
+        status: supported
       cfed_volume_1:
         type: json
         description: CFED Volume.
         required: true
-        status: SUPPORTED
+        status: supported
       group_tag:
         type: string
         description: Key into "usage_info" for members of this elastic group.
         required: true
-        status: SUPPORTED
+        status: supported
       port_cfed_1_int_ctrl1_port_1_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
     attributes:
       VMB-EXT_IPS:
         type: string
         description: IP addresses assigned to the first external network.
-        status: SUPPORTED
+        status: supported
       Version:
         type: string
         description: |
           Template file version number. This should be updated
           each time a non-comment change is made to this file.
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_cfed_server_1:
         capability: tosca.capabilities.Node
@@ -2783,19 +2783,19 @@ node_types:
         description: |
           This string will evaluate to the number of PairGroups in the VNF.
         required: true
-        status: SUPPORTED
+        status: supported
       ext_net_list:
         type: list
         description: List of applicable subnet tags.
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       int_net_count:
         type: float
         description: Number of internal networks.
         required: true
-        status: SUPPORTED
+        status: supported
         constraints:
         - valid_values:
           - 1
@@ -2806,51 +2806,51 @@ node_types:
           Maps the network strings used in this HOT file
            to network info for the target cloud.
         required: true
-        status: SUPPORTED
+        status: supported
       vnf_name:
         type: string
         description: Unique name for this VNF instance.
         required: true
-        status: SUPPORTED
+        status: supported
       int_net1_label:
         type: json
         description: |
           Map the number of internal networks to an internal net1 label
           or the empty string.
         required: true
-        status: SUPPORTED
+        status: supported
     attributes:
       NetInfoStr:
         type: string
         description: Per-subnet information in string format.
-        status: SUPPORTED
+        status: supported
       PrivateKey:
         type: string
         description: Private SSH key for pre-install intra-VM communication.
-        status: SUPPORTED
+        status: supported
       Version:
         type: string
         description: |
           Template file version number. This should be updated
           each time a non-comment change is made to this file.
-        status: SUPPORTED
+        status: supported
       PublicKey:
         type: string
         description: Public SSH key for pre-install intra-VM communication.
-        status: SUPPORTED
+        status: supported
       TotalPairCount:
         type: string
         description: |
           This string will evaluate to the number of PairGroups in the VNF.
-        status: SUPPORTED
+        status: supported
       IntNetInfo:
         type: string
         description: Internal network attributes.
-        status: SUPPORTED
+        status: supported
       OpenSec:
         type: string
         description: Open security group.
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_Shared_Sec_Grp:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/toscaGlobalServiceTemplates/openecomp-heat/data.yml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/toscaGlobalServiceTemplates/openecomp-heat/data.yml
index c9a098f02a..fd0938f9e2 100644
--- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/toscaGlobalServiceTemplates/openecomp-heat/data.yml
+++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/toscaGlobalServiceTemplates/openecomp-heat/data.yml
@@ -14,12 +14,12 @@ data_types:
         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.novaServer.network.PortExtraProperties:
     derived_from: tosca.datatypes.Root
     description: Nova server network expand properties for port
@@ -28,35 +28,35 @@ data_types:
         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
@@ -68,7 +68,7 @@ data_types:
         required: false
         default: {
           }
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
   org.openecomp.datatypes.heat.contrailV2.network.rule.SrcPortPairs:
@@ -79,12 +79,12 @@ data_types:
         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.virtual.machine.subInterface.AddressPair:
     derived_from: tosca.datatypes.Root
     description: Virtual Machine Sub Interface Address Pair.
@@ -93,17 +93,17 @@ data_types:
         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.network.rule.DstVirtualNetwork:
     derived_from: tosca.datatypes.Root
     description: destination addresses
@@ -112,7 +112,7 @@ data_types:
         type: string
         description: Destination addresses Virtual network
         required: false
-        status: SUPPORTED
+        status: supported
   org.openecomp.datatypes.heat.contrailV2.network.rule.Rule:
     derived_from: tosca.datatypes.Root
     description: policy rule
@@ -121,45 +121,45 @@ data_types:
         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.network.neutron.SecurityRules.Rule:
     derived_from: tosca.datatypes.Root
     description: Rules Pairs
@@ -168,12 +168,12 @@ data_types:
         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
@@ -184,7 +184,7 @@ data_types:
         description: Ethertype of the traffic
         required: false
         default: IPv4
-        status: SUPPORTED
+        status: supported
         constraints:
         - valid_values:
           - IPv4
@@ -194,7 +194,7 @@ data_types:
         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
@@ -203,13 +203,13 @@ data_types:
         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
@@ -219,7 +219,7 @@ data_types:
         description: The direction in which the security group rule is applied
         required: false
         default: ingress
-        status: SUPPORTED
+        status: supported
         constraints:
         - valid_values:
           - egress
@@ -228,7 +228,7 @@ data_types:
         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
@@ -241,12 +241,12 @@ data_types:
         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.machine.subInterface.Properties:
     derived_from: tosca.datatypes.Root
     description: Virtual Machine Sub Interface VLAN Properties.
@@ -255,7 +255,7 @@ data_types:
         type: string
         description: Sub Interface VLAN Tag.
         required: false
-        status: SUPPORTED
+        status: supported
   org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairIp:
     derived_from: tosca.datatypes.Root
     description: Virtual Machine Sub Interface Address Pair IP.
@@ -264,12 +264,12 @@ data_types:
         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.network.rule.SrcVirtualNetwork:
     derived_from: tosca.datatypes.Root
     description: source addresses
@@ -278,7 +278,7 @@ data_types:
         type: string
         description: Source addresses Virtual network
         required: false
-        status: SUPPORTED
+        status: supported
   org.openecomp.datatypes.heat.contrailV2.network.rule.ActionList:
     derived_from: tosca.datatypes.Root
     description: Action List
@@ -287,12 +287,12 @@ data_types:
         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
   org.openecomp.datatypes.heat.contrailV2.virtual.network.rule.IpamRefData:
@@ -303,7 +303,7 @@ data_types:
         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
   org.openecomp.datatypes.heat.FileInfo:
@@ -314,12 +314,12 @@ data_types:
         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
@@ -334,26 +334,26 @@ data_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
       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.network.rule.RefData:
     derived_from: tosca.datatypes.Root
     description: network policy refs data
@@ -362,7 +362,7 @@ data_types:
         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.network.rule.DstPortPairs:
     derived_from: tosca.datatypes.Root
     description: destination port pairs
@@ -371,12 +371,12 @@ data_types:
         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.network.AllocationPool:
     derived_from: tosca.datatypes.Root
     description: The start and end addresses for the allocation pool
@@ -385,12 +385,12 @@ data_types:
         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.contrail.network.rule.PortPairs:
     derived_from: tosca.datatypes.Root
     description: source and destination port pairs
@@ -399,12 +399,12 @@ data_types:
         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.VirtualNetwork:
     derived_from: tosca.datatypes.Root
     description: source and destination addresses
@@ -413,7 +413,7 @@ data_types:
         type: string
         description: Virtual network
         required: false
-        status: SUPPORTED
+        status: supported
   org.openecomp.datatypes.heat.contrail.network.rule.RuleList:
     derived_from: tosca.datatypes.Root
     description: list of policy rules
@@ -422,7 +422,7 @@ data_types:
         type: list
         description: Contrail network rule
         required: false
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.contrail.network.rule.Rule
   org.openecomp.datatypes.heat.network.contrail.AddressPair:
@@ -433,7 +433,7 @@ data_types:
         type: string
         description: Address mode active-active or active-standy
         required: false
-        status: SUPPORTED
+        status: supported
         constraints:
         - valid_values:
           - active-active
@@ -442,12 +442,12 @@ data_types:
         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.contrailV2.virtual.machine.subInterface.MacAddress:
     derived_from: tosca.datatypes.Root
     description: Virtual Machine Sub Interface Mac Address.
@@ -456,7 +456,7 @@ data_types:
         type: list
         description: Mac Addresses List.
         required: false
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
   org.openecomp.datatypes.heat.contrailV2.virtual.network.rule.ref.data.IpamSubnetList:
@@ -467,12 +467,12 @@ data_types:
         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.network.rule.RuleList:
     derived_from: tosca.datatypes.Root
     description: list of policy rules
@@ -481,7 +481,7 @@ data_types:
         type: list
         description: Contrail network rule
         required: false
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.contrailV2.network.rule.Rule
   org.openecomp.datatypes.heat.novaServer.network.AddressInfo:
@@ -492,7 +492,7 @@ data_types:
         type: string
         description: Port id
         required: false
-        status: SUPPORTED
+        status: supported
   org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs:
     derived_from: tosca.datatypes.Root
     description: Virtual Machine Sub Interface Address Pairs.
@@ -501,7 +501,7 @@ data_types:
         type: list
         description: Addresses pair List.
         required: false
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPair
   org.openecomp.datatypes.heat.neutron.port.FixedIps:
@@ -512,12 +512,12 @@ data_types:
         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.contrailV2.virtual.machine.interface.Properties:
     derived_from: tosca.datatypes.Root
     description: Virtual Machine Interface Properties.
@@ -526,7 +526,7 @@ data_types:
         type: string
         description: Service Interface Type.
         required: false
-        status: SUPPORTED
+        status: supported
   org.openecomp.datatypes.heat.network.subnet.HostRoute:
     derived_from: tosca.datatypes.Root
     description: Host route info for the subnet
@@ -535,12 +535,12 @@ data_types:
         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.contrail.port.StaticRoute:
     derived_from: tosca.datatypes.Root
     description: static route
@@ -549,17 +549,17 @@ data_types:
         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.substitution.SubstitutionFiltering:
     derived_from: tosca.datatypes.Root
     description: Substitution Filter
@@ -568,13 +568,13 @@ data_types:
         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:
@@ -582,19 +582,19 @@ data_types:
         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.network.neutron.Subnet:
     derived_from: tosca.datatypes.Root
     description: A subnet represents an IP address block that can be used for assigning IP addresses to virtual instances
@@ -603,18 +603,18 @@ data_types:
         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
@@ -624,7 +624,7 @@ data_types:
         type: string
         description: IPv6 RA (Router Advertisement) mode
         required: false
-        status: SUPPORTED
+        status: supported
         constraints:
         - valid_values:
           - dhcpv6-stateful
@@ -636,35 +636,35 @@ data_types:
         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:
@@ -672,7 +672,7 @@ data_types:
         description: The gateway IP address
         required: false
         default: 4
-        status: SUPPORTED
+        status: supported
         constraints:
         - valid_values:
           - 4
@@ -681,24 +681,24 @@ data_types:
         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.contrail.network.rule.Rule:
     derived_from: tosca.datatypes.Root
     description: policy rule
@@ -707,45 +707,45 @@ data_types:
         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.contrailV2.virtual.network.rule.RefDataSequence:
     derived_from: tosca.datatypes.Root
     description: network policy refs data sequence
@@ -754,9 +754,9 @@ data_types:
         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
diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/toscaGlobalServiceTemplates/openecomp-heat/groups.yml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/toscaGlobalServiceTemplates/openecomp-heat/groups.yml
index 86a8f8dc71..7fc6de0f70 100644
--- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/toscaGlobalServiceTemplates/openecomp-heat/groups.yml
+++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/toscaGlobalServiceTemplates/openecomp-heat/groups.yml
@@ -14,9 +14,9 @@ group_types:
         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
diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/toscaGlobalServiceTemplates/openecomp-heat/nodes.yml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/toscaGlobalServiceTemplates/openecomp-heat/nodes.yml
index e2967174e2..74e308bfbe 100644
--- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/toscaGlobalServiceTemplates/openecomp-heat/nodes.yml
+++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/toscaGlobalServiceTemplates/openecomp-heat/nodes.yml
@@ -13,12 +13,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:
@@ -26,33 +26,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
@@ -63,7 +63,7 @@ node_types:
         type: list
         description: List of interface types
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
           constraints:
@@ -76,19 +76,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
@@ -98,42 +98,42 @@ 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
+        status: supported
 
   org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface:
     derived_from: org.openecomp.resource.cp.nodes.network.v2.SubInterface
@@ -141,48 +141,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
@@ -190,11 +190,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
@@ -210,54 +210,54 @@ node_types:
         type: string
         description: Virtual Machine Interface name
         required: false
-        status: SUPPORTED
+        status: supported
       security_group_refs:
         type: list
         description: List of security groups.
         required: false
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       virtual_network_refs:
         type: list
         description: List of virtual networks.
         required: false
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       virtual_machine_interface_properties:
         type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.interface.Properties
         description: virtual machine interface properties.
         required: false
-        status: SUPPORTED
+        status: supported
       port_tuple_refs:
         type: list
         description: List of port tuples.
         required: false
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       virtual_machine_interface_mac_addresses:
         type: list
         description: List of mac addresses.
         required: false
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       virtual_machine_interface_allowed_address_pairs:
         type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs
         description: Virtual Machine Interface allowed address pairs.
         required: false
-        status: SUPPORTED
+        status: supported
     attributes:
       fq_name:
         type: string
         description: The FQ name of the Virtual Network.
-        status: SUPPORTED
+        status: supported
       show:
         type: string
         description: All attributes.
-        status: SUPPORTED
+        status: supported
     capabilities:
       binding:
         type: tosca.capabilities.network.Bindable
@@ -274,29 +274,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:
@@ -314,24 +314,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
@@ -347,66 +347,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:
@@ -422,23 +422,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
@@ -448,19 +448,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
@@ -470,7 +470,7 @@ node_types:
         description: Policy on how to apply a flavor update
         required: false
         default: RESIZE
-        status: SUPPORTED
+        status: supported
         constraints:
         - valid_values:
           - RESIZE
@@ -480,43 +480,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:
@@ -524,7 +524,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
@@ -536,7 +536,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
@@ -546,7 +546,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
@@ -555,45 +555,45 @@ 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
   org.openecomp.resource.vfc.rules.nodes.heat.network.contrailV2.NetworkRules:
     derived_from: tosca.nodes.Root
     properties:
@@ -601,17 +601,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
@@ -627,29 +627,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
@@ -661,25 +661,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
@@ -688,59 +688,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
@@ -762,41 +762,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:
@@ -805,38 +805,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
@@ -850,25 +850,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:
@@ -876,17 +876,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
@@ -897,7 +897,7 @@ node_types:
       fq_name:
         type: string
         description: fq_name
-        status: SUPPORTED
+        status: supported
   org.openecomp.resource.vfc.nodes.heat.contrail.Compute:
     derived_from: org.openecomp.resource.vfc.nodes.Compute
     properties:
@@ -905,22 +905,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
@@ -932,22 +932,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
@@ -957,27 +957,27 @@ 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
   org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface:
     derived_from: org.openecomp.resource.cp.nodes.network.SubInterface
     properties:
@@ -985,59 +985,59 @@ node_types:
         type: list
         description: List of virtual machine interface.
         required: false
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       name:
         type: string
         description: Virtual Machine Sub Interface VLAN name
         required: false
-        status: SUPPORTED
+        status: supported
       virtual_network_refs:
         type: list
         description: List of virtual networks.
         required: false
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       virtual_machine_interface_properties:
         type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.Properties
         description: virtual machine interface properties.
         required: false
-        status: SUPPORTED
+        status: supported
       virtual_machine_interface_allowed_address_pairs:
         type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs
         description: Virtual Machine Sub Interface allowed address pairs.
         required: false
-        status: SUPPORTED
+        status: supported
       virtual_machine_interface_mac_addresses:
         type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.MacAddress
         description: List of mac addresses.
         required: false
-        status: SUPPORTED
+        status: supported
       security_group_refs:
         type: list
         description: List of security groups.
         required: false
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_tuple_refs:
         type: list
         description: List of port tuples.
         required: false
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
     attributes:
       fq_name:
         type: string
         description: The FQ name of the Virtual Network.
-        status: SUPPORTED
+        status: supported
       show:
         type: string
         description: All attributes.
-        status: SUPPORTED
+        status: supported
     requirements:
     - binding:
         capability: tosca.capabilities.network.Bindable
@@ -1053,58 +1053,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:
@@ -1120,34 +1120,34 @@ node_types:
         type: string
         description: The availability zone in which the volume will be created
         required: false
-        status: SUPPORTED
+        status: supported
       image:
         type: string
         description: If specified, the name or ID of the image to create the volume from
         required: false
-        status: SUPPORTED
+        status: supported
       metadata:
         type: map
         description: Key/value pairs to associate with the volume
         required: false
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       volume_type:
         type: string
         description: If specified, the type of volume to use, mapping to a specific backend
         required: false
-        status: SUPPORTED
+        status: supported
       description:
         type: string
         description: A description of the volume
         required: false
-        status: SUPPORTED
+        status: supported
       device_type:
         type: string
         description: Device type
         required: false
-        status: SUPPORTED
+        status: supported
         constraints:
         - valid_values:
           - cdrom
@@ -1157,7 +1157,7 @@ node_types:
         description: 'Bus of the device: hypervisor driver chooses a suitable default
           if omitted'
         required: false
-        status: SUPPORTED
+        status: supported
         constraints:
         - valid_values:
           - ide
@@ -1169,94 +1169,94 @@ node_types:
         type: string
         description: If specified, the backup to create the volume from
         required: false
-        status: SUPPORTED
+        status: supported
       source_volid:
         type: string
         description: If specified, the volume to use as source
         required: false
-        status: SUPPORTED
+        status: supported
       boot_index:
         type: integer
         description: Integer used for ordering the boot disks
         required: false
-        status: SUPPORTED
+        status: supported
       size:
         type: scalar-unit.size
         description: The requested storage size (default unit is MB)
         required: false
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 1 GB
       read_only:
         type: boolean
         description: Enables or disables read-only access mode of volume
         required: false
-        status: SUPPORTED
+        status: supported
       name:
         type: string
         description: A name used to distinguish the volume
         required: false
-        status: SUPPORTED
+        status: supported
       scheduler_hints:
         type: map
         description: Arbitrary key-value pairs specified by the client to help the Cinder scheduler creating a volume
         required: false
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       swap_size:
         type: scalar-unit.size
         description: The size of the swap, in MB
         required: false
-        status: SUPPORTED
+        status: supported
       delete_on_termination:
         type: boolean
         description: Indicate whether the volume should be deleted when the server is terminated
         required: false
-        status: SUPPORTED
+        status: supported
       multiattach:
         type: boolean
         description: Whether allow the volume to be attached more than once
         required: false
-        status: SUPPORTED
+        status: supported
     attributes:
       display_description:
         type: string
         description: Description of the volume
-        status: SUPPORTED
+        status: supported
       attachments:
         type: string
         description: The list of attachments of the volume
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       encrypted:
         type: boolean
         description: Boolean indicating if the volume is encrypted or not
-        status: SUPPORTED
+        status: supported
       show:
         type: string
         description: Detailed information about resource
-        status: SUPPORTED
+        status: supported
       created_at:
         type: timestamp
         description: The timestamp indicating volume creation
-        status: SUPPORTED
+        status: supported
       display_name:
         type: string
         description: Name of the volume
-        status: SUPPORTED
+        status: supported
       metadata_values:
         type: map
         description: Key/value pairs associated with the volume in raw dict form
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       bootable:
         type: boolean
         description: Boolean indicating if the volume can be booted or not
-        status: SUPPORTED
+        status: supported
       status:
         type: string
         description: The current status of the volume
-        status: SUPPORTED
+        status: supported
diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/toscaGlobalServiceTemplates/openecomp/capabilities.yml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/toscaGlobalServiceTemplates/openecomp/capabilities.yml
index a36b5569f5..5bcdf749e2 100644
--- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/toscaGlobalServiceTemplates/openecomp/capabilities.yml
+++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/toscaGlobalServiceTemplates/openecomp/capabilities.yml
@@ -14,7 +14,7 @@ capability_types:
         type: map
         description: Deployment flavors instance
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.DeploymentFlavor
   org.openecomp.capabilities.metric.SnmpTrap:
@@ -25,7 +25,7 @@ capability_types:
         type: string
         description: Object Id of the metric
         required: true
-        status: SUPPORTED
+        status: supported
   org.openecomp.capabilities.AllottedResource:
     derived_from: tosca.capabilities.Root
   org.openecomp.capabilities.metric.SnmpPolling:
@@ -36,7 +36,7 @@ capability_types:
         type: string
         description: Object Id of the metric
         required: true
-        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.
@@ -45,7 +45,7 @@ capability_types:
         type: string
         description: Ceilometer metric type name to monitor. (The name ceilometer is using)
         required: true
-        status: SUPPORTED
+        status: supported
   org.openecomp.capabilities.Metric:
     derived_from: tosca.capabilities.Endpoint
     description: A node type that includes the Metric capability indicates that it can be monitored.
@@ -54,24 +54,24 @@ capability_types:
         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
diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/toscaGlobalServiceTemplates/openecomp/data.yml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/toscaGlobalServiceTemplates/openecomp/data.yml
index 2f2249fe90..b916e420a1 100644
--- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/toscaGlobalServiceTemplates/openecomp/data.yml
+++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/toscaGlobalServiceTemplates/openecomp/data.yml
@@ -13,13 +13,13 @@ data_types:
         type: boolean
         description: \"true\" indicates that this a Neutron provider type of network
         required: true
-        status: SUPPORTED
+        status: supported
       physical_network_name:
         type: string
         description: |
           Identifies the NUMA processor cluster to which this physical network interface belongs. NUMA instance correlates to the first digit of the Physical Network Name suffix (e.g. \"01\" = NUMA 0, \"11\" = NUMA 1)
         required: false
-        status: SUPPORTED
+        status: supported
         constraints:
         - valid_values:
           - Physnet41
@@ -36,7 +36,7 @@ data_types:
         description: |
           PNIC instance within the NUMA processor cluster PNIC Instance correlates to the second digit of the Physical Network Name suffix (e.g. "01" = PNIC 1, "02" = "PNIC 2)
         required: false
-        status: SUPPORTED
+        status: supported
         constraints:
         - valid_values:
           - NUMA 0
@@ -45,7 +45,7 @@ data_types:
         type: integer
         description: PNIC instance within the NUMA processor cluster
         required: false
-        status: SUPPORTED
+        status: supported
   org.openecomp.datatypes.DeploymentFlavor:
     derived_from: tosca.datatypes.Root
     description: Deployment Flavor
@@ -54,17 +54,17 @@ data_types:
         type: string
         description: Deployment Flavor Name
         required: true
-        status: SUPPORTED
+        status: supported
       license_feature_group:
         type: org.openecomp.datatypes.FeatureGroup
         description: license feature group associated with Deployment Flavor
         required: true
-        status: SUPPORTED
+        status: supported
       compute_size:
         type: org.openecomp.datatypes.ComputeFlavor
         description: Size of VM
         required: true
-        status: SUPPORTED
+        status: supported
   org.openecomp.datatypes.FeatureGroup:
     derived_from: tosca.datatypes.Root
     description: License Feature Group
@@ -73,12 +73,12 @@ data_types:
         type: string
         description: Deployment Flavor Name
         required: true
-        status: SUPPORTED
+        status: supported
       part_number:
         type: string
         description: refrence part number related to feature group
         required: true
-        status: SUPPORTED
+        status: supported
   org.openecomp.datatypes.EcompHoming:
     derived_from: org.openecomp.datatypes.Root
     properties:
@@ -90,17 +90,17 @@ data_types:
            node required (e.g. VID will present a prompt to operator and collect the operator-selected target node for the deployment of this Network instance).
         required: true
         default: false
-        status: SUPPORTED
+        status: supported
       homing_policy:
         type: string
         description: Referenc to a service level homing policy that OPENECOMP will use for instance deployment target node
         required: false
-        status: SUPPORTED
+        status: supported
       instance_node_target:
         type: string
         description: Instance target deployment node
         required: false
-        status: SUPPORTED
+        status: supported
   org.openecomp.datatypes.AssignmentRequirements:
     derived_from: org.openecomp.datatypes.Root
     properties:
@@ -110,19 +110,19 @@ data_types:
           "true" indicates that assignment is required
         required: true
         default: false
-        status: SUPPORTED
+        status: supported
       count:
         type: integer
         description: number of assignments required
         required: false
-        status: SUPPORTED
+        status: supported
   org.openecomp.datatypes.network.IpRequirements:
     derived_from: org.openecomp.datatypes.Root
     properties:
       ip_version:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
         constraints:
         - valid_values:
           - 4
@@ -131,19 +131,19 @@ data_types:
         type: org.openecomp.datatypes.AssignmentRequirements
         description: identifies the number of ip address to assign to the CP from the plan
         required: true
-        status: SUPPORTED
+        status: supported
       floating_ip_count:
         type: org.openecomp.datatypes.AssignmentRequirements
         required: false
-        status: SUPPORTED
+        status: supported
       subnet_role:
         type: string
         required: false
-        status: SUPPORTED
+        status: supported
       assingment_method:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
         constraints:
         - valid_values:
           - fixed
@@ -155,13 +155,13 @@ data_types:
         type: boolean
         description: true indicates that this a Neutron provider type of network
         required: true
-        status: SUPPORTED
+        status: supported
       physical_network_name:
         type: string
         description: |
           Identifies the NUMA processor cluster to which this physical network interface belongs. NUMA instance correlates to the first digit of the Physical Network Name suffix (e.g. "01" = NUMA 0, "11" = NUMA 1)
         required: false
-        status: SUPPORTED
+        status: supported
         constraints:
         - valid_values:
           - Physnet-SRIOV-1
@@ -173,7 +173,7 @@ data_types:
         description: |
           PNIC instance within the NUMA processor cluster PNIC Instance correlates to the second digit of the Physical Network Name suffix (e.g. "01" = PNIC 1, "02" = "PNIC 2)
         required: false
-        status: SUPPORTED
+        status: supported
         constraints:
         - valid_values:
           - NUMA 0
@@ -182,7 +182,7 @@ data_types:
         type: integer
         description: PNIC instance within the NUMA processor cluster
         required: false
-        status: SUPPORTED
+        status: supported
   org.openecomp.datatypes.network.VlanRequirements:
     derived_from: org.openecomp.datatypes.Root
     properties:
@@ -190,12 +190,12 @@ data_types:
         type: string
         description: reference to a vlan range plan
         required: true
-        status: SUPPORTED
+        status: supported
       vlan_type:
         type: string
         description: identifies the vlan type (e.g., c-tag)
         required: true
-        status: SUPPORTED
+        status: supported
         constraints:
         - valid_values:
           - c-tag
@@ -204,7 +204,7 @@ data_types:
         type: integer
         description: identifies the number of vlan tags to assign to the CP from the plan
         required: true
-        status: SUPPORTED
+        status: supported
   org.openecomp.datatypes.ComputeFlavor:
     derived_from: tosca.datatypes.Root
     description: Compute Flavor (Size)
@@ -213,22 +213,22 @@ data_types:
         type: string
         description: Compute Flavor Name
         required: true
-        status: SUPPORTED
+        status: supported
       num_cpus:
         type: integer
         description: Number of cpu
         required: true
-        status: SUPPORTED
+        status: supported
       disk_size:
         type: scalar-unit.size
         description: Disk size
         required: true
-        status: SUPPORTED
+        status: supported
       mem_size:
         type: scalar-unit.size
         description: Memory size
         required: true
-        status: SUPPORTED
+        status: supported
   org.openecomp.datatypes.network.MacAssignments:
     derived_from: org.openecomp.datatypes.Root
     properties:
@@ -236,12 +236,12 @@ data_types:
         type: string
         description: reference to a MAC address range plan
         required: true
-        status: SUPPORTED
+        status: supported
       mac_count:
         type: integer
         description: identifies the number of MAC addresses to assign to the CP from the plan
         required: true
-        status: SUPPORTED
+        status: supported
   org.openecomp.datatypes.network.MacRequirements:
     derived_from: org.openecomp.datatypes.Root
     properties:
@@ -249,12 +249,12 @@ data_types:
         type: string
         description: reference to a MAC address range plan
         required: true
-        status: SUPPORTED
+        status: supported
       mac_count:
         type: org.openecomp.datatypes.AssignmentRequirements
         description: identifies the number of MAC addresses to assign to the CP from the plan
         required: true
-        status: SUPPORTED
+        status: supported
   org.openecomp.datatypes.network.SubnetAssignments:
     derived_from: org.openecomp.datatypes.Root
     properties:
@@ -262,17 +262,17 @@ data_types:
         type: string
         description: Reference to EIPAM, VLAN or other address plan ID used to assign subnets to this network
         required: false
-        status: SUPPORTED
+        status: supported
       dhcp_enabled:
         type: boolean
         description: \"true\" indicates the network has 1 or more policies
         required: false
-        status: SUPPORTED
+        status: supported
       ip_version:
         type: integer
         description: The IP version of the subnet
         required: true
-        status: SUPPORTED
+        status: supported
         constraints:
         - valid_values:
           - 4
@@ -281,13 +281,13 @@ data_types:
         type: integer
         description: The default subnet CIDR mask
         required: true
-        status: SUPPORTED
+        status: supported
       min_subnets_count:
         type: integer
         description: Quantity of subnets that must be initially assigned
         required: true
         default: 1
-        status: SUPPORTED
+        status: supported
   org.openecomp.datatypes.Artifact:
     derived_from: org.openecomp.datatypes.Root
     properties:
@@ -295,27 +295,27 @@ data_types:
         type: string
         description: Artifcat name
         required: true
-        status: SUPPORTED
+        status: supported
       artifact_type:
         type: string
         description: Artifcat type
         required: true
-        status: SUPPORTED
+        status: supported
       artifact_uuid:
         type: string
         description: Artifcat UUID
         required: true
-        status: SUPPORTED
+        status: supported
       artifact_checksum:
         type: string
         description: Artifact checksum
         required: true
-        status: SUPPORTED
+        status: supported
       artifact_url:
         type: string
         description: Artifcay URL. Can also include only the file name
         required: true
-        status: SUPPORTED
+        status: supported
   org.openecomp.datatypes.network.IPv4SubnetAssignments:
     derived_from: org.openecomp.datatypes.network.SubnetAssignments
     properties:
@@ -323,7 +323,7 @@ data_types:
         type: boolean
         description: Indicates IPv4 subnet assignments
         required: true
-        status: SUPPORTED
+        status: supported
   org.openecomp.datatypes.Root:
     derived_from: tosca.datatypes.Root
     description: |
@@ -332,7 +332,7 @@ data_types:
       supplemental_data:
         type: map
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           description: |
             A placeholder for missing properties that would be included in future openecomp model
@@ -346,13 +346,13 @@ data_types:
         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:
@@ -360,18 +360,18 @@ data_types:
         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
-        status: SUPPORTED
+        status: supported
   org.openecomp.datatypes.network.NetworkFlows:
     derived_from: org.openecomp.datatypes.Root
     properties:
@@ -380,17 +380,17 @@ data_types:
         description: true indicates the network has 1 or more policies
         required: false
         default: false
-        status: SUPPORTED
+        status: supported
       network_policy:
         type: string
         description: Identifies the specific OPENECOMP Contrail network policy that must be applied to this network (source - from Policy Manager)
         required: false
-        status: SUPPORTED
+        status: supported
       vpn_binding:
         type: string
         description: Identifies the specific VPN Binding entry in A&AI that must be applied when creating this network (source - A&AI)
         required: false
-        status: SUPPORTED
+        status: supported
   org.openecomp.datatypes.network.NetworkAssignments:
     derived_from: org.openecomp.datatypes.Root
     properties:
@@ -400,33 +400,33 @@ data_types:
           "true" indicates that the network assignments will be auto-generated by OPENECOMP "false" indicates operator-supplied Network assignments file upload is required (e.g. VID will present prompt to operator to upload operator-supplied Network assignments file).
         required: true
         default: false
-        status: SUPPORTED
+        status: supported
       network_assignments_file:
         type: string
         description: Filename of the template that specifies all of the configurable name/value pairs of Network assignments in this Network model
         required: false
-        status: SUPPORTED
+        status: supported
       multi_tenant:
         type: boolean
         description: true means this network is shared by multiple Openstack tenants
         required: true
         default: true
-        status: SUPPORTED
+        status: supported
       min_subnets_count:
         type: integer
         description: Quantity of subnets that must be initially assigned
         required: true
-        status: SUPPORTED
+        status: supported
       ip_network_address_plan:
         type: string
         description: Reference to EIPAM, VLAN or other address plan ID used to assign subnets to this network
         required: true
-        status: SUPPORTED
+        status: supported
       vlan_network_address_plan:
         type: string
         description: Reference to VLAN or other address plan ID used to assign subnets to this network
         required: true
-        status: SUPPORTED
+        status: supported
       related_networks:
         type: list
         description: Related Networks List.
@@ -452,7 +452,7 @@ data_types:
         type: boolean
         description: Indicates IPv6 subnet assignments
         required: true
-        status: SUPPORTED
+        status: supported
   org.openecomp.datatypes.EcompNaming:
     derived_from: org.openecomp.datatypes.Root
     properties:
@@ -462,12 +462,12 @@ data_types:
           "true" indicates that the name for the instance will be auto-generated by OPENECOMP. "false" indicates operator-supplied name required (e.g. VID will present prompt to operator and collect the operator-supplied instance name).
         required: true
         default: true
-        status: SUPPORTED
+        status: supported
       naming_policy:
         type: string
         description: Referenc to naming policy that OPENECOMP will use when the name is auto-generated
         required: false
-        status: SUPPORTED
+        status: supported
   org.openecomp.datatypes.Naming:
     derived_from: org.openecomp.datatypes.Root
     properties:
@@ -477,7 +477,7 @@ data_types:
           "true" indicates that the name for the instance will be auto-generated by OPENECOMP. "false" indicates operator-supplied name required (e.g. VID will present prompt to operator and collect the operator-supplied instance name).
         required: true
         default: true
-        status: SUPPORTED
+        status: supported
   org.openecomp.datatypes.EcompGeneratedNaming:
     derived_from: org.openecomp.datatypes.Naming
     properties:
@@ -485,7 +485,7 @@ data_types:
         type: string
         description: Referenc to naming policy that OPENECOMP will use when the name is auto-generated
         required: false
-        status: SUPPORTED
+        status: supported
   org.openecomp.datatypes.UserDefinedNaming:
     derived_from: org.openecomp.datatypes.Naming
     properties:
@@ -493,4 +493,4 @@ data_types:
         type: string
         description: Reference to naming policy that OPENECOMP will use when the name is auto-generated
         required: false
-        status: SUPPORTED
+        status: supported
diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/toscaGlobalServiceTemplates/openecomp/groups.yml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/toscaGlobalServiceTemplates/openecomp/groups.yml
index 09a9fb0807..f45c569c96 100644
--- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/toscaGlobalServiceTemplates/openecomp/groups.yml
+++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/toscaGlobalServiceTemplates/openecomp/groups.yml
@@ -15,39 +15,39 @@ group_types:
         description: Whether this module should be deployed before other modules
         required: true
         default: false
-        status: SUPPORTED
+        status: supported
       vf_module_label:
         type: string
         description: |
           Alternate textual key used to reference this VF-Module model.  Must be unique within the VNF model
         required: true
-        status: SUPPORTED
+        status: supported
       vf_module_description:
         type: string
         description: |
           Description of the VF-modules contents and purpose   (e.g. "Front-End" or "Database Cluster")
         required: true
-        status: SUPPORTED
+        status: supported
       min_vf_module_instances:
         type: integer
         description: The minimum instances of this VF-Module
         required: true
-        status: SUPPORTED
+        status: supported
       max_vf_module_instances:
         type: integer
         description: The maximum instances of this VF-Module
         required: false
-        status: SUPPORTED
+        status: supported
       initial_count:
         type: integer
         description: |
           The initial count of instances of the VF-Module. The value must be in the  range between min_vfmodule_instances and max_vfmodule_instances. If no value provided the initial count is the min_vfmodule_instances.
         required: false
-        status: SUPPORTED
+        status: supported
       vf_module_type:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
         constraints:
         - valid_values:
           - Base
@@ -58,4 +58,4 @@ group_types:
           "true" indicates that this VF Module model requires attachment to a Volume   Group.  VID operator must select the Volume Group instance to attach to a VF-Module  at deployment time.
         required: true
         default: false
-        status: SUPPORTED
+        status: supported
diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/toscaGlobalServiceTemplates/openecomp/nodes.yml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/toscaGlobalServiceTemplates/openecomp/nodes.yml
index 7c5c453afa..a6e76a75a6 100644
--- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/toscaGlobalServiceTemplates/openecomp/nodes.yml
+++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/toscaGlobalServiceTemplates/openecomp/nodes.yml
@@ -43,7 +43,7 @@ node_types:
       service_template_filter:
         description: Substitution Filter
         type: org.openecomp.datatypes.substitution.SubstitutionFiltering
-        status: SUPPORTED
+        status: supported
         required: true
 
   org.openecomp.resource.vl.extVL:
@@ -309,7 +309,7 @@ node_types:
       license_feature_group_ref:
         description: refrence to license feature group
         type: string
-        status: SUPPORTED
+        status: supported
         required: true
     requirements:
     - deployment_flavor:
@@ -329,48 +329,48 @@ node_types:
       high_availablity:
         description: high_availablity
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
       vm_image_name:
         description: Master image_name volume id
         type: string
-        status: SUPPORTED
+        status: supported
         required: true
       vm_flavor_name:
         description: Master image_name volume id
         type: string
-        status: SUPPORTED
+        status: supported
         required: true
       nfc_naming_code:
         description: nfc code for instance naming
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
       nfc_code:
         type: string
         description: nfc code
-        status: SUPPORTED
+        status: supported
         required: false
       nfc_function:
         type: string
         description: nfc function
-        status: SUPPORTED
+        status: supported
         required: false
       vm_type_tag:
         description: vm type based on naming Convention
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
       vfc_naming:
         description: vfc naming
         type: org.openecomp.datatypes.Naming
-        status: SUPPORTED
+        status: supported
         default: false
         required: false
       min_instances:
         description: Minimum number of VFC Instances
         type: integer
-        status: SUPPORTED
+        status: supported
         default: 0
         required: false
         constraints:
@@ -378,7 +378,7 @@ node_types:
       max_instances:
         description: Maximum number of VFC Instances
         type: integer
-        status: SUPPORTED
+        status: supported
         required: false
         constraints:
         - greater_or_equal: 1
@@ -657,29 +657,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
@@ -691,25 +691,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
@@ -718,59 +718,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
@@ -793,25 +793,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:
@@ -819,17 +819,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
@@ -840,7 +840,7 @@ node_types:
       fq_name:
         type: string
         description: fq_name
-        status: SUPPORTED
+        status: supported
 
   org.openecomp.resource.cp.v2.extVirtualMachineInterfaceCP:
     derived_from: org.openecomp.resource.cp.v2.extCP
@@ -848,55 +848,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/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/toscaGlobalServiceTemplates/openecomp/relationships.yml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/toscaGlobalServiceTemplates/openecomp/relationships.yml
index 310e9847c7..9c4a5eb7d8 100644
--- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/toscaGlobalServiceTemplates/openecomp/relationships.yml
+++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/toscaGlobalServiceTemplates/openecomp/relationships.yml
@@ -14,17 +14,17 @@ relationship_types:
         type: string
         description: The ID of the volume to be attached
         required: true
-        status: SUPPORTED
+        status: supported
       instance_uuid:
         type: string
         description: The ID of the server to which the volume attaches
         required: true
-        status: SUPPORTED
+        status: supported
     attributes:
       show:
         type: string
         description: Detailed information about resource
-        status: SUPPORTED
+        status: supported
   org.openecomp.relationships.AttachesTo:
     derived_from: tosca.relationships.AttachesTo
     description: This type represents an attachment relationship
@@ -33,4 +33,4 @@ relationship_types:
         type: string
         description: The relative location (e.g., path on the file system), which provides the root location to address an attached node.
         required: false
-        status: SUPPORTED
+        status: supported
diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/toscaGlobalServiceTemplates/tosca/capabilities.yml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/toscaGlobalServiceTemplates/tosca/capabilities.yml
index 34f78c4ec8..53364d86fb 100644
--- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/toscaGlobalServiceTemplates/tosca/capabilities.yml
+++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/toscaGlobalServiceTemplates/tosca/capabilities.yml
@@ -19,28 +19,28 @@ capability_types:
         type: integer
         description: Number of (actual or virtual) CPUs associated with the Compute node.
         required: false
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 1
       cpu_frequency:
         type: scalar-unit.frequency
         description: Specifies the operating frequency of CPU's core. This property expresses the expected frequency of one (1) CPU as provided by the property "num_cpus".
         required: false
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0.1 GHz
       disk_size:
         type: scalar-unit.size
         description: Size of the local disk available to applications running on the Compute node (default unit is MB).
         required: false
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0 MB
       mem_size:
         type: scalar-unit.size
         description: Size of memory available to applications running on the Compute node (default unit is MB).
         required: false
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0 MB
   tosca.capabilities.Endpoint:
@@ -54,41 +54,41 @@ capability_types:
           tcp, udp, etc.'
         required: true
         default: tcp
-        status: SUPPORTED
+        status: supported
       port:
         type: tosca.datatypes.network.PortDef
         description: The optional port of the endpoint.
         required: false
-        status: SUPPORTED
+        status: supported
       secure:
         type: boolean
         description: Requests for the endpoint to be secure and use credentials supplied on the ConnectsTo relationship.
         required: false
         default: false
-        status: SUPPORTED
+        status: supported
       url_path:
         type: string
         description: The optional URL path of the endpoint's address if applicable for the protocol.
         required: false
-        status: SUPPORTED
+        status: supported
       port_name:
         type: string
         description: The optional name (or ID) of the network port this endpoint should be bound to.
         required: false
-        status: SUPPORTED
+        status: supported
       network_name:
         type: string
         description: 'The optional name (or ID) of the network this endpoint should
           be bound to. network_name: PRIVATE | PUBLIC | <network_name> | <network_id>.'
         required: false
         default: PRIVATE
-        status: SUPPORTED
+        status: supported
       initiator:
         type: string
         description: The optional indicator of the direction of the connection.
         required: false
         default: source
-        status: SUPPORTED
+        status: supported
         constraints:
         - valid_values:
           - source
@@ -98,7 +98,7 @@ capability_types:
         type: map
         description: The optional map of ports the Endpoint supports (if more than one).
         required: false
-        status: SUPPORTED
+        status: supported
         constraints:
         - min_length: 1
         entry_schema:
@@ -108,7 +108,7 @@ capability_types:
         type: string
         description: 'Note: This is the IP address as propagated up by the associated
           node''s host (Compute) container.'
-        status: SUPPORTED
+        status: supported
   tosca.capabilities.Endpoint.Public:
     derived_from: tosca.capabilities.Endpoint
     description: |-
@@ -119,7 +119,7 @@ capability_types:
         type: string
         required: true
         default: PUBLIC
-        status: SUPPORTED
+        status: supported
         constraints:
         - equal: PUBLIC
   tosca.capabilities.Endpoint.Admin:
@@ -131,7 +131,7 @@ capability_types:
         description: Requests for the endpoint to be secure and use credentials supplied on the ConnectsTo relationship.
         required: true
         default: true
-        status: SUPPORTED
+        status: supported
         constraints:
         - equal: true
   tosca.capabilities.Endpoint.Database:
@@ -149,24 +149,24 @@ capability_types:
         description: 'The Operating System (OS) architecture. Examples of valid values
           include: x86_32, x86_64, etc.'
         required: false
-        status: SUPPORTED
+        status: supported
       type:
         type: string
         description: 'The Operating System (OS) type. Examples of valid values include:
           linux, aix, mac, windows, etc.'
         required: false
-        status: SUPPORTED
+        status: supported
       distribution:
         type: string
         description: 'The Operating System (OS) distribution. Examples of valid values
           for a "type" of "Linux" would include: debian, fedora, rhel and ubuntu.'
         required: false
-        status: SUPPORTED
+        status: supported
       version:
         type: version
         description: The Operating System version.
         required: false
-        status: SUPPORTED
+        status: supported
   tosca.capabilities.Scalable:
     derived_from: tosca.capabilities.Root
     description: This is the default TOSCA type that should be used to express a scalability capability for a node.
@@ -176,13 +176,13 @@ capability_types:
         description: This property is used to indicate the minimum number of instances that should be created for the associated TOSCA Node Template by a TOSCA orchestrator.
         required: true
         default: 1
-        status: SUPPORTED
+        status: supported
       max_instances:
         type: integer
         description: This property is used to indicate the maximum number of instances that should be created for the associated TOSCA Node Template by a TOSCA orchestrator.
         required: true
         default: 1
-        status: SUPPORTED
+        status: supported
       default_instances:
         type: integer
         description: 'An optional property that indicates the requested default number
@@ -191,7 +191,7 @@ capability_types:
           the range between the values set for "min_instances" and "max_instances"
           properties.'
         required: false
-        status: SUPPORTED
+        status: supported
   tosca.capabilities.network.Bindable:
     derived_from: tosca.capabilities.Node
     description: A node type that includes the Bindable capability indicates that it can be bound to a logical network association via a network port.
@@ -204,29 +204,29 @@ capability_types:
       version:
         type: list
         required: false
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: version
       publish_all:
         type: boolean
         required: false
         default: false
-        status: SUPPORTED
+        status: supported
       publish_ports:
         type: list
         required: false
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: PortSpec
       expose_ports:
         type: list
         required: false
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: PortSpec
       volumes:
         type: list
         required: false
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/toscaGlobalServiceTemplates/tosca/data.yml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/toscaGlobalServiceTemplates/tosca/data.yml
index 88042193f5..68e3363e31 100644
--- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/toscaGlobalServiceTemplates/tosca/data.yml
+++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/toscaGlobalServiceTemplates/tosca/data.yml
@@ -40,17 +40,17 @@ data_types:
         type: string
         description: The name of the logical network. e.g., "public", "private", "admin". etc.
         required: false
-        status: SUPPORTED
+        status: supported
       network_id:
         type: string
         description: The unique ID of for the network generated by the network provider.
         required: false
-        status: SUPPORTED
+        status: supported
       addresses:
         type: list
         description: The list of IP addresses assigned from the underlying network.
         required: false
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
   tosca.datatypes.TimeInterval:
@@ -59,11 +59,11 @@ data_types:
       start_time:
         type: timestamp
         required: true
-        status: SUPPORTED
+        status: supported
       end_time:
         type: timestamp
         required: true
-        status: SUPPORTED
+        status: supported
   tosca.datatypes.network.PortSpec:
     derived_from: tosca.datatypes.Root
     description: The PortSpec type is a complex TOSCA data Type used when describing port specifications for a network connection.
@@ -73,7 +73,7 @@ data_types:
         description: The required protocol used on the port.
         required: true
         default: tcp
-        status: SUPPORTED
+        status: supported
         constraints:
         - valid_values:
           - udp
@@ -83,12 +83,12 @@ data_types:
         type: tosca.datatypes.network.PortDef
         description: The optional source port.
         required: false
-        status: SUPPORTED
+        status: supported
       source_range:
         type: range
         description: The optional range for source port.
         required: false
-        status: SUPPORTED
+        status: supported
         constraints:
         - in_range:
           - 1
@@ -97,12 +97,12 @@ data_types:
         type: tosca.datatypes.network.PortDef
         description: The optional target port.
         required: false
-        status: SUPPORTED
+        status: supported
       target_range:
         type: range
         description: The optional range for target port.
         required: false
-        status: SUPPORTED
+        status: supported
         constraints:
         - in_range:
           - 1
@@ -122,27 +122,27 @@ data_types:
         type: string
         description: The logical network port name.
         required: false
-        status: SUPPORTED
+        status: supported
       port_id:
         type: string
         description: The unique ID for the network port generated by the network provider.
         required: false
-        status: SUPPORTED
+        status: supported
       network_id:
         type: string
         description: The unique ID for the network.
         required: false
-        status: SUPPORTED
+        status: supported
       mac_address:
         type: string
         description: The unique media access control address (MAC address) assigned to the port.
         required: false
-        status: SUPPORTED
+        status: supported
       addresses:
         type: list
         description: The list of IP address(es) assigned to the port.
         required: false
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
   tosca.datatypes.Credential:
@@ -153,27 +153,27 @@ data_types:
         type: string
         description: The optional protocol name.
         required: false
-        status: SUPPORTED
+        status: supported
       token_type:
         type: string
         description: The required token type.
         required: true
         default: password
-        status: SUPPORTED
+        status: supported
       token:
         type: string
         description: The required token used as a credential for authorization or access to a networked resource.
         required: true
-        status: SUPPORTED
+        status: supported
       keys:
         type: map
         description: The optional list of protocol-specific keys or assertions.
         required: false
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       user:
         type: string
         description: The optional user (name or ID) used for non-token based credentials.
         required: false
-        status: SUPPORTED
+        status: supported
diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/toscaGlobalServiceTemplates/tosca/nodes.yml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/toscaGlobalServiceTemplates/tosca/nodes.yml
index bb61619217..4172f13bd6 100644
--- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/toscaGlobalServiceTemplates/tosca/nodes.yml
+++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/toscaGlobalServiceTemplates/tosca/nodes.yml
@@ -12,16 +12,16 @@ node_types:
       tosca_id:
         type: string
         description: A unique identifier of the realized instance of a Node Template that derives from any TOSCA normative type.
-        status: SUPPORTED
+        status: supported
       tosca_name:
         type: string
         description: This attribute reflects the name of the Node Template as defined in the TOSCA service template. This name is not unique to the realized instance model of corresponding deployed application as each template in the model can result in one or more instances (e.g., scaled) when orchestrated to a provider environment.
-        status: SUPPORTED
+        status: supported
       state:
         type: string
         description: The state of the node instance.
         default: initial
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency:
         capability: tosca.capabilities.Node
@@ -47,19 +47,19 @@ node_types:
         type: string
         description: The logical name of the object store (or container).
         required: true
-        status: SUPPORTED
+        status: supported
       size:
         type: scalar-unit.size
         description: The requested initial storage size (default unit is in Gigabytes).
         required: false
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0 GB
       maxsize:
         type: scalar-unit.size
         description: The requested maximum storage size (default unit is in Gigabytes).
         required: false
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0 GB
     capabilities:
@@ -76,12 +76,12 @@ node_types:
         type: string
         description: The optional root password for the DBMS server.
         required: false
-        status: SUPPORTED
+        status: supported
       port:
         type: integer
         description: The DBMS server's port.
         required: false
-        status: SUPPORTED
+        status: supported
     capabilities:
       host:
         type: tosca.capabilities.Container
@@ -98,7 +98,7 @@ node_types:
         type: string
         description: The web application's context root which designates the application's URL path within the web server it is hosted on.
         required: false
-        status: SUPPORTED
+        status: supported
     requirements:
     - host:
         capability: tosca.capabilities.Container
@@ -117,21 +117,21 @@ node_types:
       private_address:
         type: string
         description: The primary private IP address assigned by the cloud provider that applications may use to access the Compute node.
-        status: SUPPORTED
+        status: supported
       public_address:
         type: string
         description: The primary public IP address assigned by the cloud provider that applications may use to access the Compute node.
-        status: SUPPORTED
+        status: supported
       networks:
         type: map
         description: The list of logical networks assigned to the compute host instance and information about them.
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: tosca.datatypes.network.NetworkInfo
       ports:
         type: map
         description: The list of logical ports assigned to the compute host instance and information about them.
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: tosca.datatypes.network.PortInfo
     requirements:
@@ -179,7 +179,7 @@ node_types:
         description: The IP version of the requested network.
         required: false
         default: 4
-        status: SUPPORTED
+        status: supported
         constraints:
         - valid_values:
           - 4
@@ -188,53 +188,53 @@ node_types:
         type: string
         description: The cidr block of the requested network.
         required: false
-        status: SUPPORTED
+        status: supported
       start_ip:
         type: string
         description: The IP address to be used as the 1st one in a pool of addresses derived from the cidr block full IP range.
         required: false
-        status: SUPPORTED
+        status: supported
       end_ip:
         type: string
         description: The IP address to be used as the last one in a pool of addresses derived from the cidr block full IP range.
         required: false
-        status: SUPPORTED
+        status: supported
       gateway_ip:
         type: string
         description: The gateway IP address.
         required: false
-        status: SUPPORTED
+        status: supported
       network_name:
         type: string
         description: An Identifier that represents an existing Network instance in the underlying cloud infrastructure - OR - be used as the name of the new created network.
         required: false
-        status: SUPPORTED
+        status: supported
       network_id:
         type: string
         description: An Identifier that represents an existing Network instance in the underlying cloud infrastructure. This property is mutually exclusive with all other properties except network_name.
         required: false
-        status: SUPPORTED
+        status: supported
       segmentation_id:
         type: string
         description: A segmentation identifier in the underlying cloud infrastructure (e.g., VLAN id, GRE tunnel id). If the segmentation_id is specified, the network_type or physical_network properties should be provided as well.
         required: false
-        status: SUPPORTED
+        status: supported
       network_type:
         type: string
         description: Optionally, specifies the nature of the physical network in the underlying cloud infrastructure. Examples are flat, vlan, gre or vxlan. For flat and vlan types, physical_network should be provided too.
         required: false
-        status: SUPPORTED
+        status: supported
       physical_network:
         type: string
         description: Optionally, identifies the physical network on top of which the network is implemented, e.g. physnet1. This property is required if network_type is flat or vlan.
         required: false
-        status: SUPPORTED
+        status: supported
       dhcp_enabled:
         type: boolean
         description: Indicates the TOSCA container to create a virtual network instance with or without a DHCP service.
         required: false
         default: true
-        status: SUPPORTED
+        status: supported
     capabilities:
       link:
         type: tosca.capabilities.network.Linkable
@@ -291,12 +291,12 @@ node_types:
         type: version
         description: The optional software component's version.
         required: false
-        status: SUPPORTED
+        status: supported
       admin_credential:
         type: tosca.datatypes.Credential
         description: The optional credential that can be used to authenticate to the software component.
         required: false
-        status: SUPPORTED
+        status: supported
     requirements:
     - host:
         capability: tosca.capabilities.Container
@@ -310,19 +310,19 @@ node_types:
         type: scalar-unit.size
         description: The requested storage size (default unit is MB).
         required: true
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 1 MB
       volume_id:
         type: string
         description: ID of an existing volume (that is in the accessible scope of the requesting application).
         required: false
-        status: SUPPORTED
+        status: supported
       snapshot_id:
         type: string
         description: Some identifier that represents an existing snapshot that should be used when creating the block storage (volume).
         required: false
-        status: SUPPORTED
+        status: supported
     capabilities:
       attachment:
         type: tosca.capabilities.Attachment
@@ -339,7 +339,7 @@ node_types:
         type: string
         description: Allow the user to set a fixed IP address. Note that this address is a request to the provider which they will attempt to fulfill but may not be able to dependent on the network the port is associated with.
         required: false
-        status: SUPPORTED
+        status: supported
       order:
         type: integer
         description: 'The order of the NIC on the compute instance (e.g. eth2). Note:
@@ -349,7 +349,7 @@ node_types:
           progression that starts with 0 (e.g. 0, 1, 2, ..., n).'
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       is_default:
@@ -357,22 +357,22 @@ node_types:
         description: Set is_default=true to apply a default gateway route on the running compute instance to the associated network gateway. Only one port that is associated to single compute node can set as default=true.
         required: false
         default: false
-        status: SUPPORTED
+        status: supported
       ip_range_start:
         type: string
         description: Defines the starting IP of a range to be allocated for the compute instances that are associated by this Port. Without setting this property the IP allocation is done from the entire CIDR block of the network.
         required: false
-        status: SUPPORTED
+        status: supported
       ip_range_end:
         type: string
         description: Defines the ending IP of a range to be allocated for the compute instances that are associated by this Port. Without setting this property the IP allocation is done from the entire CIDR block of the network.
         required: false
-        status: SUPPORTED
+        status: supported
     attributes:
       ip_address:
         type: string
         description: The IP address would be assigned to the associated compute instance.
-        status: SUPPORTED
+        status: supported
     requirements:
     - link:
         capability: tosca.capabilities.network.Linkable
@@ -405,22 +405,22 @@ node_types:
         type: string
         description: The logical database Name.
         required: true
-        status: SUPPORTED
+        status: supported
       port:
         type: integer
         description: The port the database service will use to listen for incoming data and requests.
         required: false
-        status: SUPPORTED
+        status: supported
       user:
         type: string
         description: The special user account used for database administration.
         required: false
-        status: SUPPORTED
+        status: supported
       password:
         type: string
         description: The password associated with the user account provided in the 'user' property.
         required: false
-        status: SUPPORTED
+        status: supported
     requirements:
     - host:
         capability: tosca.capabilities.Container
diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/toscaGlobalServiceTemplates/tosca/relationships.yml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/toscaGlobalServiceTemplates/tosca/relationships.yml
index 07a9bf5bd9..8ba1b1e107 100644
--- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/toscaGlobalServiceTemplates/tosca/relationships.yml
+++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/toscaGlobalServiceTemplates/tosca/relationships.yml
@@ -12,16 +12,16 @@ relationship_types:
       tosca_id:
         type: string
         description: A unique identifier of the realized instance of a Relationship Template that derives from any TOSCA normative type.
-        status: SUPPORTED
+        status: supported
       tosca_name:
         type: string
         description: This attribute reflects the name of the Relationship Template as defined in the TOSCA service template. This name is not unique to the realized instance model of corresponding deployed application as each template in the model can result in one or more instances (e.g., scaled) when orchestrated to a provider environment.
-        status: SUPPORTED
+        status: supported
       state:
         type: string
         description: The state of the relationship instance.
         default: initial
-        status: SUPPORTED
+        status: supported
     interfaces:
       Configure:
         type: tosca.interfaces.relationship.Configure
@@ -46,21 +46,21 @@ relationship_types:
           / path such as ''/usr/data''. Note: The user must provide it and it cannot
           be "root".'
         required: true
-        status: SUPPORTED
+        status: supported
         constraints:
         - min_length: 1
       device:
         type: string
         description: The logical device name which for the attached device (which is represented by the target node in the model). e.g., '/dev/hda1'.
         required: false
-        status: SUPPORTED
+        status: supported
     attributes:
       device:
         type: string
         description: 'The logical name of the device as exposed to the instance. Note:
           A runtime property that gets set when the model gets instantiated by the
           orchestrator.'
-        status: SUPPORTED
+        status: supported
     valid_target_types:
     - tosca.capabilities.Attachment
   tosca.relationships.network.BindsTo:
@@ -85,6 +85,6 @@ relationship_types:
       credential:
         type: tosca.datatypes.Credential
         required: false
-        status: SUPPORTED
+        status: supported
     valid_target_types:
     - tosca.capabilities.Endpoint
diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/toscaGlobalServiceTemplates_1610/AbstractSubstituteGlobalTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/toscaGlobalServiceTemplates_1610/AbstractSubstituteGlobalTypesServiceTemplate.yaml
index 449f0939ee..400a13bf16 100644
--- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/toscaGlobalServiceTemplates_1610/AbstractSubstituteGlobalTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/toscaGlobalServiceTemplates_1610/AbstractSubstituteGlobalTypesServiceTemplate.yaml
@@ -15,13 +15,13 @@ data_types:
         type: string
         description: Substitute Service Template
         required: true
-        status: SUPPORTED
+        status: supported
       index_variable:
         type: string
         description: Index variable
         required: false
         default: '%index%'
-        status: SUPPORTED
+        status: supported
         constraints:
         - min_length: 3
       count:
@@ -29,13 +29,13 @@ data_types:
         description: Count
         required: false
         default: 1
-        status: SUPPORTED
+        status: supported
       mandatory:
         type: boolean
         description: Mandatory
         required: false
         default: true
-        status: SUPPORTED
+        status: supported
 node_types:
   org.openecomp.resource.abstract.nodes.AbstractSubstitute:
     derived_from: tosca.nodes.Root
@@ -44,4 +44,4 @@ node_types:
         type: org.openecomp.datatypes.heat.substitution.SubstitutionFilter
         description: Substitution Filter
         required: true
-        status: SUPPORTED
\ No newline at end of file
+        status: supported
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/toscaGlobalServiceTemplates_1610/CinderVolumeGlobalTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/toscaGlobalServiceTemplates_1610/CinderVolumeGlobalTypesServiceTemplate.yaml
index 9b0655bf36..3c15fd818d 100644
--- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/toscaGlobalServiceTemplates_1610/CinderVolumeGlobalTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/toscaGlobalServiceTemplates_1610/CinderVolumeGlobalTypesServiceTemplate.yaml
@@ -12,22 +12,22 @@ relationship_types:
         type: string
         description: The ID of the volume to be attached
         required: true
-        status: SUPPORTED
+        status: supported
       location:
         type: string
         description: The location where the volume is exposed on the instance, mountpoint
         required: false
-        status: SUPPORTED
+        status: supported
       instance_uuid:
         type: string
         description: The ID of the server to which the volume attaches
         required: true
-        status: SUPPORTED
+        status: supported
     attributes:
       show:
         type: string
         description: Detailed information about resource
-        status: SUPPORTED
+        status: supported
 node_types:
   org.openecomp.resource.vfc.nodes.heat.cinder.Volume:
     derived_from: tosca.nodes.BlockStorage
@@ -36,34 +36,34 @@ node_types:
         type: string
         description: The availability zone in which the volume will be created
         required: false
-        status: SUPPORTED
+        status: supported
       image:
         type: string
         description: If specified, the name or ID of the image to create the volume from
         required: false
-        status: SUPPORTED
+        status: supported
       metadata:
         type: map
         description: Key/value pairs to associate with the volume
         required: false
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       volume_type:
         type: string
         description: If specified, the type of volume to use, mapping to a specific backend
         required: false
-        status: SUPPORTED
+        status: supported
       description:
         type: string
         description: A description of the volume
         required: false
-        status: SUPPORTED
+        status: supported
       device_type:
         type: string
         description: Device type
         required: false
-        status: SUPPORTED
+        status: supported
         constraints:
         - valid_values:
           - cdrom
@@ -73,7 +73,7 @@ node_types:
         description: 'Bus of the device: hypervisor driver chooses a suitable default
           if omitted'
         required: false
-        status: SUPPORTED
+        status: supported
         constraints:
         - valid_values:
           - ide
@@ -85,92 +85,92 @@ node_types:
         type: string
         description: If specified, the backup to create the volume from
         required: false
-        status: SUPPORTED
+        status: supported
       source_volid:
         type: string
         description: If specified, the volume to use as source
         required: false
-        status: SUPPORTED
+        status: supported
       boot_index:
         type: integer
         description: Integer used for ordering the boot disks
         required: false
-        status: SUPPORTED
+        status: supported
       size:
         type: scalar-unit.size
         description: The requested storage size (default unit is MB)
         required: false
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 1 GB
       read_only:
         type: boolean
         description: Enables or disables read-only access mode of volume
         required: false
-        status: SUPPORTED
+        status: supported
       name:
         type: string
         description: A name used to distinguish the volume
         required: false
-        status: SUPPORTED
+        status: supported
       scheduler_hints:
         type: map
         description: Arbitrary key-value pairs specified by the client to help the Cinder scheduler creating a volume
         required: false
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       swap_size:
         type: scalar-unit.size
         description: The size of the swap, in MB
         required: false
-        status: SUPPORTED
+        status: supported
       delete_on_termination:
         type: boolean
         description: Indicate whether the volume should be deleted when the server is terminated
         required: false
-        status: SUPPORTED
+        status: supported
       multiattach:
         type: boolean
         description: Whether allow the volume to be attached more than once
         required: false
-        status: SUPPORTED
+        status: supported
     attributes:
       display_description:
         type: string
         description: Description of the volume
-        status: SUPPORTED
+        status: supported
       attachments:
         type: string
         description: The list of attachments of the volume
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       encrypted:
         type: boolean
         description: Boolean indicating if the volume is encrypted or not
-        status: SUPPORTED
+        status: supported
       show:
         type: string
         description: Detailed information about resource
-        status: SUPPORTED
+        status: supported
       created_at:
         type: timestamp
         description: The timestamp indicating volume creation
-        status: SUPPORTED
+        status: supported
       display_name:
         type: string
         description: Name of the volume
-        status: SUPPORTED
+        status: supported
       metadata_values:
         type: map
         description: Key/value pairs associated with the volume in raw dict form
-        status: SUPPORTED
+        status: supported
       bootable:
         type: boolean
         description: Boolean indicating if the volume can be booted or not
-        status: SUPPORTED
+        status: supported
       status:
         type: string
         description: The current status of the volume
-        status: SUPPORTED
+        status: supported
diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/toscaGlobalServiceTemplates_1610/CommonGlobalTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/toscaGlobalServiceTemplates_1610/CommonGlobalTypesServiceTemplate.yaml
index f8b9c0d048..08fad45abf 100644
--- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/toscaGlobalServiceTemplates_1610/CommonGlobalTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/toscaGlobalServiceTemplates_1610/CommonGlobalTypesServiceTemplate.yaml
@@ -15,12 +15,12 @@ data_types:
         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
     description: Host route info for the subnet
@@ -29,12 +29,12 @@ data_types:
         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.neutron.Subnet:
     derived_from: tosca.datatypes.Root
     description: A subnet represents an IP address block that can be used for assigning IP addresses to virtual instances
@@ -43,18 +43,18 @@ data_types:
         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
@@ -64,7 +64,7 @@ data_types:
         type: string
         description: IPv6 RA (Router Advertisement) mode
         required: false
-        status: SUPPORTED
+        status: supported
         constraints:
         - valid_values:
           - dhcpv6-stateful
@@ -76,35 +76,35 @@ data_types:
         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:
@@ -112,7 +112,7 @@ data_types:
         description: The gateway IP address
         required: false
         default: 4
-        status: SUPPORTED
+        status: supported
         constraints:
         - valid_values:
           - '4'
@@ -121,24 +121,24 @@ data_types:
         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.network.AllocationPool:
     derived_from: tosca.datatypes.Root
     description: The start and end addresses for the allocation pool
@@ -147,12 +147,12 @@ data_types:
         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
 relationship_types:
   org.openecomp.relationships.AttachesTo:
     derived_from: tosca.relationships.Root
@@ -166,12 +166,12 @@ group_types:
         type: string
         description: Heat file which associate to this group/heat stack
         required: true
-        status: SUPPORTED
+        status: supported
       description:
         type: string
         description: Heat file description
         required: false
-        status: SUPPORTED
+        status: supported
 policy_types:
   org.openecomp.policies.placement.Colocate:
     derived_from: tosca.policy.placement
@@ -181,12 +181,12 @@ policy_types:
         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
@@ -200,12 +200,12 @@ policy_types:
         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
diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/toscaGlobalServiceTemplates_1610/ContrailNetworkRuleGlobalTypeServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/toscaGlobalServiceTemplates_1610/ContrailNetworkRuleGlobalTypeServiceTemplate.yaml
index 044d759bc0..8e85521225 100644
--- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/toscaGlobalServiceTemplates_1610/ContrailNetworkRuleGlobalTypeServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/toscaGlobalServiceTemplates_1610/ContrailNetworkRuleGlobalTypeServiceTemplate.yaml
@@ -15,12 +15,12 @@ data_types:
         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
     description: policy rule
@@ -29,45 +29,45 @@ data_types:
         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
     description: list of policy rules
@@ -76,7 +76,7 @@ data_types:
         type: list
         description: Contrail network rule
         required: false
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.contrail.network.rule.Rule
   org.openecomp.datatypes.heat.contrail.network.rule.VirtualNetwork:
@@ -87,7 +87,7 @@ data_types:
         type: string
         description: Virtual network
         required: false
-        status: SUPPORTED
+        status: supported
 node_types:
   org.openecomp.resource.nodes.heat.network.contrail.NetworkRules:
     derived_from: tosca.nodes.Root
@@ -96,17 +96,17 @@ 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:
       fq_name:
         type: string
         description: fq_name
-        status: SUPPORTED
+        status: supported
     requirements:
     - network:
         capability: tosca.capabilities.Attachment
diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/toscaGlobalServiceTemplates_1610/ContrailVirtualNetworkGlobalTypeServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/toscaGlobalServiceTemplates_1610/ContrailVirtualNetworkGlobalTypeServiceTemplate.yaml
index cbbb979029..418588a93b 100644
--- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/toscaGlobalServiceTemplates_1610/ContrailVirtualNetworkGlobalTypeServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/toscaGlobalServiceTemplates_1610/ContrailVirtualNetworkGlobalTypeServiceTemplate.yaml
@@ -14,53 +14,53 @@ 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
       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:
       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/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/toscaGlobalServiceTemplates_1610/NativeTypesServiceTemplateServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/toscaGlobalServiceTemplates_1610/NativeTypesServiceTemplateServiceTemplate.yaml
index e7dfd49ed9..4b26de1ba0 100644
--- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/toscaGlobalServiceTemplates_1610/NativeTypesServiceTemplateServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/toscaGlobalServiceTemplates_1610/NativeTypesServiceTemplateServiceTemplate.yaml
@@ -10,21 +10,21 @@ node_types:
       private_address:
         type: string
         description: private address
-        status: SUPPORTED
+        status: supported
       public_address:
         type: string
         description: public_address
-        status: SUPPORTED
+        status: supported
       networks:
         type: map
         description: networks
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: tosca.datatypes.network.NetworkInfo
       ports:
         type: map
         description: ports
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: tosca.datatypes.network.PortInfo
     requirements:
@@ -69,25 +69,25 @@ node_types:
       ip_range_end:
         type: string
         required: false
-        status: SUPPORTED
+        status: supported
       ip_range_start:
         type: string
         required: false
-        status: SUPPORTED
+        status: supported
       ip_address:
         type: string
         required: false
-        status: SUPPORTED
+        status: supported
       is_default:
         type: boolean
         required: false
         default: false
-        status: SUPPORTED
+        status: supported
       order:
         type: integer
         required: true
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
     requirements:
@@ -104,15 +104,15 @@ node_types:
       tosca_name:
         type: string
         description: tosca name
-        status: SUPPORTED
+        status: supported
       state:
         type: string
         description: state
-        status: SUPPORTED
+        status: supported
       tosca_id:
         type: string
         description: tosca id
-        status: SUPPORTED
+        status: supported
     interfaces: {
       }
   tosca.nodes.network.Network:
@@ -121,20 +121,20 @@ node_types:
       physical_network:
         type: string
         required: false
-        status: SUPPORTED
+        status: supported
       segmentation_id:
         type: string
         required: false
-        status: SUPPORTED
+        status: supported
       network_id:
         type: string
         required: false
-        status: SUPPORTED
+        status: supported
       ip_version:
         type: integer
         required: false
         default: 4
-        status: SUPPORTED
+        status: supported
         constraints:
         - valid_values:
           - 4
@@ -142,27 +142,27 @@ node_types:
       start_ip:
         type: string
         required: false
-        status: SUPPORTED
+        status: supported
       network_name:
         type: string
         required: false
-        status: SUPPORTED
+        status: supported
       cidr:
         type: string
         required: false
-        status: SUPPORTED
+        status: supported
       gateway_ip:
         type: string
         required: false
-        status: SUPPORTED
+        status: supported
       network_type:
         type: string
         required: false
-        status: SUPPORTED
+        status: supported
       end_ip:
         type: string
         required: false
-        status: SUPPORTED
+        status: supported
     capabilities:
       link:
         type: tosca.capabilities.network.Linkable
@@ -175,17 +175,17 @@ node_types:
       size:
         type: scalar-unit.size
         required: false
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 1 MB
       volume_id:
         type: string
         required: false
-        status: SUPPORTED
+        status: supported
       snapshot_id:
         type: string
         required: false
-        status: SUPPORTED
+        status: supported
     capabilities:
       attachment:
         type: tosca.capabilities.Attachment
diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/toscaGlobalServiceTemplates_1610/NeutronNetGlobalTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/toscaGlobalServiceTemplates_1610/NeutronNetGlobalTypesServiceTemplate.yaml
index 494b44c126..d9145b77e4 100644
--- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/toscaGlobalServiceTemplates_1610/NeutronNetGlobalTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/toscaGlobalServiceTemplates_1610/NeutronNetGlobalTypesServiceTemplate.yaml
@@ -14,41 +14,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:
@@ -57,38 +57,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/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/toscaGlobalServiceTemplates_1610/NeutronPortGlobalTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/toscaGlobalServiceTemplates_1610/NeutronPortGlobalTypesServiceTemplate.yaml
index a561d79b8f..1552aea7a5 100644
--- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/toscaGlobalServiceTemplates_1610/NeutronPortGlobalTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/toscaGlobalServiceTemplates_1610/NeutronPortGlobalTypesServiceTemplate.yaml
@@ -15,12 +15,12 @@ data_types:
         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
 node_types:
   org.openecomp.resource.cp.nodes.heat.network.neutron.Port:
     derived_from: tosca.nodes.network.Port
@@ -29,29 +29,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
@@ -63,25 +63,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
@@ -90,59 +90,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/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/toscaGlobalServiceTemplates_1610/NeutronSecurityRulesGlobalTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/toscaGlobalServiceTemplates_1610/NeutronSecurityRulesGlobalTypesServiceTemplate.yaml
index 83fc31520a..153ee11153 100644
--- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/toscaGlobalServiceTemplates_1610/NeutronSecurityRulesGlobalTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/toscaGlobalServiceTemplates_1610/NeutronSecurityRulesGlobalTypesServiceTemplate.yaml
@@ -15,12 +15,12 @@ data_types:
         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
@@ -31,7 +31,7 @@ data_types:
         description: Ethertype of the traffic
         required: false
         default: IPv4
-        status: SUPPORTED
+        status: supported
         constraints:
         - valid_values:
           - IPv4
@@ -41,7 +41,7 @@ data_types:
         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
@@ -50,13 +50,13 @@ data_types:
         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
@@ -66,7 +66,7 @@ data_types:
         description: The direction in which the security group rule is applied
         required: false
         default: ingress
-        status: SUPPORTED
+        status: supported
         constraints:
         - valid_values:
           - egress
@@ -75,7 +75,7 @@ data_types:
         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
@@ -88,24 +88,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/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/toscaGlobalServiceTemplates_1610/NovaServerGlobalTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/toscaGlobalServiceTemplates_1610/NovaServerGlobalTypesServiceTemplate.yaml
index d77e378a79..906b6349e3 100644
--- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/toscaGlobalServiceTemplates_1610/NovaServerGlobalTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/toscaGlobalServiceTemplates_1610/NovaServerGlobalTypesServiceTemplate.yaml
@@ -15,35 +15,35 @@ data_types:
         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
@@ -55,7 +55,7 @@ data_types:
         required: false
         default: {
           }
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
   org.openecomp.datatypes.heat.novaServer.network.AddressInfo:
@@ -66,7 +66,7 @@ data_types:
         type: string
         description: Port id
         required: false
-        status: SUPPORTED
+        status: supported
 node_types:
   org.openecomp.resource.vfc.nodes.heat.nova.Server:
     derived_from: tosca.nodes.Compute
@@ -75,23 +75,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
@@ -101,7 +101,7 @@ node_types:
         type: map
         description: Arbitrary key/value metadata to store for this server
         required: false
-        status: SUPPORTED
+        status: supported
         constraints:
         - max_length: 255
         entry_schema:
@@ -113,7 +113,7 @@ node_types:
         description: Policy on how to apply a user_data update
         required: false
         default: REPLACE
-        status: SUPPORTED
+        status: supported
         constraints:
         - valid_values:
           - REPLACE
@@ -123,7 +123,7 @@ node_types:
         description: Policy on how to apply a flavor update
         required: false
         default: RESIZE
-        status: SUPPORTED
+        status: supported
         constraints:
         - valid_values:
           - RESIZE
@@ -133,43 +133,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:
@@ -177,7 +177,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
@@ -189,7 +189,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
@@ -199,7 +199,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
@@ -208,42 +208,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
\ No newline at end of file
+        status: supported
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multi/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multi/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
index 248290cf5d..73c7abe3c0 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multi/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multi/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -12,61 +12,61 @@ node_types:
         type: string
         description: flavor name of PCRF CM instance
         required: true
-        status: SUPPORTED
+        status: supported
       availabilityzone_name:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_image_name:
         type: string
         description: PCRF CM image name
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_vol:
         type: string
         description: CPS Cluman Cinder Volume
         required: true
-        status: SUPPORTED
+        status: supported
       security_group_name:
         type: string
         description: the name of security group
         required: true
-        status: SUPPORTED
+        status: supported
       cps_net_ip:
         type: string
         description: CPS network ip
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_server_name:
         type: string
         description: PCRF CM server name
         required: true
-        status: SUPPORTED
+        status: supported
       cps_net_name:
         type: string
         description: CPS network name
         required: true
-        status: SUPPORTED
+        status: supported
       cps_net_mask:
         type: string
         description: CPS network mask
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_ip:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_name:
         type: string
         description: OAM network name
         required: true
-        status: SUPPORTED
+        status: supported
     attributes:
       server_pcm_id:
         type: string
         description: the pcm nova service id
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_pcm_port_1:
         capability: tosca.capabilities.Node
@@ -500,72 +500,72 @@ node_types:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_gw:
         type: string
         description: CPS network gateway
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_image_name:
         type: string
         description: PCRF CM image name
         required: true
-        status: SUPPORTED
+        status: supported
       security_group_name:
         type: string
         description: the name of security group
         required: true
-        status: SUPPORTED
+        status: supported
       cps_net_ip:
         type: string
         description: CPS network ip
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_flavor_name:
         type: string
         description: flavor name of PCRF CM instance
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_vol:
         type: string
         description: CPS Cluman Cinder Volume
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_server_name:
         type: string
         description: PCRF CM server name
         required: true
-        status: SUPPORTED
+        status: supported
       cps_net_name:
         type: string
         description: CPS network name
         required: true
-        status: SUPPORTED
+        status: supported
       cps_net_mask:
         type: string
         description: CPS network mask
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_ip:
         type: string
         description: OAM network ip
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_mask:
         type: string
         description: CPS network mask
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_name:
         type: string
         description: OAM network name
         required: true
-        status: SUPPORTED
+        status: supported
     attributes:
       server_pcm_id:
         type: string
         description: the pcm nova service id
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_pcm_port_00:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multiple_resource_groups/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multiple_resource_groups/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
index 4bb275609f..132bd4972f 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multiple_resource_groups/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multiple_resource_groups/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -12,12 +12,12 @@ node_types:
         type: string
         description: Unique ID for this VF_MODULE instance
         required: true
-        status: SUPPORTED
+        status: supported
       vf_name:
         type: string
         description: The VF Name; defaults to VMVM for the virtual MVM VNF.
         required: true
-        status: SUPPORTED
+        status: supported
         constraints:
         - pattern: '[a-zA-Z0-9]+'
         - max_length: 4
@@ -26,12 +26,12 @@ node_types:
         type: string
         description: The cloud zone for this VF instance
         required: true
-        status: SUPPORTED
+        status: supported
       vf_instance_num:
         type: string
         description: The number for this VF instance
         required: true
-        status: SUPPORTED
+        status: supported
         constraints:
         - pattern: '[0-9]+'
         - max_length: 2
@@ -40,70 +40,70 @@ node_types:
         type: string
         description: Virtual management network ip address
         required: true
-        status: SUPPORTED
+        status: supported
       indx:
         type: float
         description: Index of the current instance
         required: true
-        status: SUPPORTED
+        status: supported
       mvs_mgmt_ip_0:
         type: list
         description: List of Management network IP addresses for IPv4
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       flavor:
         type: string
         description: Server flavor
         required: true
-        status: SUPPORTED
+        status: supported
       key_name:
         type: string
         description: SSH key name
         required: true
-        status: SUPPORTED
+        status: supported
       vnf_id:
         type: string
         description: Unique ID for this VF instance
         required: true
-        status: SUPPORTED
+        status: supported
       availability_zone_0:
         type: list
         description: List of Availability Zone IDs or Names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       mgmt_net_id:
         type: string
         description: Neutron UUID for the Management network
         required: true
-        status: SUPPORTED
+        status: supported
       vm_instance_num:
         type: list
         description: VM instance number list must be a list of three-digit numeric value
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       bootimage:
         type: string
         description: Master bootimage volume id
         required: true
-        status: SUPPORTED
+        status: supported
       sec_groups:
         type: list
         description: Security groups
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vf_component:
         type: string
         description: The component that this VF instance is running
         required: true
-        status: SUPPORTED
+        status: supported
         constraints:
         - pattern: '[a-zA-Z0-9]+'
         - max_length: 3
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested2levels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested2levels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
index 701a5e87b3..560da924eb 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested2levels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested2levels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -12,48 +12,48 @@ node_types:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       p2:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_image:
         type: string
         description: Image for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_flavor:
         type: string
         description: Flavor for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       availability_zone_0:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_oam_ips:
         type: string
         description: cmaui_port_1
         required: true
-        status: SUPPORTED
+        status: supported
       net:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       shared_security_group_id1:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
     attributes:
       output_attr_1:
         type: string
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_cmaui_port_2:
         capability: tosca.capabilities.Node
@@ -923,44 +923,44 @@ node_types:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       p2:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_image:
         type: string
         description: Image for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_flavor:
         type: string
         description: Flavor for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       availability_zone_0:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_oam_ips:
         type: string
         description: cmaui_port_1
         required: true
-        status: SUPPORTED
+        status: supported
       net:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       shared_security_group_id1:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_server_cmaui_2:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested3levels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested3levels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
index ef873af7b8..40b8d6a3ba 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested3levels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested3levels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -12,44 +12,44 @@ node_types:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       p2:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_image:
         type: string
         description: Image for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_flavor:
         type: string
         description: Flavor for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       availability_zone_0:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_oam_ips:
         type: string
         description: cmaui_port_1
         required: true
-        status: SUPPORTED
+        status: supported
       net:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       shared_security_group_id1:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_cmaui_port_2:
         capability: tosca.capabilities.Node
@@ -1355,44 +1355,44 @@ node_types:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       p2:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_image:
         type: string
         description: Image for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_flavor:
         type: string
         description: Flavor for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       availability_zone_0:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_oam_ips:
         type: string
         description: cmaui_port_1
         required: true
-        status: SUPPORTED
+        status: supported
       net:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       shared_security_group_id1:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_server_cmaui_3:
         capability: tosca.capabilities.Node
@@ -1826,44 +1826,44 @@ node_types:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       p2:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_image:
         type: string
         description: Image for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_flavor:
         type: string
         description: Flavor for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       availability_zone_0:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_oam_ips:
         type: string
         description: cmaui_port_1
         required: true
-        status: SUPPORTED
+        status: supported
       net:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       shared_security_group_id1:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_server_cmaui_2:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedvolumelocal/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedvolumelocal/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
index 48c3d92d3f..e58b69ca5a 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedvolumelocal/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedvolumelocal/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -12,17 +12,17 @@ node_types:
         type: string
         description: PCRF CM server name
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_server_name:
         type: string
         description: PCRF CM server name
         required: true
-        status: SUPPORTED
+        status: supported
       nove_001_vol_property:
         type: string
         description: PCRF CM server name
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_nova_001:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedvolumeseperatefile/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedvolumeseperatefile/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
index 0dbf560f84..684876d9b4 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedvolumeseperatefile/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedvolumeseperatefile/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -12,17 +12,17 @@ node_types:
         type: string
         description: nova image name
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_server_name:
         type: string
         description: PCRF CM server name
         required: true
-        status: SUPPORTED
+        status: supported
       nove_001_vol_property:
         type: string
         description: volume name
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_nova_001:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedwithoutNodeTemplates/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedwithoutNodeTemplates/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
index dd7f089424..55960499c4 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedwithoutNodeTemplates/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedwithoutNodeTemplates/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -12,17 +12,17 @@ node_types:
         type: string

         description: Unique ID for this VF Module instance

         required: true

-        status: SUPPORTED

+        status: supported

       ssc_a_name_0:

         type: string

         description: Name of Perimeta VM A instance

         required: true

-        status: SUPPORTED

+        status: supported

       int_ha_network_plen:

         type: float

         description: Prefix length of subnet associated with internal HA network

         required: true

-        status: SUPPORTED

+        status: supported

         constraints:

         - in_range:

           - 0

@@ -31,96 +31,96 @@ node_types:
         type: string

         description: Service network unused port network UUID

         required: true

-        status: SUPPORTED

+        status: supported

       perimeta_server_group:

         type: string

         description: Server group to use for these VMs

         required: true

-        status: SUPPORTED

+        status: supported

       perimeta_config:

         type: string

         description: JSON orchestration template configuration for instance.

         required: true

-        status: SUPPORTED

+        status: supported

       ssc_a_int_ha_ip_0:

         type: string

         description: Fixed IP address to use as HA IP of A instance.

         required: true

-        status: SUPPORTED

+        status: supported

       vnf_name:

         type: string

         description: Unique name for this VNF instance

         required: true

-        status: SUPPORTED

+        status: supported

       perimeta_untrusted_vlan_ids:

         type: list

         description: List of VLAN IDs to use on the untrusted/access network

         required: true

-        status: SUPPORTED

+        status: supported

         entry_schema:

           type: string

       int_ha_net_id:

         type: string

         description: HA network id

         required: true

-        status: SUPPORTED

+        status: supported

       ssc_b_int_ha_ip_0:

         type: string

         description: Fixed IP address to use as HA IPs of B instance.

         required: true

-        status: SUPPORTED

+        status: supported

       ssc_mgmt_vip_0:

         type: string

         description: Management virtual IP address.

         required: true

-        status: SUPPORTED

+        status: supported

       ssc_a_trusted_ip_0:

         type: string

         description: Fixed IP address to use as Trusted/core fixed IPs of A instance.

         required: true

-        status: SUPPORTED

+        status: supported

       perimeta_keypair:

         type: string

         description: Keypair to use for accessing this Perimeta instance

         required: true

-        status: SUPPORTED

+        status: supported

       vnf_id:

         type: string

         description: VNF ID of this deployment

         required: true

-        status: SUPPORTED

+        status: supported

       availability_zone_0:

         type: string

         description: Availability zone for A instances.

         required: true

-        status: SUPPORTED

+        status: supported

       ssc_trusted_vip_0:

         type: string

         description: Trusted/core virtual IP address.

         required: true

-        status: SUPPORTED

+        status: supported

       ssc_untrusted_vip_0:

         type: string

         description: Untrusted/access virtual IP address

         required: true

-        status: SUPPORTED

+        status: supported

       perimeta_sec_groups:

         type: list

         description: List of security groups to add on trusted interfaces.

         required: true

-        status: SUPPORTED

+        status: supported

         entry_schema:

           type: string

       ssc_a_untrusted_v6_ip_0:

         type: string

         description: Fixed IP address to use as Untrusted/access alternate fixed IP of A instance.

         required: true

-        status: SUPPORTED

+        status: supported

       perimeta_untrusted_num_vlans:

         type: float

         description: number of VLANs to connect to the untrusted/access interface

         required: true

-        status: SUPPORTED

+        status: supported

         constraints:

         - in_range:

           - 1

@@ -129,74 +129,74 @@ node_types:
         type: string

         description: RF virtual IP address to use for SSC.

         required: true

-        status: SUPPORTED

+        status: supported

       ssc_a_mgmt_ip_0:

         type: string

         description: Fixed IP address to use as management IP of A instance.

         required: true

-        status: SUPPORTED

+        status: supported

       trusted_net_id:

         type: string

         description: Trusted/core network UUID

         required: true

-        status: SUPPORTED

+        status: supported

       ssc_untrusted_parent_vip_0:

         type: string

         description: Untrusted/access parent virtual IP address

         required: true

-        status: SUPPORTED

+        status: supported

       ssc_untrusted_v6_vip_0:

         type: string

         description: Untrusted/access alternate virtual IP address

         required: true

-        status: SUPPORTED

+        status: supported

       ssc_a_rf_ip_0:

         type: string

         description: RF fixed IP address to use for SSC A.

         required: true

-        status: SUPPORTED

+        status: supported

       vm_role:

         type: string

         description: Role of these VMs

         required: true

-        status: SUPPORTED

+        status: supported

       ssc_a_untrusted_parent_ip_0:

         type: string

         description: Fixed IP address to use as Untrusted/access fixed IP of A parent instance.

         required: true

-        status: SUPPORTED

+        status: supported

       perimeta_untrusted_vlan_networks:

         type: list

         description: List of Contrail VLAN networks to use on the untrusted/access network.   The order and number of these must match the VLAN ID list.

         required: true

-        status: SUPPORTED

+        status: supported

         entry_schema:

           type: string

       ssc_a_untrusted_ip_0:

         type: string

         description: Fixed IP address to use as Untrusted/access fixed IP of A instance.

         required: true

-        status: SUPPORTED

+        status: supported

       perimeta_image_name:

         type: string

         description: Glance image for Perimeta instance

         required: true

-        status: SUPPORTED

+        status: supported

       mgmt_net_id:

         type: string

         description: Management network id

         required: true

-        status: SUPPORTED

+        status: supported

       int_untrusted_parent_net_id:

         type: string

         description: internal Untrusted/access parent network id

         required: true

-        status: SUPPORTED

+        status: supported

       perimeta_flavor_name:

         type: string

         description: Flavor to use for creating VM instances

         required: true

-        status: SUPPORTED

+        status: supported

     requirements:

     - dependency_perimeta_ssc_a_ha_0_port:

         capability: tosca.capabilities.Node

@@ -996,29 +996,29 @@ node_types:
         type: string

         description: Parent Contrail interface

         required: true

-        status: SUPPORTED

+        status: supported

       perimeta_v6_vip_0:

         type: string

         description: virtual IPv6 address associated with subinterfaces

         required: true

-        status: SUPPORTED

+        status: supported

       perimeta_subinterface_name_prefix:

         type: string

         description: Combined with subinterface_instance_index, this is used as the name of the subinterface resource

         required: true

-        status: SUPPORTED

+        status: supported

       perimeta_vlan_networks:

         type: list

         description: List of Contrail VLAN networks to use for the subinterfaces.   The order and number of these must match the VLAN ID list

         required: true

-        status: SUPPORTED

+        status: supported

         entry_schema:

           type: string

       perimeta_subinterface_instance_index:

         type: float

         description: Index of instance among multiple instances.  Use to retrieve correct parameter for this instance when passed all parameters for all instances.

         required: true

-        status: SUPPORTED

+        status: supported

         constraints:

         - in_range:

           - 1

@@ -1027,29 +1027,29 @@ node_types:
         type: string

         description: IPv4 address associated with subinterfaces

         required: true

-        status: SUPPORTED

+        status: supported

       perimeta_vip_0:

         type: string

         description: virtual IPv4 address associated with subinterfaces

         required: true

-        status: SUPPORTED

+        status: supported

       perimeta_vlan_ids:

         type: list

         description: List of VLAN IDs to use for subinterfaces

         required: true

-        status: SUPPORTED

+        status: supported

         entry_schema:

           type: string

       perimeta_mac_address:

         type: string

         description: MAC address to use for subinterface

         required: true

-        status: SUPPORTED

+        status: supported

       perimeta_v6_ip_0:

         type: string

         description: IPv6 address associated with subinterfaces

         required: true

-        status: SUPPORTED

+        status: supported

     requirements:

     - dependency_contrail_vmi_subinterface:

         capability: tosca.capabilities.Node

@@ -1084,12 +1084,12 @@ node_types:
         type: string

         description: Unique ID for this VF Module instance

         required: true

-        status: SUPPORTED

+        status: supported

       int_ha_network_plen:

         type: float

         description: Prefix length of subnet associated with internal HA network

         required: true

-        status: SUPPORTED

+        status: supported

         constraints:

         - in_range:

           - 0

@@ -1098,101 +1098,101 @@ node_types:
         type: string

         description: Service network unused port network UUID

         required: true

-        status: SUPPORTED

+        status: supported

       perimeta_server_group:

         type: string

         description: Server group to use for these VMs

         required: true

-        status: SUPPORTED

+        status: supported

       ssc_b_name_0:

         type: string

         description: Name of Perimeta VM B instance

         required: true

-        status: SUPPORTED

+        status: supported

       ssc_a_int_ha_ip_0:

         type: string

         description: Fixed IP address to use as HA IPs of A instance.

         required: true

-        status: SUPPORTED

+        status: supported

       ssc_b_untrusted_ip_0:

         type: string

         description: Fixed IP address to use as Untrusted/access fixed IP of B instance.

         required: true

-        status: SUPPORTED

+        status: supported

       ssc_b_mgmt_ip_0:

         type: string

         description: Fixed IP address to use as management IP of B instance.

         required: true

-        status: SUPPORTED

+        status: supported

       ssc_b_untrusted_parent_ip_0:

         type: string

         description: Fixed IP address to use as Untrusted/access fixed IP of B parent instance.

         required: true

-        status: SUPPORTED

+        status: supported

       vnf_name:

         type: string

         description: Unique name for this VNF instance

         required: true

-        status: SUPPORTED

+        status: supported

       perimeta_untrusted_vlan_ids:

         type: list

         description: List of VLAN IDs to use on the untrusted/access network

         required: true

-        status: SUPPORTED

+        status: supported

         entry_schema:

           type: string

       int_ha_net_id:

         type: string

         description: HA network id

         required: true

-        status: SUPPORTED

+        status: supported

       ssc_b_int_ha_ip_0:

         type: string

         description: Fixed IP address to use as HA IP of B instance.

         required: true

-        status: SUPPORTED

+        status: supported

       ssc_mgmt_vip_0:

         type: string

         description: Management virtual IP address.

         required: true

-        status: SUPPORTED

+        status: supported

       perimeta_keypair:

         type: string

         description: Keypair to use for accessing this Perimeta instance

         required: true

-        status: SUPPORTED

+        status: supported

       vnf_id:

         type: string

         description: VNF ID of this deployment

         required: true

-        status: SUPPORTED

+        status: supported

       availability_zone_1:

         type: string

         description: Availability zone for B instances.  May be the same as A instance.

         required: true

-        status: SUPPORTED

+        status: supported

       ssc_trusted_vip_0:

         type: string

         description: Trusted/core virtual IP address.

         required: true

-        status: SUPPORTED

+        status: supported

       ssc_untrusted_vip_0:

         type: string

         description: Untrusted/access virtual IP address

         required: true

-        status: SUPPORTED

+        status: supported

       perimeta_sec_groups:

         type: list

         description: List of security groups to add on trusted interfaces.

         required: true

-        status: SUPPORTED

+        status: supported

         entry_schema:

           type: string

       perimeta_untrusted_num_vlans:

         type: float

         description: number of VLANs to connect to the untrusted/access interface

         required: true

-        status: SUPPORTED

+        status: supported

         constraints:

         - in_range:

           - 1

@@ -1201,69 +1201,69 @@ node_types:
         type: string

         description: RF virtual IP address to use for SSC.

         required: true

-        status: SUPPORTED

+        status: supported

       ssc_b_trusted_ip_0:

         type: string

         description: Fixed IP address to use as Trusted/core fixed IPs of B instance.

         required: true

-        status: SUPPORTED

+        status: supported

       trusted_net_id:

         type: string

         description: Trusted/core network UUID

         required: true

-        status: SUPPORTED

+        status: supported

       ssc_untrusted_parent_vip_0:

         type: string

         description: Untrusted/access parent virtual IP address

         required: true

-        status: SUPPORTED

+        status: supported

       ssc_untrusted_v6_vip_0:

         type: string

         description: Untrusted/access alternate virtual IP address

         required: true

-        status: SUPPORTED

+        status: supported

       ssc_b_untrusted_v6_ip_0:

         type: string

         description: Fixed IP address to use as Untrusted/access alternate fixed IP of B instance.

         required: true

-        status: SUPPORTED

+        status: supported

       vm_role:

         type: string

         description: Role of these VMs

         required: true

-        status: SUPPORTED

+        status: supported

       perimeta_untrusted_vlan_networks:

         type: list

         description: List of Contrail VLAN networks to use on the untrusted/access network.   The order and number of these must match the VLAN ID list.

         required: true

-        status: SUPPORTED

+        status: supported

         entry_schema:

           type: string

       perimeta_image_name:

         type: string

         description: Glance image for Perimeta instance

         required: true

-        status: SUPPORTED

+        status: supported

       ssc_b_rf_ip_0:

         type: string

         description: RF fixed IP address to use for SSC B.

         required: true

-        status: SUPPORTED

+        status: supported

       mgmt_net_id:

         type: string

         description: Management network id

         required: true

-        status: SUPPORTED

+        status: supported

       int_untrusted_parent_net_id:

         type: string

         description: internal Untrusted/access parent network id

         required: true

-        status: SUPPORTED

+        status: supported

       perimeta_flavor_name:

         type: string

         description: Flavor to use for creating VM instances

         required: true

-        status: SUPPORTED

+        status: supported

     requirements:

     - dependency_perimeta_ssc_b_trusted_0_port:

         capability: tosca.capabilities.Node

@@ -2063,12 +2063,12 @@ node_types:
         type: string

         description: Unique ID for this VF Module instance

         required: true

-        status: SUPPORTED

+        status: supported

       int_ha_network_plen:

         type: float

         description: Prefix length of subnet associated with internal HA network

         required: true

-        status: SUPPORTED

+        status: supported

         constraints:

         - in_range:

           - 0

@@ -2077,29 +2077,29 @@ node_types:
         type: string

         description: JSON orchestration template configuration for instance.

         required: true

-        status: SUPPORTED

+        status: supported

       vnf_name:

         type: string

         description: Unique name for this VNF instance

         required: true

-        status: SUPPORTED

+        status: supported

       perimeta_untrusted_vlan_ids:

         type: list

         description: List of VLAN IDs to use on the untrusted/access network

         required: true

-        status: SUPPORTED

+        status: supported

         entry_schema:

           type: string

       int_ha_net_id:

         type: string

         description: HA network id

         required: true

-        status: SUPPORTED

+        status: supported

       perimeta_instance_index:

         type: float

         description: Index of instance among multiple instances.  Use to retrieve correct parameter for this instance when passed all parameters for all instances.

         required: true

-        status: SUPPORTED

+        status: supported

         constraints:

         - in_range:

           - 0

@@ -2108,50 +2108,50 @@ node_types:
         type: string

         description: Keypair to use for accessing this Perimeta instance

         required: true

-        status: SUPPORTED

+        status: supported

       perimeta_server_groups:

         type: list

         description: Server groups to use for these VMs

         required: true

-        status: SUPPORTED

+        status: supported

         entry_schema:

           type: string

       vnf_id:

         type: string

         description: VNF ID of this deployment

         required: true

-        status: SUPPORTED

+        status: supported

       availability_zone_0:

         type: string

         description: Availability zone for A instances.

         required: true

-        status: SUPPORTED

+        status: supported

       rtp_msc_mgmt_vips:

         type: list

         description: List of management virtual IP addresses for all instances.

         required: true

-        status: SUPPORTED

+        status: supported

         entry_schema:

           type: string

       perimeta_sec_groups:

         type: list

         description: List of security groups to add on trusted interfaces.

         required: true

-        status: SUPPORTED

+        status: supported

         entry_schema:

           type: string

       rtp_msc_untrusted_parent_vips:

         type: list

         description: List of Untrusted/access parent virtual IP addresses for all instances.

         required: true

-        status: SUPPORTED

+        status: supported

         entry_schema:

           type: string

       perimeta_untrusted_num_vlans:

         type: float

         description: number of VLANs to connect to the untrusted/access interface

         required: true

-        status: SUPPORTED

+        status: supported

         constraints:

         - in_range:

           - 1

@@ -2160,114 +2160,114 @@ node_types:
         type: list

         description: List of fixed IP addresses to use as HA IPs of A instances.

         required: true

-        status: SUPPORTED

+        status: supported

         entry_schema:

           type: string

       rtp_msc_a_untrusted_parent_ips:

         type: list

         description: List of fixed IP addresses to use as Untrusted/access parent fixed IPs of A instances.

         required: true

-        status: SUPPORTED

+        status: supported

         entry_schema:

           type: string

       rtp_msc_a_trusted_ips:

         type: list

         description: List of fixed IP addresses to use as Trusted/core fixed IPs of A instances.

         required: true

-        status: SUPPORTED

+        status: supported

         entry_schema:

           type: string

       rtp_msc_untrusted_vips:

         type: list

         description: List of Untrusted/access virtual IP addresses for all instances.

         required: true

-        status: SUPPORTED

+        status: supported

         entry_schema:

           type: string

       trusted_net_id:

         type: string

         description: Trusted/core network UUID

         required: true

-        status: SUPPORTED

+        status: supported

       rtp_msc_b_int_ha_ips:

         type: list

         description: List of fixed IP addresses to use as HA IPs of B instances.

         required: true

-        status: SUPPORTED

+        status: supported

         entry_schema:

           type: string

       rtp_msc_a_mgmt_ips:

         type: list

         description: List of fixed IP addresses to use as management IPs of A instances.

         required: true

-        status: SUPPORTED

+        status: supported

         entry_schema:

           type: string

       rtp_msc_a_untrusted_ips:

         type: list

         description: List of fixed IP addresses to use as Untrusted/access fixed IPs of A instances.

         required: true

-        status: SUPPORTED

+        status: supported

         entry_schema:

           type: string

       vm_role:

         type: string

         description: Role of these VMs

         required: true

-        status: SUPPORTED

+        status: supported

       rtp_msc_untrusted_v6_vips:

         type: list

         description: List of Untrusted/access alternate virtual IP addresses for all instances.

         required: true

-        status: SUPPORTED

+        status: supported

         entry_schema:

           type: string

       perimeta_untrusted_vlan_networks:

         type: list

         description: List of Contrail VLAN networks to use on the untrusted/access network.   The order and number of these must match the VLAN ID list.

         required: true

-        status: SUPPORTED

+        status: supported

         entry_schema:

           type: string

       rtp_msc_a_untrusted_v6_ips:

         type: list

         description: List of fixed IP addresses to use as Untrusted/access alternate fixed IPs of A instances.

         required: true

-        status: SUPPORTED

+        status: supported

         entry_schema:

           type: string

       perimeta_image_name:

         type: string

         description: Glance image for Perimeta instance

         required: true

-        status: SUPPORTED

+        status: supported

       mgmt_net_id:

         type: string

         description: Management network id

         required: true

-        status: SUPPORTED

+        status: supported

       int_untrusted_parent_net_id:

         type: string

         description: internal Untrusted/access parent network id

         required: true

-        status: SUPPORTED

+        status: supported

       rtp_msc_a_names:

         type: list

         description: List of names of Perimeta VM A instances, indexed by perimeta_instance_index

         required: true

-        status: SUPPORTED

+        status: supported

         entry_schema:

           type: string

       perimeta_flavor_name:

         type: string

         description: Flavor to use for creating VM instances

         required: true

-        status: SUPPORTED

+        status: supported

       rtp_msc_trusted_vips:

         type: list

         description: List of Trusted/core virtual IP addresses for all instances.

         required: true

-        status: SUPPORTED

+        status: supported

         entry_schema:

           type: string

     requirements:

@@ -2901,12 +2901,12 @@ node_types:
         type: string

         description: Unique ID for this VF Module instance

         required: true

-        status: SUPPORTED

+        status: supported

       int_ha_network_plen:

         type: float

         description: Prefix length of subnet associated with internal HA network

         required: true

-        status: SUPPORTED

+        status: supported

         constraints:

         - in_range:

           - 0

@@ -2915,52 +2915,52 @@ node_types:
         type: list

         description: List of fixed IP addresses to use as Untrusted/access alternate fixed IPs of B instances.

         required: true

-        status: SUPPORTED

+        status: supported

         entry_schema:

           type: string

       rtp_msc_b_mgmt_ips:

         type: list

         description: List of fixed IP addresses to use as management IPs of B instances.

         required: true

-        status: SUPPORTED

+        status: supported

         entry_schema:

           type: string

       vnf_name:

         type: string

         description: Unique name for this VNF instance

         required: true

-        status: SUPPORTED

+        status: supported

       perimeta_untrusted_vlan_ids:

         type: list

         description: List of VLAN IDs to use on the untrusted/access network

         required: true

-        status: SUPPORTED

+        status: supported

         entry_schema:

           type: string

       rtp_msc_b_names:

         type: list

         description: List of names of Perimeta VM B instances, indexed by perimeta_instance_index

         required: true

-        status: SUPPORTED

+        status: supported

         entry_schema:

           type: string

       rtp_msc_b_untrusted_ips:

         type: list

         description: List of fixed IP addresses to use as Untrusted/access fixed IPs of B instances.

         required: true

-        status: SUPPORTED

+        status: supported

         entry_schema:

           type: string

       int_ha_net_id:

         type: string

         description: HA network id

         required: true

-        status: SUPPORTED

+        status: supported

       perimeta_instance_index:

         type: float

         description: Index of instance among multiple instances.  Use to retrieve correct parameter for this instance when passed all parameters for all instances.

         required: true

-        status: SUPPORTED

+        status: supported

         constraints:

         - in_range:

           - 0

@@ -2969,50 +2969,50 @@ node_types:
         type: string

         description: Keypair to use for accessing this Perimeta instance

         required: true

-        status: SUPPORTED

+        status: supported

       perimeta_server_groups:

         type: list

         description: Server groups to use for these VMs

         required: true

-        status: SUPPORTED

+        status: supported

         entry_schema:

           type: string

       vnf_id:

         type: string

         description: VNF ID of this deployment

         required: true

-        status: SUPPORTED

+        status: supported

       availability_zone_1:

         type: string

         description: Availability zone for B instances.  May be the same as A instance.

         required: true

-        status: SUPPORTED

+        status: supported

       rtp_msc_mgmt_vips:

         type: list

         description: List of management virtual IP addresses for all instances.

         required: true

-        status: SUPPORTED

+        status: supported

         entry_schema:

           type: string

       perimeta_sec_groups:

         type: list

         description: List of security groups to add on trusted interfaces.

         required: true

-        status: SUPPORTED

+        status: supported

         entry_schema:

           type: string

       rtp_msc_untrusted_parent_vips:

         type: list

         description: List of Untrusted/access parent virtual IP addresses for all instances.

         required: true

-        status: SUPPORTED

+        status: supported

         entry_schema:

           type: string

       perimeta_untrusted_num_vlans:

         type: float

         description: number of VLANs to connect to the untrusted/access interface

         required: true

-        status: SUPPORTED

+        status: supported

         constraints:

         - in_range:

           - 1

@@ -3021,86 +3021,86 @@ node_types:
         type: list

         description: List of fixed IP addresses to use as HA IPs of A instances.

         required: true

-        status: SUPPORTED

+        status: supported

         entry_schema:

           type: string

       rtp_msc_b_trusted_ips:

         type: list

         description: List of fixed IP addresses to use as Trusted/core fixed IPs of B instances.

         required: true

-        status: SUPPORTED

+        status: supported

         entry_schema:

           type: string

       rtp_msc_untrusted_vips:

         type: list

         description: List of Untrusted/access virtual IP addresses for all instances.

         required: true

-        status: SUPPORTED

+        status: supported

         entry_schema:

           type: string

       trusted_net_id:

         type: string

         description: Trusted/core network UUID

         required: true

-        status: SUPPORTED

+        status: supported

       rtp_msc_b_int_ha_ips:

         type: list

         description: List of fixed IP addresses to use as HA IPs of B instances.

         required: true

-        status: SUPPORTED

+        status: supported

         entry_schema:

           type: string

       vm_role:

         type: string

         description: Role of these VMs

         required: true

-        status: SUPPORTED

+        status: supported

       rtp_msc_untrusted_v6_vips:

         type: list

         description: List of Untrusted/access alternate virtual IP addresses for all instances.

         required: true

-        status: SUPPORTED

+        status: supported

         entry_schema:

           type: string

       perimeta_untrusted_vlan_networks:

         type: list

         description: List of Contrail VLAN networks to use on the untrusted/access network.   The order and number of these must match the VLAN ID list.

         required: true

-        status: SUPPORTED

+        status: supported

         entry_schema:

           type: string

       perimeta_image_name:

         type: string

         description: Glance image for Perimeta instance

         required: true

-        status: SUPPORTED

+        status: supported

       rtp_msc_b_untrusted_parent_ips:

         type: list

         description: List of fixed IP addresses to use as Untrusted/access parent fixed IPs of B instances.

         required: true

-        status: SUPPORTED

+        status: supported

         entry_schema:

           type: string

       mgmt_net_id:

         type: string

         description: Management network id

         required: true

-        status: SUPPORTED

+        status: supported

       int_untrusted_parent_net_id:

         type: string

         description: internal Untrusted/access parent network id

         required: true

-        status: SUPPORTED

+        status: supported

       perimeta_flavor_name:

         type: string

         description: Flavor to use for creating VM instances

         required: true

-        status: SUPPORTED

+        status: supported

       rtp_msc_trusted_vips:

         type: list

         description: List of Trusted/core virtual IP addresses for all instances.

         required: true

-        status: SUPPORTED

+        status: supported

         entry_schema:

           type: string

     requirements:

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/recursive/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/recursive/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
index 85dac74ae7..0f1841b10f 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/recursive/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/recursive/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -12,61 +12,61 @@ node_types:
         type: string
         description: flavor name of PCRF CM instance
         required: true
-        status: SUPPORTED
+        status: supported
       availabilityzone_name:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_image_name:
         type: string
         description: PCRF CM image name
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_vol:
         type: string
         description: CPS Cluman Cinder Volume
         required: true
-        status: SUPPORTED
+        status: supported
       security_group_name:
         type: string
         description: the name of security group
         required: true
-        status: SUPPORTED
+        status: supported
       cps_net_ip:
         type: string
         description: CPS network ip
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_server_name:
         type: string
         description: PCRF CM server name
         required: true
-        status: SUPPORTED
+        status: supported
       cps_net_name:
         type: string
         description: CPS network name
         required: true
-        status: SUPPORTED
+        status: supported
       cps_net_mask:
         type: string
         description: CPS network mask
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_ip:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_name:
         type: string
         description: OAM network name
         required: true
-        status: SUPPORTED
+        status: supported
     attributes:
       server_pcm_id:
         type: string
         description: the pcm nova service id
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_pcm_port_00:
         capability: tosca.capabilities.Node
@@ -527,82 +527,82 @@ node_types:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_gw:
         type: string
         description: CPS network gateway
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_image_name:
         type: string
         description: PCRF CM image name
         required: true
-        status: SUPPORTED
+        status: supported
       cps_net_ips:
         type: string
         description: CPS network ip
         required: true
-        status: SUPPORTED
+        status: supported
       security_group_name:
         type: string
         description: the name of security group
         required: true
-        status: SUPPORTED
+        status: supported
       cps_net_ip:
         type: string
         description: CPS network ip
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_volumes:
         type: string
         description: CPS Cluman Cinder Volume
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_flavor_name:
         type: string
         description: flavor name of PCRF CM instance
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_vol:
         type: string
         description: CPS Cluman Cinder Volume
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_server_name:
         type: string
         description: PCRF CM server name
         required: true
-        status: SUPPORTED
+        status: supported
       cps_net_name:
         type: string
         description: CPS network name
         required: true
-        status: SUPPORTED
+        status: supported
       cps_net_mask:
         type: string
         description: CPS network mask
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_ip:
         type: string
         description: OAM network ip
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_mask:
         type: string
         description: CPS network mask
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_name:
         type: string
         description: OAM network name
         required: true
-        status: SUPPORTED
+        status: supported
     attributes:
       server_pcm_id:
         type: string
         description: the pcm nova service id
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_pcm_port_1:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resourceGroupIndexVar/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resourceGroupIndexVar/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
index c6020ac428..9a6ec4d01e 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resourceGroupIndexVar/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resourceGroupIndexVar/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -12,12 +12,12 @@ node_types:
         type: string
         description: Unique ID for this VF_MODULE instance
         required: true
-        status: SUPPORTED
+        status: supported
       vf_name:
         type: string
         description: The VF Name; defaults to VMVM for the virtual MVM VNF.
         required: true
-        status: SUPPORTED
+        status: supported
         constraints:
         - pattern: '[a-zA-Z0-9]+'
         - max_length: 4
@@ -26,12 +26,12 @@ node_types:
         type: string
         description: The cloud zone for this VF instance
         required: true
-        status: SUPPORTED
+        status: supported
       vf_instance_num:
         type: string
         description: The number for this VF instance
         required: true
-        status: SUPPORTED
+        status: supported
         constraints:
         - pattern: '[0-9]+'
         - max_length: 2
@@ -40,70 +40,70 @@ node_types:
         type: string
         description: Virtual management network ip address
         required: true
-        status: SUPPORTED
+        status: supported
       indx:
         type: float
         description: Index of the current instance
         required: true
-        status: SUPPORTED
+        status: supported
       mvs_mgmt_ip_0:
         type: list
         description: List of Management network IP addresses for IPv4
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       flavor:
         type: string
         description: Server flavor
         required: true
-        status: SUPPORTED
+        status: supported
       key_name:
         type: string
         description: SSH key name
         required: true
-        status: SUPPORTED
+        status: supported
       vnf_id:
         type: string
         description: Unique ID for this VF instance
         required: true
-        status: SUPPORTED
+        status: supported
       availability_zone_0:
         type: list
         description: List of Availability Zone IDs or Names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       mgmt_net_id:
         type: string
         description: Neutron UUID for the Management network
         required: true
-        status: SUPPORTED
+        status: supported
       vm_instance_num:
         type: list
         description: VM instance number list must be a list of three-digit numeric value
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       bootimage:
         type: string
         description: Master bootimage volume id
         required: true
-        status: SUPPORTED
+        status: supported
       sec_groups:
         type: list
         description: Security groups
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vf_component:
         type: string
         description: The component that this VF instance is running
         required: true
-        status: SUPPORTED
+        status: supported
         constraints:
         - pattern: '[a-zA-Z0-9]+'
         - max_length: 3
@@ -111,10 +111,10 @@ node_types:
     attributes:
       vnfci_id_2:
         type: string
-        status: SUPPORTED
+        status: supported
       vnfci_id_1:
         type: string
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_vnfci:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resourceGroupMDNS/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resourceGroupMDNS/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
index 8430f65985..8794f680dc 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resourceGroupMDNS/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resourceGroupMDNS/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -12,95 +12,95 @@ node_types:
         type: string
         description: Unique ID for this VF module instance
         required: true
-        status: SUPPORTED
+        status: supported
       name_with_index:
         type: string
         description: name parameter which will include the index value
         required: true
-        status: SUPPORTED
+        status: supported
       dns_int_bearer_ips:
         type: list
         description: DNS Bearer IP list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vnf_name:
         type: string
         description: Unique name for this VF instance
         required: true
-        status: SUPPORTED
+        status: supported
       index:
         type: float
         description: index parameter
         required: true
-        status: SUPPORTED
+        status: supported
       security_group:
         type: string
         description: security group
         required: true
-        status: SUPPORTED
+        status: supported
       oam_protected_net_name:
         type: string
         description: OAM network where instaces will connect
         required: true
-        status: SUPPORTED
+        status: supported
       dns_oam_protected_ips:
         type: list
         description: DNS OAM IP list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       dns_key:
         type: string
         description: server key
         required: true
-        status: SUPPORTED
+        status: supported
       int_bearer_net_name:
         type: string
         description: Bearer network where instaces will connect
         required: true
-        status: SUPPORTED
+        status: supported
       route_eth0:
         type: string
         description: OAM network routes
         required: true
-        status: SUPPORTED
+        status: supported
       dns_names:
         type: list
         description: server name
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vnf_id:
         type: string
         description: Unique ID for this VF instance
         required: true
-        status: SUPPORTED
+        status: supported
       availability_zone_0:
         type: string
         description: availability zone ID or Name
         required: true
-        status: SUPPORTED
+        status: supported
       dns_image_name:
         type: string
         description: server image
         required: true
-        status: SUPPORTED
+        status: supported
       dns_int_bearer_ipv6_ips:
         type: list
         description: fixed IPv6 assignment for VM's on the Bearer network
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       dns_flavor_name:
         type: string
         description: server flavor
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_dns_oam_protected_0_port:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resource_group/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resource_group/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
index c6020ac428..9a6ec4d01e 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resource_group/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resource_group/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -12,12 +12,12 @@ node_types:
         type: string
         description: Unique ID for this VF_MODULE instance
         required: true
-        status: SUPPORTED
+        status: supported
       vf_name:
         type: string
         description: The VF Name; defaults to VMVM for the virtual MVM VNF.
         required: true
-        status: SUPPORTED
+        status: supported
         constraints:
         - pattern: '[a-zA-Z0-9]+'
         - max_length: 4
@@ -26,12 +26,12 @@ node_types:
         type: string
         description: The cloud zone for this VF instance
         required: true
-        status: SUPPORTED
+        status: supported
       vf_instance_num:
         type: string
         description: The number for this VF instance
         required: true
-        status: SUPPORTED
+        status: supported
         constraints:
         - pattern: '[0-9]+'
         - max_length: 2
@@ -40,70 +40,70 @@ node_types:
         type: string
         description: Virtual management network ip address
         required: true
-        status: SUPPORTED
+        status: supported
       indx:
         type: float
         description: Index of the current instance
         required: true
-        status: SUPPORTED
+        status: supported
       mvs_mgmt_ip_0:
         type: list
         description: List of Management network IP addresses for IPv4
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       flavor:
         type: string
         description: Server flavor
         required: true
-        status: SUPPORTED
+        status: supported
       key_name:
         type: string
         description: SSH key name
         required: true
-        status: SUPPORTED
+        status: supported
       vnf_id:
         type: string
         description: Unique ID for this VF instance
         required: true
-        status: SUPPORTED
+        status: supported
       availability_zone_0:
         type: list
         description: List of Availability Zone IDs or Names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       mgmt_net_id:
         type: string
         description: Neutron UUID for the Management network
         required: true
-        status: SUPPORTED
+        status: supported
       vm_instance_num:
         type: list
         description: VM instance number list must be a list of three-digit numeric value
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       bootimage:
         type: string
         description: Master bootimage volume id
         required: true
-        status: SUPPORTED
+        status: supported
       sec_groups:
         type: list
         description: Security groups
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vf_component:
         type: string
         description: The component that this VF instance is running
         required: true
-        status: SUPPORTED
+        status: supported
         constraints:
         - pattern: '[a-zA-Z0-9]+'
         - max_length: 3
@@ -111,10 +111,10 @@ node_types:
     attributes:
       vnfci_id_2:
         type: string
-        status: SUPPORTED
+        status: supported
       vnfci_id_1:
         type: string
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_vnfci:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resource_group_with_dynamic_count/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resource_group_with_dynamic_count/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
index 4bb275609f..132bd4972f 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resource_group_with_dynamic_count/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resource_group_with_dynamic_count/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -12,12 +12,12 @@ node_types:
         type: string
         description: Unique ID for this VF_MODULE instance
         required: true
-        status: SUPPORTED
+        status: supported
       vf_name:
         type: string
         description: The VF Name; defaults to VMVM for the virtual MVM VNF.
         required: true
-        status: SUPPORTED
+        status: supported
         constraints:
         - pattern: '[a-zA-Z0-9]+'
         - max_length: 4
@@ -26,12 +26,12 @@ node_types:
         type: string
         description: The cloud zone for this VF instance
         required: true
-        status: SUPPORTED
+        status: supported
       vf_instance_num:
         type: string
         description: The number for this VF instance
         required: true
-        status: SUPPORTED
+        status: supported
         constraints:
         - pattern: '[0-9]+'
         - max_length: 2
@@ -40,70 +40,70 @@ node_types:
         type: string
         description: Virtual management network ip address
         required: true
-        status: SUPPORTED
+        status: supported
       indx:
         type: float
         description: Index of the current instance
         required: true
-        status: SUPPORTED
+        status: supported
       mvs_mgmt_ip_0:
         type: list
         description: List of Management network IP addresses for IPv4
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       flavor:
         type: string
         description: Server flavor
         required: true
-        status: SUPPORTED
+        status: supported
       key_name:
         type: string
         description: SSH key name
         required: true
-        status: SUPPORTED
+        status: supported
       vnf_id:
         type: string
         description: Unique ID for this VF instance
         required: true
-        status: SUPPORTED
+        status: supported
       availability_zone_0:
         type: list
         description: List of Availability Zone IDs or Names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       mgmt_net_id:
         type: string
         description: Neutron UUID for the Management network
         required: true
-        status: SUPPORTED
+        status: supported
       vm_instance_num:
         type: list
         description: VM instance number list must be a list of three-digit numeric value
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       bootimage:
         type: string
         description: Master bootimage volume id
         required: true
-        status: SUPPORTED
+        status: supported
       sec_groups:
         type: list
         description: Security groups
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vf_component:
         type: string
         description: The component that this VF instance is running
         required: true
-        status: SUPPORTED
+        status: supported
         constraints:
         - pattern: '[a-zA-Z0-9]+'
         - max_length: 3
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/reusenestedfrommultibase/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/reusenestedfrommultibase/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
index f890787ebd..fe2721b9af 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/reusenestedfrommultibase/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/reusenestedfrommultibase/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -12,72 +12,72 @@ node_types:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_gw:
         type: string
         description: CPS network gateway
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_image_name:
         type: string
         description: PCRF CM image name
         required: true
-        status: SUPPORTED
+        status: supported
       security_group_name:
         type: string
         description: the name of security group
         required: true
-        status: SUPPORTED
+        status: supported
       cps_net_ip:
         type: string
         description: CPS network ip
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_flavor_name:
         type: string
         description: flavor name of PCRF CM instance
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_vol:
         type: string
         description: CPS Cluman Cinder Volume
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_server_name:
         type: string
         description: PCRF CM server name
         required: true
-        status: SUPPORTED
+        status: supported
       cps_net_name:
         type: string
         description: CPS network name
         required: true
-        status: SUPPORTED
+        status: supported
       cps_net_mask:
         type: string
         description: CPS network mask
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_ip:
         type: string
         description: OAM network ip
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_mask:
         type: string
         description: CPS network mask
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_name:
         type: string
         description: OAM network name
         required: true
-        status: SUPPORTED
+        status: supported
     attributes:
       server_pcm_id:
         type: string
         description: the pcm nova service id
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_pcm_port_1:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/single/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/single/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
index f890787ebd..fe2721b9af 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/single/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/single/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -12,72 +12,72 @@ node_types:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_gw:
         type: string
         description: CPS network gateway
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_image_name:
         type: string
         description: PCRF CM image name
         required: true
-        status: SUPPORTED
+        status: supported
       security_group_name:
         type: string
         description: the name of security group
         required: true
-        status: SUPPORTED
+        status: supported
       cps_net_ip:
         type: string
         description: CPS network ip
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_flavor_name:
         type: string
         description: flavor name of PCRF CM instance
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_vol:
         type: string
         description: CPS Cluman Cinder Volume
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_server_name:
         type: string
         description: PCRF CM server name
         required: true
-        status: SUPPORTED
+        status: supported
       cps_net_name:
         type: string
         description: CPS network name
         required: true
-        status: SUPPORTED
+        status: supported
       cps_net_mask:
         type: string
         description: CPS network mask
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_ip:
         type: string
         description: OAM network ip
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_mask:
         type: string
         description: CPS network mask
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_name:
         type: string
         description: OAM network name
         required: true
-        status: SUPPORTED
+        status: supported
     attributes:
       server_pcm_id:
         type: string
         description: the pcm nova service id
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_pcm_port_1:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/multiHeat/referencedHeatResources/expectedOutput/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/multiHeat/referencedHeatResources/expectedOutput/GlobalSubstitutionTypesServiceTemplate.yaml
index d05be23ba6..01b757dee1 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/multiHeat/referencedHeatResources/expectedOutput/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/multiHeat/referencedHeatResources/expectedOutput/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -12,13 +12,13 @@ node_types:
         type: string
         description: cmaui metadata
         required: true
-        status: SUPPORTED
+        status: supported
       oam_flavor:
         type: string
         description: OAM flavor name
         required: false
         default: lc.xlarge4
-        status: SUPPORTED
+        status: supported
       eca_eca_mgmt_ips:
         type: list
         description: internal eca_mgmt network ips for eca VM
@@ -26,7 +26,7 @@ node_types:
         default:
         - 172.25.137.242
         - 172.25.137.243
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       eca_mgmt_net_name:
@@ -34,80 +34,80 @@ node_types:
         description: the name of the internal network
         required: false
         default: int_mms_eca_mgmt_net_1
-        status: SUPPORTED
+        status: supported
       ECA_OAM_volume_type:
         type: string
         description: the name of the target volume backend
         required: false
         default: Platinum
-        status: SUPPORTED
+        status: supported
       arb_eca_mgmt_ips:
         type: list
         description: internal eca_mgmt network ips for arb VM
         required: false
         default:
         - 172.25.137.244
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       networks:
         type: string
         description: cmaui network name
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_name:
         type: string
         description: cmaui name
         required: true
-        status: SUPPORTED
+        status: supported
       arb_volume_size:
         type: float
         description: the size of the ARB volume
         required: false
         default: 40
-        status: SUPPORTED
+        status: supported
       vnf_id:
         type: string
         description: Unique ID for this VNF instance
         required: false
         default: This_is_ths_MMSC-ECA_id
-        status: SUPPORTED
+        status: supported
       availability_zone_0:
         type: string
         description: availabilityzone name
         required: false
         default: nova
-        status: SUPPORTED
+        status: supported
       oam_image_name:
         type: string
         description: the OAM image name
         required: false
         default: ECABASE
-        status: SUPPORTED
+        status: supported
       oam_volume_size:
         type: float
         description: the size of the OAM volume
         required: false
         default: 1800
-        status: SUPPORTED
+        status: supported
       swift_eca_url:
         type: string
         description: Base URL for eca swift object store
         required: false
         default: http://object-store.rdm2.cci.com:8080/v1/AUTH_1bbab536a19b4756926e7d0ec1eb543c/eca
-        status: SUPPORTED
+        status: supported
       oam_net_name:
         type: string
         description: the name of the oam network
         required: false
         default: oam_protected_net_0
-        status: SUPPORTED
+        status: supported
       ARB_volume_type:
         type: string
         description: the name of the target volume backend
         required: false
         default: Platinum
-        status: SUPPORTED
+        status: supported
       eca_names:
         type: list
         description: the names of the OAM1,OAM2 VM instances
@@ -115,7 +115,7 @@ node_types:
         default:
         - ZRDM1MMSC02OAM001
         - ZRDM1MMSC02OAM002
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       arbiter_flavor:
@@ -123,7 +123,7 @@ node_types:
         description: arbiter flavor name
         required: false
         default: m1.large2
-        status: SUPPORTED
+        status: supported
       eca_oam_ips:
         type: list
         description: the ips of oam networks for eca VM
@@ -131,7 +131,7 @@ node_types:
         default:
         - 107.250.172.44
         - 107.250.172.45
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       security_group_name:
@@ -139,49 +139,49 @@ node_types:
         description: the name of security group
         required: false
         default: mmsc_security_group_1
-        status: SUPPORTED
+        status: supported
       user_data:
         type: string
         description: cmaui user data
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_image:
         type: string
         description: cmaui image
         required: true
-        status: SUPPORTED
+        status: supported
       arb_names:
         type: list
         description: the names of the arbiter VM instances
         required: false
         default:
         - ZRDM1MMSC02ARB001
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       cmaui_flavor:
         type: string
         description: cmaui flavor name
         required: true
-        status: SUPPORTED
+        status: supported
       user_data_format:
         type: string
         description: cmaui user data
         required: true
-        status: SUPPORTED
+        status: supported
       eca_oam_gateway:
         type: string
         description: the ip of oam gateway
         required: false
         default: 107.250.172.1
-        status: SUPPORTED
+        status: supported
       arb_oam_ips:
         type: list
         description: oam network ips for eca VM
         required: false
         default:
         - 107.250.172.46
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
     requirements:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/nested/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/nested/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
index afe8374ddc..3a9cff6821 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/nested/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/nested/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -12,57 +12,57 @@ node_types:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       p1:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       p2:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_image:
         type: string
         description: Image for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       template_PortTuple_LB1:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_flavor:
         type: string
         description: Flavor for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       oam_sec_group_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       lb_st_interface_type_oam:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       security_group_name:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       availability_zone_0:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_oam_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_template_VMInt_OAM_lb_1:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/nestedArrayParam/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/nestedArrayParam/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
index 2682002f72..c2c8cf11e1 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/nestedArrayParam/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/nestedArrayParam/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -12,58 +12,58 @@ node_types:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       p1:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       p2:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_image:
         type: string
         description: Image for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       template_PortTuple_LB1:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_flavor:
         type: string
         description: Flavor for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       oam_sec_group_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       lb_st_interface_type_oam:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       security_group_name:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       availability_zone_0:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_oam_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_template_VMInt_OAM_lb_1:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/nestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/nestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
index 276d388db4..1a0d8c1411 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/nestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/nestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -12,57 +12,57 @@ node_types:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       p1:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       p2:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       template_PortTuple_LB1:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_image:
         type: string
         description: Image for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       lb_st_interface_type_oam:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       oam_sec_group_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_flavor:
         type: string
         description: Flavor for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       security_group_name:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       availability_zone_0:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_oam_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_server_cmaui_1:
         capability: tosca.capabilities.Node
@@ -1764,57 +1764,57 @@ node_types:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       p1:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       p2:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       template_PortTuple_LB1:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_image:
         type: string
         description: Image for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       lb_st_interface_type_oam:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       oam_sec_group_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_flavor:
         type: string
         description: Flavor for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       security_group_name:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       availability_zone_0:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_oam_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_server_cmaui_2:
         capability: tosca.capabilities.Node
@@ -3090,60 +3090,60 @@ node_types:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       p1:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       p2:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       template_PortTuple_LB1:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_image:
         type: string
         description: Image for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       lb_st_interface_type_oam:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       oam_sec_group_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_flavor:
         type: string
         description: Flavor for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       indx:
         type: float
         required: true
-        status: SUPPORTED
+        status: supported
       security_group_name:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       availability_zone_0:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_oam_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_template_VMInt_OAM_lb_5:
         capability: tosca.capabilities.Node
@@ -3993,56 +3993,56 @@ node_types:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       p1:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       p2:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       template_PortTuple_LB1:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_image:
         type: string
         description: Image for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       lb_st_interface_type_oam:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       oam_sec_group_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_flavor:
         type: string
         description: Flavor for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       security_group_name:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       availability_zone_0:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_oam_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_template_VMInt_OAM_lb_7:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/shared/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/shared/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
index fe1958c2ac..9b610615d9 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/shared/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/shared/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -12,75 +12,75 @@ node_types:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       p2:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       abc_flavor:
         type: string
         description: Flavor for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       template_PortTuple_LB1:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       oam_sec_group_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       lb_st_interface_type_oam:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       abc_names:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       security_group_name:
         description: not impotrtant
         required: true
-        status: SUPPORTED
+        status: supported
       shared_network_id1:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_image:
         type: string
         description: Image for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_flavor:
         type: string
         description: Flavor for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       availability_zone_0:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       abc_oam_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_oam_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       abc_image:
         type: string
         description: Image for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_server_cmaui_1:
         capability: tosca.capabilities.Node
@@ -923,41 +923,41 @@ node_types:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       p1:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_image:
         type: string
         description: Image for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_flavor:
         type: string
         description: Flavor for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       security_group_name:
         description: not impotrtant
         required: true
-        status: SUPPORTED
+        status: supported
       availability_zone_0:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       abc_oam_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_oam_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_server_cmaui:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/sharedNestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/sharedNestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
index 1b396f22f4..6afbd6188f 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/sharedNestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/sharedNestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -12,57 +12,57 @@ node_types:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       p2:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       template_PortTuple_LB1:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_image:
         type: string
         description: Image for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       lb_st_interface_type_oam:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       oam_sec_group_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_flavor:
         type: string
         description: Flavor for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       security_group_name:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       availability_zone_0:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_oam_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       shared_test_net:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_template_VMInt_OAM_lb_1:
         capability: tosca.capabilities.Node
@@ -1849,57 +1849,57 @@ node_types:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       p2:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       template_PortTuple_LB1:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_image:
         type: string
         description: Image for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       lb_st_interface_type_oam:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       oam_sec_group_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_flavor:
         type: string
         description: Flavor for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       security_group_name:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       availability_zone_0:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_oam_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       shared_test_net:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_server_cmaui_2:
         capability: tosca.capabilities.Node
@@ -3175,60 +3175,60 @@ node_types:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       p2:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       template_PortTuple_LB1:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_image:
         type: string
         description: Image for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       lb_st_interface_type_oam:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       oam_sec_group_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_flavor:
         type: string
         description: Flavor for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       indx:
         type: float
         required: true
-        status: SUPPORTED
+        status: supported
       security_group_name:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       availability_zone_0:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_oam_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       shared_test_net:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_template_VMInt_OAM_lb_5:
         capability: tosca.capabilities.Node
@@ -4078,56 +4078,56 @@ node_types:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       p2:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       template_PortTuple_LB1:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_image:
         type: string
         description: Image for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       lb_st_interface_type_oam:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       oam_sec_group_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_flavor:
         type: string
         description: Flavor for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       security_group_name:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       availability_zone_0:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_oam_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       shared_test_net:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_template_VMInt_OAM_lb_7:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/nested/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/nested/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
index 8ab703915e..0a592141bb 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/nested/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/nested/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -12,96 +12,96 @@ node_types:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       p1:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       p2:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       p3:
         type: string
         description: port resource
         required: true
-        status: SUPPORTED
+        status: supported
       p4:
         type: string
         description: port resource
         required: true
-        status: SUPPORTED
+        status: supported
       template_PortTuple_LB1:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       oam_sec_group_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       lb_st_interface_type_oam:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       virtual_ip_address:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       security_group_name:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vlan_ids:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_image:
         type: string
         description: Image for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       virtual_ipv6_address:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_flavor:
         type: string
         description: Flavor for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       lb_st_vlan_type_oam:
         type: string
         description: dummy
         required: true
-        status: SUPPORTED
+        status: supported
       mac_address:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       availability_zone_0:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_name_prefix:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_instance_index:
         type: float
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_oam_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_template_Vlan_2:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/nestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/nestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
index 938e59adcc..7ecbcf73e7 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/nestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/nestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -12,89 +12,89 @@ node_types:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       p1:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       p2:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       p3:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       template_PortTuple_LB1:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       lb_st_interface_type_oam:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       oam_sec_group_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       virtual_ip_address:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       security_group_name:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vlan_ids:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_image:
         type: string
         description: Image for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       virtual_ipv6_address:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_flavor:
         type: string
         description: Flavor for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       lb_st_vlan_type_oam:
         type: string
         description: dummy
         required: true
-        status: SUPPORTED
+        status: supported
       mac_address:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       availability_zone_0:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_name_prefix:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_instance_index:
         type: float
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_oam_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_template_subint_oam_vmi_4:
         capability: tosca.capabilities.Node
@@ -129,86 +129,86 @@ node_types:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       p1:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       p2:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       template_PortTuple_LB1:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       lb_st_interface_type_oam:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       oam_sec_group_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       virtual_ip_address:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       security_group_name:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vlan_ids:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_image:
         type: string
         description: Image for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       virtual_ipv6_address:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_flavor:
         type: string
         description: Flavor for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       lb_st_vlan_type_oam:
         type: string
         description: dummy
         required: true
-        status: SUPPORTED
+        status: supported
       mac_address:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       availability_zone_0:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_name_prefix:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_instance_index:
         type: float
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_oam_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_template_VMInt_OAM_lb_1:
         capability: tosca.capabilities.Node
@@ -1599,86 +1599,86 @@ node_types:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       p1:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       p2:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       template_PortTuple_LB1:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       lb_st_interface_type_oam:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       oam_sec_group_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       virtual_ip_address:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       security_group_name:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vlan_ids:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_image:
         type: string
         description: Image for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       virtual_ipv6_address:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_flavor:
         type: string
         description: Flavor for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       lb_st_vlan_type_oam:
         type: string
         description: dummy
         required: true
-        status: SUPPORTED
+        status: supported
       mac_address:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       availability_zone_0:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_name_prefix:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_instance_index:
         type: float
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_oam_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_server_cmaui_2:
         capability: tosca.capabilities.Node
@@ -2643,89 +2643,89 @@ node_types:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       p1:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       p2:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       template_PortTuple_LB1:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       lb_st_interface_type_oam:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       oam_sec_group_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       virtual_ip_address:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       indx:
         type: float
         required: true
-        status: SUPPORTED
+        status: supported
       security_group_name:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vlan_ids:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_image:
         type: string
         description: Image for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       virtual_ipv6_address:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_flavor:
         type: string
         description: Flavor for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       lb_st_vlan_type_oam:
         type: string
         description: dummy
         required: true
-        status: SUPPORTED
+        status: supported
       mac_address:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       availability_zone_0:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_name_prefix:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_instance_index:
         type: float
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_oam_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_template_VMInt_OAM_lb_5:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/shared/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/shared/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
index 76f8356d76..37079c1b3b 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/shared/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/shared/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -12,119 +12,119 @@ node_types:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       p2:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       p3:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       p4:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       p5:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       virtual_ip_address:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       virtual_ipv6_address:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       lb_st_vlan_type_oam:
         type: string
         description: dummy
         required: true
-        status: SUPPORTED
+        status: supported
       mac_address:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       availability_zone_0:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_instance_index:
         type: float
         required: true
-        status: SUPPORTED
+        status: supported
       abc_flavor:
         type: string
         description: Flavor for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       template_PortTuple_LB1:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       oam_sec_group_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       lb_st_interface_type_oam:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       abc_names:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       security_group_name:
         description: not impotrtant
         required: true
-        status: SUPPORTED
+        status: supported
       vlan_ids:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       shared_network_id1:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_image:
         type: string
         description: Image for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_flavor:
         type: string
         description: Flavor for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       abc_oam_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_name_prefix:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_oam_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       abc_image:
         type: string
         description: Image for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_template_Vlan_3:
         capability: tosca.capabilities.Node
@@ -209,70 +209,70 @@ node_types:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       p1:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       virtual_ip_address:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       security_group_name:
         description: not impotrtant
         required: true
-        status: SUPPORTED
+        status: supported
       vlan_ids:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_image:
         type: string
         description: Image for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       virtual_ipv6_address:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_flavor:
         type: string
         description: Flavor for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       lb_st_vlan_type_oam:
         type: string
         description: dummy
         required: true
-        status: SUPPORTED
+        status: supported
       mac_address:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       availability_zone_0:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       abc_oam_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_name_prefix:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_instance_index:
         type: float
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_oam_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_template_subint_oam_vmi_1:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/sharedAddOn/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/sharedAddOn/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
index 1be71bb7c5..8d44f9756d 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/sharedAddOn/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/sharedAddOn/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -12,118 +12,118 @@ node_types:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       p1:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       p2:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       p3:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       p4:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       template_PortTuple_LB1:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       p5:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       oam_sec_group_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       lb_st_interface_type_oam:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       virtual_ip_address:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       security_group_name:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       shared_network_id:
         type: string
         description: Flavor for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       vlan_ids:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       shared_network_id1:
         type: string
         description: Flavor for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_image:
         type: string
         description: Image for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       virtual_ipv6_address:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_flavor:
         type: string
         description: Flavor for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       shared_network_id2:
         type: list
         description: Flavor for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       lb_st_vlan_type_oam:
         type: string
         description: dummy
         required: true
-        status: SUPPORTED
+        status: supported
       mac_address:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       availability_zone_0:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_name_prefix:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_instance_index:
         type: float
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_oam_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_template_Vlan_3:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/buildconsolidationdata/getattribute/noneToPortOrCompute/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/buildconsolidationdata/getattribute/noneToPortOrCompute/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
index f890787ebd..fe2721b9af 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/buildconsolidationdata/getattribute/noneToPortOrCompute/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/buildconsolidationdata/getattribute/noneToPortOrCompute/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -12,72 +12,72 @@ node_types:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_gw:
         type: string
         description: CPS network gateway
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_image_name:
         type: string
         description: PCRF CM image name
         required: true
-        status: SUPPORTED
+        status: supported
       security_group_name:
         type: string
         description: the name of security group
         required: true
-        status: SUPPORTED
+        status: supported
       cps_net_ip:
         type: string
         description: CPS network ip
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_flavor_name:
         type: string
         description: flavor name of PCRF CM instance
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_vol:
         type: string
         description: CPS Cluman Cinder Volume
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_server_name:
         type: string
         description: PCRF CM server name
         required: true
-        status: SUPPORTED
+        status: supported
       cps_net_name:
         type: string
         description: CPS network name
         required: true
-        status: SUPPORTED
+        status: supported
       cps_net_mask:
         type: string
         description: CPS network mask
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_ip:
         type: string
         description: OAM network ip
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_mask:
         type: string
         description: CPS network mask
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_name:
         type: string
         description: OAM network name
         required: true
-        status: SUPPORTED
+        status: supported
     attributes:
       server_pcm_id:
         type: string
         description: the pcm nova service id
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_pcm_port_1:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
index ec0f41eb8f..d50f8df891 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -12,146 +12,146 @@ node_types:
         type: string
         description: Policy Name
         required: true
-        status: SUPPORTED
+        status: supported
       st_static_routes_list:
         type: string
         description: List of static routes enabled-disabled
         required: true
-        status: SUPPORTED
+        status: supported
       st_type:
         type: string
         description: service type
         required: true
-        status: SUPPORTED
+        status: supported
       st_service_interface_type_list:
         type: string
         description: List of interface types
         required: true
-        status: SUPPORTED
+        status: supported
       st_mode:
         type: string
         description: service mode
         required: true
-        status: SUPPORTED
+        status: supported
       Cricket_OCS_protected_net_id:
         type: string
         description: Name of Cricket OCS network
         required: true
-        status: SUPPORTED
+        status: supported
       oam_mgmt_net_0_id:
         type: string
         description: Name of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       start_dst_ports:
         type: float
         description: Start of dst port
         required: true
-        status: SUPPORTED
+        status: supported
       st_flavor:
         type: string
         description: Flavor
         required: true
-        status: SUPPORTED
+        status: supported
       availability_zone_1:
         type: string
         description: availability zone
         required: true
-        status: SUPPORTED
+        status: supported
       service_instance_name:
         type: string
         description: Service instance name
         required: true
-        status: SUPPORTED
+        status: supported
       st_scaling:
         type: string
         description: Indicates whether service scaling is enabled
         required: true
-        status: SUPPORTED
+        status: supported
       max_num_fw_instances:
         type: float
         description: maximum number of firewall instances for scaling
         required: true
-        status: SUPPORTED
+        status: supported
       start_src_ports:
         type: float
         description: Start of src port
         required: true
-        status: SUPPORTED
+        status: supported
       network_param2:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       service_policy_direction:
         type: string
         description: Direction of Policy
         required: true
-        status: SUPPORTED
+        status: supported
       network_param1:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       st_name:
         type: string
         description: Name of service template
         required: true
-        status: SUPPORTED
+        status: supported
       hsl_direct_net3:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       hsl_direct_net4:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       HSL_direct_net_gateway:
         type: string
         description: HSL (Logging) network gateway address
         required: true
-        status: SUPPORTED
+        status: supported
       hsl_direct_net1:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       hsl_direct_net2:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       st_shared_ip_list:
         type: string
         description: List of shared ip enabled-disabled
         required: true
-        status: SUPPORTED
+        status: supported
       Cricket_OCS_direct_net_id:
         type: string
         description: Name of Cricket OCS network
         required: true
-        status: SUPPORTED
+        status: supported
       end_src_ports:
         type: float
         description: End of src port
         required: true
-        status: SUPPORTED
+        status: supported
       end_dst_ports:
         type: float
         description: End of dst port
         required: true
-        status: SUPPORTED
+        status: supported
       st_image_name:
         type: string
         description: Name of the image
         required: true
-        status: SUPPORTED
+        status: supported
       HSL_direct_net_id:
         type: string
         description: Name of HSL (Logging) network
         required: true
-        status: SUPPORTED
+        status: supported
       HSL_direct_net_cidr:
         type: string
         description: HSL (Logging) network address (CIDR notation)
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_hsl_direct_net_3:
         capability: tosca.capabilities.Node
@@ -240,146 +240,146 @@ node_types:
         type: string
         description: Policy Name
         required: true
-        status: SUPPORTED
+        status: supported
       st_static_routes_list:
         type: string
         description: List of static routes enabled-disabled
         required: true
-        status: SUPPORTED
+        status: supported
       st_type:
         type: string
         description: service type
         required: true
-        status: SUPPORTED
+        status: supported
       st_service_interface_type_list:
         type: string
         description: List of interface types
         required: true
-        status: SUPPORTED
+        status: supported
       st_mode:
         type: string
         description: service mode
         required: true
-        status: SUPPORTED
+        status: supported
       Cricket_OCS_protected_net_id:
         type: string
         description: Name of Cricket OCS network
         required: true
-        status: SUPPORTED
+        status: supported
       oam_mgmt_net_0_id:
         type: string
         description: Name of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       start_dst_ports:
         type: float
         description: Start of dst port
         required: true
-        status: SUPPORTED
+        status: supported
       st_flavor:
         type: string
         description: Flavor
         required: true
-        status: SUPPORTED
+        status: supported
       availability_zone_1:
         type: string
         description: availability zone
         required: true
-        status: SUPPORTED
+        status: supported
       service_instance_name:
         type: string
         description: Service instance name
         required: true
-        status: SUPPORTED
+        status: supported
       st_scaling:
         type: string
         description: Indicates whether service scaling is enabled
         required: true
-        status: SUPPORTED
+        status: supported
       max_num_fw_instances:
         type: float
         description: maximum number of firewall instances for scaling
         required: true
-        status: SUPPORTED
+        status: supported
       start_src_ports:
         type: float
         description: Start of src port
         required: true
-        status: SUPPORTED
+        status: supported
       network_param2:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       service_policy_direction:
         type: string
         description: Direction of Policy
         required: true
-        status: SUPPORTED
+        status: supported
       network_param1:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       st_name:
         type: string
         description: Name of service template
         required: true
-        status: SUPPORTED
+        status: supported
       hsl_direct_net3:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       hsl_direct_net4:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       HSL_direct_net_gateway:
         type: string
         description: HSL (Logging) network gateway address
         required: true
-        status: SUPPORTED
+        status: supported
       hsl_direct_net1:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       hsl_direct_net2:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       st_shared_ip_list:
         type: string
         description: List of shared ip enabled-disabled
         required: true
-        status: SUPPORTED
+        status: supported
       Cricket_OCS_direct_net_id:
         type: string
         description: Name of Cricket OCS network
         required: true
-        status: SUPPORTED
+        status: supported
       end_src_ports:
         type: float
         description: End of src port
         required: true
-        status: SUPPORTED
+        status: supported
       end_dst_ports:
         type: float
         description: End of dst port
         required: true
-        status: SUPPORTED
+        status: supported
       st_image_name:
         type: string
         description: Name of the image
         required: true
-        status: SUPPORTED
+        status: supported
       HSL_direct_net_id:
         type: string
         description: Name of HSL (Logging) network
         required: true
-        status: SUPPORTED
+        status: supported
       HSL_direct_net_cidr:
         type: string
         description: HSL (Logging) network address (CIDR notation)
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_hsl_direct_net_2:
         capability: tosca.capabilities.Node
@@ -592,146 +592,146 @@ node_types:
         type: string
         description: Policy Name
         required: true
-        status: SUPPORTED
+        status: supported
       st_static_routes_list:
         type: string
         description: List of static routes enabled-disabled
         required: true
-        status: SUPPORTED
+        status: supported
       st_type:
         type: string
         description: service type
         required: true
-        status: SUPPORTED
+        status: supported
       st_service_interface_type_list:
         type: string
         description: List of interface types
         required: true
-        status: SUPPORTED
+        status: supported
       st_mode:
         type: string
         description: service mode
         required: true
-        status: SUPPORTED
+        status: supported
       Cricket_OCS_protected_net_id:
         type: string
         description: Name of Cricket OCS network
         required: true
-        status: SUPPORTED
+        status: supported
       oam_mgmt_net_0_id:
         type: string
         description: Name of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       start_dst_ports:
         type: float
         description: Start of dst port
         required: true
-        status: SUPPORTED
+        status: supported
       st_flavor:
         type: string
         description: Flavor
         required: true
-        status: SUPPORTED
+        status: supported
       availability_zone_1:
         type: string
         description: availability zone
         required: true
-        status: SUPPORTED
+        status: supported
       service_instance_name:
         type: string
         description: Service instance name
         required: true
-        status: SUPPORTED
+        status: supported
       st_scaling:
         type: string
         description: Indicates whether service scaling is enabled
         required: true
-        status: SUPPORTED
+        status: supported
       max_num_fw_instances:
         type: float
         description: maximum number of firewall instances for scaling
         required: true
-        status: SUPPORTED
+        status: supported
       start_src_ports:
         type: float
         description: Start of src port
         required: true
-        status: SUPPORTED
+        status: supported
       network_param2:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       service_policy_direction:
         type: string
         description: Direction of Policy
         required: true
-        status: SUPPORTED
+        status: supported
       network_param1:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       st_name:
         type: string
         description: Name of service template
         required: true
-        status: SUPPORTED
+        status: supported
       hsl_direct_net3:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       hsl_direct_net4:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       HSL_direct_net_gateway:
         type: string
         description: HSL (Logging) network gateway address
         required: true
-        status: SUPPORTED
+        status: supported
       hsl_direct_net1:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       hsl_direct_net2:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       st_shared_ip_list:
         type: string
         description: List of shared ip enabled-disabled
         required: true
-        status: SUPPORTED
+        status: supported
       Cricket_OCS_direct_net_id:
         type: string
         description: Name of Cricket OCS network
         required: true
-        status: SUPPORTED
+        status: supported
       end_src_ports:
         type: float
         description: End of src port
         required: true
-        status: SUPPORTED
+        status: supported
       end_dst_ports:
         type: float
         description: End of dst port
         required: true
-        status: SUPPORTED
+        status: supported
       st_image_name:
         type: string
         description: Name of the image
         required: true
-        status: SUPPORTED
+        status: supported
       HSL_direct_net_id:
         type: string
         description: Name of HSL (Logging) network
         required: true
-        status: SUPPORTED
+        status: supported
       HSL_direct_net_cidr:
         type: string
         description: HSL (Logging) network address (CIDR notation)
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_service_instance2:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/expectedoutputfiles/OCS-fw2_service_instance21ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/expectedoutputfiles/OCS-fw2_service_instance21ServiceTemplate.yaml
index 96d57c1fe5..ef292b6ace 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/expectedoutputfiles/OCS-fw2_service_instance21ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/expectedoutputfiles/OCS-fw2_service_instance21ServiceTemplate.yaml
@@ -14,14 +14,14 @@ topology_template:
       type: string
       description: Availability zone to create servers in
       required: false
-      status: SUPPORTED
+      status: supported
     static_routes_list:
       hidden: false
       immutable: false
       type: list
       description: Static routes enabled
       required: false
-      status: SUPPORTED
+      status: supported
       entry_schema:
         type: boolean
     availability_zone_enable:
@@ -31,14 +31,14 @@ topology_template:
       description: Indicates availability zone is enabled
       required: false
       default: false
-      status: SUPPORTED
+      status: supported
     service_template_name:
       hidden: false
       immutable: false
       type: string
       description: Service template name
       required: false
-      status: SUPPORTED
+      status: supported
     ordered_interfaces:
       hidden: false
       immutable: false
@@ -46,28 +46,28 @@ topology_template:
       description: Indicates if service interface are ordered
       required: false
       default: false
-      status: SUPPORTED
+      status: supported
     flavor:
       hidden: false
       immutable: false
       type: string
       description: flavor
       required: false
-      status: SUPPORTED
+      status: supported
     image_name:
       hidden: false
       immutable: false
       type: string
       description: Image name
       required: true
-      status: SUPPORTED
+      status: supported
     service_type:
       hidden: false
       immutable: false
       type: string
       description: Service type
       required: true
-      status: SUPPORTED
+      status: supported
       constraints:
       - valid_values:
         - firewall
@@ -80,7 +80,7 @@ topology_template:
       type: list
       description: List of interface types
       required: true
-      status: SUPPORTED
+      status: supported
       entry_schema:
         type: string
         constraints:
@@ -95,14 +95,14 @@ topology_template:
       type: string
       description: Service instance name
       required: true
-      status: SUPPORTED
+      status: supported
     interface_list:
       hidden: false
       immutable: false
       type: list
       description: List of interfaces
       required: false
-      status: SUPPORTED
+      status: supported
       entry_schema:
         type: org.openecomp.datatypes.heat.network.contrail.InterfaceData
     service_mode:
@@ -111,7 +111,7 @@ topology_template:
       type: string
       description: Service mode
       required: true
-      status: SUPPORTED
+      status: supported
       constraints:
       - valid_values:
         - transparent
@@ -123,7 +123,7 @@ topology_template:
       type: list
       description: Shared ips enabled
       required: false
-      status: SUPPORTED
+      status: supported
       entry_schema:
         type: boolean
   node_templates:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/expectedoutputfiles/OCS-fw2_service_instance3ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/expectedoutputfiles/OCS-fw2_service_instance3ServiceTemplate.yaml
index 41554e57e0..fd3451190a 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/expectedoutputfiles/OCS-fw2_service_instance3ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/expectedoutputfiles/OCS-fw2_service_instance3ServiceTemplate.yaml
@@ -14,14 +14,14 @@ topology_template:
       type: string
       description: Availability zone to create servers in
       required: false
-      status: SUPPORTED
+      status: supported
     static_routes_list:
       hidden: false
       immutable: false
       type: list
       description: Static routes enabled
       required: false
-      status: SUPPORTED
+      status: supported
       entry_schema:
         type: boolean
     availability_zone_enable:
@@ -31,14 +31,14 @@ topology_template:
       description: Indicates availability zone is enabled
       required: false
       default: false
-      status: SUPPORTED
+      status: supported
     service_template_name:
       hidden: false
       immutable: false
       type: string
       description: Service template name
       required: false
-      status: SUPPORTED
+      status: supported
     ordered_interfaces:
       hidden: false
       immutable: false
@@ -46,28 +46,28 @@ topology_template:
       description: Indicates if service interface are ordered
       required: false
       default: false
-      status: SUPPORTED
+      status: supported
     flavor:
       hidden: false
       immutable: false
       type: string
       description: flavor
       required: false
-      status: SUPPORTED
+      status: supported
     image_name:
       hidden: false
       immutable: false
       type: string
       description: Image name
       required: true
-      status: SUPPORTED
+      status: supported
     service_type:
       hidden: false
       immutable: false
       type: string
       description: Service type
       required: true
-      status: SUPPORTED
+      status: supported
       constraints:
       - valid_values:
         - firewall
@@ -80,7 +80,7 @@ topology_template:
       type: list
       description: List of interface types
       required: true
-      status: SUPPORTED
+      status: supported
       entry_schema:
         type: string
         constraints:
@@ -95,14 +95,14 @@ topology_template:
       type: string
       description: Service instance name
       required: true
-      status: SUPPORTED
+      status: supported
     interface_list:
       hidden: false
       immutable: false
       type: list
       description: List of interfaces
       required: false
-      status: SUPPORTED
+      status: supported
       entry_schema:
         type: org.openecomp.datatypes.heat.network.contrail.InterfaceData
     service_mode:
@@ -111,7 +111,7 @@ topology_template:
       type: string
       description: Service mode
       required: true
-      status: SUPPORTED
+      status: supported
       constraints:
       - valid_values:
         - transparent
@@ -123,7 +123,7 @@ topology_template:
       type: list
       description: Shared ips enabled
       required: false
-      status: SUPPORTED
+      status: supported
       entry_schema:
         type: boolean
   node_templates:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/expectedoutputfiles/OCS-fw3_service_instance4ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/expectedoutputfiles/OCS-fw3_service_instance4ServiceTemplate.yaml
index 0f4867b04a..334062f60e 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/expectedoutputfiles/OCS-fw3_service_instance4ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/expectedoutputfiles/OCS-fw3_service_instance4ServiceTemplate.yaml
@@ -14,14 +14,14 @@ topology_template:
       type: string
       description: Availability zone to create servers in
       required: false
-      status: SUPPORTED
+      status: supported
     static_routes_list:
       hidden: false
       immutable: false
       type: list
       description: Static routes enabled
       required: false
-      status: SUPPORTED
+      status: supported
       entry_schema:
         type: boolean
     availability_zone_enable:
@@ -31,14 +31,14 @@ topology_template:
       description: Indicates availability zone is enabled
       required: false
       default: false
-      status: SUPPORTED
+      status: supported
     service_template_name:
       hidden: false
       immutable: false
       type: string
       description: Service template name
       required: false
-      status: SUPPORTED
+      status: supported
     ordered_interfaces:
       hidden: false
       immutable: false
@@ -46,28 +46,28 @@ topology_template:
       description: Indicates if service interface are ordered
       required: false
       default: false
-      status: SUPPORTED
+      status: supported
     flavor:
       hidden: false
       immutable: false
       type: string
       description: flavor
       required: false
-      status: SUPPORTED
+      status: supported
     image_name:
       hidden: false
       immutable: false
       type: string
       description: Image name
       required: true
-      status: SUPPORTED
+      status: supported
     service_type:
       hidden: false
       immutable: false
       type: string
       description: Service type
       required: true
-      status: SUPPORTED
+      status: supported
       constraints:
       - valid_values:
         - firewall
@@ -80,7 +80,7 @@ topology_template:
       type: list
       description: List of interface types
       required: true
-      status: SUPPORTED
+      status: supported
       entry_schema:
         type: string
         constraints:
@@ -95,14 +95,14 @@ topology_template:
       type: string
       description: Service instance name
       required: true
-      status: SUPPORTED
+      status: supported
     interface_list:
       hidden: false
       immutable: false
       type: list
       description: List of interfaces
       required: false
-      status: SUPPORTED
+      status: supported
       entry_schema:
         type: org.openecomp.datatypes.heat.network.contrail.InterfaceData
     service_mode:
@@ -111,7 +111,7 @@ topology_template:
       type: string
       description: Service mode
       required: true
-      status: SUPPORTED
+      status: supported
       constraints:
       - valid_values:
         - transparent
@@ -123,7 +123,7 @@ topology_template:
       type: list
       description: Shared ips enabled
       required: false
-      status: SUPPORTED
+      status: supported
       entry_schema:
         type: boolean
   node_templates:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/expectedoutputfiles/OCS-fw_service_instance1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/expectedoutputfiles/OCS-fw_service_instance1ServiceTemplate.yaml
index b813d27a61..387a8073a2 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/expectedoutputfiles/OCS-fw_service_instance1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/expectedoutputfiles/OCS-fw_service_instance1ServiceTemplate.yaml
@@ -14,14 +14,14 @@ topology_template:
       type: string
       description: Availability zone to create servers in
       required: false
-      status: SUPPORTED
+      status: supported
     static_routes_list:
       hidden: false
       immutable: false
       type: list
       description: Static routes enabled
       required: false
-      status: SUPPORTED
+      status: supported
       entry_schema:
         type: boolean
     availability_zone_enable:
@@ -31,14 +31,14 @@ topology_template:
       description: Indicates availability zone is enabled
       required: false
       default: false
-      status: SUPPORTED
+      status: supported
     service_template_name:
       hidden: false
       immutable: false
       type: string
       description: Service template name
       required: false
-      status: SUPPORTED
+      status: supported
     ordered_interfaces:
       hidden: false
       immutable: false
@@ -46,28 +46,28 @@ topology_template:
       description: Indicates if service interface are ordered
       required: false
       default: false
-      status: SUPPORTED
+      status: supported
     flavor:
       hidden: false
       immutable: false
       type: string
       description: flavor
       required: false
-      status: SUPPORTED
+      status: supported
     image_name:
       hidden: false
       immutable: false
       type: string
       description: Image name
       required: true
-      status: SUPPORTED
+      status: supported
     service_type:
       hidden: false
       immutable: false
       type: string
       description: Service type
       required: true
-      status: SUPPORTED
+      status: supported
       constraints:
       - valid_values:
         - firewall
@@ -80,7 +80,7 @@ topology_template:
       type: list
       description: List of interface types
       required: true
-      status: SUPPORTED
+      status: supported
       entry_schema:
         type: string
         constraints:
@@ -95,14 +95,14 @@ topology_template:
       type: string
       description: Service instance name
       required: true
-      status: SUPPORTED
+      status: supported
     interface_list:
       hidden: false
       immutable: false
       type: list
       description: List of interfaces
       required: false
-      status: SUPPORTED
+      status: supported
       entry_schema:
         type: org.openecomp.datatypes.heat.network.contrail.InterfaceData
     service_mode:
@@ -111,7 +111,7 @@ topology_template:
       type: string
       description: Service mode
       required: true
-      status: SUPPORTED
+      status: supported
       constraints:
       - valid_values:
         - transparent
@@ -123,7 +123,7 @@ topology_template:
       type: list
       description: Shared ips enabled
       required: false
-      status: SUPPORTED
+      status: supported
       entry_schema:
         type: boolean
   node_templates:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/expectedoutputfiles/OCS-fw_service_instance2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/expectedoutputfiles/OCS-fw_service_instance2ServiceTemplate.yaml
index 329913a303..4becb95ad1 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/expectedoutputfiles/OCS-fw_service_instance2ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/expectedoutputfiles/OCS-fw_service_instance2ServiceTemplate.yaml
@@ -14,14 +14,14 @@ topology_template:
       type: string
       description: Availability zone to create servers in
       required: false
-      status: SUPPORTED
+      status: supported
     static_routes_list:
       hidden: false
       immutable: false
       type: list
       description: Static routes enabled
       required: false
-      status: SUPPORTED
+      status: supported
       entry_schema:
         type: boolean
     availability_zone_enable:
@@ -31,14 +31,14 @@ topology_template:
       description: Indicates availability zone is enabled
       required: false
       default: false
-      status: SUPPORTED
+      status: supported
     service_template_name:
       hidden: false
       immutable: false
       type: string
       description: Service template name
       required: false
-      status: SUPPORTED
+      status: supported
     ordered_interfaces:
       hidden: false
       immutable: false
@@ -46,28 +46,28 @@ topology_template:
       description: Indicates if service interface are ordered
       required: false
       default: false
-      status: SUPPORTED
+      status: supported
     flavor:
       hidden: false
       immutable: false
       type: string
       description: flavor
       required: false
-      status: SUPPORTED
+      status: supported
     image_name:
       hidden: false
       immutable: false
       type: string
       description: Image name
       required: true
-      status: SUPPORTED
+      status: supported
     service_type:
       hidden: false
       immutable: false
       type: string
       description: Service type
       required: true
-      status: SUPPORTED
+      status: supported
       constraints:
       - valid_values:
         - firewall
@@ -80,7 +80,7 @@ topology_template:
       type: list
       description: List of interface types
       required: true
-      status: SUPPORTED
+      status: supported
       entry_schema:
         type: string
         constraints:
@@ -95,14 +95,14 @@ topology_template:
       type: string
       description: Service instance name
       required: true
-      status: SUPPORTED
+      status: supported
     interface_list:
       hidden: false
       immutable: false
       type: list
       description: List of interfaces
       required: false
-      status: SUPPORTED
+      status: supported
       entry_schema:
         type: org.openecomp.datatypes.heat.network.contrail.InterfaceData
     service_mode:
@@ -111,7 +111,7 @@ topology_template:
       type: string
       description: Service mode
       required: true
-      status: SUPPORTED
+      status: supported
       constraints:
       - valid_values:
         - transparent
@@ -123,7 +123,7 @@ topology_template:
       type: list
       description: Shared ips enabled
       required: false
-      status: SUPPORTED
+      status: supported
       entry_schema:
         type: boolean
   node_templates:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
index ec0f41eb8f..d50f8df891 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -12,146 +12,146 @@ node_types:
         type: string
         description: Policy Name
         required: true
-        status: SUPPORTED
+        status: supported
       st_static_routes_list:
         type: string
         description: List of static routes enabled-disabled
         required: true
-        status: SUPPORTED
+        status: supported
       st_type:
         type: string
         description: service type
         required: true
-        status: SUPPORTED
+        status: supported
       st_service_interface_type_list:
         type: string
         description: List of interface types
         required: true
-        status: SUPPORTED
+        status: supported
       st_mode:
         type: string
         description: service mode
         required: true
-        status: SUPPORTED
+        status: supported
       Cricket_OCS_protected_net_id:
         type: string
         description: Name of Cricket OCS network
         required: true
-        status: SUPPORTED
+        status: supported
       oam_mgmt_net_0_id:
         type: string
         description: Name of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       start_dst_ports:
         type: float
         description: Start of dst port
         required: true
-        status: SUPPORTED
+        status: supported
       st_flavor:
         type: string
         description: Flavor
         required: true
-        status: SUPPORTED
+        status: supported
       availability_zone_1:
         type: string
         description: availability zone
         required: true
-        status: SUPPORTED
+        status: supported
       service_instance_name:
         type: string
         description: Service instance name
         required: true
-        status: SUPPORTED
+        status: supported
       st_scaling:
         type: string
         description: Indicates whether service scaling is enabled
         required: true
-        status: SUPPORTED
+        status: supported
       max_num_fw_instances:
         type: float
         description: maximum number of firewall instances for scaling
         required: true
-        status: SUPPORTED
+        status: supported
       start_src_ports:
         type: float
         description: Start of src port
         required: true
-        status: SUPPORTED
+        status: supported
       network_param2:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       service_policy_direction:
         type: string
         description: Direction of Policy
         required: true
-        status: SUPPORTED
+        status: supported
       network_param1:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       st_name:
         type: string
         description: Name of service template
         required: true
-        status: SUPPORTED
+        status: supported
       hsl_direct_net3:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       hsl_direct_net4:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       HSL_direct_net_gateway:
         type: string
         description: HSL (Logging) network gateway address
         required: true
-        status: SUPPORTED
+        status: supported
       hsl_direct_net1:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       hsl_direct_net2:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       st_shared_ip_list:
         type: string
         description: List of shared ip enabled-disabled
         required: true
-        status: SUPPORTED
+        status: supported
       Cricket_OCS_direct_net_id:
         type: string
         description: Name of Cricket OCS network
         required: true
-        status: SUPPORTED
+        status: supported
       end_src_ports:
         type: float
         description: End of src port
         required: true
-        status: SUPPORTED
+        status: supported
       end_dst_ports:
         type: float
         description: End of dst port
         required: true
-        status: SUPPORTED
+        status: supported
       st_image_name:
         type: string
         description: Name of the image
         required: true
-        status: SUPPORTED
+        status: supported
       HSL_direct_net_id:
         type: string
         description: Name of HSL (Logging) network
         required: true
-        status: SUPPORTED
+        status: supported
       HSL_direct_net_cidr:
         type: string
         description: HSL (Logging) network address (CIDR notation)
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_hsl_direct_net_3:
         capability: tosca.capabilities.Node
@@ -240,146 +240,146 @@ node_types:
         type: string
         description: Policy Name
         required: true
-        status: SUPPORTED
+        status: supported
       st_static_routes_list:
         type: string
         description: List of static routes enabled-disabled
         required: true
-        status: SUPPORTED
+        status: supported
       st_type:
         type: string
         description: service type
         required: true
-        status: SUPPORTED
+        status: supported
       st_service_interface_type_list:
         type: string
         description: List of interface types
         required: true
-        status: SUPPORTED
+        status: supported
       st_mode:
         type: string
         description: service mode
         required: true
-        status: SUPPORTED
+        status: supported
       Cricket_OCS_protected_net_id:
         type: string
         description: Name of Cricket OCS network
         required: true
-        status: SUPPORTED
+        status: supported
       oam_mgmt_net_0_id:
         type: string
         description: Name of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       start_dst_ports:
         type: float
         description: Start of dst port
         required: true
-        status: SUPPORTED
+        status: supported
       st_flavor:
         type: string
         description: Flavor
         required: true
-        status: SUPPORTED
+        status: supported
       availability_zone_1:
         type: string
         description: availability zone
         required: true
-        status: SUPPORTED
+        status: supported
       service_instance_name:
         type: string
         description: Service instance name
         required: true
-        status: SUPPORTED
+        status: supported
       st_scaling:
         type: string
         description: Indicates whether service scaling is enabled
         required: true
-        status: SUPPORTED
+        status: supported
       max_num_fw_instances:
         type: float
         description: maximum number of firewall instances for scaling
         required: true
-        status: SUPPORTED
+        status: supported
       start_src_ports:
         type: float
         description: Start of src port
         required: true
-        status: SUPPORTED
+        status: supported
       network_param2:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       service_policy_direction:
         type: string
         description: Direction of Policy
         required: true
-        status: SUPPORTED
+        status: supported
       network_param1:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       st_name:
         type: string
         description: Name of service template
         required: true
-        status: SUPPORTED
+        status: supported
       hsl_direct_net3:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       hsl_direct_net4:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       HSL_direct_net_gateway:
         type: string
         description: HSL (Logging) network gateway address
         required: true
-        status: SUPPORTED
+        status: supported
       hsl_direct_net1:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       hsl_direct_net2:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       st_shared_ip_list:
         type: string
         description: List of shared ip enabled-disabled
         required: true
-        status: SUPPORTED
+        status: supported
       Cricket_OCS_direct_net_id:
         type: string
         description: Name of Cricket OCS network
         required: true
-        status: SUPPORTED
+        status: supported
       end_src_ports:
         type: float
         description: End of src port
         required: true
-        status: SUPPORTED
+        status: supported
       end_dst_ports:
         type: float
         description: End of dst port
         required: true
-        status: SUPPORTED
+        status: supported
       st_image_name:
         type: string
         description: Name of the image
         required: true
-        status: SUPPORTED
+        status: supported
       HSL_direct_net_id:
         type: string
         description: Name of HSL (Logging) network
         required: true
-        status: SUPPORTED
+        status: supported
       HSL_direct_net_cidr:
         type: string
         description: HSL (Logging) network address (CIDR notation)
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_hsl_direct_net_2:
         capability: tosca.capabilities.Node
@@ -592,146 +592,146 @@ node_types:
         type: string
         description: Policy Name
         required: true
-        status: SUPPORTED
+        status: supported
       st_static_routes_list:
         type: string
         description: List of static routes enabled-disabled
         required: true
-        status: SUPPORTED
+        status: supported
       st_type:
         type: string
         description: service type
         required: true
-        status: SUPPORTED
+        status: supported
       st_service_interface_type_list:
         type: string
         description: List of interface types
         required: true
-        status: SUPPORTED
+        status: supported
       st_mode:
         type: string
         description: service mode
         required: true
-        status: SUPPORTED
+        status: supported
       Cricket_OCS_protected_net_id:
         type: string
         description: Name of Cricket OCS network
         required: true
-        status: SUPPORTED
+        status: supported
       oam_mgmt_net_0_id:
         type: string
         description: Name of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       start_dst_ports:
         type: float
         description: Start of dst port
         required: true
-        status: SUPPORTED
+        status: supported
       st_flavor:
         type: string
         description: Flavor
         required: true
-        status: SUPPORTED
+        status: supported
       availability_zone_1:
         type: string
         description: availability zone
         required: true
-        status: SUPPORTED
+        status: supported
       service_instance_name:
         type: string
         description: Service instance name
         required: true
-        status: SUPPORTED
+        status: supported
       st_scaling:
         type: string
         description: Indicates whether service scaling is enabled
         required: true
-        status: SUPPORTED
+        status: supported
       max_num_fw_instances:
         type: float
         description: maximum number of firewall instances for scaling
         required: true
-        status: SUPPORTED
+        status: supported
       start_src_ports:
         type: float
         description: Start of src port
         required: true
-        status: SUPPORTED
+        status: supported
       network_param2:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       service_policy_direction:
         type: string
         description: Direction of Policy
         required: true
-        status: SUPPORTED
+        status: supported
       network_param1:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       st_name:
         type: string
         description: Name of service template
         required: true
-        status: SUPPORTED
+        status: supported
       hsl_direct_net3:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       hsl_direct_net4:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       HSL_direct_net_gateway:
         type: string
         description: HSL (Logging) network gateway address
         required: true
-        status: SUPPORTED
+        status: supported
       hsl_direct_net1:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       hsl_direct_net2:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       st_shared_ip_list:
         type: string
         description: List of shared ip enabled-disabled
         required: true
-        status: SUPPORTED
+        status: supported
       Cricket_OCS_direct_net_id:
         type: string
         description: Name of Cricket OCS network
         required: true
-        status: SUPPORTED
+        status: supported
       end_src_ports:
         type: float
         description: End of src port
         required: true
-        status: SUPPORTED
+        status: supported
       end_dst_ports:
         type: float
         description: End of dst port
         required: true
-        status: SUPPORTED
+        status: supported
       st_image_name:
         type: string
         description: Name of the image
         required: true
-        status: SUPPORTED
+        status: supported
       HSL_direct_net_id:
         type: string
         description: Name of HSL (Logging) network
         required: true
-        status: SUPPORTED
+        status: supported
       HSL_direct_net_cidr:
         type: string
         description: HSL (Logging) network address (CIDR notation)
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_service_instance2:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/expectedoutputfiles/OCS-fw2_service_instance21ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/expectedoutputfiles/OCS-fw2_service_instance21ServiceTemplate.yaml
index 96d57c1fe5..ef292b6ace 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/expectedoutputfiles/OCS-fw2_service_instance21ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/expectedoutputfiles/OCS-fw2_service_instance21ServiceTemplate.yaml
@@ -14,14 +14,14 @@ topology_template:
       type: string
       description: Availability zone to create servers in
       required: false
-      status: SUPPORTED
+      status: supported
     static_routes_list:
       hidden: false
       immutable: false
       type: list
       description: Static routes enabled
       required: false
-      status: SUPPORTED
+      status: supported
       entry_schema:
         type: boolean
     availability_zone_enable:
@@ -31,14 +31,14 @@ topology_template:
       description: Indicates availability zone is enabled
       required: false
       default: false
-      status: SUPPORTED
+      status: supported
     service_template_name:
       hidden: false
       immutable: false
       type: string
       description: Service template name
       required: false
-      status: SUPPORTED
+      status: supported
     ordered_interfaces:
       hidden: false
       immutable: false
@@ -46,28 +46,28 @@ topology_template:
       description: Indicates if service interface are ordered
       required: false
       default: false
-      status: SUPPORTED
+      status: supported
     flavor:
       hidden: false
       immutable: false
       type: string
       description: flavor
       required: false
-      status: SUPPORTED
+      status: supported
     image_name:
       hidden: false
       immutable: false
       type: string
       description: Image name
       required: true
-      status: SUPPORTED
+      status: supported
     service_type:
       hidden: false
       immutable: false
       type: string
       description: Service type
       required: true
-      status: SUPPORTED
+      status: supported
       constraints:
       - valid_values:
         - firewall
@@ -80,7 +80,7 @@ topology_template:
       type: list
       description: List of interface types
       required: true
-      status: SUPPORTED
+      status: supported
       entry_schema:
         type: string
         constraints:
@@ -95,14 +95,14 @@ topology_template:
       type: string
       description: Service instance name
       required: true
-      status: SUPPORTED
+      status: supported
     interface_list:
       hidden: false
       immutable: false
       type: list
       description: List of interfaces
       required: false
-      status: SUPPORTED
+      status: supported
       entry_schema:
         type: org.openecomp.datatypes.heat.network.contrail.InterfaceData
     service_mode:
@@ -111,7 +111,7 @@ topology_template:
       type: string
       description: Service mode
       required: true
-      status: SUPPORTED
+      status: supported
       constraints:
       - valid_values:
         - transparent
@@ -123,7 +123,7 @@ topology_template:
       type: list
       description: Shared ips enabled
       required: false
-      status: SUPPORTED
+      status: supported
       entry_schema:
         type: boolean
   node_templates:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/expectedoutputfiles/OCS-fw2_service_instance3ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/expectedoutputfiles/OCS-fw2_service_instance3ServiceTemplate.yaml
index 41554e57e0..fd3451190a 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/expectedoutputfiles/OCS-fw2_service_instance3ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/expectedoutputfiles/OCS-fw2_service_instance3ServiceTemplate.yaml
@@ -14,14 +14,14 @@ topology_template:
       type: string
       description: Availability zone to create servers in
       required: false
-      status: SUPPORTED
+      status: supported
     static_routes_list:
       hidden: false
       immutable: false
       type: list
       description: Static routes enabled
       required: false
-      status: SUPPORTED
+      status: supported
       entry_schema:
         type: boolean
     availability_zone_enable:
@@ -31,14 +31,14 @@ topology_template:
       description: Indicates availability zone is enabled
       required: false
       default: false
-      status: SUPPORTED
+      status: supported
     service_template_name:
       hidden: false
       immutable: false
       type: string
       description: Service template name
       required: false
-      status: SUPPORTED
+      status: supported
     ordered_interfaces:
       hidden: false
       immutable: false
@@ -46,28 +46,28 @@ topology_template:
       description: Indicates if service interface are ordered
       required: false
       default: false
-      status: SUPPORTED
+      status: supported
     flavor:
       hidden: false
       immutable: false
       type: string
       description: flavor
       required: false
-      status: SUPPORTED
+      status: supported
     image_name:
       hidden: false
       immutable: false
       type: string
       description: Image name
       required: true
-      status: SUPPORTED
+      status: supported
     service_type:
       hidden: false
       immutable: false
       type: string
       description: Service type
       required: true
-      status: SUPPORTED
+      status: supported
       constraints:
       - valid_values:
         - firewall
@@ -80,7 +80,7 @@ topology_template:
       type: list
       description: List of interface types
       required: true
-      status: SUPPORTED
+      status: supported
       entry_schema:
         type: string
         constraints:
@@ -95,14 +95,14 @@ topology_template:
       type: string
       description: Service instance name
       required: true
-      status: SUPPORTED
+      status: supported
     interface_list:
       hidden: false
       immutable: false
       type: list
       description: List of interfaces
       required: false
-      status: SUPPORTED
+      status: supported
       entry_schema:
         type: org.openecomp.datatypes.heat.network.contrail.InterfaceData
     service_mode:
@@ -111,7 +111,7 @@ topology_template:
       type: string
       description: Service mode
       required: true
-      status: SUPPORTED
+      status: supported
       constraints:
       - valid_values:
         - transparent
@@ -123,7 +123,7 @@ topology_template:
       type: list
       description: Shared ips enabled
       required: false
-      status: SUPPORTED
+      status: supported
       entry_schema:
         type: boolean
   node_templates:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/expectedoutputfiles/OCS-fw3_service_instance4ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/expectedoutputfiles/OCS-fw3_service_instance4ServiceTemplate.yaml
index 0f4867b04a..334062f60e 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/expectedoutputfiles/OCS-fw3_service_instance4ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/expectedoutputfiles/OCS-fw3_service_instance4ServiceTemplate.yaml
@@ -14,14 +14,14 @@ topology_template:
       type: string
       description: Availability zone to create servers in
       required: false
-      status: SUPPORTED
+      status: supported
     static_routes_list:
       hidden: false
       immutable: false
       type: list
       description: Static routes enabled
       required: false
-      status: SUPPORTED
+      status: supported
       entry_schema:
         type: boolean
     availability_zone_enable:
@@ -31,14 +31,14 @@ topology_template:
       description: Indicates availability zone is enabled
       required: false
       default: false
-      status: SUPPORTED
+      status: supported
     service_template_name:
       hidden: false
       immutable: false
       type: string
       description: Service template name
       required: false
-      status: SUPPORTED
+      status: supported
     ordered_interfaces:
       hidden: false
       immutable: false
@@ -46,28 +46,28 @@ topology_template:
       description: Indicates if service interface are ordered
       required: false
       default: false
-      status: SUPPORTED
+      status: supported
     flavor:
       hidden: false
       immutable: false
       type: string
       description: flavor
       required: false
-      status: SUPPORTED
+      status: supported
     image_name:
       hidden: false
       immutable: false
       type: string
       description: Image name
       required: true
-      status: SUPPORTED
+      status: supported
     service_type:
       hidden: false
       immutable: false
       type: string
       description: Service type
       required: true
-      status: SUPPORTED
+      status: supported
       constraints:
       - valid_values:
         - firewall
@@ -80,7 +80,7 @@ topology_template:
       type: list
       description: List of interface types
       required: true
-      status: SUPPORTED
+      status: supported
       entry_schema:
         type: string
         constraints:
@@ -95,14 +95,14 @@ topology_template:
       type: string
       description: Service instance name
       required: true
-      status: SUPPORTED
+      status: supported
     interface_list:
       hidden: false
       immutable: false
       type: list
       description: List of interfaces
       required: false
-      status: SUPPORTED
+      status: supported
       entry_schema:
         type: org.openecomp.datatypes.heat.network.contrail.InterfaceData
     service_mode:
@@ -111,7 +111,7 @@ topology_template:
       type: string
       description: Service mode
       required: true
-      status: SUPPORTED
+      status: supported
       constraints:
       - valid_values:
         - transparent
@@ -123,7 +123,7 @@ topology_template:
       type: list
       description: Shared ips enabled
       required: false
-      status: SUPPORTED
+      status: supported
       entry_schema:
         type: boolean
   node_templates:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/expectedoutputfiles/OCS-fw_service_instance1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/expectedoutputfiles/OCS-fw_service_instance1ServiceTemplate.yaml
index b813d27a61..387a8073a2 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/expectedoutputfiles/OCS-fw_service_instance1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/expectedoutputfiles/OCS-fw_service_instance1ServiceTemplate.yaml
@@ -14,14 +14,14 @@ topology_template:
       type: string
       description: Availability zone to create servers in
       required: false
-      status: SUPPORTED
+      status: supported
     static_routes_list:
       hidden: false
       immutable: false
       type: list
       description: Static routes enabled
       required: false
-      status: SUPPORTED
+      status: supported
       entry_schema:
         type: boolean
     availability_zone_enable:
@@ -31,14 +31,14 @@ topology_template:
       description: Indicates availability zone is enabled
       required: false
       default: false
-      status: SUPPORTED
+      status: supported
     service_template_name:
       hidden: false
       immutable: false
       type: string
       description: Service template name
       required: false
-      status: SUPPORTED
+      status: supported
     ordered_interfaces:
       hidden: false
       immutable: false
@@ -46,28 +46,28 @@ topology_template:
       description: Indicates if service interface are ordered
       required: false
       default: false
-      status: SUPPORTED
+      status: supported
     flavor:
       hidden: false
       immutable: false
       type: string
       description: flavor
       required: false
-      status: SUPPORTED
+      status: supported
     image_name:
       hidden: false
       immutable: false
       type: string
       description: Image name
       required: true
-      status: SUPPORTED
+      status: supported
     service_type:
       hidden: false
       immutable: false
       type: string
       description: Service type
       required: true
-      status: SUPPORTED
+      status: supported
       constraints:
       - valid_values:
         - firewall
@@ -80,7 +80,7 @@ topology_template:
       type: list
       description: List of interface types
       required: true
-      status: SUPPORTED
+      status: supported
       entry_schema:
         type: string
         constraints:
@@ -95,14 +95,14 @@ topology_template:
       type: string
       description: Service instance name
       required: true
-      status: SUPPORTED
+      status: supported
     interface_list:
       hidden: false
       immutable: false
       type: list
       description: List of interfaces
       required: false
-      status: SUPPORTED
+      status: supported
       entry_schema:
         type: org.openecomp.datatypes.heat.network.contrail.InterfaceData
     service_mode:
@@ -111,7 +111,7 @@ topology_template:
       type: string
       description: Service mode
       required: true
-      status: SUPPORTED
+      status: supported
       constraints:
       - valid_values:
         - transparent
@@ -123,7 +123,7 @@ topology_template:
       type: list
       description: Shared ips enabled
       required: false
-      status: SUPPORTED
+      status: supported
       entry_schema:
         type: boolean
   node_templates:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/expectedoutputfiles/OCS-fw_service_instance2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/expectedoutputfiles/OCS-fw_service_instance2ServiceTemplate.yaml
index 329913a303..4becb95ad1 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/expectedoutputfiles/OCS-fw_service_instance2ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/expectedoutputfiles/OCS-fw_service_instance2ServiceTemplate.yaml
@@ -14,14 +14,14 @@ topology_template:
       type: string
       description: Availability zone to create servers in
       required: false
-      status: SUPPORTED
+      status: supported
     static_routes_list:
       hidden: false
       immutable: false
       type: list
       description: Static routes enabled
       required: false
-      status: SUPPORTED
+      status: supported
       entry_schema:
         type: boolean
     availability_zone_enable:
@@ -31,14 +31,14 @@ topology_template:
       description: Indicates availability zone is enabled
       required: false
       default: false
-      status: SUPPORTED
+      status: supported
     service_template_name:
       hidden: false
       immutable: false
       type: string
       description: Service template name
       required: false
-      status: SUPPORTED
+      status: supported
     ordered_interfaces:
       hidden: false
       immutable: false
@@ -46,28 +46,28 @@ topology_template:
       description: Indicates if service interface are ordered
       required: false
       default: false
-      status: SUPPORTED
+      status: supported
     flavor:
       hidden: false
       immutable: false
       type: string
       description: flavor
       required: false
-      status: SUPPORTED
+      status: supported
     image_name:
       hidden: false
       immutable: false
       type: string
       description: Image name
       required: true
-      status: SUPPORTED
+      status: supported
     service_type:
       hidden: false
       immutable: false
       type: string
       description: Service type
       required: true
-      status: SUPPORTED
+      status: supported
       constraints:
       - valid_values:
         - firewall
@@ -80,7 +80,7 @@ topology_template:
       type: list
       description: List of interface types
       required: true
-      status: SUPPORTED
+      status: supported
       entry_schema:
         type: string
         constraints:
@@ -95,14 +95,14 @@ topology_template:
       type: string
       description: Service instance name
       required: true
-      status: SUPPORTED
+      status: supported
     interface_list:
       hidden: false
       immutable: false
       type: list
       description: List of interfaces
       required: false
-      status: SUPPORTED
+      status: supported
       entry_schema:
         type: org.openecomp.datatypes.heat.network.contrail.InterfaceData
     service_mode:
@@ -111,7 +111,7 @@ topology_template:
       type: string
       description: Service mode
       required: true
-      status: SUPPORTED
+      status: supported
       constraints:
       - valid_values:
         - transparent
@@ -123,7 +123,7 @@ topology_template:
       type: list
       description: Shared ips enabled
       required: false
-      status: SUPPORTED
+      status: supported
       entry_schema:
         type: boolean
   node_templates:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/diffServiceTemplate/expectedoutputfiles/OCS-fw_service_instance_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/diffServiceTemplate/expectedoutputfiles/OCS-fw_service_instance_1ServiceTemplate.yaml
index 9c7de5309f..f3cbe9d077 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/diffServiceTemplate/expectedoutputfiles/OCS-fw_service_instance_1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/diffServiceTemplate/expectedoutputfiles/OCS-fw_service_instance_1ServiceTemplate.yaml
@@ -14,14 +14,14 @@ topology_template:
       type: string
       description: Availability zone to create servers in
       required: false
-      status: SUPPORTED
+      status: supported
     static_routes_list:
       hidden: false
       immutable: false
       type: list
       description: Static routes enabled
       required: false
-      status: SUPPORTED
+      status: supported
       entry_schema:
         type: boolean
     availability_zone_enable:
@@ -31,14 +31,14 @@ topology_template:
       description: Indicates availability zone is enabled
       required: false
       default: false
-      status: SUPPORTED
+      status: supported
     service_template_name:
       hidden: false
       immutable: false
       type: string
       description: Service template name
       required: false
-      status: SUPPORTED
+      status: supported
     ordered_interfaces:
       hidden: false
       immutable: false
@@ -46,28 +46,28 @@ topology_template:
       description: Indicates if service interface are ordered
       required: false
       default: false
-      status: SUPPORTED
+      status: supported
     flavor:
       hidden: false
       immutable: false
       type: string
       description: flavor
       required: false
-      status: SUPPORTED
+      status: supported
     image_name:
       hidden: false
       immutable: false
       type: string
       description: Image name
       required: true
-      status: SUPPORTED
+      status: supported
     service_type:
       hidden: false
       immutable: false
       type: string
       description: Service type
       required: true
-      status: SUPPORTED
+      status: supported
       constraints:
       - valid_values:
         - firewall
@@ -80,7 +80,7 @@ topology_template:
       type: list
       description: List of interface types
       required: true
-      status: SUPPORTED
+      status: supported
       entry_schema:
         type: string
         constraints:
@@ -95,14 +95,14 @@ topology_template:
       type: string
       description: Service instance name
       required: true
-      status: SUPPORTED
+      status: supported
     interface_list:
       hidden: false
       immutable: false
       type: list
       description: List of interfaces
       required: false
-      status: SUPPORTED
+      status: supported
       entry_schema:
         type: org.openecomp.datatypes.heat.network.contrail.InterfaceData
     service_mode:
@@ -111,7 +111,7 @@ topology_template:
       type: string
       description: Service mode
       required: true
-      status: SUPPORTED
+      status: supported
       constraints:
       - valid_values:
         - transparent
@@ -123,7 +123,7 @@ topology_template:
       type: list
       description: Shared ips enabled
       required: false
-      status: SUPPORTED
+      status: supported
       entry_schema:
         type: boolean
   node_templates:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/diffServiceTemplate/expectedoutputfiles/OCS-fw_service_instance_2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/diffServiceTemplate/expectedoutputfiles/OCS-fw_service_instance_2ServiceTemplate.yaml
index 6ccd3c4a0e..6fb09de773 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/diffServiceTemplate/expectedoutputfiles/OCS-fw_service_instance_2ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/diffServiceTemplate/expectedoutputfiles/OCS-fw_service_instance_2ServiceTemplate.yaml
@@ -14,14 +14,14 @@ topology_template:
       type: string
       description: Availability zone to create servers in
       required: false
-      status: SUPPORTED
+      status: supported
     static_routes_list:
       hidden: false
       immutable: false
       type: list
       description: Static routes enabled
       required: false
-      status: SUPPORTED
+      status: supported
       entry_schema:
         type: boolean
     availability_zone_enable:
@@ -31,14 +31,14 @@ topology_template:
       description: Indicates availability zone is enabled
       required: false
       default: false
-      status: SUPPORTED
+      status: supported
     service_template_name:
       hidden: false
       immutable: false
       type: string
       description: Service template name
       required: false
-      status: SUPPORTED
+      status: supported
     ordered_interfaces:
       hidden: false
       immutable: false
@@ -46,28 +46,28 @@ topology_template:
       description: Indicates if service interface are ordered
       required: false
       default: false
-      status: SUPPORTED
+      status: supported
     flavor:
       hidden: false
       immutable: false
       type: string
       description: flavor
       required: false
-      status: SUPPORTED
+      status: supported
     image_name:
       hidden: false
       immutable: false
       type: string
       description: Image name
       required: true
-      status: SUPPORTED
+      status: supported
     service_type:
       hidden: false
       immutable: false
       type: string
       description: Service type
       required: true
-      status: SUPPORTED
+      status: supported
       constraints:
       - valid_values:
         - firewall
@@ -80,7 +80,7 @@ topology_template:
       type: list
       description: List of interface types
       required: true
-      status: SUPPORTED
+      status: supported
       entry_schema:
         type: string
         constraints:
@@ -95,14 +95,14 @@ topology_template:
       type: string
       description: Service instance name
       required: true
-      status: SUPPORTED
+      status: supported
     interface_list:
       hidden: false
       immutable: false
       type: list
       description: List of interfaces
       required: false
-      status: SUPPORTED
+      status: supported
       entry_schema:
         type: org.openecomp.datatypes.heat.network.contrail.InterfaceData
     service_mode:
@@ -111,7 +111,7 @@ topology_template:
       type: string
       description: Service mode
       required: true
-      status: SUPPORTED
+      status: supported
       constraints:
       - valid_values:
         - transparent
@@ -123,7 +123,7 @@ topology_template:
       type: list
       description: Shared ips enabled
       required: false
-      status: SUPPORTED
+      status: supported
       entry_schema:
         type: boolean
   node_templates:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/oneServiceInstance/expectedoutputfiles/lcp1_mss.oam-fw_si_service_instanceServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/oneServiceInstance/expectedoutputfiles/lcp1_mss.oam-fw_si_service_instanceServiceTemplate.yaml
index c7685c951b..9fd1fa566d 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/oneServiceInstance/expectedoutputfiles/lcp1_mss.oam-fw_si_service_instanceServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/oneServiceInstance/expectedoutputfiles/lcp1_mss.oam-fw_si_service_instanceServiceTemplate.yaml
@@ -14,14 +14,14 @@ topology_template:
       type: string
       description: Availability zone to create servers in
       required: false
-      status: SUPPORTED
+      status: supported
     static_routes_list:
       hidden: false
       immutable: false
       type: list
       description: Static routes enabled
       required: false
-      status: SUPPORTED
+      status: supported
       entry_schema:
         type: boolean
     availability_zone_enable:
@@ -31,14 +31,14 @@ topology_template:
       description: Indicates availability zone is enabled
       required: false
       default: false
-      status: SUPPORTED
+      status: supported
     service_template_name:
       hidden: false
       immutable: false
       type: string
       description: Service template name
       required: false
-      status: SUPPORTED
+      status: supported
     ordered_interfaces:
       hidden: false
       immutable: false
@@ -46,28 +46,28 @@ topology_template:
       description: Indicates if service interface are ordered
       required: false
       default: false
-      status: SUPPORTED
+      status: supported
     flavor:
       hidden: false
       immutable: false
       type: string
       description: flavor
       required: false
-      status: SUPPORTED
+      status: supported
     image_name:
       hidden: false
       immutable: false
       type: string
       description: Image name
       required: true
-      status: SUPPORTED
+      status: supported
     service_type:
       hidden: false
       immutable: false
       type: string
       description: Service type
       required: true
-      status: SUPPORTED
+      status: supported
       constraints:
       - valid_values:
         - firewall
@@ -80,7 +80,7 @@ topology_template:
       type: list
       description: List of interface types
       required: true
-      status: SUPPORTED
+      status: supported
       entry_schema:
         type: string
         constraints:
@@ -95,14 +95,14 @@ topology_template:
       type: string
       description: Service instance name
       required: true
-      status: SUPPORTED
+      status: supported
     interface_list:
       hidden: false
       immutable: false
       type: list
       description: List of interfaces
       required: false
-      status: SUPPORTED
+      status: supported
       entry_schema:
         type: org.openecomp.datatypes.heat.network.contrail.InterfaceData
     service_mode:
@@ -111,7 +111,7 @@ topology_template:
       type: string
       description: Service mode
       required: true
-      status: SUPPORTED
+      status: supported
       constraints:
       - valid_values:
         - transparent
@@ -123,7 +123,7 @@ topology_template:
       type: list
       description: Shared ips enabled
       required: false
-      status: SUPPORTED
+      status: supported
       entry_schema:
         type: boolean
   node_templates:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/sameServiceTemplate/expectedoutputfiles/OCS-fw_service_instance_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/sameServiceTemplate/expectedoutputfiles/OCS-fw_service_instance_1ServiceTemplate.yaml
index 413aa7b724..8e48912454 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/sameServiceTemplate/expectedoutputfiles/OCS-fw_service_instance_1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/sameServiceTemplate/expectedoutputfiles/OCS-fw_service_instance_1ServiceTemplate.yaml
@@ -14,14 +14,14 @@ topology_template:
       type: string
       description: Availability zone to create servers in
       required: false
-      status: SUPPORTED
+      status: supported
     static_routes_list:
       hidden: false
       immutable: false
       type: list
       description: Static routes enabled
       required: false
-      status: SUPPORTED
+      status: supported
       entry_schema:
         type: boolean
     availability_zone_enable:
@@ -31,14 +31,14 @@ topology_template:
       description: Indicates availability zone is enabled
       required: false
       default: false
-      status: SUPPORTED
+      status: supported
     service_template_name:
       hidden: false
       immutable: false
       type: string
       description: Service template name
       required: false
-      status: SUPPORTED
+      status: supported
     ordered_interfaces:
       hidden: false
       immutable: false
@@ -46,28 +46,28 @@ topology_template:
       description: Indicates if service interface are ordered
       required: false
       default: false
-      status: SUPPORTED
+      status: supported
     flavor:
       hidden: false
       immutable: false
       type: string
       description: flavor
       required: false
-      status: SUPPORTED
+      status: supported
     image_name:
       hidden: false
       immutable: false
       type: string
       description: Image name
       required: true
-      status: SUPPORTED
+      status: supported
     service_type:
       hidden: false
       immutable: false
       type: string
       description: Service type
       required: true
-      status: SUPPORTED
+      status: supported
       constraints:
       - valid_values:
         - firewall
@@ -80,7 +80,7 @@ topology_template:
       type: list
       description: List of interface types
       required: true
-      status: SUPPORTED
+      status: supported
       entry_schema:
         type: string
         constraints:
@@ -95,14 +95,14 @@ topology_template:
       type: string
       description: Service instance name
       required: true
-      status: SUPPORTED
+      status: supported
     interface_list:
       hidden: false
       immutable: false
       type: list
       description: List of interfaces
       required: false
-      status: SUPPORTED
+      status: supported
       entry_schema:
         type: org.openecomp.datatypes.heat.network.contrail.InterfaceData
     service_mode:
@@ -111,7 +111,7 @@ topology_template:
       type: string
       description: Service mode
       required: true
-      status: SUPPORTED
+      status: supported
       constraints:
       - valid_values:
         - transparent
@@ -123,7 +123,7 @@ topology_template:
       type: list
       description: Shared ips enabled
       required: false
-      status: SUPPORTED
+      status: supported
       entry_schema:
         type: boolean
   node_templates:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/sameServiceTemplate/expectedoutputfiles/OCS-fw_service_instance_2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/sameServiceTemplate/expectedoutputfiles/OCS-fw_service_instance_2ServiceTemplate.yaml
index a20cb55608..d4b80670ac 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/sameServiceTemplate/expectedoutputfiles/OCS-fw_service_instance_2ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/sameServiceTemplate/expectedoutputfiles/OCS-fw_service_instance_2ServiceTemplate.yaml
@@ -14,14 +14,14 @@ topology_template:
       type: string
       description: Availability zone to create servers in
       required: false
-      status: SUPPORTED
+      status: supported
     static_routes_list:
       hidden: false
       immutable: false
       type: list
       description: Static routes enabled
       required: false
-      status: SUPPORTED
+      status: supported
       entry_schema:
         type: boolean
     availability_zone_enable:
@@ -31,14 +31,14 @@ topology_template:
       description: Indicates availability zone is enabled
       required: false
       default: false
-      status: SUPPORTED
+      status: supported
     service_template_name:
       hidden: false
       immutable: false
       type: string
       description: Service template name
       required: false
-      status: SUPPORTED
+      status: supported
     ordered_interfaces:
       hidden: false
       immutable: false
@@ -46,28 +46,28 @@ topology_template:
       description: Indicates if service interface are ordered
       required: false
       default: false
-      status: SUPPORTED
+      status: supported
     flavor:
       hidden: false
       immutable: false
       type: string
       description: flavor
       required: false
-      status: SUPPORTED
+      status: supported
     image_name:
       hidden: false
       immutable: false
       type: string
       description: Image name
       required: true
-      status: SUPPORTED
+      status: supported
     service_type:
       hidden: false
       immutable: false
       type: string
       description: Service type
       required: true
-      status: SUPPORTED
+      status: supported
       constraints:
       - valid_values:
         - firewall
@@ -80,7 +80,7 @@ topology_template:
       type: list
       description: List of interface types
       required: true
-      status: SUPPORTED
+      status: supported
       entry_schema:
         type: string
         constraints:
@@ -95,14 +95,14 @@ topology_template:
       type: string
       description: Service instance name
       required: true
-      status: SUPPORTED
+      status: supported
     interface_list:
       hidden: false
       immutable: false
       type: list
       description: List of interfaces
       required: false
-      status: SUPPORTED
+      status: supported
       entry_schema:
         type: org.openecomp.datatypes.heat.network.contrail.InterfaceData
     service_mode:
@@ -111,7 +111,7 @@ topology_template:
       type: string
       description: Service mode
       required: true
-      status: SUPPORTED
+      status: supported
       constraints:
       - valid_values:
         - transparent
@@ -123,7 +123,7 @@ topology_template:
       type: list
       description: Shared ips enabled
       required: false
-      status: SUPPORTED
+      status: supported
       entry_schema:
         type: boolean
   node_templates:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/sharedNetworkMulti/expectedoutputfiles/OCS-fw_service_instanceServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/sharedNetworkMulti/expectedoutputfiles/OCS-fw_service_instanceServiceTemplate.yaml
index 51dacb2187..dabace0309 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/sharedNetworkMulti/expectedoutputfiles/OCS-fw_service_instanceServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/sharedNetworkMulti/expectedoutputfiles/OCS-fw_service_instanceServiceTemplate.yaml
@@ -14,14 +14,14 @@ topology_template:
       type: string
       description: Availability zone to create servers in
       required: false
-      status: SUPPORTED
+      status: supported
     static_routes_list:
       hidden: false
       immutable: false
       type: list
       description: Static routes enabled
       required: false
-      status: SUPPORTED
+      status: supported
       entry_schema:
         type: boolean
     availability_zone_enable:
@@ -31,14 +31,14 @@ topology_template:
       description: Indicates availability zone is enabled
       required: false
       default: false
-      status: SUPPORTED
+      status: supported
     service_template_name:
       hidden: false
       immutable: false
       type: string
       description: Service template name
       required: false
-      status: SUPPORTED
+      status: supported
     ordered_interfaces:
       hidden: false
       immutable: false
@@ -46,28 +46,28 @@ topology_template:
       description: Indicates if service interface are ordered
       required: false
       default: false
-      status: SUPPORTED
+      status: supported
     flavor:
       hidden: false
       immutable: false
       type: string
       description: flavor
       required: false
-      status: SUPPORTED
+      status: supported
     image_name:
       hidden: false
       immutable: false
       type: string
       description: Image name
       required: true
-      status: SUPPORTED
+      status: supported
     service_type:
       hidden: false
       immutable: false
       type: string
       description: Service type
       required: true
-      status: SUPPORTED
+      status: supported
       constraints:
       - valid_values:
         - firewall
@@ -80,7 +80,7 @@ topology_template:
       type: list
       description: List of interface types
       required: true
-      status: SUPPORTED
+      status: supported
       entry_schema:
         type: string
         constraints:
@@ -95,14 +95,14 @@ topology_template:
       type: string
       description: Service instance name
       required: true
-      status: SUPPORTED
+      status: supported
     interface_list:
       hidden: false
       immutable: false
       type: list
       description: List of interfaces
       required: false
-      status: SUPPORTED
+      status: supported
       entry_schema:
         type: org.openecomp.datatypes.heat.network.contrail.InterfaceData
     service_mode:
@@ -111,7 +111,7 @@ topology_template:
       type: string
       description: Service mode
       required: true
-      status: SUPPORTED
+      status: supported
       constraints:
       - valid_values:
         - transparent
@@ -123,7 +123,7 @@ topology_template:
       type: list
       description: Shared ips enabled
       required: false
-      status: SUPPORTED
+      status: supported
       entry_schema:
         type: boolean
   node_templates:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/GlobalSubstitutionTypesServiceTemplate.yaml
index fc83a30f88..f3c9d01783 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -11,225 +11,225 @@ node_types:
       port_plt_oam_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_plt_data_port_0_allowed_address_pairs:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.network.AddressPair
       port_plt_oam_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_plt_oam_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_plt_config_drive:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: boolean
       port_plt_data_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_plt_internal_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_plt_data_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_plt_internal_port_0_replacement_policy:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_plt_data_port_0_security_groups:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_plt_oam_port_0_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_plt_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_plt_internal_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_plt_data_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_plt_data_port_0_replacement_policy:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_plt_internal_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_plt_data_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_plt_oam_port_0_security_groups:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_plt_oam_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_plt_internal_port_0_allowed_address_pairs:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.network.AddressPair
       port_plt_internal_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       compute_plt_metadata:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_plt_internal_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_plt_oam_port_0_fixed_ips:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
       port_plt_internal_port_0_security_groups:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_plt_data_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_plt_oam_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_plt_oam_port_0_replacement_policy:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_plt_oam_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_plt_data_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_plt_internal_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_plt_internal_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_plt_oam_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       compute_plt_image_update_policy:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_plt_oam_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_plt_internal_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_plt_data_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_plt_data_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       compute_plt_user_data_format:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_plt_internal_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_plt_data_port_0_fixed_ips:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
       index_value:
@@ -237,55 +237,55 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       port_plt_data_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_plt_internal_port_0_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_plt_oam_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       compute_plt_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_plt_internal_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_plt_data_port_0_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_plt_data_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_plt_oam_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_plt_oam_port_0_allowed_address_pairs:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.network.AddressPair
     requirements:
@@ -804,277 +804,277 @@ node_types:
       compute_app_scheduler_hints:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_app_data_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_app_internal_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_app_oam_port_0_security_groups:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_app_internal_port_0_allowed_address_pairs:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.network.AddressPair
       port_app_oam_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_app_internal_port_0_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_app_internal_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_app_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_app_config_drive:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: boolean
       port_app_data_port_0_replacement_policy:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_app_oam_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_app_data_port_0_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_app_oam_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_app_oam_port_0_fixed_ips:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
       port_app_internal_port_0_replacement_policy:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_app_data_port_0_fixed_ips:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
       port_app_data_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_app_data_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       compute_app_metadata:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_app_oam_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_app_internal_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_app_oam_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_app_internal_port_0_security_groups:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_app_oam_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_app_internal_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_app_data_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_app_internal_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_app_oam_port_0_replacement_policy:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_app_data_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_app_data_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_app_data_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_app_internal_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_app_data_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       compute_app_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_app_oam_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_app_data_port_0_security_groups:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_app_oam_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_app_oam_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_app_data_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_app_data_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_app_internal_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_app_image_update_policy:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_app_internal_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_app_oam_port_0_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_app_oam_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_app_user_data_format:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_app_internal_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_app_internal_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_app:
         capability: tosca.capabilities.Node
@@ -1591,237 +1591,237 @@ node_types:
       port_iox_oam_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_iox_oam_port_0_fixed_ips:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
       port_iox_data_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_iox_oam_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_iox_data_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_iox_oam_port_0_replacement_policy:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_iox_oam_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_iox_internal_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       compute_iox_user_data_format:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_iox_internal_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_iox_data_port_0_allowed_address_pairs:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.network.AddressPair
       port_iox_data_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_iox_internal_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       compute_iox_config_drive:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: boolean
       port_iox_internal_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_iox_internal_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_iox_data_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_iox_internal_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_iox_oam_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       compute_iox_image_update_policy:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_iox_data_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_iox_data_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_iox_internal_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_iox_oam_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_iox_data_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       compute_iox_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_iox_oam_port_0_allowed_address_pairs:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.network.AddressPair
       port_iox_oam_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_iox_internal_port_0_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_iox_internal_port_0_allowed_address_pairs:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.network.AddressPair
       port_iox_oam_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_iox_data_port_0_fixed_ips:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
       port_iox_data_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_iox_oam_port_0_security_groups:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_iox_internal_port_0_security_groups:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_iox_oam_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_iox_data_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_iox_data_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_iox_data_port_0_security_groups:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_iox_internal_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_iox_internal_port_0_replacement_policy:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_iox_metadata:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_iox_data_port_0_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       index_value:
@@ -1829,43 +1829,43 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       port_iox_internal_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_iox_internal_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_iox_oam_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_iox_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_iox_oam_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_iox_data_port_0_replacement_policy:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_iox_oam_port_0_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
     requirements:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeDiffImageName/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeDiffImageName/out/GlobalSubstitutionTypesServiceTemplate.yaml
index d73f4cc5bf..301eb03ae3 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeDiffImageName/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeDiffImageName/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -11,11 +11,11 @@ node_types:
       port_pd_server_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       index_value:
@@ -23,73 +23,73 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       compute_pd_server_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_pd_server_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd_server_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_pd_server_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pd_server_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       compute_pd_server_user_data_format:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd_server_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_pd_server:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeGetAttrBetweenThem/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeGetAttrBetweenThem/out/GlobalSubstitutionTypesServiceTemplate.yaml
index d73f4cc5bf..301eb03ae3 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeGetAttrBetweenThem/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeGetAttrBetweenThem/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -11,11 +11,11 @@ node_types:
       port_pd_server_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       index_value:
@@ -23,73 +23,73 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       compute_pd_server_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_pd_server_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd_server_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_pd_server_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pd_server_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       compute_pd_server_user_data_format:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd_server_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_pd_server:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypePortsConnectedToDiffNetworks/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypePortsConnectedToDiffNetworks/out/GlobalSubstitutionTypesServiceTemplate.yaml
index d73f4cc5bf..301eb03ae3 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypePortsConnectedToDiffNetworks/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypePortsConnectedToDiffNetworks/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -11,11 +11,11 @@ node_types:
       port_pd_server_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       index_value:
@@ -23,73 +23,73 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       compute_pd_server_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_pd_server_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd_server_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_pd_server_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pd_server_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       compute_pd_server_user_data_format:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd_server_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_pd_server:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/twoNovaWithDiffProperties/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/twoNovaWithDiffProperties/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 32bbbd47da..0bb2123c60 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/twoNovaWithDiffProperties/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/twoNovaWithDiffProperties/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -11,17 +11,17 @@ node_types:
       port_pd_server_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_pd_server_key_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd_server_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       index_value:
@@ -29,85 +29,85 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       compute_pd_server_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_pd_server_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd_server_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_pd_server_personality:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       compute_pd_server_image_update_policy:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_pd_server_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pd_server_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       compute_pd_server_user_data_format:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd_server_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_pd_server:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/localNode/novaServerWithFabricConfigurationCapability/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/localNode/novaServerWithFabricConfigurationCapability/out/GlobalSubstitutionTypesServiceTemplate.yaml
index f412838924..f7666a9ab5 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/localNode/novaServerWithFabricConfigurationCapability/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/localNode/novaServerWithFabricConfigurationCapability/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -11,247 +11,247 @@ node_types:
       port_vce_SRIOV2_0_port_binding:vnic_type:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vce_SRIOV1_0_port_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_vce_SRIOV2_0_port_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_vce_SRIOV1_0_port_value_specs:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       compute_vce_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_vce_metadata:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_vce_oam0_port_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_vce_SRIOV1_0_port_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_vce_SRIOV1_0_port_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_vce_SRIOV2_0_port_value_specs:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_vce_SRIOV2_0_port_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_vce_oam0_port_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vce_SRIOV2_0_port_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_vce_oam0_port_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_vce_oam0_port_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_vce_SRIOV1_0_port_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_vce_oam0_port_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_vce_oam0_port_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vce_oam0_port_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_vce_SRIOV1_0_port_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vce_SRIOV2_0_port_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_vce_SRIOV1_0_port_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       compute_vce_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vce_oam0_port_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_vce_SRIOV1_0_port_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_vce_SRIOV2_0_port_admin_state_up:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: boolean
       port_vce_SRIOV2_0_port_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_vce_SRIOV1_0_port_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       port_vce_SRIOV1_0_port_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_vce_SRIOV1_0_port_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_vce_SRIOV2_0_port_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_vce_SRIOV2_0_port_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vce_SRIOV2_0_port_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_vce_SRIOV1_0_port_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vce_SRIOV2_0_port_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_vce_oam0_port_fixed_ips:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
       port_vce_oam0_port_admin_state_up:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: boolean
       port_vce_SRIOV2_0_port_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vce_oam0_port_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_vce_SRIOV2_0_port_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_vce_SRIOV1_0_port_admin_state_up:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: boolean
       compute_vce_user_data_format:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vce_oam0_port_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_vce_oam0_port_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_vce_SRIOV1_0_port_binding:vnic_type:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
     requirements:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 9456835eca..70b7cfdabf 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -11,92 +11,92 @@ node_types:
       server_group:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       connectivityChk:
         type: json
         required: true
-        status: SUPPORTED
+        status: supported
       availabilityzone_name:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_gw:
         type: string
         description: CPS network gateway
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_image_name:
         type: string
         description: PCRF CM image name
         required: true
-        status: SUPPORTED
+        status: supported
       security_group_name:
         type: string
         description: the name of security group
         required: true
-        status: SUPPORTED
+        status: supported
       cps_net_ip:
         type: string
         description: CPS network ip
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_flavor_name:
         type: string
         description: flavor name of PCRF CM instance
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_vol:
         type: string
         description: CPS Cluman Cinder Volume
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_server_name:
         type: string
         description: PCRF CM server name
         required: true
-        status: SUPPORTED
+        status: supported
       cps_net_name:
         type: string
         description: CPS network name
         required: true
-        status: SUPPORTED
+        status: supported
       cps_net_mask:
         type: string
         description: CPS network mask
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_ip:
         type: string
         description: OAM network ip
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_mask:
         type: string
         description: CPS network mask
         required: true
-        status: SUPPORTED
+        status: supported
       pcma_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_name:
         type: string
         description: OAM network name
         required: true
-        status: SUPPORTED
+        status: supported
       pcma_server_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       pcma_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
     attributes:
       portId:
         type: string
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_pcm_port_2:
         capability: tosca.capabilities.Node
@@ -953,105 +953,105 @@ node_types:
       port_pcm_port_3_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_2_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_2_fixed_ips:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
       port_pcm_port_3_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_3_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_3_security_groups:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_pcm_port_3_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       compute_pcma_server_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_2_security_groups:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_pcm_port_2_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_3_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_pcm_port_2_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_2_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_2_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_pcm_port_3_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_3_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_pcma_server_config_drive:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: boolean
       port_pcm_port_3_fixed_ips:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
       port_pcm_port_3_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       index_value:
@@ -1059,61 +1059,61 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       compute_pcma_server_user_data_format:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pcm_port_2_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_3_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_2_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pcm_port_2_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_pcm_port_2_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_2_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pcm_port_3_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_pcma_server_scheduler_hints:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       compute_pcma_server_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
     requirements:
@@ -1549,164 +1549,164 @@ node_types:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_image_name:
         type: string
         description: PCRF CM image name
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_00_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_01_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_pcm_port_00_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_01_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_pcm_port_01_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_01_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_server_name:
         type: string
         description: PCRF CM server name
         required: true
-        status: SUPPORTED
+        status: supported
       cps_net_mask:
         type: string
         description: CPS network mask
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_name:
         type: string
         description: OAM network name
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_01_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_00_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_00_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pcm_port_00_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       server_group:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       connectivityChk:
         type: json
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_gw:
         type: string
         description: CPS network gateway
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_01_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       security_group_name:
         type: string
         description: the name of security group
         required: true
-        status: SUPPORTED
+        status: supported
       cps_net_ip:
         type: string
         description: CPS network ip
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_00_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_01_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_flavor_name:
         type: string
         description: flavor name of PCRF CM instance
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_00_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_00_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_01_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_vol:
         type: string
         description: CPS Cluman Cinder Volume
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_00_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       cps_net_name:
         type: string
         description: CPS network name
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_ip:
         type: string
         description: OAM network ip
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_mask:
         type: string
         description: CPS network mask
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_01_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
     attributes:
       server_pcm_id:
         type: string
         description: the pcm nova service id
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_pcm_port_00:
         capability: tosca.capabilities.Node
@@ -2139,152 +2139,152 @@ node_types:
       port_1c2_catalog_instance_t1_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_1c2_catalog_instance_t2_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       compute_1c2_catalog_instance_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_1c2_catalog_instance_t1_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_1c2_catalog_instance_t2_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_1c2_catalog_instance_t2_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_1c2_catalog_instance_t1_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_1c2_catalog_instance_t2_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_1c2_catalog_instance_t1_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_1c2_catalog_instance_t2_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_1c2_catalog_instance_t2_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_1c2_catalog_instance_t1_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_1c2_catalog_instance_t2_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       compute_1c2_catalog_instance_metadata:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       compute_1c2_catalog_instance_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_1c2_catalog_instance_t2_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_1c2_catalog_instance_t1_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_1c2_catalog_instance_t2_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_1c2_catalog_instance_t1_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_1c2_catalog_instance_t1_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       compute_1c2_catalog_instance_user_data_format:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_1c2_catalog_instance_t1_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_1c2_catalog_instance_t2_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_1c2_catalog_instance_t1_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_1c2_catalog_instance_scheduler_hints:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
     attributes:
       1c2_catalog_instance_instance_name:
         type: string
-        status: SUPPORTED
+        status: supported
       1c2_catalog_instance_1c2_catalog_instance_t1_port_0_tenant_id:
         type: string
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_1c2_catalog_instance:
         capability: tosca.capabilities.Node
@@ -2717,105 +2717,105 @@ node_types:
       port_pcm_port_1_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pcm_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_1_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_0_fixed_ips:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
       port_pcm_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_0_security_groups:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       compute_pcma_server_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pcm_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pcm_port_1_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_1_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_1_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_1_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pcm_port_1_security_groups:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_pcm_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       compute_pcma_server_config_drive:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: boolean
       index_value:
@@ -2823,57 +2823,57 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       compute_pcma_server_user_data_format:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pcm_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pcm_port_1_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_1_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_pcm_port_1_fixed_ips:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
       compute_pcma_server_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pcm_port_1_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_pcm_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_1_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_pcma_server:
         capability: tosca.capabilities.Node
@@ -3306,146 +3306,146 @@ node_types:
       port_b_single_1b_t1_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_b_single_1b_t1_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_b_single_1b_t2_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_b_single_1b_t1_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_b_single_1b_t2_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_b_single_1b_t1_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_b_single_1b_t2_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_b_single_1b_t2_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_b_single_1b_t1_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       compute_b_single_1b_user_data_format:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_b_single_1b_t2_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_b_single_1b_t2_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_b_single_1b_t1_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       compute_b_single_1b_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_b_single_1b_t1_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       compute_b_single_1b_scheduler_hints:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_b_single_1b_t1_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_b_single_1b_t1_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_b_single_1b_t2_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_b_single_1b_metadata:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_b_single_1b_t2_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_b_single_1b_t2_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_b_single_1b_t2_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       compute_b_single_1b_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
     attributes:
       b_single_1b_instance_name:
         type: string
-        status: SUPPORTED
+        status: supported
       b_single_1b_b_single_1b_t1_port_0_tenant_id:
         type: string
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_b_single_1b:
         capability: tosca.capabilities.Node
@@ -3878,179 +3878,179 @@ node_types:
       compute_1c1_scalling_instance_user_data_format:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_1c1_scalling_instance_t1_port_0_fixed_ips:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
       port_1c1_scalling_instance_t1_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_1c1_scalling_instance_t2_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_1c1_scalling_instance_t1_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_1c1_scalling_instance_t2_port_0_fixed_ips:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
       port_1c1_scalling_instance_t1_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_1c1_scalling_instance_t1_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_1c1_scalling_instance_t2_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_1c1_scalling_instance_t2_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_1c1_scalling_instance_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_1c1_scalling_instance_t2_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_1c1_scalling_instance_t1_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_1c1_scalling_instance_t1_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_1c1_scalling_instance_t2_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       port_1c1_scalling_instance_t1_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_1c1_scalling_instance_t2_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_1c1_scalling_instance_t1_port_0_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_1c1_scalling_instance_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_1c1_scalling_instance_t2_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_1c1_scalling_instance_t2_port_0_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_1c1_scalling_instance_t2_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_1c1_scalling_instance_t1_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       compute_1c1_scalling_instance_scheduler_hints:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_1c1_scalling_instance_t1_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       compute_1c1_scalling_instance_metadata:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_1c1_scalling_instance_t2_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_1c1_scalling_instance_t1_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_1c1_scalling_instance_t2_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
     attributes:
       1c1_scalling_instance_instance_name:
         type: string
-        status: SUPPORTED
+        status: supported
       1c1_scalling_instance_1c1_scalling_instance_t1_port_0_tenant_id:
         type: string
-        status: SUPPORTED
+        status: supported
       1c1_scalling_instance_1c1_scalling_instance_t2_port_0_tenant_id:
         type: string
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_1c1_scalling_instance_1c1_scalling_instance_t2_port_0:
         capability: tosca.capabilities.Node
@@ -4483,83 +4483,83 @@ node_types:
       compute_a_single_1a_metadata:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_1a_t1_port_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_1a_t2_port_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_1a_t2_port_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_1a_t2_port_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_1a_t1_port_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_1a_t1_port_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_1a_t1_port_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_1a_t2_port_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_1a_t2_port_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_1a_t1_port_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_1a_t1_port_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       compute_a_single_1a_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_a_single_1a_scheduler_hints:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       index_value:
@@ -4567,68 +4567,68 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       port_1a_t1_port_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_1a_t1_port_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_1a_t1_port_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_1a_t1_port_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_1a_t2_port_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_1a_t2_port_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_1a_t2_port_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_1a_t2_port_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       compute_a_single_1a_user_data_format:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_a_single_1a_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_1a_t2_port_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
     attributes:
       a_single_1a_instance_name:
         type: string
-        status: SUPPORTED
+        status: supported
       a_single_1a_1a_t1_port_tenant_id:
         type: string
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_a_single_1a_1a_t1_port:
         capability: tosca.capabilities.Node
@@ -5061,152 +5061,152 @@ node_types:
       port_b_single_1b_t1_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_b_single_1b_t1_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_b_single_1b_t2_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_b_single_1b_t1_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_b_single_1b_t2_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_b_single_1b_t1_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_b_single_1b_t2_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_b_single_1b_t2_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_b_single_1b_t1_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       compute_b_single_1b_user_data_format:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_b_single_1b_t2_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_b_single_1b_t2_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_b_single_1b_t1_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_b_single_1b_t1_port_0_value_specs:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       compute_b_single_1b_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_b_single_1b_t1_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       compute_b_single_1b_scheduler_hints:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_b_single_1b_t1_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_b_single_1b_t1_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_b_single_1b_t2_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_b_single_1b_t1_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_b_single_1b_t2_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_b_single_1b_t2_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_b_single_1b_t2_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       compute_b_single_1b_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
     attributes:
       b_single_1b_instance_name:
         type: string
-        status: SUPPORTED
+        status: supported
       b_single_1b_b_single_1b_t1_port_0_tenant_id:
         type: string
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_b_single_1b:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml
index b6567195b3..e5d44b6a79 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -11,88 +11,88 @@ node_types:
       server_group:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       availabilityzone_name:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_gw:
         type: string
         description: CPS network gateway
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_image_name:
         type: string
         description: PCRF CM image name
         required: true
-        status: SUPPORTED
+        status: supported
       security_group_name:
         type: string
         description: the name of security group
         required: true
-        status: SUPPORTED
+        status: supported
       cps_net_ip:
         type: string
         description: CPS network ip
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_flavor_name:
         type: string
         description: flavor name of PCRF CM instance
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_vol:
         type: string
         description: CPS Cluman Cinder Volume
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_server_name:
         type: string
         description: PCRF CM server name
         required: true
-        status: SUPPORTED
+        status: supported
       cps_net_name:
         type: string
         description: CPS network name
         required: true
-        status: SUPPORTED
+        status: supported
       cps_net_mask:
         type: string
         description: CPS network mask
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_ip:
         type: string
         description: OAM network ip
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_mask:
         type: string
         description: CPS network mask
         required: true
-        status: SUPPORTED
+        status: supported
       pcma_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_name:
         type: string
         description: OAM network name
         required: true
-        status: SUPPORTED
+        status: supported
       pcma_server_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       pcma_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
     attributes:
       portId:
         type: string
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_server_pcma2:
         capability: tosca.capabilities.Node
@@ -949,95 +949,95 @@ node_types:
       port_pcm_port_2_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_2_0_security_groups:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_pcm_port_2_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_2_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_pcm_port_3_0_fixed_ips:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_3_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_pcm_port_3_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       compute_pcma_server_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_3_0_security_groups:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_pcm_port_2_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_2_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pcm_port_2_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_3_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_3_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_pcm_port_2_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       compute_pcma_server_config_drive:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: boolean
       index_value:
@@ -1045,73 +1045,73 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       compute_pcma_server_user_data_format:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pcm_port_3_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pcm_port_2_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_2_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pcm_port_2_0_fixed_ips:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
       port_pcm_port_2_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_3_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_3_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_3_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       compute_pcma_server_scheduler_hints:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       compute_pcma_server_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pcm_port_3_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_3_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_pcma_server:
         capability: tosca.capabilities.Node
@@ -1544,161 +1544,161 @@ node_types:
       port_pcm_port_1_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pcm_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_1_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       availabilityzone_name:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       pcm_image_name:
         type: string
         description: PCRF CM image name
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pcm_port_1_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_server_name:
         type: string
         description: PCRF CM server name
         required: true
-        status: SUPPORTED
+        status: supported
       cps_net_mask:
         type: string
         description: CPS network mask
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_1_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_name:
         type: string
         description: OAM network name
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_1_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       server_group:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       oam_net_gw:
         type: string
         description: CPS network gateway
         required: true
-        status: SUPPORTED
+        status: supported
       security_group_name:
         type: string
         description: the name of security group
         required: true
-        status: SUPPORTED
+        status: supported
       cps_net_ip:
         type: string
         description: CPS network ip
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_1_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_1_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       pcm_flavor_name:
         type: string
         description: flavor name of PCRF CM instance
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_vol:
         type: string
         description: CPS Cluman Cinder Volume
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_1_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_pcm_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       cps_net_name:
         type: string
         description: CPS network name
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_ip:
         type: string
         description: OAM network ip
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_mask:
         type: string
         description: CPS network mask
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_1_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
     attributes:
       server_pcm_id:
         type: string
         description: the pcm nova service id
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_pcm_port_1:
         capability: tosca.capabilities.Node
@@ -2131,146 +2131,146 @@ node_types:
       port_1c2_catalog_instance_t1_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_1c2_catalog_instance_t2_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       compute_1c2_catalog_instance_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_1c2_catalog_instance_t1_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_1c2_catalog_instance_t2_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_1c2_catalog_instance_t2_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_1c2_catalog_instance_t1_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_1c2_catalog_instance_t2_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_1c2_catalog_instance_t1_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_1c2_catalog_instance_t2_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_1c2_catalog_instance_t2_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_1c2_catalog_instance_t1_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_1c2_catalog_instance_t2_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       compute_1c2_catalog_instance_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_1c2_catalog_instance_t2_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_1c2_catalog_instance_t1_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_1c2_catalog_instance_t2_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_1c2_catalog_instance_t1_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_1c2_catalog_instance_t1_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       compute_1c2_catalog_instance_user_data_format:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_1c2_catalog_instance_t1_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_1c2_catalog_instance_t2_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_1c2_catalog_instance_t1_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_1c2_catalog_instance_scheduler_hints:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
     attributes:
       1c2_catalog_instance_instance_name:
         type: string
-        status: SUPPORTED
+        status: supported
       1c2_catalog_instance_1c2_catalog_instance_t1_port_0_tenant_id:
         type: string
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_1c2_catalog_instance:
         capability: tosca.capabilities.Node
@@ -2703,85 +2703,85 @@ node_types:
       port_pcm_port_0_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_1_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_1_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_0_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       compute_pcma_server_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pcm_port_0_0_security_groups:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_pcm_port_1_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_pcm_port_0_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_1_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_0_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_1_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_pcm_port_0_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_1_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_1_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_1_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       compute_pcma_server_config_drive:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: boolean
       index_value:
@@ -2789,75 +2789,75 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       compute_pcma_server_user_data_format:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pcm_port_0_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pcm_port_0_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_0_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_1_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pcm_port_0_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_pcm_port_1_0_security_groups:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_pcm_port_0_0_fixed_ips:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
       port_pcm_port_1_0_fixed_ips:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
       port_pcm_port_0_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       compute_pcma_server_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pcm_port_1_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
     requirements:
@@ -3292,140 +3292,140 @@ node_types:
       port_b_single_1b_t1_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_b_single_1b_t1_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_b_single_1b_t2_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_b_single_1b_t1_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_b_single_1b_t2_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_b_single_1b_t1_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_b_single_1b_t2_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_b_single_1b_t2_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_b_single_1b_t1_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       compute_b_single_1b_user_data_format:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_b_single_1b_t2_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_b_single_1b_t2_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_b_single_1b_t1_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       compute_b_single_1b_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_b_single_1b_t1_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       compute_b_single_1b_scheduler_hints:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_b_single_1b_t1_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_b_single_1b_t1_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_b_single_1b_t2_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_b_single_1b_t2_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_b_single_1b_t2_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_b_single_1b_t2_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       compute_b_single_1b_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
     attributes:
       b_single_1b_instance_name:
         type: string
-        status: SUPPORTED
+        status: supported
       b_single_1b_b_single_1b_t1_port_0_tenant_id:
         type: string
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_b_single_1b:
         capability: tosca.capabilities.Node
@@ -3858,170 +3858,170 @@ node_types:
       compute_1c1_scalling_instance_user_data_format:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_1c1_scalling_instance_t1_port_0_fixed_ips:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
       port_1c1_scalling_instance_t1_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_1c1_scalling_instance_t2_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_1c1_scalling_instance_t1_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_1c1_scalling_instance_t2_port_0_fixed_ips:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
       port_1c1_scalling_instance_t1_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_1c1_scalling_instance_t1_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_1c1_scalling_instance_t2_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_1c1_scalling_instance_t2_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_1c1_scalling_instance_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_1c1_scalling_instance_t2_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_1c1_scalling_instance_t1_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_1c1_scalling_instance_t1_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_1c1_scalling_instance_t2_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       port_1c1_scalling_instance_t1_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_1c1_scalling_instance_t2_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_1c1_scalling_instance_t1_port_0_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_1c1_scalling_instance_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_1c1_scalling_instance_t2_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_1c1_scalling_instance_t2_port_0_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_1c1_scalling_instance_t2_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_1c1_scalling_instance_t1_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       compute_1c1_scalling_instance_scheduler_hints:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_1c1_scalling_instance_t1_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_1c1_scalling_instance_t2_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_1c1_scalling_instance_t1_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_1c1_scalling_instance_t2_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
     attributes:
       1c1_scalling_instance_instance_name:
         type: string
-        status: SUPPORTED
+        status: supported
       1c1_scalling_instance_1c1_scalling_instance_t2_port_0_tenant_id:
         type: string
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_1c1_scalling_instance_1c1_scalling_instance_t2_port_0:
         capability: tosca.capabilities.Node
@@ -4454,83 +4454,83 @@ node_types:
       port_a_single_1a_t1_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_a_single_1a_t1_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_a_single_1a_t2_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_a_single_1a_t2_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_a_single_1a_t2_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_a_single_1a_t1_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_a_single_1a_t1_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_a_single_1a_t2_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_a_single_1a_t1_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_a_single_1a_t1_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_a_single_1a_t2_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_a_single_1a_t2_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_a_single_1a_t1_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_a_single_1a_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_a_single_1a_scheduler_hints:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       index_value:
@@ -4538,62 +4538,62 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       port_a_single_1a_t1_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_a_single_1a_t1_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_a_single_1a_t1_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_a_single_1a_t2_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_a_single_1a_t2_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_a_single_1a_t2_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       compute_a_single_1a_user_data_format:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_a_single_1a_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_a_single_1a_t2_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
     attributes:
       a_single_1a_a_single_1a_t1_port_0_tenant_id:
         type: string
-        status: SUPPORTED
+        status: supported
       a_single_1a_instance_name:
         type: string
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_a_single_1a_a_single_1a_t2_port_0:
         capability: tosca.capabilities.Node
@@ -5026,146 +5026,146 @@ node_types:
       port_b_single_1b_t1_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_b_single_1b_t1_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_b_single_1b_t2_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_b_single_1b_t1_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_b_single_1b_t2_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_b_single_1b_t1_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_b_single_1b_t2_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_b_single_1b_t2_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_b_single_1b_t1_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       compute_b_single_1b_user_data_format:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_b_single_1b_t2_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_b_single_1b_t2_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_b_single_1b_t1_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       compute_b_single_1b_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_b_single_1b_t1_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       compute_b_single_1b_scheduler_hints:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_b_single_1b_t1_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_b_single_1b_t1_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_b_single_1b_t2_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_b_single_1b_t1_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_b_single_1b_t2_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_b_single_1b_t2_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_b_single_1b_t2_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       compute_b_single_1b_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
     attributes:
       b_single_1b_instance_name:
         type: string
-        status: SUPPORTED
+        status: supported
       b_single_1b_b_single_1b_t1_port_0_tenant_id:
         type: string
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_b_single_1b:
         capability: tosca.capabilities.Node
@@ -5598,15 +5598,15 @@ node_types:
       security_group_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       net_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
     attributes:
       output1:
         type: string
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_jsa_security_group_1:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/GlobalSubstitutionTypesServiceTemplate.yaml
index e91c84e002..24d5c6b93e 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -11,88 +11,88 @@ node_types:
       server_group:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       availabilityzone_name:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_gw:
         type: string
         description: CPS network gateway
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_image_name:
         type: string
         description: PCRF CM image name
         required: true
-        status: SUPPORTED
+        status: supported
       security_group_name:
         type: string
         description: the name of security group
         required: true
-        status: SUPPORTED
+        status: supported
       cps_net_ip:
         type: string
         description: CPS network ip
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_flavor_name:
         type: string
         description: flavor name of PCRF CM instance
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_vol:
         type: string
         description: CPS Cluman Cinder Volume
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_server_name:
         type: string
         description: PCRF CM server name
         required: true
-        status: SUPPORTED
+        status: supported
       cps_net_name:
         type: string
         description: CPS network name
         required: true
-        status: SUPPORTED
+        status: supported
       cps_net_mask:
         type: string
         description: CPS network mask
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_ip:
         type: string
         description: OAM network ip
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_mask:
         type: string
         description: CPS network mask
         required: true
-        status: SUPPORTED
+        status: supported
       pcma_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_name:
         type: string
         description: OAM network name
         required: true
-        status: SUPPORTED
+        status: supported
       pcma_server_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       pcma_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
     attributes:
       portId:
         type: string
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_pcm_port_2:
         capability: tosca.capabilities.Node
@@ -949,105 +949,105 @@ node_types:
       port_pcm_port_3_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_2_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_2_fixed_ips:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
       port_pcm_port_3_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_3_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_3_security_groups:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_pcm_port_3_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       compute_pcma_server_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_2_security_groups:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_pcm_port_2_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_3_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_pcm_port_2_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_2_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_2_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_pcm_port_3_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_3_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_pcma_server_config_drive:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: boolean
       port_pcm_port_3_fixed_ips:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
       port_pcm_port_3_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       index_value:
@@ -1055,61 +1055,61 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       compute_pcma_server_user_data_format:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pcm_port_2_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_3_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_2_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pcm_port_2_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_pcm_port_2_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_2_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pcm_port_3_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_pcma_server_scheduler_hints:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       compute_pcma_server_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
     requirements:
@@ -1545,160 +1545,160 @@ node_types:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_image_name:
         type: string
         description: PCRF CM image name
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_00_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_01_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_pcm_port_00_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_01_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_pcm_port_01_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_01_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_server_name:
         type: string
         description: PCRF CM server name
         required: true
-        status: SUPPORTED
+        status: supported
       cps_net_mask:
         type: string
         description: CPS network mask
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_name:
         type: string
         description: OAM network name
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_01_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_00_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_00_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pcm_port_00_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       server_group:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_gw:
         type: string
         description: CPS network gateway
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_01_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       security_group_name:
         type: string
         description: the name of security group
         required: true
-        status: SUPPORTED
+        status: supported
       cps_net_ip:
         type: string
         description: CPS network ip
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_00_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_01_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_flavor_name:
         type: string
         description: flavor name of PCRF CM instance
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_00_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_00_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_01_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_vol:
         type: string
         description: CPS Cluman Cinder Volume
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_00_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       cps_net_name:
         type: string
         description: CPS network name
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_ip:
         type: string
         description: OAM network ip
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_mask:
         type: string
         description: CPS network mask
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_01_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
     attributes:
       server_pcm_id:
         type: string
         description: the pcm nova service id
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_pcm_port_00:
         capability: tosca.capabilities.Node
@@ -2131,146 +2131,146 @@ node_types:
       port_1c2_catalog_instance_t1_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_1c2_catalog_instance_t2_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       compute_1c2_catalog_instance_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_1c2_catalog_instance_t1_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_1c2_catalog_instance_t2_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_1c2_catalog_instance_t2_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_1c2_catalog_instance_t1_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_1c2_catalog_instance_t2_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_1c2_catalog_instance_t1_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_1c2_catalog_instance_t2_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_1c2_catalog_instance_t2_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_1c2_catalog_instance_t1_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_1c2_catalog_instance_t2_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       compute_1c2_catalog_instance_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_1c2_catalog_instance_t2_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_1c2_catalog_instance_t1_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_1c2_catalog_instance_t2_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_1c2_catalog_instance_t1_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_1c2_catalog_instance_t1_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       compute_1c2_catalog_instance_user_data_format:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_1c2_catalog_instance_t1_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_1c2_catalog_instance_t2_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_1c2_catalog_instance_t1_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_1c2_catalog_instance_scheduler_hints:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
     attributes:
       1c2_catalog_instance_instance_name:
         type: string
-        status: SUPPORTED
+        status: supported
       1c2_catalog_instance_1c2_catalog_instance_t1_port_0_tenant_id:
         type: string
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_1c2_catalog_instance:
         capability: tosca.capabilities.Node
@@ -2703,105 +2703,105 @@ node_types:
       port_pcm_port_1_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pcm_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_1_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_0_fixed_ips:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
       port_pcm_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_0_security_groups:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       compute_pcma_server_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pcm_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pcm_port_1_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_1_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_1_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_1_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pcm_port_1_security_groups:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_pcm_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       compute_pcma_server_config_drive:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: boolean
       index_value:
@@ -2809,57 +2809,57 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       compute_pcma_server_user_data_format:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pcm_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pcm_port_1_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_1_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_pcm_port_1_fixed_ips:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
       compute_pcma_server_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pcm_port_1_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_pcm_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_1_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_pcma_server:
         capability: tosca.capabilities.Node
@@ -3292,140 +3292,140 @@ node_types:
       port_b_single_1b_t1_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_b_single_1b_t1_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_b_single_1b_t2_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_b_single_1b_t1_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_b_single_1b_t2_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_b_single_1b_t1_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_b_single_1b_t2_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_b_single_1b_t2_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_b_single_1b_t1_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       compute_b_single_1b_user_data_format:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_b_single_1b_t2_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_b_single_1b_t2_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_b_single_1b_t1_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       compute_b_single_1b_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_b_single_1b_t1_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       compute_b_single_1b_scheduler_hints:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_b_single_1b_t1_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_b_single_1b_t1_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_b_single_1b_t2_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_b_single_1b_t2_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_b_single_1b_t2_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_b_single_1b_t2_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       compute_b_single_1b_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
     attributes:
       b_single_1b_instance_name:
         type: string
-        status: SUPPORTED
+        status: supported
       b_single_1b_b_single_1b_t1_port_0_tenant_id:
         type: string
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_b_single_1b:
         capability: tosca.capabilities.Node
@@ -3858,170 +3858,170 @@ node_types:
       compute_1c1_scalling_instance_user_data_format:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_1c1_scalling_instance_t1_port_0_fixed_ips:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
       port_1c1_scalling_instance_t1_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_1c1_scalling_instance_t2_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_1c1_scalling_instance_t1_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_1c1_scalling_instance_t2_port_0_fixed_ips:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
       port_1c1_scalling_instance_t1_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_1c1_scalling_instance_t1_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_1c1_scalling_instance_t2_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_1c1_scalling_instance_t2_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_1c1_scalling_instance_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_1c1_scalling_instance_t2_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_1c1_scalling_instance_t1_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_1c1_scalling_instance_t1_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_1c1_scalling_instance_t2_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       port_1c1_scalling_instance_t1_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_1c1_scalling_instance_t2_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_1c1_scalling_instance_t1_port_0_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_1c1_scalling_instance_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_1c1_scalling_instance_t2_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_1c1_scalling_instance_t2_port_0_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_1c1_scalling_instance_t2_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_1c1_scalling_instance_t1_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       compute_1c1_scalling_instance_scheduler_hints:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_1c1_scalling_instance_t1_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_1c1_scalling_instance_t2_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_1c1_scalling_instance_t1_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_1c1_scalling_instance_t2_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
     attributes:
       1c1_scalling_instance_instance_name:
         type: string
-        status: SUPPORTED
+        status: supported
       1c1_scalling_instance_1c1_scalling_instance_t2_port_0_tenant_id:
         type: string
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_1c1_scalling_instance_1c1_scalling_instance_t2_port_0:
         capability: tosca.capabilities.Node
@@ -4454,77 +4454,77 @@ node_types:
       port_1a_t1_port_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_1a_t2_port_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_1a_t2_port_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_1a_t2_port_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_1a_t1_port_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_1a_t1_port_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_1a_t1_port_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_1a_t2_port_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_1a_t2_port_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_1a_t1_port_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_1a_t1_port_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       compute_a_single_1a_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_a_single_1a_scheduler_hints:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       index_value:
@@ -4532,68 +4532,68 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       port_1a_t1_port_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_1a_t1_port_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_1a_t1_port_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_1a_t1_port_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_1a_t2_port_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_1a_t2_port_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_1a_t2_port_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_1a_t2_port_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       compute_a_single_1a_user_data_format:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_a_single_1a_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_1a_t2_port_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
     attributes:
       a_single_1a_instance_name:
         type: string
-        status: SUPPORTED
+        status: supported
       a_single_1a_1a_t1_port_tenant_id:
         type: string
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_a_single_1a_1a_t1_port:
         capability: tosca.capabilities.Node
@@ -5026,146 +5026,146 @@ node_types:
       port_b_single_1b_t1_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_b_single_1b_t1_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_b_single_1b_t2_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_b_single_1b_t1_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_b_single_1b_t2_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_b_single_1b_t1_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_b_single_1b_t2_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_b_single_1b_t2_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_b_single_1b_t1_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       compute_b_single_1b_user_data_format:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_b_single_1b_t2_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_b_single_1b_t2_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_b_single_1b_t1_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       compute_b_single_1b_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_b_single_1b_t1_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       compute_b_single_1b_scheduler_hints:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_b_single_1b_t1_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_b_single_1b_t1_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_b_single_1b_t2_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_b_single_1b_t1_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_b_single_1b_t2_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_b_single_1b_t2_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_b_single_1b_t2_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       compute_b_single_1b_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
     attributes:
       b_single_1b_instance_name:
         type: string
-        status: SUPPORTED
+        status: supported
       b_single_1b_b_single_1b_t1_port_0_tenant_id:
         type: string
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_b_single_1b:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 54fa35bba8..572d0643bf 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -11,92 +11,92 @@ node_types:
       server_group:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       connectivityChk:
         type: json
         required: true
-        status: SUPPORTED
+        status: supported
       availabilityzone_name:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_gw:
         type: string
         description: CPS network gateway
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_image_name:
         type: string
         description: PCRF CM image name
         required: true
-        status: SUPPORTED
+        status: supported
       security_group_name:
         type: string
         description: the name of security group
         required: true
-        status: SUPPORTED
+        status: supported
       cps_net_ip:
         type: string
         description: CPS network ip
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_flavor_name:
         type: string
         description: flavor name of PCRF CM instance
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_vol:
         type: string
         description: CPS Cluman Cinder Volume
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_server_name:
         type: string
         description: PCRF CM server name
         required: true
-        status: SUPPORTED
+        status: supported
       cps_net_name:
         type: string
         description: CPS network name
         required: true
-        status: SUPPORTED
+        status: supported
       cps_net_mask:
         type: string
         description: CPS network mask
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_ip:
         type: string
         description: OAM network ip
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_mask:
         type: string
         description: CPS network mask
         required: true
-        status: SUPPORTED
+        status: supported
       pcma_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_name:
         type: string
         description: OAM network name
         required: true
-        status: SUPPORTED
+        status: supported
       pcma_server_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       pcma_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
     attributes:
       portId:
         type: string
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_pcm_port_2:
         capability: tosca.capabilities.Node
@@ -953,110 +953,110 @@ node_types:
       compute_1c12_scalling_instance_scheduler_hints:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       compute_1c12_scalling_instance_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_1c12_scalling_instance_t1_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       port_1c12_scalling_instance_t1_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_1c12_scalling_instance_user_data_format:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_1c12_scalling_instance_t1_port_0_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_1c12_scalling_instance_t1_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_1c12_scalling_instance_t1_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_1c12_scalling_instance_t1_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_1c12_scalling_instance_t1_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_1c12_scalling_instance_t1_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_1c12_scalling_instance_t1_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_1c12_scalling_instance_t1_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_1c12_scalling_instance_t1_port_0_fixed_ips:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
       compute_1c12_scalling_instance_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_1c12_scalling_instance_t1_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
     attributes:
       1c12_scalling_instance_1c12_scalling_instance_t1_port_0_tenant_id:
         type: string
-        status: SUPPORTED
+        status: supported
       1c12_scalling_instance_instance_name:
         type: string
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_1c12_scalling_instance:
         capability: tosca.capabilities.Node
@@ -1406,164 +1406,164 @@ node_types:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_image_name:
         type: string
         description: PCRF CM image name
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_00_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_01_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_pcm_port_00_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_01_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_pcm_port_01_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_01_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_server_name:
         type: string
         description: PCRF CM server name
         required: true
-        status: SUPPORTED
+        status: supported
       cps_net_mask:
         type: string
         description: CPS network mask
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_name:
         type: string
         description: OAM network name
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_01_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_00_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_00_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pcm_port_00_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       server_group:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       connectivityChk:
         type: json
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_gw:
         type: string
         description: CPS network gateway
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_01_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       security_group_name:
         type: string
         description: the name of security group
         required: true
-        status: SUPPORTED
+        status: supported
       cps_net_ip:
         type: string
         description: CPS network ip
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_00_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_01_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_flavor_name:
         type: string
         description: flavor name of PCRF CM instance
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_00_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_00_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_01_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_vol:
         type: string
         description: CPS Cluman Cinder Volume
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_00_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       cps_net_name:
         type: string
         description: CPS network name
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_ip:
         type: string
         description: OAM network ip
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_mask:
         type: string
         description: CPS network mask
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_01_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
     attributes:
       server_pcm_id:
         type: string
         description: the pcm nova service id
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_pcm_port_00:
         capability: tosca.capabilities.Node
@@ -1996,110 +1996,110 @@ node_types:
       port_1c11_scalling_instance_t1_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       port_1c11_scalling_instance_t1_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_1c11_scalling_instance_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_1c11_scalling_instance_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_1c11_scalling_instance_user_data_format:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_1c11_scalling_instance_t1_port_0_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_1c11_scalling_instance_t1_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_1c11_scalling_instance_t1_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_1c11_scalling_instance_t1_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_1c11_scalling_instance_t1_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_1c11_scalling_instance_scheduler_hints:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_1c11_scalling_instance_t1_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_1c11_scalling_instance_t1_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_1c11_scalling_instance_t1_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_1c11_scalling_instance_t1_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_1c11_scalling_instance_t1_port_0_fixed_ips:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
     attributes:
       1c11_scalling_instance_instance_name:
         type: string
-        status: SUPPORTED
+        status: supported
       1c11_scalling_instance_1c11_scalling_instance_t1_port_0_tenant_id:
         type: string
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_1c11_scalling_instance_1c11_scalling_instance_t1_port_0:
         capability: tosca.capabilities.Node
@@ -2448,105 +2448,105 @@ node_types:
       port_pcm_port_3_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_2_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_2_fixed_ips:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
       port_pcm_port_3_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_3_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_3_security_groups:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_pcm_port_3_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       compute_pcma_server_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_2_security_groups:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_pcm_port_2_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_3_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_pcm_port_2_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_2_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_2_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_pcm_port_3_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_3_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_pcma_server_config_drive:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: boolean
       port_pcm_port_3_fixed_ips:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
       port_pcm_port_3_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       index_value:
@@ -2554,61 +2554,61 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       compute_pcma_server_user_data_format:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pcm_port_2_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_3_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_2_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pcm_port_2_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_pcm_port_2_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_2_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pcm_port_3_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_pcma_server_scheduler_hints:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       compute_pcma_server_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
     requirements:
@@ -3044,164 +3044,164 @@ node_types:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_image_name:
         type: string
         description: PCRF CM image name
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_00_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_01_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_pcm_port_00_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_01_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_pcm_port_01_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_01_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_server_name:
         type: string
         description: PCRF CM server name
         required: true
-        status: SUPPORTED
+        status: supported
       cps_net_mask:
         type: string
         description: CPS network mask
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_name:
         type: string
         description: OAM network name
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_01_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_00_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_00_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pcm_port_00_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       server_group:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       connectivityChk:
         type: json
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_gw:
         type: string
         description: CPS network gateway
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_01_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       security_group_name:
         type: string
         description: the name of security group
         required: true
-        status: SUPPORTED
+        status: supported
       cps_net_ip:
         type: string
         description: CPS network ip
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_00_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_01_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_flavor_name:
         type: string
         description: flavor name of PCRF CM instance
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_00_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_00_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_01_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_vol:
         type: string
         description: CPS Cluman Cinder Volume
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_00_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       cps_net_name:
         type: string
         description: CPS network name
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_ip:
         type: string
         description: OAM network ip
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_mask:
         type: string
         description: CPS network mask
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_01_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
     attributes:
       server_pcm_id:
         type: string
         description: the pcm nova service id
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_pcm_port_00:
         capability: tosca.capabilities.Node
@@ -3634,143 +3634,143 @@ node_types:
       port_2c2_catalog_instance_201_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       compute_2c2_catalog_instance_user_data_format:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_2c2_catalog_instance_202_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_2c2_catalog_instance_202_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_2c2_catalog_instance_201_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_2c2_catalog_instance_202_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_2c2_catalog_instance_202_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_2c2_catalog_instance_202_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_2c2_catalog_instance_202_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_2c2_catalog_instance_202_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_2c2_catalog_instance_201_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_2c2_catalog_instance_scheduler_hints:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       compute_2c2_catalog_instance_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_2c2_catalog_instance_201_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_2c2_catalog_instance_202_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_2c2_catalog_instance_201_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       port_2c2_catalog_instance_202_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       compute_2c2_catalog_instance_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_2c2_catalog_instance_201_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_2c2_catalog_instance_201_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_2c2_catalog_instance_201_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_2c2_catalog_instance_202_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_2c2_catalog_instance_201_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_2c2_catalog_instance_201_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
     attributes:
       2c2_catalog_instance_instance_name:
         type: string
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_2c2_catalog_instance:
         capability: tosca.capabilities.Node
@@ -4203,75 +4203,75 @@ node_types:
       port_1c2_catalog_instance_201_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_1c2_catalog_instance_202_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       compute_1c2_catalog_instance_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_1c2_catalog_instance_202_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       compute_1c2_catalog_instance_personality:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_1c2_catalog_instance_201_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_1c2_catalog_instance_202_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_1c2_catalog_instance_202_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_1c2_catalog_instance_202_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_1c2_catalog_instance_201_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_1c2_catalog_instance_201_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_1c2_catalog_instance_201_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_1c2_catalog_instance_201_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       index_value:
@@ -4279,76 +4279,76 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       compute_1c2_catalog_instance_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_1c2_catalog_instance_201_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_1c2_catalog_instance_202_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_1c2_catalog_instance_201_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_1c2_catalog_instance_201_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_1c2_catalog_instance_202_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_1c2_catalog_instance_202_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_1c2_catalog_instance_202_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_1c2_catalog_instance_201_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_1c2_catalog_instance_user_data_format:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_1c2_catalog_instance_202_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_1c2_catalog_instance_scheduler_hints:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
     attributes:
       1c2_catalog_instance_instance_name:
         type: string
-        status: SUPPORTED
+        status: supported
       1c2_catalog_instance_1c2_catalog_instance_201_port_0_tenant_id:
         type: string
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_1c2_catalog_instance:
         capability: tosca.capabilities.Node
@@ -4781,27 +4781,27 @@ node_types:
       port_a_single_2a_t1_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_a_single_2a_t1_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       compute_a_single_2a_user_data_format:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_a_single_2a_t1_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_a_single_2a_t1_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       index_value:
@@ -4809,73 +4809,73 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       compute_a_single_2a_scheduler_hints:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       compute_a_single_2a_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_a_single_2a_t1_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_a_single_2a_t1_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       compute_a_single_2a_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_a_single_2a_t1_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_a_single_2a_t1_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_a_single_2a_t1_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_a_single_2a_t1_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       compute_a_single_2a_metadata:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
     attributes:
       a_single_2a_instance_name:
         type: string
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_a_single_2a:
         capability: tosca.capabilities.Node
@@ -5224,105 +5224,105 @@ node_types:
       port_pcm_port_1_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pcm_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_1_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_0_fixed_ips:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
       port_pcm_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_0_security_groups:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       compute_pcma_server_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pcm_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pcm_port_1_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_1_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_1_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_1_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pcm_port_1_security_groups:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_pcm_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       compute_pcma_server_config_drive:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: boolean
       index_value:
@@ -5330,57 +5330,57 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       compute_pcma_server_user_data_format:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pcm_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pcm_port_1_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_1_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_pcm_port_1_fixed_ips:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
       compute_pcma_server_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pcm_port_1_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_pcm_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_1_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_pcma_server:
         capability: tosca.capabilities.Node
@@ -5813,152 +5813,152 @@ node_types:
       port_b_single_1b_t1_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_b_single_1b_t1_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_b_single_1b_t2_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_b_single_1b_t1_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_b_single_1b_t2_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_b_single_1b_t1_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_b_single_1b_t2_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_b_single_1b_t2_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_b_single_1b_t1_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       compute_b_single_1b_user_data_format:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_b_single_1b_t2_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_b_single_1b_t2_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_b_single_1b_t1_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_b_single_1b_t1_port_0_value_specs:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       compute_b_single_1b_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_b_single_1b_t1_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       compute_b_single_1b_scheduler_hints:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_b_single_1b_t1_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_b_single_1b_t1_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_b_single_1b_t2_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_b_single_1b_t1_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_b_single_1b_t2_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_b_single_1b_t2_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_b_single_1b_t2_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       compute_b_single_1b_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
     attributes:
       b_single_1b_instance_name:
         type: string
-        status: SUPPORTED
+        status: supported
       b_single_1b_b_single_1b_t1_port_0_tenant_id:
         type: string
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_b_single_1b:
         capability: tosca.capabilities.Node
@@ -6391,89 +6391,89 @@ node_types:
       compute_a_single_1a_metadata:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_a_single_1a_t1_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_a_single_1a_t1_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_a_single_1a_t2_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_a_single_1a_t2_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_a_single_1a_t2_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_a_single_1a_t1_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_a_single_1a_t1_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_a_single_1a_t2_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_a_single_1a_t1_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_a_single_1a_t1_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_a_single_1a_t2_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_a_single_1a_t2_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_a_single_1a_t1_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_a_single_1a_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_a_single_1a_scheduler_hints:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       index_value:
@@ -6481,62 +6481,62 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       port_a_single_1a_t1_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_a_single_1a_t1_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_a_single_1a_t1_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_a_single_1a_t2_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_a_single_1a_t2_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_a_single_1a_t2_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       compute_a_single_1a_user_data_format:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_a_single_1a_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_a_single_1a_t2_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
     attributes:
       a_single_1a_a_single_1a_t1_port_0_tenant_id:
         type: string
-        status: SUPPORTED
+        status: supported
       a_single_1a_instance_name:
         type: string
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_a_single_1a_a_single_1a_t2_port_0:
         capability: tosca.capabilities.Node
@@ -6969,146 +6969,146 @@ node_types:
       port_b_single_1b_t1_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_b_single_1b_t1_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_b_single_1b_t2_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_b_single_1b_t1_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_b_single_1b_t2_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_b_single_1b_t1_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_b_single_1b_t2_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_b_single_1b_t2_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_b_single_1b_t1_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       compute_b_single_1b_user_data_format:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_b_single_1b_t2_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_b_single_1b_t2_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_b_single_1b_t1_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       compute_b_single_1b_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_b_single_1b_t1_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       compute_b_single_1b_scheduler_hints:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_b_single_1b_t1_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_b_single_1b_t1_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_b_single_1b_t2_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_b_single_1b_metadata:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_b_single_1b_t2_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_b_single_1b_t2_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_b_single_1b_t2_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       compute_b_single_1b_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
     attributes:
       b_single_1b_instance_name:
         type: string
-        status: SUPPORTED
+        status: supported
       b_single_1b_b_single_1b_t1_port_0_tenant_id:
         type: string
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_b_single_1b:
         capability: tosca.capabilities.Node
@@ -7541,69 +7541,69 @@ node_types:
       port_b_single_2b_t2_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_b_single_2b_t1_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_b_single_2b_t1_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_b_single_2b_t2_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_b_single_2b_t2_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_b_single_2b_t2_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_b_single_2b_scheduler_hints:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_b_single_2b_t1_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_b_single_2b_t1_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_b_single_2b_t2_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       compute_b_single_2b_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_b_single_2b_t1_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       index_value:
@@ -7611,79 +7611,79 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       compute_b_single_2b_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_b_single_2b_t1_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_b_single_2b_t2_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_b_single_2b_t2_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       compute_b_single_2b_user_data_format:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_b_single_2b_t2_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_b_single_2b_t1_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_b_single_2b_t1_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_b_single_2b_t1_port_0_value_specs:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_b_single_2b_t1_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_b_single_2b_t2_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_b_single_2b_t1_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_b_single_2b_t2_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
     attributes:
       b_single_2b_instance_name:
         type: string
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_b_single_2b:
         capability: tosca.capabilities.Node
@@ -8116,75 +8116,75 @@ node_types:
       port_b_single_2b_t2_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_b_single_2b_t1_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_b_single_2b_t1_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_b_single_2b_t2_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       compute_b_single_2b_metadata:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_b_single_2b_t2_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_b_single_2b_t2_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_b_single_2b_scheduler_hints:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_b_single_2b_t1_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_b_single_2b_t1_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_b_single_2b_t2_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       compute_b_single_2b_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_b_single_2b_t1_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       index_value:
@@ -8192,67 +8192,67 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       compute_b_single_2b_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_b_single_2b_t1_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_b_single_2b_t2_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_b_single_2b_t2_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       compute_b_single_2b_user_data_format:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_b_single_2b_t2_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_b_single_2b_t1_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_b_single_2b_t1_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_b_single_2b_t2_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_b_single_2b_t1_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_b_single_2b_t2_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
     attributes:
       b_single_2b_instance_name:
         type: string
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_b_single_2b:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 1a92fb8152..c15d41e2c8 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -11,91 +11,91 @@ node_types:
       port_pd_server_nested2_1b_port_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_pd_server_nested2_1b_port_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       port_pd_server_nested2_1b_port_replacement_policy:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd_server_nested2_1b_port_fixed_ips:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
       port_pd_server_nested2_1b_port_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_nested2_1b_port_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_nested2_1b_port_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_pd_server_nested2_1b_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_pd_server_nested2_1b_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_nested2_1b_port_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_pd_server_nested2_1b_port_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_nested2_1b_port_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pd_server_nested2_1b_port_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd_server_nested2_1b_port_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_pd_server_nested2_1b:
         capability: tosca.capabilities.Node
@@ -444,20 +444,20 @@ node_types:
       ps_server_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       name:
         type: string
         description: nested parameter
         required: true
-        status: SUPPORTED
+        status: supported
       net:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       pd_server_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_ps_server_port:
         capability: tosca.capabilities.Node
@@ -646,144 +646,144 @@ node_types:
       pd_server_pattern4_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       p1:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_pattern4_0_mgmt_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       p2:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_pattern4_0_mgmt_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_pattern4_1_mgmt_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_pattern4_1_mgmt_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_pattern4_0_mgmt_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_pattern4_1_mgmt_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       availability_zone_0:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_pattern4_0_mgmt_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       net:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_pattern4_1_mgmt_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       pd_server_pattern4_flavor:
         type: string
         description: Flavor for PD server
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_pattern4_1_mgmt_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_pattern4_1_mgmt_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_pattern4_1_mgmt_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_pd_server_pattern4_1_mgmt_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       security_group_name:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       ps_server_flavor:
         type: string
         description: Flavor for PS server
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_pattern4_0_mgmt_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       pd_server_pattern4_image:
         type: string
         description: Flavor for PD server
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_pattern4_1_mgmt_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_pd_server_pattern4_0_mgmt_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_pattern4_0_mgmt_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_pattern4_0_mgmt_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_pd_server_pattern4_0_mgmt_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       pd_server_pattern4_names:
         type: list
         description: PD server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
     attributes:
       pattern4_attr_1:
         type: string
         description: pattern4_attr_1_value
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_server_pd_pattern4_1:
         capability: tosca.capabilities.Node
@@ -1216,144 +1216,144 @@ node_types:
       pd_server_pattern4_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       p1:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       p2:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_pattern4_1_oam_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_pattern4_0_oam_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_pd_server_pattern4_0_oam_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_pattern4_0_oam_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pd_server_pattern4_0_oam_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_pattern4_0_oam_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_pd_server_pattern4_1_oam_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pd_server_pattern4_0_oam_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       availability_zone_0:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_pattern4_1_oam_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       net:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       pd_server_pattern4_flavor:
         type: string
         description: Flavor for PD server
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_pattern4_0_oam_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       security_group_name:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema: &id001
           type: string
       ps_server_flavor:
         type: string
         description: Flavor for PS server
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_pattern4_1_oam_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_pattern4_1_oam_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       pd_server_pattern4_image:
         type: string
         description: Flavor for PD server
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_pattern4_0_oam_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_pattern4_1_oam_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_pattern4_1_oam_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_pattern4_1_oam_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_pd_server_pattern4_1_oam_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_pattern4_0_oam_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       pd_server_pattern4_names:
         type: list
         description: PD server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema: &id002
           type: string
     attributes:
       pattern4_attr_1:
         type: string
         description: pattern4_attr_1_value
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_pd_server_pattern4_0_oam_port_0:
         capability: tosca.capabilities.Node
@@ -1786,142 +1786,142 @@ node_types:
       pd_server_pattern4_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       p1:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       p2:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_pattern4_1_oam_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_pattern4_0_oam_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_pd_server_pattern4_0_oam_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_pattern4_0_oam_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pd_server_pattern4_0_oam_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_pattern4_0_oam_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_pd_server_pattern4_1_oam_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pd_server_pattern4_0_oam_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       availability_zone_0:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_pattern4_1_oam_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       net:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       pd_server_pattern4_flavor:
         type: string
         description: Flavor for PD server
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_pattern4_0_oam_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       security_group_name:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema: *id001
       ps_server_flavor:
         type: string
         description: Flavor for PS server
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_pattern4_1_oam_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_pattern4_1_oam_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       pd_server_pattern4_image:
         type: string
         description: Flavor for PD server
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_pattern4_0_oam_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_pattern4_1_oam_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_pattern4_1_oam_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_pattern4_1_oam_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_pd_server_pattern4_1_oam_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_pattern4_0_oam_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       pd_server_pattern4_names:
         type: list
         description: PD server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema: *id002
     attributes:
       pattern4_attr_1:
         type: string
         description: pattern4_attr_1_value
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_pd_server_pattern4_0_oam_port_0:
         capability: tosca.capabilities.Node
@@ -2354,21 +2354,21 @@ node_types:
       port_cmaui_1c1_main_mgmt_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_cmaui_1c1_main_mgmt_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui_1c1_main_mgmt_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui_1c1_main_mgmt_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       index_value:
@@ -2376,69 +2376,69 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       port_cmaui_1c1_main_mgmt_port_0_fixed_ips:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui_1c1_main_mgmt_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_cmaui_1c1_main_mgmt_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui_1c1_main_mgmt_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui_1c1_main_mgmt_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui_1c1_main_mgmt_port_0_replacement_policy:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_cmaui_1c1_main_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_cmaui_1c1_main_mgmt_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_cmaui_1c1_main_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_cmaui_1c1_main_mgmt_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_cmaui_1c1_main:
         capability: tosca.capabilities.Node
@@ -2788,95 +2788,95 @@ node_types:
         type: string
         description: Ps Image server
         required: true
-        status: SUPPORTED
+        status: supported
       security_group_name:
         type: string
         description: security_group_name
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_1c1_main_names:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       contrail_net_name:
         type: string
         description: network name of contrail v2 network
         required: true
-        status: SUPPORTED
+        status: supported
       ps_server_main_1b_flavor:
         type: string
         description: Flavor for PS server
         required: true
-        status: SUPPORTED
+        status: supported
       ps_server_main_1b_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       jsa_net_name:
         type: string
         description: network name of jsa network
         required: true
-        status: SUPPORTED
+        status: supported
       jsa_name:
         type: string
         description: network name of jsa log network
         required: true
-        status: SUPPORTED
+        status: supported
       pd_server_main_1b_names:
         type: list
         description: PD server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       cmaui_1c1_main_flavor:
         type: string
         description: Flavor for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       pd_server_main_1b_flavor:
         type: string
         description: Flavor for PD server
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_1c1_main_image:
         type: string
         description: Image for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       ps_server_main_1b_names:
         type: list
         description: Ps server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       name:
         type: string
         description: nested parameter
         required: true
-        status: SUPPORTED
+        status: supported
       availability_zone_0:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_oam_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       pd_server_main_1b_image:
         type: string
         description: PD Image server
         required: true
-        status: SUPPORTED
+        status: supported
       pd_server_main_1b_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_cmaui_1c1_main_11_mgmt_port_0:
         capability: tosca.capabilities.Node
@@ -7025,89 +7025,89 @@ node_types:
       port_ps_server_main_1b_port_fixed_ips:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
       port_ps_server_main_1b_port_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_ps_server_main_1b_port_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_ps_server_main_1b_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_ps_server_main_1b_port_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps_server_main_1b_port_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps_server_main_1b_port_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps_server_main_1b_port_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps_server_main_1b_port_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps_server_main_1b_port_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       compute_ps_server_main_1b_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_ps_server_main_1b_port_replacement_policy:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_ps_server_main_1b_port_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps_server_main_1b_port_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
     requirements:
@@ -7459,95 +7459,95 @@ node_types:
         type: string
         description: Flavor for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_1c1_nested2_names:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       ps_server_nested2_1b_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       security_group_name:
         type: string
         description: security_group_name
         required: true
-        status: SUPPORTED
+        status: supported
       pd_server_nested2_1b_flavor:
         type: string
         description: Flavor for PD server
         required: true
-        status: SUPPORTED
+        status: supported
       contrail_net_name:
         type: string
         description: network name of contrail v2 network
         required: true
-        status: SUPPORTED
+        status: supported
       jsa_net_name:
         type: string
         description: network name of jsa network
         required: true
-        status: SUPPORTED
+        status: supported
       ps_server_nested2_1b_names:
         type: list
         description: Ps server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       pd_server_nested2_1b_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       jsa_name:
         type: string
         description: network name of jsa log network
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_1c1_nested2_image:
         type: string
         description: Image for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       ps_server_nested2_1b_flavor:
         type: string
         description: Flavor for PS server
         required: true
-        status: SUPPORTED
+        status: supported
       pd_server_nested2_1b_names:
         type: list
         description: PD server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       name:
         type: string
         description: nested parameter
         required: true
-        status: SUPPORTED
+        status: supported
       pd_server_nested2_1b_image:
         type: string
         description: PD Image server
         required: true
-        status: SUPPORTED
+        status: supported
       availability_zone_0:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_oam_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       ps_server_nested2_1b_image:
         type: string
         description: Ps Image server
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_server_nested2_ps_1b:
         capability: tosca.capabilities.Node
@@ -9888,15 +9888,15 @@ node_types:
       port_pd_server_main_1b_port_1_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_main_1b_port_1_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_main_1b_port_1_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       index_value:
@@ -9904,73 +9904,73 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       port_pd_server_main_1b_port_1_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_main_1b_port_1_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       compute_pd_server_main_1b_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd_server_main_1b_port_1_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_main_1b_port_1_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_pd_server_main_1b_port_1_fixed_ips:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
       port_pd_server_main_1b_port_1_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_pd_server_main_1b_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd_server_main_1b_port_1_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_main_1b_port_1_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_main_1b_port_1_replacement_policy:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
     requirements:
@@ -10323,89 +10323,89 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       port_pd_server_main_1b_port_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       compute_pd_server_main_1b_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd_server_main_1b_port_replacement_policy:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd_server_main_1b_port_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_main_1b_port_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_main_1b_port_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_main_1b_port_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_pd_server_main_1b_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd_server_main_1b_port_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd_server_main_1b_port_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_pd_server_main_1b_port_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_main_1b_port_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_pd_server_main_1b_port_fixed_ips:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
       port_pd_server_main_1b_port_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_pd_server_main_1b:
         capability: tosca.capabilities.Node
@@ -10755,22 +10755,22 @@ node_types:
         type: string
         description: nested parameter
         required: true
-        status: SUPPORTED
+        status: supported
       name:
         type: string
         description: nested parameter
         required: true
-        status: SUPPORTED
+        status: supported
       indx:
         type: string
         description: nested parameter
         required: true
-        status: SUPPORTED
+        status: supported
       security_group_name:
         type: string
         description: security_group_name
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_jsa_security_group1:
         capability: tosca.capabilities.Node
@@ -10817,21 +10817,21 @@ node_types:
       port_ps_server_main_1b_port_1_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps_server_main_1b_port_1_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_ps_server_main_1b_port_1_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_ps_server_main_1b_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       index_value:
@@ -10839,69 +10839,69 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       port_ps_server_main_1b_port_1_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps_server_main_1b_port_1_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps_server_main_1b_port_1_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps_server_main_1b_port_1_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       compute_ps_server_main_1b_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_ps_server_main_1b_port_1_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_ps_server_main_1b_port_1_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps_server_main_1b_port_1_replacement_policy:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_ps_server_main_1b_port_1_fixed_ips:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
       port_ps_server_main_1b_port_1_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_ps_server_main_1b_ps_server_main_1b_port_1:
         capability: tosca.capabilities.Node
@@ -11250,11 +11250,11 @@ node_types:
       port_cmaui_1c1_nested2_mgmt_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui_1c1_nested2_mgmt_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       index_value:
@@ -11262,79 +11262,79 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       port_cmaui_1c1_nested2_mgmt_port_0_replacement_policy:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_cmaui_1c1_nested2_mgmt_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui_1c1_nested2_mgmt_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui_1c1_nested2_mgmt_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui_1c1_nested2_mgmt_port_0_fixed_ips:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui_1c1_nested2_mgmt_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_cmaui_1c1_nested2_mgmt_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_cmaui_1c1_nested2_mgmt_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       compute_cmaui_1c1_nested2_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_cmaui_1c1_nested2_mgmt_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       compute_cmaui_1c1_nested2_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_cmaui_1c1_nested2_mgmt_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_cmaui_1c1_nested2:
         capability: tosca.capabilities.Node
@@ -11683,91 +11683,91 @@ node_types:
       port_ps_server_nested2_1b_port_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps_server_nested2_1b_port_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_ps_server_nested2_1b_port_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       compute_ps_server_nested2_1b_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_ps_server_nested2_1b_port_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       compute_ps_server_nested2_1b_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_ps_server_nested2_1b_port_replacement_policy:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps_server_nested2_1b_port_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_ps_server_nested2_1b_port_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_ps_server_nested2_1b_port_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps_server_nested2_1b_port_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps_server_nested2_1b_port_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps_server_nested2_1b_port_fixed_ips:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
       port_ps_server_nested2_1b_port_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_ps_server_nested2_1b:
         capability: tosca.capabilities.Node
@@ -12116,21 +12116,21 @@ node_types:
       port_cmaui_1c1_main_mgmt_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_cmaui_1c1_main_mgmt_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui_1c1_main_mgmt_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui_1c1_main_mgmt_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       index_value:
@@ -12138,69 +12138,69 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       port_cmaui_1c1_main_mgmt_port_0_fixed_ips:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui_1c1_main_mgmt_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_cmaui_1c1_main_mgmt_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui_1c1_main_mgmt_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui_1c1_main_mgmt_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui_1c1_main_mgmt_port_0_replacement_policy:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_cmaui_1c1_main_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_cmaui_1c1_main_mgmt_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_cmaui_1c1_main_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_cmaui_1c1_main_mgmt_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_cmaui_1c1_main:
         capability: tosca.capabilities.Node
@@ -12549,142 +12549,142 @@ node_types:
       pd_server_pattern4_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       p1:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       p2:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_pattern4_1_oam_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_pattern4_0_oam_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_pd_server_pattern4_0_oam_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_pattern4_0_oam_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pd_server_pattern4_0_oam_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_pattern4_0_oam_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_pd_server_pattern4_1_oam_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pd_server_pattern4_0_oam_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       availability_zone_0:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_pattern4_1_oam_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       net:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       pd_server_pattern4_flavor:
         type: string
         description: Flavor for PD server
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_pattern4_0_oam_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       security_group_name:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema: *id001
       ps_server_flavor:
         type: string
         description: Flavor for PS server
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_pattern4_1_oam_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_pattern4_1_oam_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       pd_server_pattern4_image:
         type: string
         description: Flavor for PD server
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_pattern4_0_oam_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_pattern4_1_oam_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_pattern4_1_oam_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_pattern4_1_oam_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_pd_server_pattern4_1_oam_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_pattern4_0_oam_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       pd_server_pattern4_names:
         type: list
         description: PD server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema: *id002
     attributes:
       pattern4_attr_1:
         type: string
         description: pattern4_attr_1_value
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_pd_server_pattern4_0_oam_port_0:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/GlobalSubstitutionTypesServiceTemplate.yaml
index c04600a16e..0975553a1a 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -11,97 +11,97 @@ node_types:
       port_pd_server_port_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_pd_server_port_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       port_pd_server_port_security_groups:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       compute_pd_server_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_pd_server_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd_server_port_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_port_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_port_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_port_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_port_fixed_ips:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_port_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_port_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_pd_server_port_replacement_policy:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd_server_port_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pd_server_port_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_pd_server:
         capability: tosca.capabilities.Node
@@ -451,144 +451,144 @@ node_types:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       p1:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui_port_8_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       p2:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       net2:
         type: string
         description: Contrail V2 network
         required: true
-        status: SUPPORTED
+        status: supported
       net1:
         type: string
         description: Neutron network
         required: true
-        status: SUPPORTED
+        status: supported
       indx:
         type: float
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui_port_8_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui_port_7_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_cmaui_port_7_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       availability_zone_0:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       net:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui_port_8_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_cmaui_port_7_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       security_group_name:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_cmaui_port_8_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui_port_8_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui_port_7_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_cmaui_port_7_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_image:
         type: string
         description: Image for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_flavor:
         type: string
         description: Flavor for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui_port_7_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui_port_7_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_cmaui_port_7_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui_port_7_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui_port_8_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       cmaui_oam_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui_port_8_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui_port_8_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui_port_8_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     requirements:
@@ -1023,95 +1023,95 @@ node_types:
       port_oam_server_port_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_oam_server_port_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       port_oam_server_port_security_groups:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_oam_server_port_replacement_policy:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_oam_server_port_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_oam_server_port_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       compute_oam_server_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_oam_server_port_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_oam_server_port_fixed_ips:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
       port_oam_server_port_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_oam_server_port_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_oam_server_port_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_oam_server_port_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       compute_oam_server_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_oam_server_port_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
     requirements:
@@ -1463,80 +1463,80 @@ node_types:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       ps_server_image:
         type: string
         description: Ps Image server
         required: true
-        status: SUPPORTED
+        status: supported
       p2:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       ps_server_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       net2:
         type: string
         description: Contrail V2 network
         required: true
-        status: SUPPORTED
+        status: supported
       net1:
         type: string
         description: Neutron network
         required: true
-        status: SUPPORTED
+        status: supported
       security_group_name:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       ps_server_flavor:
         type: string
         description: Flavor for PS server
         required: true
-        status: SUPPORTED
+        status: supported
       pd_server_names:
         type: list
         description: PD server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       pd_server_flavor:
         type: string
         description: Flavor for PD server
         required: true
-        status: SUPPORTED
+        status: supported
       ps_server_names:
         type: list
         description: Ps server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       pd_server_image:
         type: string
         description: PD Image server
         required: true
-        status: SUPPORTED
+        status: supported
       availability_zone_0:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       net:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       pd_server_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_server_ps:
         capability: tosca.capabilities.Node
@@ -3354,80 +3354,80 @@ node_types:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       p2:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       net2:
         type: string
         description: Contrail V2 network
         required: true
-        status: SUPPORTED
+        status: supported
       net1:
         type: string
         description: Neutron network
         required: true
-        status: SUPPORTED
+        status: supported
       security_group_name:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       sm_server_names:
         type: list
         description: SM server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       oam_server_image:
         type: string
         description: OAM Image server
         required: true
-        status: SUPPORTED
+        status: supported
       oam_server_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       oam_server_flavor:
         type: string
         description: Flavor for OAM server
         required: true
-        status: SUPPORTED
+        status: supported
       sm_server_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       availability_zone_0:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       net:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       oam_server_names:
         type: list
         description: OAM server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       sm_server_flavor:
         type: string
         description: Flavor for SM server
         required: true
-        status: SUPPORTED
+        status: supported
       sm_server_image:
         type: string
         description: SM Image server
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_oam_server_port:
         capability: tosca.capabilities.Node
@@ -4554,93 +4554,93 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       port_sm_server_port_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_sm_server_port_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_sm_server_port_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_sm_server_port_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_sm_server_port_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_sm_server_port_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_sm_server_port_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_sm_server_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_sm_server_port_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_sm_server_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_sm_server_port_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_sm_server_port_replacement_policy:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_sm_server_port_fixed_ips:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
       port_sm_server_port_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_sm_server_port_security_groups:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
     requirements:
@@ -4991,97 +4991,97 @@ node_types:
       port_ps_server_port_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_ps_server_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_ps_server_port_security_groups:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_ps_server_port_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       compute_ps_server_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_ps_server_port_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       port_ps_server_port_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps_server_port_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps_server_port_fixed_ips:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
       port_ps_server_port_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps_server_port_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps_server_port_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_ps_server_port_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps_server_port_replacement_policy:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_ps_server_port_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_ps_server_ps_server_port:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/GlobalSubstitutionTypesServiceTemplate.yaml
index e7bcdefd3c..2bf5c2e5c1 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -11,7 +11,7 @@ node_types:
       port_pd02_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       index_value:
@@ -19,75 +19,75 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       compute_pd_server_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_pd_server_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd02_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd02_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd02_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd02_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd02_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd02_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd02_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pd02_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd02_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       compute_pd_server_user_data_format:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
     requirements:
@@ -438,13 +438,13 @@ node_types:
       port_pd01_port_1_security_groups:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_pd01_port_1_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       index_value:
@@ -452,81 +452,81 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       port_pd01_port_1_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_1_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_1_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_1_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_pd01_port_1_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_1_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_ps_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd01_port_1_replacement_policy:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd01_port_1_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       compute_ps_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd01_port_1_fixed_ips:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
       port_pd01_port_1_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_1_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
     requirements:
@@ -877,31 +877,31 @@ node_types:
       port_pd01_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd01_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_pd01_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       index_value:
@@ -909,51 +909,51 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       compute_pd_server_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_pd_server_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_pd01_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_pd_server_user_data_format:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
     requirements:
@@ -1304,7 +1304,7 @@ node_types:
       port_oam02_port_2_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       index_value:
@@ -1312,87 +1312,87 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       port_oam02_port_2_security_groups:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_oam02_port_2_replacement_policy:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_oam02_port_2_fixed_ips:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
       port_oam02_port_2_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_oam02_port_2_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_oam02_port_2_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_oam02_port_2_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_oam02_port_2_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_oam02_port_2_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_oam02_port_2_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       compute_oam_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_oam02_port_2_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_oam_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_oam02_port_2_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
     requirements:
@@ -1743,11 +1743,11 @@ node_types:
       port_oam01_port_1_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_oam01_port_1_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       index_value:
@@ -1755,83 +1755,83 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       port_oam01_port_1_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_oam01_port_1_security_groups:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_oam01_port_1_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_oam01_port_1_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_oam01_port_1_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_oam01_port_1_replacement_policy:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_oam01_port_1_fixed_ips:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
       compute_oam_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_oam01_port_1_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_oam01_port_1_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_oam01_port_1_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_oam01_port_1_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       compute_oam_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
     requirements:
@@ -2182,97 +2182,97 @@ node_types:
       port_cmaui02_port_2_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_cmaui02_port_2_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_cmaui02_port_2_replacement_policy:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_cmaui02_port_2_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_cmaui_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_cmaui02_port_2_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_cmaui02_port_2_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui02_port_2_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       compute_cmaui_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_cmaui02_port_2_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui02_port_2_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_cmaui02_port_2_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui02_port_2_security_groups:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_cmaui02_port_2_fixed_ips:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
       port_cmaui02_port_2_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_cmaui_cmaui02_port_2:
         capability: tosca.capabilities.Node
@@ -2623,93 +2623,93 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_cmaui_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_cmaui01_port_1_fixed_ips:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
       port_cmaui01_port_1_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       compute_cmaui_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_cmaui01_port_1_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui01_port_1_replacement_policy:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_cmaui01_port_1_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui01_port_1_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_cmaui01_port_1_security_groups:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_cmaui01_port_1_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui01_port_1_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui01_port_1_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_cmaui01_port_1_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui01_port_1_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui01_port_1_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
     requirements:
@@ -3061,49 +3061,49 @@ node_types:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       p1:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       p2:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_image:
         type: string
         description: Image for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_flavor:
         type: string
         description: Flavor for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       security_group_name:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       availability_zone_0:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_oam_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       net:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_server_cmaui_2:
         capability: tosca.capabilities.Node
@@ -5177,49 +5177,49 @@ node_types:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       p2:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_image:
         type: string
         description: Image for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_flavor:
         type: string
         description: Flavor for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       security_group_name:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       oam_names:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       availability_zone_0:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_oam_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       net:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_oam01_port_1:
         capability: tosca.capabilities.Node
@@ -6600,97 +6600,97 @@ node_types:
       port_pd02_port_2_replacement_policy:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd02_port_2_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd02_port_2_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       port_pd02_port_2_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd02_port_2_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_pd02_port_2_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd02_port_2_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd02_port_2_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_pd02_port_2_security_groups:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_pd02_port_2_fixed_ips:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
       port_pd02_port_2_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_ps_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd02_port_2_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       compute_ps_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd02_port_2_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_ps:
         capability: tosca.capabilities.Node
@@ -7040,49 +7040,49 @@ node_types:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       p2:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       ps_names:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       cmaui_image:
         type: string
         description: Image for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_flavor:
         type: string
         description: Flavor for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       security_group_name:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       availability_zone_0:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_oam_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       net:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_pd01_port_1:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/GlobalSubstitutionTypesServiceTemplate.yaml
index e776376302..e3e97ddf08 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -11,83 +11,83 @@ node_types:
       port_pd01_port_01_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_01_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_pd01_port_01_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pd01_port_01_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       compute_pd_server_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_pd_server_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd01_port_01_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_01_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_01_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_01_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_01_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_01_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       compute_pd_server_user_data_format:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
     requirements:
@@ -438,7 +438,7 @@ node_types:
       port_ps02_port_01_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       index_value:
@@ -446,77 +446,77 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       port_ps02_port_01_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_ps02_port_01_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       compute_pd_server_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_pd_server_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_ps02_port_01_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps02_port_01_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps02_port_01_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps02_port_01_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps02_port_01_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps02_port_01_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_pd_server_user_data_format:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_ps02_port_01_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_pd_server_ps02_port_01:
         capability: tosca.capabilities.Node
@@ -865,7 +865,7 @@ node_types:
       port_pd02_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       index_value:
@@ -873,75 +873,75 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       compute_pd_server_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_pd_server_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd02_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd02_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd02_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd02_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd02_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd02_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd02_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pd02_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd02_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       compute_pd_server_user_data_format:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
     requirements:
@@ -1292,83 +1292,83 @@ node_types:
       port_pd01_port_03_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_03_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_03_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       compute_pd_server_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_pd_server_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd01_port_03_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_pd01_port_03_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_03_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_03_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_03_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_03_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd01_port_03_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_pd_server_user_data_format:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
     requirements:
@@ -1719,31 +1719,31 @@ node_types:
       port_pd01_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd01_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_pd01_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       index_value:
@@ -1751,51 +1751,51 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       compute_pd_server_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_pd_server_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_pd01_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_pd_server_user_data_format:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
     requirements:
@@ -2146,11 +2146,11 @@ node_types:
       port_pd02_port_03_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd02_port_03_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       index_value:
@@ -2158,71 +2158,71 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       compute_pd_server_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_pd_server_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd02_port_03_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd02_port_03_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd02_port_03_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd02_port_03_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd02_port_03_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd02_port_03_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd02_port_03_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       compute_pd_server_user_data_format:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd02_port_03_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
     requirements:
@@ -2573,83 +2573,83 @@ node_types:
       port_pd02_port_02_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       port_pd02_port_02_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       compute_pd_server_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_pd_server_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd02_port_02_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd02_port_02_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd02_port_02_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd02_port_02_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_pd02_port_02_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd02_port_02_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd02_port_02_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd02_port_02_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_pd_server_user_data_format:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
     requirements:
@@ -3000,83 +3000,83 @@ node_types:
       port_pd01_port_02_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_pd01_port_02_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       compute_pd_server_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_pd_server_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd01_port_02_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_02_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_02_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_02_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd01_port_02_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_02_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_02_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_pd01_port_02_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       compute_pd_server_user_data_format:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
     requirements:
@@ -3428,49 +3428,49 @@ node_types:
         type: string
         description: Flavor for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       p1:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       p2:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       availabilityzone_name:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       security_group_name:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       pd_image_name:
         type: string
         description: Image for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       pd_server_names:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       net:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_ps02_port_01:
         capability: tosca.capabilities.Node
@@ -5544,49 +5544,49 @@ node_types:
         type: string
         description: Flavor for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       p1:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       p2:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       availabilityzone_name:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       security_group_name:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       pd_image_name:
         type: string
         description: Image for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       pd_server_names:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       net:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_test_nested3Level:
         capability: tosca.capabilities.Node
@@ -6968,49 +6968,49 @@ node_types:
         type: string
         description: Flavor for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       p1:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       p2:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       availabilityzone_name:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       security_group_name:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       pd_image_name:
         type: string
         description: Image for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       pd_server_names:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       net:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_server_pd_31:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 7bef7a1fce..0a54d072d5 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -11,31 +11,31 @@ node_types:
       compute_pd_server_1b_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd_server_1b_port_1_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_1b_port_1_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_pd_server_1b_port_1_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_1b_port_1_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_1b_port_1_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       index_value:
@@ -43,63 +43,63 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       port_pd_server_1b_port_1_fixed_ips:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
       port_pd_server_1b_port_1_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_1b_port_1_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_1b_port_1_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd_server_1b_port_1_replacement_policy:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd_server_1b_port_1_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       compute_pd_server_1b_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd_server_1b_port_1_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
     attributes:
       pd_server_1b_accessIPv4:
         type: string
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_pd_server_1b:
         capability: tosca.capabilities.Node
@@ -448,101 +448,101 @@ node_types:
       port_osm_server_1c2_mgmt_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       port_osm_server_1c2_mgmt_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_osm_server_1c2_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_osm_server_1c2_mgmt_port_0_replacement_policy:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_osm_server_1c2_mgmt_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_osm_server_1c2_mgmt_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_osm_server_1c2_mgmt_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_osm_server_1c2_mgmt_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_osm_server_1c2_mgmt_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_osm_server_1c2_mgmt_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_osm_server_1c2_mgmt_port_0_fixed_ips:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
       compute_osm_server_1c2_metadata:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_osm_server_1c2_mgmt_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_osm_server_1c2_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_osm_server_1c2_mgmt_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
     attributes:
       osm_server_1c2_accessIPv4:
         type: string
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_osm_server_1c2_osm_server_1c2_mgmt_port_0:
         capability: tosca.capabilities.Node
@@ -891,19 +891,19 @@ node_types:
       port_oam_server_1c2_mgmt_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       compute_oam_server_1c2_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_oam_server_1c2_mgmt_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       index_value:
@@ -911,81 +911,81 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       port_oam_server_1c2_mgmt_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_oam_server_1c2_mgmt_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_oam_server_1c2_mgmt_port_0_fixed_ips:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_oam_server_1c2_mgmt_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       compute_oam_server_1c2_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_oam_server_1c2_metadata:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_oam_server_1c2_mgmt_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_oam_server_1c2_mgmt_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_oam_server_1c2_mgmt_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_oam_server_1c2_mgmt_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_oam_server_1c2_mgmt_port_0_replacement_policy:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_oam_server_1c2_mgmt_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
     attributes:
       oam_server_1c2_accessIPv4:
         type: string
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_oam_server_1c2_oam_server_1c2_mgmt_port_0:
         capability: tosca.capabilities.Node
@@ -1335,143 +1335,143 @@ node_types:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       p2:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       pd_server_names:
         type: list
         description: PD server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema: &id001
           type: string
       port_pd_server_1_port_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_pd_server_1_port_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_2_port_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       pd_server_flavor:
         type: string
         description: Flavor for PD server
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_1_port_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_pd_server_2_port_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_1_port_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       availability_zone_0:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       net:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       pd_server_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_1_port_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_2_port_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_1_port_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pd_server_1_port_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_2_port_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_1_port_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       security_group_name:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema: &id002
           type: string
       ps_server_flavor:
         type: string
         description: Flavor for PS server
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_2_port_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_pd_server_2_port_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_2_port_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_pd_server_2_port_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pd_server_2_port_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       pd_server_image:
         type: string
         description: Flavor for PD server
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_1_port_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
     attributes:
       pattern4_attr_1:
         type: string
         description: pattern4_attr_1_value
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_pd_server_2_port:
         capability: tosca.capabilities.Node
@@ -1904,17 +1904,17 @@ node_types:
       port_ps_server_1b_port_1_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_pd_server_1b_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_ps_server_1b_port_1_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       index_value:
@@ -1922,71 +1922,71 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       port_ps_server_1b_port_1_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps_server_1b_port_1_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps_server_1b_port_1_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps_server_1b_port_1_replacement_policy:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_ps_server_1b_port_1_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps_server_1b_port_1_fixed_ips:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
       port_ps_server_1b_port_1_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps_server_1b_port_1_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps_server_1b_port_1_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_pd_server_1b_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_ps_server_1b_port_1_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
     requirements:
@@ -2337,11 +2337,11 @@ node_types:
       port_BE_1c1_mgmt_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_BE_1c1_mgmt_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       index_value:
@@ -2349,83 +2349,83 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       port_BE_1c1_mgmt_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_BE_1c1_mgmt_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       compute_BE_1c1_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_BE_1c1_mgmt_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_BE_1c1_mgmt_port_0_fixed_ips:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
       port_BE_1c1_mgmt_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_BE_1c1_mgmt_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_BE_1c1_mgmt_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_BE_1c1_mgmt_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_BE_1c1_mgmt_port_0_replacement_policy:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_BE_1c1_mgmt_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       compute_BE_1c1_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
     attributes:
       BE_1c1_accessIPv4:
         type: string
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_BE_1c1:
         capability: tosca.capabilities.Node
@@ -2775,121 +2775,121 @@ node_types:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       p2:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_1c1_image:
         type: string
         description: Image for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       ps_server_1b_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       pd_server_1b_names:
         type: list
         description: PD server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       security_group_name:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       oam_server_1c2_image:
         type: string
         description: Image for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_1c1_flavor:
         type: string
         description: Flavor for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       ps_server_1b_names:
         type: list
         description: Ps server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       cmaui_1c1_names:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       pd_server_1b_flavor:
         type: string
         description: Flavor for PD server
         required: true
-        status: SUPPORTED
+        status: supported
       pd_server_1b_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       packet_internal_network_1_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       packet_external_network_1_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       availability_zone_0:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       ps_server_1b_flavor:
         type: string
         description: Flavor for PS server
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_oam_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       ps_server_1b_image:
         type: string
         description: Ps Image server
         required: true
-        status: SUPPORTED
+        status: supported
       net:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       pd_server_1b_image:
         type: string
         description: PD Image server
         required: true
-        status: SUPPORTED
+        status: supported
       oam_server_1c2_flavor:
         type: string
         description: Flavor for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       oam_server_1c2_names:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
     attributes:
       all_pattern_attr_1:
         type: string
         description: all_pattern_attr_1
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_oam_server_1c2_1_mgmt_port_0:
         capability: tosca.capabilities.Node
@@ -5404,21 +5404,21 @@ node_types:
       port_ps_server_1b_port_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_ps_server_1b_port_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps_server_1b_port_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps_server_1b_port_fixed_ips:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
       index_value:
@@ -5426,69 +5426,69 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       compute_rd_server_1b_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_ps_server_1b_port_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps_server_1b_port_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_ps_server_1b_port_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_ps_server_1b_port_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps_server_1b_port_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps_server_1b_port_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps_server_1b_port_replacement_policy:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_rd_server_1b_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_ps_server_1b_port_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_rd_server_1b_ps_server_1b_port:
         capability: tosca.capabilities.Node
@@ -5837,95 +5837,95 @@ node_types:
       port_rd_server_1b_port_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_rd_server_1b_port_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       compute_rd_server_1b_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_rd_server_1b_port_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_rd_server_1b_port_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_rd_server_1b_port_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_rd_server_1b_port_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_rd_server_1b_port_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_rd_server_1b_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_rd_server_1b_port_fixed_ips:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
       port_rd_server_1b_port_replacement_policy:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_rd_server_1b_port_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_rd_server_1b_port_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_rd_server_1b_port_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     attributes:
       rd_server_1b_accessIPv4:
         type: string
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_rd_server_1b_rd_server_1b_port:
         capability: tosca.capabilities.Node
@@ -6275,62 +6275,62 @@ node_types:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       p1:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       p2:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_image:
         type: string
         description: Image for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_flavor:
         type: string
         description: Flavor for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       packet_internal_network_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       packet_external_network_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       security_group_name:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       availability_zone_0:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_oam_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       net:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
     attributes:
       no_compute_attr_1:
         type: string
         description: no_compute_attr_1
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_cmaui_port_12:
         capability: tosca.capabilities.Node
@@ -6562,141 +6562,141 @@ node_types:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       p2:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       pd_server_names:
         type: list
         description: PD server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema: *id001
       port_pd_server_1_port_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_pd_server_1_port_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_2_port_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       pd_server_flavor:
         type: string
         description: Flavor for PD server
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_1_port_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_pd_server_2_port_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_1_port_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       availability_zone_0:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       net:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       pd_server_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_1_port_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_2_port_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_1_port_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pd_server_1_port_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_2_port_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_1_port_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       security_group_name:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema: *id002
       ps_server_flavor:
         type: string
         description: Flavor for PS server
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_2_port_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_pd_server_2_port_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_2_port_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_pd_server_2_port_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pd_server_2_port_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       pd_server_image:
         type: string
         description: Flavor for PD server
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_1_port_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
     attributes:
       pattern4_attr_1:
         type: string
         description: pattern4_attr_1_value
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_pd_server_2_port:
         capability: tosca.capabilities.Node
@@ -7130,141 +7130,141 @@ node_types:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       p2:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       pd_server_names:
         type: list
         description: PD server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema: *id001
       port_pd_server_1_port_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_pd_server_1_port_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_2_port_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       pd_server_flavor:
         type: string
         description: Flavor for PD server
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_1_port_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_pd_server_2_port_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_1_port_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       availability_zone_0:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       net:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       pd_server_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_1_port_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_2_port_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_1_port_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pd_server_1_port_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_2_port_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_1_port_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       security_group_name:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema: *id002
       ps_server_flavor:
         type: string
         description: Flavor for PS server
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_2_port_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_pd_server_2_port_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_2_port_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_pd_server_2_port_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pd_server_2_port_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       pd_server_image:
         type: string
         description: Flavor for PD server
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_1_port_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
     attributes:
       pattern4_attr_1:
         type: string
         description: pattern4_attr_1_value
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_pd_server_2_port:
         capability: tosca.capabilities.Node
@@ -7697,7 +7697,7 @@ node_types:
       port_cmaui_1c1_mgmt_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       index_value:
@@ -7705,87 +7705,87 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       port_cmaui_1c1_mgmt_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_cmaui_1c1_mgmt_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       compute_cmaui_1c1_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_cmaui_1c1_mgmt_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui_1c1_mgmt_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui_1c1_mgmt_port_0_fixed_ips:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
       port_cmaui_1c1_mgmt_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui_1c1_mgmt_port_0_replacement_policy:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_cmaui_1c1_mgmt_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_cmaui_1c1_mgmt_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui_1c1_mgmt_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui_1c1_mgmt_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_cmaui_1c1_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
     attributes:
       cmaui_1c1_accessIPv4:
         type: string
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_cmaui_1c1_cmaui_1c1_mgmt_port_0:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/GlobalSubstitutionTypesServiceTemplate.yaml
index f3636211a1..9d9c8d8951 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -11,19 +11,19 @@ node_types:
       port_oam_server_1c2_mgmt_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       compute_oam_server_1c2_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_oam_server_1c2_mgmt_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       index_value:
@@ -31,71 +31,71 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       port_oam_server_1c2_mgmt_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_oam_server_1c2_mgmt_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_oam_server_1c2_mgmt_port_0_fixed_ips:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_oam_server_1c2_mgmt_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       compute_oam_server_1c2_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_oam_server_1c2_mgmt_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_oam_server_1c2_mgmt_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_oam_server_1c2_mgmt_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_oam_server_1c2_mgmt_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_oam_server_1c2_mgmt_port_0_replacement_policy:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_oam_server_1c2_mgmt_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_oam_server_1c2_oam_server_1c2_mgmt_port_0:
         capability: tosca.capabilities.Node
@@ -444,7 +444,7 @@ node_types:
       compute_pd_server_1b_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       index_value:
@@ -452,83 +452,83 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_1b_port_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_pd_server_1b_port_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pd_server_1b_port_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_1b_port_replacement_policy:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd_server_1b_port_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_1b_port_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_1b_port_fixed_ips:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
       port_pd_server_1b_port_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_pd_server_1b_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd_server_1b_port_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_1b_port_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_1b_port_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_pd_server_1b_port_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_pd_server_1b:
         capability: tosca.capabilities.Node
@@ -878,114 +878,114 @@ node_types:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       p2:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_1c1_image:
         type: string
         description: Image for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       ps_server_1b_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       packet_internal_network_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       pd_server_1b_names:
         type: list
         description: PD server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       security_group_name:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       oam_server_1c2_image:
         type: string
         description: Image for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_1c1_flavor:
         type: string
         description: Flavor for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       ps_server_1b_names:
         type: list
         description: Ps server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       cmaui_1c1_names:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       pd_server_1b_flavor:
         type: string
         description: Flavor for PD server
         required: true
-        status: SUPPORTED
+        status: supported
       pd_server_1b_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       packet_external_network_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       availability_zone_0:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       ps_server_1b_flavor:
         type: string
         description: Flavor for PS server
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_oam_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       ps_server_1b_image:
         type: string
         description: Ps Image server
         required: true
-        status: SUPPORTED
+        status: supported
       net:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       pd_server_1b_image:
         type: string
         description: PD Image server
         required: true
-        status: SUPPORTED
+        status: supported
       oam_server_1c2_flavor:
         type: string
         description: Flavor for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       oam_server_1c2_names:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
     requirements:
@@ -3066,21 +3066,21 @@ node_types:
       port_ps_server_1b_port_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_ps_server_1b_port_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps_server_1b_port_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps_server_1b_port_fixed_ips:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
       index_value:
@@ -3088,67 +3088,67 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       port_ps_server_1b_port_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps_server_1b_port_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_ps_server_1b_port_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_ps_server_1b_port_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps_server_1b_port_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps_server_1b_port_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps_server_1b_port_replacement_policy:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_ps_server_1b_port_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_ps_server_1b_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_ps_server_1b_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
     requirements:
@@ -3499,7 +3499,7 @@ node_types:
       port_cmaui_1c1_mgmt_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       index_value:
@@ -3507,81 +3507,81 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       port_cmaui_1c1_mgmt_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_cmaui_1c1_mgmt_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       compute_cmaui_1c1_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_cmaui_1c1_mgmt_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui_1c1_mgmt_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui_1c1_mgmt_port_0_fixed_ips:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
       port_cmaui_1c1_mgmt_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui_1c1_mgmt_port_0_replacement_policy:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_cmaui_1c1_mgmt_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_cmaui_1c1_mgmt_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui_1c1_mgmt_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui_1c1_mgmt_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_cmaui_1c1_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
     requirements:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml
index fa714a9087..0dd51f556b 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -11,19 +11,19 @@ node_types:
       port_oam_server_1c2_mgmt_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       compute_oam_server_1c2_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_oam_server_1c2_mgmt_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       index_value:
@@ -31,75 +31,75 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       port_oam_server_1c2_mgmt_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_oam_server_1c2_mgmt_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_oam_server_1c2_mgmt_port_0_fixed_ips:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_oam_server_1c2_mgmt_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       compute_oam_server_1c2_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_oam_server_1c2_mgmt_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_oam_server_1c2_mgmt_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_oam_server_1c2_mgmt_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_oam_server_1c2_mgmt_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_oam_server_1c2_mgmt_port_0_replacement_policy:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_oam_server_1c2_mgmt_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
     attributes:
       oam_server_1c2_accessIPv4:
         type: string
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_oam_server_1c2_oam_server_1c2_mgmt_port_0:
         capability: tosca.capabilities.Node
@@ -449,143 +449,143 @@ node_types:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       p2:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_port_1_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       pd_server_names:
         type: list
         description: PD server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd_server_port_1_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_port_2_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_port_1_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       pd_server_flavor:
         type: string
         description: Flavor for PD server
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_port_2_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_pd_server_port_2_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       availability_zone_0:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       net:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_port_2_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_pd_server_port_2_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       pd_server_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_port_1_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_port_1_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pd_server_port_1_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       security_group_name:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       ps_server_flavor:
         type: string
         description: Flavor for PS server
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_port_1_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_pd_server_port_2_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_port_2_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pd_server_port_2_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       pd_server_image:
         type: string
         description: Flavor for PD server
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_port_1_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_pd_server_port_2_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_port_1_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
     attributes:
       pattern4_attr_1:
         type: string
         description: pattern4_attr_1_value
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_pd_server_port_1:
         capability: tosca.capabilities.Node
@@ -1018,7 +1018,7 @@ node_types:
       compute_pd_server_1b_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       index_value:
@@ -1026,83 +1026,83 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_1b_port_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_pd_server_1b_port_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pd_server_1b_port_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_1b_port_replacement_policy:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd_server_1b_port_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_1b_port_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_1b_port_fixed_ips:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
       port_pd_server_1b_port_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_pd_server_1b_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd_server_1b_port_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_1b_port_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_1b_port_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_pd_server_1b_port_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_pd_server_1b:
         capability: tosca.capabilities.Node
@@ -1452,62 +1452,62 @@ node_types:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       p1:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       p2:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_image:
         type: string
         description: Image for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_flavor:
         type: string
         description: Flavor for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       packet_internal_network_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       packet_external_network_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       security_group_name:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       availability_zone_0:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_oam_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       net:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
     attributes:
       no_compute_attr_1:
         type: string
         description: no_compute_attr_1
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_cmaui_port_01:
         capability: tosca.capabilities.Node
@@ -1739,121 +1739,121 @@ node_types:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       p2:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_1c1_image:
         type: string
         description: Image for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       ps_server_1b_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       packet_internal_network_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       pd_server_1b_names:
         type: list
         description: PD server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       security_group_name:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       oam_server_1c2_image:
         type: string
         description: Image for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_1c1_flavor:
         type: string
         description: Flavor for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       ps_server_1b_names:
         type: list
         description: Ps server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       cmaui_1c1_names:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       pd_server_1b_flavor:
         type: string
         description: Flavor for PD server
         required: true
-        status: SUPPORTED
+        status: supported
       pd_server_1b_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       packet_external_network_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       availability_zone_0:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       ps_server_1b_flavor:
         type: string
         description: Flavor for PS server
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_oam_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       ps_server_1b_image:
         type: string
         description: Ps Image server
         required: true
-        status: SUPPORTED
+        status: supported
       net:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       pd_server_1b_image:
         type: string
         description: PD Image server
         required: true
-        status: SUPPORTED
+        status: supported
       oam_server_1c2_flavor:
         type: string
         description: Flavor for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       oam_server_1c2_names:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
     attributes:
       all_pattern_attr_1:
         type: string
         description: all_pattern_attr_1
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_oam_server_1c2_1_mgmt_port_0:
         capability: tosca.capabilities.Node
@@ -3932,21 +3932,21 @@ node_types:
       port_ps_server_1b_port_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_ps_server_1b_port_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps_server_1b_port_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps_server_1b_port_fixed_ips:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
       index_value:
@@ -3954,67 +3954,67 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       port_ps_server_1b_port_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps_server_1b_port_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_ps_server_1b_port_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_ps_server_1b_port_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps_server_1b_port_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps_server_1b_port_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps_server_1b_port_replacement_policy:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_ps_server_1b_port_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_ps_server_1b_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_ps_server_1b_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
     requirements:
@@ -4365,7 +4365,7 @@ node_types:
       port_cmaui_1c1_mgmt_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       index_value:
@@ -4373,81 +4373,81 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       port_cmaui_1c1_mgmt_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_cmaui_1c1_mgmt_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       compute_cmaui_1c1_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_cmaui_1c1_mgmt_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui_1c1_mgmt_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui_1c1_mgmt_port_0_fixed_ips:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
       port_cmaui_1c1_mgmt_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui_1c1_mgmt_port_0_replacement_policy:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_cmaui_1c1_mgmt_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_cmaui_1c1_mgmt_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui_1c1_mgmt_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui_1c1_mgmt_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_cmaui_1c1_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
     requirements:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedCatalogInstance/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedCatalogInstance/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 254be7a7da..25ea72bde1 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedCatalogInstance/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedCatalogInstance/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -13,89 +13,89 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       port_cmaui_mgmt_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui_mgmt_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_cmaui_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_cmaui_mgmt_port_0_replacement_policy:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_cmaui_mgmt_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_cmaui_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_cmaui_mgmt_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui_mgmt_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui_mgmt_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_cmaui_mgmt_port_0_fixed_ips:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
       port_cmaui_mgmt_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui_mgmt_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_cmaui_mgmt_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui_mgmt_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_cmaui_cmaui_mgmt_port_0:
         capability: tosca.capabilities.Node
@@ -445,57 +445,57 @@ node_types:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       p1:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       p2:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_image:
         type: string
         description: Image for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_flavor:
         type: string
         description: Flavor for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       packet_internal_network_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       packet_external_network_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       security_group_name:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       availability_zone_0:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_oam_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       net:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_cmaui_1_mgmt_port_0:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedNoCompute/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedNoCompute/out/GlobalSubstitutionTypesServiceTemplate.yaml
index cc3485bf5c..d90c28a6d0 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedNoCompute/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedNoCompute/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -12,57 +12,57 @@ node_types:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       p1:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       p2:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_image:
         type: string
         description: Image for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_flavor:
         type: string
         description: Flavor for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       packet_internal_network_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       packet_external_network_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       security_group_name:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       availability_zone_0:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_oam_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       net:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_cmaui_port_2:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedScalingInstance/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedScalingInstance/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 0cca83c5fa..294d0cf5e0 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedScalingInstance/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedScalingInstance/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -13,89 +13,89 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       port_cmaui_mgmt_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui_mgmt_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_cmaui_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_cmaui_mgmt_port_0_replacement_policy:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_cmaui_mgmt_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_cmaui_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_cmaui_mgmt_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui_mgmt_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui_mgmt_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_cmaui_mgmt_port_0_fixed_ips:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
       port_cmaui_mgmt_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui_mgmt_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_cmaui_mgmt_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui_mgmt_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_cmaui_cmaui_mgmt_port_0:
         capability: tosca.capabilities.Node
@@ -445,49 +445,49 @@ node_types:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       p1:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       p2:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_image:
         type: string
         description: Image for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_flavor:
         type: string
         description: Flavor for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       security_group_name:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       availability_zone_0:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_oam_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       net:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_cmaui_1_mgmt_port_0:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedSingleSubstitution1B/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedSingleSubstitution1B/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 01d73994bc..908d830cf4 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedSingleSubstitution1B/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedSingleSubstitution1B/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -11,91 +11,91 @@ node_types:
       port_pd_server_port_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_pd_server_port_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       compute_pd_server_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_pd_server_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd_server_port_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_port_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_port_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_port_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_port_fixed_ips:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_port_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_port_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_pd_server_port_replacement_policy:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd_server_port_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pd_server_port_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_pd_server:
         capability: tosca.capabilities.Node
@@ -445,70 +445,70 @@ node_types:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       ps_server_image:
         type: string
         description: Ps Image server
         required: true
-        status: SUPPORTED
+        status: supported
       p2:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       ps_server_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       security_group_name:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       ps_server_flavor:
         type: string
         description: Flavor for PS server
         required: true
-        status: SUPPORTED
+        status: supported
       pd_server_names:
         type: list
         description: PD server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       pd_server_flavor:
         type: string
         description: Flavor for PD server
         required: true
-        status: SUPPORTED
+        status: supported
       ps_server_names:
         type: list
         description: Ps server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       pd_server_image:
         type: string
         description: PD Image server
         required: true
-        status: SUPPORTED
+        status: supported
       availability_zone_0:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       net:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       pd_server_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_server_ps:
         capability: tosca.capabilities.Node
@@ -1197,91 +1197,91 @@ node_types:
       port_ps_server_port_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_ps_server_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_ps_server_port_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       compute_ps_server_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_ps_server_port_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       port_ps_server_port_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps_server_port_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps_server_port_fixed_ips:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
       port_ps_server_port_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps_server_port_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps_server_port_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_ps_server_port_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps_server_port_replacement_policy:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_ps_server_port_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_ps_server_ps_server_port:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/GlobalSubstitutionTypesServiceTemplate.yaml
index b7d9b88fcf..69d5d80ae7 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -11,91 +11,91 @@ node_types:
       port_pd_server_port_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_pd_server_port_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       compute_pd_server_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_pd_server_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd_server_port_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_port_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_port_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_port_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_port_fixed_ips:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_port_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_port_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_pd_server_port_replacement_policy:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd_server_port_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pd_server_port_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_pd_server:
         capability: tosca.capabilities.Node
@@ -445,75 +445,75 @@ node_types:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       p2:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       security_group_name:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       sm_server_names:
         type: list
         description: SM server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       oam_server_image:
         type: string
         description: OAM Image server
         required: true
-        status: SUPPORTED
+        status: supported
       oam_server_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       oam_server_flavor:
         type: string
         description: Flavor for OAM server
         required: true
-        status: SUPPORTED
+        status: supported
       sm_server_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       availability_zone_0:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       net:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       oam_server_names:
         type: list
         description: OAM server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       sm_server_flavor:
         type: string
         description: Flavor for SM server
         required: true
-        status: SUPPORTED
+        status: supported
       sm_server_image:
         type: string
         description: SM Image server
         required: true
-        status: SUPPORTED
+        status: supported
     attributes:
       nested_diff_file_attr_1:
         type: string
         description: nested_diff_file_attr_1_value
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_oam_server_port:
         capability: tosca.capabilities.Node
@@ -1203,75 +1203,75 @@ node_types:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       ps_server_image:
         type: string
         description: Ps Image server
         required: true
-        status: SUPPORTED
+        status: supported
       p2:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       ps_server_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       security_group_name:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       ps_server_flavor:
         type: string
         description: Flavor for PS server
         required: true
-        status: SUPPORTED
+        status: supported
       pd_server_names:
         type: list
         description: PD server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       pd_server_flavor:
         type: string
         description: Flavor for PD server
         required: true
-        status: SUPPORTED
+        status: supported
       ps_server_names:
         type: list
         description: Ps server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       pd_server_image:
         type: string
         description: PD Image server
         required: true
-        status: SUPPORTED
+        status: supported
       availability_zone_0:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       net:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       pd_server_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
     attributes:
       nested_same_file_attr_1:
         type: string
         description: nested_same_file_attr_1
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_server_ps:
         capability: tosca.capabilities.Node
@@ -1960,89 +1960,89 @@ node_types:
       port_oam_server_port_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_oam_server_port_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       port_oam_server_port_replacement_policy:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_oam_server_port_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_oam_server_port_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       compute_oam_server_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_oam_server_port_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_oam_server_port_fixed_ips:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
       port_oam_server_port_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_oam_server_port_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_oam_server_port_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_oam_server_port_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       compute_oam_server_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_oam_server_port_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
     requirements:
@@ -2395,87 +2395,87 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       port_sm_server_port_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_sm_server_port_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_sm_server_port_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_sm_server_port_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_sm_server_port_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_sm_server_port_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_sm_server_port_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_sm_server_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_sm_server_port_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_sm_server_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_sm_server_port_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_sm_server_port_replacement_policy:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_sm_server_port_fixed_ips:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
       port_sm_server_port_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     requirements:
@@ -2826,91 +2826,91 @@ node_types:
       port_ps_server_port_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_ps_server_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_ps_server_port_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       compute_ps_server_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_ps_server_port_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       port_ps_server_port_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps_server_port_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps_server_port_fixed_ips:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
       port_ps_server_port_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps_server_port_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps_server_port_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_ps_server_port_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps_server_port_replacement_policy:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_ps_server_port_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_ps_server_ps_server_port:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 1d03026866..a9ab611515 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -11,97 +11,97 @@ node_types:
       port_pd_server_port_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_pd_server_port_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       port_pd_server_port_security_groups:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       compute_pd_server_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_pd_server_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd_server_port_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_port_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_port_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_port_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_port_fixed_ips:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_port_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_port_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_pd_server_port_replacement_policy:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd_server_port_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pd_server_port_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_pd_server:
         capability: tosca.capabilities.Node
@@ -451,75 +451,75 @@ node_types:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       p2:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       security_group_name:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       sm_server_names:
         type: list
         description: SM server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       oam_server_image:
         type: string
         description: OAM Image server
         required: true
-        status: SUPPORTED
+        status: supported
       oam_server_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       oam_server_flavor:
         type: string
         description: Flavor for OAM server
         required: true
-        status: SUPPORTED
+        status: supported
       sm_server_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       availability_zone_0:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       net:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       oam_server_names:
         type: list
         description: OAM server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       sm_server_flavor:
         type: string
         description: Flavor for SM server
         required: true
-        status: SUPPORTED
+        status: supported
       sm_server_image:
         type: string
         description: SM Image server
         required: true
-        status: SUPPORTED
+        status: supported
     attributes:
       nested_diff_file_attr_1:
         type: string
         description: nested_diff_file_attr_1_value
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_oam_server_port:
         capability: tosca.capabilities.Node
@@ -1209,75 +1209,75 @@ node_types:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       ps_server_image:
         type: string
         description: Ps Image server
         required: true
-        status: SUPPORTED
+        status: supported
       p2:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       ps_server_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       security_group_name:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       ps_server_flavor:
         type: string
         description: Flavor for PS server
         required: true
-        status: SUPPORTED
+        status: supported
       pd_server_names:
         type: list
         description: PD server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       pd_server_flavor:
         type: string
         description: Flavor for PD server
         required: true
-        status: SUPPORTED
+        status: supported
       ps_server_names:
         type: list
         description: Ps server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       pd_server_image:
         type: string
         description: PD Image server
         required: true
-        status: SUPPORTED
+        status: supported
       availability_zone_0:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       net:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       pd_server_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
     attributes:
       nested_same_file_attr_1:
         type: string
         description: nested_same_file_attr_1
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_server_ps:
         capability: tosca.capabilities.Node
@@ -1966,95 +1966,95 @@ node_types:
       port_oam_server_port_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_oam_server_port_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       port_oam_server_port_security_groups:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_oam_server_port_replacement_policy:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_oam_server_port_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_oam_server_port_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       compute_oam_server_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_oam_server_port_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_oam_server_port_fixed_ips:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
       port_oam_server_port_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_oam_server_port_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_oam_server_port_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_oam_server_port_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       compute_oam_server_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_oam_server_port_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
     requirements:
@@ -2407,93 +2407,93 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       port_sm_server_port_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_sm_server_port_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_sm_server_port_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_sm_server_port_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_sm_server_port_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_sm_server_port_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_sm_server_port_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_sm_server_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_sm_server_port_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_sm_server_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_sm_server_port_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_sm_server_port_replacement_policy:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_sm_server_port_fixed_ips:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
       port_sm_server_port_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_sm_server_port_security_groups:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
     requirements:
@@ -2844,97 +2844,97 @@ node_types:
       port_ps_server_port_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_ps_server_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_ps_server_port_security_groups:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_ps_server_port_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       compute_ps_server_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_ps_server_port_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       port_ps_server_port_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps_server_port_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps_server_port_fixed_ips:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
       port_ps_server_port_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps_server_port_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps_server_port_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_ps_server_port_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps_server_port_replacement_policy:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_ps_server_port_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_ps_server_ps_server_port:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 6f5c2c3bf3..dadf2724e3 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -11,157 +11,157 @@ node_types:
       port_pcm_port_02_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_12_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_pcm_port_02_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       availabilityzone_name:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_12_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_02_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_image_name:
         type: string
         description: PCRF CM image name
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_02_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_12_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pcm_port_12_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_02_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_server_name:
         type: string
         description: PCRF CM server name
         required: true
-        status: SUPPORTED
+        status: supported
       cps_net_mask:
         type: string
         description: CPS network mask
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_name:
         type: string
         description: OAM network name
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_12_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_02_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_gw:
         type: string
         description: CPS network gateway
         required: true
-        status: SUPPORTED
+        status: supported
       security_group_name:
         type: string
         description: the name of security group
         required: true
-        status: SUPPORTED
+        status: supported
       cps_net_ip:
         type: string
         description: CPS network ip
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_12_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       pcm_flavor_name:
         type: string
         description: flavor name of PCRF CM instance
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_12_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_vol:
         type: string
         description: CPS Cluman Cinder Volume
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_02_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       cps_net_name:
         type: string
         description: CPS network name
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_ip:
         type: string
         description: OAM network ip
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_mask:
         type: string
         description: CPS network mask
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_12_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_02_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pcm_port_12_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_02_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
     attributes:
       server_pcm_id:
         type: string
         description: the pcm nova service id
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_server_pcm:
         capability: tosca.capabilities.Node
@@ -594,157 +594,157 @@ node_types:
       port_pcm_port_1_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pcm_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_1_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       availabilityzone_name:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       pcm_image_name:
         type: string
         description: PCRF CM image name
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pcm_port_1_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_server_name:
         type: string
         description: PCRF CM server name
         required: true
-        status: SUPPORTED
+        status: supported
       cps_net_mask:
         type: string
         description: CPS network mask
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_1_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_name:
         type: string
         description: OAM network name
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_1_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       oam_net_gw:
         type: string
         description: CPS network gateway
         required: true
-        status: SUPPORTED
+        status: supported
       security_group_name:
         type: string
         description: the name of security group
         required: true
-        status: SUPPORTED
+        status: supported
       cps_net_ip:
         type: string
         description: CPS network ip
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_1_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_1_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       pcm_flavor_name:
         type: string
         description: flavor name of PCRF CM instance
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_vol:
         type: string
         description: CPS Cluman Cinder Volume
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_1_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_pcm_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       cps_net_name:
         type: string
         description: CPS network name
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_ip:
         type: string
         description: OAM network ip
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_mask:
         type: string
         description: CPS network mask
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_1_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
     attributes:
       server_pcm_id:
         type: string
         description: the pcm nova service id
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_pcm_port_1:
         capability: tosca.capabilities.Node
@@ -1177,35 +1177,35 @@ node_types:
       compute_compute_user_data_format:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       compute_compute_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_compute_config_drive:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: boolean
     requirements:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/GlobalSubstitutionTypesServiceTemplate.yaml
index fc2a5b73f2..4bd6901696 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -11,115 +11,115 @@ node_types:
       port_cdi_internal_0_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cdi_ims_core_0_port_1_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_cdi_internal_0_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cdi_ims_core_0_port_1_security_groups:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_cdi_ims_core_0_port_1_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_cdi_ims_core_0_port_1_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_cdi_ims_core_0_port_1_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cdi_internal_0_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       compute_cdi_scheduler_hints:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       compute_cdi_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_cdi_user_data_format:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_cdi_internal_0_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       compute_cdi_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_cdi_ims_core_0_port_1_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cdi_internal_0_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cdi_internal_0_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       compute_cdi_config_drive:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: boolean
       port_cdi_internal_0_port_0_allowed_address_pairs:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.network.AddressPair
       port_cdi_internal_0_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_cdi_internal_0_port_0_security_groups:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       index_value:
@@ -127,83 +127,83 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       port_cdi_ims_core_0_port_1_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cdi_ims_core_0_port_1_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_cdi_internal_0_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_cdi_ims_core_0_port_1_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_cdi_internal_0_port_0_fixed_ips:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
       port_cdi_ims_core_0_port_1_fixed_ips:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
       port_cdi_internal_0_port_0_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_cdi_ims_core_0_port_1_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_cdi_internal_0_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_cdi_metadata:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_cdi_internal_0_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_cdi_ims_core_0_port_1_allowed_address_pairs:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.network.AddressPair
       port_cdi_ims_core_0_port_1_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cdi_ims_core_0_port_1_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_cdi:
         capability: tosca.capabilities.Node
@@ -636,179 +636,179 @@ node_types:
       port_lbd_ims_core_1_port_2_security_groups:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       compute_lbd_user_data_format:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_lbd_ims_core_1_port_2_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_lbd_ims_core_1_port_2_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_lbd_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_lbd_dpdk_1_port_1_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_lbd_internal_1_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_lbd_internal_1_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_lbd_ims_core_1_port_2_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_lbd_dpdk_1_port_1_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_lbd_internal_1_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_lbd_ims_core_1_port_2_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_lbd_internal_1_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_lbd_ims_core_1_port_2_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_lbd_dpdk_1_port_1_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_lbd_scheduler_hints:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_lbd_ims_core_1_port_2_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_lbd_dpdk_1_port_1_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       compute_lbd_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_lbd_dpdk_1_port_1_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_lbd_internal_1_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_lbd_dpdk_1_port_1_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_lbd_dpdk_1_port_1_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_lbd_config_drive:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: boolean
       port_lbd_internal_1_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_lbd_internal_1_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_lbd_ims_core_1_port_2_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_lbd_ims_core_1_port_2_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_lbd_internal_1_port_0_fixed_ips:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
       port_lbd_ims_core_1_port_2_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_lbd_ims_core_1_port_2_allowed_address_pairs:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.network.AddressPair
       port_lbd_dpdk_1_port_1_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_lbd_dpdk_1_port_1_fixed_ips:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
       index_value:
@@ -816,83 +816,83 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       port_lbd_ims_core_1_port_2_fixed_ips:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
       port_lbd_dpdk_1_port_1_security_groups:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_lbd_dpdk_1_port_1_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_lbd_ims_core_1_port_2_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_lbd_internal_1_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_lbd_dpdk_1_port_1_allowed_address_pairs:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.network.AddressPair
       port_lbd_internal_1_port_0_security_groups:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_lbd_internal_1_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_lbd_dpdk_1_port_1_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       compute_lbd_metadata:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_lbd_dpdk_1_port_1_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_lbd_internal_1_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_lbd_internal_1_port_0_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_lbd_ims_core_1_port_2_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
     requirements:
@@ -1411,197 +1411,197 @@ node_types:
       port_oam_oam_1_port_1_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_oam_internal_1_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_oam_internal_1_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_oam_oam_1_port_1_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_oam_internal_1_port_0_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_oam_config_drive:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: boolean
       port_oam_oam_1_port_1_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_oam_internal_1_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_oam_oam_1_port_1_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_oam_oam_1_port_1_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_oam_oam_1_port_1_allowed_address_pairs:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.network.AddressPair
       port_oam_oam_1_port_1_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_oam_internal_1_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       port_oam_oam_1_port_1_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_oam_oam_1_port_1_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_oam_user_data_format:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_oam_oam_1_port_1_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_oam_internal_1_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_oam_internal_1_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_oam_internal_1_port_0_allowed_address_pairs:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.network.AddressPair
       port_oam_oam_1_port_1_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_oam_oam_1_port_1_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_oam_internal_1_port_0_fixed_ips:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
       port_oam_internal_1_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       compute_oam_scheduler_hints:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_oam_internal_1_port_0_security_groups:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_oam_internal_1_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       compute_oam_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_oam_metadata:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_oam_internal_1_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_oam_oam_1_port_1_security_groups:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       compute_oam_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_oam_internal_1_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_oam_oam_1_port_1_fixed_ips:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
     requirements:
@@ -2036,197 +2036,197 @@ node_types:
       port_oam_internal_2_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_oam_internal_2_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_oam_internal_2_port_0_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_oam_internal_2_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_oam_internal_2_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_oam_oam_2_port_1_allowed_address_pairs:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.network.AddressPair
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_oam_config_drive:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: boolean
       port_oam_internal_2_port_0_allowed_address_pairs:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.network.AddressPair
       port_oam_oam_2_port_1_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_oam_oam_2_port_1_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_oam_oam_2_port_1_security_groups:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_oam_oam_2_port_1_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_oam_oam_2_port_1_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_oam_oam_2_port_1_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_oam_internal_2_port_0_security_groups:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_oam_oam_2_port_1_fixed_ips:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
       port_oam_internal_2_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       port_oam_oam_2_port_1_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_oam_user_data_format:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_oam_internal_2_port_0_fixed_ips:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
       port_oam_internal_2_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_oam_internal_2_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_oam_internal_2_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_oam_oam_2_port_1_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_oam_oam_2_port_1_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_oam_oam_2_port_1_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_oam_scheduler_hints:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_oam_internal_2_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_oam_oam_2_port_1_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_oam_oam_2_port_1_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_oam_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_oam_metadata:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_oam_internal_2_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_oam_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
     requirements:
@@ -2662,143 +2662,143 @@ node_types:
         type: string
         description: Unique ID for this VF Module instance
         required: true
-        status: SUPPORTED
+        status: supported
       internal_net_id:
         type: string
         description: internal network name/uuid
         required: true
-        status: SUPPORTED
+        status: supported
       vcscf_release:
         type: string
         description: IMS release
         required: true
-        status: SUPPORTED
+        status: supported
       tdcore_security_group:
         type: string
         description: security group
         required: true
-        status: SUPPORTED
+        status: supported
       tdcore_names:
         type: list
         description: List of instance names for TDCORE instances
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema: &id001
           type: string
       port_tdcore_dpdk_0_port_1_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_tdcore_dpdk_0_port_1_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_tdcore_dpdk_0_port_1_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_tdcore_internal_0_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       vcscf_gateway:
         type: string
         description: OAM unit virtual ip
         required: true
-        status: SUPPORTED
+        status: supported
       vnf_name:
         type: string
         description: Unique name for this VF instance
         required: true
-        status: SUPPORTED
+        status: supported
       port_tdcore_internal_0_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_tdcore_dpdk_0_port_1_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       vf_module_name:
         type: string
         description: Unique name for this VF Module instance
         required: true
-        status: SUPPORTED
+        status: supported
       internal_dpdk_net_id:
         type: string
         description: internal dpdk network name/uuid
         required: true
-        status: SUPPORTED
+        status: supported
       port_tdcore_dpdk_0_port_1_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_tdcore_dpdk_0_port_1_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_tdcore_internal_0_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       vcscf_swrepo_address:
         type: string
         description: SWRepo IP or FQDN
         required: true
-        status: SUPPORTED
+        status: supported
       vnf_id:
         type: string
         description: Unique ID for this VF instance
         required: true
-        status: SUPPORTED
+        status: supported
       availability_zone_0:
         type: string
         description: Availability zone name.
         required: true
-        status: SUPPORTED
+        status: supported
       port_tdcore_dpdk_0_port_1_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_tdcore_internal_0_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       tdcore_flavor_name:
         type: string
         description: flavor name
         required: true
-        status: SUPPORTED
+        status: supported
       tdcore_image_name:
         type: string
         description: image name
         required: true
-        status: SUPPORTED
+        status: supported
       vcscf_cmrepo_address:
         type: string
         description: CMRepo IP or FQDN
         required: true
-        status: SUPPORTED
+        status: supported
       vcscf_dns_address:
         type: string
         description: DNS server IP
         required: true
-        status: SUPPORTED
+        status: supported
       vcscf_internal_network_mtu:
         type: float
         description: MTU for internal network interface (eth0)
         required: true
-        status: SUPPORTED
+        status: supported
         constraints: &id002
         - in_range:
           - 1000
@@ -2806,17 +2806,17 @@ node_types:
       port_tdcore_dpdk_0_port_1_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       tdcore_server_group:
         type: string
         description: server group name/id
         required: true
-        status: SUPPORTED
+        status: supported
       index:
         type: float
         description: index
         required: true
-        status: SUPPORTED
+        status: supported
         constraints: &id003
         - in_range:
           - 0
@@ -2825,11 +2825,11 @@ node_types:
         type: string
         description: internal netmask
         required: true
-        status: SUPPORTED
+        status: supported
       port_tdcore_internal_0_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       vcscf_name_delimeter:
@@ -2837,7 +2837,7 @@ node_types:
         description: 'delimeter used in concatenating different words while naming
           (ex: "-","_",".",...)'
         required: true
-        status: SUPPORTED
+        status: supported
         constraints: &id004
         - valid_values:
           - '-'
@@ -2848,53 +2848,53 @@ node_types:
         type: list
         description: List of Internal Lan IPs for TDCORE instances
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema: &id005
           type: string
       tdcore_dpdk_ips:
         type: list
         description: List of DPDK Lan IPs for TDCORE instances
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema: &id006
           type: string
       tdcore_uuids:
         type: list
         description: List of UUIDs generated by cmrepo for TDCORE instances
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema: &id007
           type: string
       vcscf_dn:
         type: string
         description: DN name
         required: true
-        status: SUPPORTED
+        status: supported
       port_tdcore_internal_0_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_tdcore_internal_0_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_tdcore_internal_0_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       vcscf_du:
         type: string
         description: DU name
         required: true
-        status: SUPPORTED
+        status: supported
       port_tdcore_dpdk_0_port_1_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_tdcore_internal_0_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_tdcore_internal_0_port_0:
         capability: tosca.capabilities.Node
@@ -3327,111 +3327,111 @@ node_types:
       port_cdi_ims_core_1_port_1_fixed_ips:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
       port_cdi_internal_1_port_0_security_groups:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_cdi_ims_core_1_port_1_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cdi_ims_core_1_port_1_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_cdi_internal_1_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_cdi_ims_core_1_port_1_security_groups:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_cdi_ims_core_1_port_1_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cdi_internal_1_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_cdi_ims_core_1_port_1_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_cdi_scheduler_hints:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       compute_cdi_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_cdi_user_data_format:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_cdi_ims_core_1_port_1_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cdi_ims_core_1_port_1_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_cdi_internal_1_port_0_fixed_ips:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
       port_cdi_internal_1_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cdi_ims_core_1_port_1_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_cdi_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_cdi_config_drive:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: boolean
       index_value:
@@ -3439,87 +3439,87 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       port_cdi_internal_1_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_cdi_internal_1_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cdi_ims_core_1_port_1_allowed_address_pairs:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.network.AddressPair
       port_cdi_internal_1_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_cdi_internal_1_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_cdi_internal_1_port_0_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_cdi_ims_core_1_port_1_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_cdi_ims_core_1_port_1_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_cdi_ims_core_1_port_1_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_cdi_ims_core_1_port_1_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_cdi_internal_1_port_0_allowed_address_pairs:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.network.AddressPair
       port_cdi_internal_1_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_cdi_metadata:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_cdi_internal_1_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_cdi_internal_1_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_cdi_cdi_internal_1_port_0:
         capability: tosca.capabilities.Node
@@ -3952,213 +3952,213 @@ node_types:
       compute_lbd_user_data_format:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_lbd_ims_core_0_port_2_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_lbd_internal_0_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_lbd_internal_0_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_lbd_internal_0_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_lbd_dpdk_0_port_1_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_lbd_dpdk_0_port_1_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_lbd_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_lbd_dpdk_0_port_1_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_lbd_ims_core_0_port_2_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_lbd_internal_0_port_0_security_groups:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_lbd_ims_core_0_port_2_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_lbd_ims_core_0_port_2_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_lbd_dpdk_0_port_1_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_lbd_dpdk_0_port_1_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       compute_lbd_scheduler_hints:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_lbd_ims_core_0_port_2_security_groups:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_lbd_dpdk_0_port_1_fixed_ips:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
       port_lbd_ims_core_0_port_2_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_lbd_internal_0_port_0_fixed_ips:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
       port_lbd_ims_core_0_port_2_fixed_ips:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
       compute_lbd_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_lbd_internal_0_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_lbd_internal_0_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_lbd_dpdk_0_port_1_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_lbd_internal_0_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_lbd_ims_core_0_port_2_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_lbd_dpdk_0_port_1_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       compute_lbd_config_drive:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: boolean
       port_lbd_internal_0_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_lbd_dpdk_0_port_1_security_groups:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_lbd_ims_core_0_port_2_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_lbd_ims_core_0_port_2_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_lbd_dpdk_0_port_1_allowed_address_pairs:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.network.AddressPair
       port_lbd_dpdk_0_port_1_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_lbd_ims_core_0_port_2_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_lbd_dpdk_0_port_1_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_lbd_internal_0_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_lbd_ims_core_0_port_2_allowed_address_pairs:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.network.AddressPair
       index_value:
@@ -4166,49 +4166,49 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       port_lbd_ims_core_0_port_2_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_lbd_internal_0_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_lbd_internal_0_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_lbd_ims_core_0_port_2_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       compute_lbd_metadata:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_lbd_dpdk_0_port_1_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_lbd_dpdk_0_port_1_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_lbd_internal_0_port_0_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
     requirements:
@@ -4727,331 +4727,331 @@ node_types:
       port_cif_oam_1_port_1_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_cif_ims_core_1_port_2_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_cif_ims_li_1_port_4_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_cif_ims_li_1_port_4_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cif_oam_1_port_3_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_cif_ims_core_1_port_2_fixed_ips:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
       port_cif_oam_1_port_1_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_cif_oam_1_port_3_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cif_oam_1_port_3_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cif_oam_1_port_3_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_cif_ims_core_1_port_2_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cif_internal_1_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_cif_user_data_format:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_cif_oam_1_port_3_allowed_address_pairs:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.network.AddressPair
       port_cif_oam_1_port_1_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cif_internal_1_port_0_allowed_address_pairs:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.network.AddressPair
       compute_cif_scheduler_hints:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_cif_oam_1_port_3_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_cif_ims_core_1_port_2_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_cif_ims_li_1_port_4_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_cif_oam_1_port_1_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_cif_internal_1_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_cif_ims_li_1_port_4_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cif_internal_1_port_0_fixed_ips:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
       port_cif_oam_1_port_3_security_groups:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       compute_cif_metadata:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_cif_internal_1_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cif_ims_core_1_port_2_allowed_address_pairs:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.network.AddressPair
       port_cif_internal_1_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cif_ims_li_1_port_4_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_cif_ims_core_1_port_2_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_cif_ims_core_1_port_2_security_groups:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_cif_oam_1_port_3_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_cif_oam_1_port_1_fixed_ips:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
       port_cif_oam_1_port_3_fixed_ips:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
       port_cif_ims_core_1_port_2_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cif_ims_li_1_port_4_allowed_address_pairs:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.network.AddressPair
       port_cif_internal_1_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_cif_oam_1_port_3_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cif_ims_core_1_port_2_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_cif_oam_1_port_1_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_cif_oam_1_port_1_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_cif_ims_li_1_port_4_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_cif_oam_1_port_1_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_cif_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_cif_oam_1_port_1_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       compute_cif_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_cif_oam_1_port_1_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_cif_ims_core_1_port_2_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_cif_ims_li_1_port_4_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cif_internal_1_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_cif_internal_1_port_0_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_cif_ims_li_1_port_4_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_cif_internal_1_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_cif_ims_li_1_port_4_security_groups:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_cif_ims_li_1_port_4_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_cif_internal_1_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_cif_oam_1_port_1_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cif_oam_1_port_3_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_cif_oam_1_port_1_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_cif_ims_core_1_port_2_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cif_internal_1_port_0_security_groups:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       index_value:
@@ -5059,83 +5059,83 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       port_cif_ims_core_1_port_2_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       compute_cif_config_drive:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: boolean
       port_cif_ims_core_1_port_2_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_cif_ims_li_1_port_4_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_cif_ims_li_1_port_4_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_cif_oam_1_port_3_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_cif_ims_li_1_port_4_fixed_ips:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
       port_cif_ims_core_1_port_2_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_cif_internal_1_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_cif_oam_1_port_3_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_cif_oam_1_port_1_security_groups:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_cif_oam_1_port_1_allowed_address_pairs:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.network.AddressPair
       port_cif_internal_1_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_cif_oam_1_port_3_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_cif:
         capability: tosca.capabilities.Node
@@ -5821,118 +5821,118 @@ node_types:
         type: string
         description: Unique ID for this VF Module instance
         required: true
-        status: SUPPORTED
+        status: supported
       internal_net_id:
         type: string
         description: internal network name/uuid
         required: true
-        status: SUPPORTED
+        status: supported
       vcscf_release:
         type: string
         description: IMS release
         required: true
-        status: SUPPORTED
+        status: supported
       port_cscf_internal_0_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       cscf_internal_ips:
         type: list
         description: List of Internal Lan IPs for CSCF instances
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema: &id008
           type: string
       vcscf_gateway:
         type: string
         description: OAM unit cipa ip
         required: true
-        status: SUPPORTED
+        status: supported
       vnf_name:
         type: string
         description: Unique name for this VF instance
         required: true
-        status: SUPPORTED
+        status: supported
       port_cscf_internal_0_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       vf_module_name:
         type: string
         description: Unique name for this VF Module instance
         required: true
-        status: SUPPORTED
+        status: supported
       cscf_image_name:
         type: string
         description: image name
         required: true
-        status: SUPPORTED
+        status: supported
       cscf_names:
         type: list
         description: List of instance names for CSCF instances
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema: &id009
           type: string
       port_cscf_internal_0_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vcscf_swrepo_address:
         type: string
         description: SWRepo IP or FQDN
         required: true
-        status: SUPPORTED
+        status: supported
       cscf_uuids:
         type: list
         description: List of UUIDs generated by cmrepo for CSCF instances
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema: &id010
           type: string
       vnf_id:
         type: string
         description: Unique ID for this VF instance
         required: true
-        status: SUPPORTED
+        status: supported
       port_cscf_internal_0_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       availability_zone_0:
         type: string
         description: Availability zone name for CSCF instances.
         required: true
-        status: SUPPORTED
+        status: supported
       cscf_internal_v6_ips:
         type: list
         description: List of Internal Lan v6 IPs for CSCF instances
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema: &id011
           type: string
       cscf_flavor_name:
         type: string
         description: flavor name
         required: true
-        status: SUPPORTED
+        status: supported
       vcscf_cmrepo_address:
         type: string
         description: CMRepo IP or FQDN
         required: true
-        status: SUPPORTED
+        status: supported
       vcscf_dns_address:
         type: string
         description: DNS server IP
         required: true
-        status: SUPPORTED
+        status: supported
       vcscf_internal_network_mtu:
         type: float
         description: MTU for internal network interface (eth0)
         required: true
-        status: SUPPORTED
+        status: supported
         constraints: &id012
         - in_range:
           - 1000
@@ -5940,20 +5940,20 @@ node_types:
       port_cscf_internal_0_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_cscf_internal_0_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       index:
         type: float
         description: index
         required: true
-        status: SUPPORTED
+        status: supported
         constraints: &id013
         - in_range:
           - 0
@@ -5962,13 +5962,13 @@ node_types:
         type: string
         description: internal netmask
         required: true
-        status: SUPPORTED
+        status: supported
       vcscf_name_delimeter:
         type: string
         description: 'delimeter used in concatenating different words while naming
           (ex: "-","_",".",...)'
         required: true
-        status: SUPPORTED
+        status: supported
         constraints: &id014
         - valid_values:
           - '-'
@@ -5978,30 +5978,30 @@ node_types:
       port_cscf_internal_0_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vcscf_dn:
         type: string
         description: DN name
         required: true
-        status: SUPPORTED
+        status: supported
       vcscf_du:
         type: string
         description: DU name
         required: true
-        status: SUPPORTED
+        status: supported
       port_cscf_internal_0_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_cscf_internal_0_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       cscf_security_group:
         type: string
         description: security group
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_cscf_server_0:
         capability: tosca.capabilities.Node
@@ -6350,115 +6350,115 @@ node_types:
       port_oam_oam_0_port_1_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_oam_oam_0_port_1_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_oam_internal_0_port_0_fixed_ips:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_oam_internal_0_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_oam_internal_0_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_oam_oam_0_port_1_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_oam_internal_0_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_oam_oam_0_port_1_fixed_ips:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
       port_oam_oam_0_port_1_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_oam_internal_0_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_oam_oam_0_port_1_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_oam_config_drive:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: boolean
       port_oam_oam_0_port_1_allowed_address_pairs:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.network.AddressPair
       port_oam_internal_0_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_oam_oam_0_port_1_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_oam_internal_0_port_0_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_oam_oam_0_port_1_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_oam_oam_0_port_1_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_oam_internal_0_port_0_security_groups:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_oam_oam_0_port_1_security_groups:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       index_value:
@@ -6466,83 +6466,83 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       port_oam_internal_0_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_oam_internal_0_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       compute_oam_user_data_format:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_oam_internal_0_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_oam_oam_0_port_1_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_oam_internal_0_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_oam_oam_0_port_1_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_oam_scheduler_hints:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_oam_internal_0_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       compute_oam_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_oam_metadata:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       compute_oam_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_oam_internal_0_port_0_allowed_address_pairs:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.network.AddressPair
       port_oam_oam_0_port_1_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_oam_oam_internal_0_port_0:
         capability: tosca.capabilities.Node
@@ -6976,167 +6976,167 @@ node_types:
         type: string
         description: Unique ID for this VF Module instance
         required: true
-        status: SUPPORTED
+        status: supported
       internal_net_id:
         type: string
         description: internal network name/uuid
         required: true
-        status: SUPPORTED
+        status: supported
       vcscf_release:
         type: string
         description: IMS release
         required: true
-        status: SUPPORTED
+        status: supported
       tdcore_security_group:
         type: string
         description: security group
         required: true
-        status: SUPPORTED
+        status: supported
       tdcore_names:
         type: list
         description: List of instance names for TDCORE instances
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema: *id001
       port_tdcore_dpdk_0_port_1_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_tdcore_dpdk_0_port_1_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_tdcore_dpdk_0_port_1_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_tdcore_internal_0_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       vcscf_gateway:
         type: string
         description: OAM unit virtual ip
         required: true
-        status: SUPPORTED
+        status: supported
       vnf_name:
         type: string
         description: Unique name for this VF instance
         required: true
-        status: SUPPORTED
+        status: supported
       port_tdcore_internal_0_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_tdcore_dpdk_0_port_1_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       vf_module_name:
         type: string
         description: Unique name for this VF Module instance
         required: true
-        status: SUPPORTED
+        status: supported
       internal_dpdk_net_id:
         type: string
         description: internal dpdk network name/uuid
         required: true
-        status: SUPPORTED
+        status: supported
       port_tdcore_dpdk_0_port_1_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_tdcore_dpdk_0_port_1_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_tdcore_internal_0_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       vcscf_swrepo_address:
         type: string
         description: SWRepo IP or FQDN
         required: true
-        status: SUPPORTED
+        status: supported
       vnf_id:
         type: string
         description: Unique ID for this VF instance
         required: true
-        status: SUPPORTED
+        status: supported
       availability_zone_0:
         type: string
         description: Availability zone name.
         required: true
-        status: SUPPORTED
+        status: supported
       port_tdcore_dpdk_0_port_1_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_tdcore_internal_0_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       tdcore_flavor_name:
         type: string
         description: flavor name
         required: true
-        status: SUPPORTED
+        status: supported
       tdcore_image_name:
         type: string
         description: image name
         required: true
-        status: SUPPORTED
+        status: supported
       vcscf_cmrepo_address:
         type: string
         description: CMRepo IP or FQDN
         required: true
-        status: SUPPORTED
+        status: supported
       vcscf_dns_address:
         type: string
         description: DNS server IP
         required: true
-        status: SUPPORTED
+        status: supported
       vcscf_internal_network_mtu:
         type: float
         description: MTU for internal network interface (eth0)
         required: true
-        status: SUPPORTED
+        status: supported
         constraints: *id002
       port_tdcore_dpdk_0_port_1_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       tdcore_server_group:
         type: string
         description: server group name/id
         required: true
-        status: SUPPORTED
+        status: supported
       index:
         type: float
         description: index
         required: true
-        status: SUPPORTED
+        status: supported
         constraints: *id003
       vcscf_internal_netmask:
         type: string
         description: internal netmask
         required: true
-        status: SUPPORTED
+        status: supported
       port_tdcore_internal_0_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       vcscf_name_delimeter:
@@ -7144,56 +7144,56 @@ node_types:
         description: 'delimeter used in concatenating different words while naming
           (ex: "-","_",".",...)'
         required: true
-        status: SUPPORTED
+        status: supported
         constraints: *id004
       tdcore_internal_ips:
         type: list
         description: List of Internal Lan IPs for TDCORE instances
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema: *id005
       tdcore_dpdk_ips:
         type: list
         description: List of DPDK Lan IPs for TDCORE instances
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema: *id006
       tdcore_uuids:
         type: list
         description: List of UUIDs generated by cmrepo for TDCORE instances
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema: *id007
       vcscf_dn:
         type: string
         description: DN name
         required: true
-        status: SUPPORTED
+        status: supported
       port_tdcore_internal_0_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_tdcore_internal_0_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_tdcore_internal_0_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       vcscf_du:
         type: string
         description: DU name
         required: true
-        status: SUPPORTED
+        status: supported
       port_tdcore_dpdk_0_port_1_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_tdcore_internal_0_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_tdcore_internal_0_port_0:
         capability: tosca.capabilities.Node
@@ -7626,315 +7626,315 @@ node_types:
       port_cif_internal_0_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cif_oam_0_port_1_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_cif_oam_0_port_1_allowed_address_pairs:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.network.AddressPair
       port_cif_internal_0_port_0_security_groups:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_cif_internal_0_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_cif_internal_0_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_cif_internal_0_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_cif_oam_0_port_1_fixed_ips:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
       port_cif_ims_li_0_port_4_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cif_ims_core_0_port_2_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_cif_oam_0_port_1_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_cif_oam_0_port_3_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_cif_oam_0_port_1_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_cif_oam_0_port_1_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_cif_user_data_format:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_cif_oam_0_port_1_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_cif_ims_li_0_port_4_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_cif_oam_0_port_1_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_cif_ims_li_0_port_4_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_cif_scheduler_hints:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_cif_ims_li_0_port_4_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cif_oam_0_port_1_security_groups:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_cif_internal_0_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_cif_ims_core_0_port_2_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_cif_metadata:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_cif_internal_0_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_cif_oam_0_port_3_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cif_internal_0_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_cif_ims_li_0_port_4_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_cif_oam_0_port_3_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cif_oam_0_port_3_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cif_oam_0_port_1_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cif_ims_core_0_port_2_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cif_ims_core_0_port_2_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_cif_oam_0_port_3_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_cif_oam_0_port_1_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cif_oam_0_port_3_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_cif_oam_0_port_3_security_groups:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_cif_internal_0_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cif_oam_0_port_1_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_cif_ims_li_0_port_4_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cif_ims_li_0_port_4_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_cif_ims_core_0_port_2_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_cif_oam_0_port_3_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       compute_cif_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_cif_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_cif_oam_0_port_1_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cif_ims_li_0_port_4_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_cif_ims_core_0_port_2_security_groups:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_cif_ims_core_0_port_2_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_cif_oam_0_port_3_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_cif_oam_0_port_3_fixed_ips:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
       port_cif_internal_0_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cif_ims_core_0_port_2_allowed_address_pairs:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.network.AddressPair
       port_cif_internal_0_port_0_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_cif_ims_li_0_port_4_allowed_address_pairs:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.network.AddressPair
       port_cif_ims_core_0_port_2_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_cif_ims_li_0_port_4_fixed_ips:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
       port_cif_internal_0_port_0_allowed_address_pairs:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.network.AddressPair
       index_value:
@@ -7942,97 +7942,97 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       port_cif_oam_0_port_3_allowed_address_pairs:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.network.AddressPair
       port_cif_internal_0_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_cif_ims_core_0_port_2_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cif_ims_li_0_port_4_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_cif_ims_core_0_port_2_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_cif_config_drive:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: boolean
       port_cif_ims_li_0_port_4_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_cif_ims_core_0_port_2_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_cif_ims_core_0_port_2_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_cif_oam_0_port_3_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_cif_oam_0_port_3_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_cif_ims_core_0_port_2_fixed_ips:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
       port_cif_internal_0_port_0_fixed_ips:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
       port_cif_oam_0_port_1_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_cif_ims_li_0_port_4_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cif_ims_li_0_port_4_security_groups:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_cif_oam_0_port_3_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
     requirements:
@@ -8720,172 +8720,172 @@ node_types:
         type: string
         description: Unique ID for this VF Module instance
         required: true
-        status: SUPPORTED
+        status: supported
       internal_net_id:
         type: string
         description: internal network name/uuid
         required: true
-        status: SUPPORTED
+        status: supported
       vcscf_release:
         type: string
         description: IMS release
         required: true
-        status: SUPPORTED
+        status: supported
       port_cscf_internal_0_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       cscf_internal_ips:
         type: list
         description: List of Internal Lan IPs for CSCF instances
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema: *id008
       vcscf_gateway:
         type: string
         description: OAM unit cipa ip
         required: true
-        status: SUPPORTED
+        status: supported
       vnf_name:
         type: string
         description: Unique name for this VF instance
         required: true
-        status: SUPPORTED
+        status: supported
       port_cscf_internal_0_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       vf_module_name:
         type: string
         description: Unique name for this VF Module instance
         required: true
-        status: SUPPORTED
+        status: supported
       cscf_image_name:
         type: string
         description: image name
         required: true
-        status: SUPPORTED
+        status: supported
       cscf_names:
         type: list
         description: List of instance names for CSCF instances
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema: *id009
       port_cscf_internal_0_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vcscf_swrepo_address:
         type: string
         description: SWRepo IP or FQDN
         required: true
-        status: SUPPORTED
+        status: supported
       cscf_uuids:
         type: list
         description: List of UUIDs generated by cmrepo for CSCF instances
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema: *id010
       vnf_id:
         type: string
         description: Unique ID for this VF instance
         required: true
-        status: SUPPORTED
+        status: supported
       port_cscf_internal_0_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       availability_zone_0:
         type: string
         description: Availability zone name for CSCF instances.
         required: true
-        status: SUPPORTED
+        status: supported
       cscf_internal_v6_ips:
         type: list
         description: List of Internal Lan v6 IPs for CSCF instances
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema: *id011
       cscf_flavor_name:
         type: string
         description: flavor name
         required: true
-        status: SUPPORTED
+        status: supported
       vcscf_cmrepo_address:
         type: string
         description: CMRepo IP or FQDN
         required: true
-        status: SUPPORTED
+        status: supported
       vcscf_dns_address:
         type: string
         description: DNS server IP
         required: true
-        status: SUPPORTED
+        status: supported
       vcscf_internal_network_mtu:
         type: float
         description: MTU for internal network interface (eth0)
         required: true
-        status: SUPPORTED
+        status: supported
         constraints: *id012
       port_cscf_internal_0_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_cscf_internal_0_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       index:
         type: float
         description: index
         required: true
-        status: SUPPORTED
+        status: supported
         constraints: *id013
       vcscf_internal_netmask:
         type: string
         description: internal netmask
         required: true
-        status: SUPPORTED
+        status: supported
       vcscf_name_delimeter:
         type: string
         description: 'delimeter used in concatenating different words while naming
           (ex: "-","_",".",...)'
         required: true
-        status: SUPPORTED
+        status: supported
         constraints: *id014
       port_cscf_internal_0_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vcscf_dn:
         type: string
         description: DN name
         required: true
-        status: SUPPORTED
+        status: supported
       vcscf_du:
         type: string
         description: DU name
         required: true
-        status: SUPPORTED
+        status: supported
       port_cscf_internal_0_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_cscf_internal_0_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       cscf_security_group:
         type: string
         description: security group
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_cscf_server_0:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml
index cd1f543c80..6a457d5e4c 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -12,47 +12,47 @@ node_types:
         type: string
         description: Unique ID for this VF Module instance
         required: true
-        status: SUPPORTED
+        status: supported
       default_gateway:
         type: string
         description: Default gateway.
         required: true
-        status: SUPPORTED
+        status: supported
       instance_index:
         type: float
         description: Index of the instance.
         required: true
-        status: SUPPORTED
+        status: supported
       vnf_name:
         type: string
         description: Unique name for this VF instance.
         required: true
-        status: SUPPORTED
+        status: supported
       port_vson_server_oam_net_port_10_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_subnet_prefix_length:
         type: string
         description: Prefix length of the subnet on the OAM network.
         required: true
-        status: SUPPORTED
+        status: supported
       port_vson_server_oam_net_port_10_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       vf_module_name:
         type: string
         description: Unique name for this VF module instance.
         required: true
-        status: SUPPORTED
+        status: supported
       dns_servers:
         type: list
         description: List of DNS servers.
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema: &id007
           type: string
       oam_net_security_group_id:
@@ -60,114 +60,114 @@ node_types:
         description: |
           The ID of Security group applied on the port bound to the vSON OAM network.
         required: true
-        status: SUPPORTED
+        status: supported
       vnf_id:
         type: string
         description: Unique ID for this VF instance.
         required: true
-        status: SUPPORTED
+        status: supported
       vson_clm_oam_net_ip:
         type: string
         description: IP of the vSON Cluster Manager.
         required: true
-        status: SUPPORTED
+        status: supported
       port_vson_server_oam_net_port_10_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_vson_server_oam_net_port_10_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       vson_dc_unit:
         type: string
         description: Name of the vSON Data Center.
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_ips:
         type: list
         description: Fixed IP assignments for vSON instances on the OAM network.
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema: &id008
           type: string
       vfc_role:
         type: string
         description: Unique ID for this VF Module instance
         required: true
-        status: SUPPORTED
+        status: supported
       swift_account_auth_token:
         type: string
         description: |
           Swift account auth token. Example:  041a5187bb4641f9b89583e2539776b0
         required: true
-        status: SUPPORTED
+        status: supported
       vson_server_group_id:
         type: string
         description: |
           Tells what policy should be applied to the ServerGroup. Affinity policy will force instances to share the same hypervisor. Anti-affinity will force instances to run in different hypervisors.
         required: true
-        status: SUPPORTED
+        status: supported
       vson_vm_flavor_name:
         type: string
         description: The ID or name of the flavor to boot onto.
         required: true
-        status: SUPPORTED
+        status: supported
       availability_zones:
         type: list
         description: List of availability zones.
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema: &id009
           type: string
       volume_ids:
         type: list
         description: List of Volumes IDs.
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema: &id010
           type: string
       port_vson_server_oam_net_port_10_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       ntp_servers:
         type: list
         description: List of NTP servers.
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema: &id011
           type: string
       port_vson_server_oam_net_port_10_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_id:
         type: string
         description: The ID of the OAM network.
         required: true
-        status: SUPPORTED
+        status: supported
       port_vson_server_oam_net_port_10_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       vson_vm_names:
         type: list
         description: A list of unique names to be issued to the vSON Cluster leaders.
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema: &id012
           type: string
       port_vson_server_oam_net_port_10_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_vson_server_oam_net_port_10_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
     requirements:
@@ -519,43 +519,43 @@ node_types:
         type: string
         description: Unique ID for this VF Module instance
         required: true
-        status: SUPPORTED
+        status: supported
       default_gateway:
         type: string
         description: Default gateway.
         required: true
-        status: SUPPORTED
+        status: supported
       port_vson_server_oam_net_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       instance_index:
         type: float
         description: Index of the instance.
         required: true
-        status: SUPPORTED
+        status: supported
       vnf_name:
         type: string
         description: Unique name for this VF instance.
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_subnet_prefix_length:
         type: string
         description: Prefix length of the subnet on the OAM network.
         required: true
-        status: SUPPORTED
+        status: supported
       vf_module_name:
         type: string
         description: Unique name for this VF module instance.
         required: true
-        status: SUPPORTED
+        status: supported
       dns_servers:
         type: list
         description: List of DNS servers.
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       oam_net_security_group_id:
@@ -563,120 +563,120 @@ node_types:
         description: |
           The ID of Security group applied on the port bound to the vSON OAM network.
         required: true
-        status: SUPPORTED
+        status: supported
       vson_vm_image_name:
         type: string
         description: VM Image name the vSON instance will be created from.
         required: true
-        status: SUPPORTED
+        status: supported
       vnf_id:
         type: string
         description: Unique ID for this VF instance.
         required: true
-        status: SUPPORTED
+        status: supported
       port_vson_server_oam_net_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vson_clm_oam_net_ip:
         type: string
         description: IP of the vSON Cluster Manager.
         required: true
-        status: SUPPORTED
+        status: supported
       port_vson_server_oam_net_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_vson_server_oam_net_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vson_dc_unit:
         type: string
         description: Name of the vSON Data Center.
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_ips:
         type: list
         description: Fixed IPv4 assignments for vSON instances on the OAM network.
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       oam_net_subnet_v6_prefix_length:
         type: string
         description: OAM network IPv6 subnet prefix length.
         required: true
-        status: SUPPORTED
+        status: supported
       vfc_role:
         type: string
         description: Unique ID for this VF Module instance
         required: true
-        status: SUPPORTED
+        status: supported
       swift_account_auth_token:
         type: string
         description: |
           Swift account auth token. Example:  041a5187bb4641f9b89583e2539776b0
         required: true
-        status: SUPPORTED
+        status: supported
       port_vson_server_oam_net_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       default_gateway_v6:
         type: string
         description: Default IPv6 gateway.
         required: true
-        status: SUPPORTED
+        status: supported
       vson_server_group_id:
         type: string
         description: |
           Tells what policy should be applied to the ServerGroup. Affinity policy will force instances to share the same hypervisor. Anti-affinity will force instances to run in different hypervisors.
         required: true
-        status: SUPPORTED
+        status: supported
       vson_vm_flavor_name:
         type: string
         description: The ID or name of the flavor to boot onto.
         required: true
-        status: SUPPORTED
+        status: supported
       port_vson_server_oam_net_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_vson_server_oam_net_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       availability_zones:
         type: list
         description: List of availability zones.
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       volume_ids:
         type: list
         description: List of Volumes IDs.
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       oam_net_v6_ips:
         type: list
         description: Fixed IPv6 assignments for vSON instances on the OAM network.
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       ntp_servers:
         type: list
         description: List of NTP servers.
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vson_join_cluster_auth_token:
@@ -684,25 +684,25 @@ node_types:
         description: |
           Authentication Token generated for the user permitted to add a new Datacenter/vSON member to existing vSON Cluster.
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_id:
         type: string
         description: The ID of the OAM network.
         required: true
-        status: SUPPORTED
+        status: supported
       port_vson_server_oam_net_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_vson_server_oam_net_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       vson_vm_names:
         type: list
         description: A list of unique names to be issued to the vSON Cluster leaders.
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
     requirements:
@@ -1054,53 +1054,53 @@ node_types:
         type: string
         description: Unique ID for this VF Module instance
         required: true
-        status: SUPPORTED
+        status: supported
       default_gateway:
         type: string
         description: Default gateway.
         required: true
-        status: SUPPORTED
+        status: supported
       port_vson_server_oam_net_port_00_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       instance_index:
         type: float
         description: Index of the instance.
         required: true
-        status: SUPPORTED
+        status: supported
       vnf_name:
         type: string
         description: Unique name for this VF instance.
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_subnet_prefix_length:
         type: string
         description: Prefix length of the subnet on the OAM network.
         required: true
-        status: SUPPORTED
+        status: supported
       port_vson_server_oam_net_port_00_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       vf_module_name:
         type: string
         description: Unique name for this VF module instance.
         required: true
-        status: SUPPORTED
+        status: supported
       port_vson_server_oam_net_port_00_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       dns_servers:
         type: list
         description: List of DNS servers.
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema: &id001
           type: string
       oam_net_security_group_id:
@@ -1108,79 +1108,79 @@ node_types:
         description: |
           The ID of Security group applied on the port bound to the vSON OAM network.
         required: true
-        status: SUPPORTED
+        status: supported
       vson_vm_image_name:
         type: string
         description: VM Image name the vSON instance will be created from.
         required: true
-        status: SUPPORTED
+        status: supported
       vnf_id:
         type: string
         description: Unique ID for this VF instance.
         required: true
-        status: SUPPORTED
+        status: supported
       vson_clm_oam_net_ip:
         type: string
         description: IP of the vSON Cluster Manager.
         required: true
-        status: SUPPORTED
+        status: supported
       vson_dc_unit:
         type: string
         description: Name of the vSON Data Center.
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_ips:
         type: list
         description: Fixed IP assignments for vSON instances on the OAM network.
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema: &id002
           type: string
       vfc_role:
         type: string
         description: Unique ID for this VF Module instance
         required: true
-        status: SUPPORTED
+        status: supported
       swift_account_auth_token:
         type: string
         description: |
           Swift account auth token. Example:  041a5187bb4641f9b89583e2539776b0
         required: true
-        status: SUPPORTED
+        status: supported
       port_vson_server_oam_net_port_00_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       vson_server_group_id:
         type: string
         description: |
           Tells what policy should be applied to the ServerGroup. Affinity policy will force instances to share the same hypervisor. Anti-affinity will force instances to run in different hypervisors.
         required: true
-        status: SUPPORTED
+        status: supported
       vson_vm_flavor_name:
         type: string
         description: The ID or name of the flavor to boot onto.
         required: true
-        status: SUPPORTED
+        status: supported
       availability_zones:
         type: list
         description: List of availability zones.
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema: &id003
           type: string
       volume_ids:
         type: list
         description: List of Volumes IDs.
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema: &id004
           type: string
       ntp_servers:
         type: list
         description: List of NTP servers.
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema: &id005
           type: string
       vson_join_cluster_auth_token:
@@ -1188,41 +1188,41 @@ node_types:
         description: "Authentication Token generated for the user permitted to add\
           \  a new Datacenter/vSON member to existing vSON Cluster. \n"
         required: true
-        status: SUPPORTED
+        status: supported
       port_vson_server_oam_net_port_00_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_vson_server_oam_net_port_00_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_id:
         type: string
         description: The ID of the OAM network.
         required: true
-        status: SUPPORTED
+        status: supported
       port_vson_server_oam_net_port_00_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_vson_server_oam_net_port_00_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vson_vm_names:
         type: list
         description: A list of unique names to be issued to the vSON Cluster leaders.
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema: &id006
           type: string
       port_vson_server_oam_net_port_00_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_vson_server_2:
         capability: tosca.capabilities.Node
@@ -1572,169 +1572,169 @@ node_types:
         type: string
         description: Unique ID for this VF Module instance
         required: true
-        status: SUPPORTED
+        status: supported
       default_gateway:
         type: string
         description: Default gateway.
         required: true
-        status: SUPPORTED
+        status: supported
       port_vson_server_oam_net_port_00_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       instance_index:
         type: float
         description: Index of the instance.
         required: true
-        status: SUPPORTED
+        status: supported
       vnf_name:
         type: string
         description: Unique name for this VF instance.
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_subnet_prefix_length:
         type: string
         description: Prefix length of the subnet on the OAM network.
         required: true
-        status: SUPPORTED
+        status: supported
       port_vson_server_oam_net_port_00_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       vf_module_name:
         type: string
         description: Unique name for this VF module instance.
         required: true
-        status: SUPPORTED
+        status: supported
       port_vson_server_oam_net_port_00_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       dns_servers:
         type: list
         description: List of DNS servers.
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema: *id001
       oam_net_security_group_id:
         type: string
         description: |
           The ID of Security group applied on the port bound to the vSON OAM network.
         required: true
-        status: SUPPORTED
+        status: supported
       vson_vm_image_name:
         type: string
         description: VM Image name the vSON instance will be created from.
         required: true
-        status: SUPPORTED
+        status: supported
       vnf_id:
         type: string
         description: Unique ID for this VF instance.
         required: true
-        status: SUPPORTED
+        status: supported
       vson_clm_oam_net_ip:
         type: string
         description: IP of the vSON Cluster Manager.
         required: true
-        status: SUPPORTED
+        status: supported
       vson_dc_unit:
         type: string
         description: Name of the vSON Data Center.
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_ips:
         type: list
         description: Fixed IP assignments for vSON instances on the OAM network.
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema: *id002
       vfc_role:
         type: string
         description: Unique ID for this VF Module instance
         required: true
-        status: SUPPORTED
+        status: supported
       swift_account_auth_token:
         type: string
         description: |
           Swift account auth token. Example:  041a5187bb4641f9b89583e2539776b0
         required: true
-        status: SUPPORTED
+        status: supported
       port_vson_server_oam_net_port_00_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       vson_server_group_id:
         type: string
         description: |
           Tells what policy should be applied to the ServerGroup. Affinity policy will force instances to share the same hypervisor. Anti-affinity will force instances to run in different hypervisors.
         required: true
-        status: SUPPORTED
+        status: supported
       vson_vm_flavor_name:
         type: string
         description: The ID or name of the flavor to boot onto.
         required: true
-        status: SUPPORTED
+        status: supported
       availability_zones:
         type: list
         description: List of availability zones.
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema: *id003
       volume_ids:
         type: list
         description: List of Volumes IDs.
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema: *id004
       ntp_servers:
         type: list
         description: List of NTP servers.
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema: *id005
       vson_join_cluster_auth_token:
         type: string
         description: "Authentication Token generated for the user permitted to add\
           \  a new Datacenter/vSON member to existing vSON Cluster. \n"
         required: true
-        status: SUPPORTED
+        status: supported
       port_vson_server_oam_net_port_00_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_vson_server_oam_net_port_00_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_id:
         type: string
         description: The ID of the OAM network.
         required: true
-        status: SUPPORTED
+        status: supported
       port_vson_server_oam_net_port_00_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_vson_server_oam_net_port_00_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vson_vm_names:
         type: list
         description: A list of unique names to be issued to the vSON Cluster leaders.
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema: *id006
       port_vson_server_oam_net_port_00_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_vson_server_2:
         capability: tosca.capabilities.Node
@@ -2084,156 +2084,156 @@ node_types:
         type: string
         description: Unique ID for this VF Module instance
         required: true
-        status: SUPPORTED
+        status: supported
       default_gateway:
         type: string
         description: Default gateway.
         required: true
-        status: SUPPORTED
+        status: supported
       instance_index:
         type: float
         description: Index of the instance.
         required: true
-        status: SUPPORTED
+        status: supported
       vnf_name:
         type: string
         description: Unique name for this VF instance.
         required: true
-        status: SUPPORTED
+        status: supported
       port_vson_server_oam_net_port_10_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_subnet_prefix_length:
         type: string
         description: Prefix length of the subnet on the OAM network.
         required: true
-        status: SUPPORTED
+        status: supported
       port_vson_server_oam_net_port_10_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       vf_module_name:
         type: string
         description: Unique name for this VF module instance.
         required: true
-        status: SUPPORTED
+        status: supported
       dns_servers:
         type: list
         description: List of DNS servers.
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema: *id007
       oam_net_security_group_id:
         type: string
         description: |
           The ID of Security group applied on the port bound to the vSON OAM network.
         required: true
-        status: SUPPORTED
+        status: supported
       vnf_id:
         type: string
         description: Unique ID for this VF instance.
         required: true
-        status: SUPPORTED
+        status: supported
       vson_clm_oam_net_ip:
         type: string
         description: IP of the vSON Cluster Manager.
         required: true
-        status: SUPPORTED
+        status: supported
       port_vson_server_oam_net_port_10_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_vson_server_oam_net_port_10_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       vson_dc_unit:
         type: string
         description: Name of the vSON Data Center.
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_ips:
         type: list
         description: Fixed IP assignments for vSON instances on the OAM network.
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema: *id008
       vfc_role:
         type: string
         description: Unique ID for this VF Module instance
         required: true
-        status: SUPPORTED
+        status: supported
       swift_account_auth_token:
         type: string
         description: |
           Swift account auth token. Example:  041a5187bb4641f9b89583e2539776b0
         required: true
-        status: SUPPORTED
+        status: supported
       vson_server_group_id:
         type: string
         description: |
           Tells what policy should be applied to the ServerGroup. Affinity policy will force instances to share the same hypervisor. Anti-affinity will force instances to run in different hypervisors.
         required: true
-        status: SUPPORTED
+        status: supported
       vson_vm_flavor_name:
         type: string
         description: The ID or name of the flavor to boot onto.
         required: true
-        status: SUPPORTED
+        status: supported
       availability_zones:
         type: list
         description: List of availability zones.
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema: *id009
       volume_ids:
         type: list
         description: List of Volumes IDs.
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema: *id010
       port_vson_server_oam_net_port_10_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       ntp_servers:
         type: list
         description: List of NTP servers.
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema: *id011
       port_vson_server_oam_net_port_10_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_id:
         type: string
         description: The ID of the OAM network.
         required: true
-        status: SUPPORTED
+        status: supported
       port_vson_server_oam_net_port_10_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       vson_vm_names:
         type: list
         description: A list of unique names to be issued to the vSON Cluster leaders.
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema: *id012
       port_vson_server_oam_net_port_10_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_vson_server_oam_net_port_10_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
     requirements:
@@ -2585,169 +2585,169 @@ node_types:
         type: string
         description: Unique ID for this VF Module instance
         required: true
-        status: SUPPORTED
+        status: supported
       default_gateway:
         type: string
         description: Default gateway.
         required: true
-        status: SUPPORTED
+        status: supported
       port_vson_server_oam_net_port_00_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       instance_index:
         type: float
         description: Index of the instance.
         required: true
-        status: SUPPORTED
+        status: supported
       vnf_name:
         type: string
         description: Unique name for this VF instance.
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_subnet_prefix_length:
         type: string
         description: Prefix length of the subnet on the OAM network.
         required: true
-        status: SUPPORTED
+        status: supported
       port_vson_server_oam_net_port_00_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       vf_module_name:
         type: string
         description: Unique name for this VF module instance.
         required: true
-        status: SUPPORTED
+        status: supported
       port_vson_server_oam_net_port_00_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       dns_servers:
         type: list
         description: List of DNS servers.
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema: *id001
       oam_net_security_group_id:
         type: string
         description: |
           The ID of Security group applied on the port bound to the vSON OAM network.
         required: true
-        status: SUPPORTED
+        status: supported
       vson_vm_image_name:
         type: string
         description: VM Image name the vSON instance will be created from.
         required: true
-        status: SUPPORTED
+        status: supported
       vnf_id:
         type: string
         description: Unique ID for this VF instance.
         required: true
-        status: SUPPORTED
+        status: supported
       vson_clm_oam_net_ip:
         type: string
         description: IP of the vSON Cluster Manager.
         required: true
-        status: SUPPORTED
+        status: supported
       vson_dc_unit:
         type: string
         description: Name of the vSON Data Center.
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_ips:
         type: list
         description: Fixed IP assignments for vSON instances on the OAM network.
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema: *id002
       vfc_role:
         type: string
         description: Unique ID for this VF Module instance
         required: true
-        status: SUPPORTED
+        status: supported
       swift_account_auth_token:
         type: string
         description: |
           Swift account auth token. Example:  041a5187bb4641f9b89583e2539776b0
         required: true
-        status: SUPPORTED
+        status: supported
       port_vson_server_oam_net_port_00_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       vson_server_group_id:
         type: string
         description: |
           Tells what policy should be applied to the ServerGroup. Affinity policy will force instances to share the same hypervisor. Anti-affinity will force instances to run in different hypervisors.
         required: true
-        status: SUPPORTED
+        status: supported
       vson_vm_flavor_name:
         type: string
         description: The ID or name of the flavor to boot onto.
         required: true
-        status: SUPPORTED
+        status: supported
       availability_zones:
         type: list
         description: List of availability zones.
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema: *id003
       volume_ids:
         type: list
         description: List of Volumes IDs.
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema: *id004
       ntp_servers:
         type: list
         description: List of NTP servers.
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema: *id005
       vson_join_cluster_auth_token:
         type: string
         description: "Authentication Token generated for the user permitted to add\
           \  a new Datacenter/vSON member to existing vSON Cluster. \n"
         required: true
-        status: SUPPORTED
+        status: supported
       port_vson_server_oam_net_port_00_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_vson_server_oam_net_port_00_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_id:
         type: string
         description: The ID of the OAM network.
         required: true
-        status: SUPPORTED
+        status: supported
       port_vson_server_oam_net_port_00_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_vson_server_oam_net_port_00_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vson_vm_names:
         type: list
         description: A list of unique names to be issued to the vSON Cluster leaders.
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema: *id006
       port_vson_server_oam_net_port_00_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_vson_server_2:
         capability: tosca.capabilities.Node
@@ -3097,169 +3097,169 @@ node_types:
         type: string
         description: Unique ID for this VF Module instance
         required: true
-        status: SUPPORTED
+        status: supported
       default_gateway:
         type: string
         description: Default gateway.
         required: true
-        status: SUPPORTED
+        status: supported
       port_vson_server_oam_net_port_00_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       instance_index:
         type: float
         description: Index of the instance.
         required: true
-        status: SUPPORTED
+        status: supported
       vnf_name:
         type: string
         description: Unique name for this VF instance.
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_subnet_prefix_length:
         type: string
         description: Prefix length of the subnet on the OAM network.
         required: true
-        status: SUPPORTED
+        status: supported
       port_vson_server_oam_net_port_00_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       vf_module_name:
         type: string
         description: Unique name for this VF module instance.
         required: true
-        status: SUPPORTED
+        status: supported
       port_vson_server_oam_net_port_00_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       dns_servers:
         type: list
         description: List of DNS servers.
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema: *id001
       oam_net_security_group_id:
         type: string
         description: |
           The ID of Security group applied on the port bound to the vSON OAM network.
         required: true
-        status: SUPPORTED
+        status: supported
       vson_vm_image_name:
         type: string
         description: VM Image name the vSON instance will be created from.
         required: true
-        status: SUPPORTED
+        status: supported
       vnf_id:
         type: string
         description: Unique ID for this VF instance.
         required: true
-        status: SUPPORTED
+        status: supported
       vson_clm_oam_net_ip:
         type: string
         description: IP of the vSON Cluster Manager.
         required: true
-        status: SUPPORTED
+        status: supported
       vson_dc_unit:
         type: string
         description: Name of the vSON Data Center.
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_ips:
         type: list
         description: Fixed IP assignments for vSON instances on the OAM network.
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema: *id002
       vfc_role:
         type: string
         description: Unique ID for this VF Module instance
         required: true
-        status: SUPPORTED
+        status: supported
       swift_account_auth_token:
         type: string
         description: |
           Swift account auth token. Example:  041a5187bb4641f9b89583e2539776b0
         required: true
-        status: SUPPORTED
+        status: supported
       port_vson_server_oam_net_port_00_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       vson_server_group_id:
         type: string
         description: |
           Tells what policy should be applied to the ServerGroup. Affinity policy will force instances to share the same hypervisor. Anti-affinity will force instances to run in different hypervisors.
         required: true
-        status: SUPPORTED
+        status: supported
       vson_vm_flavor_name:
         type: string
         description: The ID or name of the flavor to boot onto.
         required: true
-        status: SUPPORTED
+        status: supported
       availability_zones:
         type: list
         description: List of availability zones.
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema: *id003
       volume_ids:
         type: list
         description: List of Volumes IDs.
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema: *id004
       ntp_servers:
         type: list
         description: List of NTP servers.
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema: *id005
       vson_join_cluster_auth_token:
         type: string
         description: "Authentication Token generated for the user permitted to add\
           \  a new Datacenter/vSON member to existing vSON Cluster. \n"
         required: true
-        status: SUPPORTED
+        status: supported
       port_vson_server_oam_net_port_00_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_vson_server_oam_net_port_00_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_id:
         type: string
         description: The ID of the OAM network.
         required: true
-        status: SUPPORTED
+        status: supported
       port_vson_server_oam_net_port_00_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_vson_server_oam_net_port_00_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vson_vm_names:
         type: list
         description: A list of unique names to be issued to the vSON Cluster leaders.
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema: *id006
       port_vson_server_oam_net_port_00_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_vson_server_2:
         capability: tosca.capabilities.Node
@@ -3609,169 +3609,169 @@ node_types:
         type: string
         description: Unique ID for this VF Module instance
         required: true
-        status: SUPPORTED
+        status: supported
       default_gateway:
         type: string
         description: Default gateway.
         required: true
-        status: SUPPORTED
+        status: supported
       port_vson_server_oam_net_port_00_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       instance_index:
         type: float
         description: Index of the instance.
         required: true
-        status: SUPPORTED
+        status: supported
       vnf_name:
         type: string
         description: Unique name for this VF instance.
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_subnet_prefix_length:
         type: string
         description: Prefix length of the subnet on the OAM network.
         required: true
-        status: SUPPORTED
+        status: supported
       port_vson_server_oam_net_port_00_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       vf_module_name:
         type: string
         description: Unique name for this VF module instance.
         required: true
-        status: SUPPORTED
+        status: supported
       port_vson_server_oam_net_port_00_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       dns_servers:
         type: list
         description: List of DNS servers.
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema: *id001
       oam_net_security_group_id:
         type: string
         description: |
           The ID of Security group applied on the port bound to the vSON OAM network.
         required: true
-        status: SUPPORTED
+        status: supported
       vson_vm_image_name:
         type: string
         description: VM Image name the vSON instance will be created from.
         required: true
-        status: SUPPORTED
+        status: supported
       vnf_id:
         type: string
         description: Unique ID for this VF instance.
         required: true
-        status: SUPPORTED
+        status: supported
       vson_clm_oam_net_ip:
         type: string
         description: IP of the vSON Cluster Manager.
         required: true
-        status: SUPPORTED
+        status: supported
       vson_dc_unit:
         type: string
         description: Name of the vSON Data Center.
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_ips:
         type: list
         description: Fixed IP assignments for vSON instances on the OAM network.
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema: *id002
       vfc_role:
         type: string
         description: Unique ID for this VF Module instance
         required: true
-        status: SUPPORTED
+        status: supported
       swift_account_auth_token:
         type: string
         description: |
           Swift account auth token. Example:  041a5187bb4641f9b89583e2539776b0
         required: true
-        status: SUPPORTED
+        status: supported
       port_vson_server_oam_net_port_00_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       vson_server_group_id:
         type: string
         description: |
           Tells what policy should be applied to the ServerGroup. Affinity policy will force instances to share the same hypervisor. Anti-affinity will force instances to run in different hypervisors.
         required: true
-        status: SUPPORTED
+        status: supported
       vson_vm_flavor_name:
         type: string
         description: The ID or name of the flavor to boot onto.
         required: true
-        status: SUPPORTED
+        status: supported
       availability_zones:
         type: list
         description: List of availability zones.
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema: *id003
       volume_ids:
         type: list
         description: List of Volumes IDs.
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema: *id004
       ntp_servers:
         type: list
         description: List of NTP servers.
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema: *id005
       vson_join_cluster_auth_token:
         type: string
         description: "Authentication Token generated for the user permitted to add\
           \  a new Datacenter/vSON member to existing vSON Cluster. \n"
         required: true
-        status: SUPPORTED
+        status: supported
       port_vson_server_oam_net_port_00_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_vson_server_oam_net_port_00_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_id:
         type: string
         description: The ID of the OAM network.
         required: true
-        status: SUPPORTED
+        status: supported
       port_vson_server_oam_net_port_00_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_vson_server_oam_net_port_00_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vson_vm_names:
         type: list
         description: A list of unique names to be issued to the vSON Cluster leaders.
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema: *id006
       port_vson_server_oam_net_port_00_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_vson_server_2:
         capability: tosca.capabilities.Node
@@ -4121,54 +4121,54 @@ node_types:
         type: string
         description: Unique ID for this VF Module instance
         required: true
-        status: SUPPORTED
+        status: supported
       vson_cluster_name:
         type: string
         description: Name of the vSON Cluster.
         required: true
-        status: SUPPORTED
+        status: supported
       default_gateway:
         type: string
         description: Default gateway.
         required: true
-        status: SUPPORTED
+        status: supported
       instance_index:
         type: float
         description: Index of the instance.
         required: true
-        status: SUPPORTED
+        status: supported
       vnf_name:
         type: string
         description: Unique name for this VF instance.
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_subnet_prefix_length:
         type: string
         description: Prefix length of the subnet on the OAM network.
         required: true
-        status: SUPPORTED
+        status: supported
       swift_storage_url:
         type: string
         description: |
           Swift storage URL. Example: http://172.16.209.246:8080/v1/AUTH_a4d426b5ef2e41408a8e6e6b9a8d3029 http://172.16.209.246:8080 - protocol, IP and port, v1 - API version AUTH_a4d426b5ef2e41408a8e6e6b9a8d3029 - account ID
         required: true
-        status: SUPPORTED
+        status: supported
       vf_module_name:
         type: string
         description: Unique name for this VF module instance.
         required: true
-        status: SUPPORTED
+        status: supported
       dns_servers:
         type: list
         description: List of DNS servers.
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema: &id013
           type: string
       port_vson_server_oam_net_port_20_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       oam_net_security_group_id:
@@ -4176,116 +4176,116 @@ node_types:
         description: |
           The ID of Security group applied on the port bound to the vSON OAM network.
         required: true
-        status: SUPPORTED
+        status: supported
       vson_vm_image_name:
         type: string
         description: VM Image name the vSON instance will be created from.
         required: true
-        status: SUPPORTED
+        status: supported
       vnf_id:
         type: string
         description: Unique ID for this VF instance.
         required: true
-        status: SUPPORTED
+        status: supported
       port_vson_server_oam_net_port_20_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vson_clm_oam_net_ip:
         type: string
         description: IP of the vSON Cluster Manager.
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_ips:
         type: list
         description: Fixed IP assignments for vSON instances on the OAM network.
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema: &id014
           type: string
       swift_son_container_name:
         type: string
         description: Swift container storing vSON artifacts.
         required: true
-        status: SUPPORTED
+        status: supported
       vfc_role:
         type: string
         description: Unique ID for this VF Module instance
         required: true
-        status: SUPPORTED
+        status: supported
       swift_account_auth_token:
         type: string
         description: |
           Swift account auth token. Example:  041a5187bb4641f9b89583e2539776b0
         required: true
-        status: SUPPORTED
+        status: supported
       vson_server_group_id:
         type: string
         description: |
           Tells what policy should be applied to the ServerGroup. Affinity policy will force instances to share the same hypervisor. Anti-affinity will force instances to run in different hypervisors.
         required: true
-        status: SUPPORTED
+        status: supported
       vson_vm_flavor_name:
         type: string
         description: The ID or name of the flavor to boot onto.
         required: true
-        status: SUPPORTED
+        status: supported
       port_vson_server_oam_net_port_20_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       availability_zones:
         type: list
         description: List of availability zones.
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema: &id015
           type: string
       ntp_servers:
         type: list
         description: List of NTP servers.
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema: &id016
           type: string
       port_vson_server_oam_net_port_20_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_vson_server_oam_net_port_20_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_vson_server_oam_net_port_20_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_vson_server_oam_net_port_20_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_id:
         type: string
         description: The ID of the OAM network.
         required: true
-        status: SUPPORTED
+        status: supported
       port_vson_server_oam_net_port_20_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_vson_server_oam_net_port_20_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       vson_vm_names:
         type: list
         description: A list of unique names to be issued to the vSON Cluster leaders.
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema: &id017
           type: string
     requirements:
@@ -4637,53 +4637,53 @@ node_types:
         type: string
         description: Unique ID for this VF Module instance
         required: true
-        status: SUPPORTED
+        status: supported
       vson_cluster_name:
         type: string
         description: Name of the vSON Cluster.
         required: true
-        status: SUPPORTED
+        status: supported
       default_gateway:
         type: string
         description: Default gateway.
         required: true
-        status: SUPPORTED
+        status: supported
       instance_index:
         type: float
         description: Index of the instance.
         required: true
-        status: SUPPORTED
+        status: supported
       vnf_name:
         type: string
         description: Unique name for this VF instance.
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_subnet_prefix_length:
         type: string
         description: Prefix length of the subnet on the OAM network.
         required: true
-        status: SUPPORTED
+        status: supported
       swift_storage_url:
         type: string
         description: |
           Swift storage URL. Example: http://172.16.209.246:8080/v1/AUTH_a4d426b5ef2e41408a8e6e6b9a8d3029 http://172.16.209.246:8080 - protocol, IP and port, v1 - API version AUTH_a4d426b5ef2e41408a8e6e6b9a8d3029 - account ID
         required: true
-        status: SUPPORTED
+        status: supported
       vf_module_name:
         type: string
         description: Unique name for this VF module instance.
         required: true
-        status: SUPPORTED
+        status: supported
       dns_servers:
         type: list
         description: List of DNS servers.
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema: *id013
       port_vson_server_oam_net_port_20_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       oam_net_security_group_id:
@@ -4691,113 +4691,113 @@ node_types:
         description: |
           The ID of Security group applied on the port bound to the vSON OAM network.
         required: true
-        status: SUPPORTED
+        status: supported
       vson_vm_image_name:
         type: string
         description: VM Image name the vSON instance will be created from.
         required: true
-        status: SUPPORTED
+        status: supported
       vnf_id:
         type: string
         description: Unique ID for this VF instance.
         required: true
-        status: SUPPORTED
+        status: supported
       port_vson_server_oam_net_port_20_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vson_clm_oam_net_ip:
         type: string
         description: IP of the vSON Cluster Manager.
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_ips:
         type: list
         description: Fixed IP assignments for vSON instances on the OAM network.
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema: *id014
       swift_son_container_name:
         type: string
         description: Swift container storing vSON artifacts.
         required: true
-        status: SUPPORTED
+        status: supported
       vfc_role:
         type: string
         description: Unique ID for this VF Module instance
         required: true
-        status: SUPPORTED
+        status: supported
       swift_account_auth_token:
         type: string
         description: |
           Swift account auth token. Example:  041a5187bb4641f9b89583e2539776b0
         required: true
-        status: SUPPORTED
+        status: supported
       vson_server_group_id:
         type: string
         description: |
           Tells what policy should be applied to the ServerGroup. Affinity policy will force instances to share the same hypervisor. Anti-affinity will force instances to run in different hypervisors.
         required: true
-        status: SUPPORTED
+        status: supported
       vson_vm_flavor_name:
         type: string
         description: The ID or name of the flavor to boot onto.
         required: true
-        status: SUPPORTED
+        status: supported
       port_vson_server_oam_net_port_20_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       availability_zones:
         type: list
         description: List of availability zones.
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema: *id015
       ntp_servers:
         type: list
         description: List of NTP servers.
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema: *id016
       port_vson_server_oam_net_port_20_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_vson_server_oam_net_port_20_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_vson_server_oam_net_port_20_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_vson_server_oam_net_port_20_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_id:
         type: string
         description: The ID of the OAM network.
         required: true
-        status: SUPPORTED
+        status: supported
       port_vson_server_oam_net_port_20_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_vson_server_oam_net_port_20_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       vson_vm_names:
         type: list
         description: A list of unique names to be issued to the vSON Cluster leaders.
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema: *id017
     requirements:
     - dependency_vson_server_1:
@@ -5148,156 +5148,156 @@ node_types:
         type: string
         description: Unique ID for this VF Module instance
         required: true
-        status: SUPPORTED
+        status: supported
       default_gateway:
         type: string
         description: Default gateway.
         required: true
-        status: SUPPORTED
+        status: supported
       instance_index:
         type: float
         description: Index of the instance.
         required: true
-        status: SUPPORTED
+        status: supported
       vnf_name:
         type: string
         description: Unique name for this VF instance.
         required: true
-        status: SUPPORTED
+        status: supported
       port_vson_server_oam_net_port_10_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_subnet_prefix_length:
         type: string
         description: Prefix length of the subnet on the OAM network.
         required: true
-        status: SUPPORTED
+        status: supported
       port_vson_server_oam_net_port_10_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       vf_module_name:
         type: string
         description: Unique name for this VF module instance.
         required: true
-        status: SUPPORTED
+        status: supported
       dns_servers:
         type: list
         description: List of DNS servers.
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema: *id007
       oam_net_security_group_id:
         type: string
         description: |
           The ID of Security group applied on the port bound to the vSON OAM network.
         required: true
-        status: SUPPORTED
+        status: supported
       vnf_id:
         type: string
         description: Unique ID for this VF instance.
         required: true
-        status: SUPPORTED
+        status: supported
       vson_clm_oam_net_ip:
         type: string
         description: IP of the vSON Cluster Manager.
         required: true
-        status: SUPPORTED
+        status: supported
       port_vson_server_oam_net_port_10_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_vson_server_oam_net_port_10_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       vson_dc_unit:
         type: string
         description: Name of the vSON Data Center.
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_ips:
         type: list
         description: Fixed IP assignments for vSON instances on the OAM network.
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema: *id008
       vfc_role:
         type: string
         description: Unique ID for this VF Module instance
         required: true
-        status: SUPPORTED
+        status: supported
       swift_account_auth_token:
         type: string
         description: |
           Swift account auth token. Example:  041a5187bb4641f9b89583e2539776b0
         required: true
-        status: SUPPORTED
+        status: supported
       vson_server_group_id:
         type: string
         description: |
           Tells what policy should be applied to the ServerGroup. Affinity policy will force instances to share the same hypervisor. Anti-affinity will force instances to run in different hypervisors.
         required: true
-        status: SUPPORTED
+        status: supported
       vson_vm_flavor_name:
         type: string
         description: The ID or name of the flavor to boot onto.
         required: true
-        status: SUPPORTED
+        status: supported
       availability_zones:
         type: list
         description: List of availability zones.
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema: *id009
       volume_ids:
         type: list
         description: List of Volumes IDs.
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema: *id010
       port_vson_server_oam_net_port_10_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       ntp_servers:
         type: list
         description: List of NTP servers.
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema: *id011
       port_vson_server_oam_net_port_10_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_id:
         type: string
         description: The ID of the OAM network.
         required: true
-        status: SUPPORTED
+        status: supported
       port_vson_server_oam_net_port_10_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       vson_vm_names:
         type: list
         description: A list of unique names to be issued to the vSON Cluster leaders.
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema: *id012
       port_vson_server_oam_net_port_10_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_vson_server_oam_net_port_10_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
     requirements:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/myTest/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/myTest/out/GlobalSubstitutionTypesServiceTemplate.yaml
index e92abe8fd5..e940d5c17a 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/myTest/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/myTest/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -11,19 +11,19 @@ node_types:
       compute_jsa_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
     requirements:
@@ -291,120 +291,120 @@ node_types:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       p1:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui_port_8_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       p2:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui_port_8_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui_port_7_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       availability_zone_0:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       net:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui_port_8_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_cmaui_port_7_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       security_group_name:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_cmaui_port_8_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui_port_8_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui_port_7_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_cmaui_port_7_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_image:
         type: string
         description: Image for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_flavor:
         type: string
         description: Flavor for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui_port_7_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui_port_7_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_cmaui_port_7_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui_port_7_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui_port_8_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       cmaui_oam_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui_port_8_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui_port_8_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_cmaui_port_7:
         capability: tosca.capabilities.Node
@@ -825,91 +825,91 @@ node_types:
       port_cmaui_port_6_fixed_ips:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
       port_cmaui_port_6_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui_port_5_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui_port_5_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui_port_6_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_cmaui_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_cmaui_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui_port_6_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_cmaui_port_6_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_cmaui_port_6_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui_port_5_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_cmaui_port_5_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui_port_6_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui_port_5_fixed_ips:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
       port_cmaui_port_6_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_cmaui_port_5_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       index_value:
@@ -917,57 +917,57 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       port_cmaui_port_5_replacement_policy:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_cmaui_port_6_replacement_policy:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_cmaui_port_5_security_groups:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_cmaui_port_5_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui_port_5_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_cmaui_port_6_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui_port_5_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui_port_6_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui_port_5_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui_port_6_security_groups:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
     requirements:
@@ -1390,73 +1390,73 @@ node_types:
       port_cmaui_port_1_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui_port_2_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui_port_1_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui_port_1_security_groups:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_cmaui_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_cmaui_port_2_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui_port_1_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       compute_cmaui_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_cmaui_port_1_fixed_ips:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
       port_cmaui_port_1_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui_port_2_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui_port_2_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_cmaui_port_2_security_groups:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       index_value:
@@ -1464,75 +1464,75 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       port_cmaui_port_1_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_cmaui_port_1_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui_port_2_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui_port_1_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_cmaui_port_1_replacement_policy:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_cmaui_port_2_replacement_policy:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_cmaui_port_1_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui_port_2_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_cmaui_port_2_fixed_ips:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
       port_cmaui_port_2_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_cmaui_port_2_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui_port_2_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui_port_1_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
   org.openecomp.resource.abstract.nodes.cmaui_1:
@@ -1541,151 +1541,151 @@ node_types:
       port_cmaui_port_3_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui_port_3_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui_port_3_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_cmaui_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_cmaui_port_4_fixed_ips:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
       port_cmaui_port_4_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_cmaui_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_cmaui_port_4_security_groups:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui_port_3_fixed_ips:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
       port_cmaui_port_3_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_cmaui_port_3_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui_port_4_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui_port_4_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui_port_3_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_cmaui_port_4_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_cmaui_port_3_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       port_cmaui_port_3_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_cmaui_port_4_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui_port_4_replacement_policy:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_cmaui_port_3_replacement_policy:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_cmaui_port_4_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_cmaui_port_4_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_cmaui_port_3_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui_port_4_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui_port_3_security_groups:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_cmaui_port_4_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_cmaui_cmaui_port_4:
         capability: tosca.capabilities.Node
@@ -2107,49 +2107,49 @@ node_types:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       p1:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       p2:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_image:
         type: string
         description: Image for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_flavor:
         type: string
         description: Flavor for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       security_group_name:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       availability_zone_0:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_oam_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       net:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_cmaui_port_2:
         capability: tosca.capabilities.Node
@@ -3842,73 +3842,73 @@ node_types:
       port_cmaui_port_1_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui_port_2_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui_port_1_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui_port_1_security_groups:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_cmaui_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_cmaui_port_2_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui_port_1_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       compute_cmaui_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_cmaui_port_1_fixed_ips:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
       port_cmaui_port_1_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui_port_2_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui_port_2_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_cmaui_port_2_security_groups:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       index_value:
@@ -3916,75 +3916,75 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       port_cmaui_port_1_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_cmaui_port_1_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui_port_2_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui_port_1_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_cmaui_port_1_replacement_policy:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_cmaui_port_2_replacement_policy:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_cmaui_port_1_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui_port_2_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_cmaui_port_2_fixed_ips:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
       port_cmaui_port_2_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_cmaui_port_2_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui_port_2_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui_port_1_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
     requirements:
@@ -4408,49 +4408,49 @@ node_types:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       p1:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       p2:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_image:
         type: string
         description: Image for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_flavor:
         type: string
         description: Flavor for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       security_group_name:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       availability_zone_0:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_oam_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       net:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_cmaui_port_3:
         capability: tosca.capabilities.Node
@@ -5720,52 +5720,52 @@ node_types:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       p1:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       p2:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_image:
         type: string
         description: Image for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_flavor:
         type: string
         description: Flavor for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       indx:
         type: float
         required: true
-        status: SUPPORTED
+        status: supported
       security_group_name:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       availability_zone_0:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_oam_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       net:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_test_nested4Level:
         capability: tosca.capabilities.Node
@@ -6610,18 +6610,18 @@ node_types:
       compute_jsa_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 242293f376..0809d349fe 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -11,19 +11,19 @@ node_types:
       compute_jsa_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
     requirements:
@@ -291,130 +291,130 @@ node_types:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       p1:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui_port_8_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       p2:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui_port_8_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui_port_7_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_cmaui_port_7_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       availability_zone_0:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       net:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui_port_8_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_cmaui_port_7_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       security_group_name:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_cmaui_port_8_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui_port_8_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui_port_7_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_cmaui_port_7_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_image:
         type: string
         description: Image for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_flavor:
         type: string
         description: Flavor for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui_port_7_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui_port_7_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_cmaui_port_7_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui_port_7_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui_port_8_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       cmaui_oam_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui_port_8_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui_port_8_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui_port_8_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     requirements:
@@ -849,103 +849,103 @@ node_types:
       port_cmaui_port_6_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_cmaui_port_6_fixed_ips:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
       port_cmaui_port_6_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui_port_5_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui_port_5_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui_port_6_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_cmaui_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_cmaui_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui_port_5_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_cmaui_port_6_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_cmaui_port_6_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_cmaui_port_6_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui_port_5_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_cmaui_port_5_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui_port_6_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui_port_5_fixed_ips:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
       port_cmaui_port_6_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_cmaui_port_5_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       index_value:
@@ -953,57 +953,57 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       port_cmaui_port_5_replacement_policy:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_cmaui_port_6_replacement_policy:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_cmaui_port_5_security_groups:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_cmaui_port_5_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui_port_5_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_cmaui_port_6_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui_port_5_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui_port_6_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui_port_5_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui_port_6_security_groups:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
     requirements:
@@ -1438,163 +1438,163 @@ node_types:
       port_cmaui_port_3_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui_port_3_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui_port_3_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_cmaui_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_cmaui_port_4_fixed_ips:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
       port_cmaui_port_4_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_cmaui_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_cmaui_port_4_security_groups:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui_port_3_fixed_ips:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
       port_cmaui_port_3_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_cmaui_port_3_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui_port_4_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui_port_4_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui_port_3_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_cmaui_port_4_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_cmaui_port_3_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       port_cmaui_port_3_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_cmaui_port_3_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_cmaui_port_4_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui_port_4_replacement_policy:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_cmaui_port_3_replacement_policy:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_cmaui_port_4_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_cmaui_port_4_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_cmaui_port_3_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui_port_4_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui_port_3_security_groups:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_cmaui_port_4_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_cmaui_port_4_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_cmaui_cmaui_port_4:
         capability: tosca.capabilities.Node
@@ -2028,49 +2028,49 @@ node_types:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       p1:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       p2:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_image:
         type: string
         description: Image for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_flavor:
         type: string
         description: Flavor for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       security_group_name:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       availability_zone_0:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_oam_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       net:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_cmaui_port_2:
         capability: tosca.capabilities.Node
@@ -3811,85 +3811,85 @@ node_types:
       port_cmaui_port_1_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui_port_2_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui_port_1_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui_port_1_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_cmaui_port_1_security_groups:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_cmaui_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_cmaui_port_2_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui_port_1_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       compute_cmaui_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_cmaui_port_1_fixed_ips:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
       port_cmaui_port_1_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui_port_2_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_cmaui_port_2_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui_port_2_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_cmaui_port_2_security_groups:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       index_value:
@@ -3897,75 +3897,75 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       port_cmaui_port_1_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_cmaui_port_2_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui_port_1_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui_port_1_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_cmaui_port_1_replacement_policy:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_cmaui_port_2_replacement_policy:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_cmaui_port_1_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui_port_2_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_cmaui_port_2_fixed_ips:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
       port_cmaui_port_2_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_cmaui_port_2_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui_port_2_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_cmaui_port_1_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
     requirements:
@@ -4401,49 +4401,49 @@ node_types:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       p1:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       p2:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_image:
         type: string
         description: Image for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_flavor:
         type: string
         description: Flavor for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       security_group_name:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       availability_zone_0:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_oam_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       net:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_cmaui_port_3:
         capability: tosca.capabilities.Node
@@ -5749,52 +5749,52 @@ node_types:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       p1:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       p2:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_image:
         type: string
         description: Image for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_flavor:
         type: string
         description: Flavor for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       indx:
         type: float
         required: true
-        status: SUPPORTED
+        status: supported
       security_group_name:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       availability_zone_0:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_oam_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       net:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_test_nested4Level:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
index adbfc2a693..9e28a5f4d6 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -12,166 +12,166 @@ node_types:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       port_oam_port_1_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       availabilityzone_name:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       port_oam_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_oam_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_oam_port_1_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       oam_server_name:
         type: string
         description: oam server name
         required: true
-        status: SUPPORTED
+        status: supported
       port_oam_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_oam_port_1_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_oam_port_1_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_oam_port_1_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_oam_port_1_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_oam_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_oam_port_1_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       oam_image_name:
         type: string
         description: oam image name
         required: true
-        status: SUPPORTED
+        status: supported
       cps_net_mask:
         type: string
         description: CPS network mask
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_name:
         type: string
         description: OAM network name
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_gw:
         type: string
         description: CPS network gateway
         required: true
-        status: SUPPORTED
+        status: supported
       port_oam_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       oam_flavor_name:
         type: string
         description: flavor name of PCRF CM instance
         required: true
-        status: SUPPORTED
+        status: supported
       security_group_name:
         type: string
         description: the name of security group
         required: true
-        status: SUPPORTED
+        status: supported
       cps_net_ip:
         type: string
         description: CPS network ip
         required: true
-        status: SUPPORTED
+        status: supported
       port_oam_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_oam_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_oam_port_1_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_oam_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_vol:
         type: string
         description: CPS Cluman Cinder Volume
         required: true
-        status: SUPPORTED
+        status: supported
       cps_net_name:
         type: string
         description: CPS network name
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_ip:
         type: string
         description: OAM network ip
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_mask:
         type: string
         description: CPS network mask
         required: true
-        status: SUPPORTED
+        status: supported
       port_oam_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_oam_port_1_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       shared_security_group_id1:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
     attributes:
       server_oam_id:
         type: string
         description: the oam nova service id
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_oam_port_0:
         capability: tosca.capabilities.Node
@@ -604,167 +604,167 @@ node_types:
       port_pcm_port_1_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pcm_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       p1:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       p2:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_1_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       availabilityzone_name:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       pcm_image_name:
         type: string
         description: PCRF CM image name
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pcm_port_1_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_server_name:
         type: string
         description: PCRF CM server name
         required: true
-        status: SUPPORTED
+        status: supported
       cps_net_mask:
         type: string
         description: CPS network mask
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_1_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_name:
         type: string
         description: OAM network name
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_1_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       oam_net_gw:
         type: string
         description: CPS network gateway
         required: true
-        status: SUPPORTED
+        status: supported
       security_group_name:
         type: string
         description: the name of security group
         required: true
-        status: SUPPORTED
+        status: supported
       cps_net_ip:
         type: string
         description: CPS network ip
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_1_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_1_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       pcm_flavor_name:
         type: string
         description: flavor name of PCRF CM instance
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_vol:
         type: string
         description: CPS Cluman Cinder Volume
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_1_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_pcm_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       cps_net_name:
         type: string
         description: CPS network name
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_ip:
         type: string
         description: OAM network ip
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_mask:
         type: string
         description: CPS network mask
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_1_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
     attributes:
       server_pcm_id:
         type: string
         description: the pcm nova service id
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_pcm_port_1:
         capability: tosca.capabilities.Node
@@ -1198,166 +1198,166 @@ node_types:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       port_oam_port_1_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       availabilityzone_name:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       port_oam_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_oam_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_oam_port_1_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       oam_server_name:
         type: string
         description: oam server name
         required: true
-        status: SUPPORTED
+        status: supported
       port_oam_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_oam_port_1_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_oam_port_1_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_oam_port_1_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_oam_port_1_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_oam_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_oam_port_1_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       oam_image_name:
         type: string
         description: oam image name
         required: true
-        status: SUPPORTED
+        status: supported
       cps_net_mask:
         type: string
         description: CPS network mask
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_name:
         type: string
         description: OAM network name
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_gw:
         type: string
         description: CPS network gateway
         required: true
-        status: SUPPORTED
+        status: supported
       port_oam_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       oam_flavor_name:
         type: string
         description: flavor name of PCRF CM instance
         required: true
-        status: SUPPORTED
+        status: supported
       security_group_name:
         type: string
         description: the name of security group
         required: true
-        status: SUPPORTED
+        status: supported
       cps_net_ip:
         type: string
         description: CPS network ip
         required: true
-        status: SUPPORTED
+        status: supported
       port_oam_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_oam_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_oam_port_1_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_oam_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_vol:
         type: string
         description: CPS Cluman Cinder Volume
         required: true
-        status: SUPPORTED
+        status: supported
       cps_net_name:
         type: string
         description: CPS network name
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_ip:
         type: string
         description: OAM network ip
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_mask:
         type: string
         description: CPS network mask
         required: true
-        status: SUPPORTED
+        status: supported
       port_oam_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_oam_port_1_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       shared_security_group_id1:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
     attributes:
       server_oam_id:
         type: string
         description: the oam nova service id
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_oam_port_0:
         capability: tosca.capabilities.Node
@@ -1790,167 +1790,167 @@ node_types:
       port_pcm_port_1_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pcm_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       p1:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       p2:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_1_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       availabilityzone_name:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       pcm_image_name:
         type: string
         description: PCRF CM image name
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pcm_port_1_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_server_name:
         type: string
         description: PCRF CM server name
         required: true
-        status: SUPPORTED
+        status: supported
       cps_net_mask:
         type: string
         description: CPS network mask
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_1_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_name:
         type: string
         description: OAM network name
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_1_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       oam_net_gw:
         type: string
         description: CPS network gateway
         required: true
-        status: SUPPORTED
+        status: supported
       security_group_name:
         type: string
         description: the name of security group
         required: true
-        status: SUPPORTED
+        status: supported
       cps_net_ip:
         type: string
         description: CPS network ip
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_1_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_1_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       pcm_flavor_name:
         type: string
         description: flavor name of PCRF CM instance
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_vol:
         type: string
         description: CPS Cluman Cinder Volume
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_1_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_pcm_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       cps_net_name:
         type: string
         description: CPS network name
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_ip:
         type: string
         description: OAM network ip
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_mask:
         type: string
         description: CPS network mask
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_1_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
     attributes:
       server_pcm_id:
         type: string
         description: the pcm nova service id
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_pcm_port_1:
         capability: tosca.capabilities.Node
@@ -2383,41 +2383,41 @@ node_types:
       compute_compute_user_data_format:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       compute_compute_metadata:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       compute_compute_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_compute_config_drive:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: boolean
     requirements:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 8cf38b50e7..7a132bc1d4 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -11,172 +11,172 @@ node_types:
       port_pcm_port_1_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pcm_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       metadata:
         type: string
         description: metadata
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_1_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       availabilityzone_name:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       pcm_image_name:
         type: string
         description: PCRF CM image name
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pcm_port_1_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_server_name:
         type: string
         description: PCRF CM server name
         required: true
-        status: SUPPORTED
+        status: supported
       cps_net_mask:
         type: string
         description: CPS network mask
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_1_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_name:
         type: string
         description: OAM network name
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_1_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       oam_net_gw:
         type: string
         description: CPS network gateway
         required: true
-        status: SUPPORTED
+        status: supported
       security_group_name:
         type: string
         description: the name of security group
         required: true
-        status: SUPPORTED
+        status: supported
       cps_net_ip:
         type: string
         description: CPS network ip
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_1_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_1_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       pcm_flavor_name:
         type: string
         description: flavor name of PCRF CM instance
         required: true
-        status: SUPPORTED
+        status: supported
       key_name:
         type: string
         description: key_name
         required: true
-        status: SUPPORTED
+        status: supported
       user_data_format:
         type: string
         description: user_data_format
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_vol:
         type: string
         description: CPS Cluman Cinder Volume
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_1_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_pcm_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       cps_net_name:
         type: string
         description: CPS network name
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_ip:
         type: string
         description: OAM network ip
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_mask:
         type: string
         description: CPS network mask
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_1_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
     attributes:
       server_pcm_id:
         type: string
         description: the pcm nova service id
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_pcm_port_1:
         capability: tosca.capabilities.Node
@@ -610,156 +610,156 @@ node_types:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_00_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_01_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       oam_server_name:
         type: string
         description: oam server name
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_00_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_01_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_pcm_port_01_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_01_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       oam_image_name:
         type: string
         description: oam image name
         required: true
-        status: SUPPORTED
+        status: supported
       cps_net_mask:
         type: string
         description: CPS network mask
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_name:
         type: string
         description: OAM network name
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_01_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_00_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_00_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pcm_port_00_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       oam_net_gw:
         type: string
         description: CPS network gateway
         required: true
-        status: SUPPORTED
+        status: supported
       oam_flavor_name:
         type: string
         description: flavor name of PCRF CM instance
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_01_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       security_group_name:
         type: string
         description: the name of security group
         required: true
-        status: SUPPORTED
+        status: supported
       cps_net_ip:
         type: string
         description: CPS network ip
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_00_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_01_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_00_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_00_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_01_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_vol:
         type: string
         description: CPS Cluman Cinder Volume
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_00_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       cps_net_name:
         type: string
         description: CPS network name
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_ip:
         type: string
         description: OAM network ip
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_mask:
         type: string
         description: CPS network mask
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_01_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
     attributes:
       server_oam_id:
         type: string
         description: the oam nova service id
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_server_oam:
         capability: tosca.capabilities.Node
@@ -1192,172 +1192,172 @@ node_types:
       port_pcm_port_1_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pcm_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       metadata:
         type: string
         description: metadata
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_1_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       availabilityzone_name:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       pcm_image_name:
         type: string
         description: PCRF CM image name
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pcm_port_1_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_server_name:
         type: string
         description: PCRF CM server name
         required: true
-        status: SUPPORTED
+        status: supported
       cps_net_mask:
         type: string
         description: CPS network mask
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_1_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_name:
         type: string
         description: OAM network name
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_1_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       oam_net_gw:
         type: string
         description: CPS network gateway
         required: true
-        status: SUPPORTED
+        status: supported
       security_group_name:
         type: string
         description: the name of security group
         required: true
-        status: SUPPORTED
+        status: supported
       cps_net_ip:
         type: string
         description: CPS network ip
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_1_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_1_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       pcm_flavor_name:
         type: string
         description: flavor name of PCRF CM instance
         required: true
-        status: SUPPORTED
+        status: supported
       key_name:
         type: string
         description: key_name
         required: true
-        status: SUPPORTED
+        status: supported
       user_data_format:
         type: string
         description: user_data_format
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_vol:
         type: string
         description: CPS Cluman Cinder Volume
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_1_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_pcm_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       cps_net_name:
         type: string
         description: CPS network name
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_ip:
         type: string
         description: OAM network ip
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_mask:
         type: string
         description: CPS network mask
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_1_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
     attributes:
       server_pcm_id:
         type: string
         description: the pcm nova service id
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_pcm_port_1:
         capability: tosca.capabilities.Node
@@ -1790,47 +1790,47 @@ node_types:
       compute_compute_user_data_format:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       compute_compute_metadata:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       compute_compute_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_compute_config_drive:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: boolean
     attributes:
       compute_instance_name:
         type: string
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_compute:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 27cd819fcc..9f987e4dad 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -11,167 +11,167 @@ node_types:
       port_pcm_port_1_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pcm_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       metadata:
         type: string
         description: metadata
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_1_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       availabilityzone_name:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       pcm_image_name:
         type: string
         description: PCRF CM image name
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pcm_port_1_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_server_name:
         type: string
         description: PCRF CM server name
         required: true
-        status: SUPPORTED
+        status: supported
       cps_net_mask:
         type: string
         description: CPS network mask
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_1_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_name:
         type: string
         description: OAM network name
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_1_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       oam_net_gw:
         type: string
         description: CPS network gateway
         required: true
-        status: SUPPORTED
+        status: supported
       security_group_name:
         type: string
         description: the name of security group
         required: true
-        status: SUPPORTED
+        status: supported
       cps_net_ip:
         type: string
         description: CPS network ip
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_1_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_1_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       pcm_flavor_name:
         type: string
         description: flavor name of PCRF CM instance
         required: true
-        status: SUPPORTED
+        status: supported
       user_data_format:
         type: string
         description: user_data_format
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_vol:
         type: string
         description: CPS Cluman Cinder Volume
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_1_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_pcm_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       cps_net_name:
         type: string
         description: CPS network name
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_ip:
         type: string
         description: OAM network ip
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_mask:
         type: string
         description: CPS network mask
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_1_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
     attributes:
       server_pcm_id:
         type: string
         description: the pcm nova service id
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_pcm_port_1:
         capability: tosca.capabilities.Node
@@ -605,156 +605,156 @@ node_types:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_00_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_01_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       oam_server_name:
         type: string
         description: oam server name
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_00_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_01_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_pcm_port_01_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_01_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       oam_image_name:
         type: string
         description: oam image name
         required: true
-        status: SUPPORTED
+        status: supported
       cps_net_mask:
         type: string
         description: CPS network mask
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_name:
         type: string
         description: OAM network name
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_01_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_00_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_00_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pcm_port_00_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       oam_net_gw:
         type: string
         description: CPS network gateway
         required: true
-        status: SUPPORTED
+        status: supported
       oam_flavor_name:
         type: string
         description: flavor name of PCRF CM instance
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_01_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       security_group_name:
         type: string
         description: the name of security group
         required: true
-        status: SUPPORTED
+        status: supported
       cps_net_ip:
         type: string
         description: CPS network ip
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_00_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_01_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_00_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_00_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_01_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_vol:
         type: string
         description: CPS Cluman Cinder Volume
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_00_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       cps_net_name:
         type: string
         description: CPS network name
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_ip:
         type: string
         description: OAM network ip
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_mask:
         type: string
         description: CPS network mask
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_01_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
     attributes:
       server_oam_id:
         type: string
         description: the oam nova service id
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_server_oam:
         capability: tosca.capabilities.Node
@@ -1187,167 +1187,167 @@ node_types:
       port_pcm_port_1_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pcm_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       metadata:
         type: string
         description: metadata
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_1_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       availabilityzone_name:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       pcm_image_name:
         type: string
         description: PCRF CM image name
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pcm_port_1_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_server_name:
         type: string
         description: PCRF CM server name
         required: true
-        status: SUPPORTED
+        status: supported
       cps_net_mask:
         type: string
         description: CPS network mask
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_1_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_name:
         type: string
         description: OAM network name
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_1_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       oam_net_gw:
         type: string
         description: CPS network gateway
         required: true
-        status: SUPPORTED
+        status: supported
       security_group_name:
         type: string
         description: the name of security group
         required: true
-        status: SUPPORTED
+        status: supported
       cps_net_ip:
         type: string
         description: CPS network ip
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_1_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_1_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       pcm_flavor_name:
         type: string
         description: flavor name of PCRF CM instance
         required: true
-        status: SUPPORTED
+        status: supported
       user_data_format:
         type: string
         description: user_data_format
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_vol:
         type: string
         description: CPS Cluman Cinder Volume
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_1_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_pcm_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       cps_net_name:
         type: string
         description: CPS network name
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_ip:
         type: string
         description: OAM network ip
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_mask:
         type: string
         description: CPS network mask
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_1_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
     attributes:
       server_pcm_id:
         type: string
         description: the pcm nova service id
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_pcm_port_1:
         capability: tosca.capabilities.Node
@@ -1780,35 +1780,35 @@ node_types:
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       compute_compute_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_compute_config_drive:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: boolean
     attributes:
       compute_instance_name:
         type: string
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_compute:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 654b73714e..8b3ed6a544 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -11,157 +11,157 @@ node_types:
       port_pcm_port_1_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pcm_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_1_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       availabilityzone_name:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       pcm_image_name:
         type: string
         description: PCRF CM image name
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pcm_port_1_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_server_name:
         type: string
         description: PCRF CM server name
         required: true
-        status: SUPPORTED
+        status: supported
       cps_net_mask:
         type: string
         description: CPS network mask
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_1_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_name:
         type: string
         description: OAM network name
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_1_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       oam_net_gw:
         type: string
         description: CPS network gateway
         required: true
-        status: SUPPORTED
+        status: supported
       security_group_name:
         type: string
         description: the name of security group
         required: true
-        status: SUPPORTED
+        status: supported
       cps_net_ip:
         type: string
         description: CPS network ip
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_1_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_1_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       pcm_flavor_name:
         type: string
         description: flavor name of PCRF CM instance
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_vol:
         type: string
         description: CPS Cluman Cinder Volume
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_1_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_pcm_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       cps_net_name:
         type: string
         description: CPS network name
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_ip:
         type: string
         description: OAM network ip
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_mask:
         type: string
         description: CPS network mask
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_1_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
     attributes:
       server_pcm_id:
         type: string
         description: the pcm nova service id
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_pcm_port_1:
         capability: tosca.capabilities.Node
@@ -594,13 +594,13 @@ node_types:
       compute_compute_user_data_format:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_compute_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       index_value:
@@ -608,71 +608,71 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       compute_compute_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_compute_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_compute_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_compute_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_compute_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_compute_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_compute_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       compute_compute_metadata:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_compute_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_compute_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_compute_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_compute:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneComputeDiffPortType/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneComputeDiffPortType/out/GlobalSubstitutionTypesServiceTemplate.yaml
index b8e0c1ed42..7571cc0732 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneComputeDiffPortType/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneComputeDiffPortType/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -11,157 +11,157 @@ node_types:
       port_pcm_1port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       availabilityzone_name:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_1port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_1port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       pcm_image_name:
         type: string
         description: PCRF CM image name
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_1port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_1port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_2port_1_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_2port_1_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_1port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_pcm_1port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_server_name:
         type: string
         description: PCRF CM server name
         required: true
-        status: SUPPORTED
+        status: supported
       cps_net_mask:
         type: string
         description: CPS network mask
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_name:
         type: string
         description: OAM network name
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_1port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_2port_1_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_gw:
         type: string
         description: CPS network gateway
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_2port_1_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pcm_1port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_2port_1_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       security_group_name:
         type: string
         description: the name of security group
         required: true
-        status: SUPPORTED
+        status: supported
       cps_net_ip:
         type: string
         description: CPS network ip
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_2port_1_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       pcm_flavor_name:
         type: string
         description: flavor name of PCRF CM instance
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_2port_1_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_vol:
         type: string
         description: CPS Cluman Cinder Volume
         required: true
-        status: SUPPORTED
+        status: supported
       cps_net_name:
         type: string
         description: CPS network name
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_ip:
         type: string
         description: OAM network ip
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_mask:
         type: string
         description: CPS network mask
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_2port_1_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_2port_1_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
     attributes:
       server_pcm_id:
         type: string
         description: the pcm nova service id
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_server_pcm:
         capability: tosca.capabilities.Node
@@ -594,41 +594,41 @@ node_types:
       compute_compute_user_data_format:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       compute_compute_metadata:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       compute_compute_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_compute_config_drive:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: boolean
     requirements:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoComputesOfSameType/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoComputesOfSameType/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 869685f7e5..92ba608ae7 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoComputesOfSameType/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoComputesOfSameType/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -11,101 +11,101 @@ node_types:
       port_pcm_server_mgmt_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pcm_server_mgmt_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_server_mgmt_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       compute_pcm_server_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pcm_server_mgmt_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_server_mgmt_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_server_mgmt_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_pcm_server_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pcm_server_mgmt_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       compute_pcm_server_user_data_format:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pcm_server_mgmt_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_pcm_server_config_drive:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: boolean
       port_pcm_server_mgmt_port_0_fixed_ips:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
       port_pcm_server_mgmt_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_server_mgmt_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_server_mgmt_port_0_security_groups:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
     requirements:
@@ -457,76 +457,76 @@ node_types:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_gw:
         type: string
         description: CPS network gateway
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_image_name:
         type: string
         description: PCRF CM image name
         required: true
-        status: SUPPORTED
+        status: supported
       security_group_name:
         type: string
         description: the name of security group
         required: true
-        status: SUPPORTED
+        status: supported
       cps_net_ip:
         type: string
         description: CPS network ip
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_flavor_name:
         type: string
         description: flavor name of PCRF CM instance
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_vol:
         type: string
         description: CPS Cluman Cinder Volume
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_server_name:
         type: string
         description: PCRF CM server name
         required: true
-        status: SUPPORTED
+        status: supported
       cps_net_name:
         type: string
         description: CPS network name
         required: true
-        status: SUPPORTED
+        status: supported
       cps_net_mask:
         type: string
         description: CPS network mask
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_ip:
         type: string
         description: OAM network ip
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_mask:
         type: string
         description: CPS network mask
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_name:
         type: string
         description: OAM network name
         required: true
-        status: SUPPORTED
+        status: supported
     attributes:
       server_pcm_id_2:
         type: string
         description: the pcm nova service id
-        status: SUPPORTED
+        status: supported
       server_pcm_id_1:
         type: string
         description: the pcm nova service id
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_pcm_server_1_mgmt_port_0:
         capability: tosca.capabilities.Node
@@ -1215,35 +1215,35 @@ node_types:
       compute_compute_user_data_format:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       compute_compute_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_compute_config_drive:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: boolean
     requirements:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/GlobalSubstitutionTypesServiceTemplate.yaml
index ce3d6964c1..7b17ad20d9 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -11,23 +11,23 @@ node_types:
       port_pcm_port_1_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pcm_port_1_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_1_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pcm_port_1_security_groups:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       index_value:
@@ -35,79 +35,79 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       compute_pd_server_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_pd_server_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_1_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_1_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_pcm_port_1_fixed_ips:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_1_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_1_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       compute_pd_server_config_drive:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: boolean
       port_pcm_port_1_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       compute_pd_server_user_data_format:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pcm_port_1_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_1_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_pd_server:
         capability: tosca.capabilities.Node
@@ -456,11 +456,11 @@ node_types:
       port_pcm_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       index_value:
@@ -468,91 +468,91 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       port_pcm_port_0_fixed_ips:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
       port_pcm_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pcm_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       compute_pcm_server_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_pcm_server_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pcm_port_0_security_groups:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       compute_pcm_server_user_data_format:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pcm_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       compute_pcm_server_config_drive:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: boolean
       port_pcm_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_pcm_server_pcm_port_0:
         capability: tosca.capabilities.Node
@@ -902,91 +902,91 @@ node_types:
         type: string
         description: flavor name of PCRF CM instance
         required: true
-        status: SUPPORTED
+        status: supported
       availabilityzone_name:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_gw:
         type: string
         description: CPS network gateway
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_image_name:
         type: string
         description: PCRF CM image name
         required: true
-        status: SUPPORTED
+        status: supported
       pd_image_name:
         type: string
         description: PCRF CM image name
         required: true
-        status: SUPPORTED
+        status: supported
       security_group_name:
         type: string
         description: the name of security group
         required: true
-        status: SUPPORTED
+        status: supported
       cps_net_ip:
         type: string
         description: CPS network ip
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_flavor_name:
         type: string
         description: flavor name of PCRF CM instance
         required: true
-        status: SUPPORTED
+        status: supported
       pd_server_name:
         type: string
         description: PCRF CM server name
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_vol:
         type: string
         description: CPS Cluman Cinder Volume
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_server_name:
         type: string
         description: PCRF CM server name
         required: true
-        status: SUPPORTED
+        status: supported
       cps_net_name:
         type: string
         description: CPS network name
         required: true
-        status: SUPPORTED
+        status: supported
       cps_net_mask:
         type: string
         description: CPS network mask
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_ip:
         type: string
         description: OAM network ip
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_mask:
         type: string
         description: CPS network mask
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_name:
         type: string
         description: OAM network name
         required: true
-        status: SUPPORTED
+        status: supported
     attributes:
       server_pcm_id_2:
         type: string
         description: the pcm nova service id
-        status: SUPPORTED
+        status: supported
       server_pcm_id_1:
         type: string
         description: the pcm nova service id
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_pcm_port_1:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 3ad4ddf56f..b237ae5409 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -11,157 +11,157 @@ node_types:
       port_pcm_port_11_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_11_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       availabilityzone_name:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_11_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       pcm_image_name:
         type: string
         description: PCRF CM image name
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_01_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_pcm_port_01_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_pcm_port_11_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_01_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_01_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_server_name:
         type: string
         description: PCRF CM server name
         required: true
-        status: SUPPORTED
+        status: supported
       cps_net_mask:
         type: string
         description: CPS network mask
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_name:
         type: string
         description: OAM network name
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_01_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_gw:
         type: string
         description: CPS network gateway
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_11_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_01_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       security_group_name:
         type: string
         description: the name of security group
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_11_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       cps_net_ip:
         type: string
         description: CPS network ip
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_11_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_01_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_flavor_name:
         type: string
         description: flavor name of PCRF CM instance
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_01_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_vol:
         type: string
         description: CPS Cluman Cinder Volume
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_11_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       cps_net_name:
         type: string
         description: CPS network name
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_ip:
         type: string
         description: OAM network ip
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_mask:
         type: string
         description: CPS network mask
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_01_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_11_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
     attributes:
       server_pcm_id:
         type: string
         description: the pcm nova service id
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_pcm_port_11:
         capability: tosca.capabilities.Node
@@ -594,157 +594,157 @@ node_types:
       port_pcm_port_02_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_12_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_pcm_port_02_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       availabilityzone_name:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_12_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_02_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_image_name:
         type: string
         description: PCRF CM image name
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_02_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_12_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pcm_port_12_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_02_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_server_name:
         type: string
         description: PCRF CM server name
         required: true
-        status: SUPPORTED
+        status: supported
       cps_net_mask:
         type: string
         description: CPS network mask
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_name:
         type: string
         description: OAM network name
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_12_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_02_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_gw:
         type: string
         description: CPS network gateway
         required: true
-        status: SUPPORTED
+        status: supported
       security_group_name:
         type: string
         description: the name of security group
         required: true
-        status: SUPPORTED
+        status: supported
       cps_net_ip:
         type: string
         description: CPS network ip
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_12_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       pcm_flavor_name:
         type: string
         description: flavor name of PCRF CM instance
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_12_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_vol:
         type: string
         description: CPS Cluman Cinder Volume
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_02_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       cps_net_name:
         type: string
         description: CPS network name
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_ip:
         type: string
         description: OAM network ip
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_mask:
         type: string
         description: CPS network mask
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_12_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_02_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pcm_port_12_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_02_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
     attributes:
       server_pcm_id:
         type: string
         description: the pcm nova service id
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_pcm_port_12:
         capability: tosca.capabilities.Node
@@ -1177,157 +1177,157 @@ node_types:
       port_pcm_port_1_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pcm_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_1_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       availabilityzone_name:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       pcm_image_name:
         type: string
         description: PCRF CM image name
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pcm_port_1_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_server_name:
         type: string
         description: PCRF CM server name
         required: true
-        status: SUPPORTED
+        status: supported
       cps_net_mask:
         type: string
         description: CPS network mask
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_1_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_name:
         type: string
         description: OAM network name
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_1_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       oam_net_gw:
         type: string
         description: CPS network gateway
         required: true
-        status: SUPPORTED
+        status: supported
       security_group_name:
         type: string
         description: the name of security group
         required: true
-        status: SUPPORTED
+        status: supported
       cps_net_ip:
         type: string
         description: CPS network ip
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_1_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_1_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       pcm_flavor_name:
         type: string
         description: flavor name of PCRF CM instance
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_vol:
         type: string
         description: CPS Cluman Cinder Volume
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_1_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_pcm_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       cps_net_name:
         type: string
         description: CPS network name
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_ip:
         type: string
         description: OAM network ip
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_mask:
         type: string
         description: CPS network mask
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_1_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
     attributes:
       server_pcm_id:
         type: string
         description: the pcm nova service id
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_pcm_port_1:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/out/GlobalSubstitutionTypesServiceTemplate.yaml
index a3e7eb439c..3c0a84490c 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -11,157 +11,157 @@ node_types:
       port_pcm_port_11_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_11_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       availabilityzone_name:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_11_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       pcm_image_name:
         type: string
         description: PCRF CM image name
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_01_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_pcm_port_01_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_pcm_port_11_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_01_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_01_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_server_name:
         type: string
         description: PCRF CM server name
         required: true
-        status: SUPPORTED
+        status: supported
       cps_net_mask:
         type: string
         description: CPS network mask
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_name:
         type: string
         description: OAM network name
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_01_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_gw:
         type: string
         description: CPS network gateway
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_11_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_01_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       security_group_name:
         type: string
         description: the name of security group
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_11_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       cps_net_ip:
         type: string
         description: CPS network ip
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_11_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_01_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_flavor_name:
         type: string
         description: flavor name of PCRF CM instance
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_01_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_vol:
         type: string
         description: CPS Cluman Cinder Volume
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_11_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       cps_net_name:
         type: string
         description: CPS network name
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_ip:
         type: string
         description: OAM network ip
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_mask:
         type: string
         description: CPS network mask
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_01_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_11_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
     attributes:
       server_pcm_id:
         type: string
         description: the pcm nova service id
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_pcm_port_11:
         capability: tosca.capabilities.Node
@@ -594,157 +594,157 @@ node_types:
       port_pcm_port_1_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pcm_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_1_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       availabilityzone_name:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       pcm_image_name:
         type: string
         description: PCRF CM image name
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pcm_port_1_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_server_name:
         type: string
         description: PCRF CM server name
         required: true
-        status: SUPPORTED
+        status: supported
       cps_net_mask:
         type: string
         description: CPS network mask
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_1_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_name:
         type: string
         description: OAM network name
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_1_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       oam_net_gw:
         type: string
         description: CPS network gateway
         required: true
-        status: SUPPORTED
+        status: supported
       security_group_name:
         type: string
         description: the name of security group
         required: true
-        status: SUPPORTED
+        status: supported
       cps_net_ip:
         type: string
         description: CPS network ip
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_1_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_1_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       pcm_flavor_name:
         type: string
         description: flavor name of PCRF CM instance
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_vol:
         type: string
         description: CPS Cluman Cinder Volume
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_1_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_pcm_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       cps_net_name:
         type: string
         description: CPS network name
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_ip:
         type: string
         description: OAM network ip
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_mask:
         type: string
         description: CPS network mask
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_1_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
     attributes:
       server_pcm_id:
         type: string
         description: the pcm nova service id
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_pcm_port_1:
         capability: tosca.capabilities.Node
@@ -1177,157 +1177,157 @@ node_types:
       port_pcm_port_11_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_11_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       availabilityzone_name:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_11_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       pcm_image_name:
         type: string
         description: PCRF CM image name
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_01_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_pcm_port_01_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_pcm_port_11_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_01_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_01_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_server_name:
         type: string
         description: PCRF CM server name
         required: true
-        status: SUPPORTED
+        status: supported
       cps_net_mask:
         type: string
         description: CPS network mask
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_name:
         type: string
         description: OAM network name
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_01_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_gw:
         type: string
         description: CPS network gateway
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_11_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_01_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       security_group_name:
         type: string
         description: the name of security group
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_11_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       cps_net_ip:
         type: string
         description: CPS network ip
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_11_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_01_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_flavor_name:
         type: string
         description: flavor name of PCRF CM instance
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_01_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_vol:
         type: string
         description: CPS Cluman Cinder Volume
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_11_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       cps_net_name:
         type: string
         description: CPS network name
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_ip:
         type: string
         description: OAM network ip
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_mask:
         type: string
         description: CPS network mask
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_01_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_11_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
     attributes:
       server_pcm_id:
         type: string
         description: the pcm nova service id
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_pcm_port_11:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/twoNestedNodeTemplatesWithSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/twoNestedNodeTemplatesWithSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 81a73531c1..7d4e702c36 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/twoNestedNodeTemplatesWithSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/twoNestedNodeTemplatesWithSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -11,157 +11,157 @@ node_types:
       port_pcm_port_1_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pcm_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_1_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       availabilityzone_name:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       pcm_image_name:
         type: string
         description: PCRF CM image name
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pcm_port_1_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_server_name:
         type: string
         description: PCRF CM server name
         required: true
-        status: SUPPORTED
+        status: supported
       cps_net_mask:
         type: string
         description: CPS network mask
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_1_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_name:
         type: string
         description: OAM network name
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_1_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       oam_net_gw:
         type: string
         description: CPS network gateway
         required: true
-        status: SUPPORTED
+        status: supported
       security_group_name:
         type: string
         description: the name of security group
         required: true
-        status: SUPPORTED
+        status: supported
       cps_net_ip:
         type: string
         description: CPS network ip
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_1_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_1_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       pcm_flavor_name:
         type: string
         description: flavor name of PCRF CM instance
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_vol:
         type: string
         description: CPS Cluman Cinder Volume
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_1_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_pcm_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       cps_net_name:
         type: string
         description: CPS network name
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_ip:
         type: string
         description: OAM network ip
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_mask:
         type: string
         description: CPS network mask
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_1_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
     attributes:
       server_pcm_id:
         type: string
         description: the pcm nova service id
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_pcm_port_1:
         capability: tosca.capabilities.Node
@@ -594,157 +594,157 @@ node_types:
       port_pcm_port_1_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pcm_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_1_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       availabilityzone_name:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       pcm_image_name:
         type: string
         description: PCRF CM image name
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pcm_port_1_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_server_name:
         type: string
         description: PCRF CM server name
         required: true
-        status: SUPPORTED
+        status: supported
       cps_net_mask:
         type: string
         description: CPS network mask
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_1_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_name:
         type: string
         description: OAM network name
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_1_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       oam_net_gw:
         type: string
         description: CPS network gateway
         required: true
-        status: SUPPORTED
+        status: supported
       security_group_name:
         type: string
         description: the name of security group
         required: true
-        status: SUPPORTED
+        status: supported
       cps_net_ip:
         type: string
         description: CPS network ip
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_1_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_1_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       pcm_flavor_name:
         type: string
         description: flavor name of PCRF CM instance
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_vol:
         type: string
         description: CPS Cluman Cinder Volume
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_1_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_pcm_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       cps_net_name:
         type: string
         description: CPS network name
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_ip:
         type: string
         description: OAM network ip
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_mask:
         type: string
         description: CPS network mask
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_1_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
     attributes:
       server_pcm_id:
         type: string
         description: the pcm nova service id
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_pcm_port_1:
         capability: tosca.capabilities.Node
@@ -1177,35 +1177,35 @@ node_types:
       compute_compute_user_data_format:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       compute_compute_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_compute_config_drive:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: boolean
     requirements:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePort/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePort/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 5005610295..7db93e087a 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePort/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePort/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -11,89 +11,89 @@ node_types:
       port_pd_server_mgmt_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pd_server_mgmt_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       compute_pd_server_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_pd_server_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd_server_mgmt_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_mgmt_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_mgmt_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_mgmt_port_0_replacement_policy:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd_server_mgmt_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_mgmt_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd_server_mgmt_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_mgmt_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_mgmt_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       compute_pd_server_user_data_format:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
     requirements:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
index efd25af52b..f618d78f50 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -11,101 +11,101 @@ node_types:
       port_pd_server_mgmt_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pd_server_mgmt_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       compute_pd_server_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_pd_server_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd_server_mgmt_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_mgmt_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_mgmt_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_mgmt_port_0_replacement_policy:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd_server_mgmt_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_mgmt_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd_server_mgmt_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_mgmt_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_mgmt_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       compute_pd_server_user_data_format:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
     attributes:
       pd_server_pd_server_mgmt_port_0_device_owner:
         type: string
-        status: SUPPORTED
+        status: supported
       pd_server_accessIPv6:
         type: string
-        status: SUPPORTED
+        status: supported
       pd_server_accessIPv4:
         type: string
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_pd_server:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOut/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOut/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 2e65005e29..1f912b37dd 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOut/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOut/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -11,95 +11,95 @@ node_types:
       port_pd_server_mgmt_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pd_server_mgmt_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       compute_pd_server_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_pd_server_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd_server_mgmt_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_mgmt_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_mgmt_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_mgmt_port_0_replacement_policy:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd_server_mgmt_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_mgmt_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd_server_mgmt_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_mgmt_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_mgmt_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       compute_pd_server_user_data_format:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_pd_server_metadata:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
     requirements:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOutComputePort/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOutComputePort/out/GlobalSubstitutionTypesServiceTemplate.yaml
index e9fdc8d8ec..ea36f7bbfa 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOutComputePort/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOutComputePort/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -11,77 +11,77 @@ node_types:
       port_pd_server_mgmt_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pd_server_mgmt_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       compute_pd_server_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_pd_server_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd_server_mgmt_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_mgmt_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_mgmt_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_mgmt_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_mgmt_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd_server_mgmt_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_mgmt_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_mgmt_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
     requirements:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 5a99ad93ea..4ee5f19a5a 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -11,95 +11,95 @@ node_types:
       port_pd_server_mgmt_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pd_server_mgmt_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       compute_pd_server_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_pd_server_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd_server_mgmt_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_mgmt_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_mgmt_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_mgmt_port_0_replacement_policy:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd_server_mgmt_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_mgmt_port_0_security_groups:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_pd_server_mgmt_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd_server_mgmt_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_mgmt_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_mgmt_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       compute_pd_server_user_data_format:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
     requirements:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 5005610295..7db93e087a 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -11,89 +11,89 @@ node_types:
       port_pd_server_mgmt_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pd_server_mgmt_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       compute_pd_server_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_pd_server_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd_server_mgmt_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_mgmt_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_mgmt_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_mgmt_port_0_replacement_policy:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd_server_mgmt_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_mgmt_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd_server_mgmt_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_mgmt_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_mgmt_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       compute_pd_server_user_data_format:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
     requirements:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOneGroup/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOneGroup/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 21efa9de25..e2b3a07862 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOneGroup/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOneGroup/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -11,95 +11,95 @@ node_types:
       compute_pd_server_scheduler_hints:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_pd_server_mgmt_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pd_server_mgmt_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       compute_pd_server_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_pd_server_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd_server_mgmt_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_mgmt_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_mgmt_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_mgmt_port_0_replacement_policy:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd_server_mgmt_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_mgmt_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd_server_mgmt_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_mgmt_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_mgmt_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       compute_pd_server_user_data_format:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
     requirements:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOutputParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOutputParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 0d6c5f68cb..c9e83b3eef 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOutputParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOutputParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -11,101 +11,101 @@ node_types:
       port_pd_server_mgmt_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pd_server_mgmt_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       compute_pd_server_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_pd_server_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd_server_mgmt_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_mgmt_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_mgmt_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_mgmt_port_0_replacement_policy:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd_server_mgmt_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_mgmt_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd_server_mgmt_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_mgmt_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_mgmt_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       compute_pd_server_user_data_format:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
     attributes:
       pd_server_accessIPv6:
         type: string
-        status: SUPPORTED
+        status: supported
       pd_server_accessIPv4:
         type: string
-        status: SUPPORTED
+        status: supported
       pd_server_pd_server_mgmt_port_0_device_id:
         type: string
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_pd_server:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 51118f5860..54d95e66c0 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -11,89 +11,89 @@ node_types:
       port_pd_server_mgmt_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pd_server_mgmt_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       compute_pd_server_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_pd_server_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd_server_mgmt_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_mgmt_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_mgmt_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_mgmt_port_0_replacement_policy:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd_server_mgmt_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_mgmt_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd_server_mgmt_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_mgmt_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_mgmt_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       compute_pd_server_user_data_format:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
     requirements:
@@ -444,19 +444,19 @@ node_types:
       compute_ps_server_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_ps_server_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_ps_server_user_data_format:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       index_value:
@@ -464,71 +464,71 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       port_ps_server_mgmt_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_ps_server_mgmt_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps_server_mgmt_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps_server_mgmt_port_0_replacement_policy:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_ps_server_mgmt_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps_server_mgmt_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps_server_mgmt_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps_server_mgmt_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_ps_server_mgmt_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps_server_mgmt_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps_server_mgmt_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_ps_server:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/GlobalSubstitutionTypesServiceTemplate.yaml
index ee5b626d47..1c1b8e65a9 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -11,95 +11,95 @@ node_types:
       port_pd_server_mgmt_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pd_server_mgmt_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       compute_pd_server_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_pd_server_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd_server_mgmt_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_mgmt_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_mgmt_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_mgmt_port_0_replacement_policy:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd_server_mgmt_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_mgmt_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd_server_mgmt_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_mgmt_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_mgmt_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       compute_pd_server_user_data_format:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
     attributes:
       pd_server_accessIPv4:
         type: string
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_pd_server:
         capability: tosca.capabilities.Node
@@ -448,19 +448,19 @@ node_types:
       compute_ps_server_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_ps_server_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_ps_server_user_data_format:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       index_value:
@@ -468,75 +468,75 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       port_ps_server_mgmt_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_ps_server_mgmt_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps_server_mgmt_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps_server_mgmt_port_0_replacement_policy:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_ps_server_mgmt_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps_server_mgmt_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps_server_mgmt_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps_server_mgmt_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_ps_server_mgmt_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps_server_mgmt_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps_server_mgmt_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
     attributes:
       ps_server_accessIPv4:
         type: string
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_ps_server:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortType/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortType/out/GlobalSubstitutionTypesServiceTemplate.yaml
index d4d9603c71..a9f82bf23f 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortType/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortType/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -11,81 +11,81 @@ node_types:
       port_pd01_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd01_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_pd01_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_pd_server_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_pd_server_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd02_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd01_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd02_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_pd_server_user_data_format:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd02_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_pd01_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       index_value:
@@ -93,49 +93,49 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       port_pd02_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd02_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd02_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd02_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd02_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pd02_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd02_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_pd01_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
     requirements:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 73bbefd748..0a81d96f49 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -11,7 +11,7 @@ node_types:
       compute_smp_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       index_value:
@@ -19,93 +19,93 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       compute_smp_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_port1_replacement_policy:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_port1_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_port1_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_port1_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       compute_smp_user_data_format:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_port1_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_port1_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_port1_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_port1_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_port1_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_port1_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_port1_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_smp_metadata:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       compute_smp_scheduler_hints:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
     requirements:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 2321b10d51..4c179f53cc 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -11,99 +11,99 @@ node_types:
       port_pd01_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd01_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_pd01_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_pd_server_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_pd_server_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd01_port_0_replacement_policy:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd02_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd01_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd02_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd02_port_0_replacement_policy:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd01_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_pd_server_user_data_format:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd02_port_0_security_groups:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_pd02_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_pd01_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       index_value:
@@ -111,55 +111,55 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       port_pd02_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd02_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd02_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd02_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd02_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pd02_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd02_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_pd01_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_pd01_port_0_security_groups:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
     requirements:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 1a8c8aba68..eaaa17d875 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -11,93 +11,93 @@ node_types:
       port_pd01_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd01_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_pd01_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_pd_server_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_pd_server_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd01_port_0_replacement_policy:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd02_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd01_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd02_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd02_port_0_replacement_policy:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd01_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_pd_server_user_data_format:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd02_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_pd01_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       index_value:
@@ -105,49 +105,49 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       port_pd02_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd02_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd02_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd02_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd02_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pd02_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd02_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_pd01_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
     requirements:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
index f19d7cf6e8..6e7069e64c 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -11,101 +11,101 @@ node_types:
       port_pd01_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd01_port_1_security_groups:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_pd01_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_pd01_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_pd_server_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_pd_server_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd01_port_0_replacement_policy:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_1_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_1_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_1_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_1_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd01_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_pd_server_user_data_format:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd01_port_1_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_pd01_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       index_value:
@@ -113,53 +113,53 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       port_pd01_port_1_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_1_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pd01_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_1_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_pd01_port_1_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_1_replacement_policy:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd01_port_1_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_pd01_port_0_security_groups:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
     requirements:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml
index ab0d206d17..d7df16264b 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -11,87 +11,87 @@ node_types:
       port_pd_server_0_oam_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       compute_pd_server_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_pd_server_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd_server_0_oam_port_0_replacement_policy:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_1_oam_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_0_oam_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_0_oam_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pd_server_1_oam_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_0_oam_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_1_oam_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_pd_server_user_data_format:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd_server_0_oam_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_pd_server_0_oam_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_1_oam_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_0_oam_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_1_oam_port_0_replacement_policy:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       index_value:
@@ -99,57 +99,57 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       port_pd_server_1_oam_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_1_oam_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pd_server_1_oam_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_pd_server_0_oam_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_pd_server_1_oam_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_1_oam_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd_server_0_oam_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd_server_1_oam_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_pd_server_0_oam_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_pd_server:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 296881d7c1..1c251aa41d 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -11,81 +11,81 @@ node_types:
       port_pd01_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd01_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_pd01_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_pd_server_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_pd_server_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd02_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd01_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd02_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_pd_server_user_data_format:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd02_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_pd01_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       index_value:
@@ -93,49 +93,49 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       port_pd02_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd02_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd02_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd02_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd02_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pd02_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd02_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_pd01_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
     requirements:
@@ -570,167 +570,167 @@ node_types:
       port_pcm_port_1_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pcm_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_1_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       availabilityzone_name:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       pcm_image_name:
         type: string
         description: PCRF CM image name
         required: true
-        status: SUPPORTED
+        status: supported
       cps_net_ips:
         type: string
         description: CPS network ip
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pcm_port_1_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_server_name:
         type: string
         description: PCRF CM server name
         required: true
-        status: SUPPORTED
+        status: supported
       cps_net_mask:
         type: string
         description: CPS network mask
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_1_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_name:
         type: string
         description: OAM network name
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_1_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       oam_net_gw:
         type: string
         description: CPS network gateway
         required: true
-        status: SUPPORTED
+        status: supported
       security_group_name:
         type: string
         description: the name of security group
         required: true
-        status: SUPPORTED
+        status: supported
       cps_net_ip:
         type: string
         description: CPS network ip
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_1_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_volumes:
         type: string
         description: CPS Cluman Cinder Volume
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_1_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       pcm_flavor_name:
         type: string
         description: flavor name of PCRF CM instance
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_vol:
         type: string
         description: CPS Cluman Cinder Volume
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_1_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_pcm_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       cps_net_name:
         type: string
         description: CPS network name
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_ip:
         type: string
         description: OAM network ip
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_mask:
         type: string
         description: CPS network mask
         required: true
-        status: SUPPORTED
+        status: supported
       port_pcm_port_1_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
     attributes:
       server_pcm_id:
         type: string
         description: the pcm nova service id
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_pcm_port_1:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 2e4b2ff854..97c3f0d986 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -11,133 +11,133 @@ node_types:
       port_pd_server_0_oam_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       compute_pd_server_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_pd_server_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_1_oam_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_0_oam_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_0_oam_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pd_server_1_oam_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_0_oam_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_1_oam_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_pd_server_user_data_format:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd_server_0_oam_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_pd_server_0_oam_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_1_oam_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_0_oam_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       port_pd_server_1_oam_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_1_oam_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pd_server_1_oam_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_pd_server_0_oam_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_pd_server_1_oam_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_1_oam_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd_server_0_oam_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd_server_1_oam_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_pd_server_0_oam_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_pd_server:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes2/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes2/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 54a9238b79..a54e933673 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes2/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes2/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -11,133 +11,133 @@ node_types:
       port_pd_1_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd_2_port_1_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       compute_pd_server_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_pd_server_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd_2_port_1_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd_2_port_1_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_2_port_1_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pd_2_port_1_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_1_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_1_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_1_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_pd_2_port_1_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_pd_2_port_1_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_pd_server_user_data_format:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd_1_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_pd_1_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       port_pd_2_port_1_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_1_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pd_2_port_1_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_1_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_1_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_1_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_2_port_1_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_pd_server:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes3/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes3/out/GlobalSubstitutionTypesServiceTemplate.yaml
index d817b21500..465c88dce1 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes3/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes3/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -11,133 +11,133 @@ node_types:
       port_pd_server_0_oam_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       compute_pd_server_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_pd_server_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_1_oam_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_0_oam_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_0_oam_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pd_server_1_oam_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_0_oam_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_1_oam_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_pd_server_user_data_format:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd_server_0_oam_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_pd_server_0_oam_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_1_oam_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_0_oam_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       port_pd_server_1_oam_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_1_oam_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pd_server_1_oam_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_pd_server_0_oam_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_pd_server_1_oam_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_1_oam_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd_server_0_oam_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd_server_1_oam_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_pd_server_0_oam_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_pd_server:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes4/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes4/out/GlobalSubstitutionTypesServiceTemplate.yaml
index aff212083e..d039cc1496 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes4/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes4/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -11,131 +11,131 @@ node_types:
       port_pd01_port1_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd01_port1_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port1_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port2_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd01_port1_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pd01_port2_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       compute_pd_server_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_pd_server_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port2_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port1_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port2_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port2_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pd01_port2_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_pd01_port2_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       compute_pd_server_user_data_format:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd01_port1_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       port_pd01_port1_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port2_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port2_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port1_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_pd01_port1_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port2_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port1_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
     requirements:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/diffPortTypeAndOutParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/diffPortTypeAndOutParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
index bef997b5b3..687b559f17 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/diffPortTypeAndOutParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/diffPortTypeAndOutParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -11,81 +11,81 @@ node_types:
       port_pd01_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd01_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_pd01_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_pd_server_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_pd_server_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd02_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd01_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd02_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_pd_server_user_data_format:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd02_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_pd01_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       index_value:
@@ -93,61 +93,61 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       port_pd02_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd02_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd02_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd02_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd02_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pd02_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd02_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_pd01_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
     attributes:
       pd_server_pd01_port_0_device_id:
         type: string
-        status: SUPPORTED
+        status: supported
       pd_server_accessIPv4:
         type: string
-        status: SUPPORTED
+        status: supported
       pd_server_pd02_port_0_device_owner:
         type: string
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_pd_server:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/GlobalSubstitutionTypesServiceTemplate.yaml
index a3e595f5da..abfcb2d1f8 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -11,25 +11,25 @@ node_types:
       port_FSB_OAM_network_role_tag:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_FSB2_Internal2_mac_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.MacRequirements
       port_FSB_OAM_mac_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.MacRequirements
       port_FSB2_Internal2_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       index_value:
@@ -37,77 +37,77 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       port_FSB2_Internal2_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_FSB2_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_FSB_OAM_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_FSB2_Internal1_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       compute_FSB2_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_FSB2_Internal1_mac_address:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_FSB_OAM_fixed_ips:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_FSB2_Internal1_mac_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.MacRequirements
       port_FSB_OAM_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_FSB2_Internal1_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_FSB2_Internal2_mac_address:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
     requirements:
@@ -608,117 +608,117 @@ node_types:
       port_VLC_SCTP_A_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_VLC_OAM_network_role_tag:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_VLC_GTP_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_VLC2_Internal2_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_VLC_SCTP_A_mac_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.MacRequirements
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_VLC_SCTP_B_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_VLC_SCTP_A_fixed_ips:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_VLC_OAM_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_VLC2_Internal2_mac_address:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_VLC_OAM_fixed_ips:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_VLC2_Internal1_mac_address:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_VLC2_Internal2_mac_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.MacRequirements
       port_VLC2_Internal1_mac_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.MacRequirements
       port_VLC_SCTP_A_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_VLC_SCTP_B_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_VLC_GTP_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_VLC2_Internal1_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       compute_VLC2_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       index_value:
@@ -726,61 +726,61 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       port_VLC_SCTP_B_fixed_ips:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_VLC_GTP_mac_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.MacRequirements
       port_VLC2_Internal1_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_VLC2_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_VLC_GTP_fixed_ips:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_VLC_OAM_mac_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.MacRequirements
       port_VLC_OAM_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_VLC_SCTP_B_mac_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.MacRequirements
       port_VLC2_Internal2_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
     requirements:
@@ -1515,7 +1515,7 @@ node_types:
       port_NCB1_Internal2_mac_address:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       index_value:
@@ -1523,69 +1523,69 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       port_NCB1_Internal1_mac_address:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_NCB1_Internal1_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_NCB1_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_NCB1_Internal1_mac_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.MacRequirements
       port_NCB1_Internal2_mac_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.MacRequirements
       port_NCB1_Internal1_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_NCB1_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_NCB1_Internal2_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_NCB1_Internal2_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
     requirements:
@@ -2010,75 +2010,75 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       port_NCB2_Internal1_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_NCB2_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_NCB2_Internal2_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_NCB2_Internal2_mac_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.MacRequirements
       port_NCB2_Internal2_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_NCB2_Internal1_mac_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.MacRequirements
       port_NCB2_Internal1_mac_address:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_NCB2_Internal2_mac_address:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_NCB2_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_NCB2_Internal1_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
     requirements:
@@ -2501,25 +2501,25 @@ node_types:
       port_GPB2_Internal2_mac_address:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_GPB2_Internal2_mac_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.MacRequirements
       port_GPB2_Internal1_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_GPB2_Internal1_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       index_value:
@@ -2527,51 +2527,51 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       compute_GPB2_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_GPB2_Internal1_mac_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.MacRequirements
       port_GPB2_Internal2_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_GPB2_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_GPB2_Internal1_mac_address:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_GPB2_Internal2_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
     requirements:
@@ -2994,111 +2994,111 @@ node_types:
       port_VLC1_Internal2_mac_address:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_VLC1_Internal1_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_VLC_SCTP_A_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_VLC_OAM_network_role_tag:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_VLC1_Internal1_mac_address:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_VLC_GTP_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_VLC_SCTP_A_mac_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.MacRequirements
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_VLC1_Internal2_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_VLC_SCTP_B_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_VLC_SCTP_A_fixed_ips:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_VLC_OAM_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_VLC1_Internal1_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_VLC_OAM_fixed_ips:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_VLC_SCTP_A_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_VLC_SCTP_B_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_VLC_GTP_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_VLC1_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       index_value:
@@ -3106,67 +3106,67 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       port_VLC1_Internal1_mac_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.MacRequirements
       port_VLC1_Internal2_mac_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.MacRequirements
       port_VLC_SCTP_B_fixed_ips:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_VLC_GTP_mac_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.MacRequirements
       port_VLC_GTP_fixed_ips:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_VLC_OAM_mac_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.MacRequirements
       port_VLC_OAM_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_VLC1_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_VLC_SCTP_B_mac_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.MacRequirements
       port_VLC1_Internal2_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
     requirements:
@@ -3901,31 +3901,31 @@ node_types:
       port_FSB1_Internal1_mac_address:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_FSB_OAM_network_role_tag:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_FSB1_Internal2_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_FSB_OAM_mac_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.MacRequirements
       compute_FSB1_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       index_value:
@@ -3933,71 +3933,71 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       port_FSB1_Internal1_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_FSB1_Internal2_mac_address:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_FSB_OAM_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_FSB1_Internal2_mac_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.MacRequirements
       port_FSB1_Internal2_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_FSB_OAM_fixed_ips:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       compute_FSB1_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_FSB1_Internal1_mac_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.MacRequirements
       port_FSB1_Internal1_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_FSB_OAM_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
     requirements:
@@ -4498,7 +4498,7 @@ node_types:
       port_GPB1_Internal2_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       index_value:
@@ -4506,69 +4506,69 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       port_GPB1_Internal1_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_GPB1_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_GPB1_Internal2_mac_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.MacRequirements
       port_GPB1_Internal1_mac_address:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_GPB1_Internal2_mac_address:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_GPB1_Internal1_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_GPB1_Internal1_mac_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.MacRequirements
       compute_GPB1_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_GPB1_Internal2_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
     requirements:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/inputOutputParamType/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/inputOutputParamType/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 1b612b79fa..85885db0c3 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/inputOutputParamType/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/inputOutputParamType/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -11,271 +11,271 @@ node_types:
       port_template_VMInt_OAM_lb_4_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_pd_server_key_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd01_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       compute_pd_server_personality:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_pd01_port_0_replacement_policy:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_pd_server_image_update_policy:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd01_port_0_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_0_binding:vnic_type:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd01_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_template_VMInt_OAM_lb_4_virtual_machine_interface_allowed_address_pairs:
         type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs
         required: true
-        status: SUPPORTED
+        status: supported
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_0_port_security_enabled:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: boolean
       port_pd01_port_0_value_specs:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_pd01_port_0_admin_state_up:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: boolean
       port_pd01_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_template_VMInt_OAM_lb_4_virtual_network_refs:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       compute_pd_server_metadata:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       compute_pd_server_diskConfig:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd01_port_0_mac_address:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_pd_server_admin_pass:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_pd_server_flavor_update_policy:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd01_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_template_VMInt_OAM_lb_4_security_group_refs:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_template_VMInt_OAM_lb_4_virtual_machine_interface_mac_addresses:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_template_VMInt_OAM_lb_4_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_template_VMInt_OAM_lb_4_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pd01_port_0_fixed_ips:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
       compute_pd_server_security_groups:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       compute_pd_server_software_config_transport:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd01_port_0_security_groups:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       compute_pd_server_scheduler_hints:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       compute_pd_server_contrail_service_instance_ind:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: boolean
       port_template_VMInt_OAM_lb_4_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_pd01_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd01_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_pd_server_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_pd_server_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_template_VMInt_OAM_lb_4_virtual_machine_interface_properties:
         type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.interface.Properties
         required: true
-        status: SUPPORTED
+        status: supported
       port_template_VMInt_OAM_lb_4_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_template_VMInt_OAM_lb_4_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_template_VMInt_OAM_lb_4_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_pd_server_config_drive:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: boolean
       compute_pd_server_user_data_format:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd01_port_0_allowed_address_pairs:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.network.AddressPair
       port_pd01_port_0_device_id:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd01_port_0_qos_policy:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd01_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       index_value:
@@ -283,157 +283,157 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       port_template_VMInt_OAM_lb_4_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_template_VMInt_OAM_lb_4_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       compute_pd_server_user_data_update_policy:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd01_port_0_device_owner:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_template_VMInt_OAM_lb_4_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       compute_pd_server_reservation_id:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_template_VMInt_OAM_lb_4_port_tuple_refs:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_pd01_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
     attributes:
       pd_server_pd01_port_0_port_security_enabled:
         type: boolean
-        status: SUPPORTED
+        status: supported
       pd_server_show:
         type: string
-        status: SUPPORTED
+        status: supported
       pd_server_template_VMInt_OAM_lb_4_name:
         type: string
-        status: SUPPORTED
+        status: supported
       pd_server_pd01_port_0_allowed_address_pairs:
         type: list
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.network.AddressPair
       pd_server_console_urls:
         type: string
-        status: SUPPORTED
+        status: supported
       pd_server_pd01_port_0_security_groups:
         type: list
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       pd_server_pd01_port_0_tenant_id:
         type: string
-        status: SUPPORTED
+        status: supported
       pd_server_template_VMInt_OAM_lb_4_virtual_machine_interface_mac_addresses:
         type: list
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       pd_server_template_VMInt_OAM_lb_4_fq_name:
         type: string
-        status: SUPPORTED
+        status: supported
       pd_server_pd01_port_0_name:
         type: string
-        status: SUPPORTED
+        status: supported
       pd_server_template_VMInt_OAM_lb_4_virtual_machine_interface_properties:
         type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.interface.Properties
-        status: SUPPORTED
+        status: supported
       pd_server_pd01_port_0_subnets:
         type: list
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       pd_server_pd01_port_0_show:
         type: string
-        status: SUPPORTED
+        status: supported
       pd_server_pd01_port_0_status:
         type: string
-        status: SUPPORTED
+        status: supported
       pd_server_pd01_port_0_qos_policy:
         type: string
-        status: SUPPORTED
+        status: supported
       pd_server_accessIPv6:
         type: string
-        status: SUPPORTED
+        status: supported
       pd_server_instance_name:
         type: string
-        status: SUPPORTED
+        status: supported
       pd_server_accessIPv4:
         type: string
-        status: SUPPORTED
+        status: supported
       pd_server_pd01_port_0_admin_state_up:
         type: boolean
-        status: SUPPORTED
+        status: supported
       pd_server_template_VMInt_OAM_lb_4_virtual_network_refs:
         type: list
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       pd_server_addresses:
         type: map
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.novaServer.network.AddressInfo
       pd_server_pd01_port_0_device_id:
         type: string
-        status: SUPPORTED
+        status: supported
       pd_server_pd01_port_0_network:
         type: string
-        status: SUPPORTED
+        status: supported
       pd_server_pd01_port_0_mac_address:
         type: string
-        status: SUPPORTED
+        status: supported
       pd_server_pd01_port_0_device_owner:
         type: string
-        status: SUPPORTED
+        status: supported
       pd_server_pd01_port_0_fixed_ips:
         type: list
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
       pd_server_template_VMInt_OAM_lb_4_port_tuple_refs:
         type: list
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       pd_server_template_VMInt_OAM_lb_4_show:
         type: string
-        status: SUPPORTED
+        status: supported
       pd_server_template_VMInt_OAM_lb_4_virtual_machine_interface_allowed_address_pairs:
         type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_pd_server:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttIn/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 14892d8ec9..830ffe8e70 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -11,81 +11,81 @@ node_types:
       port_pd01_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd01_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_pd01_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_pd_server_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_pd_server_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd02_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd01_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd02_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_pd_server_user_data_format:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd02_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_pd01_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       index_value:
@@ -93,58 +93,58 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       port_pd02_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd02_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd02_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd02_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd02_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pd02_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd02_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_pd01_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
     attributes:
       pd_server_accessIPv4:
         type: string
-        status: SUPPORTED
+        status: supported
       pd_server_pd01_port_0_device_owner:
         type: string
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_pd_server:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttOut/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttOut/out/GlobalSubstitutionTypesServiceTemplate.yaml
index d4d9603c71..a9f82bf23f 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttOut/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttOut/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -11,81 +11,81 @@ node_types:
       port_pd01_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd01_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_pd01_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_pd_server_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_pd_server_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd02_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd01_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd02_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_pd_server_user_data_format:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd02_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_pd01_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       index_value:
@@ -93,49 +93,49 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       port_pd02_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd02_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd02_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd02_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd02_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pd02_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd02_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_pd01_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
     requirements:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 2e4b2ff854..97c3f0d986 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -11,133 +11,133 @@ node_types:
       port_pd_server_0_oam_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       compute_pd_server_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_pd_server_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_1_oam_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_0_oam_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_0_oam_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pd_server_1_oam_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_0_oam_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_1_oam_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_pd_server_user_data_format:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd_server_0_oam_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_pd_server_0_oam_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_1_oam_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_0_oam_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       port_pd_server_1_oam_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_1_oam_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pd_server_1_oam_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_pd_server_0_oam_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_pd_server_1_oam_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_1_oam_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd_server_0_oam_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd_server_1_oam_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_pd_server_0_oam_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_pd_server:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortsAndGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortsAndGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
index a9716b4faa..f0dd6ee4be 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortsAndGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortsAndGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -11,143 +11,143 @@ node_types:
       port_pd_server_0_oam_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       compute_pd_server_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_pd_server_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_1_oam_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_0_oam_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_0_oam_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pd_server_1_oam_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_0_oam_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_1_oam_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_pd_server_user_data_format:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd_server_0_oam_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_pd_server_0_oam_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_1_oam_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_0_oam_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       port_pd_server_1_oam_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_1_oam_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pd_server_1_oam_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_pd_server_0_oam_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_pd_server_1_oam_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_1_oam_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd_server_0_oam_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd_server_1_oam_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_pd_server_0_oam_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
     attributes:
       pd_server_accessIPv4:
         type: string
-        status: SUPPORTED
+        status: supported
       pd_server_pd_server_1_oam_port_0_device_owner:
         type: string
-        status: SUPPORTED
+        status: supported
       pd_server_pd_server_0_oam_port_0_device_owner:
         type: string
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_pd_server:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
index b8c1f7aade..08db3c7752 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -11,143 +11,143 @@ node_types:
       port_pd_server_0_oam_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       compute_pd_server_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_pd_server_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_1_oam_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_0_oam_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_0_oam_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pd_server_1_oam_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_0_oam_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_1_oam_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_pd_server_user_data_format:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd_server_0_oam_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_pd_server_0_oam_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_1_oam_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_0_oam_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       port_pd_server_1_oam_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_1_oam_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pd_server_1_oam_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_pd_server_0_oam_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_pd_server_1_oam_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_1_oam_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd_server_0_oam_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd_server_1_oam_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_pd_server_0_oam_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
     attributes:
       pd_server_accessIPv4:
         type: string
-        status: SUPPORTED
+        status: supported
       pd_server_pd_server_0_oam_port_0_device_id:
         type: string
-        status: SUPPORTED
+        status: supported
       pd_server_pd_server_1_oam_port_0_device_owner:
         type: string
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_pd_server:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 7a2d9ce520..d9ad4409a7 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -11,104 +11,104 @@ node_types:
       port_pd_server_oam_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       compute_pd_server_scheduler_hints:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_pd_server_oam_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       compute_pd_server_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_pd_server_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd_server_oam_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_oam_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_pd_server_oam_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_oam_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_oam_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_pd_server_oam_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_oam_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_oam_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_pd_server_user_data_format:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd_server_oam_port_0_security_groups:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
     attributes:
       pd_server_accessIPv4:
         type: string
-        status: SUPPORTED
+        status: supported
       pd_server_pd_server_oam_port_0_device_owner:
         type: string
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_pd_server:
         capability: tosca.capabilities.Node
@@ -457,101 +457,101 @@ node_types:
       port_oam_server_oam_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_oam_server_oam_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_oam_server_oam_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       port_oam_server_oam_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_oam_server_oam_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_oam_server_oam_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_oam_server_oam_port_0_security_groups:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_oam_server_oam_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_oam_server_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_oam_server_oam_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_oam_server_oam_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       compute_oam_server_user_data_format:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_oam_server_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_oam_server_oam_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       compute_oam_server_scheduler_hints:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
     attributes:
       oam_server_accessIPv4:
         type: string
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_oam_server_oam_server_oam_port_0:
         capability: tosca.capabilities.Node
@@ -900,25 +900,25 @@ node_types:
       compute_ps_server_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_ps_server_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_ps_server_user_data_format:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_ps_server_scheduler_hints:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       index_value:
@@ -926,78 +926,78 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       port_ps_server_oam_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps_server_oam_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_ps_server_oam_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_ps_server_oam_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps_server_oam_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps_server_oam_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_ps_server_oam_port_0_security_groups:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps_server_oam_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps_server_oam_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_ps_server_oam_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps_server_oam_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
     attributes:
       ps_server_accessIPv4:
         type: string
-        status: SUPPORTED
+        status: supported
       ps_server_ps_server_oam_port_0_device_id:
         type: string
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_ps_server:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/GlobalSubstitutionTypesServiceTemplate.yaml
index f0fa48a8bd..843be37f56 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -11,83 +11,83 @@ node_types:
       port_pd_server_oam_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_oam_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       compute_pd_server_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_pd_server_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd_server_oam_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_oam_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_pd_server_oam_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_oam_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_oam_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_pd_server_oam_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_oam_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_oam_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_pd_server_user_data_format:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
     requirements:
@@ -438,85 +438,85 @@ node_types:
       port_oam_server_oam_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_oam_server_oam_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_oam_server_oam_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       port_oam_server_oam_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_oam_server_oam_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_oam_server_oam_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_oam_server_oam_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_oam_server_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_oam_server_oam_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_oam_server_oam_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       compute_oam_server_user_data_format:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_oam_server_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_oam_server_oam_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_oam_server_oam_server_oam_port_0:
         capability: tosca.capabilities.Node
@@ -865,19 +865,19 @@ node_types:
       compute_ps_server_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_ps_server_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_ps_server_user_data_format:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       index_value:
@@ -885,65 +885,65 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       port_ps_server_oam_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps_server_oam_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_ps_server_oam_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_ps_server_oam_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps_server_oam_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps_server_oam_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps_server_oam_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps_server_oam_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_ps_server_oam_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps_server_oam_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_ps_server:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 2a5c880508..7f7ae6d688 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -11,7 +11,7 @@ node_types:
       port_pd01_port_1_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       index_value:
@@ -19,69 +19,69 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       compute_pd_server_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_pd_server_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd01_port_1_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_1_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_1_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_1_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_pd01_port_1_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_1_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_1_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_1_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_pd_server_user_data_format:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
     requirements:
@@ -432,25 +432,25 @@ node_types:
       port_pd01_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_pd01_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       index_value:
@@ -458,51 +458,51 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       compute_pd_server_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_pd_server_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_pd01_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_pd_server_user_data_format:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
     requirements:
@@ -853,83 +853,83 @@ node_types:
       port_pd01_port_2_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       port_pd01_port_2_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       compute_pd_server_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_pd_server_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_2_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_2_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_2_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_2_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd01_port_2_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pd01_port_2_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_2_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       compute_pd_server_user_data_format:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd01_port_2_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
     requirements:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml
index d3d5fbba28..810796a530 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -11,7 +11,7 @@ node_types:
       port_pd01_port_1_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       index_value:
@@ -19,75 +19,75 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       compute_pd_server_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_pd_server_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd01_port_1_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_1_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_1_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_1_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_pd01_port_1_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_1_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_1_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_1_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_1_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_pd_server_user_data_format:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
     requirements:
@@ -438,31 +438,31 @@ node_types:
       port_pd01_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd01_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_pd01_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       index_value:
@@ -470,51 +470,51 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       compute_pd_server_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_pd_server_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_pd01_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_pd_server_user_data_format:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
     requirements:
@@ -865,133 +865,133 @@ node_types:
       port_pd_server_2_oam_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_pd_server_0_oam_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       compute_pd_server_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_pd_server_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd_server_2_oam_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_2_oam_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_2_oam_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_2_oam_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_0_oam_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_0_oam_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pd_server_0_oam_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_pd_server_user_data_format:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd_server_0_oam_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_pd_server_2_oam_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_0_oam_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_0_oam_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       port_pd_server_0_oam_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_pd_server_2_oam_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_0_oam_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd_server_2_oam_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pd_server_2_oam_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd_server_0_oam_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_2_oam_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_pd_server:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 4e72ded9e5..64bf6fdb07 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -11,31 +11,31 @@ node_types:
       port_pd01_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd01_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_pd01_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       index_value:
@@ -43,57 +43,57 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       compute_pd_server_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_pd_server_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_pd01_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_pd_server_user_data_format:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
     attributes:
       pd_server_accessIPv4:
         type: string
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_pd_server:
         capability: tosca.capabilities.Node
@@ -442,29 +442,29 @@ node_types:
       compute_ps_server_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_ps01_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_ps_server_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_ps_server_user_data_format:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_ps01_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       index_value:
@@ -472,59 +472,59 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       port_ps01_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_ps01_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps01_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps01_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps01_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps01_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps01_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps01_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     attributes:
       ps_server_accessIPv4:
         type: string
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_ps_server_ps01_port_0:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 092c618595..ae8e5f3f4a 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -11,31 +11,31 @@ node_types:
       port_pd01_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd01_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_pd01_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       index_value:
@@ -43,51 +43,51 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       compute_pd_server_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_pd_server_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_pd01_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_pd_server_user_data_format:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
     requirements:
@@ -438,29 +438,29 @@ node_types:
       compute_ps_server_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_ps01_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_ps_server_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_ps_server_user_data_format:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_ps01_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       index_value:
@@ -468,53 +468,53 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       port_ps01_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_ps01_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps01_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps01_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps01_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps01_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps01_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps01_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     requirements:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/computePortNetworkSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/computePortNetworkSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml
index b5981ebfaa..88c3184581 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/computePortNetworkSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/computePortNetworkSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -11,133 +11,133 @@ node_types:
       subinterface_nested_parent_interface:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_untr_vmi_1_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_vdbe_untr_vmi_1_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_nested_aap_address_mode:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_nested_vlan_tag_list:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       compute_vdbe_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_nested_service_template_filter_count:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: float
       subinterface_nested_aap_untrusted_v6_ip_prefix_len:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_vmi_1_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_vdbe_untr_vmi_1_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_nested_aap_untrusted_ip_prefix:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_nested_aap_sec_untrusted_ip_prefix_len:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_nested_aap_sec_untrusted_ip_prefix:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_nested_aap_untrusted_v6_ip_prefix:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_vdbe_metadata:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       subinterface_nested_mac_address:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_untr_vmi_1_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_untr_vmi_1_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_nested_ip_address:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_untr_vmi_1_virtual_network_refs:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_vdbe_untr_vmi_1_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_nested_ip_v6_address:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       index_value:
@@ -145,61 +145,61 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       subinterface_nested_vmac_address:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_nested_vn_network_list:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_untr_vmi_1_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_vdbe_untr_vmi_1_virtual_machine_interface_allowed_address_pairs:
         type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_vmi_1_virtual_machine_interface_mac_addresses:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_vdbe_untr_vmi_1_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_vmi_1_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_nested_aap_untrusted_ip_prefix_len:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_nested_subinterfaces_name_prefix:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_vdbe_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
     requirements:
@@ -576,84 +576,84 @@ node_types:
         type: string
         description: ip prefix for primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       aap_sec_untrusted_ip_prefix:
         type: string
         description: ip prefix for secondary vDBE VM aap on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       ip_v6_address:
         type: string
         description: IPv6 address associated with subinterfaces
         required: true
-        status: SUPPORTED
+        status: supported
       counter:
         type: float
         description: Index of instance among multiple instances.  Use to retrieve correct parameter for this instance when passed all parameters for all instances.
         required: true
-        status: SUPPORTED
+        status: supported
       subinterfaces_name_prefix:
         type: string
         description: Combined with subinterface_instance_index, this is used as the name of the subinterface resource
         required: true
-        status: SUPPORTED
+        status: supported
       ip_address:
         type: string
         description: IPv4 address associated with subinterfaces
         required: true
-        status: SUPPORTED
+        status: supported
       aap_address_mode:
         type: string
         description: Address mode for the vDBE cluster IP
         required: true
-        status: SUPPORTED
+        status: supported
       aap_untrusted_v6_ip_prefix:
         type: string
         description: ipv6 prefix for the primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       parent_interface:
         type: string
         description: Parent Contrail interface
         required: true
-        status: SUPPORTED
+        status: supported
       vn_network_list:
         type: string
         description: List of Contrail VLAN networks to use for the subinterfaces.   The order and number of these must match the VLAN ID list
         required: true
-        status: SUPPORTED
+        status: supported
       mac_address:
         type: string
         description: HW MAC address to use for subinterface
         required: true
-        status: SUPPORTED
+        status: supported
       vlan_tag_list:
         type: list
         description: List of VLAN IDs to use for subinterfaces
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       aap_sec_untrusted_ip_prefix_len:
         type: string
         description: ip prefix length for the secondary DBE VM aap on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       vmac_address:
         type: string
         description: virtual MAC address to use for subinterface
         required: true
-        status: SUPPORTED
+        status: supported
       aap_untrusted_v6_ip_prefix_len:
         type: string
         description: ipv6 prefix length for the primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       aap_untrusted_ip_prefix_len:
         type: string
         description: ip prefix length for the primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_vdbe_0_untr_vmi_0:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multiplePortsMultipleVlans/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multiplePortsMultipleVlans/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 61c9922604..fa6a579a83 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multiplePortsMultipleVlans/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multiplePortsMultipleVlans/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -11,303 +11,303 @@ node_types:
       subinterface_vlan1_aap_untrusted_v6_ip_prefix:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_vlan1_aap_sec_untrusted_ip_prefix:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_vlan1_vmac_address:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_vdbe_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_untr_2_port_virtual_machine_interface_mac_addresses:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_vdbe_untr_2_port_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_vlan1_counter:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: float
       subinterface_vlan2_aap_untrusted_v6_ip_prefix:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_2_port_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_vdbe_metadata:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       subinterface_vlan1_aap_untrusted_v6_ip_prefix_len:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_untr_1_port_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_vdbe_untr_2_port_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_vdbe_untr_2_port_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_2_port_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_vdbe_untr_1_port_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_1_port_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_vlan2_ip_address:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_vlan2_ip_v6_address:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_untr_1_port_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_vlan2_parent_interface:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_vlan2_aap_address_mode:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_untr_2_port_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_1_port_virtual_machine_interface_allowed_address_pairs:
         type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_vlan1_mac_address:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_vlan2_mac_address:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_vlan1_aap_untrusted_ip_prefix_len:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_vlan1_ip_address:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_vlan2_aap_sec_untrusted_ip_prefix:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_vdbe_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_untr_1_port_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_vlan2_aap_untrusted_ip_prefix:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_vlan1_ip_v6_address:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_vlan2_vmac_address:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_untr_1_port_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       subinterface_vlan1_aap_untrusted_ip_prefix:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_untr_2_port_virtual_network_refs:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       subinterface_vlan2_vn_network_list:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_vlan1_subinterfaces_name_prefix:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_untr_1_port_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_2_port_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_untr_2_port_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_vdbe_untr_1_port_virtual_network_refs:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       subinterface_vlan2_vlan_tag_list:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       subinterface_vlan1_vn_network_list:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_vlan2_aap_sec_untrusted_ip_prefix_len:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_untr_2_port_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_2_port_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_vlan1_service_template_filter_count:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: float
       subinterface_vlan2_counter:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: float
       subinterface_vlan1_parent_interface:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_vlan1_aap_address_mode:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_vlan2_aap_untrusted_ip_prefix_len:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       index_value:
@@ -315,69 +315,69 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       subinterface_vlan2_subinterfaces_name_prefix:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_vlan2_aap_untrusted_v6_ip_prefix_len:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_untr_1_port_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_1_port_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_vlan2_service_template_filter_count:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: float
       subinterface_vlan1_aap_sec_untrusted_ip_prefix_len:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_untr_2_port_virtual_machine_interface_allowed_address_pairs:
         type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_1_port_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_vdbe_untr_1_port_virtual_machine_interface_mac_addresses:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       subinterface_vlan1_vlan_tag_list:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
     attributes:
       vdbe_vdbe_untr_1_port_vlan1_vlan_tag_list:
         type: list
-        status: SUPPORTED
+        status: supported
         entry_schema: &id001
           type: string
     requirements:
@@ -863,83 +863,83 @@ node_types:
         type: string
         description: ip prefix for primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       aap_sec_untrusted_ip_prefix:
         type: string
         description: ip prefix for secondary vDBE VM aap on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       ip_v6_address:
         type: string
         description: IPv6 address associated with subinterfaces
         required: true
-        status: SUPPORTED
+        status: supported
       counter:
         type: float
         description: Index of instance among multiple instances.  Use to retrieve correct parameter for this instance when passed all parameters for all instances.
         required: true
-        status: SUPPORTED
+        status: supported
       subinterfaces_name_prefix:
         type: string
         description: Combined with subinterface_instance_index, this is used as the name of the subinterface resource
         required: true
-        status: SUPPORTED
+        status: supported
       ip_address:
         type: string
         description: IPv4 address associated with subinterfaces
         required: true
-        status: SUPPORTED
+        status: supported
       aap_address_mode:
         type: string
         description: Address mode for the vDBE cluster IP
         required: true
-        status: SUPPORTED
+        status: supported
       aap_untrusted_v6_ip_prefix:
         type: string
         description: ipv6 prefix for the primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       parent_interface:
         type: string
         description: Parent Contrail interface
         required: true
-        status: SUPPORTED
+        status: supported
       vn_network_list:
         type: string
         description: List of Contrail VLAN networks to use for the subinterfaces.   The order and number of these must match the VLAN ID list
         required: true
-        status: SUPPORTED
+        status: supported
       mac_address:
         type: string
         description: HW MAC address to use for subinterface
         required: true
-        status: SUPPORTED
+        status: supported
       vlan_tag_list:
         type: list
         description: List of VLAN IDs to use for subinterfaces
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema: *id001
       aap_sec_untrusted_ip_prefix_len:
         type: string
         description: ip prefix length for the secondary DBE VM aap on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       vmac_address:
         type: string
         description: virtual MAC address to use for subinterface
         required: true
-        status: SUPPORTED
+        status: supported
       aap_untrusted_v6_ip_prefix_len:
         type: string
         description: ipv6 prefix length for the primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       aap_untrusted_ip_prefix_len:
         type: string
         description: ip prefix length for the primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_vdbe_untr_x_subport:
         capability: tosca.capabilities.Node
@@ -974,84 +974,84 @@ node_types:
         type: string
         description: ip prefix for primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       aap_sec_untrusted_ip_prefix:
         type: string
         description: ip prefix for secondary vDBE VM aap on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       ip_v6_address:
         type: string
         description: IPv6 address associated with subinterfaces
         required: true
-        status: SUPPORTED
+        status: supported
       counter:
         type: float
         description: Index of instance among multiple instances.  Use to retrieve correct parameter for this instance when passed all parameters for all instances.
         required: true
-        status: SUPPORTED
+        status: supported
       subinterfaces_name_prefix:
         type: string
         description: Combined with subinterface_instance_index, this is used as the name of the subinterface resource
         required: true
-        status: SUPPORTED
+        status: supported
       ip_address:
         type: string
         description: IPv4 address associated with subinterfaces
         required: true
-        status: SUPPORTED
+        status: supported
       aap_address_mode:
         type: string
         description: Address mode for the vDBE cluster IP
         required: true
-        status: SUPPORTED
+        status: supported
       aap_untrusted_v6_ip_prefix:
         type: string
         description: ipv6 prefix for the primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       parent_interface:
         type: string
         description: Parent Contrail interface
         required: true
-        status: SUPPORTED
+        status: supported
       vn_network_list:
         type: string
         description: List of Contrail VLAN networks to use for the subinterfaces.   The order and number of these must match the VLAN ID list
         required: true
-        status: SUPPORTED
+        status: supported
       mac_address:
         type: string
         description: HW MAC address to use for subinterface
         required: true
-        status: SUPPORTED
+        status: supported
       vlan_tag_list:
         type: list
         description: List of VLAN IDs to use for subinterfaces
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       aap_sec_untrusted_ip_prefix_len:
         type: string
         description: ip prefix length for the secondary DBE VM aap on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       vmac_address:
         type: string
         description: virtual MAC address to use for subinterface
         required: true
-        status: SUPPORTED
+        status: supported
       aap_untrusted_v6_ip_prefix_len:
         type: string
         description: ipv6 prefix length for the primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       aap_untrusted_ip_prefix_len:
         type: string
         description: ip prefix length for the primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_vdbe_untr_x_subport_another:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multipleVlanDiffType/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multipleVlanDiffType/out/GlobalSubstitutionTypesServiceTemplate.yaml
index f9eb9a8d09..83f1cce038 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multipleVlanDiffType/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multipleVlanDiffType/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -11,243 +11,243 @@ node_types:
       subinterface_vlan1_aap_untrusted_v6_ip_prefix:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_vlan1_aap_sec_untrusted_ip_prefix:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_vlan1_vmac_address:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_vdbe_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_vlan1_counter:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: float
       subinterface_vlan2_aap_untrusted_v6_ip_prefix:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_vdbe_metadata:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       subinterface_vlan1_aap_untrusted_v6_ip_prefix_len:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_untr_1_port_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_vdbe_untr_1_port_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_1_port_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_vlan2_ip_address:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_vlan2_ip_v6_address:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_untr_1_port_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_vlan2_parent_interface:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_vlan2_aap_address_mode:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_untr_1_port_virtual_machine_interface_allowed_address_pairs:
         type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_vlan1_mac_address:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_vlan2_mac_address:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_vlan1_aap_untrusted_ip_prefix_len:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_vlan1_ip_address:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_vlan2_aap_sec_untrusted_ip_prefix:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_vdbe_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_untr_1_port_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_vlan2_aap_untrusted_ip_prefix:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_vlan1_ip_v6_address:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_vlan2_vmac_address:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_untr_1_port_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       subinterface_vlan1_aap_untrusted_ip_prefix:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_vlan2_vn_network_list:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_vlan1_subinterfaces_name_prefix:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_untr_1_port_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_1_port_virtual_network_refs:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       subinterface_vlan2_vlan_tag_list:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       subinterface_vlan1_vn_network_list:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_vlan2_aap_sec_untrusted_ip_prefix_len:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_vlan1_service_template_filter_count:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: float
       subinterface_vlan2_counter:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: float
       subinterface_vlan1_parent_interface:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_vlan1_aap_address_mode:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_vlan2_aap_untrusted_ip_prefix_len:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       index_value:
@@ -255,59 +255,59 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       subinterface_vlan2_subinterfaces_name_prefix:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_vlan2_aap_untrusted_v6_ip_prefix_len:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_untr_1_port_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_1_port_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_vlan2_service_template_filter_count:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: float
       subinterface_vlan1_aap_sec_untrusted_ip_prefix_len:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_untr_1_port_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_vdbe_untr_1_port_virtual_machine_interface_mac_addresses:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       subinterface_vlan1_vlan_tag_list:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
     requirements:
@@ -714,84 +714,84 @@ node_types:
         type: string
         description: ip prefix for primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       aap_sec_untrusted_ip_prefix:
         type: string
         description: ip prefix for secondary vDBE VM aap on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       ip_v6_address:
         type: string
         description: IPv6 address associated with subinterfaces
         required: true
-        status: SUPPORTED
+        status: supported
       counter:
         type: float
         description: Index of instance among multiple instances.  Use to retrieve correct parameter for this instance when passed all parameters for all instances.
         required: true
-        status: SUPPORTED
+        status: supported
       subinterfaces_name_prefix:
         type: string
         description: Combined with subinterface_instance_index, this is used as the name of the subinterface resource
         required: true
-        status: SUPPORTED
+        status: supported
       ip_address:
         type: string
         description: IPv4 address associated with subinterfaces
         required: true
-        status: SUPPORTED
+        status: supported
       aap_address_mode:
         type: string
         description: Address mode for the vDBE cluster IP
         required: true
-        status: SUPPORTED
+        status: supported
       aap_untrusted_v6_ip_prefix:
         type: string
         description: ipv6 prefix for the primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       parent_interface:
         type: string
         description: Parent Contrail interface
         required: true
-        status: SUPPORTED
+        status: supported
       vn_network_list:
         type: string
         description: List of Contrail VLAN networks to use for the subinterfaces.   The order and number of these must match the VLAN ID list
         required: true
-        status: SUPPORTED
+        status: supported
       mac_address:
         type: string
         description: HW MAC address to use for subinterface
         required: true
-        status: SUPPORTED
+        status: supported
       vlan_tag_list:
         type: list
         description: List of VLAN IDs to use for subinterfaces
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       aap_sec_untrusted_ip_prefix_len:
         type: string
         description: ip prefix length for the secondary DBE VM aap on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       vmac_address:
         type: string
         description: virtual MAC address to use for subinterface
         required: true
-        status: SUPPORTED
+        status: supported
       aap_untrusted_v6_ip_prefix_len:
         type: string
         description: ipv6 prefix length for the primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       aap_untrusted_ip_prefix_len:
         type: string
         description: ip prefix length for the primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_vdbe_untr_x_subport:
         capability: tosca.capabilities.Node
@@ -826,84 +826,84 @@ node_types:
         type: string
         description: ip prefix for primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       aap_sec_untrusted_ip_prefix:
         type: string
         description: ip prefix for secondary vDBE VM aap on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       ip_v6_address:
         type: string
         description: IPv6 address associated with subinterfaces
         required: true
-        status: SUPPORTED
+        status: supported
       counter:
         type: float
         description: Index of instance among multiple instances.  Use to retrieve correct parameter for this instance when passed all parameters for all instances.
         required: true
-        status: SUPPORTED
+        status: supported
       subinterfaces_name_prefix:
         type: string
         description: Combined with subinterface_instance_index, this is used as the name of the subinterface resource
         required: true
-        status: SUPPORTED
+        status: supported
       ip_address:
         type: string
         description: IPv4 address associated with subinterfaces
         required: true
-        status: SUPPORTED
+        status: supported
       aap_address_mode:
         type: string
         description: Address mode for the vDBE cluster IP
         required: true
-        status: SUPPORTED
+        status: supported
       aap_untrusted_v6_ip_prefix:
         type: string
         description: ipv6 prefix for the primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       parent_interface:
         type: string
         description: Parent Contrail interface
         required: true
-        status: SUPPORTED
+        status: supported
       vn_network_list:
         type: string
         description: List of Contrail VLAN networks to use for the subinterfaces.   The order and number of these must match the VLAN ID list
         required: true
-        status: SUPPORTED
+        status: supported
       mac_address:
         type: string
         description: HW MAC address to use for subinterface
         required: true
-        status: SUPPORTED
+        status: supported
       vlan_tag_list:
         type: list
         description: List of VLAN IDs to use for subinterfaces
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       aap_sec_untrusted_ip_prefix_len:
         type: string
         description: ip prefix length for the secondary DBE VM aap on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       vmac_address:
         type: string
         description: virtual MAC address to use for subinterface
         required: true
-        status: SUPPORTED
+        status: supported
       aap_untrusted_v6_ip_prefix_len:
         type: string
         description: ipv6 prefix length for the primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       aap_untrusted_ip_prefix_len:
         type: string
         description: ip prefix length for the primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_vdbe_untr_x_subport_another:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multipleVlanSameType/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multipleVlanSameType/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 14505714d0..19c6990a24 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multipleVlanSameType/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multipleVlanSameType/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -11,213 +11,213 @@ node_types:
       subinterface_vdbe_untr_1_subports_ip_address:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_vdbe_untr_1_subports_aap_sec_untrusted_ip_prefix:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_vdbe_untr_2_subports_aap_untrusted_v6_ip_prefix:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_vdbe_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_vdbe_untr_2_subports_aap_address_mode:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_vdbe_untr_2_subports_aap_untrusted_ip_prefix_len:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_vdbe_untr_1_subports_mac_address:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_vdbe_untr_1_subports_subinterfaces_name_prefix:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_vdbe_untr_1_subports_aap_untrusted_v6_ip_prefix_len:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_vdbe_metadata:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_vdbe_untr_1_port_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       subinterface_vdbe_untr_2_subports_counter:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: float
       subinterface_vdbe_untr_2_subports_vmac_address:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_vdbe_untr_1_subports_aap_address_mode:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_vdbe_untr_2_subports_vlan_tag_list:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_vdbe_untr_1_port_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_1_port_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_vdbe_untr_1_subports_vn_network_list:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_untr_1_port_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_vdbe_untr_2_subports_vn_network_list:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_vdbe_untr_1_subports_aap_untrusted_v6_ip_prefix:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_vdbe_untr_2_subports_ip_v6_address:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_untr_1_port_virtual_machine_interface_allowed_address_pairs:
         type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_vdbe_untr_2_subports_mac_address:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_vdbe_untr_2_subports_aap_untrusted_v6_ip_prefix_len:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_vdbe_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_untr_1_port_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_vdbe_untr_1_subports_aap_sec_untrusted_ip_prefix_len:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_vdbe_untr_2_subports_aap_sec_untrusted_ip_prefix_len:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_vdbe_untr_1_subports_vlan_tag_list:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       subinterface_vdbe_untr_2_subports_aap_untrusted_ip_prefix:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_vdbe_untr_1_subports_aap_untrusted_ip_prefix:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_untr_1_port_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       subinterface_vdbe_untr_1_subports_ip_v6_address:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_untr_1_port_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_1_port_virtual_network_refs:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       index_value:
@@ -225,83 +225,83 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       subinterface_vdbe_untr_1_subports_parent_interface:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_vdbe_untr_2_subports_service_template_filter_count:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: float
       subinterface_vdbe_untr_1_subports_service_template_filter_count:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: float
       port_vdbe_untr_1_port_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_vdbe_untr_2_subports_ip_address:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_vdbe_untr_1_subports_vmac_address:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_vdbe_untr_2_subports_subinterfaces_name_prefix:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_untr_1_port_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_vdbe_untr_2_subports_aap_sec_untrusted_ip_prefix:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_vdbe_untr_1_subports_aap_untrusted_ip_prefix_len:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_vdbe_untr_2_subports_parent_interface:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_untr_1_port_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_vdbe_untr_1_port_virtual_machine_interface_mac_addresses:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
     requirements:
@@ -708,84 +708,84 @@ node_types:
         type: string
         description: ip prefix for primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       aap_sec_untrusted_ip_prefix:
         type: string
         description: ip prefix for secondary vDBE VM aap on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       ip_v6_address:
         type: string
         description: IPv6 address associated with subinterfaces
         required: true
-        status: SUPPORTED
+        status: supported
       counter:
         type: float
         description: Index of instance among multiple instances.  Use to retrieve correct parameter for this instance when passed all parameters for all instances.
         required: true
-        status: SUPPORTED
+        status: supported
       subinterfaces_name_prefix:
         type: string
         description: Combined with subinterface_instance_index, this is used as the name of the subinterface resource
         required: true
-        status: SUPPORTED
+        status: supported
       ip_address:
         type: string
         description: IPv4 address associated with subinterfaces
         required: true
-        status: SUPPORTED
+        status: supported
       aap_address_mode:
         type: string
         description: Address mode for the vDBE cluster IP
         required: true
-        status: SUPPORTED
+        status: supported
       aap_untrusted_v6_ip_prefix:
         type: string
         description: ipv6 prefix for the primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       parent_interface:
         type: string
         description: Parent Contrail interface
         required: true
-        status: SUPPORTED
+        status: supported
       vn_network_list:
         type: string
         description: List of Contrail VLAN networks to use for the subinterfaces.   The order and number of these must match the VLAN ID list
         required: true
-        status: SUPPORTED
+        status: supported
       mac_address:
         type: string
         description: HW MAC address to use for subinterface
         required: true
-        status: SUPPORTED
+        status: supported
       vlan_tag_list:
         type: list
         description: List of VLAN IDs to use for subinterfaces
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       aap_sec_untrusted_ip_prefix_len:
         type: string
         description: ip prefix length for the secondary DBE VM aap on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       vmac_address:
         type: string
         description: virtual MAC address to use for subinterface
         required: true
-        status: SUPPORTED
+        status: supported
       aap_untrusted_v6_ip_prefix_len:
         type: string
         description: ipv6 prefix length for the primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       aap_untrusted_ip_prefix_len:
         type: string
         description: ip prefix length for the primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_vdbe_untr_x_subport:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/notBoundToParentPort/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/notBoundToParentPort/out/GlobalSubstitutionTypesServiceTemplate.yaml
index a11bbd4092..41f523b90c 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/notBoundToParentPort/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/notBoundToParentPort/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -11,99 +11,99 @@ node_types:
       port_vdbe_untr_1_port_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_1_port_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       compute_vdbe_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_untr_1_port_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_vdbe_untr_1_port_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_1_port_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_1_port_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_1_port_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_1_port_virtual_machine_interface_allowed_address_pairs:
         type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs
         required: true
-        status: SUPPORTED
+        status: supported
       compute_vdbe_metadata:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_vdbe_untr_1_port_virtual_network_refs:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_vdbe_untr_1_port_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       compute_vdbe_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_untr_1_port_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_1_port_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_vdbe_untr_1_port_virtual_machine_interface_mac_addresses:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
     requirements:
@@ -450,84 +450,84 @@ node_types:
         type: string
         description: ip prefix for primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       aap_sec_untrusted_ip_prefix:
         type: string
         description: ip prefix for secondary vDBE VM aap on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       ip_v6_address:
         type: string
         description: IPv6 address associated with subinterfaces
         required: true
-        status: SUPPORTED
+        status: supported
       counter:
         type: float
         description: Index of instance among multiple instances.  Use to retrieve correct parameter for this instance when passed all parameters for all instances.
         required: true
-        status: SUPPORTED
+        status: supported
       subinterfaces_name_prefix:
         type: string
         description: Combined with subinterface_instance_index, this is used as the name of the subinterface resource
         required: true
-        status: SUPPORTED
+        status: supported
       ip_address:
         type: string
         description: IPv4 address associated with subinterfaces
         required: true
-        status: SUPPORTED
+        status: supported
       aap_address_mode:
         type: string
         description: Address mode for the vDBE cluster IP
         required: true
-        status: SUPPORTED
+        status: supported
       aap_untrusted_v6_ip_prefix:
         type: string
         description: ipv6 prefix for the primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       parent_interface:
         type: string
         description: Parent Contrail interface
         required: true
-        status: SUPPORTED
+        status: supported
       vn_network_list:
         type: string
         description: List of Contrail VLAN networks to use for the subinterfaces.   The order and number of these must match the VLAN ID list
         required: true
-        status: SUPPORTED
+        status: supported
       mac_address:
         type: string
         description: HW MAC address to use for subinterface
         required: true
-        status: SUPPORTED
+        status: supported
       vlan_tag_list:
         type: list
         description: List of VLAN IDs to use for subinterfaces
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       aap_sec_untrusted_ip_prefix_len:
         type: string
         description: ip prefix length for the secondary DBE VM aap on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       vmac_address:
         type: string
         description: virtual MAC address to use for subinterface
         required: true
-        status: SUPPORTED
+        status: supported
       aap_untrusted_v6_ip_prefix_len:
         type: string
         description: ipv6 prefix length for the primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       aap_untrusted_ip_prefix_len:
         type: string
         description: ip prefix length for the primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_vdbe_untr_x_subport:
         capability: tosca.capabilities.Node
@@ -562,84 +562,84 @@ node_types:
         type: string
         description: ip prefix for primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       aap_sec_untrusted_ip_prefix:
         type: string
         description: ip prefix for secondary vDBE VM aap on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       ip_v6_address:
         type: string
         description: IPv6 address associated with subinterfaces
         required: true
-        status: SUPPORTED
+        status: supported
       counter:
         type: float
         description: Index of instance among multiple instances.  Use to retrieve correct parameter for this instance when passed all parameters for all instances.
         required: true
-        status: SUPPORTED
+        status: supported
       subinterfaces_name_prefix:
         type: string
         description: Combined with subinterface_instance_index, this is used as the name of the subinterface resource
         required: true
-        status: SUPPORTED
+        status: supported
       ip_address:
         type: string
         description: IPv4 address associated with subinterfaces
         required: true
-        status: SUPPORTED
+        status: supported
       aap_address_mode:
         type: string
         description: Address mode for the vDBE cluster IP
         required: true
-        status: SUPPORTED
+        status: supported
       aap_untrusted_v6_ip_prefix:
         type: string
         description: ipv6 prefix for the primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       parent_interface:
         type: string
         description: Parent Contrail interface
         required: true
-        status: SUPPORTED
+        status: supported
       vn_network_list:
         type: string
         description: List of Contrail VLAN networks to use for the subinterfaces.   The order and number of these must match the VLAN ID list
         required: true
-        status: SUPPORTED
+        status: supported
       mac_address:
         type: string
         description: HW MAC address to use for subinterface
         required: true
-        status: SUPPORTED
+        status: supported
       vlan_tag_list:
         type: list
         description: List of VLAN IDs to use for subinterfaces
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       aap_sec_untrusted_ip_prefix_len:
         type: string
         description: ip prefix length for the secondary DBE VM aap on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       vmac_address:
         type: string
         description: virtual MAC address to use for subinterface
         required: true
-        status: SUPPORTED
+        status: supported
       aap_untrusted_v6_ip_prefix_len:
         type: string
         description: ipv6 prefix length for the primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       aap_untrusted_ip_prefix_len:
         type: string
         description: ip prefix length for the primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
   org.openecomp.resource.abstract.nodes.heat.nested3:
     derived_from: org.openecomp.resource.abstract.nodes.AbstractSubstitute
     properties:
@@ -647,84 +647,84 @@ node_types:
         type: string
         description: ip prefix for primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       aap_sec_untrusted_ip_prefix:
         type: string
         description: ip prefix for secondary vDBE VM aap on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       ip_v6_address:
         type: string
         description: IPv6 address associated with subinterfaces
         required: true
-        status: SUPPORTED
+        status: supported
       counter:
         type: float
         description: Index of instance among multiple instances.  Use to retrieve correct parameter for this instance when passed all parameters for all instances.
         required: true
-        status: SUPPORTED
+        status: supported
       subinterfaces_name_prefix:
         type: string
         description: Combined with subinterface_instance_index, this is used as the name of the subinterface resource
         required: true
-        status: SUPPORTED
+        status: supported
       ip_address:
         type: string
         description: IPv4 address associated with subinterfaces
         required: true
-        status: SUPPORTED
+        status: supported
       aap_address_mode:
         type: string
         description: Address mode for the vDBE cluster IP
         required: true
-        status: SUPPORTED
+        status: supported
       aap_untrusted_v6_ip_prefix:
         type: string
         description: ipv6 prefix for the primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       parent_interface:
         type: string
         description: Parent Contrail interface
         required: true
-        status: SUPPORTED
+        status: supported
       vn_network_list:
         type: string
         description: List of Contrail VLAN networks to use for the subinterfaces.   The order and number of these must match the VLAN ID list
         required: true
-        status: SUPPORTED
+        status: supported
       mac_address:
         type: string
         description: HW MAC address to use for subinterface
         required: true
-        status: SUPPORTED
+        status: supported
       vlan_tag_list:
         type: list
         description: List of VLAN IDs to use for subinterfaces
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       aap_sec_untrusted_ip_prefix_len:
         type: string
         description: ip prefix length for the secondary DBE VM aap on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       vmac_address:
         type: string
         description: virtual MAC address to use for subinterface
         required: true
-        status: SUPPORTED
+        status: supported
       aap_untrusted_v6_ip_prefix_len:
         type: string
         description: ipv6 prefix length for the primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       aap_untrusted_ip_prefix_len:
         type: string
         description: ip prefix length for the primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_vdbe_untr_x_subport_missing_vlan_tag:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/regularNestedSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/regularNestedSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 094898920f..d20184d014 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/regularNestedSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/regularNestedSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -11,201 +11,201 @@ node_types:
       subinterface_nested_parent_interface:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_nested_aap_address_mode:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_nested_vlan_tag_list:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       compute_vdbe_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_untr_1_port_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       subinterface_nested_service_template_filter_count:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: float
       subinterface_nested_aap_untrusted_v6_ip_prefix_len:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_nested_aap_untrusted_ip_prefix:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_1_port_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_nested_aap_sec_untrusted_ip_prefix_len:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_nested_aap_sec_untrusted_ip_prefix:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_nested_aap_untrusted_v6_ip_prefix:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_vdbe_metadata:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       subinterface_nested_mac_address:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_untr_1_port_virtual_network_refs:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_vdbe_untr_1_port_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       subinterface_nested_ip_address:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_nested_ip_v6_address:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_untr_1_port_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_1_port_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       subinterface_nested_vmac_address:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_nested_vn_network_list:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_untr_1_port_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_1_port_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_1_port_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_untr_1_port_virtual_machine_interface_allowed_address_pairs:
         type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_nested_aap_untrusted_ip_prefix_len:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_nested_counter:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: float
       subinterface_nested_subinterfaces_name_prefix:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_vdbe_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_untr_1_port_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_1_port_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_vdbe_untr_1_port_virtual_machine_interface_mac_addresses:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
     requirements:
@@ -582,84 +582,84 @@ node_types:
         type: string
         description: ip prefix for primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       aap_sec_untrusted_ip_prefix:
         type: string
         description: ip prefix for secondary vDBE VM aap on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       ip_v6_address:
         type: string
         description: IPv6 address associated with subinterfaces
         required: true
-        status: SUPPORTED
+        status: supported
       counter:
         type: float
         description: Index of instance among multiple instances.  Use to retrieve correct parameter for this instance when passed all parameters for all instances.
         required: true
-        status: SUPPORTED
+        status: supported
       subinterfaces_name_prefix:
         type: string
         description: Combined with subinterface_instance_index, this is used as the name of the subinterface resource
         required: true
-        status: SUPPORTED
+        status: supported
       ip_address:
         type: string
         description: IPv4 address associated with subinterfaces
         required: true
-        status: SUPPORTED
+        status: supported
       aap_address_mode:
         type: string
         description: Address mode for the vDBE cluster IP
         required: true
-        status: SUPPORTED
+        status: supported
       aap_untrusted_v6_ip_prefix:
         type: string
         description: ipv6 prefix for the primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       parent_interface:
         type: string
         description: Parent Contrail interface
         required: true
-        status: SUPPORTED
+        status: supported
       vn_network_list:
         type: string
         description: List of Contrail VLAN networks to use for the subinterfaces.   The order and number of these must match the VLAN ID list
         required: true
-        status: SUPPORTED
+        status: supported
       mac_address:
         type: string
         description: HW MAC address to use for subinterface
         required: true
-        status: SUPPORTED
+        status: supported
       vlan_tag_list:
         type: list
         description: List of VLAN IDs to use for subinterfaces
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       aap_sec_untrusted_ip_prefix_len:
         type: string
         description: ip prefix length for the secondary DBE VM aap on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       vmac_address:
         type: string
         description: virtual MAC address to use for subinterface
         required: true
-        status: SUPPORTED
+        status: supported
       aap_untrusted_v6_ip_prefix_len:
         type: string
         description: ipv6 prefix length for the primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       aap_untrusted_ip_prefix_len:
         type: string
         description: ip prefix length for the primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_vdbe_untr_x_subport:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/subInterfaceGetAttrInOut/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/subInterfaceGetAttrInOut/out/GlobalSubstitutionTypesServiceTemplate.yaml
index ffaaf60a01..9656fb2ede 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/subInterfaceGetAttrInOut/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/subInterfaceGetAttrInOut/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -11,204 +11,204 @@ node_types:
       subinterface_nested_parent_interface:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_nested_aap_address_mode:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_nested_vlan_tag_list:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_vdbe_untr_1_port_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       subinterface_nested_service_template_filter_count:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: float
       subinterface_nested_aap_untrusted_v6_ip_prefix_len:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_nested_aap_untrusted_ip_prefix:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_1_port_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_nested_vdbe_subport_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_nested_aap_sec_untrusted_ip_prefix_len:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_nested_aap_sec_untrusted_ip_prefix:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_nested_aap_untrusted_v6_ip_prefix:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_vdbe_metadata:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       subinterface_nested_mac_address:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_untr_1_port_virtual_network_refs:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_vdbe_untr_1_port_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       subinterface_nested_ip_address:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_nested_ip_v6_address:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_untr_1_port_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_1_port_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       subinterface_nested_vmac_address:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_untr_1_port_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_1_port_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_1_port_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_untr_1_port_virtual_machine_interface_allowed_address_pairs:
         type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_nested_aap_untrusted_ip_prefix_len:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_nested_counter:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: float
       subinterface_nested_subinterfaces_name_prefix:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_vdbe_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_untr_1_port_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_1_port_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_vdbe_untr_1_port_virtual_machine_interface_mac_addresses:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
     attributes:
       vdbe_vdbe_untr_1_port_nested_aap_address_mode:
         type: string
-        status: SUPPORTED
+        status: supported
       vdbe_vdbe_untr_1_port_nested_vlan_tag_list:
         type: list
-        status: SUPPORTED
+        status: supported
         entry_schema: &id001
           type: string
     requirements:
@@ -585,83 +585,83 @@ node_types:
         type: string
         description: ip prefix for primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       aap_sec_untrusted_ip_prefix:
         type: string
         description: ip prefix for secondary vDBE VM aap on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       vdbe_subport_network:
         type: string
         description: List of Contrail VLAN networks to use for the subinterfaces.   The order and number of these must match the VLAN ID list
         required: true
-        status: SUPPORTED
+        status: supported
       ip_v6_address:
         type: string
         description: IPv6 address associated with subinterfaces
         required: true
-        status: SUPPORTED
+        status: supported
       counter:
         type: float
         description: Index of instance among multiple instances.  Use to retrieve correct parameter for this instance when passed all parameters for all instances.
         required: true
-        status: SUPPORTED
+        status: supported
       subinterfaces_name_prefix:
         type: string
         description: Combined with subinterface_instance_index, this is used as the name of the subinterface resource
         required: true
-        status: SUPPORTED
+        status: supported
       ip_address:
         type: string
         description: IPv4 address associated with subinterfaces
         required: true
-        status: SUPPORTED
+        status: supported
       aap_address_mode:
         type: string
         description: Address mode for the vDBE cluster IP
         required: true
-        status: SUPPORTED
+        status: supported
       aap_untrusted_v6_ip_prefix:
         type: string
         description: ipv6 prefix for the primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       parent_interface:
         type: string
         description: Parent Contrail interface
         required: true
-        status: SUPPORTED
+        status: supported
       mac_address:
         type: string
         description: HW MAC address to use for subinterface
         required: true
-        status: SUPPORTED
+        status: supported
       vlan_tag_list:
         type: list
         description: List of VLAN IDs to use for subinterfaces
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema: *id001
       aap_sec_untrusted_ip_prefix_len:
         type: string
         description: ip prefix length for the secondary DBE VM aap on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       vmac_address:
         type: string
         description: virtual MAC address to use for subinterface
         required: true
-        status: SUPPORTED
+        status: supported
       aap_untrusted_v6_ip_prefix_len:
         type: string
         description: ipv6 prefix length for the primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       aap_untrusted_ip_prefix_len:
         type: string
         description: ip prefix length for the primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_vdbe_untr_x_subport:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/subInterfaceNodesConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/subInterfaceNodesConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 613e041f29..35e337502b 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/subInterfaceNodesConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/subInterfaceNodesConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -11,201 +11,201 @@ node_types:
       subinterface_nested_parent_interface:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_nested_aap_address_mode:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_nested_vlan_tag_list:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       compute_vdbe_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_untr_1_port_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       subinterface_nested_service_template_filter_count:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: float
       subinterface_nested_aap_untrusted_v6_ip_prefix_len:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_nested_aap_untrusted_ip_prefix:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_1_port_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_nested_vdbe_subport_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_nested_aap_sec_untrusted_ip_prefix_len:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_nested_aap_sec_untrusted_ip_prefix:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_nested_aap_untrusted_v6_ip_prefix:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_vdbe_metadata:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       subinterface_nested_mac_address:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_untr_1_port_virtual_network_refs:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_vdbe_untr_1_port_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       subinterface_nested_ip_address:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_nested_ip_v6_address:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_untr_1_port_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_1_port_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       subinterface_nested_vmac_address:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_untr_1_port_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_1_port_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_1_port_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_untr_1_port_virtual_machine_interface_allowed_address_pairs:
         type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_nested_aap_untrusted_ip_prefix_len:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_nested_counter:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: float
       subinterface_nested_subinterfaces_name_prefix:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_vdbe_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_untr_1_port_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_1_port_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_vdbe_untr_1_port_virtual_machine_interface_mac_addresses:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
     requirements:
@@ -582,84 +582,84 @@ node_types:
         type: string
         description: ip prefix for primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       aap_sec_untrusted_ip_prefix:
         type: string
         description: ip prefix for secondary vDBE VM aap on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       vdbe_subport_network:
         type: string
         description: List of Contrail VLAN networks to use for the subinterfaces.   The order and number of these must match the VLAN ID list
         required: true
-        status: SUPPORTED
+        status: supported
       ip_v6_address:
         type: string
         description: IPv6 address associated with subinterfaces
         required: true
-        status: SUPPORTED
+        status: supported
       counter:
         type: float
         description: Index of instance among multiple instances.  Use to retrieve correct parameter for this instance when passed all parameters for all instances.
         required: true
-        status: SUPPORTED
+        status: supported
       subinterfaces_name_prefix:
         type: string
         description: Combined with subinterface_instance_index, this is used as the name of the subinterface resource
         required: true
-        status: SUPPORTED
+        status: supported
       ip_address:
         type: string
         description: IPv4 address associated with subinterfaces
         required: true
-        status: SUPPORTED
+        status: supported
       aap_address_mode:
         type: string
         description: Address mode for the vDBE cluster IP
         required: true
-        status: SUPPORTED
+        status: supported
       aap_untrusted_v6_ip_prefix:
         type: string
         description: ipv6 prefix for the primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       parent_interface:
         type: string
         description: Parent Contrail interface
         required: true
-        status: SUPPORTED
+        status: supported
       mac_address:
         type: string
         description: HW MAC address to use for subinterface
         required: true
-        status: SUPPORTED
+        status: supported
       vlan_tag_list:
         type: list
         description: List of VLAN IDs to use for subinterfaces
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       aap_sec_untrusted_ip_prefix_len:
         type: string
         description: ip prefix length for the secondary DBE VM aap on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       vmac_address:
         type: string
         description: virtual MAC address to use for subinterface
         required: true
-        status: SUPPORTED
+        status: supported
       aap_untrusted_v6_ip_prefix_len:
         type: string
         description: ipv6 prefix length for the primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       aap_untrusted_ip_prefix_len:
         type: string
         description: ip prefix length for the primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_vdbe_untr_x_subport:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/subInterfaceNodesConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/subInterfaceNodesConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 9a248e4a89..0990667711 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/subInterfaceNodesConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/subInterfaceNodesConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -11,195 +11,195 @@ node_types:
       subinterface_nested_parent_interface:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_nested_aap_address_mode:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_nested_vlan_tag_list:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       compute_vdbe_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_untr_1_port_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       subinterface_nested_service_template_filter_count:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: float
       subinterface_nested_aap_untrusted_v6_ip_prefix_len:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_nested_aap_untrusted_ip_prefix:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_1_port_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_nested_vdbe_subport_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_nested_aap_sec_untrusted_ip_prefix_len:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_nested_aap_sec_untrusted_ip_prefix:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_nested_aap_untrusted_v6_ip_prefix:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_vdbe_metadata:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       subinterface_nested_mac_address:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_untr_1_port_virtual_network_refs:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_vdbe_untr_1_port_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       subinterface_nested_ip_address:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_nested_ip_v6_address:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_untr_1_port_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_1_port_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       subinterface_nested_vmac_address:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_untr_1_port_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_1_port_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_1_port_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_untr_1_port_virtual_machine_interface_allowed_address_pairs:
         type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_nested_aap_untrusted_ip_prefix_len:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_nested_subinterfaces_name_prefix:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_vdbe_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_untr_1_port_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_1_port_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_vdbe_untr_1_port_virtual_machine_interface_mac_addresses:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
     requirements:
@@ -576,84 +576,84 @@ node_types:
         type: string
         description: ip prefix for primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       aap_sec_untrusted_ip_prefix:
         type: string
         description: ip prefix for secondary vDBE VM aap on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       vdbe_subport_network:
         type: string
         description: List of Contrail VLAN networks to use for the subinterfaces.   The order and number of these must match the VLAN ID list
         required: true
-        status: SUPPORTED
+        status: supported
       ip_v6_address:
         type: string
         description: IPv6 address associated with subinterfaces
         required: true
-        status: SUPPORTED
+        status: supported
       counter:
         type: float
         description: Index of instance among multiple instances.  Use to retrieve correct parameter for this instance when passed all parameters for all instances.
         required: true
-        status: SUPPORTED
+        status: supported
       subinterfaces_name_prefix:
         type: string
         description: Combined with subinterface_instance_index, this is used as the name of the subinterface resource
         required: true
-        status: SUPPORTED
+        status: supported
       ip_address:
         type: string
         description: IPv4 address associated with subinterfaces
         required: true
-        status: SUPPORTED
+        status: supported
       aap_address_mode:
         type: string
         description: Address mode for the vDBE cluster IP
         required: true
-        status: SUPPORTED
+        status: supported
       aap_untrusted_v6_ip_prefix:
         type: string
         description: ipv6 prefix for the primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       parent_interface:
         type: string
         description: Parent Contrail interface
         required: true
-        status: SUPPORTED
+        status: supported
       mac_address:
         type: string
         description: HW MAC address to use for subinterface
         required: true
-        status: SUPPORTED
+        status: supported
       vlan_tag_list:
         type: list
         description: List of VLAN IDs to use for subinterfaces
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       aap_sec_untrusted_ip_prefix_len:
         type: string
         description: ip prefix length for the secondary DBE VM aap on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       vmac_address:
         type: string
         description: virtual MAC address to use for subinterface
         required: true
-        status: SUPPORTED
+        status: supported
       aap_untrusted_v6_ip_prefix_len:
         type: string
         description: ipv6 prefix length for the primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       aap_untrusted_ip_prefix_len:
         type: string
         description: ip prefix length for the primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_vdbe_untr_x_subport:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/twoPortOnlyOneConnectedWithSubInf/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/twoPortOnlyOneConnectedWithSubInf/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 1fd158a6c8..31531f27ac 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/twoPortOnlyOneConnectedWithSubInf/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/twoPortOnlyOneConnectedWithSubInf/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -11,179 +11,179 @@ node_types:
       subinterface_nested1_aap_untrusted_v6_ip_prefix_len:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_nested1_aap_address_mode:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_nested1_vn_network_list:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_vdbe_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_untr_port_1_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_untr_port_1_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_port_1_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_port_1_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_nested1_vmac_address:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_nested1_ip_address:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_nested1_subinterfaces_name_prefix:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_vdbe_metadata:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       subinterface_nested1_service_template_filter_count:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: float
       subinterface_nested1_aap_untrusted_v6_ip_prefix:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_nested1_parent_interface:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_untr_port_1_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       subinterface_nested1_aap_untrusted_ip_prefix_len:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_nested1_ip_v6_address:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_untr_port_1_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_vdbe_untr_port_1_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_port_1_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_port_1_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       port_vdbe_untr_port_1_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       subinterface_nested1_mac_address:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_nested1_aap_untrusted_ip_prefix:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_nested1_aap_sec_untrusted_ip_prefix_len:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_nested1_vlan_tag_list:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       compute_vdbe_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_nested1_aap_sec_untrusted_ip_prefix:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
     requirements:
@@ -565,84 +565,84 @@ node_types:
         type: string
         description: ip prefix for primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       aap_sec_untrusted_ip_prefix:
         type: string
         description: ip prefix for secondary vDBE VM aap on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       ip_v6_address:
         type: string
         description: IPv6 address associated with subinterfaces
         required: true
-        status: SUPPORTED
+        status: supported
       counter:
         type: float
         description: Index of instance among multiple instances.  Use to retrieve correct parameter for this instance when passed all parameters for all instances.
         required: true
-        status: SUPPORTED
+        status: supported
       subinterfaces_name_prefix:
         type: string
         description: Combined with subinterface_instance_index, this is used as the name of the subinterface resource
         required: true
-        status: SUPPORTED
+        status: supported
       ip_address:
         type: string
         description: IPv4 address associated with subinterfaces
         required: true
-        status: SUPPORTED
+        status: supported
       aap_address_mode:
         type: string
         description: Address mode for the vDBE cluster IP
         required: true
-        status: SUPPORTED
+        status: supported
       aap_untrusted_v6_ip_prefix:
         type: string
         description: ipv6 prefix for the primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       parent_interface:
         type: string
         description: Parent Contrail interface
         required: true
-        status: SUPPORTED
+        status: supported
       vn_network_list:
         type: string
         description: List of Contrail VLAN networks to use for the subinterfaces.   The order and number of these must match the VLAN ID list
         required: true
-        status: SUPPORTED
+        status: supported
       mac_address:
         type: string
         description: HW MAC address to use for subinterface
         required: true
-        status: SUPPORTED
+        status: supported
       vlan_tag_list:
         type: list
         description: List of VLAN IDs to use for subinterfaces
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       aap_sec_untrusted_ip_prefix_len:
         type: string
         description: ip prefix length for the secondary DBE VM aap on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       vmac_address:
         type: string
         description: virtual MAC address to use for subinterface
         required: true
-        status: SUPPORTED
+        status: supported
       aap_untrusted_v6_ip_prefix_len:
         type: string
         description: ipv6 prefix length for the primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       aap_untrusted_ip_prefix_len:
         type: string
         description: ip prefix length for the primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_vdbe_0_subint_untr_vmi_0:
         capability: tosca.capabilities.Node
@@ -676,7 +676,7 @@ node_types:
       port_vdbe_untr_port_2_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       index_value:
@@ -684,77 +684,77 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       compute_vdbe_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_untr_port_2_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_port_2_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_port_2_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_port_2_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_vdbe_untr_port_2_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_vdbe_untr_port_2_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_port_2_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_untr_port_2_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_vdbe_metadata:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       compute_vdbe_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_untr_port_2_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_vdbe_vdbe_untr_port_2:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/diffComputeSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/diffComputeSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml
index fd261d6cf3..6ec677877a 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/diffComputeSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/diffComputeSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -11,31 +11,31 @@ node_types:
       port_pd01_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd01_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_pd01_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       index_value:
@@ -43,69 +43,69 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       compute_pd_server_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_pd_server_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_nested_service_template_filter_count:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: float
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_nested_p1:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd01_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_nested_net1:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd01_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_pd01_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_pd_server_user_data_format:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
     requirements:
@@ -486,48 +486,48 @@ node_types:
       vlan_ids:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       p1:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       p2:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       virtual_ipv6_address:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       virtual_ip_address:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       net2:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       lb_st_vlan_type_oam:
         type: string
         description: dummy
         required: true
-        status: SUPPORTED
+        status: supported
       mac_address:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       net1:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_name_prefix:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_instance_index:
         type: float
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_template_Vlan_1:
         capability: tosca.capabilities.Node
@@ -561,29 +561,29 @@ node_types:
       compute_ps_server_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_ps01_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_ps_server_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_ps_server_user_data_format:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_ps01_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       index_value:
@@ -591,71 +591,71 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       port_ps01_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       subinterface_nested_service_template_filter_count:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: float
       port_ps01_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_nested_p1:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_ps01_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps01_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps01_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps01_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps01_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps01_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       subinterface_nested_net1:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
     requirements:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/onePortIsConnectedWithSubInf/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/onePortIsConnectedWithSubInf/out/GlobalSubstitutionTypesServiceTemplate.yaml
index f31af57507..ea201ba913 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/onePortIsConnectedWithSubInf/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/onePortIsConnectedWithSubInf/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -11,7 +11,7 @@ node_types:
       port_pd01_port_1_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       index_value:
@@ -19,75 +19,75 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       compute_pd_server_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_pd_server_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd01_port_1_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_1_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_1_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_1_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_pd01_port_1_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_1_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_1_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_1_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_1_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_pd_server_user_data_format:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
     requirements:
@@ -438,31 +438,31 @@ node_types:
       port_pd01_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd01_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_pd01_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       index_value:
@@ -470,69 +470,69 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       compute_pd_server_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_pd_server_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_nested_service_template_filter_count:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: float
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_nested_p1:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd01_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_nested_net1:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd01_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_pd01_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_pd_server_user_data_format:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
     requirements:
@@ -913,48 +913,48 @@ node_types:
       vlan_ids:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       p1:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       p2:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       virtual_ipv6_address:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       virtual_ip_address:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       net2:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       lb_st_vlan_type_oam:
         type: string
         description: dummy
         required: true
-        status: SUPPORTED
+        status: supported
       mac_address:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       net1:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_name_prefix:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_instance_index:
         type: float
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_template_Vlan_vmi_1:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/regularNestedSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/regularNestedSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml
index fd261d6cf3..6ec677877a 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/regularNestedSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/regularNestedSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -11,31 +11,31 @@ node_types:
       port_pd01_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd01_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_pd01_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       index_value:
@@ -43,69 +43,69 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       compute_pd_server_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_pd_server_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_nested_service_template_filter_count:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: float
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_nested_p1:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd01_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_nested_net1:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd01_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_pd01_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_pd_server_user_data_format:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
     requirements:
@@ -486,48 +486,48 @@ node_types:
       vlan_ids:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       p1:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       p2:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       virtual_ipv6_address:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       virtual_ip_address:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       net2:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       lb_st_vlan_type_oam:
         type: string
         description: dummy
         required: true
-        status: SUPPORTED
+        status: supported
       mac_address:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       net1:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_name_prefix:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_instance_index:
         type: float
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_template_Vlan_1:
         capability: tosca.capabilities.Node
@@ -561,29 +561,29 @@ node_types:
       compute_ps_server_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_ps01_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_ps_server_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_ps_server_user_data_format:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_ps01_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       index_value:
@@ -591,71 +591,71 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       port_ps01_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       subinterface_nested_service_template_filter_count:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: float
       port_ps01_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_nested_p1:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_ps01_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps01_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps01_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps01_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps01_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps01_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       subinterface_nested_net1:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
     requirements:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeDiffPortSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeDiffPortSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 0c17a3cd9b..8255fa889f 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeDiffPortSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeDiffPortSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -11,11 +11,11 @@ node_types:
       port_ps01_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps01_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       index_value:
@@ -23,89 +23,89 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       compute_pd_server_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_pd_server_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_ps01_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       subinterface_nested_service_template_filter_count:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: float
       port_ps01_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_nested_p1:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_ps01_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps01_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps01_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps01_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps01_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps01_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       subinterface_nested_net1:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_pd_server_user_data_format:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
     requirements:
@@ -486,31 +486,31 @@ node_types:
       port_pd01_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd01_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_pd01_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       index_value:
@@ -518,69 +518,69 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       compute_pd_server_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_pd_server_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_nested_service_template_filter_count:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: float
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_nested_p1:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd01_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_nested_net1:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd01_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_pd01_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_pd_server_user_data_format:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
     requirements:
@@ -961,48 +961,48 @@ node_types:
       vlan_ids:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       p1:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       p2:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       virtual_ipv6_address:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       virtual_ip_address:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       net2:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       lb_st_vlan_type_oam:
         type: string
         description: dummy
         required: true
-        status: SUPPORTED
+        status: supported
       mac_address:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       net1:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_name_prefix:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_instance_index:
         type: float
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_template_Vlan_vmi_1:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeSamePortDiffSubInterfaceFile/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeSamePortDiffSubInterfaceFile/out/GlobalSubstitutionTypesServiceTemplate.yaml
index f31af57507..ea201ba913 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeSamePortDiffSubInterfaceFile/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeSamePortDiffSubInterfaceFile/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -11,7 +11,7 @@ node_types:
       port_pd01_port_1_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       index_value:
@@ -19,75 +19,75 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       compute_pd_server_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_pd_server_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd01_port_1_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_1_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_1_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_1_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_pd01_port_1_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_1_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_1_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_1_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_1_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_pd_server_user_data_format:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
     requirements:
@@ -438,31 +438,31 @@ node_types:
       port_pd01_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd01_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_pd01_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       index_value:
@@ -470,69 +470,69 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       compute_pd_server_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_pd_server_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_nested_service_template_filter_count:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: float
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd01_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_nested_p1:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd01_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_nested_net1:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd01_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_pd01_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_pd_server_user_data_format:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
     requirements:
@@ -913,48 +913,48 @@ node_types:
       vlan_ids:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       p1:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       p2:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       virtual_ipv6_address:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       virtual_ip_address:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       net2:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       lb_st_vlan_type_oam:
         type: string
         description: dummy
         required: true
-        status: SUPPORTED
+        status: supported
       mac_address:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       net1:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_name_prefix:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_instance_index:
         type: float
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_template_Vlan_vmi_1:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/allConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/allConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 0156a9af57..e3ac44e287 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/allConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/allConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -11,277 +11,277 @@ node_types:
       port_vdbe_untr_1_port_1_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_1_port_1_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_vlan1_aap_untrusted_v6_ip_prefix:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_untr_2_port_1_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_1_port_1_virtual_machine_interface_mac_addresses:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       subinterface_vlan1_aap_sec_untrusted_ip_prefix:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_vdbe_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_untr_1_port_1_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_1_port_1_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_vdbe_untr_1_port_1_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_untr_2_port_1_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_untr_2_port_1_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       subinterface_vlan1_counter:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: float
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_vdbe_metadata:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       subinterface_vlan1_aap_untrusted_v6_ip_prefix_len:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_untr_2_port_1_virtual_machine_interface_mac_addresses:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_vdbe_untr_2_port_1_virtual_machine_interface_allowed_address_pairs:
         type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_2_port_1_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_1_port_1_virtual_machine_interface_allowed_address_pairs:
         type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_vlan1_mac_address:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_vlan1_aap_untrusted_ip_prefix_len:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_untr_1_port_1_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_vlan1_ip_address:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_vdbe_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_untr_2_port_1_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_2_port_1_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_2_port_1_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_vdbe_untr_2_port_1_virtual_network_refs:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_vdbe_untr_2_port_1_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_vlan1_ip_v6_address:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_vlan1_aap_untrusted_ip_prefix:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_untr_1_port_1_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_vlan1_subinterfaces_name_prefix:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_untr_1_port_1_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_vlan1_vn_network_list:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_untr_1_port_1_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       subinterface_vlan1_service_template_filter_count:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: float
       subinterface_vlan1_parent_interface:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_vlan1_aap_address_mode:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_untr_2_port_1_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       subinterface_vlan1_optional_property_1:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_untr_2_port_1_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_vdbe_untr_1_port_1_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       subinterface_vlan1_optional_property_2:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_vlan1_aap_sec_untrusted_ip_prefix_len:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_untr_1_port_1_virtual_network_refs:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       subinterface_vlan1_vlan_tag_list:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
     attributes:
       vdbe_vdbe_untr_1_port_1_vlan1_aap_address_mode:
         type: string
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_vdbe:
         capability: tosca.capabilities.Node
@@ -735,94 +735,94 @@ node_types:
         type: string
         description: ip prefix for primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       aap_sec_untrusted_ip_prefix:
         type: string
         description: ip prefix for secondary vDBE VM aap on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       ip_v6_address:
         type: string
         description: IPv6 address associated with subinterfaces
         required: true
-        status: SUPPORTED
+        status: supported
       counter:
         type: float
         description: Index of instance among multiple instances.  Use to retrieve correct parameter for this instance when passed all parameters for all instances.
         required: true
-        status: SUPPORTED
+        status: supported
       subinterfaces_name_prefix:
         type: string
         description: Combined with subinterface_instance_index, this is used as the name of the subinterface resource
         required: true
-        status: SUPPORTED
+        status: supported
       ip_address:
         type: string
         description: IPv4 address associated with subinterfaces
         required: true
-        status: SUPPORTED
+        status: supported
       aap_address_mode:
         type: string
         description: Address mode for the vDBE cluster IP
         required: true
-        status: SUPPORTED
+        status: supported
       aap_untrusted_v6_ip_prefix:
         type: string
         description: ipv6 prefix for the primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       parent_interface:
         type: string
         description: Parent Contrail interface
         required: true
-        status: SUPPORTED
+        status: supported
       vn_network_list:
         type: string
         description: List of Contrail VLAN networks to use for the subinterfaces.   The order and number of these must match the VLAN ID list
         required: true
-        status: SUPPORTED
+        status: supported
       optional_property_1:
         type: string
         description: Optional property
         required: true
-        status: SUPPORTED
+        status: supported
       optional_property_2:
         type: string
         description: Optional property
         required: true
-        status: SUPPORTED
+        status: supported
       mac_address:
         type: string
         description: HW MAC address to use for subinterface
         required: true
-        status: SUPPORTED
+        status: supported
       vlan_tag_list:
         type: list
         description: List of VLAN IDs to use for subinterfaces
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       aap_sec_untrusted_ip_prefix_len:
         type: string
         description: ip prefix length for the secondary DBE VM aap on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       vmac_address:
         type: string
         description: virtual MAC address to use for subinterface
         required: true
-        status: SUPPORTED
+        status: supported
       aap_untrusted_v6_ip_prefix_len:
         type: string
         description: ipv6 prefix length for the primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       aap_untrusted_ip_prefix_len:
         type: string
         description: ip prefix length for the primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_vdbe_untr_x_vlan1-Network-Role_vmi_subport:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/multiplePortsMultipleVlans/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/multiplePortsMultipleVlans/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 52446f0fb1..d351a7d655 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/multiplePortsMultipleVlans/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/multiplePortsMultipleVlans/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -11,301 +11,301 @@ node_types:
       subinterface_vlan1_aap_untrusted_v6_ip_prefix:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_oam_vmi_1_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       subinterface_vlan1_aap_sec_untrusted_ip_prefix:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_vlan1_vmac_address:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_vdbe_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_oam_vmi_1_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_oam_vmi_1_virtual_network_refs:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_vmi_1_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_vdbe_oam_vmi_1_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_vlan1_counter:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: float
       subinterface_vlan2_aap_untrusted_v6_ip_prefix:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_oam_vmi_1_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       compute_vdbe_metadata:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       subinterface_vlan1_aap_untrusted_v6_ip_prefix_len:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_untr_vmi_1_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_untr_vmi_1_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_oam_vmi_1_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_untr_vmi_1_virtual_network_refs:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       subinterface_vlan2_ip_address:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_vlan2_ip_v6_address:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_oam_vmi_1_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_vdbe_untr_vmi_1_virtual_machine_interface_allowed_address_pairs:
         type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_vmi_1_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_vlan2_parent_interface:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_vlan2_aap_address_mode:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_untr_vmi_1_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_vlan1_mac_address:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_vlan2_mac_address:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_vlan1_aap_untrusted_ip_prefix_len:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_vlan1_ip_address:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_vlan2_aap_sec_untrusted_ip_prefix:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_vdbe_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_vlan2_aap_untrusted_ip_prefix:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_oam_vmi_1_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_vmi_1_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_vdbe_untr_vmi_1_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_vlan1_ip_v6_address:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_vlan2_vmac_address:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_oam_vmi_1_virtual_machine_interface_allowed_address_pairs:
         type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_oam_vmi_1_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_vlan1_aap_untrusted_ip_prefix:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_vlan2_vn_network_list:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_untr_vmi_1_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_vlan1_subinterfaces_name_prefix:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_vlan2_vlan_tag_list:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       subinterface_vlan1_vn_network_list:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_vlan2_aap_sec_untrusted_ip_prefix_len:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_untr_vmi_1_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_vlan1_service_template_filter_count:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: float
       subinterface_vlan2_counter:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: float
       subinterface_vlan1_parent_interface:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_vlan1_aap_address_mode:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_vlan2_aap_untrusted_ip_prefix_len:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       index_value:
@@ -313,65 +313,65 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       subinterface_vlan2_subinterfaces_name_prefix:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_vlan2_aap_untrusted_v6_ip_prefix_len:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_untr_vmi_1_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_vdbe_untr_vmi_1_virtual_machine_interface_mac_addresses:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_vdbe_oam_vmi_1_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       subinterface_vlan2_service_template_filter_count:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: float
       subinterface_vlan1_aap_sec_untrusted_ip_prefix_len:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_oam_vmi_1_virtual_machine_interface_mac_addresses:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_vdbe_oam_vmi_1_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_vlan1_vlan_tag_list:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
     requirements:
@@ -857,84 +857,84 @@ node_types:
         type: string
         description: ip prefix for primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       aap_sec_untrusted_ip_prefix:
         type: string
         description: ip prefix for secondary vDBE VM aap on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       ip_v6_address:
         type: string
         description: IPv6 address associated with subinterfaces
         required: true
-        status: SUPPORTED
+        status: supported
       counter:
         type: float
         description: Index of instance among multiple instances.  Use to retrieve correct parameter for this instance when passed all parameters for all instances.
         required: true
-        status: SUPPORTED
+        status: supported
       subinterfaces_name_prefix:
         type: string
         description: Combined with subinterface_instance_index, this is used as the name of the subinterface resource
         required: true
-        status: SUPPORTED
+        status: supported
       ip_address:
         type: string
         description: IPv4 address associated with subinterfaces
         required: true
-        status: SUPPORTED
+        status: supported
       aap_address_mode:
         type: string
         description: Address mode for the vDBE cluster IP
         required: true
-        status: SUPPORTED
+        status: supported
       aap_untrusted_v6_ip_prefix:
         type: string
         description: ipv6 prefix for the primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       parent_interface:
         type: string
         description: Parent Contrail interface
         required: true
-        status: SUPPORTED
+        status: supported
       vn_network_list:
         type: string
         description: List of Contrail VLAN networks to use for the subinterfaces.   The order and number of these must match the VLAN ID list
         required: true
-        status: SUPPORTED
+        status: supported
       mac_address:
         type: string
         description: HW MAC address to use for subinterface
         required: true
-        status: SUPPORTED
+        status: supported
       vlan_tag_list:
         type: list
         description: List of VLAN IDs to use for subinterfaces
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       aap_sec_untrusted_ip_prefix_len:
         type: string
         description: ip prefix length for the secondary DBE VM aap on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       vmac_address:
         type: string
         description: virtual MAC address to use for subinterface
         required: true
-        status: SUPPORTED
+        status: supported
       aap_untrusted_v6_ip_prefix_len:
         type: string
         description: ipv6 prefix length for the primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       aap_untrusted_ip_prefix_len:
         type: string
         description: ip prefix length for the primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_vdbe_0_subint_untr_vmi_0:
         capability: tosca.capabilities.Node
@@ -969,84 +969,84 @@ node_types:
         type: string
         description: ip prefix for primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       aap_sec_untrusted_ip_prefix:
         type: string
         description: ip prefix for secondary vDBE VM aap on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       ip_v6_address:
         type: string
         description: IPv6 address associated with subinterfaces
         required: true
-        status: SUPPORTED
+        status: supported
       counter:
         type: float
         description: Index of instance among multiple instances.  Use to retrieve correct parameter for this instance when passed all parameters for all instances.
         required: true
-        status: SUPPORTED
+        status: supported
       subinterfaces_name_prefix:
         type: string
         description: Combined with subinterface_instance_index, this is used as the name of the subinterface resource
         required: true
-        status: SUPPORTED
+        status: supported
       ip_address:
         type: string
         description: IPv4 address associated with subinterfaces
         required: true
-        status: SUPPORTED
+        status: supported
       aap_address_mode:
         type: string
         description: Address mode for the vDBE cluster IP
         required: true
-        status: SUPPORTED
+        status: supported
       aap_untrusted_v6_ip_prefix:
         type: string
         description: ipv6 prefix for the primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       parent_interface:
         type: string
         description: Parent Contrail interface
         required: true
-        status: SUPPORTED
+        status: supported
       vn_network_list:
         type: string
         description: List of Contrail VLAN networks to use for the subinterfaces.   The order and number of these must match the VLAN ID list
         required: true
-        status: SUPPORTED
+        status: supported
       mac_address:
         type: string
         description: HW MAC address to use for subinterface
         required: true
-        status: SUPPORTED
+        status: supported
       vlan_tag_list:
         type: list
         description: List of VLAN IDs to use for subinterfaces
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       aap_sec_untrusted_ip_prefix_len:
         type: string
         description: ip prefix length for the secondary DBE VM aap on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       vmac_address:
         type: string
         description: virtual MAC address to use for subinterface
         required: true
-        status: SUPPORTED
+        status: supported
       aap_untrusted_v6_ip_prefix_len:
         type: string
         description: ipv6 prefix length for the primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       aap_untrusted_ip_prefix_len:
         type: string
         description: ip prefix length for the primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_vdbe_1_subint_oam_vmi_1:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/onePortVlanSameType/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/onePortVlanSameType/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 3a0a9ff451..775e9dd4ff 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/onePortVlanSameType/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/onePortVlanSameType/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -11,201 +11,201 @@ node_types:
       subinterface_nested_parent_interface:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_nested_aap_address_mode:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_nested_vlan_tag_list:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_vdbe_untr_port_1_virtual_machine_interface_allowed_address_pairs:
         type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs
         required: true
-        status: SUPPORTED
+        status: supported
       compute_vdbe_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_nested_service_template_filter_count:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: float
       subinterface_nested_aap_untrusted_v6_ip_prefix_len:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_untr_port_1_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_untr_port_1_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_port_1_virtual_machine_interface_mac_addresses:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_vdbe_untr_port_1_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_nested_aap_untrusted_ip_prefix:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_untr_port_1_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_nested_aap_sec_untrusted_ip_prefix_len:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_nested_aap_sec_untrusted_ip_prefix:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_nested_aap_untrusted_v6_ip_prefix:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_vdbe_metadata:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       subinterface_nested_mac_address:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_nested_ip_address:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_untr_port_1_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       subinterface_nested_ip_v6_address:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_untr_port_1_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_vdbe_untr_port_1_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_port_1_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_port_1_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       subinterface_nested_vmac_address:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_nested_vn_network_list:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_untr_port_1_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       subinterface_nested_aap_untrusted_ip_prefix_len:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_nested_counter:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: float
       subinterface_nested_subinterfaces_name_prefix:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_vdbe_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_untr_port_1_virtual_network_refs:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
     requirements:
@@ -582,84 +582,84 @@ node_types:
         type: string
         description: ip prefix for primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       aap_sec_untrusted_ip_prefix:
         type: string
         description: ip prefix for secondary vDBE VM aap on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       ip_v6_address:
         type: string
         description: IPv6 address associated with subinterfaces
         required: true
-        status: SUPPORTED
+        status: supported
       counter:
         type: float
         description: Index of instance among multiple instances.  Use to retrieve correct parameter for this instance when passed all parameters for all instances.
         required: true
-        status: SUPPORTED
+        status: supported
       subinterfaces_name_prefix:
         type: string
         description: Combined with subinterface_instance_index, this is used as the name of the subinterface resource
         required: true
-        status: SUPPORTED
+        status: supported
       ip_address:
         type: string
         description: IPv4 address associated with subinterfaces
         required: true
-        status: SUPPORTED
+        status: supported
       aap_address_mode:
         type: string
         description: Address mode for the vDBE cluster IP
         required: true
-        status: SUPPORTED
+        status: supported
       aap_untrusted_v6_ip_prefix:
         type: string
         description: ipv6 prefix for the primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       parent_interface:
         type: string
         description: Parent Contrail interface
         required: true
-        status: SUPPORTED
+        status: supported
       vn_network_list:
         type: string
         description: List of Contrail VLAN networks to use for the subinterfaces.   The order and number of these must match the VLAN ID list
         required: true
-        status: SUPPORTED
+        status: supported
       mac_address:
         type: string
         description: HW MAC address to use for subinterface
         required: true
-        status: SUPPORTED
+        status: supported
       vlan_tag_list:
         type: list
         description: List of VLAN IDs to use for subinterfaces
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       aap_sec_untrusted_ip_prefix_len:
         type: string
         description: ip prefix length for the secondary DBE VM aap on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       vmac_address:
         type: string
         description: virtual MAC address to use for subinterface
         required: true
-        status: SUPPORTED
+        status: supported
       aap_untrusted_v6_ip_prefix_len:
         type: string
         description: ipv6 prefix length for the primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       aap_untrusted_ip_prefix_len:
         type: string
         description: ip prefix length for the primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_vdbe_untr_x_int_vmi_subport:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/optionalPropertiesConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/optionalPropertiesConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 5f71804e20..08d2aeb67e 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/optionalPropertiesConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/optionalPropertiesConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -11,277 +11,277 @@ node_types:
       port_vdbe_untr_1_port_1_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_1_port_1_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_vlan1_aap_untrusted_v6_ip_prefix:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_untr_2_port_1_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_1_port_1_virtual_machine_interface_mac_addresses:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       subinterface_vlan1_aap_sec_untrusted_ip_prefix:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_vlan1_vmac_address:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_vdbe_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_untr_1_port_1_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_1_port_1_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_vdbe_untr_1_port_1_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_untr_2_port_1_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_untr_2_port_1_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       subinterface_vlan1_counter:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: float
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_vdbe_metadata:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       subinterface_vlan1_aap_untrusted_v6_ip_prefix_len:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_untr_2_port_1_virtual_machine_interface_mac_addresses:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_vdbe_untr_2_port_1_virtual_machine_interface_allowed_address_pairs:
         type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_2_port_1_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_1_port_1_virtual_machine_interface_allowed_address_pairs:
         type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_vlan1_mac_address:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_vlan1_aap_untrusted_ip_prefix_len:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_untr_1_port_1_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_vlan1_ip_address:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_vdbe_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_untr_2_port_1_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_2_port_1_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_2_port_1_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_vdbe_untr_2_port_1_virtual_network_refs:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_vdbe_untr_2_port_1_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_vlan1_ip_v6_address:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_vlan1_aap_untrusted_ip_prefix:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_untr_1_port_1_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_vlan1_subinterfaces_name_prefix:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_untr_1_port_1_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_vlan1_vn_network_list:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_untr_1_port_1_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       subinterface_vlan1_service_template_filter_count:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: float
       subinterface_vlan1_parent_interface:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_vlan1_aap_address_mode:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_untr_2_port_1_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       subinterface_vlan1_optional_property_1:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_untr_2_port_1_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_vdbe_untr_1_port_1_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       subinterface_vlan1_optional_property_2:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_vlan1_aap_sec_untrusted_ip_prefix_len:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_untr_1_port_1_virtual_network_refs:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       subinterface_vlan1_vlan_tag_list:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
     requirements:
@@ -737,94 +737,94 @@ node_types:
         type: string
         description: ip prefix for primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       aap_sec_untrusted_ip_prefix:
         type: string
         description: ip prefix for secondary vDBE VM aap on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       ip_v6_address:
         type: string
         description: IPv6 address associated with subinterfaces
         required: true
-        status: SUPPORTED
+        status: supported
       counter:
         type: float
         description: Index of instance among multiple instances.  Use to retrieve correct parameter for this instance when passed all parameters for all instances.
         required: true
-        status: SUPPORTED
+        status: supported
       subinterfaces_name_prefix:
         type: string
         description: Combined with subinterface_instance_index, this is used as the name of the subinterface resource
         required: true
-        status: SUPPORTED
+        status: supported
       ip_address:
         type: string
         description: IPv4 address associated with subinterfaces
         required: true
-        status: SUPPORTED
+        status: supported
       aap_address_mode:
         type: string
         description: Address mode for the vDBE cluster IP
         required: true
-        status: SUPPORTED
+        status: supported
       aap_untrusted_v6_ip_prefix:
         type: string
         description: ipv6 prefix for the primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       parent_interface:
         type: string
         description: Parent Contrail interface
         required: true
-        status: SUPPORTED
+        status: supported
       vn_network_list:
         type: string
         description: List of Contrail VLAN networks to use for the subinterfaces.   The order and number of these must match the VLAN ID list
         required: true
-        status: SUPPORTED
+        status: supported
       optional_property_1:
         type: string
         description: Optional property
         required: true
-        status: SUPPORTED
+        status: supported
       optional_property_2:
         type: string
         description: Optional property
         required: true
-        status: SUPPORTED
+        status: supported
       mac_address:
         type: string
         description: HW MAC address to use for subinterface
         required: true
-        status: SUPPORTED
+        status: supported
       vlan_tag_list:
         type: list
         description: List of VLAN IDs to use for subinterfaces
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       aap_sec_untrusted_ip_prefix_len:
         type: string
         description: ip prefix length for the secondary DBE VM aap on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       vmac_address:
         type: string
         description: virtual MAC address to use for subinterface
         required: true
-        status: SUPPORTED
+        status: supported
       aap_untrusted_v6_ip_prefix_len:
         type: string
         description: ipv6 prefix length for the primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       aap_untrusted_ip_prefix_len:
         type: string
         description: ip prefix length for the primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_vdbe_untr_x_vlan1-Network-Role_vmi_subport:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/regularNestedSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/regularNestedSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 7ac84b0fcf..191d2a383d 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/regularNestedSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/regularNestedSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -11,213 +11,213 @@ node_types:
       subinterface_nested_parent_interface:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_nested_aap_address_mode:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_nested_vlan_tag_list:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_vdbe_untr_port_1_virtual_machine_interface_allowed_address_pairs:
         type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs
         required: true
-        status: SUPPORTED
+        status: supported
       compute_vdbe_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_nested_service_template_filter_count:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: float
       subinterface_nested_aap_untrusted_v6_ip_prefix_len:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_untr_port_1_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_untr_port_1_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_port_1_virtual_machine_interface_mac_addresses:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_vdbe_untr_port_1_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_nested_aap_untrusted_ip_prefix:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_untr_port_1_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_nested_aap_sec_untrusted_ip_prefix_len:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_nested_aap_sec_untrusted_ip_prefix:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_nested_aap_untrusted_v6_ip_prefix:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_vdbe_metadata:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       subinterface_nested_mac_address:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_nested_ip_address:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_untr_port_1_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       subinterface_nested_ip_v6_address:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_untr_port_1_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_vdbe_untr_port_1_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_port_1_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_port_1_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       subinterface_nested_vmac_address:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_nested_vn_network_list:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_untr_port_1_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       subinterface_nested_aap_untrusted_ip_prefix_len:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_nested_counter:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: float
       subinterface_nested_subinterfaces_name_prefix:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_vdbe_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_nested_optional_property_1:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_nested_optional_property_2:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_untr_port_1_virtual_network_refs:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
     requirements:
@@ -594,94 +594,94 @@ node_types:
         type: string
         description: ip prefix for primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       aap_sec_untrusted_ip_prefix:
         type: string
         description: ip prefix for secondary vDBE VM aap on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       ip_v6_address:
         type: string
         description: IPv6 address associated with subinterfaces
         required: true
-        status: SUPPORTED
+        status: supported
       counter:
         type: float
         description: Index of instance among multiple instances.  Use to retrieve correct parameter for this instance when passed all parameters for all instances.
         required: true
-        status: SUPPORTED
+        status: supported
       subinterfaces_name_prefix:
         type: string
         description: Combined with subinterface_instance_index, this is used as the name of the subinterface resource
         required: true
-        status: SUPPORTED
+        status: supported
       ip_address:
         type: string
         description: IPv4 address associated with subinterfaces
         required: true
-        status: SUPPORTED
+        status: supported
       aap_address_mode:
         type: string
         description: Address mode for the vDBE cluster IP
         required: true
-        status: SUPPORTED
+        status: supported
       aap_untrusted_v6_ip_prefix:
         type: string
         description: ipv6 prefix for the primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       parent_interface:
         type: string
         description: Parent Contrail interface
         required: true
-        status: SUPPORTED
+        status: supported
       vn_network_list:
         type: string
         description: List of Contrail VLAN networks to use for the subinterfaces.   The order and number of these must match the VLAN ID list
         required: true
-        status: SUPPORTED
+        status: supported
       optional_property_1:
         type: string
         description: Optional property
         required: true
-        status: SUPPORTED
+        status: supported
       optional_property_2:
         type: string
         description: Optional property
         required: true
-        status: SUPPORTED
+        status: supported
       mac_address:
         type: string
         description: HW MAC address to use for subinterface
         required: true
-        status: SUPPORTED
+        status: supported
       vlan_tag_list:
         type: list
         description: List of VLAN IDs to use for subinterfaces
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       aap_sec_untrusted_ip_prefix_len:
         type: string
         description: ip prefix length for the secondary DBE VM aap on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       vmac_address:
         type: string
         description: virtual MAC address to use for subinterface
         required: true
-        status: SUPPORTED
+        status: supported
       aap_untrusted_v6_ip_prefix_len:
         type: string
         description: ipv6 prefix length for the primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       aap_untrusted_ip_prefix_len:
         type: string
         description: ip prefix length for the primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_vdbe_untr_x_vlan1-Network-Role_vmi_subport:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNetwork/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNetwork/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 2204cc5703..748bc591ef 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNetwork/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNetwork/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -11,7 +11,7 @@ node_types:
       port_pd_server_port_1_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       index_value:
@@ -19,95 +19,95 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       port_pd_server_port_1_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_port_1_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_pd_server_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_pd_server_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd_server_port_1_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_nested_service_template_filter_count:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: float
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_nested_p1:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd_server_port_1_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_pd_server_port_1_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_port_1_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_nested_net1:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd_server_port_1_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       compute_pd_server_user_data_format:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd_server_port_1_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_port_1_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_pd_server:
         capability: tosca.capabilities.Node
@@ -486,48 +486,48 @@ node_types:
       vlan_ids:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       p1:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       p2:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       virtual_ipv6_address:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       virtual_ip_address:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       net2:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       lb_st_vlan_type_oam:
         type: string
         description: dummy
         required: true
-        status: SUPPORTED
+        status: supported
       mac_address:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       net1:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_name_prefix:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_instance_index:
         type: float
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_template_Vlan_vmi_1:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNodesConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNodesConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 2204cc5703..748bc591ef 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNodesConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNodesConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -11,7 +11,7 @@ node_types:
       port_pd_server_port_1_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       index_value:
@@ -19,95 +19,95 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       port_pd_server_port_1_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_port_1_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_pd_server_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_pd_server_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd_server_port_1_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_nested_service_template_filter_count:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: float
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_nested_p1:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd_server_port_1_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_pd_server_port_1_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_port_1_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_nested_net1:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd_server_port_1_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       compute_pd_server_user_data_format:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd_server_port_1_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_port_1_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_pd_server:
         capability: tosca.capabilities.Node
@@ -486,48 +486,48 @@ node_types:
       vlan_ids:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       p1:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       p2:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       virtual_ipv6_address:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       virtual_ip_address:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       net2:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       lb_st_vlan_type_oam:
         type: string
         description: dummy
         required: true
-        status: SUPPORTED
+        status: supported
       mac_address:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       net1:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_name_prefix:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_instance_index:
         type: float
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_template_Vlan_vmi_1:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentResourceGroupCount/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentResourceGroupCount/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 54a6020581..40f4b2f71f 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentResourceGroupCount/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentResourceGroupCount/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -11,137 +11,137 @@ node_types:
       port_vdbe_untr_1_port_1_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_1_port_1_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_nested_parent_interface:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_untr_1_port_1_virtual_machine_interface_mac_addresses:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       subinterface_nested_aap_address_mode:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_nested_vlan_tag_list:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       compute_vdbe_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_nested_service_template_filter_count:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: float
       subinterface_nested_aap_untrusted_v6_ip_prefix_len:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_untr_1_port_1_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_1_port_1_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_vdbe_untr_1_port_1_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_nested_aap_untrusted_ip_prefix:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_untr_1_port_1_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_nested_aap_sec_untrusted_ip_prefix_len:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_nested_aap_sec_untrusted_ip_prefix:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_nested_aap_untrusted_v6_ip_prefix:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_vdbe_metadata:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_vdbe_untr_1_port_1_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_nested_mac_address:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_nested_ip_address:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_untr_1_port_1_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       subinterface_nested_ip_v6_address:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       index_value:
@@ -149,63 +149,63 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       subinterface_nested_vmac_address:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_nested_vn_network_list:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_untr_1_port_1_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       subinterface_nested_aap_untrusted_ip_prefix_len:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_untr_1_port_1_virtual_network_refs:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_vdbe_untr_1_port_1_virtual_machine_interface_allowed_address_pairs:
         type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_1_port_1_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_nested_counter:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: float
       subinterface_nested_subinterfaces_name_prefix:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_vdbe_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
     requirements:
@@ -582,84 +582,84 @@ node_types:
         type: string
         description: ip prefix for primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       aap_sec_untrusted_ip_prefix:
         type: string
         description: ip prefix for secondary vDBE VM aap on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       ip_v6_address:
         type: string
         description: IPv6 address associated with subinterfaces
         required: true
-        status: SUPPORTED
+        status: supported
       counter:
         type: float
         description: Index of instance among multiple instances.  Use to retrieve correct parameter for this instance when passed all parameters for all instances.
         required: true
-        status: SUPPORTED
+        status: supported
       subinterfaces_name_prefix:
         type: string
         description: Combined with subinterface_instance_index, this is used as the name of the subinterface resource
         required: true
-        status: SUPPORTED
+        status: supported
       ip_address:
         type: string
         description: IPv4 address associated with subinterfaces
         required: true
-        status: SUPPORTED
+        status: supported
       aap_address_mode:
         type: string
         description: Address mode for the vDBE cluster IP
         required: true
-        status: SUPPORTED
+        status: supported
       aap_untrusted_v6_ip_prefix:
         type: string
         description: ipv6 prefix for the primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       parent_interface:
         type: string
         description: Parent Contrail interface
         required: true
-        status: SUPPORTED
+        status: supported
       vn_network_list:
         type: string
         description: List of Contrail VLAN networks to use for the subinterfaces.   The order and number of these must match the VLAN ID list
         required: true
-        status: SUPPORTED
+        status: supported
       mac_address:
         type: string
         description: HW MAC address to use for subinterface
         required: true
-        status: SUPPORTED
+        status: supported
       vlan_tag_list:
         type: list
         description: List of VLAN IDs to use for subinterfaces
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       aap_sec_untrusted_ip_prefix_len:
         type: string
         description: ip prefix length for the secondary DBE VM aap on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       vmac_address:
         type: string
         description: virtual MAC address to use for subinterface
         required: true
-        status: SUPPORTED
+        status: supported
       aap_untrusted_v6_ip_prefix_len:
         type: string
         description: ipv6 prefix length for the primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       aap_untrusted_ip_prefix_len:
         type: string
         description: ip prefix length for the primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_vdbe_untr_x_subport:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/computePortNetworkSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/computePortNetworkSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 38f116d3d8..dafae2196c 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/computePortNetworkSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/computePortNetworkSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -12,43 +12,43 @@ node_types:
         type: string
         description: Unique ID for this VF module inst
         required: true
-        status: SUPPORTED
+        status: supported
       control_int_net_rpf:
         type: string
         description: Reverse Path Filtering enable or disable for the control virtual network
         required: true
-        status: SUPPORTED
+        status: supported
       control_int_net_forwarding_mode:
         type: string
         description: forwarding mode of the control virtual network
         required: true
-        status: SUPPORTED
+        status: supported
       vnf_name:
         type: string
         description: Unique name for this VF instance
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_1_port_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       vdbe_untrusted_ip_1:
         type: string
         description: IPV4 address of the secondary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       vdbe_aap_untrusted_ip_prefix_len:
         type: string
         description: ip prefix length for the primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       untrusted_num_vn:
         type: float
         description: Number of vDBE subinterface virtual Networks
         required: true
-        status: SUPPORTED
+        status: supported
         constraints:
         - in_range:
           - 1
@@ -57,152 +57,152 @@ node_types:
         type: string
         description: Unique name for this VF Module instance
         required: true
-        status: SUPPORTED
+        status: supported
       aap_address_mode:
         type: string
         description: Address mode for the vDBE cluster IP
         required: true
-        status: SUPPORTED
+        status: supported
       control_int_net_shared:
         type: boolean
         description: control virtual network shared
         required: true
-        status: SUPPORTED
+        status: supported
       vdbe_untrusted_v6_ip_1:
         type: string
         description: IPV6 address of the secondary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       vdbe_untrusted_vmac_address:
         type: string
         description: Virtual MAC of the primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       control_int_net_flood_unknown_unicast:
         type: boolean
         description: forwarding mode of the control virtual network
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_1_port_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vdbe_aap_sec_untrusted_ip_prefix:
         type: string
         description: ip prefix for secondary vDBE VM aap on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       vnf_id:
         type: string
         description: Unique ID for this VF inst
         required: true
-        status: SUPPORTED
+        status: supported
       vdbe_name_1:
         type: string
         description: VM Name for this vdbe node 1
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_1_port_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       availability_zone_1:
         type: string
         description: The availability zone of secondary node1 vDBE vm in the local HA pair.
         required: true
-        status: SUPPORTED
+        status: supported
       untrusted_vn_networks:
         type: list
         description: List of subinterface virtual networks
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vdbe_image_name:
         type: string
         description: Image to use for vDBE
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_name:
         type: string
         description: Name of NSDNet network from which the management IP addresses will be allocated
         required: true
-        status: SUPPORTED
+        status: supported
       vdbe_aap_sec_untrusted_ip_prefix_len:
         type: string
         description: ip prefix length for the secondary DBE VM aap on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_1_port_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_1_port_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       vdbe_aap_untrusted_v6_ip_prefix:
         type: string
         description: ipv6 prefix for the primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       vdbe_aap_untrusted_v6_ip_prefix_len:
         type: string
         description: ipv6 prefix length for the primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       untrusted_vlan_tags:
         type: list
         description: List of subinterface vlan tags
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vdbe_flavor_name:
         type: string
         description: Flavor to use for vDBE
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_1_port_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_1_port_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vdbe_hw_untr_mac_1:
         type: string
         description: Secondary MAC address of the secondary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       untrusted_net_name:
         type: string
         description: Name of public untrusted network into which this vDBE HA cluster is deployed
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_1_port_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vdbe_device_name:
         type: string
         description: VDBE device Name for this vdbe VNF
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_1_port_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       vdbe_aap_untrusted_ip_prefix:
         type: string
         description: ip prefix for primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_vdbe_node_1:
         capability: tosca.capabilities.Node
@@ -598,84 +598,84 @@ node_types:
         type: string
         description: ip prefix for primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       aap_sec_untrusted_ip_prefix:
         type: string
         description: ip prefix for secondary vDBE VM aap on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       ip_v6_address:
         type: string
         description: IPv6 address associated with subinterfaces
         required: true
-        status: SUPPORTED
+        status: supported
       counter:
         type: float
         description: Index of instance among multiple instances.  Use to retrieve correct parameter for this instance when passed all parameters for all instances.
         required: true
-        status: SUPPORTED
+        status: supported
       subinterfaces_name_prefix:
         type: string
         description: Combined with subinterface_instance_index, this is used as the name of the subinterface resource
         required: true
-        status: SUPPORTED
+        status: supported
       ip_address:
         type: string
         description: IPv4 address associated with subinterfaces
         required: true
-        status: SUPPORTED
+        status: supported
       aap_address_mode:
         type: string
         description: Address mode for the vDBE cluster IP
         required: true
-        status: SUPPORTED
+        status: supported
       aap_untrusted_v6_ip_prefix:
         type: string
         description: ipv6 prefix for the primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       parent_interface:
         type: string
         description: Parent Contrail interface
         required: true
-        status: SUPPORTED
+        status: supported
       vn_network_list:
         type: string
         description: List of Contrail VLAN networks to use for the subinterfaces.   The order and number of these must match the VLAN ID list
         required: true
-        status: SUPPORTED
+        status: supported
       mac_address:
         type: string
         description: HW MAC address to use for subinterface
         required: true
-        status: SUPPORTED
+        status: supported
       vlan_tag_list:
         type: list
         description: List of VLAN IDs to use for subinterfaces
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       aap_sec_untrusted_ip_prefix_len:
         type: string
         description: ip prefix length for the secondary DBE VM aap on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       vmac_address:
         type: string
         description: virtual MAC address to use for subinterface
         required: true
-        status: SUPPORTED
+        status: supported
       aap_untrusted_v6_ip_prefix_len:
         type: string
         description: ipv6 prefix length for the primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       aap_untrusted_ip_prefix_len:
         type: string
         description: ip prefix length for the primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_vdbe_untr_x_subport:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/multiplePortsMultipleVlans/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/multiplePortsMultipleVlans/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 2edf12d177..021af2a1d1 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/multiplePortsMultipleVlans/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/multiplePortsMultipleVlans/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -12,84 +12,84 @@ node_types:
         type: string
         description: ip prefix for primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       aap_sec_untrusted_ip_prefix:
         type: string
         description: ip prefix for secondary vDBE VM aap on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       ip_v6_address:
         type: string
         description: IPv6 address associated with subinterfaces
         required: true
-        status: SUPPORTED
+        status: supported
       counter:
         type: float
         description: Index of instance among multiple instances.  Use to retrieve correct parameter for this instance when passed all parameters for all instances.
         required: true
-        status: SUPPORTED
+        status: supported
       subinterfaces_name_prefix:
         type: string
         description: Combined with subinterface_instance_index, this is used as the name of the subinterface resource
         required: true
-        status: SUPPORTED
+        status: supported
       ip_address:
         type: string
         description: IPv4 address associated with subinterfaces
         required: true
-        status: SUPPORTED
+        status: supported
       aap_address_mode:
         type: string
         description: Address mode for the vDBE cluster IP
         required: true
-        status: SUPPORTED
+        status: supported
       aap_untrusted_v6_ip_prefix:
         type: string
         description: ipv6 prefix for the primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       parent_interface:
         type: string
         description: Parent Contrail interface
         required: true
-        status: SUPPORTED
+        status: supported
       vn_network_list:
         type: string
         description: List of Contrail VLAN networks to use for the subinterfaces.   The order and number of these must match the VLAN ID list
         required: true
-        status: SUPPORTED
+        status: supported
       mac_address:
         type: string
         description: HW MAC address to use for subinterface
         required: true
-        status: SUPPORTED
+        status: supported
       vlan_tag_list:
         type: list
         description: List of VLAN IDs to use for subinterfaces
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       aap_sec_untrusted_ip_prefix_len:
         type: string
         description: ip prefix length for the secondary DBE VM aap on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       vmac_address:
         type: string
         description: virtual MAC address to use for subinterface
         required: true
-        status: SUPPORTED
+        status: supported
       aap_untrusted_v6_ip_prefix_len:
         type: string
         description: ipv6 prefix length for the primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       aap_untrusted_ip_prefix_len:
         type: string
         description: ip prefix length for the primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_vdbe_untr_x_subport:
         capability: tosca.capabilities.Node
@@ -124,31 +124,31 @@ node_types:
         type: string
         description: Reverse Path Filtering enable or disable for the fabric virtual network
         required: true
-        status: SUPPORTED
+        status: supported
       control_int_net_rpf:
         type: string
         description: Reverse Path Filtering enable or disable for the control virtual network
         required: true
-        status: SUPPORTED
+        status: supported
       control_int_net_forwarding_mode:
         type: string
         description: forwarding mode of the control virtual network
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_2_port_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vdbe_aap_untrusted_ip_prefix_len:
         type: string
         description: ip prefix length for the primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       untrusted_num_vn:
         type: float
         description: Number of vDBE subinterface virtual Networks
         required: true
-        status: SUPPORTED
+        status: supported
         constraints:
         - in_range:
           - 1
@@ -157,230 +157,230 @@ node_types:
         type: boolean
         description: control virtual network shared
         required: true
-        status: SUPPORTED
+        status: supported
       control_int_net_flood_unknown_unicast:
         type: boolean
         description: forwarding mode of the control virtual network
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_2_port_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_1_port_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_vdbe_untr_2_port_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_vdbe_untr_2_port_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       vdbe_image_name:
         type: string
         description: Image to use for vDBE
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_name:
         type: string
         description: Name of NSDNet network from which the management IP addresses will be allocated
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_2_port_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_vdbe_untr_1_port_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_1_port_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       vdbe_aap_untrusted_v6_ip_prefix_len:
         type: string
         description: ipv6 prefix length for the primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       vdbe_flavor_name:
         type: string
         description: Flavor to use for vDBE
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_1_port_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       fabric_int_net_forwarding_mode:
         type: string
         description: forwarding mode of the fabric virtual network
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_2_port_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       fabric_int_net_shared:
         description: fabric virtual network shared
         required: true
-        status: SUPPORTED
+        status: supported
       untrusted_net_name:
         type: string
         description: Name of public untrusted network into which this vDBE HA cluster is deployed
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_1_port_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vf_module_id:
         type: string
         description: Unique ID for this VF module inst
         required: true
-        status: SUPPORTED
+        status: supported
       vnf_name:
         type: string
         description: Unique name for this VF instance
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_1_port_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       vdbe_untrusted_ip_1:
         type: string
         description: IPV4 address of the secondary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       vf_module_name:
         type: string
         description: Unique name for this VF Module instance
         required: true
-        status: SUPPORTED
+        status: supported
       aap_address_mode:
         type: string
         description: Address mode for the vDBE cluster IP
         required: true
-        status: SUPPORTED
+        status: supported
       vdbe_untrusted_v6_ip_1:
         type: string
         description: IPV6 address of the secondary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       vdbe_untrusted_vmac_address:
         type: string
         description: Virtual MAC of the primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_1_port_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vdbe_aap_sec_untrusted_ip_prefix:
         type: string
         description: ip prefix for secondary vDBE VM aap on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       vnf_id:
         type: string
         description: Unique ID for this VF inst
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_2_port_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       vdbe_name_1:
         type: string
         description: VM Name for this vdbe node 1
         required: true
-        status: SUPPORTED
+        status: supported
       availability_zone_1:
         type: string
         description: The availability zone of secondary node1 vDBE vm in the local HA pair.
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_2_port_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       untrusted_vn_networks:
         type: list
         description: List of subinterface virtual networks
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_untr_2_port_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       vdbe_aap_sec_untrusted_ip_prefix_len:
         type: string
         description: ip prefix length for the secondary DBE VM aap on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       vdbe_aap_untrusted_v6_ip_prefix:
         type: string
         description: ipv6 prefix for the primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       fabric_int_net_flood_unknown_unicast:
         type: boolean
         description: forwarding mode of the fabric virtual network
         required: true
-        status: SUPPORTED
+        status: supported
       untrusted_vlan_tags:
         type: list
         description: List of subinterface vlan tags
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_untr_1_port_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       counter:
         type: float
         description: Counter.
         required: true
-        status: SUPPORTED
+        status: supported
       vdbe_hw_untr_mac_1:
         type: string
         description: Secondary MAC address of the secondary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       vdbe_device_name:
         type: string
         description: VDBE device Name for this vdbe VNF
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_1_port_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       vdbe_aap_untrusted_ip_prefix:
         type: string
         description: ip prefix for primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_vdbe_untr_2_subports:
         capability: tosca.capabilities.Node
@@ -900,84 +900,84 @@ node_types:
         type: string
         description: ip prefix for primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       aap_sec_untrusted_ip_prefix:
         type: string
         description: ip prefix for secondary vDBE VM aap on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       ip_v6_address:
         type: string
         description: IPv6 address associated with subinterfaces
         required: true
-        status: SUPPORTED
+        status: supported
       counter:
         type: float
         description: Index of instance among multiple instances.  Use to retrieve correct parameter for this instance when passed all parameters for all instances.
         required: true
-        status: SUPPORTED
+        status: supported
       subinterfaces_name_prefix:
         type: string
         description: Combined with subinterface_instance_index, this is used as the name of the subinterface resource
         required: true
-        status: SUPPORTED
+        status: supported
       ip_address:
         type: string
         description: IPv4 address associated with subinterfaces
         required: true
-        status: SUPPORTED
+        status: supported
       aap_address_mode:
         type: string
         description: Address mode for the vDBE cluster IP
         required: true
-        status: SUPPORTED
+        status: supported
       aap_untrusted_v6_ip_prefix:
         type: string
         description: ipv6 prefix for the primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       parent_interface:
         type: string
         description: Parent Contrail interface
         required: true
-        status: SUPPORTED
+        status: supported
       vn_network_list:
         type: string
         description: List of Contrail VLAN networks to use for the subinterfaces.   The order and number of these must match the VLAN ID list
         required: true
-        status: SUPPORTED
+        status: supported
       mac_address:
         type: string
         description: HW MAC address to use for subinterface
         required: true
-        status: SUPPORTED
+        status: supported
       vlan_tag_list:
         type: list
         description: List of VLAN IDs to use for subinterfaces
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       aap_sec_untrusted_ip_prefix_len:
         type: string
         description: ip prefix length for the secondary DBE VM aap on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       vmac_address:
         type: string
         description: virtual MAC address to use for subinterface
         required: true
-        status: SUPPORTED
+        status: supported
       aap_untrusted_v6_ip_prefix_len:
         type: string
         description: ipv6 prefix length for the primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       aap_untrusted_ip_prefix_len:
         type: string
         description: ip prefix length for the primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_vdbe_untr_x_subport_another:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/multipleVlanDiffFile/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/multipleVlanDiffFile/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 6b3a3e421c..d4acba0161 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/multipleVlanDiffFile/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/multipleVlanDiffFile/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -12,84 +12,84 @@ node_types:
         type: string
         description: ip prefix for primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       aap_sec_untrusted_ip_prefix:
         type: string
         description: ip prefix for secondary vDBE VM aap on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       ip_v6_address:
         type: string
         description: IPv6 address associated with subinterfaces
         required: true
-        status: SUPPORTED
+        status: supported
       counter:
         type: float
         description: Index of instance among multiple instances.  Use to retrieve correct parameter for this instance when passed all parameters for all instances.
         required: true
-        status: SUPPORTED
+        status: supported
       subinterfaces_name_prefix:
         type: string
         description: Combined with subinterface_instance_index, this is used as the name of the subinterface resource
         required: true
-        status: SUPPORTED
+        status: supported
       ip_address:
         type: string
         description: IPv4 address associated with subinterfaces
         required: true
-        status: SUPPORTED
+        status: supported
       aap_address_mode:
         type: string
         description: Address mode for the vDBE cluster IP
         required: true
-        status: SUPPORTED
+        status: supported
       aap_untrusted_v6_ip_prefix:
         type: string
         description: ipv6 prefix for the primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       parent_interface:
         type: string
         description: Parent Contrail interface
         required: true
-        status: SUPPORTED
+        status: supported
       vn_network_list:
         type: string
         description: List of Contrail VLAN networks to use for the subinterfaces.   The order and number of these must match the VLAN ID list
         required: true
-        status: SUPPORTED
+        status: supported
       mac_address:
         type: string
         description: HW MAC address to use for subinterface
         required: true
-        status: SUPPORTED
+        status: supported
       vlan_tag_list:
         type: list
         description: List of VLAN IDs to use for subinterfaces
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       aap_sec_untrusted_ip_prefix_len:
         type: string
         description: ip prefix length for the secondary DBE VM aap on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       vmac_address:
         type: string
         description: virtual MAC address to use for subinterface
         required: true
-        status: SUPPORTED
+        status: supported
       aap_untrusted_v6_ip_prefix_len:
         type: string
         description: ipv6 prefix length for the primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       aap_untrusted_ip_prefix_len:
         type: string
         description: ip prefix length for the primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_vdbe_untr_x_subport:
         capability: tosca.capabilities.Node
@@ -124,43 +124,43 @@ node_types:
         type: string
         description: Unique ID for this VF module inst
         required: true
-        status: SUPPORTED
+        status: supported
       control_int_net_rpf:
         type: string
         description: Reverse Path Filtering enable or disable for the control virtual network
         required: true
-        status: SUPPORTED
+        status: supported
       control_int_net_forwarding_mode:
         type: string
         description: forwarding mode of the control virtual network
         required: true
-        status: SUPPORTED
+        status: supported
       vnf_name:
         type: string
         description: Unique name for this VF instance
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_1_port_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       vdbe_untrusted_ip_1:
         type: string
         description: IPV4 address of the secondary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       vdbe_aap_untrusted_ip_prefix_len:
         type: string
         description: ip prefix length for the primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       untrusted_num_vn:
         type: float
         description: Number of vDBE subinterface virtual Networks
         required: true
-        status: SUPPORTED
+        status: supported
         constraints:
         - in_range:
           - 1
@@ -169,157 +169,157 @@ node_types:
         type: string
         description: Unique name for this VF Module instance
         required: true
-        status: SUPPORTED
+        status: supported
       aap_address_mode:
         type: string
         description: Address mode for the vDBE cluster IP
         required: true
-        status: SUPPORTED
+        status: supported
       control_int_net_shared:
         type: boolean
         description: control virtual network shared
         required: true
-        status: SUPPORTED
+        status: supported
       vdbe_untrusted_v6_ip_1:
         type: string
         description: IPV6 address of the secondary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       vdbe_untrusted_vmac_address:
         type: string
         description: Virtual MAC of the primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       control_int_net_flood_unknown_unicast:
         type: boolean
         description: forwarding mode of the control virtual network
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_1_port_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vdbe_aap_sec_untrusted_ip_prefix:
         type: string
         description: ip prefix for secondary vDBE VM aap on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       vnf_id:
         type: string
         description: Unique ID for this VF inst
         required: true
-        status: SUPPORTED
+        status: supported
       vdbe_name_1:
         type: string
         description: VM Name for this vdbe node 1
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_1_port_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       availability_zone_1:
         type: string
         description: The availability zone of secondary node1 vDBE vm in the local HA pair.
         required: true
-        status: SUPPORTED
+        status: supported
       untrusted_vn_networks:
         type: list
         description: List of subinterface virtual networks
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vdbe_image_name:
         type: string
         description: Image to use for vDBE
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_name:
         type: string
         description: Name of NSDNet network from which the management IP addresses will be allocated
         required: true
-        status: SUPPORTED
+        status: supported
       vdbe_aap_sec_untrusted_ip_prefix_len:
         type: string
         description: ip prefix length for the secondary DBE VM aap on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_1_port_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_1_port_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       vdbe_aap_untrusted_v6_ip_prefix:
         type: string
         description: ipv6 prefix for the primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       vdbe_aap_untrusted_v6_ip_prefix_len:
         type: string
         description: ipv6 prefix length for the primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       untrusted_vlan_tags:
         type: list
         description: List of subinterface vlan tags
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vdbe_flavor_name:
         type: string
         description: Flavor to use for vDBE
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_1_port_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       counter:
         type: float
         description: Counter.
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_1_port_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vdbe_hw_untr_mac_1:
         type: string
         description: Secondary MAC address of the secondary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       untrusted_net_name:
         type: string
         description: Name of public untrusted network into which this vDBE HA cluster is deployed
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_1_port_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vdbe_device_name:
         type: string
         description: VDBE device Name for this vdbe VNF
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_1_port_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       vdbe_aap_untrusted_ip_prefix:
         type: string
         description: ip prefix for primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_vdbe_untr_2_subports:
         capability: tosca.capabilities.Node
@@ -745,84 +745,84 @@ node_types:
         type: string
         description: ip prefix for primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       aap_sec_untrusted_ip_prefix:
         type: string
         description: ip prefix for secondary vDBE VM aap on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       ip_v6_address:
         type: string
         description: IPv6 address associated with subinterfaces
         required: true
-        status: SUPPORTED
+        status: supported
       counter:
         type: float
         description: Index of instance among multiple instances.  Use to retrieve correct parameter for this instance when passed all parameters for all instances.
         required: true
-        status: SUPPORTED
+        status: supported
       subinterfaces_name_prefix:
         type: string
         description: Combined with subinterface_instance_index, this is used as the name of the subinterface resource
         required: true
-        status: SUPPORTED
+        status: supported
       ip_address:
         type: string
         description: IPv4 address associated with subinterfaces
         required: true
-        status: SUPPORTED
+        status: supported
       aap_address_mode:
         type: string
         description: Address mode for the vDBE cluster IP
         required: true
-        status: SUPPORTED
+        status: supported
       aap_untrusted_v6_ip_prefix:
         type: string
         description: ipv6 prefix for the primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       parent_interface:
         type: string
         description: Parent Contrail interface
         required: true
-        status: SUPPORTED
+        status: supported
       vn_network_list:
         type: string
         description: List of Contrail VLAN networks to use for the subinterfaces.   The order and number of these must match the VLAN ID list
         required: true
-        status: SUPPORTED
+        status: supported
       mac_address:
         type: string
         description: HW MAC address to use for subinterface
         required: true
-        status: SUPPORTED
+        status: supported
       vlan_tag_list:
         type: list
         description: List of VLAN IDs to use for subinterfaces
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       aap_sec_untrusted_ip_prefix_len:
         type: string
         description: ip prefix length for the secondary DBE VM aap on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       vmac_address:
         type: string
         description: virtual MAC address to use for subinterface
         required: true
-        status: SUPPORTED
+        status: supported
       aap_untrusted_v6_ip_prefix_len:
         type: string
         description: ipv6 prefix length for the primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       aap_untrusted_ip_prefix_len:
         type: string
         description: ip prefix length for the primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_vdbe_untr_x_subport_another:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/multipleVlanSameFile/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/multipleVlanSameFile/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 0c815e4fef..603e2fe638 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/multipleVlanSameFile/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/multipleVlanSameFile/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -12,43 +12,43 @@ node_types:
         type: string
         description: Unique ID for this VF module inst
         required: true
-        status: SUPPORTED
+        status: supported
       control_int_net_rpf:
         type: string
         description: Reverse Path Filtering enable or disable for the control virtual network
         required: true
-        status: SUPPORTED
+        status: supported
       control_int_net_forwarding_mode:
         type: string
         description: forwarding mode of the control virtual network
         required: true
-        status: SUPPORTED
+        status: supported
       vnf_name:
         type: string
         description: Unique name for this VF instance
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_1_port_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       vdbe_untrusted_ip_1:
         type: string
         description: IPV4 address of the secondary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       vdbe_aap_untrusted_ip_prefix_len:
         type: string
         description: ip prefix length for the primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       untrusted_num_vn:
         type: float
         description: Number of vDBE subinterface virtual Networks
         required: true
-        status: SUPPORTED
+        status: supported
         constraints:
         - in_range:
           - 1
@@ -57,157 +57,157 @@ node_types:
         type: string
         description: Unique ID for this VF Module instance
         required: true
-        status: SUPPORTED
+        status: supported
       aap_address_mode:
         type: string
         description: Address mode for the vDBE cluster IP
         required: true
-        status: SUPPORTED
+        status: supported
       control_int_net_shared:
         type: boolean
         description: control virtual network shared
         required: true
-        status: SUPPORTED
+        status: supported
       vdbe_untrusted_v6_ip_1:
         type: string
         description: IPV6 address of the secondary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       vdbe_untrusted_vmac_address:
         type: string
         description: Virtual MAC of the primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       control_int_net_flood_unknown_unicast:
         type: boolean
         description: forwarding mode of the control virtual network
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_1_port_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vdbe_aap_sec_untrusted_ip_prefix:
         type: string
         description: ip prefix for secondary vDBE VM aap on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       vnf_id:
         type: string
         description: Unique ID for this VF inst
         required: true
-        status: SUPPORTED
+        status: supported
       vdbe_name_1:
         type: string
         description: VM Name for this vdbe node 1
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_1_port_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       availability_zone_1:
         type: string
         description: The availability zone of secondary node1 vDBE vm in the local HA pair.
         required: true
-        status: SUPPORTED
+        status: supported
       untrusted_vn_networks:
         type: list
         description: List of subinterface virtual networks
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vdbe_image_name:
         type: string
         description: Image to use for vDBE
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_name:
         type: string
         description: Name of NSDNet network from which the management IP addresses will be allocated
         required: true
-        status: SUPPORTED
+        status: supported
       vdbe_aap_sec_untrusted_ip_prefix_len:
         type: string
         description: ip prefix length for the secondary DBE VM aap on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_1_port_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_1_port_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       vdbe_aap_untrusted_v6_ip_prefix:
         type: string
         description: ipv6 prefix for the primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       vdbe_aap_untrusted_v6_ip_prefix_len:
         type: string
         description: ipv6 prefix length for the primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       untrusted_vlan_tags:
         type: list
         description: List of subinterface vlan tags
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vdbe_flavor_name:
         type: string
         description: Flavor to use for vDBE
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_1_port_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       counter:
         type: float
         description: Counter.
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_1_port_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vdbe_hw_untr_mac_1:
         type: string
         description: Secondary MAC address of the secondary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       untrusted_net_name:
         type: string
         description: Name of public untrusted network into which this vDBE HA cluster is deployed
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_1_port_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vdbe_device_name:
         type: string
         description: VDBE device Name for this vdbe VNF
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_1_port_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       vdbe_aap_untrusted_ip_prefix:
         type: string
         description: ip prefix for primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_vdbe_untr_2_subports:
         capability: tosca.capabilities.Node
@@ -633,84 +633,84 @@ node_types:
         type: string
         description: ip prefix for primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       aap_sec_untrusted_ip_prefix:
         type: string
         description: ip prefix for secondary vDBE VM aap on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       ip_v6_address:
         type: string
         description: IPv6 address associated with subinterfaces
         required: true
-        status: SUPPORTED
+        status: supported
       counter:
         type: float
         description: Index of instance among multiple instances.  Use to retrieve correct parameter for this instance when passed all parameters for all instances.
         required: true
-        status: SUPPORTED
+        status: supported
       subinterfaces_name_prefix:
         type: string
         description: Combined with subinterface_instance_index, this is used as the name of the subinterface resource
         required: true
-        status: SUPPORTED
+        status: supported
       ip_address:
         type: string
         description: IPv4 address associated with subinterfaces
         required: true
-        status: SUPPORTED
+        status: supported
       aap_address_mode:
         type: string
         description: Address mode for the vDBE cluster IP
         required: true
-        status: SUPPORTED
+        status: supported
       aap_untrusted_v6_ip_prefix:
         type: string
         description: ipv6 prefix for the primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       parent_interface:
         type: string
         description: Parent Contrail interface
         required: true
-        status: SUPPORTED
+        status: supported
       vn_network_list:
         type: string
         description: List of Contrail VLAN networks to use for the subinterfaces.   The order and number of these must match the VLAN ID list
         required: true
-        status: SUPPORTED
+        status: supported
       mac_address:
         type: string
         description: HW MAC address to use for subinterface
         required: true
-        status: SUPPORTED
+        status: supported
       vlan_tag_list:
         type: list
         description: List of VLAN IDs to use for subinterfaces
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       aap_sec_untrusted_ip_prefix_len:
         type: string
         description: ip prefix length for the secondary DBE VM aap on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       vmac_address:
         type: string
         description: virtual MAC address to use for subinterface
         required: true
-        status: SUPPORTED
+        status: supported
       aap_untrusted_v6_ip_prefix_len:
         type: string
         description: ipv6 prefix length for the primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       aap_untrusted_ip_prefix_len:
         type: string
         description: ip prefix length for the primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_vdbe_untr_x_subport:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/regularNestedSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/regularNestedSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 785d5430da..a8ebc7aa87 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/regularNestedSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/regularNestedSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -12,43 +12,43 @@ node_types:
         type: string
         description: Unique ID for this VF module inst
         required: true
-        status: SUPPORTED
+        status: supported
       control_int_net_rpf:
         type: string
         description: Reverse Path Filtering enable or disable for the control virtual network
         required: true
-        status: SUPPORTED
+        status: supported
       control_int_net_forwarding_mode:
         type: string
         description: forwarding mode of the control virtual network
         required: true
-        status: SUPPORTED
+        status: supported
       vnf_name:
         type: string
         description: Unique name for this VF instance
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_1_port_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       vdbe_untrusted_ip_1:
         type: string
         description: IPV4 address of the secondary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       vdbe_aap_untrusted_ip_prefix_len:
         type: string
         description: ip prefix length for the primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       untrusted_num_vn:
         type: float
         description: Number of vDBE subinterface virtual Networks
         required: true
-        status: SUPPORTED
+        status: supported
         constraints:
         - in_range:
           - 1
@@ -57,152 +57,152 @@ node_types:
         type: string
         description: Unique Name for this VF module inst
         required: true
-        status: SUPPORTED
+        status: supported
       aap_address_mode:
         type: string
         description: Address mode for the vDBE cluster IP
         required: true
-        status: SUPPORTED
+        status: supported
       control_int_net_shared:
         type: boolean
         description: control virtual network shared
         required: true
-        status: SUPPORTED
+        status: supported
       vdbe_untrusted_v6_ip_1:
         type: string
         description: IPV6 address of the secondary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       vdbe_untrusted_vmac_address:
         type: string
         description: Virtual MAC of the primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       control_int_net_flood_unknown_unicast:
         type: boolean
         description: forwarding mode of the control virtual network
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_1_port_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vdbe_aap_sec_untrusted_ip_prefix:
         type: string
         description: ip prefix for secondary vDBE VM aap on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       vnf_id:
         type: string
         description: Unique ID for this VF inst
         required: true
-        status: SUPPORTED
+        status: supported
       vdbe_name_1:
         type: string
         description: VM Name for this vdbe node 1
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_1_port_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       availability_zone_1:
         type: string
         description: The availability zone of secondary node1 vDBE vm in the local HA pair.
         required: true
-        status: SUPPORTED
+        status: supported
       untrusted_vn_networks:
         type: list
         description: List of subinterface virtual networks
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vdbe_image_name:
         type: string
         description: Image to use for vDBE
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_name:
         type: string
         description: Name of NSDNet network from which the management IP addresses will be allocated
         required: true
-        status: SUPPORTED
+        status: supported
       vdbe_aap_sec_untrusted_ip_prefix_len:
         type: string
         description: ip prefix length for the secondary DBE VM aap on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_1_port_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_1_port_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       vdbe_aap_untrusted_v6_ip_prefix:
         type: string
         description: ipv6 prefix for the primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       vdbe_aap_untrusted_v6_ip_prefix_len:
         type: string
         description: ipv6 prefix length for the primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       untrusted_vlan_tags:
         type: list
         description: List of subinterface vlan tags
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vdbe_flavor_name:
         type: string
         description: Flavor to use for vDBE
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_1_port_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_1_port_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vdbe_hw_untr_mac_1:
         type: string
         description: Secondary MAC address of the secondary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       untrusted_net_name:
         type: string
         description: Name of public untrusted network into which this vDBE HA cluster is deployed
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_1_port_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vdbe_device_name:
         type: string
         description: VDBE device Name for this vdbe VNF
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_1_port_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       vdbe_aap_untrusted_ip_prefix:
         type: string
         description: ip prefix for primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_vdbe_node_1:
         capability: tosca.capabilities.Node
@@ -598,84 +598,84 @@ node_types:
         type: string
         description: ip prefix for primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       aap_sec_untrusted_ip_prefix:
         type: string
         description: ip prefix for secondary vDBE VM aap on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       ip_v6_address:
         type: string
         description: IPv6 address associated with subinterfaces
         required: true
-        status: SUPPORTED
+        status: supported
       counter:
         type: float
         description: Index of instance among multiple instances.  Use to retrieve correct parameter for this instance when passed all parameters for all instances.
         required: true
-        status: SUPPORTED
+        status: supported
       subinterfaces_name_prefix:
         type: string
         description: Combined with subinterface_instance_index, this is used as the name of the subinterface resource
         required: true
-        status: SUPPORTED
+        status: supported
       ip_address:
         type: string
         description: IPv4 address associated with subinterfaces
         required: true
-        status: SUPPORTED
+        status: supported
       aap_address_mode:
         type: string
         description: Address mode for the vDBE cluster IP
         required: true
-        status: SUPPORTED
+        status: supported
       aap_untrusted_v6_ip_prefix:
         type: string
         description: ipv6 prefix for the primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       parent_interface:
         type: string
         description: Parent Contrail interface
         required: true
-        status: SUPPORTED
+        status: supported
       vn_network_list:
         type: string
         description: List of Contrail VLAN networks to use for the subinterfaces.   The order and number of these must match the VLAN ID list
         required: true
-        status: SUPPORTED
+        status: supported
       mac_address:
         type: string
         description: HW MAC address to use for subinterface
         required: true
-        status: SUPPORTED
+        status: supported
       vlan_tag_list:
         type: list
         description: List of VLAN IDs to use for subinterfaces
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       aap_sec_untrusted_ip_prefix_len:
         type: string
         description: ip prefix length for the secondary DBE VM aap on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       vmac_address:
         type: string
         description: virtual MAC address to use for subinterface
         required: true
-        status: SUPPORTED
+        status: supported
       aap_untrusted_v6_ip_prefix_len:
         type: string
         description: ipv6 prefix length for the primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       aap_untrusted_ip_prefix_len:
         type: string
         description: ip prefix length for the primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_vdbe_untr_x_subport:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/subInterfaceGetAttrInOut/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/subInterfaceGetAttrInOut/out/GlobalSubstitutionTypesServiceTemplate.yaml
index e7b83ebaf3..75aa82201b 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/subInterfaceGetAttrInOut/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/subInterfaceGetAttrInOut/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -12,48 +12,48 @@ node_types:
         type: string
         description: Unique ID for this VF module inst
         required: true
-        status: SUPPORTED
+        status: supported
       fabric_int_net_rpf:
         type: string
         description: Reverse Path Filtering enable or disable for the fabric virtual network
         required: true
-        status: SUPPORTED
+        status: supported
       control_int_net_rpf:
         type: string
         description: Reverse Path Filtering enable or disable for the control virtual network
         required: true
-        status: SUPPORTED
+        status: supported
       control_int_net_forwarding_mode:
         type: string
         description: forwarding mode of the control virtual network
         required: true
-        status: SUPPORTED
+        status: supported
       vnf_name:
         type: string
         description: Unique name for this VF instance
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_1_port_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       vdbe_untrusted_ip_1:
         type: string
         description: IPV4 address of the secondary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       vdbe_aap_untrusted_ip_prefix_len:
         type: string
         description: ip prefix length for the primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       untrusted_num_vn:
         type: float
         description: Number of vDBE subinterface virtual Networks
         required: true
-        status: SUPPORTED
+        status: supported
         constraints:
         - in_range:
           - 1
@@ -62,176 +62,176 @@ node_types:
         type: string
         description: Unique Name for this VF module inst
         required: true
-        status: SUPPORTED
+        status: supported
       aap_address_mode:
         type: string
         description: Address mode for the vDBE cluster IP
         required: true
-        status: SUPPORTED
+        status: supported
       control_int_net_shared:
         type: boolean
         description: control virtual network shared
         required: true
-        status: SUPPORTED
+        status: supported
       vdbe_untrusted_v6_ip_1:
         type: string
         description: IPV6 address of the secondary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       vdbe_untrusted_vmac_address:
         type: string
         description: Virtual MAC of the primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       control_int_net_flood_unknown_unicast:
         type: boolean
         description: forwarding mode of the control virtual network
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_1_port_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vdbe_aap_sec_untrusted_ip_prefix:
         type: string
         description: ip prefix for secondary vDBE VM aap on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       vnf_id:
         type: string
         description: Unique ID for this VF inst
         required: true
-        status: SUPPORTED
+        status: supported
       vdbe_name_1:
         type: string
         description: VM Name for this vdbe node 1
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_1_port_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       availability_zone_1:
         type: string
         description: The availability zone of secondary node1 vDBE vm in the local HA pair.
         required: true
-        status: SUPPORTED
+        status: supported
       untrusted_vn_networks:
         type: list
         description: List of subinterface virtual networks
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vdbe_image_name:
         type: string
         description: Image to use for vDBE
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_name:
         type: string
         description: Name of NSDNet network from which the management IP addresses will be allocated
         required: true
-        status: SUPPORTED
+        status: supported
       vdbe_aap_sec_untrusted_ip_prefix_len:
         type: string
         description: ip prefix length for the secondary DBE VM aap on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_1_port_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_1_port_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       vdbe_aap_untrusted_v6_ip_prefix:
         type: string
         description: ipv6 prefix for the primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       vdbe_aap_untrusted_v6_ip_prefix_len:
         type: string
         description: ipv6 prefix length for the primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       fabric_int_net_flood_unknown_unicast:
         type: boolean
         description: forwarding mode of the fabric virtual network
         required: true
-        status: SUPPORTED
+        status: supported
       untrusted_vlan_tags:
         type: list
         description: List of subinterface vlan tags
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vdbe_flavor_name:
         type: string
         description: Flavor to use for vDBE
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_1_port_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       counter:
         type: float
         description: Counter.
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_1_port_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       fabric_int_net_forwarding_mode:
         type: string
         description: forwarding mode of the fabric virtual network
         required: true
-        status: SUPPORTED
+        status: supported
       fabric_int_net_shared:
         description: fabric virtual network shared
         required: true
-        status: SUPPORTED
+        status: supported
       vdbe_hw_untr_mac_1:
         type: string
         description: Secondary MAC address of the secondary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       untrusted_net_name:
         type: string
         description: Name of public untrusted network into which this vDBE HA cluster is deployed
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_1_port_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vdbe_device_name:
         type: string
         description: VDBE device Name for this vdbe VNF
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_1_port_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       vdbe_aap_untrusted_ip_prefix:
         type: string
         description: ip prefix for primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
     attributes:
       out1:
         type: string
         description: output param connectivity
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_vdbe_node_1:
         capability: tosca.capabilities.Node
@@ -648,84 +648,84 @@ node_types:
         type: string
         description: ip prefix for primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       aap_sec_untrusted_ip_prefix:
         type: string
         description: ip prefix for secondary vDBE VM aap on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       vdbe_subport_network:
         type: string
         description: List of Contrail VLAN networks to use for the subinterfaces.   The order and number of these must match the VLAN ID list
         required: true
-        status: SUPPORTED
+        status: supported
       ip_v6_address:
         type: string
         description: IPv6 address associated with subinterfaces
         required: true
-        status: SUPPORTED
+        status: supported
       counter:
         type: float
         description: Index of instance among multiple instances.  Use to retrieve correct parameter for this instance when passed all parameters for all instances.
         required: true
-        status: SUPPORTED
+        status: supported
       subinterfaces_name_prefix:
         type: string
         description: Combined with subinterface_instance_index, this is used as the name of the subinterface resource
         required: true
-        status: SUPPORTED
+        status: supported
       ip_address:
         type: string
         description: IPv4 address associated with subinterfaces
         required: true
-        status: SUPPORTED
+        status: supported
       aap_address_mode:
         type: string
         description: Address mode for the vDBE cluster IP
         required: true
-        status: SUPPORTED
+        status: supported
       aap_untrusted_v6_ip_prefix:
         type: string
         description: ipv6 prefix for the primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       parent_interface:
         type: string
         description: Parent Contrail interface
         required: true
-        status: SUPPORTED
+        status: supported
       mac_address:
         type: string
         description: HW MAC address to use for subinterface
         required: true
-        status: SUPPORTED
+        status: supported
       vlan_tag_list:
         type: list
         description: List of VLAN IDs to use for subinterfaces
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       aap_sec_untrusted_ip_prefix_len:
         type: string
         description: ip prefix length for the secondary DBE VM aap on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       vmac_address:
         type: string
         description: virtual MAC address to use for subinterface
         required: true
-        status: SUPPORTED
+        status: supported
       aap_untrusted_v6_ip_prefix_len:
         type: string
         description: ipv6 prefix length for the primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       aap_untrusted_ip_prefix_len:
         type: string
         description: ip prefix length for the primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_vdbe_untr_x_subport:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/subInterfaceNodesConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/subInterfaceNodesConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 7a3f7befe9..076824d32a 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/subInterfaceNodesConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/subInterfaceNodesConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -12,48 +12,48 @@ node_types:
         type: string
         description: Unique ID for this VF module inst
         required: true
-        status: SUPPORTED
+        status: supported
       fabric_int_net_rpf:
         type: string
         description: Reverse Path Filtering enable or disable for the fabric virtual network
         required: true
-        status: SUPPORTED
+        status: supported
       control_int_net_rpf:
         type: string
         description: Reverse Path Filtering enable or disable for the control virtual network
         required: true
-        status: SUPPORTED
+        status: supported
       control_int_net_forwarding_mode:
         type: string
         description: forwarding mode of the control virtual network
         required: true
-        status: SUPPORTED
+        status: supported
       vnf_name:
         type: string
         description: Unique name for this VF instance
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_1_port_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       vdbe_untrusted_ip_1:
         type: string
         description: IPV4 address of the secondary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       vdbe_aap_untrusted_ip_prefix_len:
         type: string
         description: ip prefix length for the primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       untrusted_num_vn:
         type: float
         description: Number of vDBE subinterface virtual Networks
         required: true
-        status: SUPPORTED
+        status: supported
         constraints:
         - in_range:
           - 1
@@ -62,171 +62,171 @@ node_types:
         type: string
         description: Unique name for this VF module inst
         required: true
-        status: SUPPORTED
+        status: supported
       aap_address_mode:
         type: string
         description: Address mode for the vDBE cluster IP
         required: true
-        status: SUPPORTED
+        status: supported
       control_int_net_shared:
         type: boolean
         description: control virtual network shared
         required: true
-        status: SUPPORTED
+        status: supported
       vdbe_untrusted_v6_ip_1:
         type: string
         description: IPV6 address of the secondary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       vdbe_untrusted_vmac_address:
         type: string
         description: Virtual MAC of the primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       control_int_net_flood_unknown_unicast:
         type: boolean
         description: forwarding mode of the control virtual network
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_1_port_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vdbe_aap_sec_untrusted_ip_prefix:
         type: string
         description: ip prefix for secondary vDBE VM aap on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       vnf_id:
         type: string
         description: Unique ID for this VF inst
         required: true
-        status: SUPPORTED
+        status: supported
       vdbe_name_1:
         type: string
         description: VM Name for this vdbe node 1
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_1_port_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       availability_zone_1:
         type: string
         description: The availability zone of secondary node1 vDBE vm in the local HA pair.
         required: true
-        status: SUPPORTED
+        status: supported
       untrusted_vn_networks:
         type: list
         description: List of subinterface virtual networks
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vdbe_image_name:
         type: string
         description: Image to use for vDBE
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_name:
         type: string
         description: Name of NSDNet network from which the management IP addresses will be allocated
         required: true
-        status: SUPPORTED
+        status: supported
       vdbe_aap_sec_untrusted_ip_prefix_len:
         type: string
         description: ip prefix length for the secondary DBE VM aap on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_1_port_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_1_port_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       vdbe_aap_untrusted_v6_ip_prefix:
         type: string
         description: ipv6 prefix for the primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       vdbe_aap_untrusted_v6_ip_prefix_len:
         type: string
         description: ipv6 prefix length for the primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       fabric_int_net_flood_unknown_unicast:
         type: boolean
         description: forwarding mode of the fabric virtual network
         required: true
-        status: SUPPORTED
+        status: supported
       untrusted_vlan_tags:
         type: list
         description: List of subinterface vlan tags
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vdbe_flavor_name:
         type: string
         description: Flavor to use for vDBE
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_1_port_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       counter:
         type: float
         description: Counter.
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_1_port_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       fabric_int_net_forwarding_mode:
         type: string
         description: forwarding mode of the fabric virtual network
         required: true
-        status: SUPPORTED
+        status: supported
       fabric_int_net_shared:
         description: fabric virtual network shared
         required: true
-        status: SUPPORTED
+        status: supported
       vdbe_hw_untr_mac_1:
         type: string
         description: Secondary MAC address of the secondary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       untrusted_net_name:
         type: string
         description: Name of public untrusted network into which this vDBE HA cluster is deployed
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_1_port_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vdbe_device_name:
         type: string
         description: VDBE device Name for this vdbe VNF
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_1_port_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       vdbe_aap_untrusted_ip_prefix:
         type: string
         description: ip prefix for primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_vdbe_node_1:
         capability: tosca.capabilities.Node
@@ -643,84 +643,84 @@ node_types:
         type: string
         description: ip prefix for primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       aap_sec_untrusted_ip_prefix:
         type: string
         description: ip prefix for secondary vDBE VM aap on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       vdbe_subport_network:
         type: string
         description: List of Contrail VLAN networks to use for the subinterfaces.   The order and number of these must match the VLAN ID list
         required: true
-        status: SUPPORTED
+        status: supported
       ip_v6_address:
         type: string
         description: IPv6 address associated with subinterfaces
         required: true
-        status: SUPPORTED
+        status: supported
       counter:
         type: float
         description: Index of instance among multiple instances.  Use to retrieve correct parameter for this instance when passed all parameters for all instances.
         required: true
-        status: SUPPORTED
+        status: supported
       subinterfaces_name_prefix:
         type: string
         description: Combined with subinterface_instance_index, this is used as the name of the subinterface resource
         required: true
-        status: SUPPORTED
+        status: supported
       ip_address:
         type: string
         description: IPv4 address associated with subinterfaces
         required: true
-        status: SUPPORTED
+        status: supported
       aap_address_mode:
         type: string
         description: Address mode for the vDBE cluster IP
         required: true
-        status: SUPPORTED
+        status: supported
       aap_untrusted_v6_ip_prefix:
         type: string
         description: ipv6 prefix for the primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       parent_interface:
         type: string
         description: Parent Contrail interface
         required: true
-        status: SUPPORTED
+        status: supported
       mac_address:
         type: string
         description: HW MAC address to use for subinterface
         required: true
-        status: SUPPORTED
+        status: supported
       vlan_tag_list:
         type: list
         description: List of VLAN IDs to use for subinterfaces
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       aap_sec_untrusted_ip_prefix_len:
         type: string
         description: ip prefix length for the secondary DBE VM aap on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       vmac_address:
         type: string
         description: virtual MAC address to use for subinterface
         required: true
-        status: SUPPORTED
+        status: supported
       aap_untrusted_v6_ip_prefix_len:
         type: string
         description: ipv6 prefix length for the primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       aap_untrusted_ip_prefix_len:
         type: string
         description: ip prefix length for the primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_vdbe_untr_x_subport:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/subInterfaceNodesConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/subInterfaceNodesConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 0f1d7a446c..65265acaa8 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/subInterfaceNodesConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/subInterfaceNodesConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -12,43 +12,43 @@ node_types:
         type: string
         description: Unique ID for this VF module inst
         required: true
-        status: SUPPORTED
+        status: supported
       control_int_net_rpf:
         type: string
         description: Reverse Path Filtering enable or disable for the control virtual network
         required: true
-        status: SUPPORTED
+        status: supported
       control_int_net_forwarding_mode:
         type: string
         description: forwarding mode of the control virtual network
         required: true
-        status: SUPPORTED
+        status: supported
       vnf_name:
         type: string
         description: Unique name for this VF instance
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_1_port_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       vdbe_untrusted_ip_1:
         type: string
         description: IPV4 address of the secondary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       vdbe_aap_untrusted_ip_prefix_len:
         type: string
         description: ip prefix length for the primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       untrusted_num_vn:
         type: float
         description: Number of vDBE subinterface virtual Networks
         required: true
-        status: SUPPORTED
+        status: supported
         constraints:
         - in_range:
           - 1
@@ -57,152 +57,152 @@ node_types:
         type: string
         description: Unique name for this VF module inst
         required: true
-        status: SUPPORTED
+        status: supported
       aap_address_mode:
         type: string
         description: Address mode for the vDBE cluster IP
         required: true
-        status: SUPPORTED
+        status: supported
       control_int_net_shared:
         type: boolean
         description: control virtual network shared
         required: true
-        status: SUPPORTED
+        status: supported
       vdbe_untrusted_v6_ip_1:
         type: string
         description: IPV6 address of the secondary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       vdbe_untrusted_vmac_address:
         type: string
         description: Virtual MAC of the primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       control_int_net_flood_unknown_unicast:
         type: boolean
         description: forwarding mode of the control virtual network
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_1_port_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vdbe_aap_sec_untrusted_ip_prefix:
         type: string
         description: ip prefix for secondary vDBE VM aap on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       vnf_id:
         type: string
         description: Unique ID for this VF inst
         required: true
-        status: SUPPORTED
+        status: supported
       vdbe_name_1:
         type: string
         description: VM Name for this vdbe node 1
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_1_port_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       availability_zone_1:
         type: string
         description: The availability zone of secondary node1 vDBE vm in the local HA pair.
         required: true
-        status: SUPPORTED
+        status: supported
       untrusted_vn_networks:
         type: list
         description: List of subinterface virtual networks
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vdbe_image_name:
         type: string
         description: Image to use for vDBE
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_name:
         type: string
         description: Name of NSDNet network from which the management IP addresses will be allocated
         required: true
-        status: SUPPORTED
+        status: supported
       vdbe_aap_sec_untrusted_ip_prefix_len:
         type: string
         description: ip prefix length for the secondary DBE VM aap on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_1_port_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_1_port_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       vdbe_aap_untrusted_v6_ip_prefix:
         type: string
         description: ipv6 prefix for the primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       vdbe_aap_untrusted_v6_ip_prefix_len:
         type: string
         description: ipv6 prefix length for the primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       untrusted_vlan_tags:
         type: list
         description: List of subinterface vlan tags
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vdbe_flavor_name:
         type: string
         description: Flavor to use for vDBE
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_1_port_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_1_port_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vdbe_hw_untr_mac_1:
         type: string
         description: Secondary MAC address of the secondary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       untrusted_net_name:
         type: string
         description: Name of public untrusted network into which this vDBE HA cluster is deployed
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_1_port_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vdbe_device_name:
         type: string
         description: VDBE device Name for this vdbe VNF
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_1_port_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       vdbe_aap_untrusted_ip_prefix:
         type: string
         description: ip prefix for primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_vdbe_node_1:
         capability: tosca.capabilities.Node
@@ -592,84 +592,84 @@ node_types:
         type: string
         description: ip prefix for primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       aap_sec_untrusted_ip_prefix:
         type: string
         description: ip prefix for secondary vDBE VM aap on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       vdbe_subport_network:
         type: string
         description: List of Contrail VLAN networks to use for the subinterfaces.   The order and number of these must match the VLAN ID list
         required: true
-        status: SUPPORTED
+        status: supported
       ip_v6_address:
         type: string
         description: IPv6 address associated with subinterfaces
         required: true
-        status: SUPPORTED
+        status: supported
       counter:
         type: float
         description: Index of instance among multiple instances.  Use to retrieve correct parameter for this instance when passed all parameters for all instances.
         required: true
-        status: SUPPORTED
+        status: supported
       subinterfaces_name_prefix:
         type: string
         description: Combined with subinterface_instance_index, this is used as the name of the subinterface resource
         required: true
-        status: SUPPORTED
+        status: supported
       ip_address:
         type: string
         description: IPv4 address associated with subinterfaces
         required: true
-        status: SUPPORTED
+        status: supported
       aap_address_mode:
         type: string
         description: Address mode for the vDBE cluster IP
         required: true
-        status: SUPPORTED
+        status: supported
       aap_untrusted_v6_ip_prefix:
         type: string
         description: ipv6 prefix for the primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       parent_interface:
         type: string
         description: Parent Contrail interface
         required: true
-        status: SUPPORTED
+        status: supported
       mac_address:
         type: string
         description: HW MAC address to use for subinterface
         required: true
-        status: SUPPORTED
+        status: supported
       vlan_tag_list:
         type: list
         description: List of VLAN IDs to use for subinterfaces
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       aap_sec_untrusted_ip_prefix_len:
         type: string
         description: ip prefix length for the secondary DBE VM aap on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       vmac_address:
         type: string
         description: virtual MAC address to use for subinterface
         required: true
-        status: SUPPORTED
+        status: supported
       aap_untrusted_v6_ip_prefix_len:
         type: string
         description: ipv6 prefix length for the primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       aap_untrusted_ip_prefix_len:
         type: string
         description: ip prefix length for the primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_vdbe_untr_x_subport:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/baseScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/baseScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml
index ad64e97e78..2bc572443d 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/baseScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/baseScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -12,86 +12,86 @@ node_types:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       p2:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       ps_server_1b_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       packet_internal_network_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       pd_server_1b_names:
         type: list
         description: PD server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       security_group_name:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       ps_server_1b_names:
         type: list
         description: Ps server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       ps_server_2b_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       pd_server_1b_flavor:
         type: string
         description: Flavor for PD server
         required: true
-        status: SUPPORTED
+        status: supported
       pd_server_1b_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       packet_external_network_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       availability_zone_0:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       ps_server_1b_flavor:
         type: string
         description: Flavor for PS server
         required: true
-        status: SUPPORTED
+        status: supported
       ps_server_1b_image:
         type: string
         description: Ps Image server
         required: true
-        status: SUPPORTED
+        status: supported
       net:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       pd_server_1b_image:
         type: string
         description: PD Image server
         required: true
-        status: SUPPORTED
+        status: supported
       pd_server_2b_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_pd_server_1b_port:
         capability: tosca.capabilities.Node
@@ -1014,169 +1014,169 @@ node_types:
       port_pd_server_2b_port_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_pd_server_1b_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd_server_2b_port_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_pd_server_2b_port_fixed_ips:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
       port_pd_server_2b_port_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_nested_vlan_net1:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd_server_1b_port_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pd_server_2b_port_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_2b_port_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_nested_vlan_parent_interface:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd_server_1b_port_fixed_ips:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
       port_pd_server_2b_port_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       compute_pd_server_1b_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd_server_1b_port_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_1b_port_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       subinterface_nested_vlan_service_template_filter_count:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: float
       port_pd_server_2b_port_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       port_pd_server_1b_port_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_pd_server_1b_port_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_1b_port_replacement_policy:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd_server_1b_port_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_2b_port_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_1b_port_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_1b_port_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd_server_2b_port_replacement_policy:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd_server_2b_port_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_2b_port_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pd_server_1b_port_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_1b_port_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_pd_server_1b_pd_server_2b_port:
         capability: tosca.capabilities.Node
@@ -1639,151 +1639,151 @@ node_types:
       port_ps_server_2b_port_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_ps_server_2b_port_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps_server_1b_port_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps_server_1b_port_fixed_ips:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
       port_ps_server_2b_port_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps_server_1b_port_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_ps_server_1b_port_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps_server_2b_port_fixed_ips:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
       port_ps_server_2b_port_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       compute_ps_server_1b_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_ps_server_1b_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_ps_server_1b_port_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_ps_server_1b_port_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       port_ps_server_1b_port_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps_server_2b_port_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_ps_server_2b_port_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps_server_1b_port_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_ps_server_1b_port_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_ps_server_2b_port_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_ps_server_1b_port_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps_server_2b_port_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps_server_1b_port_replacement_policy:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_ps_server_1b_port_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps_server_2b_port_replacement_policy:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_ps_server_2b_port_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps_server_2b_port_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_ps_server_1b:
         capability: tosca.capabilities.Node
@@ -2216,40 +2216,40 @@ node_types:
       vlan_ids:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       parent_interface:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       virtual_ipv6_address:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       virtual_ip_address:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       lb_st_vlan_type_oam:
         type: string
         description: dummy
         required: true
-        status: SUPPORTED
+        status: supported
       mac_address:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       net1:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_name_prefix:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_instance_index:
         type: float
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_template_Vlan_vmi_1:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedDiffComputeScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedDiffComputeScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 0aaf991239..56567e073a 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedDiffComputeScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedDiffComputeScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -12,59 +12,59 @@ node_types:
         type: string
         description: port network
         required: true
-        status: SUPPORTED
+        status: supported
       pd_server_1b_flavor:
         type: string
         description: Flavor for PD server
         required: true
-        status: SUPPORTED
+        status: supported
       pd_server_1b_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       packet_external_network_name:
         type: string
         description: network name
         required: true
-        status: SUPPORTED
+        status: supported
       packet_internal_network_name:
         type: string
         description: network name
         required: true
-        status: SUPPORTED
+        status: supported
       pd_server_1b_names:
         type: list
         description: PD server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       security_group_name:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       availability_zone_0:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       sub_inf_net:
         type: string
         description: sub interface network
         required: true
-        status: SUPPORTED
+        status: supported
       pd_server_1b_image:
         type: string
         description: PD Image server
         required: true
-        status: SUPPORTED
+        status: supported
       pd_server_2b_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_server_1b_pd_0:
         capability: tosca.capabilities.Node
@@ -909,107 +909,107 @@ node_types:
       compute_pd_server_1b_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_nested_vlan_service_template_filter_count:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: float
       port_pd_server_1b_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_1b_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       port_pd_server_1b_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_pd_server_1b_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_1b_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_1b_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_nested_vlan_net1:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd_server_1b_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_1b_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       subinterface_nested_vlan_parent_interface:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd_server_1b_port_0_replacement_policy:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd_server_1b_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_1b_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       compute_pd_server_1b_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd_server_1b_port_0_fixed_ips:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
     requirements:
@@ -1390,100 +1390,100 @@ node_types:
       port_ps_server_1b_port_1_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps_server_1b_port_1_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       ps_server_1b_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps_server_1b_port_1_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       security_group_name:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_ps_server_1b_port_1_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       ps_server_1b_names:
         type: list
         description: Ps server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       packet_ext_network_name:
         type: string
         description: network name
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps_server_1b_port_1_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_net:
         type: string
         description: port network
         required: true
-        status: SUPPORTED
+        status: supported
       ps_server_2b_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       packet_int_network_name:
         type: string
         description: network name
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps_server_1b_port_1_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps_server_1b_port_1_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps_server_1b_port_1_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       availability_zone_0:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       ps_server_1b_flavor:
         type: string
         description: Flavor for PS server
         required: true
-        status: SUPPORTED
+        status: supported
       ps_server_1b_image:
         type: string
         description: Ps Image server
         required: true
-        status: SUPPORTED
+        status: supported
       sub_inf_net:
         type: string
         description: sub interface network
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps_server_1b_port_1_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
     requirements:
@@ -1906,40 +1906,40 @@ node_types:
       vlan_ids:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       parent_interface:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       virtual_ipv6_address:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       virtual_ip_address:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       lb_st_vlan_type_oam:
         type: string
         description: dummy
         required: true
-        status: SUPPORTED
+        status: supported
       mac_address:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       net1:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_name_prefix:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_instance_index:
         type: float
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_template_Vlan_vmi_1:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml
index fe48762a9b..335a4a67fa 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -12,59 +12,59 @@ node_types:
         type: string
         description: port network
         required: true
-        status: SUPPORTED
+        status: supported
       pd_server_1b_flavor:
         type: string
         description: Flavor for PD server
         required: true
-        status: SUPPORTED
+        status: supported
       pd_server_1b_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       packet_external_network_name:
         type: string
         description: network name
         required: true
-        status: SUPPORTED
+        status: supported
       packet_internal_network_name:
         type: string
         description: network name
         required: true
-        status: SUPPORTED
+        status: supported
       pd_server_1b_names:
         type: list
         description: PD server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       security_group_name:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       availability_zone_0:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       sub_inf_net:
         type: string
         description: sub interface network
         required: true
-        status: SUPPORTED
+        status: supported
       pd_server_1b_image:
         type: string
         description: PD Image server
         required: true
-        status: SUPPORTED
+        status: supported
       pd_server_2b_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_server_1b_pd_0:
         capability: tosca.capabilities.Node
@@ -1267,107 +1267,107 @@ node_types:
       compute_pd_server_1b_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_nested_vlan_service_template_filter_count:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: float
       port_pd_server_1b_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_1b_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       port_pd_server_1b_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_pd_server_1b_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_1b_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_1b_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_nested_vlan_net1:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd_server_1b_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_1b_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       subinterface_nested_vlan_parent_interface:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd_server_1b_port_0_replacement_policy:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd_server_1b_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_1b_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       compute_pd_server_1b_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd_server_1b_port_0_fixed_ips:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
     requirements:
@@ -1749,59 +1749,59 @@ node_types:
         type: string
         description: port network
         required: true
-        status: SUPPORTED
+        status: supported
       ps_server_2b_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       ps_server_1b_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       packet_int_network_name:
         type: string
         description: network name
         required: true
-        status: SUPPORTED
+        status: supported
       security_group_name:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       availability_zone_0:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       ps_server_1b_flavor:
         type: string
         description: Flavor for PS server
         required: true
-        status: SUPPORTED
+        status: supported
       ps_server_1b_image:
         type: string
         description: Ps Image server
         required: true
-        status: SUPPORTED
+        status: supported
       sub_inf_net:
         type: string
         description: sub interface network
         required: true
-        status: SUPPORTED
+        status: supported
       ps_server_1b_names:
         type: list
         description: Ps server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       packet_ext_network_name:
         type: string
         description: network name
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_server_1b_ps_1:
         capability: tosca.capabilities.Node
@@ -2580,17 +2580,17 @@ node_types:
       port_ps_server_1b_port_1_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps_server_1b_port_1_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       subinterface_nested_vlan_service_template_filter_count:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: float
       index_value:
@@ -2598,89 +2598,89 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       port_ps_server_1b_port_1_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps_server_1b_port_1_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps_server_1b_port_1_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_nested_vlan_net1:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps_server_1b_port_1_replacement_policy:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_ps_server_1b_port_1_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps_server_1b_port_1_fixed_ips:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
       subinterface_nested_vlan_parent_interface:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_ps_server_1b_port_1_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps_server_1b_port_1_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps_server_1b_port_1_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_ps_server_1b_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_ps_server_1b_port_1_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       compute_ps_server_1b_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
     requirements:
@@ -3061,40 +3061,40 @@ node_types:
       vlan_ids:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       parent_interface:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       virtual_ipv6_address:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       virtual_ip_address:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       lb_st_vlan_type_oam:
         type: string
         description: dummy
         required: true
-        status: SUPPORTED
+        status: supported
       mac_address:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       net1:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_name_prefix:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_instance_index:
         type: float
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_template_Vlan_vmi_1:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 6cbf3dfc19..2de8e509bc 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -11,75 +11,75 @@ node_types:
       ps_server_1b_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       pd_server_1b_names:
         type: list
         description: PD server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       security_group_name:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       ps_server_1b_names:
         type: list
         description: Ps server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_net:
         type: string
         description: port network
         required: true
-        status: SUPPORTED
+        status: supported
       ps_server_2b_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       pd_server_1b_flavor:
         type: string
         description: Flavor for PD server
         required: true
-        status: SUPPORTED
+        status: supported
       pd_server_1b_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       availability_zone_0:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       ps_server_1b_flavor:
         type: string
         description: Flavor for PS server
         required: true
-        status: SUPPORTED
+        status: supported
       ps_server_1b_image:
         type: string
         description: Ps Image server
         required: true
-        status: SUPPORTED
+        status: supported
       sub_inf_net:
         type: string
         description: sub interface network
         required: true
-        status: SUPPORTED
+        status: supported
       pd_server_1b_image:
         type: string
         description: PD Image server
         required: true
-        status: SUPPORTED
+        status: supported
       pd_server_2b_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_server_1b_pd_0:
         capability: tosca.capabilities.Node
@@ -840,107 +840,107 @@ node_types:
       compute_pd_server_1b_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_nested_vlan_service_template_filter_count:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: float
       port_pd_server_1b_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_1b_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       port_pd_server_1b_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_pd_server_1b_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_1b_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_1b_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_nested_vlan_net1:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd_server_1b_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_1b_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       subinterface_nested_vlan_parent_interface:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd_server_1b_port_0_replacement_policy:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd_server_1b_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_1b_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       compute_pd_server_1b_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd_server_1b_port_0_fixed_ips:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
     requirements:
@@ -1321,117 +1321,117 @@ node_types:
       port_pd_server_1b_port_1_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_1b_port_1_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_pd_server_1b_port_1_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_1b_port_1_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_1b_port_1_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       ps_server_1b_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       pd_server_1b_names:
         type: list
         description: PD server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       security_group_name:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd_server_1b_port_1_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       ps_server_1b_names:
         type: list
         description: Ps server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_net:
         type: string
         description: port network
         required: true
-        status: SUPPORTED
+        status: supported
       ps_server_2b_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       pd_server_1b_flavor:
         type: string
         description: Flavor for PD server
         required: true
-        status: SUPPORTED
+        status: supported
       pd_server_1b_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_1b_port_1_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       availability_zone_0:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       ps_server_1b_flavor:
         type: string
         description: Flavor for PS server
         required: true
-        status: SUPPORTED
+        status: supported
       ps_server_1b_image:
         type: string
         description: Ps Image server
         required: true
-        status: SUPPORTED
+        status: supported
       sub_inf_net:
         type: string
         description: sub interface network
         required: true
-        status: SUPPORTED
+        status: supported
       pd_server_1b_image:
         type: string
         description: PD Image server
         required: true
-        status: SUPPORTED
+        status: supported
       pd_server_2b_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_1b_port_1_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_pd_server_1b_port_1_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_test_resourceGroup_1:
         capability: tosca.capabilities.Node
@@ -1810,40 +1810,40 @@ node_types:
       vlan_ids:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       parent_interface:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       virtual_ipv6_address:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       virtual_ip_address:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       lb_st_vlan_type_oam:
         type: string
         description: dummy
         required: true
-        status: SUPPORTED
+        status: supported
       mac_address:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       net1:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_name_prefix:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_instance_index:
         type: float
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_template_Vlan_vmi_1:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 6d8d1684d9..79dbce48e4 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -11,37 +11,37 @@ node_types:
       compute_pd_server_1b_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_nested_vlan_service_template_filter_count:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: float
       port_pd_server_1b_port_1_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_1b_port_1_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_pd_server_1b_port_1_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_1b_port_1_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_1b_port_1_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       index_value:
@@ -49,71 +49,71 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       port_pd_server_1b_port_1_fixed_ips:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
       port_pd_server_1b_port_1_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_nested_vlan_net1:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd_server_1b_port_1_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_1b_port_1_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_nested_vlan_parent_interface:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd_server_1b_port_1_replacement_policy:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd_server_1b_port_1_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       compute_pd_server_1b_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd_server_1b_port_1_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_pd_server_1b:
         capability: tosca.capabilities.Node
@@ -492,81 +492,81 @@ node_types:
       ps_server_1b_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       pd_server_1b_names:
         type: list
         description: PD server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       security_group_name:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       ps_server_1b_names:
         type: list
         description: Ps server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       packet_ext_network_name:
         type: string
         description: network name
         required: true
-        status: SUPPORTED
+        status: supported
       port_net:
         type: string
         description: port network
         required: true
-        status: SUPPORTED
+        status: supported
       ps_server_2b_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       pd_server_1b_flavor:
         type: string
         description: Flavor for PD server
         required: true
-        status: SUPPORTED
+        status: supported
       pd_server_1b_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       packet_int_network_name:
         type: string
         description: network name
         required: true
-        status: SUPPORTED
+        status: supported
       availability_zone_0:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       ps_server_1b_flavor:
         type: string
         description: Flavor for PS server
         required: true
-        status: SUPPORTED
+        status: supported
       ps_server_1b_image:
         type: string
         description: Ps Image server
         required: true
-        status: SUPPORTED
+        status: supported
       sub_inf_net:
         type: string
         description: sub interface network
         required: true
-        status: SUPPORTED
+        status: supported
       pd_server_1b_image:
         type: string
         description: PD Image server
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_test_resourceGroup_2:
         capability: tosca.capabilities.Node
@@ -2013,23 +2013,23 @@ node_types:
       compute_pd_server_1b_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd_server_1b_port_2_fixed_ips:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
       port_pd_server_1b_port_2_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_1b_port_2_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       index_value:
@@ -2037,65 +2037,65 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_1b_port_2_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_pd_server_1b_port_2_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pd_server_1b_port_2_replacement_policy:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_1b_port_2_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_1b_port_2_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd_server_1b_port_2_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_1b_port_2_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_1b_port_2_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_1b_port_2_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       compute_pd_server_1b_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
     requirements:
@@ -2446,23 +2446,23 @@ node_types:
       port_ps_server_1b_port_2_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_ps_server_1b_port_2_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_ps_server_1b_port_2_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_nested_vlan_service_template_filter_count:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: float
       index_value:
@@ -2470,83 +2470,83 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       port_ps_server_1b_port_2_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_ps_server_1b_port_2_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps_server_1b_port_2_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps_server_1b_port_2_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps_server_1b_port_2_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_nested_vlan_net1:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_ps_server_1b_port_2_fixed_ips:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
       port_ps_server_1b_port_2_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps_server_1b_port_2_replacement_policy:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_nested_vlan_parent_interface:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_ps_server_1b_port_2_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       compute_ps_server_1b_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_ps_server_1b_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
     requirements:
@@ -2927,40 +2927,40 @@ node_types:
       vlan_ids:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       parent_interface:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       virtual_ipv6_address:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       virtual_ip_address:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       lb_st_vlan_type_oam:
         type: string
         description: dummy
         required: true
-        status: SUPPORTED
+        status: supported
       mac_address:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       net1:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_name_prefix:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_instance_index:
         type: float
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_template_Vlan_vmi_1:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCScalingScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCScalingScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml
index e53e4ad2c3..7ed0ae1057 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCScalingScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCScalingScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -12,86 +12,86 @@ node_types:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       p2:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       ps_server_1b_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       packet_internal_network_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       pd_server_1b_names:
         type: list
         description: PD server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       security_group_name:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       ps_server_1b_names:
         type: list
         description: Ps server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       ps_server_2b_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       pd_server_1b_flavor:
         type: string
         description: Flavor for PD server
         required: true
-        status: SUPPORTED
+        status: supported
       pd_server_1b_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       packet_external_network_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       availability_zone_0:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       ps_server_1b_flavor:
         type: string
         description: Flavor for PS server
         required: true
-        status: SUPPORTED
+        status: supported
       ps_server_1b_image:
         type: string
         description: Ps Image server
         required: true
-        status: SUPPORTED
+        status: supported
       net:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       pd_server_1b_image:
         type: string
         description: PD Image server
         required: true
-        status: SUPPORTED
+        status: supported
       pd_server_2b_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_server_1b_pd_0:
         capability: tosca.capabilities.Node
@@ -870,37 +870,37 @@ node_types:
       compute_pd_server_1b_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_nested_vlan_service_template_filter_count:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: float
       port_pd_server_1b_port_1_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_1b_port_1_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_pd_server_1b_port_1_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_1b_port_1_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_1b_port_1_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       index_value:
@@ -908,71 +908,71 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       port_pd_server_1b_port_1_fixed_ips:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
       port_pd_server_1b_port_1_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_nested_vlan_net1:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd_server_1b_port_1_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_1b_port_1_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_nested_vlan_parent_interface:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd_server_1b_port_1_replacement_policy:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd_server_1b_port_1_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       compute_pd_server_1b_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd_server_1b_port_1_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_pd_server_1b:
         capability: tosca.capabilities.Node
@@ -1351,40 +1351,40 @@ node_types:
       vlan_ids:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       parent_interface:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       virtual_ipv6_address:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       virtual_ip_address:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       lb_st_vlan_type_oam:
         type: string
         description: dummy
         required: true
-        status: SUPPORTED
+        status: supported
       mac_address:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       net1:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_name_prefix:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_instance_index:
         type: float
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_template_Vlan_vmi_1:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 3c0d996aeb..48b6a09547 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -12,59 +12,59 @@ node_types:
         type: string
         description: port network
         required: true
-        status: SUPPORTED
+        status: supported
       pd_server_1b_flavor:
         type: string
         description: Flavor for PD server
         required: true
-        status: SUPPORTED
+        status: supported
       pd_server_1b_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       packet_external_network_name:
         type: string
         description: network name
         required: true
-        status: SUPPORTED
+        status: supported
       packet_internal_network_name:
         type: string
         description: network name
         required: true
-        status: SUPPORTED
+        status: supported
       pd_server_1b_names:
         type: list
         description: PD server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       security_group_name:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       availability_zone_0:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       sub_inf_net:
         type: string
         description: sub interface network
         required: true
-        status: SUPPORTED
+        status: supported
       pd_server_1b_image:
         type: string
         description: PD Image server
         required: true
-        status: SUPPORTED
+        status: supported
       pd_server_2b_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_server_1b_pd_0:
         capability: tosca.capabilities.Node
@@ -1243,107 +1243,107 @@ node_types:
       compute_pd_server_1b_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_nested_vlan_service_template_filter_count:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: float
       port_pd_server_1b_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_1b_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       port_pd_server_1b_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_pd_server_1b_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_1b_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_1b_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_nested_vlan_net1:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd_server_1b_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_1b_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       subinterface_nested_vlan_parent_interface:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd_server_1b_port_0_replacement_policy:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd_server_1b_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_1b_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       compute_pd_server_1b_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd_server_1b_port_0_fixed_ips:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
     requirements:
@@ -1725,59 +1725,59 @@ node_types:
         type: string
         description: port network
         required: true
-        status: SUPPORTED
+        status: supported
       ps_server_2b_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       ps_server_1b_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       packet_int_network_name:
         type: string
         description: network name
         required: true
-        status: SUPPORTED
+        status: supported
       security_group_name:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       availability_zone_0:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       ps_server_1b_flavor:
         type: string
         description: Flavor for PS server
         required: true
-        status: SUPPORTED
+        status: supported
       ps_server_1b_image:
         type: string
         description: Ps Image server
         required: true
-        status: SUPPORTED
+        status: supported
       sub_inf_net:
         type: string
         description: sub interface network
         required: true
-        status: SUPPORTED
+        status: supported
       ps_server_1b_names:
         type: list
         description: Ps server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       packet_ext_network_name:
         type: string
         description: network name
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_server_1b_ps_1:
         capability: tosca.capabilities.Node
@@ -2532,11 +2532,11 @@ node_types:
       port_ps_server_1b_port_1_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps_server_1b_port_1_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       index_value:
@@ -2544,77 +2544,77 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       port_ps_server_1b_port_1_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps_server_1b_port_1_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps_server_1b_port_1_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps_server_1b_port_1_replacement_policy:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_ps_server_1b_port_1_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps_server_1b_port_1_fixed_ips:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
       port_ps_server_1b_port_1_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps_server_1b_port_1_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps_server_1b_port_1_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_ps_server_1b_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_ps_server_1b_port_1_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       compute_ps_server_1b_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
     requirements:
@@ -2965,17 +2965,17 @@ node_types:
       port_ps_server_1b_port_1_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps_server_1b_port_1_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       subinterface_nested_vlan_service_template_filter_count:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: float
       index_value:
@@ -2983,89 +2983,89 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       port_ps_server_1b_port_1_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps_server_1b_port_1_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps_server_1b_port_1_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_nested_vlan_net1:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps_server_1b_port_1_replacement_policy:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_ps_server_1b_port_1_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps_server_1b_port_1_fixed_ips:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
       subinterface_nested_vlan_parent_interface:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_ps_server_1b_port_1_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps_server_1b_port_1_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps_server_1b_port_1_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_ps_server_1b_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_ps_server_1b_port_1_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       compute_ps_server_1b_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
     requirements:
@@ -3446,40 +3446,40 @@ node_types:
       vlan_ids:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       parent_interface:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       virtual_ipv6_address:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       virtual_ip_address:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       lb_st_vlan_type_oam:
         type: string
         description: dummy
         required: true
-        status: SUPPORTED
+        status: supported
       mac_address:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       net1:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_name_prefix:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_instance_index:
         type: float
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_template_Vlan_vmi_1:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml
index e44facaecf..ae721fd9e1 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -12,59 +12,59 @@ node_types:
         type: string
         description: port network
         required: true
-        status: SUPPORTED
+        status: supported
       pd_server_1b_flavor:
         type: string
         description: Flavor for PD server
         required: true
-        status: SUPPORTED
+        status: supported
       pd_server_1b_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       packet_external_network_name:
         type: string
         description: network name
         required: true
-        status: SUPPORTED
+        status: supported
       packet_internal_network_name:
         type: string
         description: network name
         required: true
-        status: SUPPORTED
+        status: supported
       pd_server_1b_names:
         type: list
         description: PD server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       security_group_name:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       availability_zone_0:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       sub_inf_net:
         type: string
         description: sub interface network
         required: true
-        status: SUPPORTED
+        status: supported
       pd_server_1b_image:
         type: string
         description: PD Image server
         required: true
-        status: SUPPORTED
+        status: supported
       pd_server_2b_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_server_1b_pd_0:
         capability: tosca.capabilities.Node
@@ -1267,107 +1267,107 @@ node_types:
       compute_pd_server_1b_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_nested_vlan_service_template_filter_count:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: float
       port_pd_server_1b_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_1b_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       port_pd_server_1b_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_pd_server_1b_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_1b_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_1b_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_nested_vlan_net1:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd_server_1b_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_1b_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       subinterface_nested_vlan_parent_interface:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd_server_1b_port_0_replacement_policy:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd_server_1b_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_pd_server_1b_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       compute_pd_server_1b_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_pd_server_1b_port_0_fixed_ips:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
     requirements:
@@ -1749,59 +1749,59 @@ node_types:
         type: string
         description: port network
         required: true
-        status: SUPPORTED
+        status: supported
       ps_server_2b_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       ps_server_1b_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       packet_int_network_name:
         type: string
         description: network name
         required: true
-        status: SUPPORTED
+        status: supported
       security_group_name:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       availability_zone_0:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       ps_server_1b_flavor:
         type: string
         description: Flavor for PS server
         required: true
-        status: SUPPORTED
+        status: supported
       ps_server_1b_image:
         type: string
         description: Ps Image server
         required: true
-        status: SUPPORTED
+        status: supported
       sub_inf_net:
         type: string
         description: sub interface network
         required: true
-        status: SUPPORTED
+        status: supported
       ps_server_1b_names:
         type: list
         description: Ps server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       packet_ext_network_name:
         type: string
         description: network name
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_server_1b_ps_1:
         capability: tosca.capabilities.Node
@@ -2580,17 +2580,17 @@ node_types:
       port_ps_server_1b_port_1_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps_server_1b_port_1_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       subinterface_nested_vlan_service_template_filter_count:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: float
       index_value:
@@ -2598,89 +2598,89 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       port_ps_server_1b_port_1_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps_server_1b_port_1_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps_server_1b_port_1_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_nested_vlan_net1:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps_server_1b_port_1_replacement_policy:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_ps_server_1b_port_1_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps_server_1b_port_1_fixed_ips:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
       subinterface_nested_vlan_parent_interface:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_ps_server_1b_port_1_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps_server_1b_port_1_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_ps_server_1b_port_1_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_ps_server_1b_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_ps_server_1b_port_1_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       compute_ps_server_1b_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
     requirements:
@@ -3061,40 +3061,40 @@ node_types:
       vlan_ids:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       parent_interface:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       virtual_ipv6_address:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       virtual_ip_address:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       lb_st_vlan_type_oam:
         type: string
         description: dummy
         required: true
-        status: SUPPORTED
+        status: supported
       mac_address:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       net1:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_name_prefix:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_instance_index:
         type: float
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_template_subint_Vlan_vmi_1:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRole/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRole/out/GlobalSubstitutionTypesServiceTemplate.yaml
index b63bc3034c..cccda2fd34 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRole/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRole/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -11,281 +11,281 @@ node_types:
       subinterface_vdbe_untr_1_subports_ip_address:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_vdbe_untr_1_subports_aap_sec_untrusted_ip_prefix:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_vdbe_untr_2_subports_aap_untrusted_v6_ip_prefix:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_vdbe_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_vdbe_untr_2_subports_aap_address_mode:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_vdbe_untr_2_subports_aap_untrusted_ip_prefix_len:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_vdbe_untr_1_subports_mac_address:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_vdbe_untr_1_subports_subinterfaces_name_prefix:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_vdbe_untr_1_subports_aap_untrusted_v6_ip_prefix_len:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_vdbe_metadata:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       subinterface_vdbe_untr_2_subports_counter:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: float
       subinterface_vdbe_untr_2_subports_vmac_address:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_untr_port_1_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       subinterface_vdbe_untr_1_subports_aap_address_mode:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_vdbe_untr_2_subports_vlan_tag_list:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_vdbe_untr_port_1_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_port_1_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_vdbe_untr_1_subports_vn_network_list:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_vdbe_untr_2_subports_vn_network_list:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_vdbe_untr_1_subports_aap_untrusted_v6_ip_prefix:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_vdbe_untr_2_subports_ip_v6_address:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_vdbe_untr_2_subports_mac_address:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_vdbe_untr_2_subports_aap_untrusted_v6_ip_prefix_len:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_vdbe_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_vdbe_untr_1_subports_aap_sec_untrusted_ip_prefix_len:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_vdbe_untr_2_subports_aap_sec_untrusted_ip_prefix_len:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_vdbe_untr_1_subports_vlan_tag_list:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       subinterface_vdbe_untr_2_subports_aap_untrusted_ip_prefix:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_vdbe_untr_1_subports_aap_untrusted_ip_prefix:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_untr_port_1_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_untr_port_1_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_port_1_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_port_1_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_vdbe_untr_1_subports_ip_v6_address:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_untr_port_1_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_vdbe_untr_port_1_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       subinterface_vdbe_untr_1_subports_parent_interface:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_vdbe_untr_2_subports_service_template_filter_count:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: float
       subinterface_vdbe_untr_1_subports_service_template_filter_count:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: float
       port_vdbe_untr_port_1_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       subinterface_vdbe_untr_2_subports_ip_address:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_vdbe_untr_1_subports_vmac_address:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_vdbe_untr_2_subports_subinterfaces_name_prefix:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_vdbe_untr_2_subports_aap_sec_untrusted_ip_prefix:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_vdbe_untr_1_subports_aap_untrusted_ip_prefix_len:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_vdbe_untr_2_subports_parent_interface:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
     requirements:
@@ -697,84 +697,84 @@ node_types:
         type: string
         description: ip prefix for primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       aap_sec_untrusted_ip_prefix:
         type: string
         description: ip prefix for secondary vDBE VM aap on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       ip_v6_address:
         type: string
         description: IPv6 address associated with subinterfaces
         required: true
-        status: SUPPORTED
+        status: supported
       counter:
         type: float
         description: Index of instance among multiple instances.  Use to retrieve correct parameter for this instance when passed all parameters for all instances.
         required: true
-        status: SUPPORTED
+        status: supported
       subinterfaces_name_prefix:
         type: string
         description: Combined with subinterface_instance_index, this is used as the name of the subinterface resource
         required: true
-        status: SUPPORTED
+        status: supported
       ip_address:
         type: string
         description: IPv4 address associated with subinterfaces
         required: true
-        status: SUPPORTED
+        status: supported
       aap_address_mode:
         type: string
         description: Address mode for the vDBE cluster IP
         required: true
-        status: SUPPORTED
+        status: supported
       aap_untrusted_v6_ip_prefix:
         type: string
         description: ipv6 prefix for the primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       parent_interface:
         type: string
         description: Parent Contrail interface
         required: true
-        status: SUPPORTED
+        status: supported
       vn_network_list:
         type: string
         description: List of Contrail VLAN networks to use for the subinterfaces.   The order and number of these must match the VLAN ID list
         required: true
-        status: SUPPORTED
+        status: supported
       mac_address:
         type: string
         description: HW MAC address to use for subinterface
         required: true
-        status: SUPPORTED
+        status: supported
       vlan_tag_list:
         type: list
         description: List of VLAN IDs to use for subinterfaces
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       aap_sec_untrusted_ip_prefix_len:
         type: string
         description: ip prefix length for the secondary DBE VM aap on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       vmac_address:
         type: string
         description: virtual MAC address to use for subinterface
         required: true
-        status: SUPPORTED
+        status: supported
       aap_untrusted_v6_ip_prefix_len:
         type: string
         description: ipv6 prefix length for the primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       aap_untrusted_ip_prefix_len:
         type: string
         description: ip prefix length for the primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_vdbe_0_subint_untr_vmi_0:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRoleAndTwoAbstractNodes/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRoleAndTwoAbstractNodes/out/GlobalSubstitutionTypesServiceTemplate.yaml
index acb814e35d..67c33c16d1 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRoleAndTwoAbstractNodes/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRoleAndTwoAbstractNodes/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -11,185 +11,185 @@ node_types:
       subinterface_nested_parent_interface:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_nested_aap_address_mode:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_nested_vlan_tag_list:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       compute_vdbe_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_nested_service_template_filter_count:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: float
       subinterface_nested_aap_untrusted_v6_ip_prefix_len:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_untr_port_1_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_untr_port_1_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_port_1_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_nested_aap_untrusted_ip_prefix:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_untr_port_1_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_nested_aap_sec_untrusted_ip_prefix_len:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_nested_aap_sec_untrusted_ip_prefix:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_nested_aap_untrusted_v6_ip_prefix:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_vdbe_metadata:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       subinterface_nested_mac_address:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_nested_ip_address:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_untr_port_1_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       subinterface_nested_ip_v6_address:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_untr_port_1_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_vdbe_untr_port_1_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_port_1_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_port_1_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       subinterface_nested_vmac_address:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_nested_vn_network_list:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_untr_port_1_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       subinterface_nested_aap_untrusted_ip_prefix_len:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_nested_counter:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: float
       subinterface_nested_subinterfaces_name_prefix:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_vdbe_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
     requirements:
@@ -571,84 +571,84 @@ node_types:
         type: string
         description: ip prefix for primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       aap_sec_untrusted_ip_prefix:
         type: string
         description: ip prefix for secondary vDBE VM aap on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       ip_v6_address:
         type: string
         description: IPv6 address associated with subinterfaces
         required: true
-        status: SUPPORTED
+        status: supported
       counter:
         type: float
         description: Index of instance among multiple instances.  Use to retrieve correct parameter for this instance when passed all parameters for all instances.
         required: true
-        status: SUPPORTED
+        status: supported
       subinterfaces_name_prefix:
         type: string
         description: Combined with subinterface_instance_index, this is used as the name of the subinterface resource
         required: true
-        status: SUPPORTED
+        status: supported
       ip_address:
         type: string
         description: IPv4 address associated with subinterfaces
         required: true
-        status: SUPPORTED
+        status: supported
       aap_address_mode:
         type: string
         description: Address mode for the vDBE cluster IP
         required: true
-        status: SUPPORTED
+        status: supported
       aap_untrusted_v6_ip_prefix:
         type: string
         description: ipv6 prefix for the primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       parent_interface:
         type: string
         description: Parent Contrail interface
         required: true
-        status: SUPPORTED
+        status: supported
       vn_network_list:
         type: string
         description: List of Contrail VLAN networks to use for the subinterfaces.   The order and number of these must match the VLAN ID list
         required: true
-        status: SUPPORTED
+        status: supported
       mac_address:
         type: string
         description: HW MAC address to use for subinterface
         required: true
-        status: SUPPORTED
+        status: supported
       vlan_tag_list:
         type: list
         description: List of VLAN IDs to use for subinterfaces
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       aap_sec_untrusted_ip_prefix_len:
         type: string
         description: ip prefix length for the secondary DBE VM aap on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       vmac_address:
         type: string
         description: virtual MAC address to use for subinterface
         required: true
-        status: SUPPORTED
+        status: supported
       aap_untrusted_v6_ip_prefix_len:
         type: string
         description: ipv6 prefix length for the primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       aap_untrusted_ip_prefix_len:
         type: string
         description: ip prefix length for the primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_vdbe_0_subint_untr_vmi_0:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/pattern4SubInterfaceNodesConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/pattern4SubInterfaceNodesConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml
index e170d5aaa1..84fb551d85 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/pattern4SubInterfaceNodesConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/pattern4SubInterfaceNodesConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -12,53 +12,53 @@ node_types:
         type: string
         description: Unique ID for this VF module inst
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_0_untr_vmi_1_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_vdbe_0_untr_vmi_1_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       control_int_net_rpf:
         type: string
         description: Reverse Path Filtering enable or disable for the control virtual network
         required: true
-        status: SUPPORTED
+        status: supported
       control_int_net_forwarding_mode:
         type: string
         description: forwarding mode of the control virtual network
         required: true
-        status: SUPPORTED
+        status: supported
       vnf_name:
         type: string
         description: Unique name for this VF instance
         required: true
-        status: SUPPORTED
+        status: supported
       vdbe_untrusted_ip_1:
         type: string
         description: IPV4 address of the secondary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       vdbe_aap_untrusted_ip_prefix_len:
         type: string
         description: ip prefix length for the primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_0_untr_vmi_1_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       untrusted_num_vn:
         type: float
         description: Number of vDBE subinterface virtual Networks
         required: true
-        status: SUPPORTED
+        status: supported
         constraints:
         - in_range:
           - 1
@@ -67,142 +67,142 @@ node_types:
         type: string
         description: Unique name for this VF module inst
         required: true
-        status: SUPPORTED
+        status: supported
       aap_address_mode:
         type: string
         description: Address mode for the vDBE cluster IP
         required: true
-        status: SUPPORTED
+        status: supported
       control_int_net_shared:
         type: boolean
         description: control virtual network shared
         required: true
-        status: SUPPORTED
+        status: supported
       vdbe_untrusted_v6_ip_1:
         type: string
         description: IPV6 address of the secondary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       vdbe_untrusted_vmac_address:
         type: string
         description: Virtual MAC of the primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       control_int_net_flood_unknown_unicast:
         type: boolean
         description: forwarding mode of the control virtual network
         required: true
-        status: SUPPORTED
+        status: supported
       vdbe_aap_sec_untrusted_ip_prefix:
         type: string
         description: ip prefix for secondary vDBE VM aap on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       vnf_id:
         type: string
         description: Unique ID for this VF inst
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_0_untr_vmi_1_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       vdbe_name_1:
         type: string
         description: VM Name for this vdbe node 1
         required: true
-        status: SUPPORTED
+        status: supported
       availability_zone_1:
         type: string
         description: The availability zone of secondary node1 vDBE vm in the local HA pair.
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_0_untr_vmi_1_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       untrusted_vn_networks:
         type: list
         description: List of subinterface virtual networks
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vdbe_image_name:
         type: string
         description: Image to use for vDBE
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_name:
         type: string
         description: Name of NSDNet network from which the management IP addresses will be allocated
         required: true
-        status: SUPPORTED
+        status: supported
       vdbe_aap_sec_untrusted_ip_prefix_len:
         type: string
         description: ip prefix length for the secondary DBE VM aap on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       vdbe_aap_untrusted_v6_ip_prefix:
         type: string
         description: ipv6 prefix for the primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       vdbe_aap_untrusted_v6_ip_prefix_len:
         type: string
         description: ipv6 prefix length for the primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       untrusted_vlan_tags:
         type: list
         description: List of subinterface vlan tags
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_0_untr_vmi_1_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vdbe_flavor_name:
         type: string
         description: Flavor to use for vDBE
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_0_untr_vmi_1_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       vdbe_hw_untr_mac_1:
         type: string
         description: Secondary MAC address of the secondary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       untrusted_net_name:
         type: string
         description: Name of public untrusted network into which this vDBE HA cluster is deployed
         required: true
-        status: SUPPORTED
+        status: supported
       vdbe_device_name:
         type: string
         description: VDBE device Name for this vdbe VNF
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_0_untr_vmi_1_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vdbe_aap_untrusted_ip_prefix:
         type: string
         description: ip prefix for primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_0_untr_vmi_1_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_vdbe_0_untr_vmi_1:
         capability: tosca.capabilities.Node
@@ -592,84 +592,84 @@ node_types:
         type: string
         description: ip prefix for primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       aap_sec_untrusted_ip_prefix:
         type: string
         description: ip prefix for secondary vDBE VM aap on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       vdbe_subport_network:
         type: string
         description: List of Contrail VLAN networks to use for the subinterfaces.   The order and number of these must match the VLAN ID list
         required: true
-        status: SUPPORTED
+        status: supported
       ip_v6_address:
         type: string
         description: IPv6 address associated with subinterfaces
         required: true
-        status: SUPPORTED
+        status: supported
       counter:
         type: float
         description: Index of instance among multiple instances.  Use to retrieve correct parameter for this instance when passed all parameters for all instances.
         required: true
-        status: SUPPORTED
+        status: supported
       subinterfaces_name_prefix:
         type: string
         description: Combined with subinterface_instance_index, this is used as the name of the subinterface resource
         required: true
-        status: SUPPORTED
+        status: supported
       ip_address:
         type: string
         description: IPv4 address associated with subinterfaces
         required: true
-        status: SUPPORTED
+        status: supported
       aap_address_mode:
         type: string
         description: Address mode for the vDBE cluster IP
         required: true
-        status: SUPPORTED
+        status: supported
       aap_untrusted_v6_ip_prefix:
         type: string
         description: ipv6 prefix for the primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       parent_interface:
         type: string
         description: Parent Contrail interface
         required: true
-        status: SUPPORTED
+        status: supported
       mac_address:
         type: string
         description: HW MAC address to use for subinterface
         required: true
-        status: SUPPORTED
+        status: supported
       vlan_tag_list:
         type: list
         description: List of VLAN IDs to use for subinterfaces
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       aap_sec_untrusted_ip_prefix_len:
         type: string
         description: ip prefix length for the secondary DBE VM aap on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       vmac_address:
         type: string
         description: virtual MAC address to use for subinterface
         required: true
-        status: SUPPORTED
+        status: supported
       aap_untrusted_v6_ip_prefix_len:
         type: string
         description: ipv6 prefix length for the primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       aap_untrusted_ip_prefix_len:
         type: string
         description: ip prefix length for the primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_vdbe_0_subint_untr_vmi_1:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 39cfc595b6..1c979faad6 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -12,84 +12,84 @@ node_types:
         type: string
         description: ip prefix for primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       aap_sec_untrusted_ip_prefix:
         type: string
         description: ip prefix for secondary vDBE VM aap on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       ip_v6_address:
         type: string
         description: IPv6 address associated with subinterfaces
         required: true
-        status: SUPPORTED
+        status: supported
       counter:
         type: float
         description: Index of instance among multiple instances.  Use to retrieve correct parameter for this instance when passed all parameters for all instances.
         required: true
-        status: SUPPORTED
+        status: supported
       subinterfaces_name_prefix:
         type: string
         description: Combined with subinterface_instance_index, this is used as the name of the subinterface resource
         required: true
-        status: SUPPORTED
+        status: supported
       ip_address:
         type: string
         description: IPv4 address associated with subinterfaces
         required: true
-        status: SUPPORTED
+        status: supported
       aap_address_mode:
         type: string
         description: Address mode for the vDBE cluster IP
         required: true
-        status: SUPPORTED
+        status: supported
       aap_untrusted_v6_ip_prefix:
         type: string
         description: ipv6 prefix for the primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       parent_interface:
         type: string
         description: Parent Contrail interface
         required: true
-        status: SUPPORTED
+        status: supported
       vn_network_list:
         type: string
         description: List of Contrail VLAN networks to use for the subinterfaces.   The order and number of these must match the VLAN ID list
         required: true
-        status: SUPPORTED
+        status: supported
       mac_address:
         type: string
         description: HW MAC address to use for subinterface
         required: true
-        status: SUPPORTED
+        status: supported
       vlan_tag_list:
         type: list
         description: List of VLAN IDs to use for subinterfaces
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       aap_sec_untrusted_ip_prefix_len:
         type: string
         description: ip prefix length for the secondary DBE VM aap on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       vmac_address:
         type: string
         description: virtual MAC address to use for subinterface
         required: true
-        status: SUPPORTED
+        status: supported
       aap_untrusted_v6_ip_prefix_len:
         type: string
         description: ipv6 prefix length for the primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       aap_untrusted_ip_prefix_len:
         type: string
         description: ip prefix length for the primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_vdbe_0_subint_oam_vmi_0:
         capability: tosca.capabilities.Node
@@ -123,179 +123,179 @@ node_types:
       subinterface_nested1_aap_untrusted_v6_ip_prefix_len:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_nested1_aap_address_mode:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_nested1_vn_network_list:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_vdbe_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_untr_port_1_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_untr_port_1_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_port_1_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_port_1_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_nested1_vmac_address:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_nested1_ip_address:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_nested1_subinterfaces_name_prefix:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_vdbe_metadata:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       subinterface_nested1_service_template_filter_count:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: float
       subinterface_nested1_aap_untrusted_v6_ip_prefix:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_nested1_parent_interface:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_untr_port_1_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       subinterface_nested1_aap_untrusted_ip_prefix_len:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_nested1_ip_v6_address:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_untr_port_1_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_vdbe_untr_port_1_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_port_1_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_port_1_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       port_vdbe_untr_port_1_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       subinterface_nested1_mac_address:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_nested1_aap_untrusted_ip_prefix:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_nested1_aap_sec_untrusted_ip_prefix_len:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_nested1_vlan_tag_list:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       compute_vdbe_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_nested1_aap_sec_untrusted_ip_prefix:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
     requirements:
@@ -677,84 +677,84 @@ node_types:
         type: string
         description: ip prefix for primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       aap_sec_untrusted_ip_prefix:
         type: string
         description: ip prefix for secondary vDBE VM aap on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       ip_v6_address:
         type: string
         description: IPv6 address associated with subinterfaces
         required: true
-        status: SUPPORTED
+        status: supported
       counter:
         type: float
         description: Index of instance among multiple instances.  Use to retrieve correct parameter for this instance when passed all parameters for all instances.
         required: true
-        status: SUPPORTED
+        status: supported
       subinterfaces_name_prefix:
         type: string
         description: Combined with subinterface_instance_index, this is used as the name of the subinterface resource
         required: true
-        status: SUPPORTED
+        status: supported
       ip_address:
         type: string
         description: IPv4 address associated with subinterfaces
         required: true
-        status: SUPPORTED
+        status: supported
       aap_address_mode:
         type: string
         description: Address mode for the vDBE cluster IP
         required: true
-        status: SUPPORTED
+        status: supported
       aap_untrusted_v6_ip_prefix:
         type: string
         description: ipv6 prefix for the primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       parent_interface:
         type: string
         description: Parent Contrail interface
         required: true
-        status: SUPPORTED
+        status: supported
       vn_network_list:
         type: string
         description: List of Contrail VLAN networks to use for the subinterfaces.   The order and number of these must match the VLAN ID list
         required: true
-        status: SUPPORTED
+        status: supported
       mac_address:
         type: string
         description: HW MAC address to use for subinterface
         required: true
-        status: SUPPORTED
+        status: supported
       vlan_tag_list:
         type: list
         description: List of VLAN IDs to use for subinterfaces
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       aap_sec_untrusted_ip_prefix_len:
         type: string
         description: ip prefix length for the secondary DBE VM aap on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       vmac_address:
         type: string
         description: virtual MAC address to use for subinterface
         required: true
-        status: SUPPORTED
+        status: supported
       aap_untrusted_v6_ip_prefix_len:
         type: string
         description: ipv6 prefix length for the primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       aap_untrusted_ip_prefix_len:
         type: string
         description: ip prefix length for the primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_vdbe_0_subint_untr_vmi_0:
         capability: tosca.capabilities.Node
@@ -788,111 +788,111 @@ node_types:
       subinterface_nested2_subinterfaces_name_prefix:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_vdbe_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_nested2_aap_untrusted_v6_ip_prefix:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_untr_port_1_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_untr_port_1_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_nested2_parent_interface:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_untr_port_1_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_nested2_aap_sec_untrusted_ip_prefix:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_nested2_vmac_address:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_untr_port_1_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_vdbe_metadata:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_vdbe_untr_port_1_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       subinterface_nested2_aap_sec_untrusted_ip_prefix_len:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_nested2_mac_address:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_untr_port_1_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_vdbe_untr_port_1_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_port_1_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_port_1_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_nested2_ip_address:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       index_value:
@@ -900,73 +900,73 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       port_vdbe_untr_port_1_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       subinterface_nested2_vlan_tag_list:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       subinterface_nested2_aap_untrusted_ip_prefix_len:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_nested2_service_template_filter_count:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: float
       subinterface_nested2_counter:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: float
       subinterface_nested2_aap_untrusted_v6_ip_prefix_len:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_nested2_ip_v6_address:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_vdbe_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_nested2_aap_untrusted_ip_prefix:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_nested2_aap_address_mode:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_nested2_vn_network_list:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
     requirements:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/vdbeav/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/vdbeav/out/GlobalSubstitutionTypesServiceTemplate.yaml
index b90adc25b2..a2845d7ead 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/vdbeav/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/vdbeav/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -12,86 +12,86 @@ node_types:
         type: string
         description: ip prefix for primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       aap_sec_untrusted_ip_prefix:
         type: string
         description: ip prefix for secondary vDBE VM aap on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       ip_v6_address:
         type: string
         description: IPv6 address associated with subinterfaces
         required: true
-        status: SUPPORTED
+        status: supported
       counter:
         type: float
         description: Index of instance among multiple instances.  Use to retrieve correct parameter for this instance when passed all parameters for all instances.
         required: true
-        status: SUPPORTED
+        status: supported
       subinterfaces_name_prefix:
         type: string
         description: Combined with subinterface_instance_index, this is used as the name of the subinterface resource
         required: true
-        status: SUPPORTED
+        status: supported
       ip_address:
         type: string
         description: IPv4 address associated with subinterfaces
         required: true
-        status: SUPPORTED
+        status: supported
       aap_address_mode:
         type: string
         description: Address mode for the vDBE cluster IP
         required: true
-        status: SUPPORTED
+        status: supported
       parent_interface:
         type: string
         description: Parent Contrail interface
         required: true
-        status: SUPPORTED
+        status: supported
       aap_untrusted_v6_ip_prefix:
         type: string
         description: ipv6 prefix for the primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       vn_network_list:
         type: list
         description: List of Contrail VLAN networks to use for the subinterfaces.   The order and number of these must match the VLAN ID list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       mac_address:
         type: string
         description: HW MAC address to use for subinterface
         required: true
-        status: SUPPORTED
+        status: supported
       vlan_tag_list:
         type: list
         description: List of VLAN IDs to use for subinterfaces
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vmac_address:
         type: string
         description: virtual MAC address to use for subinterface
         required: true
-        status: SUPPORTED
+        status: supported
       aap_sec_untrusted_ip_prefix_len:
         type: string
         description: ip prefix length for the secondary DBE VM aap on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       aap_untrusted_v6_ip_prefix_len:
         type: string
         description: ipv6 prefix length for the primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       aap_untrusted_ip_prefix_len:
         type: string
         description: ip prefix length for the primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_vdbe_0_subint_untr_vmi_0:
         capability: tosca.capabilities.Node
@@ -125,365 +125,365 @@ node_types:
       subinterface_vdbeav_subinterface_heat_template_aap_address_mode:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_oam_0_port_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_vdbe_trst_0_port_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_vdbe_trst_0_port_virtual_machine_interface_mac_addresses:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_vdbe_fabr_0_port_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_fabr_0_port_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_vdbe_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_trst_0_port_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_vmi_1_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_vdbe_ctrl_0_port_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_trst_0_port_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_oam_0_port_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       compute_vdbe_metadata:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       subinterface_vdbeav_subinterface_heat_template_aap_sec_untrusted_ip_prefix_len:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_oam_0_port_virtual_network_refs:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_vdbe_untr_vmi_1_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_untr_vmi_1_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_trst_0_port_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_untr_vmi_1_virtual_network_refs:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       subinterface_vdbeav_subinterface_heat_template_parent_interface:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_ctrl_0_port_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_ctrl_0_port_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_vdbe_ctrl_0_port_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_ctrl_0_port_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       subinterface_vdbeav_subinterface_heat_template_aap_untrusted_ip_prefix:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_fabr_0_port_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       subinterface_vdbeav_subinterface_heat_template_vlan_tag_list:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_vdbe_fabr_0_port_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_fabr_0_port_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_vdbe_trst_0_port_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_vmi_1_virtual_machine_interface_allowed_address_pairs:
         type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_oam_0_port_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_vdbeav_subinterface_heat_template_vn_network_list:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_vdbe_untr_vmi_1_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_vmi_1_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_vdbeav_subinterface_heat_template_subinterfaces_name_prefix:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_trst_0_port_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_oam_0_port_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_ctrl_0_port_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_ctrl_0_port_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_vdbeav_subinterface_heat_template_aap_untrusted_ip_prefix_len:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_trst_0_port_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_vdbe_fabr_0_port_virtual_network_refs:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       compute_vdbe_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_oam_0_port_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_ctrl_0_port_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_vdbeav_subinterface_heat_template_service_template_filter_count:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: float
       port_vdbe_trst_0_port_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_oam_0_port_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_vdbe_untr_vmi_1_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_vdbe_untr_vmi_1_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_fabr_0_port_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       subinterface_vdbeav_subinterface_heat_template_mac_address:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_vdbeav_subinterface_heat_template_ip_address:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_trst_0_port_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_fabr_0_port_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_vdbeav_subinterface_heat_template_vmac_address:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_untr_vmi_1_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       compute_vdbe_scheduler_hints:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_vdbe_trst_0_port_virtual_machine_interface_allowed_address_pairs:
         type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_ctrl_0_port_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       subinterface_vdbeav_subinterface_heat_template_aap_untrusted_v6_ip_prefix_len:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_oam_0_port_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_vdbe_fabr_0_port_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_vmi_1_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_trst_0_port_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_oam_0_port_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_vdbeav_subinterface_heat_template_aap_sec_untrusted_ip_prefix:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_oam_0_port_virtual_machine_interface_mac_addresses:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       index_value:
@@ -491,69 +491,69 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       port_vdbe_untr_vmi_1_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_vdbe_untr_vmi_1_virtual_machine_interface_mac_addresses:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       subinterface_vdbeav_subinterface_heat_template_aap_untrusted_v6_ip_prefix:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_fabr_0_port_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_ctrl_0_port_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_fabr_0_port_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_vdbeav_subinterface_heat_template_ip_v6_address:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_ctrl_0_port_virtual_network_refs:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_vdbe_oam_0_port_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_trst_0_port_virtual_network_refs:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_vdbe_oam_0_port_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_vdbe_vdbe_fabr_0_port:
         capability: tosca.capabilities.Node
@@ -1243,333 +1243,333 @@ node_types:
       subinterface_vdbeav_subinterface_heat_template_aap_address_mode:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_ctrl_1_port_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       compute_vdbe_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_oam_1_port_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_vdbe_ctrl_1_port_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_vmi_1_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_vdbe_oam_1_port_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_fabr_1_port_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_trst_1_port_virtual_network_refs:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_trst_1_port_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       compute_vdbe_metadata:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_vdbe_fabr_1_port_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_vdbeav_subinterface_heat_template_aap_sec_untrusted_ip_prefix_len:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_untr_vmi_1_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_untr_vmi_1_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_trst_1_port_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_ctrl_1_port_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_vdbe_untr_vmi_1_virtual_network_refs:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_vdbe_fabr_1_port_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       subinterface_vdbeav_subinterface_heat_template_parent_interface:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_oam_1_port_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_fabr_1_port_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_vdbeav_subinterface_heat_template_aap_untrusted_ip_prefix:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_oam_1_port_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_vdbeav_subinterface_heat_template_vlan_tag_list:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_vdbe_oam_1_port_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_fabr_1_port_virtual_network_refs:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_vdbe_untr_vmi_1_virtual_machine_interface_allowed_address_pairs:
         type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_vdbeav_subinterface_heat_template_vn_network_list:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_vdbe_untr_vmi_1_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_vmi_1_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_trst_1_port_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       subinterface_vdbeav_subinterface_heat_template_subinterfaces_name_prefix:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_ctrl_1_port_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_oam_1_port_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_ctrl_1_port_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_trst_1_port_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_vdbeav_subinterface_heat_template_aap_untrusted_ip_prefix_len:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       compute_vdbe_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_oam_1_port_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_trst_1_port_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_vdbeav_subinterface_heat_template_service_template_filter_count:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: float
       port_vdbe_untr_vmi_1_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_vdbe_untr_vmi_1_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_fabr_1_port_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       subinterface_vdbeav_subinterface_heat_template_mac_address:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_fabr_1_port_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_vdbe_trst_1_port_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       subinterface_vdbeav_subinterface_heat_template_ip_address:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_trst_1_port_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_oam_1_port_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       subinterface_vdbeav_subinterface_heat_template_vmac_address:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_untr_vmi_1_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_ctrl_1_port_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_ctrl_1_port_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_vdbe_scheduler_hints:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_vdbe_trst_1_port_virtual_machine_interface_allowed_address_pairs:
         type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_vdbeav_subinterface_heat_template_aap_untrusted_v6_ip_prefix_len:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_fabr_1_port_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_untr_vmi_1_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_trst_1_port_virtual_machine_interface_mac_addresses:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       subinterface_vdbeav_subinterface_heat_template_aap_sec_untrusted_ip_prefix:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_oam_1_port_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       index_value:
@@ -1577,99 +1577,99 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       port_vdbe_untr_vmi_1_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_vdbe_fabr_1_port_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_oam_1_port_virtual_network_refs:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_vdbe_ctrl_1_port_virtual_network_refs:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_vdbe_untr_vmi_1_virtual_machine_interface_mac_addresses:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_vdbe_oam_1_port_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_vdbeav_subinterface_heat_template_aap_untrusted_v6_ip_prefix:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_trst_1_port_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_ctrl_1_port_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_fabr_1_port_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_vdbe_ctrl_1_port_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_vdbe_fabr_1_port_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_vdbe_ctrl_1_port_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_vdbe_trst_1_port_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       subinterface_vdbeav_subinterface_heat_template_ip_v6_address:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_vdbe_oam_1_port_virtual_machine_interface_mac_addresses:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_vdbe_trst_1_port_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
     requirements:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/getAttr/getAttrUnsupportedResource/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/getAttr/getAttrUnsupportedResource/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
index 1a5c50d8d2..c9721afab5 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/getAttr/getAttrUnsupportedResource/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/getAttr/getAttrUnsupportedResource/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -12,64 +12,64 @@ node_types:
         type: string
         description: Unique ID for this VF Module instance
         required: true
-        status: SUPPORTED
+        status: supported
       security_group_ids:
         type: list
         description: IDs of the security groups for the server
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vm_role:
         type: string
         description: VM Role for the db vms
         required: true
-        status: SUPPORTED
+        status: supported
       db_name:
         type: string
         description: Hostname of the database servers
         required: true
-        status: SUPPORTED
+        status: supported
       vnf_id:
         type: string
         description: Unique ID for this VF instance
         required: true
-        status: SUPPORTED
+        status: supported
       server_group_id:
         type: string
         description: ID of the server group
         required: true
-        status: SUPPORTED
+        status: supported
       availability_zone_0:
         type: string
         description: Name of the availability zone for this server
         required: true
-        status: SUPPORTED
+        status: supported
       db_image_name:
         type: string
         description: Image to be used for the server
         required: true
-        status: SUPPORTED
+        status: supported
       keypair_id:
         type: string
         description: Name of the security key for the server
         required: true
-        status: SUPPORTED
+        status: supported
       db_volume_id_3:
         type: string
         description: IDs to be used for the database volume
         required: true
-        status: SUPPORTED
+        status: supported
       db_volume_id_2:
         type: string
         description: IDs to be used for the database volume
         required: true
-        status: SUPPORTED
+        status: supported
       deploy_timeout:
         type: float
         description: Timeout before declaring the stack deployment as failed.
         required: true
-        status: SUPPORTED
+        status: supported
         constraints:
         - in_range:
           - 60
@@ -78,27 +78,27 @@ node_types:
         type: string
         description: Name of the oam network
         required: true
-        status: SUPPORTED
+        status: supported
       db_oam_ip_0:
         type: string
         description: OAM IP Address of the database servers
         required: true
-        status: SUPPORTED
+        status: supported
       db_flavor_name:
         type: string
         description: Flavor to be used for the server
         required: true
-        status: SUPPORTED
+        status: supported
       db_volume_id_1:
         type: string
         description: IDs to be used for the database volume
         required: true
-        status: SUPPORTED
+        status: supported
       db_volume_id_0:
         type: string
         description: IDs to be used for the database volume
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_db_server_0:
         capability: tosca.capabilities.Node
@@ -364,64 +364,64 @@ node_types:
         type: string
         description: Unique ID for this VF Module instance
         required: true
-        status: SUPPORTED
+        status: supported
       app_flavor_name:
         type: string
         description: Flavor to be used for the server
         required: true
-        status: SUPPORTED
+        status: supported
       security_group_ids:
         type: list
         description: IDs of the security groups for the server
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vm_role:
         type: string
         description: VM Role for the application vms
         required: true
-        status: SUPPORTED
+        status: supported
       app_name:
         type: string
         description: Hostnames of the application servers
         required: true
-        status: SUPPORTED
+        status: supported
       vnf_id:
         type: string
         description: Unique ID for this VF instance
         required: true
-        status: SUPPORTED
+        status: supported
       app_oam_ip_0:
         type: string
         description: OAM IP Addresses of the application servers
         required: true
-        status: SUPPORTED
+        status: supported
       server_group_id:
         type: string
         description: ID of the server group
         required: true
-        status: SUPPORTED
+        status: supported
       availability_zone_0:
         type: string
         description: Name of the availability zone for this server
         required: true
-        status: SUPPORTED
+        status: supported
       app_image_name:
         type: string
         description: Image to be used for the server
         required: true
-        status: SUPPORTED
+        status: supported
       keypair_id:
         type: string
         description: Name of the security key for the server
         required: true
-        status: SUPPORTED
+        status: supported
       deploy_timeout:
         type: float
         description: Timeout before declaring the stack deployment as failed.
         required: true
-        status: SUPPORTED
+        status: supported
         constraints:
         - in_range:
           - 60
@@ -430,7 +430,7 @@ node_types:
         type: string
         description: Name of the oam network
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_app_server_0:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/hot-nimbus-oam-volumes_v1.0/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/hot-nimbus-oam-volumes_v1.0/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 8838d445ef..4ca97bc956 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/hot-nimbus-oam-volumes_v1.0/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/hot-nimbus-oam-volumes_v1.0/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -12,47 +12,47 @@ node_types:
         type: string
         description: CPS network ip
         required: true
-        status: SUPPORTED
+        status: supported
       availabilityzone_name:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       pcrf_vnf_id:
         type: string
         description: PCRF VNF Id
         required: true
-        status: SUPPORTED
+        status: supported
       pcrf_cps_net_name:
         type: string
         description: CPS network name
         required: true
-        status: SUPPORTED
+        status: supported
       pcrf_cps_net_mask:
         type: string
         description: CPS network mask
         required: true
-        status: SUPPORTED
+        status: supported
       pcrf_pps_image_name:
         type: string
         description: PCRF PS image name
         required: true
-        status: SUPPORTED
+        status: supported
       pcrf_pps_flavor_name:
         type: string
         description: flavor name of PCRF PS instance
         required: true
-        status: SUPPORTED
+        status: supported
       pcrf_pps_server_name:
         type: string
         description: PCRF PS server name
         required: true
-        status: SUPPORTED
+        status: supported
       pcrf_security_group_name:
         type: string
         description: the name of security group
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_pcrf_pps_port_0:
         capability: tosca.capabilities.Node
@@ -402,167 +402,167 @@ node_types:
         type: string
         description: PCRF PD image name
         required: true
-        status: SUPPORTED
+        status: supported
       availabilityzone_name:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       pcrf_sp_net_ip:
         type: string
         description: Sp network ip
         required: true
-        status: SUPPORTED
+        status: supported
       pcrf_ppd_server_name:
         type: string
         description: PCRF PD server name
         required: true
-        status: SUPPORTED
+        status: supported
       pcrf_gx_net_ip:
         type: string
         description: Gx network ip
         required: true
-        status: SUPPORTED
+        status: supported
       pcrf_sy_net_name:
         type: string
         description: Sy network name
         required: true
-        status: SUPPORTED
+        status: supported
       pcrf_sp_net_mask:
         type: string
         description: Sp network mask
         required: true
-        status: SUPPORTED
+        status: supported
       pcrf_sd_net_ip:
         type: string
         description: Sd network ip
         required: true
-        status: SUPPORTED
+        status: supported
       pcrf_vnf_id:
         type: string
         description: PCRF VNF Id
         required: true
-        status: SUPPORTED
+        status: supported
       pcrf_oam_net_name:
         type: string
         description: OAM network name
         required: true
-        status: SUPPORTED
+        status: supported
       pcrf_oam_net_ip:
         type: string
         description: OAM network ip
         required: true
-        status: SUPPORTED
+        status: supported
       pcrf_cps_net_mask:
         type: string
         description: CPS network mask
         required: true
-        status: SUPPORTED
+        status: supported
       pcrf_gx_net_mask:
         type: string
         description: Gx network mask
         required: true
-        status: SUPPORTED
+        status: supported
       pcrf_sgi_sy_net_name:
         type: string
         description: Sgi Sy network name
         required: true
-        status: SUPPORTED
+        status: supported
       pcrf_sd_net_name:
         type: string
         description: Sd network name
         required: true
-        status: SUPPORTED
+        status: supported
       pcrf_oam_net_gw:
         type: string
         description: CPS network gateway
         required: true
-        status: SUPPORTED
+        status: supported
       pcrf_rx_net_name:
         type: string
         description: Rx network name
         required: true
-        status: SUPPORTED
+        status: supported
       pcrf_rx_net_ip:
         type: string
         description: Rx network ip
         required: true
-        status: SUPPORTED
+        status: supported
       pcrf_sy_net_ip:
         type: string
         description: Sy network ip
         required: true
-        status: SUPPORTED
+        status: supported
       pcrf_sgi_sy_net_ip:
         type: string
         description: Sgi Sy network ip
         required: true
-        status: SUPPORTED
+        status: supported
       pcrf_ppd_flavor_name:
         type: string
         description: flavor name of PCRF PD instance
         required: true
-        status: SUPPORTED
+        status: supported
       pcrf_cps_net_ip:
         type: string
         description: CPS network ip
         required: true
-        status: SUPPORTED
+        status: supported
       pcrf_sy_net_mask:
         type: string
         description: Sy network mask
         required: true
-        status: SUPPORTED
+        status: supported
       pcrf_cps_net_name:
         type: string
         description: CPS network name
         required: true
-        status: SUPPORTED
+        status: supported
       pcrf_oam_net_mask:
         type: string
         description: CPS network mask
         required: true
-        status: SUPPORTED
+        status: supported
       pcrf_lb_management_vip:
         type: string
         description: CPS OAM LB VIP
         required: true
-        status: SUPPORTED
+        status: supported
       pcrf_sgi_sy_net_mask:
         type: string
         description: Sgi Sy network mask
         required: true
-        status: SUPPORTED
+        status: supported
       pcrf_lb_internal_vip:
         type: string
         description: CPS Internal LB VIP
         required: true
-        status: SUPPORTED
+        status: supported
       pcrf_sd_net_mask:
         type: string
         description: Sd network mask
         required: true
-        status: SUPPORTED
+        status: supported
       pcrf_gx_net_name:
         type: string
         description: Gx network name
         required: true
-        status: SUPPORTED
+        status: supported
       pcrf_sp_net_name:
         type: string
         description: Sp network name
         required: true
-        status: SUPPORTED
+        status: supported
       pcrf_rx_net_mask:
         type: string
         description: Rx network mask
         required: true
-        status: SUPPORTED
+        status: supported
       pcrf_security_group_name:
         type: string
         description: the name of security group
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_pcrf_ppd_port_5:
         capability: tosca.capabilities.Node
@@ -1500,77 +1500,77 @@ node_types:
         type: string
         description: flavor name of PCRF CM instance
         required: true
-        status: SUPPORTED
+        status: supported
       availabilityzone_name:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       pcrf_cps_net_ip:
         type: string
         description: CPS network ip
         required: true
-        status: SUPPORTED
+        status: supported
       pcrf_pcm_image_name:
         type: string
         description: PCRF CM image name
         required: true
-        status: SUPPORTED
+        status: supported
       pcrf_vnf_id:
         type: string
         description: PCRF VNF Id
         required: true
-        status: SUPPORTED
+        status: supported
       pcrf_oam_net_name:
         type: string
         description: OAM network name
         required: true
-        status: SUPPORTED
+        status: supported
       pcrf_cps_net_name:
         type: string
         description: CPS network name
         required: true
-        status: SUPPORTED
+        status: supported
       pcrf_oam_net_ip:
         type: string
         description: OAM network ip
         required: true
-        status: SUPPORTED
+        status: supported
       pcrf_oam_net_mask:
         type: string
         description: CPS network mask
         required: true
-        status: SUPPORTED
+        status: supported
       pcrf_cps_net_mask:
         type: string
         description: CPS network mask
         required: true
-        status: SUPPORTED
+        status: supported
       pcrf_pcm_server_name:
         type: string
         description: PCRF CM server name
         required: true
-        status: SUPPORTED
+        status: supported
       pcrf_oam_net_gw:
         type: string
         description: CPS network gateway
         required: true
-        status: SUPPORTED
+        status: supported
       pcrf_pcm_volume_id:
         type: string
         description: CPS Cluman Cinder Volume
         required: true
-        status: SUPPORTED
+        status: supported
       pcrf_security_group_name:
         type: string
         description: the name of security group
         required: true
-        status: SUPPORTED
+        status: supported
     attributes:
       pcrf_server_pcm_id:
         type: string
         description: the pcm server id
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_pcrf_pcm_port_0:
         capability: tosca.capabilities.Node
@@ -2004,82 +2004,82 @@ node_types:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       pcrf_oam_flavor_name:
         type: string
         description: flavor name of PCRF OAM instance
         required: true
-        status: SUPPORTED
+        status: supported
       pcrf_oam_server_name:
         type: string
         description: PCRF OAM server name
         required: true
-        status: SUPPORTED
+        status: supported
       pcrf_cps_net_ip:
         type: string
         description: CPS network ip
         required: true
-        status: SUPPORTED
+        status: supported
       pcrf_vnf_id:
         type: string
         description: PCRF VNF Id
         required: true
-        status: SUPPORTED
+        status: supported
       pcrf_oam_net_name:
         type: string
         description: OAM network name
         required: true
-        status: SUPPORTED
+        status: supported
       pcrf_cps_net_name:
         type: string
         description: CPS network name
         required: true
-        status: SUPPORTED
+        status: supported
       pcrf_arbiter_vip:
         type: string
         description: OAM Arbiter LB VIP
         required: true
-        status: SUPPORTED
+        status: supported
       pcrf_oam_net_ip:
         type: string
         description: OAM network ip
         required: true
-        status: SUPPORTED
+        status: supported
       pcrf_oam_net_mask:
         type: string
         description: CPS network mask
         required: true
-        status: SUPPORTED
+        status: supported
       pcrf_cps_net_mask:
         type: string
         description: CPS network mask
         required: true
-        status: SUPPORTED
+        status: supported
       pcrf_oam_volume_id:
         type: string
         description: CPS OAM Cinder Volume
         required: true
-        status: SUPPORTED
+        status: supported
       pcrf_oam_net_gw:
         type: string
         description: CPS network gateway
         required: true
-        status: SUPPORTED
+        status: supported
       pcrf_oam_image_name:
         type: string
         description: PCRF OAM image name
         required: true
-        status: SUPPORTED
+        status: supported
       pcrf_security_group_name:
         type: string
         description: the name of security group
         required: true
-        status: SUPPORTED
+        status: supported
     attributes:
       pcrf_oam_vol_attachment_id:
         type: string
         description: the pcrf_oam_vol_attachment_id id
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_pcrf_server_oam:
         capability: tosca.capabilities.Node
@@ -2513,47 +2513,47 @@ node_types:
         type: string
         description: CPS network ip
         required: true
-        status: SUPPORTED
+        status: supported
       pcrf_psm_flavor_name:
         type: string
         description: flavor name of PCRF SM instance
         required: true
-        status: SUPPORTED
+        status: supported
       pcrf_psm_image_name:
         type: string
         description: PCRF SM image name
         required: true
-        status: SUPPORTED
+        status: supported
       availabilityzone_name:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       pcrf_vnf_id:
         type: string
         description: PCRF VNF Id
         required: true
-        status: SUPPORTED
+        status: supported
       pcrf_cps_net_name:
         type: string
         description: CPS network name
         required: true
-        status: SUPPORTED
+        status: supported
       pcrf_cps_net_mask:
         type: string
         description: CPS network mask
         required: true
-        status: SUPPORTED
+        status: supported
       pcrf_psm_server_name:
         type: string
         description: PCRF SM server name
         required: true
-        status: SUPPORTED
+        status: supported
       pcrf_security_group_name:
         type: string
         description: the name of security group
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_pcrf_server_psm:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/innerHeatVolNestedMultiLevel/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/innerHeatVolNestedMultiLevel/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
index 6325b01c19..9283c4553f 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/innerHeatVolNestedMultiLevel/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/innerHeatVolNestedMultiLevel/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -12,50 +12,50 @@ node_types:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       p1:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       p2:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_image:
         type: string
         description: Image for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_flavor:
         type: string
         description: Flavor for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       network_name:
         type: string
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
       security_group_name:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       availability_zone_0:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_oam_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_cmaui_port_2:
         capability: tosca.capabilities.Node
@@ -2821,45 +2821,45 @@ node_types:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       p1:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       p2:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_image:
         type: string
         description: Image for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_flavor:
         type: string
         description: Flavor for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       security_group_name:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       availability_zone_0:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_oam_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_cmaui_port_3:
         capability: tosca.capabilities.Node
@@ -4933,48 +4933,48 @@ node_types:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       p1:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       p2:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_image:
         type: string
         description: Image for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_flavor:
         type: string
         description: Flavor for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       indx:
         type: float
         required: true
-        status: SUPPORTED
+        status: supported
       security_group_name:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       availability_zone_0:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_oam_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_server_cmaui6:
         capability: tosca.capabilities.Node
@@ -6356,44 +6356,44 @@ node_types:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       p1:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       p2:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_image:
         type: string
         description: Image for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_flavor:
         type: string
         description: Flavor for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       security_group_name:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       availability_zone_0:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_oam_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_cmaui_port_7:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/innernestedconnection/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/innernestedconnection/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
index 7c442c719e..deb3719345 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/innernestedconnection/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/innernestedconnection/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -12,103 +12,103 @@ node_types:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       cmaui_cinder_volume_size:
         type: float
         description: the size of the CMAUI Cinder volume
         required: true
-        status: SUPPORTED
+        status: supported
       timezone:
         type: string
         description: timezone
         required: true
-        status: SUPPORTED
+        status: supported
       security_group_name:
         type: string
         description: the name of security group
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_volume:
         type: string
         description: Volume for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       oam_network_netmask:
         type: string
         description: oam network gateway
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_image:
         type: string
         description: Image for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       vnf_id:
         type: string
         description: Unique ID for this VNF instance
         required: false
         default: This_is_ths_MMSC-CMAUI_id
-        status: SUPPORTED
+        status: supported
       cmaui_flavor:
         type: string
         description: Flavor for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       oam_network_gateway:
         type: string
         description: oam network gateway
         required: true
-        status: SUPPORTED
+        status: supported
       availability_zone_0:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       inner_cmaui_volume_b3:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       cmaui_oam_ips:
         type: list
         description: CMAUI oam_net IP addresses
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       inner_cmaui_volume_a1:
         type: string
         description: the name of the target volume backend
         required: true
-        status: SUPPORTED
+        status: supported
       inner_cmaui_volume_b2:
         type: string
         description: the name of the target volume backend
         required: true
-        status: SUPPORTED
+        status: supported
       external_dns:
         type: string
         description: dns server
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_name:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       external_ntp:
         type: string
         description: ntp server
         required: true
-        status: SUPPORTED
+        status: supported
       CMAUI_volume_type:
         type: string
         description: the name of the target volume backend
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_cmaui_port_2:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/nestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/nestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
index 6325b01c19..9283c4553f 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/nestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/nestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -12,50 +12,50 @@ node_types:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       p1:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       p2:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_image:
         type: string
         description: Image for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_flavor:
         type: string
         description: Flavor for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       network_name:
         type: string
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
       security_group_name:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       availability_zone_0:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_oam_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_cmaui_port_2:
         capability: tosca.capabilities.Node
@@ -2821,45 +2821,45 @@ node_types:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       p1:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       p2:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_image:
         type: string
         description: Image for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_flavor:
         type: string
         description: Flavor for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       security_group_name:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       availability_zone_0:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_oam_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_cmaui_port_3:
         capability: tosca.capabilities.Node
@@ -4933,48 +4933,48 @@ node_types:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       p1:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       p2:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_image:
         type: string
         description: Image for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_flavor:
         type: string
         description: Flavor for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       indx:
         type: float
         required: true
-        status: SUPPORTED
+        status: supported
       security_group_name:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       availability_zone_0:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_oam_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_server_cmaui6:
         capability: tosca.capabilities.Node
@@ -6356,44 +6356,44 @@ node_types:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       p1:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       p2:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_image:
         type: string
         description: Image for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_flavor:
         type: string
         description: Flavor for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       security_group_name:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       availability_zone_0:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_oam_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_cmaui_port_7:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/nestedconnection/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/nestedconnection/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
index 1bfad56b1f..54f11da61f 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/nestedconnection/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/nestedconnection/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -12,45 +12,45 @@ node_types:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       p1:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_image:
         type: string
         description: Image for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_volume_param:
         type: string
         description: nova server id
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_flavor:
         type: string
         description: Flavor for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       security_group_name:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       availability_zone_0:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_oam_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_server_cmaui:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/nestednotconnected/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/nestednotconnected/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
index 1bfad56b1f..54f11da61f 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/nestednotconnected/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/nestednotconnected/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -12,45 +12,45 @@ node_types:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       p1:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_image:
         type: string
         description: Image for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_volume_param:
         type: string
         description: nova server id
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_flavor:
         type: string
         description: Flavor for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       security_group_name:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       availability_zone_0:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_oam_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_server_cmaui:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharedNestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharedNestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
index 6325b01c19..9283c4553f 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharedNestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharedNestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -12,50 +12,50 @@ node_types:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       p1:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       p2:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_image:
         type: string
         description: Image for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_flavor:
         type: string
         description: Flavor for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       network_name:
         type: string
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
       security_group_name:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       availability_zone_0:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_oam_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_cmaui_port_2:
         capability: tosca.capabilities.Node
@@ -2821,45 +2821,45 @@ node_types:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       p1:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       p2:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_image:
         type: string
         description: Image for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_flavor:
         type: string
         description: Flavor for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       security_group_name:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       availability_zone_0:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_oam_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_cmaui_port_3:
         capability: tosca.capabilities.Node
@@ -4933,48 +4933,48 @@ node_types:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       p1:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       p2:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_image:
         type: string
         description: Image for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_flavor:
         type: string
         description: Flavor for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       indx:
         type: float
         required: true
-        status: SUPPORTED
+        status: supported
       security_group_name:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       availability_zone_0:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_oam_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_server_cmaui6:
         capability: tosca.capabilities.Node
@@ -6356,44 +6356,44 @@ node_types:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       p1:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       p2:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_image:
         type: string
         description: Image for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_flavor:
         type: string
         description: Flavor for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       security_group_name:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       availability_zone_0:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_oam_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_cmaui_port_7:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharednestedconnection/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharednestedconnection/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
index b3513603cb..66ee2f5bf5 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharednestedconnection/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharednestedconnection/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -12,50 +12,50 @@ node_types:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       p1:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_image:
         type: string
         description: Image for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_flavor:
         type: string
         description: Flavor for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_volume_param2:
         type: string
         description: nova server id
         required: true
-        status: SUPPORTED
+        status: supported
       security_group_name:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       availability_zone_0:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       shared_vol1:
         type: string
         description: nova server id
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_oam_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_cmaui_port_2:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharednestednotconnected/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharednestednotconnected/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
index b3513603cb..66ee2f5bf5 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharednestednotconnected/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharednestednotconnected/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -12,50 +12,50 @@ node_types:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       p1:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_image:
         type: string
         description: Image for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_flavor:
         type: string
         description: Flavor for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_volume_param2:
         type: string
         description: nova server id
         required: true
-        status: SUPPORTED
+        status: supported
       security_group_name:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       availability_zone_0:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       shared_vol1:
         type: string
         description: nova server id
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_oam_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_cmaui_port_2:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttocontrailv2virtualnetworkconnection/nested/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttocontrailv2virtualnetworkconnection/nested/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
index d479c9d3b0..b67c8e8226 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttocontrailv2virtualnetworkconnection/nested/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttocontrailv2virtualnetworkconnection/nested/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -12,40 +12,40 @@ node_types:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       p1:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_image:
         type: string
         description: Image for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_flavor:
         type: string
         description: Flavor for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       security_group_name:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       availability_zone_0:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_oam_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_server_cmaui:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttocontrailv2virtualnetworkconnection/shared/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttocontrailv2virtualnetworkconnection/shared/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
index 6bfcf8a462..831670152c 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttocontrailv2virtualnetworkconnection/shared/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttocontrailv2virtualnetworkconnection/shared/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -12,63 +12,63 @@ node_types:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       p1:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       p2:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       abc_flavor:
         type: string
         description: Flavor for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_image:
         type: string
         description: Image for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_flavor:
         type: string
         description: Flavor for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       abc_names:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       security_group_name:
         description: not impotrtant
         required: true
-        status: SUPPORTED
+        status: supported
       availability_zone_0:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       abc_oam_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_oam_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       abc_image:
         type: string
         description: Image for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_cmaui_port_12:
         capability: tosca.capabilities.Node
@@ -842,41 +842,41 @@ node_types:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       p1:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_image:
         type: string
         description: Image for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_flavor:
         type: string
         description: Flavor for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       security_group_name:
         description: not impotrtant
         required: true
-        status: SUPPORTED
+        status: supported
       availability_zone_0:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       abc_oam_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_oam_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_cmaui_port_21:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/nested/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/nested/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
index 0e98ccf58e..e0a2b2afb9 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/nested/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/nested/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -12,40 +12,40 @@ node_types:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       p1:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_image:
         type: string
         description: Image for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_flavor:
         type: string
         description: Flavor for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       security_group_name:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       availability_zone_0:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_oam_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_server_cmaui:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/nestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/nestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
index 533227bf63..fa3345a479 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/nestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/nestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -12,45 +12,45 @@ node_types:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       p1:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       p2:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_image:
         type: string
         description: Image for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_flavor:
         type: string
         description: Flavor for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       security_group_name:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       availability_zone_0:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_oam_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_cmaui_port_10:
         capability: tosca.capabilities.Node
@@ -1714,45 +1714,45 @@ node_types:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       p1:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       p2:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_image:
         type: string
         description: Image for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_flavor:
         type: string
         description: Flavor for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       security_group_name:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       availability_zone_0:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_oam_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_cmaui_port_21:
         capability: tosca.capabilities.Node
@@ -3064,48 +3064,48 @@ node_types:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       p1:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       p2:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_image:
         type: string
         description: Image for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_flavor:
         type: string
         description: Flavor for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       indx:
         type: float
         required: true
-        status: SUPPORTED
+        status: supported
       security_group_name:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       availability_zone_0:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_oam_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_cmaui_port_32:
         capability: tosca.capabilities.Node
@@ -3975,44 +3975,44 @@ node_types:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       p1:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       p2:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_image:
         type: string
         description: Image for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_flavor:
         type: string
         description: Flavor for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       security_group_name:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       availability_zone_0:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_oam_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_cmaui_port_43:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/shared/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/shared/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
index ee0284fa1b..160fb61b95 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/shared/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/shared/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -12,63 +12,63 @@ node_types:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       shared_network_id1:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       p2:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       abc_flavor:
         type: string
         description: Flavor for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_image:
         type: string
         description: Image for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_flavor:
         type: string
         description: Flavor for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       abc_names:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       security_group_name:
         description: not impotrtant
         required: true
-        status: SUPPORTED
+        status: supported
       availability_zone_0:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       abc_oam_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_oam_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       abc_image:
         type: string
         description: Image for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_cmaui_port_12:
         capability: tosca.capabilities.Node
@@ -842,41 +842,41 @@ node_types:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       p1:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_image:
         type: string
         description: Image for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_flavor:
         type: string
         description: Flavor for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       security_group_name:
         description: not impotrtant
         required: true
-        status: SUPPORTED
+        status: supported
       availability_zone_0:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       abc_oam_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_oam_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_server_cmaui:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/sharedNestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/sharedNestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
index a79a69e7ab..ee14544388 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/sharedNestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/sharedNestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -12,45 +12,45 @@ node_types:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       p2:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_image:
         type: string
         description: Image for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_flavor:
         type: string
         description: Flavor for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       security_group_name:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       availability_zone_0:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_oam_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       shared_test_net:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_server_cmaui_1:
         capability: tosca.capabilities.Node
@@ -1714,45 +1714,45 @@ node_types:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       p2:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_image:
         type: string
         description: Image for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_flavor:
         type: string
         description: Flavor for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       security_group_name:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       availability_zone_0:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_oam_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       shared_test_net:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_cmaui_port_21:
         capability: tosca.capabilities.Node
@@ -3064,48 +3064,48 @@ node_types:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       p2:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_image:
         type: string
         description: Image for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_flavor:
         type: string
         description: Flavor for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       indx:
         type: float
         required: true
-        status: SUPPORTED
+        status: supported
       security_group_name:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       availability_zone_0:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_oam_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       shared_test_net:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_cmaui_port_32:
         capability: tosca.capabilities.Node
@@ -3975,44 +3975,44 @@ node_types:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       p2:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_image:
         type: string
         description: Image for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_flavor:
         type: string
         description: Flavor for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       security_group_name:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       availability_zone_0:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_oam_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       shared_test_net:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_cmaui_port_43:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetresourcegroupconnection/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetresourcegroupconnection/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
index d479c9d3b0..b67c8e8226 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetresourcegroupconnection/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetresourcegroupconnection/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -12,40 +12,40 @@ node_types:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       p1:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_image:
         type: string
         description: Image for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_flavor:
         type: string
         description: Flavor for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       security_group_name:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       availability_zone_0:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_oam_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_server_cmaui:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttosharednetresourcegrouplinking/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttosharednetresourcegrouplinking/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
index 5464f9c545..976371666e 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttosharednetresourcegrouplinking/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttosharednetresourcegrouplinking/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -12,63 +12,63 @@ node_types:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       p1:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       p2:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       abc_flavor:
         type: string
         description: Flavor for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_image:
         type: string
         description: Image for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_flavor:
         type: string
         description: Flavor for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       abc_names:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       security_group_name:
         description: not impotrtant
         required: true
-        status: SUPPORTED
+        status: supported
       availability_zone_0:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       abc_oam_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_oam_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       abc_image:
         type: string
         description: Image for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_cmaui_port_2:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/nestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/nestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
index 0f2251372d..1d1db4e90c 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/nestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/nestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -12,49 +12,49 @@ node_types:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       p1:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       p2:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_image:
         type: string
         description: Image for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_flavor:
         type: string
         description: Flavor for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       security_group_name:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       availability_zone_0:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_oam_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       net:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_cmaui_port_2:
         capability: tosca.capabilities.Node
@@ -1796,49 +1796,49 @@ node_types:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       p1:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       p2:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_image:
         type: string
         description: Image for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_flavor:
         type: string
         description: Flavor for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       security_group_name:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       availability_zone_0:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_oam_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       net:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_cmaui_port_3:
         capability: tosca.capabilities.Node
@@ -3144,52 +3144,52 @@ node_types:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       p1:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       p2:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_image:
         type: string
         description: Image for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_flavor:
         type: string
         description: Flavor for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       indx:
         type: float
         required: true
-        status: SUPPORTED
+        status: supported
       security_group_name:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       availability_zone_0:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_oam_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       net:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_test_nested4Level:
         capability: tosca.capabilities.Node
@@ -4059,48 +4059,48 @@ node_types:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       p1:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       p2:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_image:
         type: string
         description: Image for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_flavor:
         type: string
         description: Flavor for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       security_group_name:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       availability_zone_0:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_oam_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       net:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_cmaui_port_7:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 0d9d098942..786a08e19c 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -11,125 +11,125 @@ node_types:
       vf_module_id:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       qrouter_cluster_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       oam_private_net_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       qrouter_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       version_number:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vf_module_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       domain_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       ntp_timezone:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vnf_id:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       availability_zone_0:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       region_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       manager_name_0:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       qrouter_names:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       tenant_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       security_group:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       cdr_network:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       qrouter_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       qrouter_index:
         type: float
         required: true
-        status: SUPPORTED
+        status: supported
       qrouter_volume_type_1:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       qrouter_volume_type_2:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       qrouter_node_count:
         type: float
         required: true
-        status: SUPPORTED
+        status: supported
       qrouter_volume_name_2:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       qrouter_volume_name_1:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       qrouter_volume_name_0:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       qrouter_volume_type_0:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       qrouter_volume_size_0:
         type: float
         required: true
-        status: SUPPORTED
+        status: supported
       qrouter_volume_size_1:
         type: float
         required: true
-        status: SUPPORTED
+        status: supported
       manager_oam_direct_ip_0:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       qrouter_volume_size_2:
         type: float
         required: true
-        status: SUPPORTED
+        status: supported
       rpmrepository_ip_0:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_cdr_network_port_1:
         capability: tosca.capabilities.Node
@@ -613,145 +613,145 @@ node_types:
       vf_module_id:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       packet_mirror_network:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       oam_private_net_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vProbe_cluster_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vlb_agent_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vf_module_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vLB_node_count:
         type: float
         required: true
-        status: SUPPORTED
+        status: supported
       domain_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       ntp_timezone:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       packet_internal_network:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vnf_id:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vLBAgent_cluster_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       availability_zone_0:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       region_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       manager_name_0:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vLB_cluster_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       tenant_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vLBAgent_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       security_group:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vLBAgent_version_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vLBAgent_type:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vLBAgent_node_count:
         type: float
         required: true
-        status: SUPPORTED
+        status: supported
       vLBAgent_volume_type_0:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vLBAgent_volume_type_1:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vLBAgent_volume_size_1:
         type: float
         required: true
-        status: SUPPORTED
+        status: supported
       vLBAgent_volume_type_2:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vLBAgent_names:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vLBAgent_volume_size_2:
         type: float
         required: true
-        status: SUPPORTED
+        status: supported
       vLBAgent_volume_size_0:
         type: float
         required: true
-        status: SUPPORTED
+        status: supported
       vLBAgent_index:
         type: float
         required: true
-        status: SUPPORTED
+        status: supported
       vLBAgent_volume_name_2:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vLBAgent_volume_name_1:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vLBAgent_volume_name_0:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       manager_oam_direct_ip_0:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       rpmrepository_ip_0:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_packet_mirror_network_port_1:
         capability: tosca.capabilities.Node
@@ -1319,137 +1319,137 @@ node_types:
       vf_module_id:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       packet_mirror_network:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       oam_private_net_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vProbe_cluster_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vLB_version_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vf_module_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vLB_node_count:
         type: float
         required: true
-        status: SUPPORTED
+        status: supported
       domain_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       ntp_timezone:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       packet_internal_network:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vnf_id:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vLB_type:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       availability_zone_0:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       region_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       manager_name_0:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vLB_cluster_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       tenant_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vLB_names:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vLB_index:
         type: float
         required: true
-        status: SUPPORTED
+        status: supported
       security_group:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vLB_volume_name_2:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vLB_volume_name_0:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vLB_volume_type_1:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vLB_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vLB_volume_name_1:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vLB_volume_type_2:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vLB_volume_type_0:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vLB_volume_size_1:
         type: float
         required: true
-        status: SUPPORTED
+        status: supported
       vlb_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vLB_volume_size_0:
         type: float
         required: true
-        status: SUPPORTED
+        status: supported
       manager_oam_direct_ip_0:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       rpmrepository_ip_0:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vLB_volume_size_2:
         type: float
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_packet_internal_network_port_2:
         capability: tosca.capabilities.Node
@@ -2017,153 +2017,153 @@ node_types:
       vf_module_id:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vprobe_volume_type_0:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vprobe_volume_type_1:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       qrouter_cluster_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vprobe_volume_type_2:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       oam_private_net_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vProbe_cluster_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vprobe_type:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vprobe_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vprobe_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vf_module_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vLB_node_count:
         type: float
         required: true
-        status: SUPPORTED
+        status: supported
       domain_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       ntp_timezone:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       packet_internal_network:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vProbe_version_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vnf_id:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       availability_zone_0:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       region_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       qtrace_name_0:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vprobe_AppDependenciesMachineType:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       manager_name_0:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       win_domain_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       tenant_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vprobe_volume_size_2:
         type: float
         required: true
-        status: SUPPORTED
+        status: supported
       vprobe_volume_name_0:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vprobe_volume_size_0:
         type: float
         required: true
-        status: SUPPORTED
+        status: supported
       vprobe_volume_name_1:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vprobe_volume_size_1:
         type: float
         required: true
-        status: SUPPORTED
+        status: supported
       vprobe_volume_name_2:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       security_group:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       cdr_network:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vProbe_node_count:
         type: float
         required: true
-        status: SUPPORTED
+        status: supported
       vprobe_names:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vprobe_index:
         type: float
         required: true
-        status: SUPPORTED
+        status: supported
       manager_oam_direct_ip_0:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       rpmrepository_ip_0:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_ProbeInstance:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityrulestoportnestedconnection/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityrulestoportnestedconnection/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
index 5e603825ae..3fdd158483 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityrulestoportnestedconnection/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityrulestoportnestedconnection/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -12,44 +12,44 @@ node_types:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       p1:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       p2:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_image:
         type: string
         description: Image for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_flavor:
         type: string
         description: Flavor for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       availability_zone_0:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_oam_ips:
         type: string
         description: cmaui_oam_ips
         required: true
-        status: SUPPORTED
+        status: supported
       net:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_cmaui_port_3:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityruletosharedportlinking/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityruletosharedportlinking/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
index 62c5e12e4f..59b10443d5 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityruletosharedportlinking/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityruletosharedportlinking/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -12,44 +12,44 @@ node_types:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       p2:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_image:
         type: string
         description: Image for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_flavor:
         type: string
         description: Flavor for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       availability_zone_0:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_oam_ips:
         type: string
         description: cmaui_port_1
         required: true
-        status: SUPPORTED
+        status: supported
       net:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       shared_security_group_id1:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_cmaui_port_2:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/sharedNestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/sharedNestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
index 0f2251372d..1d1db4e90c 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/sharedNestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/sharedNestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -12,49 +12,49 @@ node_types:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       p1:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       p2:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_image:
         type: string
         description: Image for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_flavor:
         type: string
         description: Flavor for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       security_group_name:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       availability_zone_0:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_oam_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       net:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_cmaui_port_2:
         capability: tosca.capabilities.Node
@@ -1796,49 +1796,49 @@ node_types:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       p1:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       p2:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_image:
         type: string
         description: Image for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_flavor:
         type: string
         description: Flavor for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       security_group_name:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       availability_zone_0:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_oam_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       net:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_cmaui_port_3:
         capability: tosca.capabilities.Node
@@ -3144,52 +3144,52 @@ node_types:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       p1:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       p2:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_image:
         type: string
         description: Image for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_flavor:
         type: string
         description: Flavor for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       indx:
         type: float
         required: true
-        status: SUPPORTED
+        status: supported
       security_group_name:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       availability_zone_0:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_oam_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       net:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_test_nested4Level:
         capability: tosca.capabilities.Node
@@ -4059,48 +4059,48 @@ node_types:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       p1:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       p2:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_image:
         type: string
         description: Image for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_flavor:
         type: string
         description: Flavor for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       security_group_name:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       availability_zone_0:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_oam_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       net:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_cmaui_port_7:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityruletosharedportresourcegrouplinking/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityruletosharedportresourcegrouplinking/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
index 6cf8ddeb64..9821d2453b 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityruletosharedportresourcegrouplinking/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityruletosharedportresourcegrouplinking/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -12,43 +12,43 @@ node_types:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       p1:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       p2:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_image:
         type: string
         description: Image for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_flavor:
         type: string
         description: Flavor for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       availability_zone_0:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_oam_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       net:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_cmaui_port_2:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/inoutattr/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/inoutattr/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
index 4920397c09..bacfa3f584 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/inoutattr/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/inoutattr/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -12,84 +12,84 @@ node_types:
         type: string
         description: ip prefix for primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       aap_sec_untrusted_ip_prefix:
         type: string
         description: ip prefix for secondary vDBE VM aap on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       vdbe_subport_network:
         type: string
         description: List of Contrail VLAN networks to use for the subinterfaces.   The order and number of these must match the VLAN ID list
         required: true
-        status: SUPPORTED
+        status: supported
       ip_v6_address:
         type: string
         description: IPv6 address associated with subinterfaces
         required: true
-        status: SUPPORTED
+        status: supported
       counter:
         type: float
         description: Index of instance among multiple instances.  Use to retrieve correct parameter for this instance when passed all parameters for all instances.
         required: true
-        status: SUPPORTED
+        status: supported
       subinterfaces_name_prefix:
         type: string
         description: Combined with subinterface_instance_index, this is used as the name of the subinterface resource
         required: true
-        status: SUPPORTED
+        status: supported
       ip_address:
         type: string
         description: IPv4 address associated with subinterfaces
         required: true
-        status: SUPPORTED
+        status: supported
       aap_address_mode:
         type: string
         description: Address mode for the vDBE cluster IP
         required: true
-        status: SUPPORTED
+        status: supported
       aap_untrusted_v6_ip_prefix:
         type: string
         description: ipv6 prefix for the primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       parent_interface:
         type: string
         description: Parent Contrail interface
         required: true
-        status: SUPPORTED
+        status: supported
       mac_address:
         type: string
         description: HW MAC address to use for subinterface
         required: true
-        status: SUPPORTED
+        status: supported
       vlan_tag_list:
         type: list
         description: List of VLAN IDs to use for subinterfaces
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       aap_sec_untrusted_ip_prefix_len:
         type: string
         description: ip prefix length for the secondary DBE VM aap on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       vmac_address:
         type: string
         description: virtual MAC address to use for subinterface
         required: true
-        status: SUPPORTED
+        status: supported
       aap_untrusted_v6_ip_prefix_len:
         type: string
         description: ipv6 prefix length for the primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       aap_untrusted_ip_prefix_len:
         type: string
         description: ip prefix length for the primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_vdbe_0_subint_untr_vmi_0:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/nested/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/nested/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
index b821e47358..5c9337d325 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/nested/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/nested/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -11,48 +11,48 @@ node_types:
       vlan_ids:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       p1:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       p2:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       virtual_ipv6_address:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       virtual_ip_address:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       net2:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       lb_st_vlan_type_oam:
         type: string
         description: dummy
         required: true
-        status: SUPPORTED
+        status: supported
       mac_address:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       net1:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_name_prefix:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_instance_index:
         type: float
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_template_Vlan_3_arrayParameter:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/nestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/nestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
index 8b05a3876a..92cb9ef8ab 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/nestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/nestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -11,52 +11,52 @@ node_types:
       vlan_ids:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       virtual_ipv6_address:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       virtual_ip_address:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       lb_st_vlan_type_oam:
         type: string
         description: dummy
         required: true
-        status: SUPPORTED
+        status: supported
       mac_address:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       net2:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       net1:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       indx:
         type: float
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_name_prefix:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_instance_index:
         type: float
         required: true
-        status: SUPPORTED
+        status: supported
       port1:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port2:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_template_Vlan_2:
         capability: tosca.capabilities.Node
@@ -302,96 +302,96 @@ node_types:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       template_PortTuple_LB1:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       lb_st_interface_type_oam:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       oam_sec_group_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       virtual_ip_address:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       net2:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       net1:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       indx:
         type: float
         required: true
-        status: SUPPORTED
+        status: supported
       security_group_name:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port1:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port2:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vlan_ids:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_image:
         type: string
         description: Image for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       virtual_ipv6_address:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_flavor:
         type: string
         description: Flavor for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       lb_st_vlan_type_oam:
         type: string
         description: dummy
         required: true
-        status: SUPPORTED
+        status: supported
       mac_address:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       availability_zone_0:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_name_prefix:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_instance_index:
         type: float
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_oam_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_test_nested3Level:
         capability: tosca.capabilities.Node
@@ -575,96 +575,96 @@ node_types:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       template_PortTuple_LB1:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       lb_st_interface_type_oam:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       oam_sec_group_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       virtual_ip_address:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       net2:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       net1:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       indx:
         type: float
         required: true
-        status: SUPPORTED
+        status: supported
       security_group_name:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port1:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port2:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vlan_ids:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_image:
         type: string
         description: Image for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       virtual_ipv6_address:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_flavor:
         type: string
         description: Flavor for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       lb_st_vlan_type_oam:
         type: string
         description: dummy
         required: true
-        status: SUPPORTED
+        status: supported
       mac_address:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       availability_zone_0:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_name_prefix:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_instance_index:
         type: float
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_oam_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_test_nested4Level:
         capability: tosca.capabilities.Node
@@ -786,96 +786,96 @@ node_types:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       template_PortTuple_LB1:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       lb_st_interface_type_oam:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       oam_sec_group_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       virtual_ip_address:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       net2:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       net1:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       indx:
         type: float
         required: true
-        status: SUPPORTED
+        status: supported
       security_group_name:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port1:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port2:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vlan_ids:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_image:
         type: string
         description: Image for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       virtual_ipv6_address:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_flavor:
         type: string
         description: Flavor for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       lb_st_vlan_type_oam:
         type: string
         description: dummy
         required: true
-        status: SUPPORTED
+        status: supported
       mac_address:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       availability_zone_0:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_name_prefix:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       subinterface_instance_index:
         type: float
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_oam_ips:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_template_Vlan_8:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/portNetworkRole/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/portNetworkRole/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
index 662ea182f7..8774cd9ffc 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/portNetworkRole/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/portNetworkRole/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -12,84 +12,84 @@ node_types:
         type: string
         description: ip prefix for primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       aap_sec_untrusted_ip_prefix:
         type: string
         description: ip prefix for secondary vDBE VM aap on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       vdbe_subport_network:
         type: string
         description: List of Contrail VLAN networks to use for the subinterfaces.   The order and number of these must match the VLAN ID list
         required: true
-        status: SUPPORTED
+        status: supported
       ip_v6_address:
         type: string
         description: IPv6 address associated with subinterfaces
         required: true
-        status: SUPPORTED
+        status: supported
       counter:
         type: float
         description: Index of instance among multiple instances.  Use to retrieve correct parameter for this instance when passed all parameters for all instances.
         required: true
-        status: SUPPORTED
+        status: supported
       subinterfaces_name_prefix:
         type: string
         description: Combined with subinterface_instance_index, this is used as the name of the subinterface resource
         required: true
-        status: SUPPORTED
+        status: supported
       ip_address:
         type: string
         description: IPv4 address associated with subinterfaces
         required: true
-        status: SUPPORTED
+        status: supported
       aap_address_mode:
         type: string
         description: Address mode for the vDBE cluster IP
         required: true
-        status: SUPPORTED
+        status: supported
       aap_untrusted_v6_ip_prefix:
         type: string
         description: ipv6 prefix for the primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       parent_interface:
         type: string
         description: Parent Contrail interface
         required: true
-        status: SUPPORTED
+        status: supported
       mac_address:
         type: string
         description: HW MAC address to use for subinterface
         required: true
-        status: SUPPORTED
+        status: supported
       vlan_tag_list:
         type: list
         description: List of VLAN IDs to use for subinterfaces
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       aap_sec_untrusted_ip_prefix_len:
         type: string
         description: ip prefix length for the secondary DBE VM aap on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       vmac_address:
         type: string
         description: virtual MAC address to use for subinterface
         required: true
-        status: SUPPORTED
+        status: supported
       aap_untrusted_v6_ip_prefix_len:
         type: string
         description: ipv6 prefix length for the primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       aap_untrusted_ip_prefix_len:
         type: string
         description: ip prefix length for the primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_vdbe_untr_vmi_subport:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/commands/newnodetemplateidgenerator/multiplevlansametype/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/commands/newnodetemplateidgenerator/multiplevlansametype/GlobalSubstitutionTypesServiceTemplate.yaml
index b47023a3b2..291b2c4a56 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/commands/newnodetemplateidgenerator/multiplevlansametype/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/commands/newnodetemplateidgenerator/multiplevlansametype/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -12,84 +12,84 @@ node_types:
         type: string
         description: ip prefix for primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       aap_sec_untrusted_ip_prefix:
         type: string
         description: ip prefix for secondary vDBE VM aap on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       ip_v6_address:
         type: string
         description: IPv6 address associated with subinterfaces
         required: true
-        status: SUPPORTED
+        status: supported
       counter:
         type: float
         description: Index of instance among multiple instances.  Use to retrieve correct parameter for this instance when passed all parameters for all instances.
         required: true
-        status: SUPPORTED
+        status: supported
       subinterfaces_name_prefix:
         type: string
         description: Combined with subinterface_instance_index, this is used as the name of the subinterface resource
         required: true
-        status: SUPPORTED
+        status: supported
       ip_address:
         type: string
         description: IPv4 address associated with subinterfaces
         required: true
-        status: SUPPORTED
+        status: supported
       aap_address_mode:
         type: string
         description: Address mode for the vDBE cluster IP
         required: true
-        status: SUPPORTED
+        status: supported
       aap_untrusted_v6_ip_prefix:
         type: string
         description: ipv6 prefix for the primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       parent_interface:
         type: string
         description: Parent Contrail interface
         required: true
-        status: SUPPORTED
+        status: supported
       vn_network_list:
         type: string
         description: List of Contrail VLAN networks to use for the subinterfaces.   The order and number of these must match the VLAN ID list
         required: true
-        status: SUPPORTED
+        status: supported
       mac_address:
         type: string
         description: HW MAC address to use for subinterface
         required: true
-        status: SUPPORTED
+        status: supported
       vlan_tag_list:
         type: list
         description: List of VLAN IDs to use for subinterfaces
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       aap_sec_untrusted_ip_prefix_len:
         type: string
         description: ip prefix length for the secondary DBE VM aap on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       vmac_address:
         type: string
         description: virtual MAC address to use for subinterface
         required: true
-        status: SUPPORTED
+        status: supported
       aap_untrusted_v6_ip_prefix_len:
         type: string
         description: ipv6 prefix length for the primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
       aap_untrusted_ip_prefix_len:
         type: string
         description: ip prefix length for the primary vDBE VM on the VAN untrusted network
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_vdbe_untr_x_subport:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/commands/newnodetemplateidgenerator/oneportsubinterfacetype/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/commands/newnodetemplateidgenerator/oneportsubinterfacetype/GlobalSubstitutionTypesServiceTemplate.yaml
index 4176447d09..c34f9bcc50 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/commands/newnodetemplateidgenerator/oneportsubinterfacetype/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/commands/newnodetemplateidgenerator/oneportsubinterfacetype/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -12,84 +12,84 @@ node_types:
         type: string

         description: ip prefix for primary vDBE VM on the VAN untrusted network

         required: true

-        status: SUPPORTED

+        status: supported

       aap_sec_untrusted_ip_prefix:

         type: string

         description: ip prefix for secondary vDBE VM aap on the VAN untrusted network

         required: true

-        status: SUPPORTED

+        status: supported

       vdbe_subport_network:

         type: string

         description: List of Contrail VLAN networks to use for the subinterfaces.   The order and number of these must match the VLAN ID list

         required: true

-        status: SUPPORTED

+        status: supported

       ip_v6_address:

         type: string

         description: IPv6 address associated with subinterfaces

         required: true

-        status: SUPPORTED

+        status: supported

       counter:

         type: float

         description: Index of instance among multiple instances.  Use to retrieve correct parameter for this instance when passed all parameters for all instances.

         required: true

-        status: SUPPORTED

+        status: supported

       subinterfaces_name_prefix:

         type: string

         description: Combined with subinterface_instance_index, this is used as the name of the subinterface resource

         required: true

-        status: SUPPORTED

+        status: supported

       ip_address:

         type: string

         description: IPv4 address associated with subinterfaces

         required: true

-        status: SUPPORTED

+        status: supported

       aap_address_mode:

         type: string

         description: Address mode for the vDBE cluster IP

         required: true

-        status: SUPPORTED

+        status: supported

       aap_untrusted_v6_ip_prefix:

         type: string

         description: ipv6 prefix for the primary vDBE VM on the VAN untrusted network

         required: true

-        status: SUPPORTED

+        status: supported

       parent_interface:

         type: string

         description: Parent Contrail interface

         required: true

-        status: SUPPORTED

+        status: supported

       mac_address:

         type: string

         description: HW MAC address to use for subinterface

         required: true

-        status: SUPPORTED

+        status: supported

       vlan_tag_list:

         type: list

         description: List of VLAN IDs to use for subinterfaces

         required: true

-        status: SUPPORTED

+        status: supported

         entry_schema:

           type: string

       aap_sec_untrusted_ip_prefix_len:

         type: string

         description: ip prefix length for the secondary DBE VM aap on the VAN untrusted network

         required: true

-        status: SUPPORTED

+        status: supported

       vmac_address:

         type: string

         description: virtual MAC address to use for subinterface

         required: true

-        status: SUPPORTED

+        status: supported

       aap_untrusted_v6_ip_prefix_len:

         type: string

         description: ipv6 prefix length for the primary vDBE VM on the VAN untrusted network

         required: true

-        status: SUPPORTED

+        status: supported

       aap_untrusted_ip_prefix_len:

         type: string

         description: ip prefix length for the primary vDBE VM on the VAN untrusted network

         required: true

-        status: SUPPORTED

+        status: supported

     requirements:

     - dependency_vdbe_untr_vmi_subport:

         capability: tosca.capabilities.Node

@@ -116,4 +116,4 @@ node_types:
         type: tosca.capabilities.Node

         occurrences:

         - 1

-        - UNBOUNDED
\ No newline at end of file
+        - UNBOUNDED

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/NoOutParamDuplicatePortType/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/NoOutParamDuplicatePortType/out/GlobalSubstitutionTypesServiceTemplate.yaml
index ec3577ad8b..b22bad28b9 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/NoOutParamDuplicatePortType/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/NoOutParamDuplicatePortType/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -11,175 +11,175 @@ node_types:
       compute_FSB1_metadata:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_FSB1_0_Internal_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_FSB1_Internal_1_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_FSB1_OAM_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_FSB1_1_Internal_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_FSB1_0_Internal_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_FSB1_1_Internal_port_0_mac_address:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_FSB1_0_Internal_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_FSB1_1_Internal_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_FSB1_Internal_1_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_FSB1_Internal_1_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_FSB1_1_Internal_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_FSB1_OAM_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_FSB1_1_Internal_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_FSB1_Internal_1_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_FSB1_0_Internal_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_FSB1_OAM_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_FSB1_1_Internal_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_FSB1_1_Internal_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_FSB1_Internal_1_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_FSB1_OAM_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_FSB1_1_Internal_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_FSB1_OAM_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_FSB1_OAM_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_FSB1_1_Internal_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_FSB1_0_Internal_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_FSB1_0_Internal_port_0_mac_address:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_FSB1_0_Internal_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_FSB1_1_Internal_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_FSB1_OAM_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_FSB1_0_Internal_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_FSB1_Internal_1_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_FSB1_Internal_1_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_FSB1_Internal_1_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_FSB1_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       index_value:
@@ -187,65 +187,65 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       port_FSB1_0_Internal_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_FSB1_1_Internal_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_FSB1_OAM_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_FSB1_Internal_1_mac_address:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_FSB1_0_Internal_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_FSB1_Internal_1_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_FSB1_Internal_1_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_FSB1_OAM_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_FSB1_OAM_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_FSB1_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_FSB1_OAM_fixed_ips:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
       port_FSB1_0_Internal_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     requirements:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/NoPorts/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/NoPorts/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 916359eb88..bb7d8c0628 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/NoPorts/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/NoPorts/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -11,13 +11,13 @@ node_types:
       compute_FSB1_metadata:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       compute_FSB1_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       index_value:
@@ -25,19 +25,19 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       compute_FSB1_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_FSB1:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithIndex/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithIndex/out/GlobalSubstitutionTypesServiceTemplate.yaml
index ac0f7726a0..93ca9391cd 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithIndex/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithIndex/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -11,101 +11,101 @@ node_types:
       port_FSB_Internal_port_1_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_FSB_Internal_port_1_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_FSB1_OAM_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_FSB1_metadata:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_FSB_Internal_port_1_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_FSB_Internal_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_FSB_Internal_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_FSB_Internal_port_1_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_FSB1_OAM_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_FSB_Internal_port_0_mac_address:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_FSB1_OAM_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_FSB_Internal_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_FSB_Internal_port_1_mac_address:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_FSB_Internal_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_FSB1_OAM_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_FSB_Internal_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_FSB1_OAM_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_FSB_Internal_port_1_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       compute_FSB1_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       index_value:
@@ -113,89 +113,89 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       port_FSB1_OAM_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_FSB_Internal_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_FSB1_OAM_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_FSB_Internal_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_FSB_Internal_port_1_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_FSB_Internal_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_FSB1_OAM_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_FSB_Internal_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_FSB1_OAM_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_FSB1_OAM_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_FSB1_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_FSB_Internal_port_1_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_FSB1_OAM_fixed_ips:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
       port_FSB_Internal_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_FSB_Internal_port_1_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_FSB_Internal_port_1_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_FSB_Internal_port_1_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_FSB1_FSB1_OAM:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/consolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/consolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 65fe7d2736..5434fc3cf5 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/consolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/consolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -11,77 +11,77 @@ node_types:
       port_FSB_Internal_port_1_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_FSB_Internal_port_1_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       compute_FSB1_metadata:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_FSB_Internal_port_1_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_FSB_Internal_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_FSB_Internal_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_FSB_Internal_port_1_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_FSB_Internal_port_0_mac_address:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_FSB_Internal_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_FSB_Internal_port_1_mac_address:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_FSB_Internal_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_FSB_Internal_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_FSB_Internal_port_1_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       compute_FSB1_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       index_value:
@@ -89,75 +89,75 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       port_FSB_Internal_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_FSB_Internal_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_FSB_Internal_port_1_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_FSB_Internal_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_FSB_Internal_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_FSB1_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_FSB_Internal_port_1_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_FSB_Internal_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_FSB_Internal_port_1_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_FSB_Internal_port_1_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_FSB_Internal_port_1_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
     attributes:
       FSB1_FSB_1_Internal_port_1_network_id:
         type: string
-        status: SUPPORTED
+        status: supported
       FSB1_FSB_1_Internal_port_1_device_owner:
         type: string
-        status: SUPPORTED
+        status: supported
       FSB1_user_data_format:
         type: string
-        status: SUPPORTED
+        status: supported
       FSB1_accessIPv6:
         type: string
-        status: SUPPORTED
+        status: supported
       FSB1_addresses:
         type: map
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.novaServer.network.AddressInfo
     requirements:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/noConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/noConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml
index c746391eb3..78f6b20ede 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/noConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/noConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -11,97 +11,97 @@ node_types:
       port_FSB1_Internal_1_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_FSB2_Internal_2_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_FSB2_Internal_2_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_FSB1_OAM_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_FSB1_metadata:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_FSB1_OAM_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_FSB1_OAM_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_FSB2_Internal_2_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_FSB1_Internal_1_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_FSB2_Internal_2_mac_address:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_FSB2_Internal_2_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_FSB1_OAM_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_FSB1_OAM_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_FSB1_Internal_1_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_FSB1_Internal_1_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_FSB1_Internal_1_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_FSB1_Internal_1_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_FSB1_Internal_1_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_FSB1_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       index_value:
@@ -109,103 +109,103 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       port_FSB2_Internal_2_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_FSB1_OAM_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_FSB1_Internal_1_mac_address:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_FSB1_OAM_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_FSB2_Internal_2_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_FSB1_Internal_1_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_FSB2_Internal_2_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_FSB2_Internal_2_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_FSB1_Internal_1_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_FSB1_Internal_1_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_FSB1_OAM_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_FSB1_OAM_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_FSB1_OAM_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_FSB1_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_FSB1_OAM_fixed_ips:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
       port_FSB2_Internal_2_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_FSB2_Internal_2_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
     attributes:
       FSB1_accessIPv6:
         type: string
-        status: SUPPORTED
+        status: supported
       FSB1_FSB1_OAM_status:
         type: string
-        status: SUPPORTED
+        status: supported
       FSB1_addresses:
         type: map
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.novaServer.network.AddressInfo
     requirements:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/consolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/consolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 1a7ae59586..7371e3156c 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/consolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/consolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -11,77 +11,77 @@ node_types:
       port_FSB_Internal_port_1_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_FSB_Internal_port_1_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       compute_FSB1_metadata:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: json
       port_FSB_Internal_port_1_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_FSB_Internal_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_FSB_Internal_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_FSB_Internal_port_1_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_FSB_Internal_port_0_mac_address:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_FSB_Internal_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_FSB_Internal_port_1_mac_address:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_FSB_Internal_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_FSB_Internal_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_FSB_Internal_port_1_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       compute_FSB1_availability_zone:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       index_value:
@@ -89,69 +89,69 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       port_FSB_Internal_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_FSB_Internal_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_FSB_Internal_port_1_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_FSB_Internal_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_FSB_Internal_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_FSB1_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_FSB_Internal_port_1_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_FSB_Internal_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_FSB_Internal_port_1_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_FSB_Internal_port_1_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
     attributes:
       FSB1_FSB_1_Internal_port_1_network_id:
         type: string
-        status: SUPPORTED
+        status: supported
       FSB1_FSB_1_Internal_port_1_device_owner:
         type: string
-        status: SUPPORTED
+        status: supported
       FSB1_user_data_format:
         type: string
-        status: SUPPORTED
+        status: supported
       FSB1_accessIPv6:
         type: string
-        status: SUPPORTED
+        status: supported
       FSB1_addresses:
         type: map
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.novaServer.network.AddressInfo
     requirements:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/noConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/noConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml
index bc1bf735a3..fa4ee1a095 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/noConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/noConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -11,89 +11,89 @@ node_types:
       port_FSB_Internal_port_1_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_FSB_Internal_port_1_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_FSB1_OAM_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_FSB_Internal_port_1_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_FSB_Internal_port_0_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_FSB_Internal_port_1_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_FSB_Internal_port_0_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_FSB1_OAM_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_FSB_Internal_port_0_mac_address:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_FSB1_OAM_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_FSB_Internal_port_0_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_FSB_Internal_port_1_mac_address:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_FSB_Internal_port_0_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_FSB1_OAM_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_FSB_Internal_port_0_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_FSB1_OAM_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_FSB_Internal_port_1_vlan_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       index_value:
@@ -101,99 +101,99 @@ node_types:
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       port_FSB1_OAM_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_FSB_Internal_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_FSB1_OAM_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_FSB_Internal_port_0_order:
         type: integer
         required: true
-        status: SUPPORTED
+        status: supported
       port_FSB_Internal_port_1_ip_requirements:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_FSB_Internal_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_FSB1_OAM_network_role:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_FSB_Internal_port_0_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_FSB1_OAM_related_networks:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_FSB1_OAM_network_role_tag:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_FSB_Internal_port_1_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
-        status: SUPPORTED
+        status: supported
       port_FSB1_OAM_fixed_ips:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
       port_FSB_Internal_port_1_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
-        status: SUPPORTED
+        status: supported
       port_FSB_Internal_port_0_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       port_FSB_Internal_port_1_network:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       port_FSB_Internal_port_1_subnetpoolid:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
     attributes:
       FSB1_FSB_1_Internal_port_1_network_id:
         type: string
-        status: SUPPORTED
+        status: supported
       FSB1_FSB_1_Internal_port_1_device_owner:
         type: string
-        status: SUPPORTED
+        status: supported
       FSB1_accessIPv6:
         type: string
-        status: SUPPORTED
+        status: supported
       FSB1_FSB1_OAM_status:
         type: string
-        status: SUPPORTED
+        status: supported
       FSB1_addresses:
         type: map
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.novaServer.network.AddressInfo
     requirements:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/pattern4/nestedNodesConnectedIn/in/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/pattern4/nestedNodesConnectedIn/in/GlobalSubstitutionTypesServiceTemplate.yaml
index 9699fe0770..fa549deaf8 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/pattern4/nestedNodesConnectedIn/in/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/pattern4/nestedNodesConnectedIn/in/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -12,72 +12,72 @@ node_types:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_gw:
         type: string
         description: CPS network gateway
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_image_name:
         type: string
         description: PCRF CM image name
         required: true
-        status: SUPPORTED
+        status: supported
       security_group_name:
         type: string
         description: the name of security group
         required: true
-        status: SUPPORTED
+        status: supported
       cps_net_ip:
         type: string
         description: CPS network ip
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_flavor_name:
         type: string
         description: flavor name of PCRF CM instance
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_vol:
         type: string
         description: CPS Cluman Cinder Volume
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_server_name:
         type: string
         description: PCRF CM server name
         required: true
-        status: SUPPORTED
+        status: supported
       cps_net_name:
         type: string
         description: CPS network name
         required: true
-        status: SUPPORTED
+        status: supported
       cps_net_mask:
         type: string
         description: CPS network mask
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_ip:
         type: string
         description: OAM network ip
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_mask:
         type: string
         description: CPS network mask
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_name:
         type: string
         description: OAM network name
         required: true
-        status: SUPPORTED
+        status: supported
     attributes:
       server_pcm_id:
         type: string
         description: the pcm nova service id
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_pcm_port_1:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/pattern4/nestedNodesConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/pattern4/nestedNodesConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
index bb5951f82a..5e73de2fdf 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/pattern4/nestedNodesConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/pattern4/nestedNodesConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -12,72 +12,72 @@ node_types:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_gw:
         type: string
         description: CPS network gateway
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_image_name:
         type: string
         description: PCRF CM image name
         required: true
-        status: SUPPORTED
+        status: supported
       security_group_name:
         type: string
         description: the name of security group
         required: true
-        status: SUPPORTED
+        status: supported
       cps_net_ip:
         type: string
         description: CPS network ip
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_flavor_name:
         type: string
         description: flavor name of PCRF CM instance
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_vol:
         type: string
         description: CPS Cluman Cinder Volume
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_server_name:
         type: string
         description: PCRF CM server name
         required: true
-        status: SUPPORTED
+        status: supported
       cps_net_name:
         type: string
         description: CPS network name
         required: true
-        status: SUPPORTED
+        status: supported
       cps_net_mask:
         type: string
         description: CPS network mask
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_ip:
         type: string
         description: OAM network ip
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_mask:
         type: string
         description: CPS network mask
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_name:
         type: string
         description: OAM network name
         required: true
-        status: SUPPORTED
+        status: supported
     attributes:
       server_pcm_id:
         type: string
         description: the pcm nova service id
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_pcm_port_1:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/pattern4/nestedNodesGetAttrIn/in/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/pattern4/nestedNodesGetAttrIn/in/GlobalSubstitutionTypesServiceTemplate.yaml
index 9699fe0770..fa549deaf8 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/pattern4/nestedNodesGetAttrIn/in/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/pattern4/nestedNodesGetAttrIn/in/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -12,72 +12,72 @@ node_types:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_gw:
         type: string
         description: CPS network gateway
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_image_name:
         type: string
         description: PCRF CM image name
         required: true
-        status: SUPPORTED
+        status: supported
       security_group_name:
         type: string
         description: the name of security group
         required: true
-        status: SUPPORTED
+        status: supported
       cps_net_ip:
         type: string
         description: CPS network ip
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_flavor_name:
         type: string
         description: flavor name of PCRF CM instance
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_vol:
         type: string
         description: CPS Cluman Cinder Volume
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_server_name:
         type: string
         description: PCRF CM server name
         required: true
-        status: SUPPORTED
+        status: supported
       cps_net_name:
         type: string
         description: CPS network name
         required: true
-        status: SUPPORTED
+        status: supported
       cps_net_mask:
         type: string
         description: CPS network mask
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_ip:
         type: string
         description: OAM network ip
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_mask:
         type: string
         description: CPS network mask
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_name:
         type: string
         description: OAM network name
         required: true
-        status: SUPPORTED
+        status: supported
     attributes:
       server_pcm_id:
         type: string
         description: the pcm nova service id
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_pcm_port_1:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/pattern4/nestedNodesGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/pattern4/nestedNodesGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
index bb5951f82a..5e73de2fdf 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/pattern4/nestedNodesGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/pattern4/nestedNodesGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -12,72 +12,72 @@ node_types:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_gw:
         type: string
         description: CPS network gateway
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_image_name:
         type: string
         description: PCRF CM image name
         required: true
-        status: SUPPORTED
+        status: supported
       security_group_name:
         type: string
         description: the name of security group
         required: true
-        status: SUPPORTED
+        status: supported
       cps_net_ip:
         type: string
         description: CPS network ip
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_flavor_name:
         type: string
         description: flavor name of PCRF CM instance
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_vol:
         type: string
         description: CPS Cluman Cinder Volume
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_server_name:
         type: string
         description: PCRF CM server name
         required: true
-        status: SUPPORTED
+        status: supported
       cps_net_name:
         type: string
         description: CPS network name
         required: true
-        status: SUPPORTED
+        status: supported
       cps_net_mask:
         type: string
         description: CPS network mask
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_ip:
         type: string
         description: OAM network ip
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_mask:
         type: string
         description: CPS network mask
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_name:
         type: string
         description: OAM network name
         required: true
-        status: SUPPORTED
+        status: supported
     attributes:
       server_pcm_id:
         type: string
         description: the pcm nova service id
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_pcm_port_1:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/pattern4/nestedOutputParamGetAttrIn/in/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/pattern4/nestedOutputParamGetAttrIn/in/GlobalSubstitutionTypesServiceTemplate.yaml
index 9699fe0770..fa549deaf8 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/pattern4/nestedOutputParamGetAttrIn/in/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/pattern4/nestedOutputParamGetAttrIn/in/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -12,72 +12,72 @@ node_types:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_gw:
         type: string
         description: CPS network gateway
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_image_name:
         type: string
         description: PCRF CM image name
         required: true
-        status: SUPPORTED
+        status: supported
       security_group_name:
         type: string
         description: the name of security group
         required: true
-        status: SUPPORTED
+        status: supported
       cps_net_ip:
         type: string
         description: CPS network ip
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_flavor_name:
         type: string
         description: flavor name of PCRF CM instance
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_vol:
         type: string
         description: CPS Cluman Cinder Volume
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_server_name:
         type: string
         description: PCRF CM server name
         required: true
-        status: SUPPORTED
+        status: supported
       cps_net_name:
         type: string
         description: CPS network name
         required: true
-        status: SUPPORTED
+        status: supported
       cps_net_mask:
         type: string
         description: CPS network mask
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_ip:
         type: string
         description: OAM network ip
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_mask:
         type: string
         description: CPS network mask
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_name:
         type: string
         description: OAM network name
         required: true
-        status: SUPPORTED
+        status: supported
     attributes:
       server_pcm_id:
         type: string
         description: the pcm nova service id
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_pcm_port_1:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/pattern4/nestedOutputParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/pattern4/nestedOutputParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
index bb5951f82a..5e73de2fdf 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/pattern4/nestedOutputParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/pattern4/nestedOutputParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -12,72 +12,72 @@ node_types:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_gw:
         type: string
         description: CPS network gateway
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_image_name:
         type: string
         description: PCRF CM image name
         required: true
-        status: SUPPORTED
+        status: supported
       security_group_name:
         type: string
         description: the name of security group
         required: true
-        status: SUPPORTED
+        status: supported
       cps_net_ip:
         type: string
         description: CPS network ip
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_flavor_name:
         type: string
         description: flavor name of PCRF CM instance
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_vol:
         type: string
         description: CPS Cluman Cinder Volume
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_server_name:
         type: string
         description: PCRF CM server name
         required: true
-        status: SUPPORTED
+        status: supported
       cps_net_name:
         type: string
         description: CPS network name
         required: true
-        status: SUPPORTED
+        status: supported
       cps_net_mask:
         type: string
         description: CPS network mask
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_ip:
         type: string
         description: OAM network ip
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_mask:
         type: string
         description: CPS network mask
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_name:
         type: string
         description: OAM network name
         required: true
-        status: SUPPORTED
+        status: supported
     attributes:
       server_pcm_id:
         type: string
         description: the pcm nova service id
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_pcm_port_1:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/pattern4/oneNestedNode/in/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/pattern4/oneNestedNode/in/GlobalSubstitutionTypesServiceTemplate.yaml
index 887439d296..dfcce1503e 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/pattern4/oneNestedNode/in/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/pattern4/oneNestedNode/in/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -42,82 +42,82 @@ node_types:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_gw:
         type: string
         description: CPS network gateway
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_image_name:
         type: string
         description: PCRF CM image name
         required: true
-        status: SUPPORTED
+        status: supported
       cps_net_ips:
         type: string
         description: CPS network ip
         required: true
-        status: SUPPORTED
+        status: supported
       security_group_name:
         type: string
         description: the name of security group
         required: true
-        status: SUPPORTED
+        status: supported
       cps_net_ip:
         type: string
         description: CPS network ip
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_volumes:
         type: string
         description: CPS Cluman Cinder Volume
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_flavor_name:
         type: string
         description: flavor name of PCRF CM instance
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_vol:
         type: string
         description: CPS Cluman Cinder Volume
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_server_name:
         type: string
         description: PCRF CM server name
         required: true
-        status: SUPPORTED
+        status: supported
       cps_net_name:
         type: string
         description: CPS network name
         required: true
-        status: SUPPORTED
+        status: supported
       cps_net_mask:
         type: string
         description: CPS network mask
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_ip:
         type: string
         description: OAM network ip
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_mask:
         type: string
         description: CPS network mask
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_name:
         type: string
         description: OAM network name
         required: true
-        status: SUPPORTED
+        status: supported
     attributes:
       server_pcm_id:
         type: string
         description: the pcm nova service id
-        status: SUPPORTED
+        status: supported
     requirements:
     - link_pcm_port_1:
         capability: tosca.capabilities.network.Linkable
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/pattern4/oneNestedNode/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/pattern4/oneNestedNode/out/GlobalSubstitutionTypesServiceTemplate.yaml
index a424a5d19b..ec400a3063 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/pattern4/oneNestedNode/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/pattern4/oneNestedNode/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -42,82 +42,82 @@ node_types:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_gw:
         type: string
         description: CPS network gateway
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_image_name:
         type: string
         description: PCRF CM image name
         required: true
-        status: SUPPORTED
+        status: supported
       cps_net_ips:
         type: string
         description: CPS network ip
         required: true
-        status: SUPPORTED
+        status: supported
       security_group_name:
         type: string
         description: the name of security group
         required: true
-        status: SUPPORTED
+        status: supported
       cps_net_ip:
         type: string
         description: CPS network ip
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_volumes:
         type: string
         description: CPS Cluman Cinder Volume
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_flavor_name:
         type: string
         description: flavor name of PCRF CM instance
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_vol:
         type: string
         description: CPS Cluman Cinder Volume
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_server_name:
         type: string
         description: PCRF CM server name
         required: true
-        status: SUPPORTED
+        status: supported
       cps_net_name:
         type: string
         description: CPS network name
         required: true
-        status: SUPPORTED
+        status: supported
       cps_net_mask:
         type: string
         description: CPS network mask
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_ip:
         type: string
         description: OAM network ip
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_mask:
         type: string
         description: CPS network mask
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_name:
         type: string
         description: OAM network name
         required: true
-        status: SUPPORTED
+        status: supported
     attributes:
       server_pcm_id:
         type: string
         description: the pcm nova service id
-        status: SUPPORTED
+        status: supported
     requirements:
     - link_pcm_port_1:
         capability: tosca.capabilities.network.Linkable
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/pattern4/twoNestedWithOneCompute/in/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/pattern4/twoNestedWithOneCompute/in/GlobalSubstitutionTypesServiceTemplate.yaml
index 9a1c164bab..2be87a9940 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/pattern4/twoNestedWithOneCompute/in/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/pattern4/twoNestedWithOneCompute/in/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -42,72 +42,72 @@ node_types:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_gw:
         type: string
         description: CPS network gateway
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_image_name:
         type: string
         description: PCRF CM image name
         required: true
-        status: SUPPORTED
+        status: supported
       security_group_name:
         type: string
         description: the name of security group
         required: true
-        status: SUPPORTED
+        status: supported
       cps_net_ip:
         type: string
         description: CPS network ip
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_flavor_name:
         type: string
         description: flavor name of PCRF CM instance
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_vol:
         type: string
         description: CPS Cluman Cinder Volume
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_server_name:
         type: string
         description: PCRF CM server name
         required: true
-        status: SUPPORTED
+        status: supported
       cps_net_name:
         type: string
         description: CPS network name
         required: true
-        status: SUPPORTED
+        status: supported
       cps_net_mask:
         type: string
         description: CPS network mask
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_ip:
         type: string
         description: OAM network ip
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_mask:
         type: string
         description: CPS network mask
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_name:
         type: string
         description: OAM network name
         required: true
-        status: SUPPORTED
+        status: supported
     attributes:
       server_pcm_id:
         type: string
         description: the pcm nova service id
-        status: SUPPORTED
+        status: supported
     requirements:
     - link_pcm_port_1:
         capability: tosca.capabilities.network.Linkable
@@ -204,72 +204,72 @@ node_types:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_gw:
         type: string
         description: CPS network gateway
         required: true
-        status: SUPPORTED
+        status: supported
       oam_flavor_name:
         type: string
         description: flavor name of PCRF CM instance
         required: true
-        status: SUPPORTED
+        status: supported
       security_group_name:
         type: string
         description: the name of security group
         required: true
-        status: SUPPORTED
+        status: supported
       cps_net_ip:
         type: string
         description: CPS network ip
         required: true
-        status: SUPPORTED
+        status: supported
       oam_server_name:
         type: string
         description: oam server name
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_vol:
         type: string
         description: CPS Cluman Cinder Volume
         required: true
-        status: SUPPORTED
+        status: supported
       oam_image_name:
         type: string
         description: oam image name
         required: true
-        status: SUPPORTED
+        status: supported
       cps_net_name:
         type: string
         description: CPS network name
         required: true
-        status: SUPPORTED
+        status: supported
       cps_net_mask:
         type: string
         description: CPS network mask
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_ip:
         type: string
         description: OAM network ip
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_mask:
         type: string
         description: CPS network mask
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_name:
         type: string
         description: OAM network name
         required: true
-        status: SUPPORTED
+        status: supported
     attributes:
       server_oam_id:
         type: string
         description: the oam nova service id
-        status: SUPPORTED
+        status: supported
     requirements:
     - local_storage_server_oam:
         capability: tosca.capabilities.Attachment
@@ -365,35 +365,35 @@ node_types:
       compute_compute_user_data_format:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       compute_compute_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_compute_config_drive:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
     requirements:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/pattern4/twoNestedWithOneCompute/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/pattern4/twoNestedWithOneCompute/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 22cf58d6f6..9a29c4448c 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/pattern4/twoNestedWithOneCompute/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/pattern4/twoNestedWithOneCompute/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -41,35 +41,35 @@ node_types:
       compute_compute_user_data_format:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vm_image_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
         required: false
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
       compute_compute_name:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       vm_flavor_name:
         type: string
         required: true
-        status: SUPPORTED
+        status: supported
       compute_compute_config_drive:
         type: list
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
     requirements:
@@ -120,72 +120,72 @@ node_types:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_gw:
         type: string
         description: CPS network gateway
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_image_name:
         type: string
         description: PCRF CM image name
         required: true
-        status: SUPPORTED
+        status: supported
       security_group_name:
         type: string
         description: the name of security group
         required: true
-        status: SUPPORTED
+        status: supported
       cps_net_ip:
         type: string
         description: CPS network ip
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_flavor_name:
         type: string
         description: flavor name of PCRF CM instance
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_vol:
         type: string
         description: CPS Cluman Cinder Volume
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_server_name:
         type: string
         description: PCRF CM server name
         required: true
-        status: SUPPORTED
+        status: supported
       cps_net_name:
         type: string
         description: CPS network name
         required: true
-        status: SUPPORTED
+        status: supported
       cps_net_mask:
         type: string
         description: CPS network mask
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_ip:
         type: string
         description: OAM network ip
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_mask:
         type: string
         description: CPS network mask
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_name:
         type: string
         description: OAM network name
         required: true
-        status: SUPPORTED
+        status: supported
     attributes:
       server_pcm_id:
         type: string
         description: the pcm nova service id
-        status: SUPPORTED
+        status: supported
     requirements:
     - link_pcm_port_1:
         capability: tosca.capabilities.network.Linkable
@@ -282,72 +282,72 @@ node_types:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_gw:
         type: string
         description: CPS network gateway
         required: true
-        status: SUPPORTED
+        status: supported
       oam_flavor_name:
         type: string
         description: flavor name of PCRF CM instance
         required: true
-        status: SUPPORTED
+        status: supported
       security_group_name:
         type: string
         description: the name of security group
         required: true
-        status: SUPPORTED
+        status: supported
       cps_net_ip:
         type: string
         description: CPS network ip
         required: true
-        status: SUPPORTED
+        status: supported
       oam_server_name:
         type: string
         description: oam server name
         required: true
-        status: SUPPORTED
+        status: supported
       pcm_vol:
         type: string
         description: CPS Cluman Cinder Volume
         required: true
-        status: SUPPORTED
+        status: supported
       oam_image_name:
         type: string
         description: oam image name
         required: true
-        status: SUPPORTED
+        status: supported
       cps_net_name:
         type: string
         description: CPS network name
         required: true
-        status: SUPPORTED
+        status: supported
       cps_net_mask:
         type: string
         description: CPS network mask
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_ip:
         type: string
         description: OAM network ip
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_mask:
         type: string
         description: CPS network mask
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_name:
         type: string
         description: OAM network name
         required: true
-        status: SUPPORTED
+        status: supported
     attributes:
       server_oam_id:
         type: string
         description: the oam nova service id
-        status: SUPPORTED
+        status: supported
     requirements:
     - local_storage_server_oam:
         capability: tosca.capabilities.Attachment
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/vol_attach/nested_with_inner_vol/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/vol_attach/nested_with_inner_vol/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 66cca69468..17e12e589a 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/vol_attach/nested_with_inner_vol/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/vol_attach/nested_with_inner_vol/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -12,96 +12,96 @@ node_types:
         type: list
         description: CMAUI1, CMAUI2 server names
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       cmaui_cinder_volume_size:
         type: float
         description: the size of the CMAUI Cinder volume
         required: true
-        status: SUPPORTED
+        status: supported
       timezone:
         type: string
         description: timezone
         required: true
-        status: SUPPORTED
+        status: supported
       security_group_name:
         type: string
         description: the name of security group
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_volume:
         type: string
         description: Volume for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       oam_network_netmask:
         type: string
         description: oam network gateway
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_image:
         type: string
         description: Image for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       vnf_id:
         type: string
         description: Unique ID for this VNF instance
         required: false
         default: This_is_ths_MMSC-CMAUI_id
-        status: SUPPORTED
+        status: supported
       cmaui_flavor:
         type: string
         description: Flavor for CMAUI server
         required: true
-        status: SUPPORTED
+        status: supported
       oam_network_gateway:
         type: string
         description: oam network gateway
         required: true
-        status: SUPPORTED
+        status: supported
       out_cmaui_volume:
         type: string
         description: the name of the target volume backend
         required: true
-        status: SUPPORTED
+        status: supported
       availability_zone_0:
         type: string
         description: availabilityzone name
         required: true
-        status: SUPPORTED
+        status: supported
       cmaui_oam_ips:
         type: list
         description: CMAUI oam_net IP addresses
         required: true
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       external_dns:
         type: string
         description: dns server
         required: true
-        status: SUPPORTED
+        status: supported
       oam_net_name:
         type: string
         description: UID of OAM network
         required: true
-        status: SUPPORTED
+        status: supported
       external_ntp:
         type: string
         description: ntp server
         required: true
-        status: SUPPORTED
+        status: supported
       CMAUI_volume_type:
         type: string
         description: the name of the target volume backend
         required: true
-        status: SUPPORTED
+        status: supported
     attributes:
       out_cmaui_volume:
         type: string
-        status: SUPPORTED
+        status: supported
     requirements:
     - dependency_server_cmaui_2:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-core/src/main/java/org/openecomp/core/converter/impl/pnfd/parser/ParameterDefinitionYamlParser.java b/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-core/src/main/java/org/openecomp/core/converter/impl/pnfd/parser/ParameterDefinitionYamlParser.java
index d103326c11..4158deb9fe 100644
--- a/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-core/src/main/java/org/openecomp/core/converter/impl/pnfd/parser/ParameterDefinitionYamlParser.java
+++ b/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-core/src/main/java/org/openecomp/core/converter/impl/pnfd/parser/ParameterDefinitionYamlParser.java
@@ -50,7 +50,7 @@ public class ParameterDefinitionYamlParser {
         }
         parameterDefinition.setRequired((Boolean) parameterDefinitionYaml.get("required"));
         parameterDefinition.setType((String) parameterDefinitionYaml.get("type"));
-        parameterDefinition.setStatus((Status) parameterDefinitionYaml.get("status"));
+        parameterDefinition.setStatus((String) parameterDefinitionYaml.get("status"));
 
         return parameterDefinition;
     }
diff --git a/openecomp-be/lib/openecomp-tosca-lib/src/test/java/org/openecomp/sdc/tosca/datatypes/model/CapabilityDefinitionTest.java b/openecomp-be/lib/openecomp-tosca-lib/src/test/java/org/openecomp/sdc/tosca/datatypes/model/CapabilityDefinitionTest.java
index 314e071c9e..1e3024d950 100644
--- a/openecomp-be/lib/openecomp-tosca-lib/src/test/java/org/openecomp/sdc/tosca/datatypes/model/CapabilityDefinitionTest.java
+++ b/openecomp-be/lib/openecomp-tosca-lib/src/test/java/org/openecomp/sdc/tosca/datatypes/model/CapabilityDefinitionTest.java
@@ -75,7 +75,7 @@ public class CapabilityDefinitionTest {
     propertyDefinition.set_default(5);
     propertyDefinition.setEntry_schema(getMockEntrySchema());
     propertyDefinition.setRequired(false);
-    propertyDefinition.setStatus(Status.UNSUPPORTED);
+    propertyDefinition.setStatus(Status.UNSUPPORTED.getName());
     return propertyDefinition;
   }
 
@@ -102,7 +102,7 @@ public class CapabilityDefinitionTest {
     attributeDefinition.setType("type1");
     attributeDefinition.set_default("none");
     attributeDefinition.setEntry_schema(getMockEntrySchema());
-    attributeDefinition.setStatus(Status.UNSUPPORTED);
+    attributeDefinition.setStatus(Status.UNSUPPORTED.getName());
     return attributeDefinition;
   }
 
diff --git a/openecomp-be/lib/openecomp-tosca-lib/src/test/java/org/openecomp/sdc/tosca/services/impl/ToscaAnalyzerServiceImplTest.java b/openecomp-be/lib/openecomp-tosca-lib/src/test/java/org/openecomp/sdc/tosca/services/impl/ToscaAnalyzerServiceImplTest.java
index f8e6759555..7dca84bd40 100644
--- a/openecomp-be/lib/openecomp-tosca-lib/src/test/java/org/openecomp/sdc/tosca/services/impl/ToscaAnalyzerServiceImplTest.java
+++ b/openecomp-be/lib/openecomp-tosca-lib/src/test/java/org/openecomp/sdc/tosca/services/impl/ToscaAnalyzerServiceImplTest.java
@@ -1099,10 +1099,10 @@ public class ToscaAnalyzerServiceImplTest {
         parameterDefinitionInput.setRequired(true);
         parameterDefinitionInput.set_default("default");
         parameterDefinitionInput.setConstraints(Collections.singletonList(new Constraint()));
-        parameterDefinitionInput.setStatus(Status.SUPPORTED);
+        parameterDefinitionInput.setStatus(Status.SUPPORTED.getName());
 
         ParameterDefinition parameterDefinitionOutput = new ParameterDefinition();
-        parameterDefinitionOutput.setStatus(Status.SUPPORTED);
+        parameterDefinitionOutput.setStatus(Status.SUPPORTED.getName());
 
         ServiceTemplate serviceTemplate = new ServiceTemplate();
         serviceTemplate.setTopology_template(new TopologyTemplate());
diff --git a/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/analyzerService/NestedServiceTemplateReqTest.yaml b/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/analyzerService/NestedServiceTemplateReqTest.yaml
index 8022d996b7..81202230d9 100644
--- a/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/analyzerService/NestedServiceTemplateReqTest.yaml
+++ b/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/analyzerService/NestedServiceTemplateReqTest.yaml
@@ -29,13 +29,13 @@ node_types:
       admin_pass:
         description: The administrator password for the server
         type: string
-        status: SUPPORTED
+        status: supported
         default: overridden default value
         required: false
       new_property:
         description: new property
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
 data_types:
   org.openecomp.datatypes.heat.network.MyAddressPair:
@@ -45,13 +45,13 @@ data_types:
       mac_address:
         description: MAC address
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
         default: overridden default value
       new_property:
         description: new property
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
   org.openecomp.datatypes.heat.network.MyNewAddressPair:
     derived_from: org.openecomp.datatypes.heat.network.MyAddressPair
@@ -60,7 +60,7 @@ data_types:
       mac_address:
         description: MAC address
         type: string
-        status: SUPPORTED
+        status: supported
         required: true
         default: overridden default value
 topology_template:
diff --git a/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/analyzerService/ServiceTemplateDatatypeFlatTest.yaml b/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/analyzerService/ServiceTemplateDatatypeFlatTest.yaml
index d7dcdca111..8eea5c90cf 100644
--- a/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/analyzerService/ServiceTemplateDatatypeFlatTest.yaml
+++ b/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/analyzerService/ServiceTemplateDatatypeFlatTest.yaml
@@ -29,13 +29,13 @@ node_types:
       admin_pass:
         description: The administrator password for the server
         type: string
-        status: SUPPORTED
+        status: supported
         default: overridden default value
         required: false
       new_property:
         description: new property
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
 data_types:
   org.openecomp.datatypes.heat.network.MyString:
diff --git a/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/analyzerService/ServiceTemplateFileNotFoundTest.yaml b/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/analyzerService/ServiceTemplateFileNotFoundTest.yaml
index 37b242b53f..32c2ba824e 100644
--- a/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/analyzerService/ServiceTemplateFileNotFoundTest.yaml
+++ b/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/analyzerService/ServiceTemplateFileNotFoundTest.yaml
@@ -11,13 +11,13 @@ node_types:
       admin_pass:
         description: The administrator password for the server
         type: string
-        status: SUPPORTED
+        status: supported
         default: overridden default value
         required: false
       new_property:
         description: new property
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
 data_types:
   org.openecomp.datatypes.heat.network.MyAddressPair:
@@ -27,13 +27,13 @@ data_types:
       mac_address:
         description: MAC address
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
         default: overridden default value
       new_property:
         description: new property
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
   org.openecomp.datatypes.heat.network.MyNewAddressPair:
     derived_from: org.openecomp.datatypes.heat.network.MyAddressPair
@@ -42,7 +42,7 @@ data_types:
       mac_address:
         description: MAC address
         type: string
-        status: SUPPORTED
+        status: supported
         required: true
         default: overridden default value
 topology_template:
diff --git a/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/analyzerService/ServiceTemplateInterfaceInheritanceTest.yaml b/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/analyzerService/ServiceTemplateInterfaceInheritanceTest.yaml
index 3df6798b6c..d9eac6a006 100644
--- a/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/analyzerService/ServiceTemplateInterfaceInheritanceTest.yaml
+++ b/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/analyzerService/ServiceTemplateInterfaceInheritanceTest.yaml
@@ -11,13 +11,13 @@ node_types:
       admin_pass:
         description: The administrator password for the server
         type: string
-        status: SUPPORTED
+        status: supported
         default: overridden default value
         required: false
       new_property:
         description: new property
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
     interfaces:
       Standard:
@@ -89,13 +89,13 @@ data_types:
       mac_address:
         description: MAC address
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
         default: overridden default value
       new_property:
         description: new property
         type: string
-        status: SUPPORTED
+        status: supported
         required: false
   org.openecomp.datatypes.heat.network.MyNewAddressPair:
     derived_from: org.openecomp.datatypes.heat.network.MyAddressPair
@@ -104,7 +104,7 @@ data_types:
       mac_address:
         description: MAC address
         type: string
-        status: SUPPORTED
+        status: supported
         required: true
         default: overridden default value
 interface_types:
diff --git a/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/globalServiceTemplates/AbstractSubstituteGlobalTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/globalServiceTemplates/AbstractSubstituteGlobalTypesServiceTemplate.yaml
index 449f0939ee..400a13bf16 100644
--- a/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/globalServiceTemplates/AbstractSubstituteGlobalTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/globalServiceTemplates/AbstractSubstituteGlobalTypesServiceTemplate.yaml
@@ -15,13 +15,13 @@ data_types:
         type: string
         description: Substitute Service Template
         required: true
-        status: SUPPORTED
+        status: supported
       index_variable:
         type: string
         description: Index variable
         required: false
         default: '%index%'
-        status: SUPPORTED
+        status: supported
         constraints:
         - min_length: 3
       count:
@@ -29,13 +29,13 @@ data_types:
         description: Count
         required: false
         default: 1
-        status: SUPPORTED
+        status: supported
       mandatory:
         type: boolean
         description: Mandatory
         required: false
         default: true
-        status: SUPPORTED
+        status: supported
 node_types:
   org.openecomp.resource.abstract.nodes.AbstractSubstitute:
     derived_from: tosca.nodes.Root
@@ -44,4 +44,4 @@ node_types:
         type: org.openecomp.datatypes.heat.substitution.SubstitutionFilter
         description: Substitution Filter
         required: true
-        status: SUPPORTED
\ No newline at end of file
+        status: supported
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/globalServiceTemplates/CinderVolumeGlobalTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/globalServiceTemplates/CinderVolumeGlobalTypesServiceTemplate.yaml
index 9b0655bf36..3c15fd818d 100644
--- a/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/globalServiceTemplates/CinderVolumeGlobalTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/globalServiceTemplates/CinderVolumeGlobalTypesServiceTemplate.yaml
@@ -12,22 +12,22 @@ relationship_types:
         type: string
         description: The ID of the volume to be attached
         required: true
-        status: SUPPORTED
+        status: supported
       location:
         type: string
         description: The location where the volume is exposed on the instance, mountpoint
         required: false
-        status: SUPPORTED
+        status: supported
       instance_uuid:
         type: string
         description: The ID of the server to which the volume attaches
         required: true
-        status: SUPPORTED
+        status: supported
     attributes:
       show:
         type: string
         description: Detailed information about resource
-        status: SUPPORTED
+        status: supported
 node_types:
   org.openecomp.resource.vfc.nodes.heat.cinder.Volume:
     derived_from: tosca.nodes.BlockStorage
@@ -36,34 +36,34 @@ node_types:
         type: string
         description: The availability zone in which the volume will be created
         required: false
-        status: SUPPORTED
+        status: supported
       image:
         type: string
         description: If specified, the name or ID of the image to create the volume from
         required: false
-        status: SUPPORTED
+        status: supported
       metadata:
         type: map
         description: Key/value pairs to associate with the volume
         required: false
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       volume_type:
         type: string
         description: If specified, the type of volume to use, mapping to a specific backend
         required: false
-        status: SUPPORTED
+        status: supported
       description:
         type: string
         description: A description of the volume
         required: false
-        status: SUPPORTED
+        status: supported
       device_type:
         type: string
         description: Device type
         required: false
-        status: SUPPORTED
+        status: supported
         constraints:
         - valid_values:
           - cdrom
@@ -73,7 +73,7 @@ node_types:
         description: 'Bus of the device: hypervisor driver chooses a suitable default
           if omitted'
         required: false
-        status: SUPPORTED
+        status: supported
         constraints:
         - valid_values:
           - ide
@@ -85,92 +85,92 @@ node_types:
         type: string
         description: If specified, the backup to create the volume from
         required: false
-        status: SUPPORTED
+        status: supported
       source_volid:
         type: string
         description: If specified, the volume to use as source
         required: false
-        status: SUPPORTED
+        status: supported
       boot_index:
         type: integer
         description: Integer used for ordering the boot disks
         required: false
-        status: SUPPORTED
+        status: supported
       size:
         type: scalar-unit.size
         description: The requested storage size (default unit is MB)
         required: false
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 1 GB
       read_only:
         type: boolean
         description: Enables or disables read-only access mode of volume
         required: false
-        status: SUPPORTED
+        status: supported
       name:
         type: string
         description: A name used to distinguish the volume
         required: false
-        status: SUPPORTED
+        status: supported
       scheduler_hints:
         type: map
         description: Arbitrary key-value pairs specified by the client to help the Cinder scheduler creating a volume
         required: false
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       swap_size:
         type: scalar-unit.size
         description: The size of the swap, in MB
         required: false
-        status: SUPPORTED
+        status: supported
       delete_on_termination:
         type: boolean
         description: Indicate whether the volume should be deleted when the server is terminated
         required: false
-        status: SUPPORTED
+        status: supported
       multiattach:
         type: boolean
         description: Whether allow the volume to be attached more than once
         required: false
-        status: SUPPORTED
+        status: supported
     attributes:
       display_description:
         type: string
         description: Description of the volume
-        status: SUPPORTED
+        status: supported
       attachments:
         type: string
         description: The list of attachments of the volume
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
       encrypted:
         type: boolean
         description: Boolean indicating if the volume is encrypted or not
-        status: SUPPORTED
+        status: supported
       show:
         type: string
         description: Detailed information about resource
-        status: SUPPORTED
+        status: supported
       created_at:
         type: timestamp
         description: The timestamp indicating volume creation
-        status: SUPPORTED
+        status: supported
       display_name:
         type: string
         description: Name of the volume
-        status: SUPPORTED
+        status: supported
       metadata_values:
         type: map
         description: Key/value pairs associated with the volume in raw dict form
-        status: SUPPORTED
+        status: supported
       bootable:
         type: boolean
         description: Boolean indicating if the volume can be booted or not
-        status: SUPPORTED
+        status: supported
       status:
         type: string
         description: The current status of the volume
-        status: SUPPORTED
+        status: supported
diff --git a/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/globalServiceTemplates/CommonGlobalTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/globalServiceTemplates/CommonGlobalTypesServiceTemplate.yaml
index 5b85d5047b..f8af9c1bb7 100644
--- a/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/globalServiceTemplates/CommonGlobalTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/globalServiceTemplates/CommonGlobalTypesServiceTemplate.yaml
@@ -15,12 +15,12 @@ data_types:
         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
     description: Host route info for the subnet
@@ -29,12 +29,12 @@ data_types:
         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.neutron.Subnet:
     derived_from: tosca.datatypes.Root
     description: A subnet represents an IP address block that can be used for assigning IP addresses to virtual instances
@@ -43,18 +43,18 @@ data_types:
         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
@@ -64,7 +64,7 @@ data_types:
         type: string
         description: IPv6 RA (Router Advertisement) mode
         required: false
-        status: SUPPORTED
+        status: supported
         constraints:
         - valid_values:
           - dhcpv6-stateful
@@ -76,35 +76,35 @@ data_types:
         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:
@@ -112,7 +112,7 @@ data_types:
         description: The gateway IP address
         required: false
         default: 4
-        status: SUPPORTED
+        status: supported
         constraints:
         - valid_values:
           - '4'
@@ -121,24 +121,24 @@ data_types:
         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.network.AllocationPool:
     derived_from: tosca.datatypes.Root
     description: The start and end addresses for the allocation pool
@@ -147,12 +147,12 @@ data_types:
         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
 relationship_types:
   org.openecomp.relationships.AttachesTo:
     derived_from: tosca.relationships.Root
@@ -166,12 +166,12 @@ group_types:
         type: string
         description: Heat file which associate to this group/heat stack
         required: true
-        status: SUPPORTED
+        status: supported
       description:
         type: string
         description: Heat file description
         required: false
-        status: SUPPORTED
+        status: supported
 policy_types:
   org.openecomp.policies.placement.Colocate:
     derived_from: tosca.policy.placement
@@ -181,12 +181,12 @@ policy_types:
         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
@@ -200,12 +200,12 @@ policy_types:
         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
diff --git a/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/globalServiceTemplates/ContrailNetworkRuleGlobalTypeServiceTemplate.yaml b/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/globalServiceTemplates/ContrailNetworkRuleGlobalTypeServiceTemplate.yaml
index 044d759bc0..8e85521225 100644
--- a/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/globalServiceTemplates/ContrailNetworkRuleGlobalTypeServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/globalServiceTemplates/ContrailNetworkRuleGlobalTypeServiceTemplate.yaml
@@ -15,12 +15,12 @@ data_types:
         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
     description: policy rule
@@ -29,45 +29,45 @@ data_types:
         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
     description: list of policy rules
@@ -76,7 +76,7 @@ data_types:
         type: list
         description: Contrail network rule
         required: false
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: org.openecomp.datatypes.heat.contrail.network.rule.Rule
   org.openecomp.datatypes.heat.contrail.network.rule.VirtualNetwork:
@@ -87,7 +87,7 @@ data_types:
         type: string
         description: Virtual network
         required: false
-        status: SUPPORTED
+        status: supported
 node_types:
   org.openecomp.resource.nodes.heat.network.contrail.NetworkRules:
     derived_from: tosca.nodes.Root
@@ -96,17 +96,17 @@ 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:
       fq_name:
         type: string
         description: fq_name
-        status: SUPPORTED
+        status: supported
     requirements:
     - network:
         capability: tosca.capabilities.Attachment
diff --git a/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/globalServiceTemplates/ContrailVirtualNetworkGlobalTypeServiceTemplate.yaml b/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/globalServiceTemplates/ContrailVirtualNetworkGlobalTypeServiceTemplate.yaml
index cbbb979029..418588a93b 100644
--- a/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/globalServiceTemplates/ContrailVirtualNetworkGlobalTypeServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/globalServiceTemplates/ContrailVirtualNetworkGlobalTypeServiceTemplate.yaml
@@ -14,53 +14,53 @@ 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
       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:
       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/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/globalServiceTemplates/NativeTypesServiceTemplateServiceTemplate.yaml b/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/globalServiceTemplates/NativeTypesServiceTemplateServiceTemplate.yaml
index e7dfd49ed9..4b26de1ba0 100644
--- a/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/globalServiceTemplates/NativeTypesServiceTemplateServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/globalServiceTemplates/NativeTypesServiceTemplateServiceTemplate.yaml
@@ -10,21 +10,21 @@ node_types:
       private_address:
         type: string
         description: private address
-        status: SUPPORTED
+        status: supported
       public_address:
         type: string
         description: public_address
-        status: SUPPORTED
+        status: supported
       networks:
         type: map
         description: networks
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: tosca.datatypes.network.NetworkInfo
       ports:
         type: map
         description: ports
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: tosca.datatypes.network.PortInfo
     requirements:
@@ -69,25 +69,25 @@ node_types:
       ip_range_end:
         type: string
         required: false
-        status: SUPPORTED
+        status: supported
       ip_range_start:
         type: string
         required: false
-        status: SUPPORTED
+        status: supported
       ip_address:
         type: string
         required: false
-        status: SUPPORTED
+        status: supported
       is_default:
         type: boolean
         required: false
         default: false
-        status: SUPPORTED
+        status: supported
       order:
         type: integer
         required: true
         default: 0
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 0
     requirements:
@@ -104,15 +104,15 @@ node_types:
       tosca_name:
         type: string
         description: tosca name
-        status: SUPPORTED
+        status: supported
       state:
         type: string
         description: state
-        status: SUPPORTED
+        status: supported
       tosca_id:
         type: string
         description: tosca id
-        status: SUPPORTED
+        status: supported
     interfaces: {
       }
   tosca.nodes.network.Network:
@@ -121,20 +121,20 @@ node_types:
       physical_network:
         type: string
         required: false
-        status: SUPPORTED
+        status: supported
       segmentation_id:
         type: string
         required: false
-        status: SUPPORTED
+        status: supported
       network_id:
         type: string
         required: false
-        status: SUPPORTED
+        status: supported
       ip_version:
         type: integer
         required: false
         default: 4
-        status: SUPPORTED
+        status: supported
         constraints:
         - valid_values:
           - 4
@@ -142,27 +142,27 @@ node_types:
       start_ip:
         type: string
         required: false
-        status: SUPPORTED
+        status: supported
       network_name:
         type: string
         required: false
-        status: SUPPORTED
+        status: supported
       cidr:
         type: string
         required: false
-        status: SUPPORTED
+        status: supported
       gateway_ip:
         type: string
         required: false
-        status: SUPPORTED
+        status: supported
       network_type:
         type: string
         required: false
-        status: SUPPORTED
+        status: supported
       end_ip:
         type: string
         required: false
-        status: SUPPORTED
+        status: supported
     capabilities:
       link:
         type: tosca.capabilities.network.Linkable
@@ -175,17 +175,17 @@ node_types:
       size:
         type: scalar-unit.size
         required: false
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 1 MB
       volume_id:
         type: string
         required: false
-        status: SUPPORTED
+        status: supported
       snapshot_id:
         type: string
         required: false
-        status: SUPPORTED
+        status: supported
     capabilities:
       attachment:
         type: tosca.capabilities.Attachment
diff --git a/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/globalServiceTemplates/NeutronNetGlobalTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/globalServiceTemplates/NeutronNetGlobalTypesServiceTemplate.yaml
index 494b44c126..d9145b77e4 100644
--- a/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/globalServiceTemplates/NeutronNetGlobalTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/globalServiceTemplates/NeutronNetGlobalTypesServiceTemplate.yaml
@@ -14,41 +14,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:
@@ -57,38 +57,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/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/globalServiceTemplates/NeutronPortGlobalTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/globalServiceTemplates/NeutronPortGlobalTypesServiceTemplate.yaml
index a561d79b8f..1552aea7a5 100644
--- a/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/globalServiceTemplates/NeutronPortGlobalTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/globalServiceTemplates/NeutronPortGlobalTypesServiceTemplate.yaml
@@ -15,12 +15,12 @@ data_types:
         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
 node_types:
   org.openecomp.resource.cp.nodes.heat.network.neutron.Port:
     derived_from: tosca.nodes.network.Port
@@ -29,29 +29,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
@@ -63,25 +63,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
@@ -90,59 +90,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/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/globalServiceTemplates/NeutronSecurityRulesGlobalTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/globalServiceTemplates/NeutronSecurityRulesGlobalTypesServiceTemplate.yaml
index 83fc31520a..153ee11153 100644
--- a/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/globalServiceTemplates/NeutronSecurityRulesGlobalTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/globalServiceTemplates/NeutronSecurityRulesGlobalTypesServiceTemplate.yaml
@@ -15,12 +15,12 @@ data_types:
         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
@@ -31,7 +31,7 @@ data_types:
         description: Ethertype of the traffic
         required: false
         default: IPv4
-        status: SUPPORTED
+        status: supported
         constraints:
         - valid_values:
           - IPv4
@@ -41,7 +41,7 @@ data_types:
         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
@@ -50,13 +50,13 @@ data_types:
         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
@@ -66,7 +66,7 @@ data_types:
         description: The direction in which the security group rule is applied
         required: false
         default: ingress
-        status: SUPPORTED
+        status: supported
         constraints:
         - valid_values:
           - egress
@@ -75,7 +75,7 @@ data_types:
         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
@@ -88,24 +88,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/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/globalServiceTemplates/NovaServerGlobalTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/globalServiceTemplates/NovaServerGlobalTypesServiceTemplate.yaml
index d77e378a79..906b6349e3 100644
--- a/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/globalServiceTemplates/NovaServerGlobalTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/globalServiceTemplates/NovaServerGlobalTypesServiceTemplate.yaml
@@ -15,35 +15,35 @@ data_types:
         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
@@ -55,7 +55,7 @@ data_types:
         required: false
         default: {
           }
-        status: SUPPORTED
+        status: supported
         entry_schema:
           type: string
   org.openecomp.datatypes.heat.novaServer.network.AddressInfo:
@@ -66,7 +66,7 @@ data_types:
         type: string
         description: Port id
         required: false
-        status: SUPPORTED
+        status: supported
 node_types:
   org.openecomp.resource.vfc.nodes.heat.nova.Server:
     derived_from: tosca.nodes.Compute
@@ -75,23 +75,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
@@ -101,7 +101,7 @@ node_types:
         type: map
         description: Arbitrary key/value metadata to store for this server
         required: false
-        status: SUPPORTED
+        status: supported
         constraints:
         - max_length: 255
         entry_schema:
@@ -113,7 +113,7 @@ node_types:
         description: Policy on how to apply a user_data update
         required: false
         default: REPLACE
-        status: SUPPORTED
+        status: supported
         constraints:
         - valid_values:
           - REPLACE
@@ -123,7 +123,7 @@ node_types:
         description: Policy on how to apply a flavor update
         required: false
         default: RESIZE
-        status: SUPPORTED
+        status: supported
         constraints:
         - valid_values:
           - RESIZE
@@ -133,43 +133,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:
@@ -177,7 +177,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
@@ -189,7 +189,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
@@ -199,7 +199,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
@@ -208,42 +208,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
\ No newline at end of file
+        status: supported
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/model/serviceTemplate.yaml b/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/model/serviceTemplate.yaml
index c93061996b..5a4607c76d 100644
--- a/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/model/serviceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/model/serviceTemplate.yaml
@@ -26,7 +26,7 @@ node_types:
         description: Number of CPUs requested for a software node instance
         required: true
         default: 1
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 5.0
         - equal: 5
@@ -38,7 +38,7 @@ node_types:
       attDef1:
         type: string
         default: hi
-        status: SUPPORTED
+        status: supported
     requirements:
     - re1:
         capability: tosca.cap1
diff --git a/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/model/serviceTemplateHeatExtend.yaml b/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/model/serviceTemplateHeatExtend.yaml
index d027a4aa5a..5115d3a921 100644
--- a/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/model/serviceTemplateHeatExtend.yaml
+++ b/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/model/serviceTemplateHeatExtend.yaml
@@ -26,7 +26,7 @@ node_types:
         description: Number of CPUs requested for a software node instance
         required: true
         default: 1
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 5.0
         - equal: 5
@@ -38,7 +38,7 @@ node_types:
       attDef1:
         type: string
         default: hi
-        status: SUPPORTED
+        status: supported
     requirements:
     - re1:
         capability: tosca.cap1
diff --git a/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/model/serviceTemplateWithInterface.yaml b/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/model/serviceTemplateWithInterface.yaml
index 5e3c7ed2e0..f6806a315f 100644
--- a/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/model/serviceTemplateWithInterface.yaml
+++ b/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/model/serviceTemplateWithInterface.yaml
@@ -29,7 +29,7 @@ node_types:
         description: Number of CPUs requested for a software node instance
         required: true
         default: 1
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 5.0
         - equal: 5
@@ -41,7 +41,7 @@ node_types:
       attDef1:
         type: string
         default: hi
-        status: SUPPORTED
+        status: supported
     requirements:
     - re1:
         capability: tosca.cap1
diff --git a/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/model/serviceTemplateWithInterfaceAndOperation.yaml b/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/model/serviceTemplateWithInterfaceAndOperation.yaml
index d00248741c..1a35d3af5d 100644
--- a/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/model/serviceTemplateWithInterfaceAndOperation.yaml
+++ b/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/model/serviceTemplateWithInterfaceAndOperation.yaml
@@ -31,7 +31,7 @@ node_types:
         description: Number of CPUs requested for a software node instance
         required: true
         default: 1
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 5.0
         - equal: 5
@@ -43,7 +43,7 @@ node_types:
       attDef1:
         type: string
         default: hi
-        status: SUPPORTED
+        status: supported
     requirements:
     - re1:
         capability: tosca.cap1
diff --git a/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/model/serviceTemplateWithNodeTemplateInterface.yaml b/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/model/serviceTemplateWithNodeTemplateInterface.yaml
index 1131b4777f..eb0796fa23 100644
--- a/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/model/serviceTemplateWithNodeTemplateInterface.yaml
+++ b/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/model/serviceTemplateWithNodeTemplateInterface.yaml
@@ -26,7 +26,7 @@ node_types:
         description: Number of CPUs requested for a software node instance
         required: true
         default: 1
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 5.0
         - equal: 5
@@ -38,7 +38,7 @@ node_types:
       attDef1:
         type: string
         default: hi
-        status: SUPPORTED
+        status: supported
     requirements:
     - re1:
         capability: tosca.cap1
diff --git a/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/model/serviceTemplateWithNodeTypeInterface.yaml b/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/model/serviceTemplateWithNodeTypeInterface.yaml
index 59c00c9ec3..53235e6c44 100644
--- a/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/model/serviceTemplateWithNodeTypeInterface.yaml
+++ b/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/model/serviceTemplateWithNodeTypeInterface.yaml
@@ -31,7 +31,7 @@ node_types:
         description: Number of CPUs requested for a software node instance
         required: true
         default: 1
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 5.0
         - equal: 5
@@ -43,7 +43,7 @@ node_types:
       attDef1:
         type: string
         default: hi
-        status: SUPPORTED
+        status: supported
     requirements:
     - re1:
         capability: tosca.cap1
diff --git a/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/model/serviceTemplateWithServiceFilter.yaml b/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/model/serviceTemplateWithServiceFilter.yaml
index 87a8fcd6b6..4fb3396d93 100644
--- a/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/model/serviceTemplateWithServiceFilter.yaml
+++ b/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/model/serviceTemplateWithServiceFilter.yaml
@@ -26,7 +26,7 @@ node_types:
         description: Number of CPUs requested for a software node instance
         required: true
         default: 1
-        status: SUPPORTED
+        status: supported
         constraints:
         - greater_or_equal: 5.0
         - equal: 5
@@ -38,7 +38,7 @@ node_types:
       attDef1:
         type: string
         default: hi
-        status: SUPPORTED
+        status: supported
     requirements:
     - re1:
         capability: tosca.cap1
diff --git a/test-apis-ci/src/test/resources/CI/importTypesTest/myHeatStack1/myHeatStack1.yml b/test-apis-ci/src/test/resources/CI/importTypesTest/myHeatStack1/myHeatStack1.yml
index 484ed4dff6..db40c2e5dd 100644
--- a/test-apis-ci/src/test/resources/CI/importTypesTest/myHeatStack1/myHeatStack1.yml
+++ b/test-apis-ci/src/test/resources/CI/importTypesTest/myHeatStack1/myHeatStack1.yml
@@ -6,7 +6,7 @@ org.openecomp.groups.MyHeatStack1:
       type: list
       description: Heat files which associate to this group/heat stack
       required: true
-      status: SUPPORTED
+      status: supported
       entry_schema:
         type: string
     url_credential:
diff --git a/test-apis-ci/src/test/resources/CI/importTypesTest/myHeatStack2/myHeatStack2.yml b/test-apis-ci/src/test/resources/CI/importTypesTest/myHeatStack2/myHeatStack2.yml
index 94fbb0451e..017aac2f57 100644
--- a/test-apis-ci/src/test/resources/CI/importTypesTest/myHeatStack2/myHeatStack2.yml
+++ b/test-apis-ci/src/test/resources/CI/importTypesTest/myHeatStack2/myHeatStack2.yml
@@ -7,7 +7,7 @@ org.openecomp.groups.MyHeatStack2:
       type: list
       description: Heat files which associate to this group/heat stack
       required: true
-      status: SUPPORTED
+      status: supported
       entry_schema:
         type: string
     url_credential: