[SDC] OnBoard with enabled tests and features

Change-Id: I4c1bbf6e1c854cf97a3561c736f83da44b58b7c0
Signed-off-by: az2497 <avi.ziv@amdocs.com>

[SDC] OnBoard with enabled tests and features.

Change-Id: Icd52f039aee4dd393a1404d530bb9fdd0b20e604
Signed-off-by: az2497 <avi.ziv@amdocs.com>

23 files changed, 60 insertions, 60 deletions

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/MainServiceTemplate.yaml
index 5d30f60616..efa8626f8d 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/MainServiceTemplate.yaml
@@ -273,7 +273,7 @@ topology_template:
         network_name:
           get_input: net_name
     4p_nested:
-      type: org.openecomp.resource.abstract.nodes.heat.nested-pcm_v0.1
+      type: org.openecomp.resource.abstract.nodes.heat.pcm_server
       directives:
       - substitutable
       properties:
@@ -1032,4 +1032,4 @@ topology_template:
         name: def
         affinity: host
       targets:
-      - BE_Affinity_group
+      - BE_Affinity_group
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/MainServiceTemplate.yaml
index aa05a9e575..cd041a4083 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/MainServiceTemplate.yaml
@@ -266,7 +266,7 @@ topology_template:
         security_group_name: group1
         net_name: myNetwork
     4p_nested:
-      type: org.openecomp.resource.abstract.nodes.heat.nested-pcm_v0.1
+      type: org.openecomp.resource.abstract.nodes.heat.pcm_server
       directives:
       - substitutable
       properties:
@@ -938,4 +938,4 @@ topology_template:
         name: def
         affinity: host
       targets:
-      - BE_Affinity_group
+      - BE_Affinity_group
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/MainServiceTemplate.yaml
index dd024c4607..e26ec620a8 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/MainServiceTemplate.yaml
@@ -218,7 +218,7 @@ topology_template:
         network_name:
           get_input: net_name
     4p_nested:
-      type: org.openecomp.resource.abstract.nodes.heat.nested-pcm_v0.1
+      type: org.openecomp.resource.abstract.nodes.heat.pcm_server
       directives:
       - substitutable
       properties:
@@ -844,4 +844,4 @@ topology_template:
         name: def
         affinity: host
       targets:
-      - BE_Affinity_group
+      - BE_Affinity_group
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/MainServiceTemplate.yaml
index f12a9c2d2e..3dacbb2056 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/MainServiceTemplate.yaml
@@ -1433,7 +1433,7 @@ topology_template:
           node: abstract_a_single_1a
           relationship: tosca.relationships.DependsOn
     4p_nested_2:
-      type: org.openecomp.resource.abstract.nodes.heat.nested-pcm_v0.1
+      type: org.openecomp.resource.abstract.nodes.heat.pcm_server
       directives:
       - substitutable
       properties:
@@ -1566,7 +1566,7 @@ topology_template:
         network:
           get_input: ppds_net_name
     4p_nested_1:
-      type: org.openecomp.resource.abstract.nodes.heat.nested-pcm_v0.1
+      type: org.openecomp.resource.abstract.nodes.heat.pcm_server
       directives:
       - substitutable
       properties:
@@ -1950,4 +1950,4 @@ topology_template:
         name: def
         affinity: host
       targets:
-      - BE_Affinity_group
+      - BE_Affinity_group
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/MainServiceTemplate.yaml
index ff988d4835..0477fc36c5 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/MainServiceTemplate.yaml
@@ -260,7 +260,7 @@ topology_template:
           node: test_nested_no_compute
           relationship: tosca.relationships.DependsOn
     test_nested_pattern_4_main_0:
-      type: org.openecomp.resource.abstract.nodes.heat.nested-pattern-4
+      type: org.openecomp.resource.abstract.nodes.heat.pd_server_pattern4
       directives:
       - substitutable
       properties:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/nested1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/nested1ServiceTemplate.yaml
index 1a7f8816f3..c411944118 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/nested1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/nested1ServiceTemplate.yaml
@@ -104,7 +104,7 @@ topology_template:
       type: string
   node_templates:
     test_nested_pattern_4_main_1:
-      type: org.openecomp.resource.abstract.nodes.heat.nested-pattern-4
+      type: org.openecomp.resource.abstract.nodes.heat.pd_server_pattern4
       directives:
       - substitutable
       properties:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/nested2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/nested2ServiceTemplate.yaml
index 9ddecd4527..e7feb50e7b 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/nested2ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/nested2ServiceTemplate.yaml
@@ -150,7 +150,7 @@ topology_template:
           node: test_nested3Level
           relationship: tosca.relationships.DependsOn
     test_nested_pattern_4_nested2:
-      type: org.openecomp.resource.abstract.nodes.heat.nested-pattern-4
+      type: org.openecomp.resource.abstract.nodes.heat.pd_server_pattern4
       directives:
       - substitutable
       properties:
@@ -200,7 +200,7 @@ topology_template:
           node: abstract_ps_server_nested2_1b
           relationship: tosca.relationships.DependsOn
     test_nested_pattern_4_same_type_diff_file:
-      type: org.openecomp.resource.abstract.nodes.heat.nested-pattern-4-same-type
+      type: org.openecomp.resource.abstract.nodes.heat.pd_server_pattern4_2
       directives:
       - substitutable
       properties:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/nested2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/nested2ServiceTemplate.yaml
index ab21e606d2..7983fe32f4 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/nested2ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/nested2ServiceTemplate.yaml
@@ -89,7 +89,7 @@ topology_template:
       description: SM Image server
   node_templates:
     test_resourceGroup:
-      type: org.openecomp.resource.abstract.nodes.heat.nested3
+      type: org.openecomp.resource.abstract.nodes.heat.cmaui
       directives:
       - substitutable
       properties:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/MainServiceTemplate.yaml
index 9051c994b6..6d51056e60 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/MainServiceTemplate.yaml
@@ -230,7 +230,7 @@ topology_template:
           - service_template_filter
           - index_value
     test_nested_pattern_4:
-      type: org.openecomp.resource.abstract.nodes.heat.nested-pattern-4
+      type: org.openecomp.resource.abstract.nodes.heat.pd_server
       directives:
       - substitutable
       properties:
@@ -279,7 +279,7 @@ topology_template:
           node: test_nested_pattern_4
           relationship: tosca.relationships.DependsOn
     nested2_pattern_4:
-      type: org.openecomp.resource.abstract.nodes.heat.nested-pattern-4
+      type: org.openecomp.resource.abstract.nodes.heat.pd_server
       directives:
       - substitutable
       properties:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/nested1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/nested1ServiceTemplate.yaml
index abadf775f4..6edd5eb6e4 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/nested1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/nested1ServiceTemplate.yaml
@@ -216,7 +216,7 @@ topology_template:
           node: packet_internal_network
           relationship: tosca.relationships.network.LinksTo
     nested1_pattern_4:
-      type: org.openecomp.resource.abstract.nodes.heat.nested-pattern-4
+      type: org.openecomp.resource.abstract.nodes.heat.pd_server
       directives:
       - substitutable
       properties:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/MainServiceTemplate.yaml
index edc041bb40..1602a813ba 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/MainServiceTemplate.yaml
@@ -33,7 +33,7 @@ topology_template:
           node: test_nested_pattern_4
           relationship: tosca.relationships.DependsOn
     test_nested_pattern_4:
-      type: org.openecomp.resource.abstract.nodes.heat.nested-pattern-4
+      type: org.openecomp.resource.abstract.nodes.heat.pd_server
       directives:
       - substitutable
       properties:
@@ -107,4 +107,4 @@ topology_template:
       - dependsOn_network
       - test_nested_pattern_4
       - test_nested_no_compute
-      - test_nested_all_patterns
+      - test_nested_all_patterns
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/MainServiceTemplate.yaml
index 7117003215..f57796a212 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/MainServiceTemplate.yaml
@@ -55,7 +55,7 @@ topology_template:
       type: string
   node_templates:
     server_pcm_002:
-      type: org.openecomp.resource.abstract.nodes.heat.nested-pcm_v0.2
+      type: org.openecomp.resource.abstract.nodes.heat.pcm_server
       directives:
       - substitutable
       properties:
@@ -92,7 +92,7 @@ topology_template:
           - pcm_server_names
           - 0
     server_pcm_001:
-      type: org.openecomp.resource.abstract.nodes.heat.nested-pcm_v0.1
+      type: org.openecomp.resource.abstract.nodes.heat.pcm_server_1
       directives:
       - substitutable
       properties:
@@ -193,4 +193,4 @@ topology_template:
       - server_pcm_002
       - server_pcm_001
       - compute_port_0
-      - abstract_compute
+      - abstract_compute
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/MainServiceTemplate.yaml
index bd968da3a9..674b1e8d9c 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/MainServiceTemplate.yaml
@@ -999,7 +999,7 @@ topology_template:
                 get_input: vnf_name
         description: Cinder volume for the second vSON Cluster leader.
     vson_clm_0:
-      type: org.openecomp.resource.abstract.nodes.heat.nested_vson_server
+      type: org.openecomp.resource.abstract.nodes.heat.vson_vm_4
       directives:
       - substitutable
       properties:
@@ -1063,7 +1063,7 @@ topology_template:
           node: oam_net_security_group
           relationship: tosca.relationships.DependsOn
     vson_mgt_group:
-      type: org.openecomp.resource.abstract.nodes.heat.nested_vson_server_from_vol
+      type: org.openecomp.resource.abstract.nodes.heat.vson_vm_2
       directives:
       - substitutable
       properties:
@@ -1141,7 +1141,7 @@ topology_template:
           get_input: vson_dbs_volume_name_1
         description: Cinder volume for the second vSON DBS VM instance.
     vson_dbc_group:
-      type: org.openecomp.resource.abstract.nodes.heat.nested_vson_server_with_vol
+      type: org.openecomp.resource.abstract.nodes.heat.vson_vm_1
       directives:
       - substitutable
       properties:
@@ -1223,7 +1223,7 @@ topology_template:
           get_input: vson_dbs_volume_name_0
         description: Cinder volume for the first vSON DBS VM instance.
     vson_clm_group:
-      type: org.openecomp.resource.abstract.nodes.heat.nested_vson_server
+      type: org.openecomp.resource.abstract.nodes.heat.vson_vm_4
       directives:
       - substitutable
       properties:
@@ -1342,7 +1342,7 @@ topology_template:
                 get_input: vnf_name
         description: Cinder volume for the second vSON DC leader.
     vson_mdr_group:
-      type: org.openecomp.resource.abstract.nodes.heat.nested_vson_server_from_vol
+      type: org.openecomp.resource.abstract.nodes.heat.vson_vm_2
       directives:
       - substitutable
       properties:
@@ -1406,7 +1406,7 @@ topology_template:
         vson_vm_names:
         - get_input: vson_mdr_name_0
     vson_dbs_group:
-      type: org.openecomp.resource.abstract.nodes.heat.nested_vson_server_with_vol
+      type: org.openecomp.resource.abstract.nodes.heat.vson_vm_1
       directives:
       - substitutable
       properties:
@@ -1478,7 +1478,7 @@ topology_template:
         - get_input: vson_dbs_name_0
         - get_input: vson_dbs_name_1
     vson_app_group:
-      type: org.openecomp.resource.abstract.nodes.heat.nested_vson_server_with_vol_dual_ip_stack
+      type: org.openecomp.resource.abstract.nodes.heat.vson_vm
       directives:
       - substitutable
       properties:
@@ -1710,7 +1710,7 @@ topology_template:
           get_input: vson_dbg_volume_name_0
         description: vSON DB Global cinder volume.
     vson_dbg_group:
-      type: org.openecomp.resource.abstract.nodes.heat.nested_vson_server_with_vol
+      type: org.openecomp.resource.abstract.nodes.heat.vson_vm_1
       directives:
       - substitutable
       properties:
@@ -1778,7 +1778,7 @@ topology_template:
         vson_vm_names:
         - get_input: vson_dbg_name_0
     vson_cll_group:
-      type: org.openecomp.resource.abstract.nodes.heat.nested_vson_server_with_vol
+      type: org.openecomp.resource.abstract.nodes.heat.vson_vm_1
       directives:
       - substitutable
       properties:
@@ -1867,7 +1867,7 @@ topology_template:
           get_input: vson_app_volume_name_0
         description: vSON APP cinder volume.
     vson_mon_group:
-      type: org.openecomp.resource.abstract.nodes.heat.nested_vson_server_from_vol
+      type: org.openecomp.resource.abstract.nodes.heat.vson_vm_2
       directives:
       - substitutable
       properties:
@@ -1931,7 +1931,7 @@ topology_template:
         vson_vm_names:
         - get_input: vson_mon_name_0
     vson_dcl_group:
-      type: org.openecomp.resource.abstract.nodes.heat.nested_vson_server_with_vol
+      type: org.openecomp.resource.abstract.nodes.heat.vson_vm_1
       directives:
       - substitutable
       properties:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested3ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested3ServiceTemplate.yaml
index da2f42610f..f312efdeb2 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested3ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested3ServiceTemplate.yaml
@@ -61,7 +61,7 @@ topology_template:
       type: string
   node_templates:
     test_nested4Level:
-      type: org.openecomp.resource.abstract.nodes.heat.nested4
+      type: org.openecomp.resource.abstract.nodes.heat.cmaui
       directives:
       - substitutable
       properties:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesConnectedIn/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesConnectedIn/out/MainServiceTemplate.yaml
index 78fe423e5d..52911df941 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesConnectedIn/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesConnectedIn/out/MainServiceTemplate.yaml
@@ -155,7 +155,7 @@ topology_template:
       default: oam_protected_net_0
   node_templates:
     server_pcm_002:
-      type: org.openecomp.resource.abstract.nodes.heat.nested-pcm_v0.1
+      type: org.openecomp.resource.abstract.nodes.heat.pcm_server
       directives:
       - substitutable
       properties:
@@ -192,7 +192,7 @@ topology_template:
           - pcm_server_names
           - 0
     server_oam_001:
-      type: org.openecomp.resource.abstract.nodes.heat.nested-oam_v0.1
+      type: org.openecomp.resource.abstract.nodes.heat.oam_server
       directives:
       - substitutable
       properties:
@@ -251,7 +251,7 @@ topology_template:
         oam_net_name:
           get_input: oam_net_name
     server_pcm_001:
-      type: org.openecomp.resource.abstract.nodes.heat.nested-pcm_v0.1
+      type: org.openecomp.resource.abstract.nodes.heat.pcm_server
       directives:
       - substitutable
       properties:
@@ -384,7 +384,7 @@ topology_template:
           node: server_pcm_002
           relationship: org.openecomp.relationships.AttachesTo
     test_shared_node_connected_in_nested:
-      type: org.openecomp.resource.abstract.nodes.heat.nested-oam_v0.1
+      type: org.openecomp.resource.abstract.nodes.heat.oam_server
       directives:
       - substitutable
       properties:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesGetAttrIn/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesGetAttrIn/out/MainServiceTemplate.yaml
index e2ad613b15..e44327fa33 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesGetAttrIn/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesGetAttrIn/out/MainServiceTemplate.yaml
@@ -145,7 +145,7 @@ topology_template:
       default: oam_protected_net_0
   node_templates:
     server_pcm_002:
-      type: org.openecomp.resource.abstract.nodes.heat.nested-pcm_v0.1
+      type: org.openecomp.resource.abstract.nodes.heat.pcm_server
       directives:
       - substitutable
       properties:
@@ -180,7 +180,7 @@ topology_template:
           - pcm_server_names
           - 0
     server_oam_001:
-      type: org.openecomp.resource.abstract.nodes.heat.nested-oam_v0.1
+      type: org.openecomp.resource.abstract.nodes.heat.oam_server
       directives:
       - substitutable
       properties:
@@ -241,7 +241,7 @@ topology_template:
         oam_net_name:
           get_input: oam_net_name
     server_pcm_001:
-      type: org.openecomp.resource.abstract.nodes.heat.nested-pcm_v0.1
+      type: org.openecomp.resource.abstract.nodes.heat.pcm_server
       directives:
       - substitutable
       properties:
@@ -395,4 +395,4 @@ topology_template:
       - server_pcm_001
       - packet_mirror_network
       - compute_port_0
-      - abstract_compute
+      - abstract_compute
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/MainServiceTemplate.yaml
index 4c0c96f988..e49afcd726 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/MainServiceTemplate.yaml
@@ -145,7 +145,7 @@ topology_template:
       default: oam_protected_net_0
   node_templates:
     server_pcm_002:
-      type: org.openecomp.resource.abstract.nodes.heat.nested-pcm_v0.1
+      type: org.openecomp.resource.abstract.nodes.heat.pcm_server
       directives:
       - substitutable
       properties:
@@ -182,7 +182,7 @@ topology_template:
           - pcm_server_names
           - 0
     server_oam_001:
-      type: org.openecomp.resource.abstract.nodes.heat.nested-oam_v0.1
+      type: org.openecomp.resource.abstract.nodes.heat.oam_server
       directives:
       - substitutable
       properties:
@@ -243,7 +243,7 @@ topology_template:
         oam_net_name:
           get_input: oam_net_name
     server_pcm_001:
-      type: org.openecomp.resource.abstract.nodes.heat.nested-pcm_v0.1
+      type: org.openecomp.resource.abstract.nodes.heat.pcm_server
       directives:
       - substitutable
       properties:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/MainServiceTemplate.yaml
index 2d5a794b7a..0f63982943 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/MainServiceTemplate.yaml
@@ -121,7 +121,7 @@ topology_template:
       type: string
   node_templates:
     server_pcm_001:
-      type: org.openecomp.resource.abstract.nodes.heat.nested-pcm_v0.1
+      type: org.openecomp.resource.abstract.nodes.heat.pcm_server
       directives:
       - substitutable
       properties:
@@ -239,4 +239,4 @@ topology_template:
       members:
       - server_pcm_001
       - packet_mirror_network
-      - abstract_compute
+      - abstract_compute
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneComputeDiffPortType/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneComputeDiffPortType/out/MainServiceTemplate.yaml
index 2378f602c8..6bfb11cba1 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneComputeDiffPortType/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneComputeDiffPortType/out/MainServiceTemplate.yaml
@@ -121,7 +121,7 @@ topology_template:
       default: oam_protected_net_0
   node_templates:
     server_pcm_001:
-      type: org.openecomp.resource.abstract.nodes.heat.nested-pcm_v0.1
+      type: org.openecomp.resource.abstract.nodes.heat.pcm_server
       directives:
       - substitutable
       properties:
@@ -260,4 +260,4 @@ topology_template:
       - server_pcm_001
       - packet_mirror_network
       - compute_port_0
-      - abstract_compute
+      - abstract_compute
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/MainServiceTemplate.yaml
index 5db374e25b..976be29e67 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/MainServiceTemplate.yaml
@@ -55,7 +55,7 @@ topology_template:
       type: string
   node_templates:
     server_pcm_002:
-      type: org.openecomp.resource.abstract.nodes.heat.nested-pcm_v0.2
+      type: org.openecomp.resource.abstract.nodes.heat.pcm_server
       directives:
       - substitutable
       properties:
@@ -92,7 +92,7 @@ topology_template:
           - pcm_server_names
           - 0
     server_pcm_001:
-      type: org.openecomp.resource.abstract.nodes.heat.nested-pcm_v0.1
+      type: org.openecomp.resource.abstract.nodes.heat.pcm_server_1
       directives:
       - substitutable
       properties:
@@ -129,7 +129,7 @@ topology_template:
           - pcm_server_names
           - 0
     server_pcm_003:
-      type: org.openecomp.resource.abstract.nodes.heat.nested-pcm_v0.3
+      type: org.openecomp.resource.abstract.nodes.heat.pcm_server_2
       directives:
       - substitutable
       properties:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/out/MainServiceTemplate.yaml
index b7e3090eb5..2a5f3b77f9 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/out/MainServiceTemplate.yaml
@@ -55,7 +55,7 @@ topology_template:
       type: string
   node_templates:
     server_pcm_002:
-      type: org.openecomp.resource.abstract.nodes.heat.nested-pcm_v0.1
+      type: org.openecomp.resource.abstract.nodes.heat.pcm_server
       directives:
       - substitutable
       properties:
@@ -92,7 +92,7 @@ topology_template:
           - pcm_server_names
           - 0
     server_pcm_001:
-      type: org.openecomp.resource.abstract.nodes.heat.nested-pcm_v0.1
+      type: org.openecomp.resource.abstract.nodes.heat.pcm_server
       directives:
       - substitutable
       properties:
@@ -129,7 +129,7 @@ topology_template:
           - pcm_server_names
           - 0
     server_pcm_003:
-      type: org.openecomp.resource.abstract.nodes.heat.nested-pcm_v0.2
+      type: org.openecomp.resource.abstract.nodes.heat.pcm_server_2
       directives:
       - substitutable
       properties:
@@ -189,4 +189,4 @@ topology_template:
       - server_pcm_002
       - server_pcm_001
       - server_pcm_003
-      - compute_port_0
+      - compute_port_0
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/twoNestedNodeTemplatesWithSameComputeType/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/twoNestedNodeTemplatesWithSameComputeType/out/MainServiceTemplate.yaml
index 3f53330a7a..6f0bd1ea94 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/twoNestedNodeTemplatesWithSameComputeType/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/twoNestedNodeTemplatesWithSameComputeType/out/MainServiceTemplate.yaml
@@ -55,7 +55,7 @@ topology_template:
       type: string
   node_templates:
     server_pcm_002:
-      type: org.openecomp.resource.abstract.nodes.heat.nested-pcm_v0.1
+      type: org.openecomp.resource.abstract.nodes.heat.pcm_server
       directives:
       - substitutable
       properties:
@@ -92,7 +92,7 @@ topology_template:
           - pcm_server_names
           - 0
     server_pcm_001:
-      type: org.openecomp.resource.abstract.nodes.heat.nested-pcm_v0.1
+      type: org.openecomp.resource.abstract.nodes.heat.pcm_server
       directives:
       - substitutable
       properties:
@@ -193,4 +193,4 @@ topology_template:
       - server_pcm_002
       - server_pcm_001
       - compute_port_0
-      - abstract_compute
+      - abstract_compute
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/MainServiceTemplate.yaml
index 86c41415ae..a6938c23d8 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/MainServiceTemplate.yaml
@@ -420,7 +420,7 @@ topology_template:
       default: int_mog_csb_net
   node_templates:
     server_pcm_003:
-      type: org.openecomp.resource.abstract.nodes.heat.nested-pcm_v0.1
+      type: org.openecomp.resource.abstract.nodes.heat.pcm_server
       directives:
       - substitutable
       properties: