19 files changed, 453 insertions, 453 deletions
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