Change node template prefix

Add "".compute" to nested compute node types in substitution service templates

Issue - Id : SDC-425

Change-Id: I00902576a3adf8d0463ef1352961629663efd96c
Signed-off-by: talio <tali.orenbach@amdocs.com>

9 files changed, 0 insertions, 1717 deletions

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 92ed531b87..b994e51e02 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
@@ -794,222 +794,3 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-  org.openecomp.resource.vfc.nodes.heat.FSB1:
-    derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
-    properties:
-      port_FSB1_Internal_mac_address:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_FSB_OAM_network_role_tag:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_FSB1_Internal_ip_requirements:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
-      port_FSB1_Internal_subnetpoolid:
-        type: string
-        required: true
-        status: SUPPORTED
-      compute_FSB1_metadata:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: json
-      port_FSB2_Internal2_network_role_tag:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_FSB2_Internal1_exCP_naming:
-        type: org.openecomp.datatypes.Naming
-        required: true
-        status: SUPPORTED
-      vm_flavor_name:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_FSB_OAM_vlan_requirements:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.VlanRequirements
-      port_FSB2_Internal2_exCP_naming:
-        type: org.openecomp.datatypes.Naming
-        required: true
-        status: SUPPORTED
-      port_FSB2_Internal2_network_role:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_FSB2_Internal1_ip_requirements:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
-      port_FSB2_Internal1_network_role:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_FSB_OAM_ip_requirements:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
-      port_FSB1_Internal_network_role_tag:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_FSB2_Internal1_mac_address:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_FSB2_Internal1_vlan_requirements:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.VlanRequirements
-      port_FSB1_Internal_vlan_requirements:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.VlanRequirements
-      port_FSB1_Internal_exCP_naming:
-        type: org.openecomp.datatypes.Naming
-        required: true
-        status: SUPPORTED
-      port_FSB_OAM_network_role:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_FSB_OAM_network:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: string
-      port_FSB1_Internal_network_role:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_FSB2_Internal1_network:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: string
-      port_FSB2_Internal2_mac_address:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_FSB2_Internal2_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
-        required: true
-        status: SUPPORTED
-      port_FSB_OAM_subnetpoolid:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_FSB2_Internal2_ip_requirements:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
-      port_FSB_OAM_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
-        required: true
-        status: SUPPORTED
-      compute_FSB1_availability_zone:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: string
-      port_FSB1_Internal_network:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: string
-      index_value:
-        type: integer
-        description: Index value of this substitution service template runtime instance
-        required: false
-        default: 0
-        status: SUPPORTED
-        constraints:
-        - greater_or_equal: 0
-      port_FSB_OAM_order:
-        type: integer
-        required: true
-        status: SUPPORTED
-      port_FSB2_Internal2_network:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: string
-      port_FSB2_Internal2_vlan_requirements:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.VlanRequirements
-      port_FSB2_Internal1_order:
-        type: integer
-        required: true
-        status: SUPPORTED
-      port_FSB2_Internal2_subnetpoolid:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_FSB1_Internal_order:
-        type: integer
-        required: true
-        status: SUPPORTED
-      port_FSB2_Internal1_network_role_tag:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_FSB2_Internal1_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
-        required: true
-        status: SUPPORTED
-      port_FSB_OAM_fixed_ips:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.heat.neutron.port.FixedIps
-      port_FSB2_Internal2_order:
-        type: integer
-        required: true
-        status: SUPPORTED
-      port_FSB2_Internal1_subnetpoolid:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_FSB1_Internal_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
-        required: true
-        status: SUPPORTED
-      port_FSB_OAM_exCP_naming:
-        type: org.openecomp.datatypes.Naming
-        required: true
-        status: SUPPORTED
-      compute_FSB1_name:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: string
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 b6cc642eb5..916359eb88 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
@@ -296,36 +296,3 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-  org.openecomp.resource.vfc.nodes.heat.FSB1:
-    derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
-    properties:
-      compute_FSB1_metadata:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: json
-      compute_FSB1_availability_zone:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: string
-      index_value:
-        type: integer
-        description: Index value of this substitution service template runtime instance
-        required: false
-        default: 0
-        status: SUPPORTED
-        constraints:
-        - greater_or_equal: 0
-      compute_FSB1_name:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: string
-      vm_flavor_name:
-        type: string
-        required: true
-        status: SUPPORTED
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 4d5301facd..30616940a7 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
@@ -670,176 +670,3 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-  org.openecomp.resource.vfc.nodes.heat.FSB1:
-    derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
-    properties:
-      port_FSB1_Internal_mac_address:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_FSB_OAM_network_role_tag:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_FSB1_Internal_ip_requirements:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
-      port_FSB1_Internal_subnetpoolid:
-        type: string
-        required: true
-        status: SUPPORTED
-      compute_FSB1_metadata:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: json
-      port_FSB2_Internal_vlan_requirements:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.VlanRequirements
-      port_FSB2_Internal_order:
-        type: integer
-        required: true
-        status: SUPPORTED
-      port_FSB2_Internal_ip_requirements:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
-      vm_flavor_name:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_FSB_OAM_vlan_requirements:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.VlanRequirements
-      port_FSB2_Internal_network_role:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_FSB_OAM_ip_requirements:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
-      port_FSB1_Internal_network_role_tag:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_FSB1_Internal_vlan_requirements:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.VlanRequirements
-      port_FSB2_Internal_subnetpoolid:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_FSB1_Internal_exCP_naming:
-        type: org.openecomp.datatypes.Naming
-        required: true
-        status: SUPPORTED
-      port_FSB_OAM_network_role:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_FSB_OAM_network:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: string
-      port_FSB1_Internal_network_role:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_FSB_OAM_subnetpoolid:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_FSB_OAM_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
-        required: true
-        status: SUPPORTED
-      compute_FSB1_availability_zone:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: string
-      port_FSB1_Internal_network:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: string
-      index_value:
-        type: integer
-        description: Index value of this substitution service template runtime instance
-        required: false
-        default: 0
-        status: SUPPORTED
-        constraints:
-        - greater_or_equal: 0
-      port_FSB_OAM_order:
-        type: integer
-        required: true
-        status: SUPPORTED
-      port_FSB2_Internal_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
-        required: true
-        status: SUPPORTED
-      port_FSB2_Internal_mac_address:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_FSB2_Internal_exCP_naming:
-        type: org.openecomp.datatypes.Naming
-        required: true
-        status: SUPPORTED
-      port_FSB1_Internal_order:
-        type: integer
-        required: true
-        status: SUPPORTED
-      port_FSB_OAM_fixed_ips:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.heat.neutron.port.FixedIps
-      port_FSB2_Internal_network:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: string
-      port_FSB1_Internal_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
-        required: true
-        status: SUPPORTED
-      port_FSB_OAM_exCP_naming:
-        type: org.openecomp.datatypes.Naming
-        required: true
-        status: SUPPORTED
-      compute_FSB1_name:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: string
-      port_FSB2_Internal_network_role_tag:
-        type: string
-        required: true
-        status: SUPPORTED
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 2cc31a0997..83ade4a8b1 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
@@ -571,155 +571,3 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-  org.openecomp.resource.vfc.nodes.heat.FSB1:
-    derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
-    properties:
-      port_FSB1_Internal_mac_address:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_FSB1_Internal_ip_requirements:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
-      port_FSB1_Internal_subnetpoolid:
-        type: string
-        required: true
-        status: SUPPORTED
-      compute_FSB1_metadata:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: json
-      port_FSB2_Internal_vlan_requirements:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.VlanRequirements
-      port_FSB2_Internal_order:
-        type: integer
-        required: true
-        status: SUPPORTED
-      port_FSB2_Internal_ip_requirements:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
-      vm_flavor_name:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_FSB2_Internal_network_role:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_FSB1_Internal_network_role_tag:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_FSB1_Internal_vlan_requirements:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.VlanRequirements
-      port_FSB2_Internal_subnetpoolid:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_FSB1_Internal_exCP_naming:
-        type: org.openecomp.datatypes.Naming
-        required: true
-        status: SUPPORTED
-      port_FSB1_Internal_network_role:
-        type: string
-        required: true
-        status: SUPPORTED
-      compute_FSB1_availability_zone:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: string
-      port_FSB1_Internal_network:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: string
-      index_value:
-        type: integer
-        description: Index value of this substitution service template runtime instance
-        required: false
-        default: 0
-        status: SUPPORTED
-        constraints:
-        - greater_or_equal: 0
-      port_FSB2_Internal_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
-        required: true
-        status: SUPPORTED
-      port_FSB2_Internal_mac_address:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_FSB2_Internal_exCP_naming:
-        type: org.openecomp.datatypes.Naming
-        required: true
-        status: SUPPORTED
-      port_FSB1_Internal_order:
-        type: integer
-        required: true
-        status: SUPPORTED
-      port_FSB2_Internal_network:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: string
-      port_FSB1_Internal_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
-        required: true
-        status: SUPPORTED
-      compute_FSB1_name:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: string
-      port_FSB2_Internal_network_role_tag:
-        type: string
-        required: true
-        status: SUPPORTED
-    attributes:
-      FSB1_FSB2_Internal_tenant_id:
-        type: string
-        status: SUPPORTED
-      FSB1_FSB1_Internal_network_id:
-        type: string
-        status: SUPPORTED
-      FSB1_user_data_format:
-        type: string
-        status: SUPPORTED
-      FSB1_accessIPv6:
-        type: string
-        status: SUPPORTED
-      FSB1_addresses:
-        type: map
-        status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.heat.novaServer.network.AddressInfo
-      FSB1_FSB2_Internal_network_id:
-        type: string
-        status: SUPPORTED
-      FSB1_FSB1_Internal_status:
-        type: string
-        status: SUPPORTED
-      FSB1_FSB1_Internal_device_owner:
-        type: string
-        status: SUPPORTED
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 e10d530671..a42219e96f 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
@@ -694,200 +694,3 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-  org.openecomp.resource.vfc.nodes.heat.FSB1:
-    derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
-    properties:
-      port_FSB1_Internal_mac_address:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_FSB_OAM_network_role_tag:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_FSB1_Internal_ip_requirements:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
-      port_FSB1_Internal_subnetpoolid:
-        type: string
-        required: true
-        status: SUPPORTED
-      compute_FSB1_metadata:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: json
-      port_FSB2_Internal_vlan_requirements:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.VlanRequirements
-      port_FSB2_Internal_order:
-        type: integer
-        required: true
-        status: SUPPORTED
-      port_FSB2_Internal_ip_requirements:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
-      vm_flavor_name:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_FSB_OAM_vlan_requirements:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.VlanRequirements
-      port_FSB2_Internal_network_role:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_FSB_OAM_ip_requirements:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
-      port_FSB1_Internal_network_role_tag:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_FSB1_Internal_vlan_requirements:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.VlanRequirements
-      port_FSB2_Internal_subnetpoolid:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_FSB1_Internal_exCP_naming:
-        type: org.openecomp.datatypes.Naming
-        required: true
-        status: SUPPORTED
-      port_FSB_OAM_network_role:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_FSB_OAM_network:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: string
-      port_FSB1_Internal_network_role:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_FSB_OAM_subnetpoolid:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_FSB_OAM_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
-        required: true
-        status: SUPPORTED
-      compute_FSB1_availability_zone:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: string
-      port_FSB1_Internal_network:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: string
-      index_value:
-        type: integer
-        description: Index value of this substitution service template runtime instance
-        required: false
-        default: 0
-        status: SUPPORTED
-        constraints:
-        - greater_or_equal: 0
-      port_FSB_OAM_order:
-        type: integer
-        required: true
-        status: SUPPORTED
-      port_FSB2_Internal_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
-        required: true
-        status: SUPPORTED
-      port_FSB2_Internal_mac_address:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_FSB2_Internal_exCP_naming:
-        type: org.openecomp.datatypes.Naming
-        required: true
-        status: SUPPORTED
-      port_FSB1_Internal_order:
-        type: integer
-        required: true
-        status: SUPPORTED
-      port_FSB_OAM_fixed_ips:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.heat.neutron.port.FixedIps
-      port_FSB2_Internal_network:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: string
-      port_FSB1_Internal_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
-        required: true
-        status: SUPPORTED
-      port_FSB_OAM_exCP_naming:
-        type: org.openecomp.datatypes.Naming
-        required: true
-        status: SUPPORTED
-      compute_FSB1_name:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: string
-      port_FSB2_Internal_network_role_tag:
-        type: string
-        required: true
-        status: SUPPORTED
-    attributes:
-      FSB1_FSB_OAM_status:
-        type: string
-        status: SUPPORTED
-      FSB1_FSB2_Internal_tenant_id:
-        type: string
-        status: SUPPORTED
-      FSB1_FSB1_Internal_network_id:
-        type: string
-        status: SUPPORTED
-      FSB1_accessIPv6:
-        type: string
-        status: SUPPORTED
-      FSB1_addresses:
-        type: map
-        status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.heat.novaServer.network.AddressInfo
-      FSB1_FSB2_Internal_network_id:
-        type: string
-        status: SUPPORTED
-      FSB1_FSB1_Internal_device_owner:
-        type: string
-        status: SUPPORTED
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 d16a04dbb1..7c1d5352a9 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
@@ -565,149 +565,3 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-  org.openecomp.resource.vfc.nodes.heat.FSB1:
-    derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
-    properties:
-      port_FSB1_Internal_mac_address:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_FSB1_Internal_ip_requirements:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
-      port_FSB1_Internal_subnetpoolid:
-        type: string
-        required: true
-        status: SUPPORTED
-      compute_FSB1_metadata:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: json
-      port_FSB2_Internal_vlan_requirements:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.VlanRequirements
-      port_FSB2_Internal_order:
-        type: integer
-        required: true
-        status: SUPPORTED
-      compute_FSB1_availability_zone:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: string
-      index_value:
-        type: integer
-        description: Index value of this substitution service template runtime instance
-        required: false
-        default: 0
-        status: SUPPORTED
-        constraints:
-        - greater_or_equal: 0
-      port_FSB2_Internal_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
-        required: true
-        status: SUPPORTED
-      port_FSB2_Internal_ip_requirements:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
-      vm_flavor_name:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_FSB2_Internal_mac_address:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_FSB2_Internal_network_role:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_FSB2_Internal_exCP_naming:
-        type: org.openecomp.datatypes.Naming
-        required: true
-        status: SUPPORTED
-      port_FSB1_Internal_network_role_tag:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_FSB1_Internal_order:
-        type: integer
-        required: true
-        status: SUPPORTED
-      port_FSB1_Internal_vlan_requirements:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.VlanRequirements
-      port_FSB2_Internal_network:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: string
-      port_FSB2_Internal_subnetpoolid:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_FSB1_Internal_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
-        required: true
-        status: SUPPORTED
-      compute_FSB1_name:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: string
-      port_FSB1_Internal_exCP_naming:
-        type: org.openecomp.datatypes.Naming
-        required: true
-        status: SUPPORTED
-      port_FSB1_Internal_network_role:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_FSB2_Internal_network_role_tag:
-        type: string
-        required: true
-        status: SUPPORTED
-    attributes:
-      FSB1_FSB2_Internal_tenant_id:
-        type: string
-        status: SUPPORTED
-      FSB1_FSB1_Internal_network_id:
-        type: string
-        status: SUPPORTED
-      FSB1_user_data_format:
-        type: string
-        status: SUPPORTED
-      FSB1_accessIPv6:
-        type: string
-        status: SUPPORTED
-      FSB1_addresses:
-        type: map
-        status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.heat.novaServer.network.AddressInfo
-      FSB1_FSB2_Internal_network_id:
-        type: string
-        status: SUPPORTED
-      FSB1_FSB1_Internal_status:
-        type: string
-        status: SUPPORTED
-      FSB1_FSB1_Internal_device_owner:
-        type: string
-        status: SUPPORTED
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 e57d35a6b8..d2ea7e94b4 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
@@ -676,182 +676,3 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-  org.openecomp.resource.vfc.nodes.heat.FSB1:
-    derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
-    properties:
-      port_FSB1_Internal_mac_address:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_FSB_OAM_network_role_tag:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_FSB1_Internal_ip_requirements:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
-      port_FSB1_Internal_subnetpoolid:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_FSB2_Internal_vlan_requirements:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.VlanRequirements
-      port_FSB2_Internal_order:
-        type: integer
-        required: true
-        status: SUPPORTED
-      port_FSB2_Internal_ip_requirements:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
-      vm_flavor_name:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_FSB_OAM_vlan_requirements:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.VlanRequirements
-      port_FSB2_Internal_network_role:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_FSB_OAM_ip_requirements:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
-      port_FSB1_Internal_network_role_tag:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_FSB1_Internal_vlan_requirements:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.VlanRequirements
-      port_FSB2_Internal_subnetpoolid:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_FSB1_Internal_exCP_naming:
-        type: org.openecomp.datatypes.Naming
-        required: true
-        status: SUPPORTED
-      port_FSB_OAM_network_role:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_FSB_OAM_network:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: string
-      port_FSB1_Internal_network_role:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_FSB_OAM_subnetpoolid:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_FSB_OAM_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
-        required: true
-        status: SUPPORTED
-      port_FSB1_Internal_network:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: string
-      index_value:
-        type: integer
-        description: Index value of this substitution service template runtime instance
-        required: false
-        default: 0
-        status: SUPPORTED
-        constraints:
-        - greater_or_equal: 0
-      port_FSB_OAM_order:
-        type: integer
-        required: true
-        status: SUPPORTED
-      port_FSB2_Internal_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
-        required: true
-        status: SUPPORTED
-      port_FSB2_Internal_mac_address:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_FSB2_Internal_exCP_naming:
-        type: org.openecomp.datatypes.Naming
-        required: true
-        status: SUPPORTED
-      port_FSB1_Internal_order:
-        type: integer
-        required: true
-        status: SUPPORTED
-      port_FSB_OAM_fixed_ips:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.heat.neutron.port.FixedIps
-      port_FSB2_Internal_network:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: string
-      port_FSB1_Internal_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
-        required: true
-        status: SUPPORTED
-      port_FSB_OAM_exCP_naming:
-        type: org.openecomp.datatypes.Naming
-        required: true
-        status: SUPPORTED
-      port_FSB2_Internal_network_role_tag:
-        type: string
-        required: true
-        status: SUPPORTED
-    attributes:
-      FSB1_FSB_OAM_status:
-        type: string
-        status: SUPPORTED
-      FSB1_FSB2_Internal_tenant_id:
-        type: string
-        status: SUPPORTED
-      FSB1_FSB1_Internal_network_id:
-        type: string
-        status: SUPPORTED
-      FSB1_accessIPv6:
-        type: string
-        status: SUPPORTED
-      FSB1_addresses:
-        type: map
-        status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.heat.novaServer.network.AddressInfo
-      FSB1_FSB2_Internal_network_id:
-        type: string
-        status: SUPPORTED
-      FSB1_FSB1_Internal_device_owner:
-        type: string
-        status: SUPPORTED
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 7f16b2ff14..a424a5d19b 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
@@ -329,297 +329,3 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-  org.openecomp.resource.vfc.nodes.heat.pcm_server:
-    derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
-    properties:
-      availabilityzone_name:
-        type: string
-        description: availabilityzone name
-        required: true
-        status: SUPPORTED
-      oam_net_gw:
-        type: string
-        description: CPS network gateway
-        required: true
-        status: SUPPORTED
-      pcm_image_name:
-        type: string
-        description: PCRF CM image name
-        required: true
-        status: SUPPORTED
-      cps_net_ips:
-        type: string
-        description: CPS network ip
-        required: true
-        status: SUPPORTED
-      security_group_name:
-        type: string
-        description: the name of security group
-        required: true
-        status: SUPPORTED
-      cps_net_ip:
-        type: string
-        description: CPS network ip
-        required: true
-        status: SUPPORTED
-      pcm_volumes:
-        type: string
-        description: CPS Cluman Cinder Volume
-        required: true
-        status: SUPPORTED
-      pcm_flavor_name:
-        type: string
-        description: flavor name of PCRF CM instance
-        required: true
-        status: SUPPORTED
-      pcm_vol:
-        type: string
-        description: CPS Cluman Cinder Volume
-        required: true
-        status: SUPPORTED
-      pcm_server_name:
-        type: string
-        description: PCRF CM server name
-        required: true
-        status: SUPPORTED
-      cps_net_name:
-        type: string
-        description: CPS network name
-        required: true
-        status: SUPPORTED
-      cps_net_mask:
-        type: string
-        description: CPS network mask
-        required: true
-        status: SUPPORTED
-      oam_net_ip:
-        type: string
-        description: OAM network ip
-        required: true
-        status: SUPPORTED
-      oam_net_mask:
-        type: string
-        description: CPS network mask
-        required: true
-        status: SUPPORTED
-      oam_net_name:
-        type: string
-        description: OAM network name
-        required: true
-        status: SUPPORTED
-    attributes:
-      server_pcm_id:
-        type: string
-        description: the pcm nova service id
-        status: SUPPORTED
-    requirements:
-    - link_pcm_port_1:
-        capability: tosca.capabilities.network.Linkable
-        node: tosca.nodes.Root
-        relationship: tosca.relationships.network.LinksTo
-        occurrences:
-        - 1
-        - 1
-    - local_storage_server_pcm:
-        capability: tosca.capabilities.Attachment
-        node: tosca.nodes.BlockStorage
-        relationship: tosca.relationships.AttachesTo
-        occurrences:
-        - 0
-        - UNBOUNDED
-    - link_pcm_port_1_server_pcm_005:
-        capability: tosca.capabilities.network.Linkable
-        node: tosca.nodes.Root
-        relationship: tosca.relationships.network.LinksTo
-        occurrences:
-        - 1
-        - 1
-    - local_storage_server_pcm_server_pcm_005:
-        capability: tosca.capabilities.Attachment
-        node: tosca.nodes.BlockStorage
-        relationship: tosca.relationships.AttachesTo
-        occurrences:
-        - 0
-        - UNBOUNDED
-    - link_pcm_port_0_server_pcm_005:
-        capability: tosca.capabilities.network.Linkable
-        node: tosca.nodes.Root
-        relationship: tosca.relationships.network.LinksTo
-        occurrences:
-        - 1
-        - 1
-    - link_pcm_port_0:
-        capability: tosca.capabilities.network.Linkable
-        node: tosca.nodes.Root
-        relationship: tosca.relationships.network.LinksTo
-        occurrences:
-        - 1
-        - 1
-    capabilities:
-      endpoint_server_pcm:
-        type: tosca.capabilities.Endpoint.Admin
-        occurrences:
-        - 1
-        - UNBOUNDED
-      feature_network_server_pcm_005:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-      host_server_pcm_server_pcm_005:
-        type: tosca.capabilities.Container
-        valid_source_types:
-        - tosca.nodes.SoftwareComponent
-        occurrences:
-        - 1
-        - UNBOUNDED
-      binding_server_pcm_server_pcm_005:
-        type: tosca.capabilities.network.Bindable
-        occurrences:
-        - 1
-        - UNBOUNDED
-      scalable_server_pcm_server_pcm_005:
-        type: tosca.capabilities.Scalable
-        occurrences:
-        - 1
-        - UNBOUNDED
-      endpoint_server_pcm_server_pcm_005:
-        type: tosca.capabilities.Endpoint.Admin
-        occurrences:
-        - 1
-        - UNBOUNDED
-      attachment_network:
-        type: tosca.capabilities.Attachment
-        occurrences:
-        - 1
-        - UNBOUNDED
-      binding_pcm_port_1_server_pcm_005:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
-        occurrences:
-        - 0
-        - UNBOUNDED
-      attachment_pcm_port_0_server_pcm_005:
-        type: tosca.capabilities.Attachment
-        occurrences:
-        - 1
-        - UNBOUNDED
-      link_network_server_pcm_005:
-        type: tosca.capabilities.network.Linkable
-        occurrences:
-        - 1
-        - UNBOUNDED
-      scalable_server_pcm:
-        type: tosca.capabilities.Scalable
-        occurrences:
-        - 1
-        - UNBOUNDED
-      feature_server_pcm_server_pcm_005:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-      feature_network:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-      binding_pcm_port_0_server_pcm_005:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
-        occurrences:
-        - 0
-        - UNBOUNDED
-      feature_server_pcm_005:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-      host_server_pcm:
-        type: tosca.capabilities.Container
-        valid_source_types:
-        - tosca.nodes.SoftwareComponent
-        occurrences:
-        - 1
-        - UNBOUNDED
-      os_server_pcm_server_pcm_005:
-        type: tosca.capabilities.OperatingSystem
-        occurrences:
-        - 1
-        - UNBOUNDED
-      feature_pcm_port_0_server_pcm_005:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-      attachment_network_server_pcm_005:
-        type: tosca.capabilities.Attachment
-        occurrences:
-        - 1
-        - UNBOUNDED
-      binding_server_pcm:
-        type: tosca.capabilities.network.Bindable
-        occurrences:
-        - 1
-        - UNBOUNDED
-      binding_pcm_port_0:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
-        occurrences:
-        - 0
-        - UNBOUNDED
-      binding_pcm_port_1:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
-        occurrences:
-        - 0
-        - UNBOUNDED
-      link_network:
-        type: tosca.capabilities.network.Linkable
-        occurrences:
-        - 1
-        - UNBOUNDED
-      os_server_pcm:
-        type: tosca.capabilities.OperatingSystem
-        occurrences:
-        - 1
-        - UNBOUNDED
-      feature_server_pcm:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-      feature_pcm_port_1:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-      feature_pcm_port_0:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-      feature_pcm_port_1_server_pcm_005:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-      attachment_pcm_port_0:
-        type: tosca.capabilities.Attachment
-        occurrences:
-        - 1
-        - UNBOUNDED
-      attachment_pcm_port_1:
-        type: tosca.capabilities.Attachment
-        occurrences:
-        - 1
-        - UNBOUNDED
-      attachment_pcm_port_1_server_pcm_005:
-        type: tosca.capabilities.Attachment
-        occurrences:
-        - 1
-        - UNBOUNDED
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 217eb69b16..22cf58d6f6 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
@@ -275,168 +275,6 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-  org.openecomp.resource.vfc.nodes.heat.pcm_server:
-    derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
-    properties:
-      availabilityzone_name:
-        type: string
-        description: availabilityzone name
-        required: true
-        status: SUPPORTED
-      oam_net_gw:
-        type: string
-        description: CPS network gateway
-        required: true
-        status: SUPPORTED
-      pcm_image_name:
-        type: string
-        description: PCRF CM image name
-        required: true
-        status: SUPPORTED
-      security_group_name:
-        type: string
-        description: the name of security group
-        required: true
-        status: SUPPORTED
-      cps_net_ip:
-        type: string
-        description: CPS network ip
-        required: true
-        status: SUPPORTED
-      pcm_flavor_name:
-        type: string
-        description: flavor name of PCRF CM instance
-        required: true
-        status: SUPPORTED
-      pcm_vol:
-        type: string
-        description: CPS Cluman Cinder Volume
-        required: true
-        status: SUPPORTED
-      pcm_server_name:
-        type: string
-        description: PCRF CM server name
-        required: true
-        status: SUPPORTED
-      cps_net_name:
-        type: string
-        description: CPS network name
-        required: true
-        status: SUPPORTED
-      cps_net_mask:
-        type: string
-        description: CPS network mask
-        required: true
-        status: SUPPORTED
-      oam_net_ip:
-        type: string
-        description: OAM network ip
-        required: true
-        status: SUPPORTED
-      oam_net_mask:
-        type: string
-        description: CPS network mask
-        required: true
-        status: SUPPORTED
-      oam_net_name:
-        type: string
-        description: OAM network name
-        required: true
-        status: SUPPORTED
-    attributes:
-      server_pcm_id:
-        type: string
-        description: the pcm nova service id
-        status: SUPPORTED
-    requirements:
-    - link_pcm_port_1:
-        capability: tosca.capabilities.network.Linkable
-        node: tosca.nodes.Root
-        relationship: tosca.relationships.network.LinksTo
-        occurrences:
-        - 1
-        - 1
-    - local_storage_server_pcm:
-        capability: tosca.capabilities.Attachment
-        node: tosca.nodes.BlockStorage
-        relationship: tosca.relationships.AttachesTo
-        occurrences:
-        - 0
-        - UNBOUNDED
-    - link_pcm_port_0:
-        capability: tosca.capabilities.network.Linkable
-        node: tosca.nodes.Root
-        relationship: tosca.relationships.network.LinksTo
-        occurrences:
-        - 1
-        - 1
-    capabilities:
-      endpoint_server_pcm:
-        type: tosca.capabilities.Endpoint.Admin
-        occurrences:
-        - 1
-        - UNBOUNDED
-      os_server_pcm:
-        type: tosca.capabilities.OperatingSystem
-        occurrences:
-        - 1
-        - UNBOUNDED
-      host_server_pcm:
-        type: tosca.capabilities.Container
-        valid_source_types:
-        - tosca.nodes.SoftwareComponent
-        occurrences:
-        - 1
-        - UNBOUNDED
-      feature_server_pcm:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-      feature_pcm_port_1:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-      scalable_server_pcm:
-        type: tosca.capabilities.Scalable
-        occurrences:
-        - 1
-        - UNBOUNDED
-      feature_pcm_port_0:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-      binding_server_pcm:
-        type: tosca.capabilities.network.Bindable
-        occurrences:
-        - 1
-        - UNBOUNDED
-      attachment_pcm_port_0:
-        type: tosca.capabilities.Attachment
-        occurrences:
-        - 1
-        - UNBOUNDED
-      attachment_pcm_port_1:
-        type: tosca.capabilities.Attachment
-        occurrences:
-        - 1
-        - UNBOUNDED
-      binding_pcm_port_0:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
-        occurrences:
-        - 0
-        - UNBOUNDED
-      binding_pcm_port_1:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
-        occurrences:
-        - 0
-        - UNBOUNDED
   org.openecomp.resource.abstract.nodes.heat.oam_server:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
@@ -599,165 +437,3 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-  org.openecomp.resource.vfc.nodes.heat.oam_server:
-    derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
-    properties:
-      availabilityzone_name:
-        type: string
-        description: availabilityzone name
-        required: true
-        status: SUPPORTED
-      oam_net_gw:
-        type: string
-        description: CPS network gateway
-        required: true
-        status: SUPPORTED
-      oam_flavor_name:
-        type: string
-        description: flavor name of PCRF CM instance
-        required: true
-        status: SUPPORTED
-      security_group_name:
-        type: string
-        description: the name of security group
-        required: true
-        status: SUPPORTED
-      cps_net_ip:
-        type: string
-        description: CPS network ip
-        required: true
-        status: SUPPORTED
-      oam_server_name:
-        type: string
-        description: oam server name
-        required: true
-        status: SUPPORTED
-      pcm_vol:
-        type: string
-        description: CPS Cluman Cinder Volume
-        required: true
-        status: SUPPORTED
-      oam_image_name:
-        type: string
-        description: oam image name
-        required: true
-        status: SUPPORTED
-      cps_net_name:
-        type: string
-        description: CPS network name
-        required: true
-        status: SUPPORTED
-      cps_net_mask:
-        type: string
-        description: CPS network mask
-        required: true
-        status: SUPPORTED
-      oam_net_ip:
-        type: string
-        description: OAM network ip
-        required: true
-        status: SUPPORTED
-      oam_net_mask:
-        type: string
-        description: CPS network mask
-        required: true
-        status: SUPPORTED
-      oam_net_name:
-        type: string
-        description: OAM network name
-        required: true
-        status: SUPPORTED
-    attributes:
-      server_oam_id:
-        type: string
-        description: the oam nova service id
-        status: SUPPORTED
-    requirements:
-    - local_storage_server_oam:
-        capability: tosca.capabilities.Attachment
-        node: tosca.nodes.BlockStorage
-        relationship: tosca.relationships.AttachesTo
-        occurrences:
-        - 0
-        - UNBOUNDED
-    - link_pcm_port_1:
-        capability: tosca.capabilities.network.Linkable
-        node: tosca.nodes.Root
-        relationship: tosca.relationships.network.LinksTo
-        occurrences:
-        - 1
-        - 1
-    - link_pcm_port_0:
-        capability: tosca.capabilities.network.Linkable
-        node: tosca.nodes.Root
-        relationship: tosca.relationships.network.LinksTo
-        occurrences:
-        - 1
-        - 1
-    capabilities:
-      host_server_oam:
-        type: tosca.capabilities.Container
-        valid_source_types:
-        - tosca.nodes.SoftwareComponent
-        occurrences:
-        - 1
-        - UNBOUNDED
-      endpoint_server_oam:
-        type: tosca.capabilities.Endpoint.Admin
-        occurrences:
-        - 1
-        - UNBOUNDED
-      os_server_oam:
-        type: tosca.capabilities.OperatingSystem
-        occurrences:
-        - 1
-        - UNBOUNDED
-      feature_server_oam:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-      feature_pcm_port_1:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-      scalable_server_oam:
-        type: tosca.capabilities.Scalable
-        occurrences:
-        - 1
-        - UNBOUNDED
-      feature_pcm_port_0:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-      binding_server_oam:
-        type: tosca.capabilities.network.Bindable
-        occurrences:
-        - 1
-        - UNBOUNDED
-      attachment_pcm_port_0:
-        type: tosca.capabilities.Attachment
-        occurrences:
-        - 1
-        - UNBOUNDED
-      attachment_pcm_port_1:
-        type: tosca.capabilities.Attachment
-        occurrences:
-        - 1
-        - UNBOUNDED
-      binding_pcm_port_0:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
-        occurrences:
-        - 0
-        - UNBOUNDED
-      binding_pcm_port_1:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
-        occurrences:
-        - 0
-        - UNBOUNDED